[POWERPC] Allow pSeries to build without CONFIG_PCI (bed59275) · Commits · 戴 / test

arch/powerpc/Kconfig

+3 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER

		config ARCH_MAY_HAVE_PC_FDC
		bool
		default y
		default !PPC_PSERIES \|\| PCI

		config PPC_OF
		def_bool y
		@@ -1028,7 +1028,8 @@ config MCA

		config PCI
		bool "PCI support" if 40x \|\| CPM2 \|\| PPC_83xx \|\| PPC_85xx \|\| PPC_86xx \
		\|\| PPC_MPC52xx \|\| (EMBEDDED && PPC_ISERIES) \|\| MPC7448HPC2 \|\| PPC_PS3
		\|\| PPC_MPC52xx \|\| (EMBEDDED && (PPC_PSERIES \|\| PPC_ISERIES)) \
		\|\| MPC7448HPC2 \|\| PPC_PS3
		default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
		&& !PPC_85xx && !PPC_86xx
		default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS

arch/powerpc/kernel/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ obj-$(CONFIG_PPC_970_NAP) += idle_power4.o
		obj-$(CONFIG_PPC_OF) += of_device.o of_platform.o prom_parse.o
		procfs-$(CONFIG_PPC64) := proc_ppc64.o
		obj-$(CONFIG_PROC_FS) += $(procfs-y)
		rtaspci-$(CONFIG_PPC64) := rtas_pci.o
		obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y)
		rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI) := rtas_pci.o
		obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y-y)
		obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
		obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
		obj-$(CONFIG_LPARCFG) += lparcfg.o

arch/powerpc/platforms/pseries/Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -2,14 +2,15 @@ ifeq ($(CONFIG_PPC64),y)
		EXTRA_CFLAGS += -mno-minimal-toc
		endif

		obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
		setup.o iommu.o ras.o rtasd.o pci_dlpar.o \
		obj-y := lpar.o hvCall.o nvram.o reconfig.o \
		setup.o iommu.o ras.o rtasd.o \
		firmware.o power.o
		obj-$(CONFIG_SMP) += smp.o
		obj-$(CONFIG_XICS) += xics.o
		obj-$(CONFIG_SCANLOG) += scanlog.o
		obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o
		obj-$(CONFIG_KEXEC) += kexec.o
		obj-$(CONFIG_PCI) += pci.o pci_dlpar.o

		obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o

arch/powerpc/platforms/pseries/iommu.c

+30 −23

Original line number	Diff line number	Diff line
		@@ -242,6 +242,7 @@ static unsigned long tce_get_pSeriesLP(struct iommu_table *tbl, long tcenum)
		return tce_ret;
		}

		#ifdef CONFIG_PCI
		static void iommu_table_setparms(struct pci_controller *phb,
		struct device_node *dn,
		struct iommu_table *tbl)
		@@ -478,29 +479,6 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev)
		pci_name(dev));
		}

		static int iommu_reconfig_notifier(struct notifier_block nb, unsigned long action, void node)
		{
		int err = NOTIFY_OK;
		struct device_node *np = node;
		struct pci_dn *pci = PCI_DN(np);

		switch (action) {
		case PSERIES_RECONFIG_REMOVE:
		if (pci && pci->iommu_table &&
		get_property(np, "ibm,dma-window", NULL))
		iommu_free_table(np);
		break;
		default:
		err = NOTIFY_DONE;
		break;
		}
		return err;
		}

		static struct notifier_block iommu_reconfig_nb = {
		.notifier_call = iommu_reconfig_notifier,
		};

		static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
		{
		struct device_node pdn, dn;
		@@ -554,6 +532,35 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)

		dev->dev.archdata.dma_data = pci->iommu_table;
		}
		#else /* CONFIG_PCI */
		#define pci_dma_bus_setup_pSeries NULL
		#define pci_dma_dev_setup_pSeries NULL
		#define pci_dma_bus_setup_pSeriesLP NULL
		#define pci_dma_dev_setup_pSeriesLP NULL
		#endif /* !CONFIG_PCI */

		static int iommu_reconfig_notifier(struct notifier_block nb, unsigned long action, void node)
		{
		int err = NOTIFY_OK;
		struct device_node *np = node;
		struct pci_dn *pci = PCI_DN(np);

		switch (action) {
		case PSERIES_RECONFIG_REMOVE:
		if (pci && pci->iommu_table &&
		get_property(np, "ibm,dma-window", NULL))
		iommu_free_table(np);
		break;
		default:
		err = NOTIFY_DONE;
		break;
		}
		return err;
		}

		static struct notifier_block iommu_reconfig_nb = {
		.notifier_call = iommu_reconfig_notifier,
		};

		/* These are called very early. */
		void iommu_init_early_pSeries(void)

arch/powerpc/platforms/pseries/setup.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@
		#include <asm/udbg.h>
		#include <asm/smp.h>
		#include <asm/firmware.h>
		#include <asm/eeh.h>

		#include "plpar_wrappers.h"
		#include "pseries.h"
		@@ -514,6 +515,10 @@ void pSeries_power_off(void)
		for (;;);
		}

		#ifndef CONFIG_PCI
		void pSeries_final_fixup(void) { }
		#endif

		define_machine(pseries) {
		.name = "pSeries",
		.probe = pSeries_probe,

Admin message