Commit 269e5833 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/eeh: Delete eeh_pe->config_addr 



The eeh_pe->config_addr field was supposed to be removed in
commit 35d64734 ("powerpc/eeh: Clean up PE addressing") which made it
largely unused. Finish the job.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201007040903.819081-1-oohall@gmail.com
parent 72cdd117

arch/powerpc/include/asm/eeh.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct pci_dn; 
struct eeh_pe {

	int type;			/* PE type: PHB/Bus/Device	*/

	int state;			/* PE EEH dependent mode	*/

	int config_addr;		/* Traditional PCI address	*/

	int addr;			/* PE configuration address	*/

	struct pci_controller *phb;	/* Associated PHB		*/

	struct pci_bus *bus;		/* Top PCI bus for bus PE	*/

arch/powerpc/kernel/eeh.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ int eeh_dev_check_failure(struct eeh_dev *edev) 
		return 0;

	}



	if (!pe->addr && !pe->config_addr) {

	if (!pe->addr) {

		eeh_stats.no_cfg_addr++;

		return 0;

	}

arch/powerpc/kernel/eeh_pe.c

+2 −2
Original line number Diff line number Diff line
@@ -354,8 +354,8 @@ int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent) 
		pr_err("%s: out of memory!\n", __func__);

		return -ENOMEM;

	}



	pe->addr = edev->pe_config_addr;

	pe->config_addr	= edev->bdfn;



	/*

	 * Put the new EEH PE into hierarchy tree. If the parent

CRA Git | Maintained and supported by SUSTech CRA and CCSE