Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 317f06de authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

powerpc/eeh: Move common part to kernel directory 



The patch moves the common part of EEH core into arch/powerpc/kernel
directory so that we needn't PPC_PSERIES while compiling POWERNV
platform:

        * Move the EEH common part into arch/powerpc/kernel
        * Move the functions for PCI hotplug from pSeries platform to
          arch/powerpc/kernel/pci-hotplug.c
        * Move CONFIG_EEH from arch/powerpc/platforms/pseries/Kconfig to
          arch/powerpc/platforms/Kconfig
        * Adjust makefile accordingly

Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a84f273c

arch/powerpc/kernel/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ obj-$(CONFIG_RTAS_PROC) += rtas-proc.o 
obj-$(CONFIG_LPARCFG)		+= lparcfg.o

obj-$(CONFIG_IBMVIO)		+= vio.o

obj-$(CONFIG_IBMEBUS)           += ibmebus.o

obj-$(CONFIG_EEH)              += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \

				  eeh_driver.o eeh_event.o eeh_sysfs.o

obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_FA_DUMP)		+= fadump.o
@@ -100,7 +102,7 @@ obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o 
obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_SWIOTLB)		+= dma-swiotlb.o



pci64-$(CONFIG_PPC64)		+= pci_dn.o isa-bridge.o

pci64-$(CONFIG_PPC64)		+= pci_dn.o pci-hotplug.o isa-bridge.o

obj-$(CONFIG_PCI)		+= pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \

				   pci-common.o pci_of_scan.o

obj-$(CONFIG_PCI_MSI)		+= msi.o

arch/powerpc/platforms/pseries/eeh_cache.c→arch/powerpc/kernel/eeh_cache.c

+0 −1
Original line number Diff line number Diff line
@@ -316,4 +316,3 @@ void __init eeh_addr_cache_build(void) 
	eeh_addr_cache_print(&pci_io_addr_cache_root);

#endif

}

arch/powerpc/platforms/pseries/eeh_driver.c→arch/powerpc/kernel/eeh_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -549,4 +549,3 @@ void eeh_handle_event(struct eeh_pe *pe) 
	if (frozen_bus)

		pcibios_remove_pci_devices(frozen_bus);

}