Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] powerpc: set up the RTAS token just like the rest of them.

Browse Source 
237-eeh-bridge-token.patch

Minor: the rtas-bridge token should be set up the same way that all
the other rtas tokens are set up.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
(cherry picked from 78379b6c5fc17b6666c40b05988e6708e98479c0 commit)
This commit is contained in:
Linas Vepstas 2005-11-03 18:54:47 -06:00 committed by Paul Mackerras
parent fcb7543e3d
commit 21e464dd7c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ static int ibm_read_slot_reset_state;
static int ibm_read_slot_reset_state2; static int ibm_read_slot_reset_state2;
static int ibm_slot_error_detail; static int ibm_slot_error_detail;
static int ibm_get_config_addr_info; static int ibm_get_config_addr_info;
static int ibm_configure_bridge;
int eeh_subsystem_enabled; int eeh_subsystem_enabled;
EXPORT_SYMBOL(eeh_subsystem_enabled); EXPORT_SYMBOL(eeh_subsystem_enabled);
@ -626,18 +627,14 @@ void
rtas_configure_bridge(struct pci_dn *pdn) rtas_configure_bridge(struct pci_dn *pdn)
{ {
int config_addr; int config_addr;
int token = rtas_token ("ibm,configure-bridge");
int rc; int rc;
if (token == RTAS_UNKNOWN_SERVICE)
return;
/* Use PE configuration address, if present */ /* Use PE configuration address, if present */
config_addr = pdn->eeh_config_addr; config_addr = pdn->eeh_config_addr;
if (pdn->eeh_pe_config_addr) if (pdn->eeh_pe_config_addr)
config_addr = pdn->eeh_pe_config_addr; config_addr = pdn->eeh_pe_config_addr;
rc = rtas_call(token,3,1, NULL, rc = rtas_call(ibm_configure_bridge,3,1, NULL,
config_addr, config_addr,
BUID_HI(pdn->phb->buid), BUID_HI(pdn->phb->buid),
BUID_LO(pdn->phb->buid)); BUID_LO(pdn->phb->buid));
@ -789,6 +786,7 @@ void __init eeh_init(void)
ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state"); ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
ibm_slot_error_detail = rtas_token("ibm,slot-error-detail"); ibm_slot_error_detail = rtas_token("ibm,slot-error-detail");
ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info"); ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
ibm_configure_bridge = rtas_token ("ibm,configure-bridge");
if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE) if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE)
return; return;