Commit dcbb01fb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ingo Molnar
Browse files

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: default avatarDavide Ciminaghi <ciminaghi@gnudd.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIngo 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
parent ca5955dd

arch/x86/Kconfig

+3 −29
Original line number Diff line number Diff line
@@ -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
@@ -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():
@@ -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
@@ -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
@@ -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
@@ -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

arch/x86/include/asm/sta2x11.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Header file for STMicroelectronics ConneXt (STA2X11) IOHub

 */

#ifndef __ASM_STA2X11_H

#define __ASM_STA2X11_H



#include <linux/pci.h>



/* This needs to be called from the MFD to configure its sub-devices */

struct sta2x11_instance *sta2x11_get_instance(struct pci_dev *pdev);



#endif /* __ASM_STA2X11_H */

arch/x86/pci/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/pci/sta2x11-fixup.c

deleted100644 → 0
+0 −233
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * DMA translation between STA2x11 AMBA memory mapping and the x86 memory mapping

 *

 * ST Microelectronics ConneXt (STA2X11/STA2X10)

 *

 * Copyright (c) 2010-2011 Wind River Systems, Inc.

 */



#include <linux/pci.h>

#include <linux/pci_ids.h>

#include <linux/export.h>

#include <linux/list.h>

#include <linux/dma-map-ops.h>

#include <linux/swiotlb.h>

#include <asm/iommu.h>

#include <asm/sta2x11.h>



#define STA2X11_SWIOTLB_SIZE (4*1024*1024)



/*

 * We build a list of bus numbers that are under the ConneXt. The

 * main bridge hosts 4 busses, which are the 4 endpoints, in order.

 */

#define STA2X11_NR_EP		4	/* 0..3 included */

#define STA2X11_NR_FUNCS	8	/* 0..7 included */

#define STA2X11_AMBA_SIZE	(512 << 20)



struct sta2x11_ahb_regs { /* saved during suspend */

	u32 base, pexlbase, pexhbase, crw;

};



struct sta2x11_mapping {

	int is_suspended;

	struct sta2x11_ahb_regs regs[STA2X11_NR_FUNCS];

};



struct sta2x11_instance {

	struct list_head list;

	int bus0;

	struct sta2x11_mapping map[STA2X11_NR_EP];

};



static LIST_HEAD(sta2x11_instance_list);



/* At probe time, record new instances of this bridge (likely one only) */

static void sta2x11_new_instance(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance;



	instance = kzalloc(sizeof(*instance), GFP_ATOMIC);

	if (!instance)

		return;

	/* This has a subordinate bridge, with 4 more-subordinate ones */

	instance->bus0 = pdev->subordinate->number + 1;



	if (list_empty(&sta2x11_instance_list)) {

		int size = STA2X11_SWIOTLB_SIZE;

		/* First instance: register your own swiotlb area */

		dev_info(&pdev->dev, "Using SWIOTLB (size %i)\n", size);

		if (swiotlb_init_late(size, GFP_DMA, NULL))

			dev_emerg(&pdev->dev, "init swiotlb failed\n");

	}

	list_add(&instance->list, &sta2x11_instance_list);

}

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_STMICRO, 0xcc17, sta2x11_new_instance);



/*

 * Utility functions used in this file from below

 */

static struct sta2x11_instance *sta2x11_pdev_to_instance(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance;

	int ep;



	list_for_each_entry(instance, &sta2x11_instance_list, list) {

		ep = pdev->bus->number - instance->bus0;

		if (ep >= 0 && ep < STA2X11_NR_EP)

			return instance;

	}

	return NULL;

}



static int sta2x11_pdev_to_ep(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance;



	instance = sta2x11_pdev_to_instance(pdev);

	if (!instance)

		return -1;



	return pdev->bus->number - instance->bus0;

}



/* This is exported, as some devices need to access the MFD registers */

struct sta2x11_instance *sta2x11_get_instance(struct pci_dev *pdev)

{

	return sta2x11_pdev_to_instance(pdev);

}

EXPORT_SYMBOL(sta2x11_get_instance);



/* At setup time, we use our own ops if the device is a ConneXt one */

static void sta2x11_setup_pdev(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance = sta2x11_pdev_to_instance(pdev);



	if (!instance) /* either a sta2x11 bridge or another ST device */

		return;



	/* We must enable all devices as master, for audio DMA to work */

	pci_set_master(pdev);

}

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_STMICRO, PCI_ANY_ID, sta2x11_setup_pdev);



/*

 * At boot we must set up the mappings for the pcie-to-amba bridge.

 * It involves device access, and the same happens at suspend/resume time

 */



#define AHB_MAPB		0xCA4

#define AHB_CRW(i)		(AHB_MAPB + 0  + (i) * 0x10)

