Commit fef7f905 authored by Sam Bobroff's avatar Sam Bobroff Committed by Michael Ellerman
Browse files

powerpc/eeh: Cleanup eeh_ops.wait_state() 



The wait_state member of eeh_ops does not need to be platform
dependent; it's just logic around eeh_ops.get_state(). Therefore,
merge the two (slightly different!) platform versions into a new
function, eeh_wait_state() and remove the eeh_ops member.

While doing this, also correct:
* The wait logic, so that it never waits longer than max_wait.
* The wait logic, so that it never waits less than
  EEH_STATE_MIN_WAIT_TIME.
* One call site where the result is treated like a bit field before
  it's checked for negative error values.
* In pseries_eeh_get_state(), rename the "state" parameter to "delay"
  because that's what it is.

Signed-off-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e762bb89

arch/powerpc/include/asm/eeh.h

+2 −2
Original line number Diff line number Diff line
@@ -205,9 +205,8 @@ struct eeh_ops { 
	void* (*probe)(struct pci_dn *pdn, void *data);

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

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

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

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

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

	int (*wait_state)(struct eeh_pe *pe, int max_wait);

	int (*get_log)(struct eeh_pe *pe, int severity, char *drv_log, unsigned long len);

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

	int (*err_inject)(struct eeh_pe *pe, int type, int func,
@@ -264,6 +263,7 @@ typedef void *(*eeh_edev_traverse_func)(struct eeh_dev *edev, void *flag); 
typedef void *(*eeh_pe_traverse_func)(struct eeh_pe *pe, void *flag);

void eeh_set_pe_aux_size(int size);

int eeh_phb_pe_create(struct pci_controller *phb);

int eeh_wait_state(struct eeh_pe *pe, int max_wait);

struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb);

struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *root);

struct eeh_pe *eeh_pe_get(struct pci_controller *phb,

arch/powerpc/kernel/eeh.c

+4 −5
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ int eeh_pci_enable(struct eeh_pe *pe, int function) 


	/* Check if the request is finished successfully */

	if (active_flag) {

		rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		rc = eeh_wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		if (rc < 0)

			return rc;
@@ -920,16 +920,15 @@ int eeh_pe_reset_full(struct eeh_pe *pe) 
			break;



		/* Wait until the PE is in a functioning state */

		state = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		if (eeh_state_active(state))

			break;



		state = eeh_wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		if (state < 0) {

			pr_warn("%s: Unrecoverable slot failure on PHB#%x-PE#%x",

				__func__, pe->phb->global_number, pe->addr);

			ret = -ENOTRECOVERABLE;

			break;

		}

		if (eeh_state_active(state))

			break;



		/* Set error in case this is our last attempt */

		ret = -EIO;

arch/powerpc/kernel/eeh_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ void eeh_handle_normal_event(struct eeh_pe *pe) 
	/* Get the current PCI slot state. This can take a long time,

	 * sometimes over 300 seconds for certain systems.

	 */

	rc = eeh_ops->wait_state(pe, MAX_WAIT_FOR_RECOVERY*1000);

	rc = eeh_wait_state(pe, MAX_WAIT_FOR_RECOVERY*1000);

	if (rc < 0 || rc == EEH_STATE_NOT_SUPPORT) {

		pr_warn("EEH: Permanent failure\n");

		goto hard_fail;

arch/powerpc/kernel/eeh_pe.c

+51 −0
Original line number Diff line number Diff line
@@ -108,6 +108,57 @@ int eeh_phb_pe_create(struct pci_controller *phb) 
	return 0;

}



/**

 * eeh_wait_state - Wait for PE state

 * @pe: EEH PE

 * @max_wait: maximal period in millisecond

 *

 * Wait for the state of associated PE. It might take some time

 * to retrieve the PE's state.

 */

int eeh_wait_state(struct eeh_pe *pe, int max_wait)

{

	int ret;

	int mwait;



	/*

	 * According to PAPR, the state of PE might be temporarily

	 * unavailable. Under the circumstance, we have to wait

	 * for indicated time determined by firmware. The maximal

	 * wait time is 5 minutes, which is acquired from the original

	 * EEH implementation. Also, the original implementation

	 * also defined the minimal wait time as 1 second.

	 */

#define EEH_STATE_MIN_WAIT_TIME	(1000)

#define EEH_STATE_MAX_WAIT_TIME	(300 * 1000)



	while (1) {

		ret = eeh_ops->get_state(pe, &mwait);



		if (ret != EEH_STATE_UNAVAILABLE)

			return ret;



		if (max_wait <= 0) {

			pr_warn("%s: Timeout when getting PE's state (%d)\n",

				__func__, max_wait);

			return EEH_STATE_NOT_SUPPORT;

		}



		if (mwait < EEH_STATE_MIN_WAIT_TIME) {

			pr_warn("%s: Firmware returned bad wait value %d\n",

				__func__, mwait);

			mwait = EEH_STATE_MIN_WAIT_TIME;

		} else if (mwait > EEH_STATE_MAX_WAIT_TIME) {

			pr_warn("%s: Firmware returned too long wait value %d\n",

				__func__, mwait);

			mwait = EEH_STATE_MAX_WAIT_TIME;

		}



		msleep(min(mwait, max_wait));

		max_wait -= mwait;

	}

}



/**

 * eeh_phb_pe_get - Retrieve PHB PE based on the given PHB

 * @phb: PCI controller

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

+0 −38
Original line number Diff line number Diff line
@@ -1133,43 +1133,6 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option) 
	return pnv_eeh_bridge_reset(bus->self, option);

}



/**

 * pnv_eeh_wait_state - Wait for PE state

 * @pe: EEH PE

 * @max_wait: maximal period in millisecond

 *

 * Wait for the state of associated PE. It might take some time

 * to retrieve the PE's state.

 */

static int pnv_eeh_wait_state(struct eeh_pe *pe, int max_wait)

{

	int ret;

	int mwait;



	while (1) {

		ret = pnv_eeh_get_state(pe, &mwait);



		/*

		 * If the PE's state is temporarily unavailable,

		 * we have to wait for the specified time. Otherwise,

		 * the PE's state will be returned immediately.

		 */

		if (ret != EEH_STATE_UNAVAILABLE)

			return ret;



		if (max_wait <= 0) {

			pr_warn("%s: Timeout getting PE#%x's state (%d)\n",

				__func__, pe->addr, max_wait);

			return EEH_STATE_NOT_SUPPORT;

		}



		max_wait -= mwait;

		msleep(mwait);

	}



	return EEH_STATE_NOT_SUPPORT;

}



/**

 * pnv_eeh_get_log - Retrieve error log

 * @pe: EEH PE
@@ -1688,7 +1651,6 @@ static struct eeh_ops pnv_eeh_ops = { 
	.get_pe_addr            = pnv_eeh_get_pe_addr,

	.get_state              = pnv_eeh_get_state,

	.reset                  = pnv_eeh_reset,

	.wait_state             = pnv_eeh_wait_state,

	.get_log                = pnv_eeh_get_log,

	.configure_bridge       = pnv_eeh_configure_bridge,

	.err_inject		= pnv_eeh_err_inject,

CRA Git | Maintained and supported by SUSTech CRA and CCSE