From: Gavin Shan <gwshan@linux•vnet.ibm.com>
To: Russell Currey <ruscur@russell•cc>
Cc: linuxppc-dev@lists•ozlabs.org
Subject: Re: [PATCH V2 1/2] pseries/eeh: Refactor the configure bridge RTAS tokens
Date: Tue, 29 Mar 2016 16:26:09 +1100 [thread overview]
Message-ID: <20160329052608.GA2614@gwshan> (raw)
In-Reply-To: <1459219911-14110-1-git-send-email-ruscur@russell.cc>
On Tue, Mar 29, 2016 at 12:51:50PM +1000, Russell Currey wrote:
>The RTAS calls configure-pe and configure-bridge perform the same
>actions, however the former can skip configuration if unnecessary. The
>existing code treats them as different tokens even though only one will
>ever be called. Refactor this by making a single token that is assigned
>during init.
>
>Cc: <stable@vger•kernel.org> # 3.10-
>Signed-off-by: Russell Currey <ruscur@russell•cc>
>---
> arch/powerpc/platforms/pseries/eeh_pseries.c | 27 +++++++++++----------------
> 1 file changed, 11 insertions(+), 16 deletions(-)
>
>diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
>index ac3ffd9..231b1df 100644
>--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
>+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
>@@ -53,7 +53,6 @@ static int ibm_read_slot_reset_state2;
> static int ibm_slot_error_detail;
> static int ibm_get_config_addr_info;
> static int ibm_get_config_addr_info2;
>-static int ibm_configure_bridge;
> static int ibm_configure_pe;
>
> /*
>@@ -81,7 +80,13 @@ static int pseries_eeh_init(void)
> ibm_get_config_addr_info2 = rtas_token("ibm,get-config-addr-info2");
> ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
> ibm_configure_pe = rtas_token("ibm,configure-pe");
>- ibm_configure_bridge = rtas_token("ibm,configure-bridge");
>+
>+ /*
>+ * configure-pe and configure-bridge perform the same actions, however
>+ * the former is preferred as it can skip configuration if unnecessary.
>+ */
>+ if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE)
>+ ibm_configure_pe = rtas_token("ibm,configure-bridge");
>
> /*
> * Necessary sanity check. We needn't check "get-config-addr-info"
>@@ -93,8 +98,7 @@ static int pseries_eeh_init(void)
> (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE &&
> ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) ||
> ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE ||
>- (ibm_configure_pe == RTAS_UNKNOWN_SERVICE &&
>- ibm_configure_bridge == RTAS_UNKNOWN_SERVICE)) {
>+ ibm_configure_pe == RTAS_UNKNOWN_SERVICE) {
> pr_info("EEH functionality not supported\n");
> return -EINVAL;
> }
Since you're here, you can do similar thing to @ibm_read_slot_reset_state
and @ibm_read_slot_reset_state?
>@@ -621,18 +625,9 @@ static int pseries_eeh_configure_bridge(struct eeh_pe *pe)
> if (pe->addr)
> config_addr = pe->addr;
>
>- /* Use new configure-pe function, if supported */
>- if (ibm_configure_pe != RTAS_UNKNOWN_SERVICE) {
>- ret = rtas_call(ibm_configure_pe, 3, 1, NULL,
>- config_addr, BUID_HI(pe->phb->buid),
>- BUID_LO(pe->phb->buid));
>- } else if (ibm_configure_bridge != RTAS_UNKNOWN_SERVICE) {
>- ret = rtas_call(ibm_configure_bridge, 3, 1, NULL,
>- config_addr, BUID_HI(pe->phb->buid),
>- BUID_LO(pe->phb->buid));
>- } else {
>- return -EFAULT;
>- }
>+ ret = rtas_call(ibm_configure_pe, 3, 1, NULL,
>+ config_addr, BUID_HI(pe->phb->buid),
>+ BUID_LO(pe->phb->buid));
>
Russell, it seems not working if "ibm,configure-pe" and "ibm,configure-bridge" are all
missed from "/rtas". Also, I don't think we need backport it to 3.10+ as it's not fixing
any bugs if I'm correct enough.
Thanks,
Gavin
> if (ret)
> pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",
>--
>2.7.4
>
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev@lists•ozlabs.org
>https://lists.ozlabs.org/listinfo/linuxppc-dev
next prev parent reply other threads:[~2016-03-29 5:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 2:51 [PATCH V2 1/2] pseries/eeh: Refactor the configure bridge RTAS tokens Russell Currey
2016-03-29 2:51 ` [PATCH V2 2/2] pseries/eeh: Handle RTAS delay requests in configure_bridge Russell Currey
2016-03-29 9:49 ` Gavin Shan
2016-03-29 22:01 ` Russell Currey
2016-03-29 23:07 ` Gavin Shan
2016-03-29 15:51 ` Tyrel Datwyler
2016-03-29 21:58 ` Russell Currey
2016-03-29 5:26 ` Gavin Shan [this message]
2016-03-29 5:53 ` [PATCH V2 1/2] pseries/eeh: Refactor the configure bridge RTAS tokens Russell Currey
2016-03-29 9:26 ` Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160329052608.GA2614@gwshan \
--to=gwshan@linux$(echo .)vnet.ibm.com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=ruscur@russell$(echo .)cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox