[PATCH 7/9] kernel/x86: remove all ISA support from non-legacy

[Elliott Mitchell]

While some older PCI motherboard might emulate some functions via
ISA, actual ISA is absent from anything non-legacy.  Move ISA DMA
enabling to Geode and Legacy.

Signed-off-by: Elliott Mitchell <ehem+openwrt at m5p.com>
---
Question here is how far to go with removing ISA support?  Certainly it
is appropriate to keep for the legacy build, but what of slightly more
recent hardware?  Some i686 motherboards might have actual slots, but it
was quickly vestigial.
---
 target/linux/x86/config-5.10        | 5 ++---
 target/linux/x86/config-5.15        | 5 ++---
 target/linux/x86/geode/config-5.10  | 2 ++
 target/linux/x86/geode/config-5.15  | 2 ++
 target/linux/x86/legacy/config-5.10 | 2 ++
 target/linux/x86/legacy/config-5.15 | 2 ++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/target/linux/x86/config-5.10 b/target/linux/x86/config-5.10
index 8be829d549..98e0372247 100644
--- a/target/linux/x86/config-5.10
+++ b/target/linux/x86/config-5.10
@@ -132,7 +132,6 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -185,8 +184,8 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
-# CONFIG_ISA is not set
-CONFIG_ISA_DMA_API=y
+CONFIG_ISA=n
+CONFIG_ISA_DMA_API=n
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
diff --git a/target/linux/x86/config-5.15 b/target/linux/x86/config-5.15
index afe66b27b1..3805820416 100644
--- a/target/linux/x86/config-5.15
+++ b/target/linux/x86/config-5.15
@@ -133,7 +133,6 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -187,8 +186,8 @@ CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
-# CONFIG_ISA is not set
-CONFIG_ISA_DMA_API=y
+CONFIG_ISA=n
+CONFIG_ISA_DMA_API=n
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
diff --git a/target/linux/x86/geode/config-5.10 b/target/linux/x86/geode/config-5.10
index 30b358b050..632e1fb7b7 100644
--- a/target/linux/x86/geode/config-5.10
+++ b/target/linux/x86/geode/config-5.10
@@ -42,6 +42,7 @@ CONFIG_CS5535_MFGPT=y
 CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 CONFIG_DMA_ACPI=y
 # CONFIG_EL3 is not set
+CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GEODE_WDT=y
 CONFIG_GEOS=y
 CONFIG_GPIO_ACPI=y
@@ -67,6 +68,7 @@ CONFIG_IOSF_MBI=y
 CONFIG_ISA=y
 # CONFIG_ISAPNP is not set
 CONFIG_ISA_BUS_API=y
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_LANCE is not set
 CONFIG_LEDS_GPIO=y
diff --git a/target/linux/x86/geode/config-5.15 b/target/linux/x86/geode/config-5.15
index 0c54cdaf9e..deaf2123d4 100644
--- a/target/linux/x86/geode/config-5.15
+++ b/target/linux/x86/geode/config-5.15
@@ -45,6 +45,7 @@ CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
 # CONFIG_CS89x0_ISA is not set
 CONFIG_DMA_ACPI=y
 # CONFIG_EL3 is not set
+CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GEODE_WDT=y
 CONFIG_GEOS=y
 CONFIG_GPIO_ACPI=y
@@ -74,6 +75,7 @@ CONFIG_IOSF_MBI=y
 CONFIG_ISA=y
 # CONFIG_ISAPNP is not set
 CONFIG_ISA_BUS_API=y
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_LANCE is not set
 CONFIG_LEDS_GPIO=y
diff --git a/target/linux/x86/legacy/config-5.10 b/target/linux/x86/legacy/config-5.10
index a11eca8fc2..3a44ab45d6 100644
--- a/target/linux/x86/legacy/config-5.10
+++ b/target/linux/x86/legacy/config-5.10
@@ -106,6 +106,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_GENERIC_ISA_DMA=y
 CONFIG_HDMI=y
 CONFIG_HID_BATTERY_STRENGTH=y
 # CONFIG_HIGHMEM4G is not set
@@ -136,6 +137,7 @@ CONFIG_IOSF_MBI=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_BUS_API=y
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT is not set
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
diff --git a/target/linux/x86/legacy/config-5.15 b/target/linux/x86/legacy/config-5.15
index b424147073..74edf85abd 100644
--- a/target/linux/x86/legacy/config-5.15
+++ b/target/linux/x86/legacy/config-5.15
@@ -109,6 +109,7 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_GENERIC_ISA_DMA=y
 CONFIG_HDMI=y
 CONFIG_HID_BATTERY_STRENGTH=y
 # CONFIG_HIGHMEM4G is not set
@@ -142,6 +143,7 @@ CONFIG_IOSF_MBI=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_BUS_API=y
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT is not set
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |       ehem+openwrt at m5p.com     PGP 87145445       |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445