| Message ID | 1430723258-21299-7-git-send-email-weiyang@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, May 04, 2015 at 03:07:35PM +0800, Wei Yang wrote: Please order this patch and PATCH[5] because EEH device is expected to be created before EEH PE. >EEH on powerpc platform needs eeh_dev structure to track the pci device ^^^ PCI >status. Since VFs are created/released dynamically, VF's eeh_dev is also >dynamically created/released in system. > >This patch creates/removes eeh_dev when pci_dn is created/removed for VFs, >and marks it with EEH_DEV_VF type. > >Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> >--- > arch/powerpc/include/asm/eeh.h | 7 +++++++ > arch/powerpc/kernel/eeh.c | 4 ++++ > arch/powerpc/kernel/eeh_dev.c | 20 ++++++++++++++++++++ > arch/powerpc/kernel/pci_dn.c | 7 +++++++ > 4 files changed, 38 insertions(+) > >diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h >index 56e8cd9..2067de4 100644 >--- a/arch/powerpc/include/asm/eeh.h >+++ b/arch/powerpc/include/asm/eeh.h >@@ -124,6 +124,7 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe) > #define EEH_DEV_NO_HANDLER (1 << 8) /* No error handler */ > #define EEH_DEV_SYSFS (1 << 9) /* Sysfs created */ > #define EEH_DEV_REMOVED (1 << 10) /* Removed permanently */ >+#define EEH_DEV_VF (1 << 11) /* VF port */ > Why you need this flag? I guess "edev->physfn" can be used to distinguish it's a normal or VF eeh_dev. > struct eeh_dev { > int mode; /* EEH mode */ >@@ -139,6 +140,9 @@ struct eeh_dev { > struct pci_controller *phb; /* Associated PHB */ > struct pci_dn *pdn; /* Associated PCI device node */ > struct pci_dev *pdev; /* Associated PCI device */ >+#ifdef CONFIG_PCI_IOV >+ struct pci_dev *physfn; /* Associated PF PORT */ >+#endif /* CONFIG_PCI_IOV */ > struct pci_bus *bus; /* PCI bus for partial hotplug */ > }; > >@@ -273,6 +277,7 @@ const char *eeh_pe_loc_get(struct eeh_pe *pe); > struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe); > > void *eeh_dev_init(struct pci_dn *pdn, void *data); >+void eeh_dev_remove(struct pci_dn *pdn); > void eeh_dev_phb_init_dynamic(struct pci_controller *phb); > int eeh_init(void); > int __init eeh_ops_register(struct eeh_ops *ops); >@@ -328,6 +333,8 @@ static inline void *eeh_dev_init(struct pci_dn *pdn, void *data) > return NULL; > } > >+void eeh_dev_remove(struct pci_dn *pdn) { } >+ > static inline void eeh_dev_phb_init_dynamic(struct pci_controller *phb) { } > > static inline int eeh_check_failure(const volatile void __iomem *token) >diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c >index 6c7ce1b..221e280 100644 >--- a/arch/powerpc/kernel/eeh.c >+++ b/arch/powerpc/kernel/eeh.c >@@ -1135,6 +1135,10 @@ void eeh_add_device_late(struct pci_dev *dev) > } > > edev->pdev = dev; >+#ifdef CONFIG_PCI_IOV >+ if (dev->is_virtfn) >+ edev->physfn = dev->physfn; >+#endif > dev->dev.archdata.edev = edev; > > if (eeh_has_flag(EEH_PROBE_MODE_DEV)) >diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c >index aabba94..ab88e61 100644 >--- a/arch/powerpc/kernel/eeh_dev.c >+++ b/arch/powerpc/kernel/eeh_dev.c >@@ -72,6 +72,26 @@ void *eeh_dev_init(struct pci_dn *pdn, void *data) > } > > /** >+ * eeh_dev_remove - Release EEH device according to OF node >+ * @pdn: PCI device node >+ */ >+void eeh_dev_remove(struct pci_dn *pdn) >+{ >+ struct eeh_dev *edev; >+ >+ if (!pdn) >+ return; >+ >+ edev = pdn_to_eeh_dev(pdn); >+ if(!edev) >+ return; >+ You don't have to have the check "if (!pdn)" here because edev should be NULL if pdn is NULL, which is covered by pdn_to_eeh_dev(). struct eeh_dev *edev = pdn_to_eeh_dev(pdn); if (!edev) return; >+ eeh_rmv_from_parent_pe(edev); >+ kfree(edev); >+ pdn->edev = NULL; >+} >+ [A] The function itself isn't correct enough. When VF's pci_dev is released, eeh_remove_device(), detaching eeh_dev from parent PE and destroying EEH address cache, should be called. The function isn't complete and you don't have to detach eeh_dev from parent PE again. >+/** > * eeh_dev_phb_init_dynamic - Create EEH devices for devices included in PHB > * @phb: PHB > * >diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c >index bf0fb873..a35f865 100644 >--- a/arch/powerpc/kernel/pci_dn.c >+++ b/arch/powerpc/kernel/pci_dn.c >@@ -179,7 +179,9 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, > struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) > { > #ifdef CONFIG_PCI_IOV >+ struct pci_controller *hose = pci_bus_to_host(pdev->bus); > struct pci_dn *parent, *pdn; >+ struct eeh_dev *edev; > int i; > > /* Only support IOV for now */ >@@ -205,6 +207,9 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) > __func__, i); > return NULL; > } >+ eeh_dev_init(pdn, hose); >+ edev = pdn_to_eeh_dev(pdn); >+ edev->mode |= EEH_DEV_VF; > } > #endif /* CONFIG_PCI_IOV */ > >@@ -257,6 +262,8 @@ void remove_dev_pci_data(struct pci_dev *pdev) > pdn->devfn != pci_iov_virtfn_devfn(pdev, i)) > continue; > >+ eeh_dev_remove(pdn); >+ Remove the function in [A] and you just need: struct eeh_dev *edev = pdn_to_eeh_dev(pdn); if (edev) { pdn->edev = NULL; kfree(edev); } > if (!list_empty(&pdn->list)) > list_del(&pdn->list); > >-- >1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, May 11, 2015 at 12:48:56PM +1000, Gavin Shan wrote: >On Mon, May 04, 2015 at 03:07:35PM +0800, Wei Yang wrote: > >Please order this patch and PATCH[5] because EEH device is expected to >be created before EEH PE. > >>EEH on powerpc platform needs eeh_dev structure to track the pci device > ^^^ > PCI > >>status. Since VFs are created/released dynamically, VF's eeh_dev is also >>dynamically created/released in system. >> >>This patch creates/removes eeh_dev when pci_dn is created/removed for VFs, >>and marks it with EEH_DEV_VF type. >> >>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> >>--- >> arch/powerpc/include/asm/eeh.h | 7 +++++++ >> arch/powerpc/kernel/eeh.c | 4 ++++ >> arch/powerpc/kernel/eeh_dev.c | 20 ++++++++++++++++++++ >> arch/powerpc/kernel/pci_dn.c | 7 +++++++ >> 4 files changed, 38 insertions(+) >> >>diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h >>index 56e8cd9..2067de4 100644 >>--- a/arch/powerpc/include/asm/eeh.h >>+++ b/arch/powerpc/include/asm/eeh.h >>@@ -124,6 +124,7 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe) >> #define EEH_DEV_NO_HANDLER (1 << 8) /* No error handler */ >> #define EEH_DEV_SYSFS (1 << 9) /* Sysfs created */ >> #define EEH_DEV_REMOVED (1 << 10) /* Removed permanently */ >>+#define EEH_DEV_VF (1 << 11) /* VF port */ >> > >Why you need this flag? I guess "edev->physfn" can be used to distinguish >it's a normal or VF eeh_dev. > Just like we have EEH_DEV_BRIDGE and EEH_DEV_DS_PORT, I use the flag EEH_DEV_VF to mark it a VF eeh_dev.
On Tue, May 12, 2015 at 04:06:43PM +0800, Wei Yang wrote: >On Mon, May 11, 2015 at 12:48:56PM +1000, Gavin Shan wrote: >>On Mon, May 04, 2015 at 03:07:35PM +0800, Wei Yang wrote: >> >>Please order this patch and PATCH[5] because EEH device is expected to >>be created before EEH PE. >> >>>EEH on powerpc platform needs eeh_dev structure to track the pci device >> ^^^ >> PCI >> >>>status. Since VFs are created/released dynamically, VF's eeh_dev is also >>>dynamically created/released in system. >>> >>>This patch creates/removes eeh_dev when pci_dn is created/removed for VFs, >>>and marks it with EEH_DEV_VF type. >>> >>>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> >>>--- >>> arch/powerpc/include/asm/eeh.h | 7 +++++++ >>> arch/powerpc/kernel/eeh.c | 4 ++++ >>> arch/powerpc/kernel/eeh_dev.c | 20 ++++++++++++++++++++ >>> arch/powerpc/kernel/pci_dn.c | 7 +++++++ >>> 4 files changed, 38 insertions(+) >>> >>>diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h >>>index 56e8cd9..2067de4 100644 >>>--- a/arch/powerpc/include/asm/eeh.h >>>+++ b/arch/powerpc/include/asm/eeh.h >>>@@ -124,6 +124,7 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe) >>> #define EEH_DEV_NO_HANDLER (1 << 8) /* No error handler */ >>> #define EEH_DEV_SYSFS (1 << 9) /* Sysfs created */ >>> #define EEH_DEV_REMOVED (1 << 10) /* Removed permanently */ >>>+#define EEH_DEV_VF (1 << 11) /* VF port */ >>> >> >>Why you need this flag? I guess "edev->physfn" can be used to distinguish >>it's a normal or VF eeh_dev. >> > >Just like we have EEH_DEV_BRIDGE and EEH_DEV_DS_PORT, I use the flag >EEH_DEV_VF to mark it a VF eeh_dev. > > They're not equal from my point of review. When the VF edev is created from VF's pdn, edev->physfn is determined. Furthermore, edev->physfn is only meaningful to VF's edev. It's why I think you needn't introduce another one flag (EEH_DEV_VF), which is just duplicated to (edev->physfn). So I think you can use following condition to check if one edev is created from VF's pdn or others: if (edev->physfn) /* VF's edev */ else /* All other cases */ In order to use the above condition, edev->phyfn is initialized to dereference the VF's physical function when it's created from VF's pdn in arch/powerpc/kernel/pdn.c. Thanks, Gavin -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h index 56e8cd9..2067de4 100644 --- a/arch/powerpc/include/asm/eeh.h +++ b/arch/powerpc/include/asm/eeh.h @@ -124,6 +124,7 @@ static inline bool eeh_pe_passed(struct eeh_pe *pe) #define EEH_DEV_NO_HANDLER (1 << 8) /* No error handler */ #define EEH_DEV_SYSFS (1 << 9) /* Sysfs created */ #define EEH_DEV_REMOVED (1 << 10) /* Removed permanently */ +#define EEH_DEV_VF (1 << 11) /* VF port */ struct eeh_dev { int mode; /* EEH mode */ @@ -139,6 +140,9 @@ struct eeh_dev { struct pci_controller *phb; /* Associated PHB */ struct pci_dn *pdn; /* Associated PCI device node */ struct pci_dev *pdev; /* Associated PCI device */ +#ifdef CONFIG_PCI_IOV + struct pci_dev *physfn; /* Associated PF PORT */ +#endif /* CONFIG_PCI_IOV */ struct pci_bus *bus; /* PCI bus for partial hotplug */ }; @@ -273,6 +277,7 @@ const char *eeh_pe_loc_get(struct eeh_pe *pe); struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe); void *eeh_dev_init(struct pci_dn *pdn, void *data); +void eeh_dev_remove(struct pci_dn *pdn); void eeh_dev_phb_init_dynamic(struct pci_controller *phb); int eeh_init(void); int __init eeh_ops_register(struct eeh_ops *ops); @@ -328,6 +333,8 @@ static inline void *eeh_dev_init(struct pci_dn *pdn, void *data) return NULL; } +void eeh_dev_remove(struct pci_dn *pdn) { } + static inline void eeh_dev_phb_init_dynamic(struct pci_controller *phb) { } static inline int eeh_check_failure(const volatile void __iomem *token) diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 6c7ce1b..221e280 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1135,6 +1135,10 @@ void eeh_add_device_late(struct pci_dev *dev) } edev->pdev = dev; +#ifdef CONFIG_PCI_IOV + if (dev->is_virtfn) + edev->physfn = dev->physfn; +#endif dev->dev.archdata.edev = edev; if (eeh_has_flag(EEH_PROBE_MODE_DEV)) diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c index aabba94..ab88e61 100644 --- a/arch/powerpc/kernel/eeh_dev.c +++ b/arch/powerpc/kernel/eeh_dev.c @@ -72,6 +72,26 @@ void *eeh_dev_init(struct pci_dn *pdn, void *data) } /** + * eeh_dev_remove - Release EEH device according to OF node + * @pdn: PCI device node + */ +void eeh_dev_remove(struct pci_dn *pdn) +{ + struct eeh_dev *edev; + + if (!pdn) + return; + + edev = pdn_to_eeh_dev(pdn); + if(!edev) + return; + + eeh_rmv_from_parent_pe(edev); + kfree(edev); + pdn->edev = NULL; +} + +/** * eeh_dev_phb_init_dynamic - Create EEH devices for devices included in PHB * @phb: PHB * diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index bf0fb873..a35f865 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -179,7 +179,9 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) { #ifdef CONFIG_PCI_IOV + struct pci_controller *hose = pci_bus_to_host(pdev->bus); struct pci_dn *parent, *pdn; + struct eeh_dev *edev; int i; /* Only support IOV for now */ @@ -205,6 +207,9 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) __func__, i); return NULL; } + eeh_dev_init(pdn, hose); + edev = pdn_to_eeh_dev(pdn); + edev->mode |= EEH_DEV_VF; } #endif /* CONFIG_PCI_IOV */ @@ -257,6 +262,8 @@ void remove_dev_pci_data(struct pci_dev *pdev) pdn->devfn != pci_iov_virtfn_devfn(pdev, i)) continue; + eeh_dev_remove(pdn); + if (!list_empty(&pdn->list)) list_del(&pdn->list);
EEH on powerpc platform needs eeh_dev structure to track the pci device status. Since VFs are created/released dynamically, VF's eeh_dev is also dynamically created/released in system. This patch creates/removes eeh_dev when pci_dn is created/removed for VFs, and marks it with EEH_DEV_VF type. Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com> --- arch/powerpc/include/asm/eeh.h | 7 +++++++ arch/powerpc/kernel/eeh.c | 4 ++++ arch/powerpc/kernel/eeh_dev.c | 20 ++++++++++++++++++++ arch/powerpc/kernel/pci_dn.c | 7 +++++++ 4 files changed, 38 insertions(+)