Commit 35d64734 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman

powerpc/eeh: Clean up PE addressing

When support for EEH on PowerNV was added a lot of pseries specific code
was made "generic" and some of the quirks of pseries EEH came along for the
ride. One of the stranger quirks is eeh_pe containing two types of PE
address: pe->addr and pe->config_addr. There reason for this appears to be
historical baggage rather than any real requirements.

On pseries EEH PEs are manipulated using RTAS calls. Each EEH RTAS call
takes a "PE configuration address" as an input which is used to identify
which EEH PE is being manipulated by the call. When initialising the EEH
state for a device the first thing we need to do is determine the
configuration address for the PE which contains the device so we can enable
EEH on that PE. This process is outlined in PAPR which is the modern
(i.e post-2003) FW specification for pseries. However, EEH support was
first described in the pSeries RISC Platform Architecture (RPA) and
although they are mostly compatible EEH is one of the areas where they are
not.

The major difference is that RPA doesn't actually have the concept of a PE.
On RPA systems the EEH RTAS calls are done on a per-device basis using the
same config_addr that would be passed to the RTAS functions to access PCI
config space (e.g. ibm,read-pci-config). The config_addr is not identical
since the function and config register offsets of the config_addr must be
set to zero. EEH operations being done on a per-device basis doesn't make a
whole lot of sense when you consider how EEH was implemented on legacy PCI
systems.

For legacy PCI(-X) systems EEH was implemented using special PCI-PCI
bridges which contained logic to detect errors and freeze the secondary
bus when one occurred. This means that the EEH enabled state is shared
among all devices behind that EEH bridge. As a result there's no way to
implement the per-device control required for the semantics specified by
RPA. It can be made to work if we assume that a separate EEH bridge exists
for each EEH capable PCI slot and there are no bridges behind those slots.
However, RPA also specifies the ibm,configure-bridge RTAS call for
re-initalising bridges behind EEH capable slots after they are reset due
to an EEH event so that is probably not a valid assumption. This
incoherence was fixed in later PAPR, which succeeded RPA. Unfortunately,
since Linux EEH support seems to have been implemented based on the RPA
spec some of the legacy assumptions were carried over (probably for POWER4
compatibility).

The fix made in PAPR was the introduction of the "PE" concept and
redefining the EEH RTAS calls (set-eeh-option, reset-slot, etc) to operate
on a per-PE basis so all devices behind an EEH bride would share the same
EEH state. The "config_addr" argument to the EEH RTAS calls became the
"PE_config_addr" and the OS was required to use the
ibm,get-config-addr-info RTAS call to find the correct PE address for the
device. When support for the new interfaces was added to Linux it was
implemented using something like:

At probe time:

	pdn->eeh_config_addr = rtas_config_addr(pdn);
	pdn->eeh_pe_config_addr = rtas_get_config_addr_info(pdn);

When performing an RTAS call:

	config_addr = pdn->eeh_config_addr;
	if (pdn->eeh_pe_config_addr)
		config_addr = pdn->eeh_pe_config_addr;

	rtas_call(..., config_addr, ...);

In other words, if the ibm,get-config-addr-info RTAS call is implemented
and returned a valid result we'd use that as the argument to the EEH
RTAS calls. If not, Linux would fall back to using the device's
config_addr. Over time these addresses have moved around going from pci_dn
to eeh_dev and finally into eeh_pe. Today the users look like this:

	config_addr = pe->config_addr;
	if (pe->addr)
		config_addr = pe->addr;

	rtas_call(..., config_addr, ...);

However, considering the EEH core always operates on a per-PE basis and
even on pseries the only per-device operation is the initial call to
ibm,set-eeh-option I'm not sure if any of this actually works on an RPA
system today. It doesn't make much sense to have the fallback address in
a generic structure either since the bulk of the code which reference it
is in pseries anyway.

The EEH core makes a token effort to support looking up a PE using the
config_addr by having two arguments to eeh_pe_get(). However, a survey of
all the callers to eeh_pe_get() shows that all bar one have the config_addr
argument hard-coded to zero.The only caller that doesn't is in
eeh_pe_tree_insert() which has:

	if (!eeh_has_flag(EEH_VALID_PE_ZERO) && !edev->pe_config_addr)
		return -EINVAL;

	pe = eeh_pe_get(hose, edev->pe_config_addr, edev->bdfn);

