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

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

powerpc/eeh: Introduce EEH device 



Original EEH implementation depends on struct pci_dn heavily. However,
EEH shouldn't depend on that actually because EEH needn't share much
information with other PCI components. That's to say, EEH should have
worked independently.

The patch introduces struct eeh_dev so that EEH core components needn't
be working based on struct pci_dn in future. Also, struct pci_dn, struct
eeh_dev instances are created in dynamic fasion and the binding with EEH
device, OF node, PCI device is implemented as well.

The EEH devices are created after PHBs are detected and initialized, but
PCI emunation hasn't started yet. Apart from that, PHB might be created
dynamically through DLPAR component and the EEH devices should be creatd
as well. Another case might be OF node is created dynamically by DR
(Dynamic Reconfiguration), which has been defined by PAPR. For those OF
nodes created by DR, EEH devices should be also created accordingly. The
binding between EEH device and OF node is done while the EEH device is
initially created.

The binding between EEH device and PCI device should be done after PCI
emunation is done. Besides, PCI hotplug also needs the binding so that
the EEH devices could be traced from the newly coming PCI buses or PCI
devices.

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

arch/powerpc/include/asm/device.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ struct dev_archdata { 
#ifdef CONFIG_SWIOTLB

	dma_addr_t		max_direct_dma_addr;

#endif

#ifdef CONFIG_EEH

	struct eeh_dev		*edev;

#endif

};



struct pdev_archdata {

arch/powerpc/include/asm/eeh.h

+50 −7
Original line number Diff line number Diff line
@@ -31,6 +31,43 @@ struct device_node; 


#ifdef CONFIG_EEH



/*

 * The struct is used to trace EEH state for the associated

 * PCI device node or PCI device. In future, it might

 * represent PE as well so that the EEH device to form

 * another tree except the currently existing tree of PCI

 * buses and PCI devices

 */

#define EEH_MODE_SUPPORTED	(1<<0)	/* EEH supported on the device	*/

#define EEH_MODE_NOCHECK	(1<<1)	/* EEH check should be skipped	*/

#define EEH_MODE_ISOLATED	(1<<2)	/* The device has been isolated	*/

#define EEH_MODE_RECOVERING	(1<<3)	/* Recovering the device	*/

#define EEH_MODE_IRQ_DISABLED	(1<<4)	/* Interrupt disabled		*/



struct eeh_dev {

	int mode;			/* EEH mode			*/

	int class_code;			/* Class code of the device	*/

	int config_addr;		/* Config address		*/

	int pe_config_addr;		/* PE config address		*/

	int check_count;		/* Times of ignored error	*/

	int freeze_count;		/* Times of froze up		*/

	int false_positives;		/* Times of reported #ff's	*/

	u32 config_space[16];		/* Saved PCI config space	*/

	struct pci_controller *phb;	/* Associated PHB		*/

	struct device_node *dn;		/* Associated device node	*/

	struct pci_dev *pdev;		/* Associated PCI device	*/

};



static inline struct device_node *eeh_dev_to_of_node(struct eeh_dev *edev)

{

	return edev->dn;

}



static inline struct pci_dev *eeh_dev_to_pci_dev(struct eeh_dev *edev)

{

	return edev->pdev;

}



/*

 * The struct is used to trace the registered EEH operation

 * callback functions. Actually, those operation callback
@@ -70,19 +107,15 @@ struct eeh_ops { 
extern struct eeh_ops *eeh_ops;

extern int eeh_subsystem_enabled;



/* Values for eeh_mode bits in device_node */

#define EEH_MODE_SUPPORTED     (1<<0)

#define EEH_MODE_NOCHECK       (1<<1)

#define EEH_MODE_ISOLATED      (1<<2)

#define EEH_MODE_RECOVERING    (1<<3)

#define EEH_MODE_IRQ_DISABLED  (1<<4)



/*

 * Max number of EEH freezes allowed before we consider the device

 * to be permanently disabled.

 */

#define EEH_MAX_ALLOWED_FREEZES 5



void * __devinit eeh_dev_init(struct device_node *dn, void *data);

void __devinit eeh_dev_phb_init_dynamic(struct pci_controller *phb);

void __init eeh_dev_phb_init(void);

void __init eeh_init(void);

#ifdef CONFIG_PPC_PSERIES

int __init eeh_pseries_init(void);
@@ -113,6 +146,16 @@ void eeh_remove_bus_device(struct pci_dev *); 
#define EEH_IO_ERROR_VALUE(size)	(~0U >> ((4 - (size)) * 8))



#else /* !CONFIG_EEH */



static inline void *eeh_dev_init(struct device_node *dn, void *data)

{

	return NULL;

}



static inline void eeh_dev_phb_init_dynamic(struct pci_controller *phb) { }



static inline void eeh_dev_phb_init(void) { }



static inline void eeh_init(void) { }



#ifdef CONFIG_PPC_PSERIES

arch/powerpc/kernel/of_platform.c

+5 −1
Original line number Diff line number Diff line
@@ -21,12 +21,13 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/atomic.h>



#include <asm/errno.h>

#include <asm/topology.h>

#include <asm/pci-bridge.h>

#include <asm/ppc-pci.h>

#include <linux/atomic.h>

#include <asm/eeh.h>



#ifdef CONFIG_PPC_OF_PLATFORM_PCI
@@ -66,6 +67,9 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev) 
	/* Init pci_dn data structures */

	pci_devs_phb_init_dynamic(phb);



	/* Create EEH devices for the PHB */

	eeh_dev_phb_init_dynamic(phb);



	/* Register devices with EEH */

#ifdef CONFIG_EEH

	if (dev->dev.of_node->child)

arch/powerpc/kernel/rtas_pci.c

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ void __init find_and_init_phbs(void) 
	of_node_put(root);

	pci_devs_phb_init();



	/* Create EEH devices for all PHBs */

	eeh_dev_phb_init();



	/*

	 * pci_probe_only and pci_assign_all_buses can be set via properties

	 * in chosen.

arch/powerpc/platforms/pseries/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ obj-y := lpar.o hvCall.o nvram.o reconfig.o \ 
			   firmware.o power.o dlpar.o mobility.o

obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_SCANLOG)	+= scanlog.o

obj-$(CONFIG_EEH)	+= eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o eeh_pseries.o

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

			   eeh_event.o eeh_sysfs.o eeh_pseries.o

obj-$(CONFIG_KEXEC)	+= kexec.o

obj-$(CONFIG_PCI)	+= pci.o pci_dlpar.o

obj-$(CONFIG_PSERIES_MSI)	+= msi.o