From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org, Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: Re: [2/5] powerpc/eeh: Add eeh_pe_state sysfs entry
Date: Thu, 25 Sep 2014 14:47:54 +1000 [thread overview]
Message-ID: <20140925044754.GA11163@shangw> (raw)
In-Reply-To: <20140925040958.4D2C414016A@ozlabs.org>
On Thu, Sep 25, 2014 at 02:09:58PM +1000, Michael Ellerman wrote:
>On Sun, 2014-17-08 at 03:02:26 UTC, Gavin Shan wrote:
>> The patch adds sysfs entry "eeh_pe_state". Reading on it returns
>> the PE's state while writing to it clears the frozen state. It's
>> used to check or clear the PE frozen state from userland for
>> debugging purpose.
>>
>> diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c
>> index e2595ba..e69bcbb 100644
>> --- a/arch/powerpc/kernel/eeh_sysfs.c
>> +++ b/arch/powerpc/kernel/eeh_sysfs.c
>> @@ -54,6 +54,63 @@ EEH_SHOW_ATTR(eeh_mode, mode, "0x%x");
>> EEH_SHOW_ATTR(eeh_config_addr, config_addr, "0x%x");
>> EEH_SHOW_ATTR(eeh_pe_config_addr, pe_config_addr, "0x%x");
>>
>> +static ssize_t eeh_pe_state_show(struct device *dev,
>> + struct device_attribute *attr, char *buf)
>> +{
>> + struct pci_dev *pdev = to_pci_dev(dev);
>> + struct eeh_dev *edev = pci_dev_to_eeh_dev(pdev);
>> + int state;
>> +
>> + if (!edev || !edev->pe)
>> + return 0;
>> +
>> + state = eeh_ops->get_state(edev->pe, NULL);
>> + return sprintf(buf, "PHB#%d-PE#%d: 0x%08x 0x%08x\n",
>> + edev->pe->phb->global_number,
>> + edev->pe->addr, state, edev->pe->state);
>
>Shouldn't this only display the state, ie not the number and addr etc.
>
Yes, I'll remove PHB#%d-PE#%d in next revision. Another sysfs entry
gives the PE number: /sys/bus/pci/devices/xxxx:xx:xx.x/eeh_pe_config_addr
>And why are there two states, state and edev->pe->state ?
>
state is from hardware, edev->pe->state is software maintained state.
>> +static ssize_t eeh_pe_state_store(struct device *dev,
>> + struct device_attribute *attr,
>> + const char *buf, size_t count)
>> +{
>> + struct pci_dev *pdev = to_pci_dev(dev);
>> + struct eeh_dev *edev = pci_dev_to_eeh_dev(pdev);
>> + int ret;
>> +
>> + if (!edev || !edev->pe)
>> + return 0;
>
>Shouldn't that be an error?
>
>> + /* Nothing to do if it's not frozen */
>> + if (!(edev->pe->state & EEH_PE_ISOLATED))
>> + return 0;
>> +
>> + /* Enable MMIO */
>> + ret = eeh_pci_enable(edev->pe, EEH_OPT_THAW_MMIO);
>> + if (ret) {
>> + pr_warn("%s: Failure %d enabling MMIO for PHB#%d-PE#%d\n",
>> + __func__, ret, edev->pe->phb->global_number,
>> + edev->pe->addr);
>> + return 0;
>
>Error ?
>
>> + }
>> +
>> + /* Enable DMA */
>> + ret = eeh_pci_enable(edev->pe, EEH_OPT_THAW_DMA);
>> + if (ret) {
>> + pr_warn("%s: Failure %d enabling DMA for PHB#%d-PE#%d\n",
>> + __func__, ret, edev->pe->phb->global_number,
>> + edev->pe->addr);
>> + return 0;
>
>Error?
>
Yes, I'll fix all "Error" cases.
>And should it roll back, ie. unthaw MMIO?
>
It's not necessary as it's only for debugging purpose. The main
purpose is to keep dumping the PE hardware/software state when
recovering one specific PE.
Thanks,
Gavin
next prev parent reply other threads:[~2014-09-25 4:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-17 3:02 [PATCH 0/5] powerpc: EEH fixes Gavin Shan
2014-08-17 3:02 ` [PATCH 1/5] powerpc/eeh: Drop unused argument in eeh_check_failure() Gavin Shan
2014-08-17 3:02 ` [PATCH 2/5] powerpc/eeh: Add eeh_pe_state sysfs entry Gavin Shan
2014-09-25 4:09 ` [2/5] " Michael Ellerman
2014-09-25 4:47 ` Gavin Shan [this message]
2014-08-17 3:02 ` [PATCH 3/5] powerpc/eeh: Freeze PE before PE reset Gavin Shan
2014-08-17 3:02 ` [PATCH 4/5] powerpc/eeh: Reenable PCI devices after reset Gavin Shan
2014-08-17 3:02 ` [PATCH 5/5] powerpc/eeh: Clear frozen state on passing device 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=20140925044754.GA11163@shangw \
--to=gwshan@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).