lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] powerpc: Use PE configuration address consistently

Browse Source 
236-eeh-config-addr.patch

The PE configuration address wasn't being cnsistently used in all locations
where a config address is called for.  This patch adds it to the places it
should have appeared in.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
(cherry picked from c2bc904a28095aca0b04a37854b63b78622a032e commit)
This commit is contained in:
Linas Vepstas
2005-11-03 18:54:39 -06:00
committed by Paul Mackerras
parent 821b537fd7
commit fcb7543e3d
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/platforms/pseries/eeh.c
View File

@@ -110,6 +110,7 @@ static DEFINE_PER_CPU(unsigned long, slot_resets);
void eeh_slot_error_detail (struct pci_dn *pdn, int severity) void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
{ {
int config_addr;
unsigned long flags; unsigned long flags;
int rc; int rc;
@@ -117,8 +118,13 @@ void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
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);
/* Use PE configuration address, if present */
config_addr = pdn->eeh_config_addr;
if (pdn->eeh_pe_config_addr)
config_addr = pdn->eeh_pe_config_addr;
rc = rtas_call(ibm_slot_error_detail, rc = rtas_call(ibm_slot_error_detail,
8, 1, NULL, pdn->eeh_config_addr, 8, 1, NULL, config_addr,
BUID_HI(pdn->phb->buid), BUID_HI(pdn->phb->buid),
BUID_LO(pdn->phb->buid), NULL, 0, BUID_LO(pdn->phb->buid), NULL, 0,
virt_to_phys(slot_errbuf), virt_to_phys(slot_errbuf),
@@ -138,6 +144,7 @@ void eeh_slot_error_detail (struct pci_dn *pdn, int severity)
static int read_slot_reset_state(struct pci_dn *pdn, int rets[]) static int read_slot_reset_state(struct pci_dn *pdn, int rets[])
{ {
int token, outputs; int token, outputs;
int config_addr;
if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) { if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) {
token = ibm_read_slot_reset_state2; token = ibm_read_slot_reset_state2;
@@ -148,7 +155,12 @@ static int read_slot_reset_state(struct pci_dn *pdn, int rets[])
outputs = 3; outputs = 3;
} }
return rtas_call(token, 3, outputs, rets, pdn->eeh_config_addr, /* Use PE configuration address, if present */
config_addr = pdn->eeh_config_addr;
if (pdn->eeh_pe_config_addr)
config_addr = pdn->eeh_pe_config_addr;
return rtas_call(token, 3, outputs, rets, config_addr,
BUID_HI(pdn->phb->buid), BUID_LO(pdn->phb->buid)); BUID_HI(pdn->phb->buid), BUID_LO(pdn->phb->buid));
} }
@@ -284,7 +296,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
return 0; return 0;
} }
if (!pdn->eeh_config_addr) { if (!pdn->eeh_config_addr && !pdn->eeh_pe_config_addr) {
__get_cpu_var(no_cfg_addr)++; __get_cpu_var(no_cfg_addr)++;
return 0; return 0;
} }
@@ -613,13 +625,20 @@ void eeh_save_bars(struct pci_dev * pdev, struct pci_dn *pdn)
void void
rtas_configure_bridge(struct pci_dn *pdn) rtas_configure_bridge(struct pci_dn *pdn)
{ {
int config_addr;
int token = rtas_token ("ibm,configure-bridge"); int token = rtas_token ("ibm,configure-bridge");
int rc; int rc;
if (token == RTAS_UNKNOWN_SERVICE) if (token == RTAS_UNKNOWN_SERVICE)
return; return;
/* Use PE configuration address, if present */
config_addr = pdn->eeh_config_addr;
if (pdn->eeh_pe_config_addr)
config_addr = pdn->eeh_pe_config_addr;
rc = rtas_call(token,3,1, NULL, rc = rtas_call(token,3,1, NULL,
pdn->eeh_config_addr, config_addr,
BUID_HI(pdn->phb->buid), BUID_HI(pdn->phb->buid),
BUID_LO(pdn->phb->buid)); BUID_LO(pdn->phb->buid));
if (rc) { if (rc) {