Skip to content

Commit

Permalink
x86/pci: Remove old STA2x11 support
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Arnd Bergmann authored and Ingo Molnar committed Feb 27, 2025
1 parent ca5955d commit dcbb01f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 277 deletions.
32 changes: 3 additions & 29 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ config X86_EXTENDED_PLATFORM
AMD Elan
RDC R-321x SoC
SGI 320/540 (Visual Workstation)
STA2X11-based (e.g. Northville)

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

config X86_32_NON_STANDARD
bool "Support non-standard 32-bit SMP architectures"
depends on X86_32 && SMP
depends on X86_EXTENDED_PLATFORM
help
This option compiles in the STA2X11 default
subarchitecture. It is intended for a generic binary
kernel. If you select them all, kernel will probe it one by
one and will fallback to default.

# Alphabetically sorted list of Non standard 32 bit platforms

config X86_SUPPORTS_MEMORY_FAILURE
def_bool y
# MCE code calls memory_failure():
Expand All @@ -753,19 +740,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
depends on X86_64 || !SPARSEMEM
select ARCH_SUPPORTS_MEMORY_FAILURE

config STA2X11
bool "STA2X11 Companion Chip Support"
depends on X86_32_NON_STANDARD && PCI
select SWIOTLB
select MFD_STA2X11
select GPIOLIB
help
This adds support for boards based on the STA2X11 IO-Hub,
a.k.a. "ConneXt". The chip is used in place of the standard
PC chipset, so all "standard" peripherals are missing. If this
option is selected the kernel will still be able to boot on
standard PC machines.

config X86_32_IRIS
tristate "Eurobraille/Iris poweroff module"
depends on X86_32
Expand Down Expand Up @@ -1103,7 +1077,7 @@ config UP_LATE_INIT
config X86_UP_APIC
bool "Local APIC support on uniprocessors" if !PCI_MSI
default PCI_MSI
depends on X86_32 && !SMP && !X86_32_NON_STANDARD
depends on X86_32 && !SMP
help
A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU
Expand All @@ -1128,7 +1102,7 @@ config X86_UP_IOAPIC

config X86_LOCAL_APIC
def_bool y
depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
depends on X86_64 || SMP || X86_UP_APIC || PCI_MSI
select IRQ_DOMAIN_HIERARCHY

config ACPI_MADT_WAKEUP
Expand Down Expand Up @@ -1590,7 +1564,7 @@ config ARCH_FLATMEM_ENABLE

config ARCH_SPARSEMEM_ENABLE
def_bool y
depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD
depends on X86_64 || NUMA || X86_32
select SPARSEMEM_STATIC if X86_32
select SPARSEMEM_VMEMMAP_ENABLE if X86_64

Expand Down
13 changes: 0 additions & 13 deletions arch/x86/include/asm/sta2x11.h

This file was deleted.

2 changes: 0 additions & 2 deletions arch/x86/pci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
obj-$(CONFIG_ACPI) += acpi.o
obj-y += legacy.o irq.o

obj-$(CONFIG_STA2X11) += sta2x11-fixup.o

obj-$(CONFIG_X86_NUMACHIP) += numachip.o

obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o
Expand Down
233 changes: 0 additions & 233 deletions arch/x86/pci/sta2x11-fixup.c

This file was deleted.

0 comments on commit dcbb01f

Please sign in to comment.