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

Commit 69672bd7 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/eeh: Remove unnecessary pointer to phb from eeh_dev 



The eeh_dev struct already holds a pointer to pci_dn which it does not
exist without and pci_dn itself holds the very same pointer so just
use it.

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

arch/powerpc/include/asm/eeh.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ struct eeh_dev { 
	struct eeh_pe *pe;		/* Associated PE		*/

	struct list_head list;		/* Form link list in the PE	*/

	struct list_head rmv_list;	/* Record the removed edevs	*/

	struct pci_controller *phb;	/* Associated PHB		*/

	struct pci_dn *pdn;		/* Associated PCI device node	*/

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

	bool in_error;			/* Error flag for edev		*/

arch/powerpc/kernel/eeh.c

+3 −4
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ static size_t eeh_dump_dev_log(struct eeh_dev *edev, char *buf, size_t len) 
	char buffer[128];



	n += scnprintf(buf+n, len-n, "%04x:%02x:%02x.%01x\n",

		       edev->phb->global_number, pdn->busno,

		       pdn->phb->global_number, pdn->busno,

		       PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));

	pr_warn("EEH: of node=%04x:%02x:%02x.%01x\n",

		edev->phb->global_number, pdn->busno,

		pdn->phb->global_number, pdn->busno,

		PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));



	eeh_ops->read_config(pdn, PCI_VENDOR_ID, 4, &cfg);
@@ -1064,7 +1064,7 @@ core_initcall_sync(eeh_init); 
 */

void eeh_add_device_early(struct pci_dn *pdn)

{

	struct pci_controller *phb;

	struct pci_controller *phb = pdn ? pdn->phb : NULL;

	struct eeh_dev *edev = pdn_to_eeh_dev(pdn);



	if (!edev)
@@ -1074,7 +1074,6 @@ void eeh_add_device_early(struct pci_dn *pdn) 
		return;



	/* USB Bus children of PCI devices will not have BUID's */

	phb = edev->phb;

	if (NULL == phb ||

	    (eeh_has_flag(EEH_PROBE_MODE_DEVTREE) && 0 == phb->buid))

		return;

arch/powerpc/kernel/eeh_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
 */

struct eeh_dev *eeh_dev_init(struct pci_dn *pdn)

{

	struct pci_controller *phb = pdn->phb;

	struct eeh_dev *edev;



	/* Allocate EEH device */
@@ -64,7 +63,6 @@ struct eeh_dev *eeh_dev_init(struct pci_dn *pdn) 
	/* Associate EEH device with OF node */

	pdn->edev = edev;

	edev->pdn = pdn;

	edev->phb = phb;

	INIT_LIST_HEAD(&edev->list);

	INIT_LIST_HEAD(&edev->rmv_list);

arch/powerpc/kernel/eeh_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void *eeh_add_virt_device(void *data, void *userdata) 


	if (!(edev->physfn)) {

		pr_warn("%s: EEH dev %04x:%02x:%02x.%01x not for VF\n",

			__func__, edev->phb->global_number, pdn->busno,

			__func__, pdn->phb->global_number, pdn->busno,

			PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));

		return NULL;

	}

arch/powerpc/kernel/eeh_pe.c

+13 −11
Original line number Diff line number Diff line
@@ -339,11 +339,12 @@ static struct eeh_pe *eeh_pe_get_parent(struct eeh_dev *edev) 
int eeh_add_to_parent_pe(struct eeh_dev *edev)

{

	struct eeh_pe *pe, *parent;

	struct pci_dn *pdn = eeh_dev_to_pdn(edev);



	/* 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, edev->phb->global_number);

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

		return -EINVAL;

	}
@@ -353,7 +354,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(edev->pdn->phb, edev->pe_config_addr,

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

			edev->config_addr);

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

		/* Mark the PE as type of PCI bus */
@@ -363,7 +364,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
		/* Put the edev to PE */

		list_add_tail(&edev->list, &pe->edevs);

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

			edev->phb->global_number,

			 pdn->phb->global_number,

			edev->config_addr >> 8,

			PCI_SLOT(edev->config_addr & 0xFF),

			PCI_FUNC(edev->config_addr & 0xFF),
@@ -386,7 +387,7 @@ 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",

			edev->phb->global_number,

			 pdn->phb->global_number,

			edev->config_addr >> 8,

                        PCI_SLOT(edev->config_addr & 0xFF),

                        PCI_FUNC(edev->config_addr & 0xFF),
@@ -396,9 +397,9 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 


	/* Create a new EEH PE */

	if (edev->physfn)

		pe = eeh_pe_alloc(edev->phb, EEH_PE_VF);

		pe = eeh_pe_alloc(pdn->phb, EEH_PE_VF);

	else

		pe = eeh_pe_alloc(edev->phb, EEH_PE_DEVICE);

		pe = eeh_pe_alloc(pdn->phb, EEH_PE_DEVICE);

	if (!pe) {

		pr_err("%s: out of memory!\n", __func__);

		return -ENOMEM;
@@ -414,10 +415,10 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	 */

	parent = eeh_pe_get_parent(edev);

	if (!parent) {

		parent = eeh_phb_pe_get(edev->phb);

		parent = eeh_phb_pe_get(pdn->phb);

		if (!parent) {

			pr_err("%s: No PHB PE is found (PHB Domain=%d)\n",

				__func__, edev->phb->global_number);

				__func__, pdn->phb->global_number);

			edev->pe = NULL;

			kfree(pe);

			return -EEXIST;
@@ -434,7 +435,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	edev->pe = pe;

	pr_debug("EEH: Add %04x:%02x:%02x.%01x to "

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

		 edev->phb->global_number,

		 pdn->phb->global_number,

		 edev->config_addr >> 8,

		 PCI_SLOT(edev->config_addr & 0xFF),

		 PCI_FUNC(edev->config_addr & 0xFF),
@@ -456,10 +457,11 @@ int eeh_rmv_from_parent_pe(struct eeh_dev *edev) 
{

	struct eeh_pe *pe, *parent, *child;

	int cnt;

	struct pci_dn *pdn = eeh_dev_to_pdn(edev);



	if (!edev->pe) {

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

			 __func__,  edev->phb->global_number,

			 __func__,  pdn->phb->global_number,

			 edev->config_addr >> 8,

			 PCI_SLOT(edev->config_addr & 0xFF),

			 PCI_FUNC(edev->config_addr & 0xFF));
@@ -722,7 +724,7 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) 
		return;



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

		 __func__, edev->phb->global_number,

		 __func__, pdn->phb->global_number,

		 edev->config_addr >> 8,

		 PCI_SLOT(edev->config_addr & 0xFF),

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