From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id DD8811A11C2 for ; Mon, 4 May 2015 17:10:26 +1000 (AEST) Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 May 2015 17:10:26 +1000 Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 5EE0D2CE804E for ; Mon, 4 May 2015 17:10:23 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t447AFFO19202218 for ; Mon, 4 May 2015 17:10:23 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4479oDR001960 for ; Mon, 4 May 2015 17:09:50 +1000 From: Wei Yang To: gwshan@linux.vnet.ibm.com, bhelgaas@google.com Subject: [PATCH V3 6/9] powerpc/powernv: create/release eeh_dev for VF Date: Mon, 4 May 2015 15:07:35 +0800 Message-Id: <1430723258-21299-7-git-send-email-weiyang@linux.vnet.ibm.com> In-Reply-To: <1430723258-21299-1-git-send-email-weiyang@linux.vnet.ibm.com> References: <1430723258-21299-1-git-send-email-weiyang@linux.vnet.ibm.com> Cc: linux-pci@vger.kernel.org, Wei Yang , linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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 */ 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); -- 1.7.9.5