Commit 768a4284 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/eeh: Remove class code field from edev 



The edev->class_code field is never referenced anywhere except for the
platform specific probe functions. The same information is available in
the pci_dev for PowerNV and in the pci_dn on pseries so we can remove
the field.

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/20200725081231.39076-11-oohall@gmail.com
parent 1a303d88

arch/powerpc/include/asm/eeh.h

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,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 bdfn;			/* bdfn of device (for cfg ops) */

	struct pci_controller *controller;

	int pe_config_addr;		/* PE config address		*/

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

+2 −3
Original line number Diff line number Diff line
@@ -372,19 +372,18 @@ static struct eeh_dev *pnv_eeh_probe(struct pci_dev *pdev) 
	}



	/* Skip for PCI-ISA bridge */

	if ((pdn->class_code >> 8) == PCI_CLASS_BRIDGE_ISA)

	if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)

		return NULL;



	eeh_edev_dbg(edev, "Probing device\n");



	/* Initialize eeh device */

	edev->class_code = pdn->class_code;

	edev->mode	&= 0xFFFFFF00;

	edev->pcix_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_PCIX);

	edev->pcie_cap = pnv_eeh_find_cap(pdn, PCI_CAP_ID_EXP);

	edev->af_cap   = pnv_eeh_find_cap(pdn, PCI_CAP_ID_AF);

	edev->aer_cap  = pnv_eeh_find_ecap(pdn, PCI_EXT_CAP_ID_ERR);

	if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {

	if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {

		edev->mode |= EEH_DEV_BRIDGE;

		if (edev->pcie_cap) {

			pnv_pci_cfg_read(pdn, edev->pcie_cap + PCI_EXP_FLAGS,

arch/powerpc/platforms/pseries/eeh_pseries.c

+1 −2
Original line number Diff line number Diff line
@@ -440,12 +440,11 @@ void pseries_eeh_init_edev(struct pci_dn *pdn) 
	 * correctly reflects that current device is root port

	 * or PCIe switch downstream port.

	 */

	edev->class_code = pdn->class_code;

	edev->pcix_cap = pseries_eeh_find_cap(pdn, PCI_CAP_ID_PCIX);

	edev->pcie_cap = pseries_eeh_find_cap(pdn, PCI_CAP_ID_EXP);

	edev->aer_cap = pseries_eeh_find_ecap(pdn, PCI_EXT_CAP_ID_ERR);

	edev->mode &= 0xFFFFFF00;

	if ((edev->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {

	if ((pdn->class_code >> 8) == PCI_CLASS_BRIDGE_PCI) {

		edev->mode |= EEH_DEV_BRIDGE;

		if (edev->pcie_cap) {

			rtas_read_config(pdn, edev->pcie_cap + PCI_EXP_FLAGS,

CRA Git | Maintained and supported by SUSTech CRA and CCSE