| Message ID | 1412044750-24460-2-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 940376b3a463303787c6227c0327612653bf5600 |
| Headers | show |
On Tue, 2014-30-09 at 02:38:51 UTC, Gavin Shan wrote: > diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c > index e2595ba..eb15be4 100644 > --- a/arch/powerpc/kernel/eeh_sysfs.c > +++ b/arch/powerpc/kernel/eeh_sysfs.c > @@ -54,6 +54,62 @@ 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 -ENODEV; > + > + state = eeh_ops->get_state(edev->pe, NULL); > + return sprintf(buf, "%08x %08x\n", > + state, edev->pe->state); Looking at all the other eeh sysfs files, they all use 0x%x. Which makes it much clearer when you're looking at the file in userspace that the content is hex. Please send an incremental patch to change the format to 0x%08x, unless there's a good reason not to. cheers
On Wed, Oct 01, 2014 at 01:43:43PM +1000, Michael Ellerman wrote: >On Tue, 2014-30-09 at 02:38:51 UTC, Gavin Shan wrote: >> diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c >> index e2595ba..eb15be4 100644 >> --- a/arch/powerpc/kernel/eeh_sysfs.c >> +++ b/arch/powerpc/kernel/eeh_sysfs.c >> @@ -54,6 +54,62 @@ 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 -ENODEV; >> + >> + state = eeh_ops->get_state(edev->pe, NULL); >> + return sprintf(buf, "%08x %08x\n", >> + state, edev->pe->state); > >Looking at all the other eeh sysfs files, they all use 0x%x. Which makes it >much clearer when you're looking at the file in userspace that the content is >hex. > >Please send an incremental patch to change the format to 0x%08x, unless there's >a good reason not to. > Agree and will do :) Thanks, Gavin >cheers >
diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c index e2595ba..eb15be4 100644 --- a/arch/powerpc/kernel/eeh_sysfs.c +++ b/arch/powerpc/kernel/eeh_sysfs.c @@ -54,6 +54,62 @@ 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 -ENODEV; + + state = eeh_ops->get_state(edev->pe, NULL); + return sprintf(buf, "%08x %08x\n", + state, edev->pe->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 -ENODEV; + + /* Nothing to do if it's not frozen */ + if (!(edev->pe->state & EEH_PE_ISOLATED)) + return count; + + /* 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 -EIO; + } + + /* 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 -EIO; + } + + /* Clear software state */ + eeh_pe_state_clear(edev->pe, EEH_PE_ISOLATED); + + return count; +} + +static DEVICE_ATTR_RW(eeh_pe_state); + void eeh_sysfs_add_device(struct pci_dev *pdev) { struct eeh_dev *edev = pci_dev_to_eeh_dev(pdev); @@ -68,9 +124,10 @@ void eeh_sysfs_add_device(struct pci_dev *pdev) rc += device_create_file(&pdev->dev, &dev_attr_eeh_mode); rc += device_create_file(&pdev->dev, &dev_attr_eeh_config_addr); rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_config_addr); + rc += device_create_file(&pdev->dev, &dev_attr_eeh_pe_state); if (rc) - printk(KERN_WARNING "EEH: Unable to create sysfs entries\n"); + pr_warn("EEH: Unable to create sysfs entries\n"); else if (edev) edev->mode |= EEH_DEV_SYSFS; } @@ -92,6 +149,7 @@ void eeh_sysfs_remove_device(struct pci_dev *pdev) device_remove_file(&pdev->dev, &dev_attr_eeh_mode); device_remove_file(&pdev->dev, &dev_attr_eeh_config_addr); device_remove_file(&pdev->dev, &dev_attr_eeh_pe_config_addr); + device_remove_file(&pdev->dev, &dev_attr_eeh_pe_state); if (edev) edev->mode &= ~EEH_DEV_SYSFS;
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. The patch also replaces printk(KERN_WARNING ...) with pr_warn() in eeh_sysfs.c Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- v2: Not output PE number and return error from the sysfs entry if necessary --- arch/powerpc/kernel/eeh_sysfs.c | 60 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)