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

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

powerpc/powernv: Drop PHB operation configure_bridge() 



The patch drops PHB EEH operation configure_bridge() and merges
its logic to eeh_ops::configure_bridge().

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 95edcdea

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

+0 −15
Original line number Diff line number Diff line
@@ -530,20 +530,6 @@ static int ioda_eeh_reset(struct eeh_pe *pe, int option) 
	return ret;

}



/**

 * ioda_eeh_configure_bridge - Configure the PCI bridges for the indicated PE

 * @pe: EEH PE

 *

 * For particular PE, it might have included PCI bridges. In order

 * to make the PE work properly, those PCI bridges should be configured

 * correctly. However, we need do nothing on P7IOC since the reset

 * function will do everything that should be covered by the function.

 */

static int ioda_eeh_configure_bridge(struct eeh_pe *pe)

{

	return 0;

}



static void ioda_eeh_hub_diag_common(struct OpalIoP7IOCErrorData *data)

{

	/* GEM */
@@ -886,6 +872,5 @@ struct pnv_eeh_ops ioda_eeh_ops = { 
	.set_option		= ioda_eeh_set_option,

	.get_state		= ioda_eeh_get_state,

	.reset			= ioda_eeh_reset,

	.configure_bridge	= ioda_eeh_configure_bridge,

	.next_error		= ioda_eeh_next_error

};

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

+1 −8
Original line number Diff line number Diff line
@@ -549,14 +549,7 @@ static int pnv_eeh_get_log(struct eeh_pe *pe, int severity, 
 */

static int pnv_eeh_configure_bridge(struct eeh_pe *pe)

{

	struct pci_controller *hose = pe->phb;

	struct pnv_phb *phb = hose->private_data;

	int ret = 0;



	if (phb->eeh_ops && phb->eeh_ops->configure_bridge)

		ret = phb->eeh_ops->configure_bridge(pe);



	return ret;

	return 0;

}



/**

arch/powerpc/platforms/powernv/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct pnv_eeh_ops { 
	int (*set_option)(struct eeh_pe *pe, int option);

	int (*get_state)(struct eeh_pe *pe);

	int (*reset)(struct eeh_pe *pe, int option);

	int (*configure_bridge)(struct eeh_pe *pe);

	int (*next_error)(struct eeh_pe **pe);

};

#endif /* CONFIG_EEH */