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

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

powerpc/eeh: Cleanup on eeh_subsystem_enabled 



The patch cleans up variable eeh_subsystem_enabled so that we needn't
refer the variable directly from external. Instead, we will use
function eeh_enabled() and eeh_set_enable() to operate the variable.

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

arch/powerpc/include/asm/eeh.h

+19 −2
Original line number Diff line number Diff line
@@ -172,10 +172,20 @@ struct eeh_ops { 
};



extern struct eeh_ops *eeh_ops;

extern int eeh_subsystem_enabled;

extern bool eeh_subsystem_enabled;

extern raw_spinlock_t confirm_error_lock;

extern int eeh_probe_mode;



static inline bool eeh_enabled(void)

{

	return eeh_subsystem_enabled;

}



static inline void eeh_set_enable(bool mode)

{

	eeh_subsystem_enabled = mode;

}



#define EEH_PROBE_MODE_DEV	(1<<0)	/* From PCI device	*/

#define EEH_PROBE_MODE_DEVTREE	(1<<1)	/* From device tree	*/
@@ -246,7 +256,7 @@ void eeh_remove_device(struct pci_dev *); 
 * If this macro yields TRUE, the caller relays to eeh_check_failure()

 * which does further tests out of line.

 */

#define EEH_POSSIBLE_ERROR(val, type)	((val) == (type)~0 && eeh_subsystem_enabled)

#define EEH_POSSIBLE_ERROR(val, type)	((val) == (type)~0 && eeh_enabled())



/*

 * Reads from a device which has been isolated by EEH will return
@@ -257,6 +267,13 @@ void eeh_remove_device(struct pci_dev *); 


#else /* !CONFIG_EEH */



static inline bool eeh_enabled(void)

{

        return false;

}



static inline void eeh_set_enable(bool mode) { }



static inline int eeh_init(void)

{

	return 0;

arch/powerpc/kernel/eeh.c

+6 −6
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
/* Platform dependent EEH operations */

struct eeh_ops *eeh_ops = NULL;



int eeh_subsystem_enabled;

bool eeh_subsystem_enabled = false;

EXPORT_SYMBOL(eeh_subsystem_enabled);



/*
@@ -364,7 +364,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev) 


	eeh_stats.total_mmio_ffs++;



	if (!eeh_subsystem_enabled)

	if (!eeh_enabled())

		return 0;



	if (!edev) {
@@ -822,7 +822,7 @@ int eeh_init(void) 
			return ret;

	}



	if (eeh_subsystem_enabled)

	if (eeh_enabled())

		pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");

	else

		pr_warning("EEH: No capable adapters found\n");
@@ -897,7 +897,7 @@ void eeh_add_device_late(struct pci_dev *dev) 
	struct device_node *dn;

	struct eeh_dev *edev;



	if (!dev || !eeh_subsystem_enabled)

	if (!dev || !eeh_enabled())

		return;



	pr_debug("EEH: Adding device %s\n", pci_name(dev));
@@ -1005,7 +1005,7 @@ void eeh_remove_device(struct pci_dev *dev) 
{

	struct eeh_dev *edev;



	if (!dev || !eeh_subsystem_enabled)

	if (!dev || !eeh_enabled())

		return;

	edev = pci_dev_to_eeh_dev(dev);
@@ -1045,7 +1045,7 @@ void eeh_remove_device(struct pci_dev *dev) 


static int proc_eeh_show(struct seq_file *m, void *v)

{

	if (0 == eeh_subsystem_enabled) {

	if (!eeh_enabled()) {

		seq_printf(m, "EEH Subsystem is globally disabled\n");

		seq_printf(m, "eeh_total_mmio_ffs=%llu\n", eeh_stats.total_mmio_ffs);

	} else {

arch/powerpc/platforms/powernv/eeh-powernv.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) 
	 * Enable EEH explicitly so that we will do EEH check

	 * while accessing I/O stuff

	 */

	eeh_subsystem_enabled = 1;

	eeh_set_enable(true);



	/* Save memory bars */

	eeh_save_bars(edev);

arch/powerpc/platforms/pseries/eeh_pseries.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void *pseries_eeh_of_probe(struct device_node *dn, void *flag) 
			enable = 1;



		if (enable) {

			eeh_subsystem_enabled = 1;

			eeh_set_enable(true);

			eeh_add_to_parent_pe(edev);



			pr_debug("%s: EEH enabled on %s PHB#%d-PE#%x, config addr#%x\n",