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

Commit 405b33a7 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/eeh: Remove unnecessary config_addr from eeh_dev 



The eeh_dev struct hold a config space address of an associated node
and the very same address is also stored in the pci_dn struct which
is always present during the eeh_dev lifetime.

This uses bus:devfn directly from pci_dn instead of cached and packed
config_addr.

Since config_addr is made from device's bus:dev.fn, there is no point
in keeping it in the debugfs either so remove that too.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 69672bd7

arch/powerpc/include/asm/eeh.h

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe) 
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		*/

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

	int pcix_cap;			/* Saved PCIx capability	*/

arch/powerpc/kernel/eeh_pe.c

+21 −21
Original line number Diff line number Diff line
@@ -340,11 +340,12 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
{

	struct eeh_pe *pe, *parent;

	struct pci_dn *pdn = eeh_dev_to_pdn(edev);

	int config_addr = (pdn->busno << 8) | (pdn->devfn);



	/* Check if the PE number is valid */

	if (!eeh_has_flag(EEH_VALID_PE_ZERO) && !edev->pe_config_addr) {

		pr_err("%s: Invalid PE#0 for edev 0x%x on PHB#%x\n",

		       __func__, edev->config_addr, pdn->phb->global_number);

		       __func__, config_addr, pdn->phb->global_number);

		return -EINVAL;

	}
@@ -354,8 +355,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	 * PE should be composed of PCI bus and its subordinate

	 * components.

	 */

	pe = eeh_pe_get(pdn->phb, edev->pe_config_addr,

			edev->config_addr);

	pe = eeh_pe_get(pdn->phb, edev->pe_config_addr, config_addr);

	if (pe && !(pe->type & EEH_PE_INVALID)) {

		/* Mark the PE as type of PCI bus */

		pe->type = EEH_PE_BUS;
@@ -365,9 +365,9 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
		list_add_tail(&edev->list, &pe->edevs);

		pr_debug("EEH: Add %04x:%02x:%02x.%01x to Bus PE#%x\n",

			 pdn->phb->global_number,

			edev->config_addr >> 8,

			PCI_SLOT(edev->config_addr & 0xFF),

			PCI_FUNC(edev->config_addr & 0xFF),

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn),

			 pe->addr);

		return 0;

	} else if (pe && (pe->type & EEH_PE_INVALID)) {
@@ -388,9 +388,9 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
		pr_debug("EEH: Add %04x:%02x:%02x.%01x to Device "

			 "PE#%x, Parent PE#%x\n",

			 pdn->phb->global_number,

			edev->config_addr >> 8,

                        PCI_SLOT(edev->config_addr & 0xFF),

                        PCI_FUNC(edev->config_addr & 0xFF),

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn),

			 pe->addr, pe->parent->addr);

		return 0;

	}
@@ -405,7 +405,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
		return -ENOMEM;

	}

	pe->addr	= edev->pe_config_addr;

	pe->config_addr	= edev->config_addr;

	pe->config_addr	= config_addr;



	/*

	 * Put the new EEH PE into hierarchy tree. If the parent
@@ -436,9 +436,9 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	pr_debug("EEH: Add %04x:%02x:%02x.%01x to "

		 "Device PE#%x, Parent PE#%x\n",

		 pdn->phb->global_number,

		 edev->config_addr >> 8,

		 PCI_SLOT(edev->config_addr & 0xFF),

		 PCI_FUNC(edev->config_addr & 0xFF),

		 pdn->busno,

		 PCI_SLOT(pdn->devfn),

		 PCI_FUNC(pdn->devfn),

		 pe->addr, pe->parent->addr);



	return 0;
@@ -462,9 +462,9 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev) 
	if (!edev->pe) {

		pr_debug("%s: No PE found for device %04x:%02x:%02x.%01x\n",

			 __func__,  pdn->phb->global_number,

			 edev->config_addr >> 8,

			 PCI_SLOT(edev->config_addr & 0xFF),

			 PCI_FUNC(edev->config_addr & 0xFF));

			 pdn->busno,

			 PCI_SLOT(pdn->devfn),

			 PCI_FUNC(pdn->devfn));

		return -EEXIST;

	}
@@ -725,9 +725,9 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 


	pr_debug("%s: Check PCIe link for %04x:%02x:%02x.%01x ...\n",

		 __func__, pdn->phb->global_number,

		 edev->config_addr >> 8,

		 PCI_SLOT(edev->config_addr & 0xFF),

		 PCI_FUNC(edev->config_addr & 0xFF));

		 pdn->busno,

		 PCI_SLOT(pdn->devfn),

		 PCI_FUNC(pdn->devfn));



	/* Check slot status */

	cap = edev->pcie_cap;

