From 16650911ec08bfa2859a072c2bcee9b83620c365 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Apr 20 2023 13:41:23 +0000 Subject: net: prevent ISA drivers from building on PPC32 (git-fixes). --- diff --git a/patches.suse/net-prevent-ISA-drivers-from-building-on-PPC32.patch b/patches.suse/net-prevent-ISA-drivers-from-building-on-PPC32.patch new file mode 100644 index 0000000..3fd028b --- /dev/null +++ b/patches.suse/net-prevent-ISA-drivers-from-building-on-PPC32.patch @@ -0,0 +1,84 @@ +From 32e5e402d337480c3c57ca9cb61ef0436fa56134 Mon Sep 17 00:00:00 2001 +From: Randy Dunlap +Date: Sat, 21 Jul 2018 12:59:25 -0700 +Subject: [PATCH 1/3] net: prevent ISA drivers from building on PPC32 +Git-commit: c9ce1fa1c24b08e13c2a3b5b1f94a19c9eaa982c +Patch-mainline: 4.18-rc7 +References: git-fixes + +Prevent drivers from building on PPC32 if they use isa_bus_to_virt(), +isa_virt_to_bus(), or isa_page_to_bus(), which are not available and +thus cause build errors. + +../drivers/net/ethernet/3com/3c515.c: In function 'corkscrew_open': +../drivers/net/ethernet/3com/3c515.c:824:9: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] + +../drivers/net/ethernet/amd/lance.c: In function 'lance_rx': +../drivers/net/ethernet/amd/lance.c:1203:23: error: implicit declaration of function 'isa_bus_to_virt'; did you mean 'bus_to_virt'? [-Werror=implicit-function-declaration] + +../drivers/net/ethernet/amd/ni65.c: In function 'ni65_init_lance': +../drivers/net/ethernet/amd/ni65.c:585:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] + +../drivers/net/ethernet/cirrus/cs89x0.c: In function 'net_open': +../drivers/net/ethernet/cirrus/cs89x0.c:897:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] + +Signed-off-by: Randy Dunlap +Suggested-by: Michael Ellerman +Signed-off-by: David S. Miller +Signed-off-by: Denis Kirjanov +--- + drivers/net/ethernet/3com/Kconfig | 2 +- + drivers/net/ethernet/amd/Kconfig | 4 ++-- + drivers/net/ethernet/cirrus/Kconfig | 1 + + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig +index 5b7658bcf020..5c3ef9fc8207 100644 +--- a/drivers/net/ethernet/3com/Kconfig ++++ b/drivers/net/ethernet/3com/Kconfig +@@ -32,7 +32,7 @@ config EL3 + + config 3C515 + tristate "3c515 ISA \"Fast EtherLink\"" +- depends on ISA && ISA_DMA_API ++ depends on ISA && ISA_DMA_API && !PPC32 + ---help--- + If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet + network card, say Y here. +diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig +index d5c15e8bb3de..a8e8f4e9c1bb 100644 +--- a/drivers/net/ethernet/amd/Kconfig ++++ b/drivers/net/ethernet/amd/Kconfig +@@ -44,7 +44,7 @@ config AMD8111_ETH + + config LANCE + tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" +- depends on ISA && ISA_DMA_API && !ARM ++ depends on ISA && ISA_DMA_API && !ARM && !PPC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y here. + Some LinkSys cards are of this type. +@@ -138,7 +138,7 @@ config PCMCIA_NMCLAN + + config NI65 + tristate "NI6510 support" +- depends on ISA && ISA_DMA_API && !ARM ++ depends on ISA && ISA_DMA_API && !ARM && !PPC32 + ---help--- + If you have a network (Ethernet) card of this type, say Y here. + +diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig +index 5ab912937aff..ec0b545197e2 100644 +--- a/drivers/net/ethernet/cirrus/Kconfig ++++ b/drivers/net/ethernet/cirrus/Kconfig +@@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS + config CS89x0 + tristate "CS89x0 support" + depends on ISA || EISA || ARM ++ depends on !PPC32 + ---help--- + Support for CS89x0 chipset based Ethernet cards. If you have a + network (Ethernet) card of this type, say Y and read the file +-- +2.16.4 + diff --git a/series.conf b/series.conf index a4b6d84..ea355fc 100644 --- a/series.conf +++ b/series.conf @@ -35896,6 +35896,7 @@ patches.suse/vxlan-make-netlink-notify-in-vxlan_fdb_destroy-optio.patch patches.suse/vxlan-fix-default-fdb-entry-netlink-notify-ordering-.patch patches.suse/nfp-flower-ensure-dead-neighbour-entries-are-not-off.patch + patches.suse/net-prevent-ISA-drivers-from-building-on-PPC32.patch patches.suse/can-peak_canfd-fix-firmware-v3.3.0-limit-allocation- patches.suse/can-m_can.c-fix-setup-of-CCCR-register-clear-CCCR-NI patches.suse/can-mpc5xxx_can-check-of_iomap-return-before-use