Skip to content

Commit dcbb01f

Browse files
arndbIngo Molnar
authored andcommitted
x86/pci: Remove old STA2x11 support
ST ConneXt STA2x11 was an interface chip for Atom E6xx processors, using a number of components usually found on Arm SoCs. Most of this was merged upstream, but it was never complete enough to actually work and has been abandoned for many years. We already had an agreement on removing it in 2022, but nobody ever submitted the patch to do it. Without STA2x11, CONFIG_X86_32_NON_STANDARD no longer has any use - remove it. Suggested-by: Davide Ciminaghi <ciminaghi@gnudd.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20250226213714.4040853-10-arnd@kernel.org
1 parent ca5955d commit dcbb01f

File tree

4 files changed

+3
-277
lines changed

4 files changed

+3
-277
lines changed

arch/x86/Kconfig

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ config X86_EXTENDED_PLATFORM
548548
AMD Elan
549549
RDC R-321x SoC
550550
SGI 320/540 (Visual Workstation)
551-
STA2X11-based (e.g. Northville)
552551

553552
64-bit platforms (CONFIG_64BIT=y):
554553
Numascale NumaChip
@@ -732,18 +731,6 @@ config X86_RDC321X
732731
as R-8610-(G).
733732
If you don't have one of these chips, you should say N here.
734733

735-
config X86_32_NON_STANDARD
736-
bool "Support non-standard 32-bit SMP architectures"
737-
depends on X86_32 && SMP
738-
depends on X86_EXTENDED_PLATFORM
739-
help
740-
This option compiles in the STA2X11 default
741-
subarchitecture. It is intended for a generic binary
742-
kernel. If you select them all, kernel will probe it one by
743-
one and will fallback to default.
744-
745-
# Alphabetically sorted list of Non standard 32 bit platforms
746-
747734
config X86_SUPPORTS_MEMORY_FAILURE
748735
def_bool y
749736
# MCE code calls memory_failure():
@@ -753,19 +740,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
753740
depends on X86_64 || !SPARSEMEM
754741
select ARCH_SUPPORTS_MEMORY_FAILURE
755742

756-
config STA2X11
757-
bool "STA2X11 Companion Chip Support"
758-
depends on X86_32_NON_STANDARD && PCI
759-
select SWIOTLB
760-
select MFD_STA2X11
761-
select GPIOLIB
762-
help
763-
This adds support for boards based on the STA2X11 IO-Hub,
764-
a.k.a. "ConneXt". The chip is used in place of the standard
765-
PC chipset, so all "standard" peripherals are missing. If this
766-
option is selected the kernel will still be able to boot on
767-
standard PC machines.
768-
769743
config X86_32_IRIS
770744
tristate "Eurobraille/Iris poweroff module"
771745
depends on X86_32
@@ -1103,7 +1077,7 @@ config UP_LATE_INIT
11031077
config X86_UP_APIC
11041078
bool "Local APIC support on uniprocessors" if !PCI_MSI
11051079
default PCI_MSI
1106-
depends on X86_32 && !SMP && !X86_32_NON_STANDARD
1080+
depends on X86_32 && !SMP
11071081
help
11081082
A local APIC (Advanced Programmable Interrupt Controller) is an
11091083
integrated interrupt controller in the CPU. If you have a single-CPU
@@ -1128,7 +1102,7 @@ config X86_UP_IOAPIC
11281102

11291103
config X86_LOCAL_APIC
11301104
def_bool y
1131-
depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
1105+
depends on X86_64 || SMP || X86_UP_APIC || PCI_MSI
11321106
select IRQ_DOMAIN_HIERARCHY
11331107

11341108
config ACPI_MADT_WAKEUP
@@ -1590,7 +1564,7 @@ config ARCH_FLATMEM_ENABLE
15901564

15911565
config ARCH_SPARSEMEM_ENABLE
15921566
def_bool y
1593-
depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD
1567+
depends on X86_64 || NUMA || X86_32
15941568
select SPARSEMEM_STATIC if X86_32
15951569
select SPARSEMEM_VMEMMAP_ENABLE if X86_64
15961570

arch/x86/include/asm/sta2x11.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/x86/pci/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
1212
obj-$(CONFIG_ACPI) += acpi.o
1313
obj-y += legacy.o irq.o
1414

15-
obj-$(CONFIG_STA2X11) += sta2x11-fixup.o
16-
1715
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
1816

1917
obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o

arch/x86/pci/sta2x11-fixup.c

Lines changed: 0 additions & 233 deletions
This file was deleted.

0 commit comments

Comments
 (0)