arch/powerpc/kernel/eeh_sysfs.c

+0 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static ssize_t eeh_show_##_name(struct device *dev, \ 
static DEVICE_ATTR(_name, S_IRUGO, eeh_show_##_name, NULL);



EEH_SHOW_ATTR(eeh_mode,            mode,            "0x%x");

EEH_SHOW_ATTR(eeh_config_addr,     config_addr,     "0x%x");

EEH_SHOW_ATTR(eeh_pe_config_addr,  pe_config_addr,  "0x%x");



static ssize_t eeh_pe_state_show(struct device *dev,
@@ -103,7 +102,6 @@ void eeh_sysfs_add_device(struct pci_dev *pdev) 
		return;



	rc += device_create_file(&pdev->dev, &dev_attr_eeh_mode);

	rc += device_create_file(&pdev->dev, &dev_attr_eeh_config_addr);

	rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);

	rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_state);
@@ -128,7 +126,6 @@ void eeh_sysfs_remove_device(struct pci_dev *pdev) 
	}



	device_remove_file(&pdev->dev, &dev_attr_eeh_mode);

	device_remove_file(&pdev->dev, &dev_attr_eeh_config_addr);

	device_remove_file(&pdev->dev, &dev_attr_eeh_pe_config_addr);

	device_remove_file(&pdev->dev, &dev_attr_eeh_pe_state);

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

+5 −4
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) 
	struct eeh_dev *edev = pdn_to_eeh_dev(pdn);

	uint32_t pcie_flags;

	int ret;

	int config_addr = (pdn->busno << 8) | (pdn->devfn);



	/*

	 * When probing the root bridge, which doesn't have any
@@ -386,8 +387,7 @@ static void *pnv_eeh_probe(struct pci_dn *pdn, void *data) 
		}

	}



	edev->config_addr    = (pdn->busno << 8) | (pdn->devfn);

	edev->pe_config_addr = phb->ioda.pe_rmap[edev->config_addr];

	edev->pe_config_addr = phb->ioda.pe_rmap[config_addr];



	/* Create PE */

	ret = eeh_add_to_parent_pe(edev);
@@ -1699,6 +1699,7 @@ static int pnv_eeh_restore_config(struct pci_dn *pdn) 
	struct eeh_dev *edev = pdn_to_eeh_dev(pdn);

	struct pnv_phb *phb;

	s64 ret;

	int config_addr = (pdn->busno << 8) | (pdn->devfn);



	if (!edev)

		return -EEXIST;
@@ -1715,12 +1716,12 @@ static int pnv_eeh_restore_config(struct pci_dn *pdn) 
	} else {

		phb = pdn->phb->private_data;

		ret = opal_pci_reinit(phb->opal_id,

				      OPAL_REINIT_PCI_DEV, edev->config_addr);

				      OPAL_REINIT_PCI_DEV, config_addr);

	}



	if (ret) {

		pr_warn("%s: Can't reinit PCI dev 0x%x (%lld)\n",

			__func__, edev->config_addr, ret);

			__func__, config_addr, ret);

		return -EIO;

	}

arch/powerpc/platforms/pseries/eeh_pseries.c

+0 −2
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) 
	ret = eeh_ops->set_option(&pe, EEH_OPT_ENABLE);

	if (!ret) {

		/* Retrieve PE address */

		edev->config_addr = (pdn->busno << 16) | (pdn->devfn << 8);

		edev->pe_config_addr = eeh_ops->get_pe_addr(&pe);

		pe.addr = edev->pe_config_addr;
@@ -279,7 +278,6 @@ static void *pseries_eeh_probe(struct pci_dn *pdn, void *data) 
			/* This device doesn't support EEH, but it may have an

			 * EEH parent, in which case we mark it as supported.

			 */

			edev->config_addr = pdn_to_eeh_dev(pdn->parent)->config_addr;

			edev->pe_config_addr = pdn_to_eeh_dev(pdn->parent)->pe_config_addr;

			eeh_add_to_parent_pe(edev);

		}