#define AHB_CRW_SZMASK			0xfffffc00UL

#define AHB_CRW_ENABLE			(1 << 0)

#define AHB_CRW_WTYPE_MEM		(2 << 1)

#define AHB_CRW_ROE			(1UL << 3)	/* Relax Order Ena */

#define AHB_CRW_NSE			(1UL << 4)	/* No Snoop Enable */

#define AHB_BASE(i)		(AHB_MAPB + 4  + (i) * 0x10)

#define AHB_PEXLBASE(i)		(AHB_MAPB + 8  + (i) * 0x10)

#define AHB_PEXHBASE(i)		(AHB_MAPB + 12 + (i) * 0x10)



/* At probe time, enable mapping for each endpoint, using the pdev */

static void sta2x11_map_ep(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance = sta2x11_pdev_to_instance(pdev);

	struct device *dev = &pdev->dev;

	u32 amba_base, max_amba_addr;

	int i, ret;



	if (!instance)

		return;



	pci_read_config_dword(pdev, AHB_BASE(0), &amba_base);

	max_amba_addr = amba_base + STA2X11_AMBA_SIZE - 1;



	ret = dma_direct_set_offset(dev, 0, amba_base, STA2X11_AMBA_SIZE);

	if (ret)

		dev_err(dev, "sta2x11: could not set DMA offset\n");



	dev->bus_dma_limit = max_amba_addr;

	dma_set_mask_and_coherent(&pdev->dev, max_amba_addr);



	/* Configure AHB mapping */

	pci_write_config_dword(pdev, AHB_PEXLBASE(0), 0);

	pci_write_config_dword(pdev, AHB_PEXHBASE(0), 0);

	pci_write_config_dword(pdev, AHB_CRW(0), STA2X11_AMBA_SIZE |

			       AHB_CRW_WTYPE_MEM | AHB_CRW_ENABLE);



	/* Disable all the other windows */

	for (i = 1; i < STA2X11_NR_FUNCS; i++)

		pci_write_config_dword(pdev, AHB_CRW(i), 0);



	dev_info(&pdev->dev,

		 "sta2x11: Map EP %i: AMBA address %#8x-%#8x\n",

		 sta2x11_pdev_to_ep(pdev), amba_base, max_amba_addr);

}

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_STMICRO, PCI_ANY_ID, sta2x11_map_ep);



#ifdef CONFIG_PM /* Some register values must be saved and restored */



static struct sta2x11_mapping *sta2x11_pdev_to_mapping(struct pci_dev *pdev)

{

	struct sta2x11_instance *instance;

	int ep;



	instance = sta2x11_pdev_to_instance(pdev);

	if (!instance)

		return NULL;

	ep = sta2x11_pdev_to_ep(pdev);

	return instance->map + ep;

}



static void suspend_mapping(struct pci_dev *pdev)

{

	struct sta2x11_mapping *map = sta2x11_pdev_to_mapping(pdev);

	int i;



	if (!map)

		return;



	if (map->is_suspended)

		return;

	map->is_suspended = 1;



	/* Save all window configs */

	for (i = 0; i < STA2X11_NR_FUNCS; i++) {

		struct sta2x11_ahb_regs *regs = map->regs + i;



		pci_read_config_dword(pdev, AHB_BASE(i), &regs->base);

		pci_read_config_dword(pdev, AHB_PEXLBASE(i), &regs->pexlbase);

		pci_read_config_dword(pdev, AHB_PEXHBASE(i), &regs->pexhbase);

		pci_read_config_dword(pdev, AHB_CRW(i), &regs->crw);

	}

}

DECLARE_PCI_FIXUP_SUSPEND(PCI_VENDOR_ID_STMICRO, PCI_ANY_ID, suspend_mapping);



static void resume_mapping(struct pci_dev *pdev)

{

	struct sta2x11_mapping *map = sta2x11_pdev_to_mapping(pdev);

	int i;



	if (!map)

		return;





	if (!map->is_suspended)

		goto out;

	map->is_suspended = 0;



	/* Restore all window configs */

	for (i = 0; i < STA2X11_NR_FUNCS; i++) {

		struct sta2x11_ahb_regs *regs = map->regs + i;



		pci_write_config_dword(pdev, AHB_BASE(i), regs->base);

		pci_write_config_dword(pdev, AHB_PEXLBASE(i), regs->pexlbase);

		pci_write_config_dword(pdev, AHB_PEXHBASE(i), regs->pexhbase);

		pci_write_config_dword(pdev, AHB_CRW(i), regs->crw);

	}

out:

	pci_set_master(pdev); /* Like at boot, enable master on all devices */

}

DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_STMICRO, PCI_ANY_ID, resume_mapping);



#endif /* CONFIG_PM */