The third argument (config_addr) is only used if the second (pe->addr)
argument is invalid. The preceding check ensures that the call to
eeh_pe_get() will never happen if edev->pe_config_addr is invalid so there
is no situation where eeh_pe_get() will search for a PE based on the 3rd
argument. The check also means that we'll never insert a PE into the tree
where pe_config_addr is zero since EEH_VALID_PE_ZERO is never set on
pseries. All the users of the fallback address on pseries never actually
use the fallback and all the only caller that supplies something for the
config_addr argument to eeh_pe_get() never use it either. It's all dead
code.

This patch removes the fallback address from eeh_pe since nothing uses it.
Specificly, we do this by:

1) Removing pe->config_addr
2) Removing the EEH_VALID_PE_ZERO flag
3) Removing the fallback address argument to eeh_pe_get().
4) Removing all the checks for pe->addr being zero in the pseries EEH code.

This leaves us with PE's only being identified by what's in their pe->addr
field and the EEH core relying on the platform to ensure that eeh_dev's are
only inserted into the EEH tree if they're actually inside a PE.

No functional changes, I hope.
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/20200918093050.37344-9-oohall@gmail.com
parent 42de19d5
...@@ -27,7 +27,6 @@ struct pci_dn; ...@@ -27,7 +27,6 @@ struct pci_dn;
#define EEH_FORCE_DISABLED 0x02 /* EEH disabled */ #define EEH_FORCE_DISABLED 0x02 /* EEH disabled */
#define EEH_PROBE_MODE_DEV 0x04 /* From PCI device */ #define EEH_PROBE_MODE_DEV 0x04 /* From PCI device */
#define EEH_PROBE_MODE_DEVTREE 0x08 /* From device tree */ #define EEH_PROBE_MODE_DEVTREE 0x08 /* From device tree */
#define EEH_VALID_PE_ZERO 0x10 /* PE#0 is valid */
#define EEH_ENABLE_IO_FOR_LOG 0x20 /* Enable IO for log */ #define EEH_ENABLE_IO_FOR_LOG 0x20 /* Enable IO for log */
#define EEH_EARLY_DUMP_LOG 0x40 /* Dump log immediately */ #define EEH_EARLY_DUMP_LOG 0x40 /* Dump log immediately */
...@@ -280,8 +279,7 @@ int eeh_phb_pe_create(struct pci_controller *phb); ...@@ -280,8 +279,7 @@ int eeh_phb_pe_create(struct pci_controller *phb);
int eeh_wait_state(struct eeh_pe *pe, int max_wait); 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_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_next(struct eeh_pe *pe, struct eeh_pe *root);
struct eeh_pe *eeh_pe_get(struct pci_controller *phb, struct eeh_pe *eeh_pe_get(struct pci_controller *phb, int pe_no);
int pe_no, int config_addr);
int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent); int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent);
int eeh_pe_tree_remove(struct eeh_dev *edev); int eeh_pe_tree_remove(struct eeh_dev *edev);
void eeh_pe_update_time_stamp(struct eeh_pe *pe); void eeh_pe_update_time_stamp(struct eeh_pe *pe);
......
...@@ -1657,7 +1657,7 @@ static ssize_t eeh_force_recover_write(struct file *filp, ...@@ -1657,7 +1657,7 @@ static ssize_t eeh_force_recover_write(struct file *filp,
return -ENODEV; return -ENODEV;
/* Retrieve PE */ /* Retrieve PE */
pe = eeh_pe_get(hose, pe_no, 0); pe = eeh_pe_get(hose, pe_no);
if (!pe) if (!pe)
return -ENODEV; return -ENODEV;
......
...@@ -251,43 +251,21 @@ void eeh_pe_dev_traverse(struct eeh_pe *root, ...@@ -251,43 +251,21 @@ void eeh_pe_dev_traverse(struct eeh_pe *root,
/** /**
* __eeh_pe_get - Check the PE address * __eeh_pe_get - Check the PE address
* @data: EEH PE
* @flag: EEH device
* *
* For one particular PE, it can be identified by PE address * For one particular PE, it can be identified by PE address
* or tranditional BDF address. BDF address is composed of * or tranditional BDF address. BDF address is composed of
* Bus/Device/Function number. The extra data referred by flag * Bus/Device/Function number. The extra data referred by flag
* indicates which type of address should be used. * indicates which type of address should be used.
*/ */
struct eeh_pe_get_flag {
int pe_no;
int config_addr;
};
static void *__eeh_pe_get(struct eeh_pe *pe, void *flag) static void *__eeh_pe_get(struct eeh_pe *pe, void *flag)
{ {
struct eeh_pe_get_flag *tmp = (struct eeh_pe_get_flag *) flag; int *target_pe = flag;
/* Unexpected PHB PE */ /* PHB PEs are special and should be ignored */
if (pe->type & EEH_PE_PHB) if (pe->type & EEH_PE_PHB)
return NULL; return NULL;
/* if (*target_pe == pe->addr)
* We prefer PE address. For most cases, we should
* have non-zero PE address
*/
if (eeh_has_flag(EEH_VALID_PE_ZERO)) {
if (tmp->pe_no == pe->addr)
return pe;
} else {
if (tmp->pe_no &&
(tmp->pe_no == pe->addr))
return pe;
}
/* Try BDF address */
if (tmp->config_addr &&
(tmp->config_addr == pe->config_addr))
return pe; return pe;
return NULL; return NULL;
...@@ -297,7 +275,6 @@ static void *__eeh_pe_get(struct eeh_pe *pe, void *flag) ...@@ -297,7 +275,6 @@ static void *__eeh_pe_get(struct eeh_pe *pe, void *flag)
* eeh_pe_get - Search PE based on the given address * eeh_pe_get - Search PE based on the given address
* @phb: PCI controller * @phb: PCI controller
* @pe_no: PE number * @pe_no: PE number
* @config_addr: Config address
* *
* Search the corresponding PE based on the specified address which * Search the corresponding PE based on the specified address which
* is included in the eeh device. The function is used to check if * is included in the eeh device. The function is used to check if
...@@ -306,16 +283,11 @@ static void *__eeh_pe_get(struct eeh_pe *pe, void *flag) ...@@ -306,16 +283,11 @@ static void *__eeh_pe_get(struct eeh_pe *pe, void *flag)
* which is composed of PCI bus/device/function number, or unified * which is composed of PCI bus/device/function number, or unified
* PE address. * PE address.
*/ */
struct eeh_pe *eeh_pe_get(struct pci_controller *phb, struct eeh_pe *eeh_pe_get(struct pci_controller *phb, int pe_no)
int pe_no, int config_addr)
{ {
struct eeh_pe *root = eeh_phb_pe_get(phb); struct eeh_pe *root = eeh_phb_pe_get(phb);
struct eeh_pe_get_flag tmp = { pe_no, config_addr };
struct eeh_pe *pe;
pe = eeh_pe_traverse(root, __eeh_pe_get, &tmp);
return pe; return eeh_pe_traverse(root, __eeh_pe_get, &pe_no);
} }
/** /**
...@@ -336,19 +308,13 @@ int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent) ...@@ -336,19 +308,13 @@ int eeh_pe_tree_insert(struct eeh_dev *edev, struct eeh_pe *new_pe_parent)
struct pci_controller *hose = edev->controller; struct pci_controller *hose = edev->controller;
struct eeh_pe *pe, *parent; struct eeh_pe *pe, *parent;
/* Check if the PE number is valid */
if (!eeh_has_flag(EEH_VALID_PE_ZERO) && !edev->pe_config_addr) {
eeh_edev_err(edev, "PE#0 is invalid for this PHB!\n");
return -EINVAL;
}
/* /*
* Search the PE has been existing or not according * Search the PE has been existing or not according
* to the PE address. If that has been existing, the * to the PE address. If that has been existing, the
* PE should be composed of PCI bus and its subordinate * PE should be composed of PCI bus and its subordinate
* components. * components.
*/ */
pe = eeh_pe_get(hose, edev->pe_config_addr, edev->bdfn); pe = eeh_pe_get(hose, edev->pe_config_addr);
if (pe) { if (pe) {
if (pe->type & EEH_PE_INVALID) { if (pe->type & EEH_PE_INVALID) {
list_add_tail(&edev->entry, &pe->edevs); list_add_tail(&edev->entry, &pe->edevs);
......
...@@ -87,7 +87,7 @@ static ssize_t pnv_eeh_ei_write(struct file *filp, ...@@ -87,7 +87,7 @@ static ssize_t pnv_eeh_ei_write(struct file *filp,
return -EINVAL; return -EINVAL;
/* Retrieve PE */ /* Retrieve PE */
pe = eeh_pe_get(hose, pe_no, 0); pe = eeh_pe_get(hose, pe_no);
if (!pe) if (!pe)
return -ENODEV; return -ENODEV;
...@@ -306,7 +306,7 @@ static struct eeh_pe *pnv_eeh_get_upstream_pe(struct pci_dev *pdev) ...@@ -306,7 +306,7 @@ static struct eeh_pe *pnv_eeh_get_upstream_pe(struct pci_dev *pdev)
if (parent) { if (parent) {
struct pnv_ioda_pe *ioda_pe = pnv_ioda_get_pe(parent); struct pnv_ioda_pe *ioda_pe = pnv_ioda_get_pe(parent);
return eeh_pe_get(phb->hose, ioda_pe->pe_number, 0); return eeh_pe_get(phb->hose, ioda_pe->pe_number);
} }
return NULL; return NULL;
...@@ -1358,7 +1358,7 @@ static int pnv_eeh_get_pe(struct pci_controller *hose, ...@@ -1358,7 +1358,7 @@ static int pnv_eeh_get_pe(struct pci_controller *hose,
} }
/* Find the PE according to PE# */ /* Find the PE according to PE# */
dev_pe = eeh_pe_get(hose, pe_no, 0); dev_pe = eeh_pe_get(hose, pe_no);
if (!dev_pe) if (!dev_pe)
return -EEXIST; return -EEXIST;
...@@ -1693,16 +1693,6 @@ static int __init eeh_powernv_init(void) ...@@ -1693,16 +1693,6 @@ static int __init eeh_powernv_init(void)
if (phb->diag_data_size > max_diag_size) if (phb->diag_data_size > max_diag_size)
max_diag_size = phb->diag_data_size; max_diag_size = phb->diag_data_size;
/*
* PE#0 should be regarded as valid by EEH core
* if it's not the reserved one. Currently, we
* have the reserved PE#255 and PE#127 for PHB3
* and P7IOC separately. So we should regard
* PE#0 as valid for PHB3 and P7IOC.
*/
if (phb->ioda.reserved_pe_idx != 0)
eeh_add_flag(EEH_VALID_PE_ZERO);
break; break;
} }
......
...@@ -509,7 +509,6 @@ EXPORT_SYMBOL_GPL(pseries_eeh_init_edev_recursive); ...@@ -509,7 +509,6 @@ EXPORT_SYMBOL_GPL(pseries_eeh_init_edev_recursive);
static int pseries_eeh_set_option(struct eeh_pe *pe, int option) static int pseries_eeh_set_option(struct eeh_pe *pe, int option)
{ {
int ret = 0; int ret = 0;
int config_addr;
/* /*
* When we're enabling or disabling EEH functioality on * When we're enabling or disabling EEH functioality on
...@@ -522,9 +521,6 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option) ...@@ -522,9 +521,6 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option)
case EEH_OPT_ENABLE: case EEH_OPT_ENABLE:
case EEH_OPT_THAW_MMIO: case EEH_OPT_THAW_MMIO:
case EEH_OPT_THAW_DMA: case EEH_OPT_THAW_DMA:
config_addr = pe->config_addr;
if (pe->addr)
config_addr = pe->addr;
break; break;
case EEH_OPT_FREEZE_PE: case EEH_OPT_FREEZE_PE:
/* Not support */ /* Not support */
...@@ -535,7 +531,7 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option) ...@@ -535,7 +531,7 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option)
} }
ret = rtas_call(ibm_set_eeh_option, 4, 1, NULL, ret = rtas_call(ibm_set_eeh_option, 4, 1, NULL,
config_addr, BUID_HI(pe->phb->buid), pe->addr, BUID_HI(pe->phb->buid),
BUID_LO(pe->phb->buid), option); BUID_LO(pe->phb->buid), option);
return ret; return ret;
...@@ -556,25 +552,19 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option) ...@@ -556,25 +552,19 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option)
*/ */
static int pseries_eeh_get_state(struct eeh_pe *pe, int *delay) static int pseries_eeh_get_state(struct eeh_pe *pe, int *delay)
{ {
int config_addr;
int ret; int ret;
int rets[4]; int rets[4];
int result; int result;
/* Figure out PE config address if possible */
config_addr = pe->config_addr;
if (pe->addr)
config_addr = pe->addr;
if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) { if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) {
ret = rtas_call(ibm_read_slot_reset_state2, 3, 4, rets, ret = rtas_call(ibm_read_slot_reset_state2, 3, 4, rets,
config_addr, BUID_HI(pe->phb->buid), pe->addr, BUID_HI(pe->phb->buid),
BUID_LO(pe->phb->buid)); BUID_LO(pe->phb->buid));
} else if (ibm_read_slot_reset_state != RTAS_UNKNOWN_SERVICE) { } else if (ibm_read_slot_reset_state != RTAS_UNKNOWN_SERVICE) {
/* Fake PE unavailable info */ /* Fake PE unavailable info */
rets[2] = 0; rets[2] = 0;
ret = rtas_call(ibm_read_slot_reset_state, 3, 3, rets, ret = rtas_call(ibm_read_slot_reset_state, 3, 3, rets,
config_addr, BUID_HI(pe->phb->buid), pe->addr, BUID_HI(pe->phb->buid),
BUID_LO(pe->phb->buid)); BUID_LO(pe->phb->buid));
} else { } else {
return EEH_STATE_NOT_SUPPORT; return EEH_STATE_NOT_SUPPORT;
...@@ -628,14 +618,7 @@ static int pseries_eeh_get_state(struct eeh_pe *pe, int *delay) ...@@ -628,14 +618,7 @@ static int pseries_eeh_get_state(struct eeh_pe *pe, int *delay)
*/ */
static int pseries_eeh_reset(struct eeh_pe *pe, int option) static int pseries_eeh_reset(struct eeh_pe *pe, int option)
{ {
int config_addr; return pseries_eeh_phb_reset(pe->phb, pe->addr, option);
/* Figure out PE address */
config_addr = pe->config_addr;
if (pe->addr)
config_addr = pe->addr;
return pseries_eeh_phb_reset(pe->phb, config_addr, option);
} }
/** /**
...@@ -651,19 +634,13 @@ static int pseries_eeh_reset(struct eeh_pe *pe, int option) ...@@ -651,19 +634,13 @@ static int pseries_eeh_reset(struct eeh_pe *pe, int option)
*/ */
static int pseries_eeh_get_log(struct eeh_pe *pe, int severity, char *drv_log, unsigned long len) static int pseries_eeh_get_log(struct eeh_pe *pe, int severity, char *drv_log, unsigned long len)
{ {
int config_addr;
unsigned long flags; unsigned long flags;
int ret; int ret;
spin_lock_irqsave(&slot_errbuf_lock, flags); spin_lock_irqsave(&slot_errbuf_lock, flags);
memset(slot_errbuf, 0, eeh_error_buf_size); memset(slot_errbuf, 0, eeh_error_buf_size);
/* Figure out the PE address */ ret = rtas_call(ibm_slot_error_detail, 8, 1, NULL, pe->addr,
config_addr = pe->config_addr;
if (pe->addr)
config_addr = pe->addr;
ret = rtas_call(ibm_slot_error_detail, 8, 1, NULL, config_addr,
BUID_HI(pe->phb->buid), BUID_LO(pe->phb->buid), BUID_HI(pe->phb->buid), BUID_LO(pe->phb->buid),
virt_to_phys(drv_log), len, virt_to_phys(drv_log), len,
virt_to_phys(slot_errbuf), eeh_error_buf_size, virt_to_phys(slot_errbuf), eeh_error_buf_size,
...@@ -682,14 +659,7 @@ static int pseries_eeh_get_log(struct eeh_pe *pe, int severity, char *drv_log, u ...@@ -682,14 +659,7 @@ static int pseries_eeh_get_log(struct eeh_pe *pe, int severity, char *drv_log, u
*/ */
static int pseries_eeh_configure_bridge(struct eeh_pe *pe) static int pseries_eeh_configure_bridge(struct eeh_pe *pe)
{ {
int config_addr; return pseries_eeh_phb_configure_bridge(pe->phb, pe->addr);
/* Figure out the PE address */
config_addr = pe->config_addr;
if (pe->addr)
config_addr = pe->addr;
return pseries_eeh_phb_configure_bridge(pe->phb, config_addr);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment