| Message ID | 20190715085612.8802-4-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4107248c5615ab20b64073f2dd5917b3961239dc |
| Headers | show |
| Series | [1/5] powerpc/eeh_cache: Don't use pci_dn when inserting new ranges | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (f5c20693d8edcd665f1159dc941b9e7f87c17647) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
On Mon, Jul 15, 2019 at 06:56:10PM +1000, Oliver O'Halloran wrote: > There are several EEH sysfs properties that only exists when the > "ibm,is-open-sriov-pf" property appears in the device tree node of the PCI > device. This used on pseries to indicate to the guest that the hypervisor > allows the guest to configure the SR-IOV capability. Doing this requires > some handshaking between the guest, hypervisor and userspace when a VF is > EEH frozen which is why these properties exist. > > This is all dead code on non-pseries platforms so wrap it in an #ifdef > CONFIG_PPC_PSERIES to make the dependency clearer. Looks good and a test compile without pSeries platform support configured seemed to work, so: Tested-by: Sam Bobroff <sbobroff@linux.ibm.com> Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com> > > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> > --- > arch/powerpc/kernel/eeh_sysfs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c > index 6a2c2886f..3adf8cd 100644 > --- a/arch/powerpc/kernel/eeh_sysfs.c > +++ b/arch/powerpc/kernel/eeh_sysfs.c > @@ -91,7 +91,7 @@ static ssize_t eeh_pe_state_store(struct device *dev, > > static DEVICE_ATTR_RW(eeh_pe_state); > > -#ifdef CONFIG_PCI_IOV > +#if defined(CONFIG_PCI_IOV) && defined(CONFIG_PPC_PSERIES) > static ssize_t eeh_notify_resume_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > @@ -148,7 +148,7 @@ static void eeh_notify_resume_remove(struct pci_dev *pdev) > #else > static inline int eeh_notify_resume_add(struct pci_dev *pdev) { return 0; } > static inline void eeh_notify_resume_remove(struct pci_dev *pdev) { } > -#endif /* CONFIG_PCI_IOV */ > +#endif /* CONFIG_PCI_IOV && CONFIG PPC_PSERIES*/ > > void eeh_sysfs_add_device(struct pci_dev *pdev) > { > -- > 2.9.5 >
diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c index 6a2c2886f..3adf8cd 100644 --- a/arch/powerpc/kernel/eeh_sysfs.c +++ b/arch/powerpc/kernel/eeh_sysfs.c @@ -91,7 +91,7 @@ static ssize_t eeh_pe_state_store(struct device *dev, static DEVICE_ATTR_RW(eeh_pe_state); -#ifdef CONFIG_PCI_IOV +#if defined(CONFIG_PCI_IOV) && defined(CONFIG_PPC_PSERIES) static ssize_t eeh_notify_resume_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -148,7 +148,7 @@ static void eeh_notify_resume_remove(struct pci_dev *pdev) #else static inline int eeh_notify_resume_add(struct pci_dev *pdev) { return 0; } static inline void eeh_notify_resume_remove(struct pci_dev *pdev) { } -#endif /* CONFIG_PCI_IOV */ +#endif /* CONFIG_PCI_IOV && CONFIG PPC_PSERIES*/ void eeh_sysfs_add_device(struct pci_dev *pdev) {
There are several EEH sysfs properties that only exists when the "ibm,is-open-sriov-pf" property appears in the device tree node of the PCI device. This used on pseries to indicate to the guest that the hypervisor allows the guest to configure the SR-IOV capability. Doing this requires some handshaking between the guest, hypervisor and userspace when a VF is EEH frozen which is why these properties exist. This is all dead code on non-pseries platforms so wrap it in an #ifdef CONFIG_PPC_PSERIES to make the dependency clearer. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/kernel/eeh_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)