From: Gavin Shan <gwshan@linux.vnet.ibm.com> To: Alexey Kardashevskiy <aik@ozlabs.ru> Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, benh@kernel.crashing.org, bhelgaas@google.com Subject: Re: [PATCH v4 10/21] powerpc/powernv: Fundamental reset for PCI bus reset Date: Tue, 12 May 2015 10:04:49 +1000 [thread overview] Message-ID: <20150512000449.GD4646@gwshan> (raw) In-Reply-To: <55505796.5030904@ozlabs.ru> On Mon, May 11, 2015 at 05:17:42PM +1000, Alexey Kardashevskiy wrote: >On 05/11/2015 04:47 PM, Gavin Shan wrote: >>On Sun, May 10, 2015 at 12:12:18AM +1000, Alexey Kardashevskiy wrote: >>>On 05/01/2015 04:02 PM, Gavin Shan wrote: >>>>Function pnv_pci_reset_secondary_bus() is used to reset specified >>>>PCI bus, which is leaded by root complex or PCI bridge. That means >>>>the function shouldn't be called on PCI root bus and the patch >>>>removes the logic for that case. >>>> >>>>Also, some adapters beneath the indicated PCI bus may require >>>>fundamental reset in order to successfully reload their firmwares >>>>after the reset. The patch translates hot reset to fundamental reset >>>>for that case. >>>> >>>>Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>>--- >>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 35 +++++++++++++++++++++------- >>>> 1 file changed, 26 insertions(+), 9 deletions(-) >>>> >>>>diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>index 3c01095..58e4dcf 100644 >>>>--- a/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>@@ -888,18 +888,35 @@ static int pnv_eeh_bridge_reset(struct pci_dev *dev, int option) >>>> return (rc == OPAL_SUCCESS) ? 0 : -EIO; >>>> } >>>> >>>>-void pnv_pci_reset_secondary_bus(struct pci_dev *dev) >>> >>> >>>Why changing dev to pdev? Keeping "dev" could make the patch simpler. >>> >> >>In the early stage when I wrote the EEH code, I had "dev" to refer PCI >>device, which isn't precisely enough. Actually, "dev" means "struct device" >>while "pdev" stands for "struct pci_dev". That's why I changed it. > > >The rest of the file and the kernel overall use "dev" for pci_dev just fine. >I would not bother. > Ok. I'll keep it. >>>>+static int pnv_pci_dev_reset_type(struct pci_dev *pdev, void *data) >>>> { >>>>- struct pci_controller *hose; >>>>+ int *freset = data; >>>> >>>>- if (pci_is_root_bus(dev->bus)) { >>>>- hose = pci_bus_to_host(dev->bus); >>>>- pnv_eeh_phb_reset(hose, EEH_RESET_HOT); >>>>- pnv_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE); >>>>- } else { >>>>- pnv_eeh_bridge_reset(dev, EEH_RESET_HOT); >>>>- pnv_eeh_bridge_reset(dev, EEH_RESET_DEACTIVATE); >>>>+ /* >>>>+ * Stop the iteration immediately if there is any >>>>+ * one PCI device requesting fundamental reset >>>>+ */ >>>>+ *freset |= pdev->needs_freset; >>>>+ return *freset; >>>>+} >>>>+ >>>>+void pnv_pci_reset_secondary_bus(struct pci_dev *pdev) >>>>+{ >>>>+ int option = EEH_RESET_HOT; >>>>+ int freset = 0; >>>>+ >>>>+ /* Check if there're any PCI devices asking for fundamental reset */ >>>>+ if (pdev->subordinate) { >>>>+ pci_walk_bus(pdev->subordinate, >>>>+ pnv_pci_dev_reset_type, >>>>+ &freset); >>>>+ if (freset) >>>>+ option = EEH_RESET_FUNDAMENTAL; >>>> } >>>>+ >>>>+ /* Issue the requested type of reset */ >>>>+ pnv_eeh_bridge_reset(pdev, option); >>>>+ pnv_eeh_bridge_reset(pdev, EEH_RESET_DEACTIVATE); >>>> } >>>> >>>> /** >>>> Thanks, Gavin
WARNING: multiple messages have this Message-ID (diff)
From: Gavin Shan <gwshan@linux.vnet.ibm.com> To: Alexey Kardashevskiy <aik@ozlabs.ru> Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Gavin Shan <gwshan@linux.vnet.ibm.com> Subject: Re: [PATCH v4 10/21] powerpc/powernv: Fundamental reset for PCI bus reset Date: Tue, 12 May 2015 10:04:49 +1000 [thread overview] Message-ID: <20150512000449.GD4646@gwshan> (raw) In-Reply-To: <55505796.5030904@ozlabs.ru> On Mon, May 11, 2015 at 05:17:42PM +1000, Alexey Kardashevskiy wrote: >On 05/11/2015 04:47 PM, Gavin Shan wrote: >>On Sun, May 10, 2015 at 12:12:18AM +1000, Alexey Kardashevskiy wrote: >>>On 05/01/2015 04:02 PM, Gavin Shan wrote: >>>>Function pnv_pci_reset_secondary_bus() is used to reset specified >>>>PCI bus, which is leaded by root complex or PCI bridge. That means >>>>the function shouldn't be called on PCI root bus and the patch >>>>removes the logic for that case. >>>> >>>>Also, some adapters beneath the indicated PCI bus may require >>>>fundamental reset in order to successfully reload their firmwares >>>>after the reset. The patch translates hot reset to fundamental reset >>>>for that case. >>>> >>>>Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >>>>--- >>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 35 +++++++++++++++++++++------- >>>> 1 file changed, 26 insertions(+), 9 deletions(-) >>>> >>>>diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>index 3c01095..58e4dcf 100644 >>>>--- a/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c >>>>@@ -888,18 +888,35 @@ static int pnv_eeh_bridge_reset(struct pci_dev *dev, int option) >>>> return (rc == OPAL_SUCCESS) ? 0 : -EIO; >>>> } >>>> >>>>-void pnv_pci_reset_secondary_bus(struct pci_dev *dev) >>> >>> >>>Why changing dev to pdev? Keeping "dev" could make the patch simpler. >>> >> >>In the early stage when I wrote the EEH code, I had "dev" to refer PCI >>device, which isn't precisely enough. Actually, "dev" means "struct device" >>while "pdev" stands for "struct pci_dev". That's why I changed it. > > >The rest of the file and the kernel overall use "dev" for pci_dev just fine. >I would not bother. > Ok. I'll keep it. >>>>+static int pnv_pci_dev_reset_type(struct pci_dev *pdev, void *data) >>>> { >>>>- struct pci_controller *hose; >>>>+ int *freset = data; >>>> >>>>- if (pci_is_root_bus(dev->bus)) { >>>>- hose = pci_bus_to_host(dev->bus); >>>>- pnv_eeh_phb_reset(hose, EEH_RESET_HOT); >>>>- pnv_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE); >>>>- } else { >>>>- pnv_eeh_bridge_reset(dev, EEH_RESET_HOT); >>>>- pnv_eeh_bridge_reset(dev, EEH_RESET_DEACTIVATE); >>>>+ /* >>>>+ * Stop the iteration immediately if there is any >>>>+ * one PCI device requesting fundamental reset >>>>+ */ >>>>+ *freset |= pdev->needs_freset; >>>>+ return *freset; >>>>+} >>>>+ >>>>+void pnv_pci_reset_secondary_bus(struct pci_dev *pdev) >>>>+{ >>>>+ int option = EEH_RESET_HOT; >>>>+ int freset = 0; >>>>+ >>>>+ /* Check if there're any PCI devices asking for fundamental reset */ >>>>+ if (pdev->subordinate) { >>>>+ pci_walk_bus(pdev->subordinate, >>>>+ pnv_pci_dev_reset_type, >>>>+ &freset); >>>>+ if (freset) >>>>+ option = EEH_RESET_FUNDAMENTAL; >>>> } >>>>+ >>>>+ /* Issue the requested type of reset */ >>>>+ pnv_eeh_bridge_reset(pdev, option); >>>>+ pnv_eeh_bridge_reset(pdev, EEH_RESET_DEACTIVATE); >>>> } >>>> >>>> /** >>>> Thanks, Gavin
next prev parent reply other threads:[~2015-05-12 0:05 UTC|newest] Thread overview: 184+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-01 6:02 [PATCH v4 00/21] PowerPC/PowerNV: PCI Slot Management Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 01/21] pci: Add pcibios_setup_bridge() Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-07 22:12 ` Bjorn Helgaas 2015-05-07 22:12 ` Bjorn Helgaas 2015-05-11 1:59 ` Gavin Shan 2015-05-11 1:59 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 02/21] powerpc/powernv: Enable M64 on P7IOC Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 0:18 ` Alexey Kardashevskiy 2015-05-09 0:18 ` Alexey Kardashevskiy 2015-05-11 4:37 ` Gavin Shan 2015-05-11 4:37 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 03/21] powerpc/powernv: M64 support improvement Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 10:24 ` Alexey Kardashevskiy 2015-05-09 10:24 ` Alexey Kardashevskiy 2015-05-11 4:47 ` Gavin Shan 2015-05-11 4:47 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 04/21] powerpc/powernv: Improve IO and M32 mapping Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 10:53 ` Alexey Kardashevskiy 2015-05-09 10:53 ` Alexey Kardashevskiy 2015-05-11 4:52 ` Gavin Shan 2015-05-11 4:52 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 05/21] powerpc/powernv: Improve DMA32 segment assignment Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 06/21] powerpc/powernv: Create PEs dynamically Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 11:43 ` Alexey Kardashevskiy 2015-05-09 11:43 ` Alexey Kardashevskiy 2015-05-11 4:55 ` Gavin Shan 2015-05-11 4:55 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 07/21] powerpc/powernv: Release " Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 12:43 ` Alexey Kardashevskiy 2015-05-09 12:43 ` Alexey Kardashevskiy 2015-05-11 6:25 ` Gavin Shan 2015-05-11 6:25 ` Gavin Shan 2015-05-11 7:02 ` Alexey Kardashevskiy 2015-05-11 7:02 ` Alexey Kardashevskiy 2015-05-12 0:03 ` Gavin Shan 2015-05-12 0:03 ` Gavin Shan 2015-05-12 0:53 ` Alexey Kardashevskiy 2015-05-12 0:53 ` Alexey Kardashevskiy 2015-05-12 1:25 ` Gavin Shan 2015-05-12 1:25 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 08/21] powerpc/powernv: Drop pnv_ioda_setup_dev_PE() Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 12:45 ` Alexey Kardashevskiy 2015-05-09 12:45 ` Alexey Kardashevskiy 2015-05-01 6:02 ` [PATCH v4 09/21] powerpc/powernv: Use PCI slot reset infrastructure Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 13:41 ` Alexey Kardashevskiy 2015-05-09 13:41 ` Alexey Kardashevskiy 2015-05-11 6:45 ` Gavin Shan 2015-05-11 6:45 ` Gavin Shan 2015-05-11 7:16 ` Alexey Kardashevskiy 2015-05-11 7:16 ` Alexey Kardashevskiy 2015-05-01 6:02 ` [PATCH v4 10/21] powerpc/powernv: Fundamental reset for PCI bus reset Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-09 14:12 ` Alexey Kardashevskiy 2015-05-09 14:12 ` Alexey Kardashevskiy 2015-05-11 6:47 ` Gavin Shan 2015-05-11 6:47 ` Gavin Shan 2015-05-11 7:17 ` Alexey Kardashevskiy 2015-05-11 7:17 ` Alexey Kardashevskiy 2015-05-12 0:04 ` Gavin Shan [this message] 2015-05-12 0:04 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 11/21] powerpc/pci: Don't scan empty slot Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-01 6:02 ` [PATCH v4 12/21] powerpc/pci: Move pcibios_find_pci_bus() around Gavin Shan 2015-05-01 6:02 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 13/21] powerpc/powernv: Introduce pnv_pci_poll() Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-09 14:30 ` Alexey Kardashevskiy 2015-05-09 14:30 ` Alexey Kardashevskiy 2015-05-11 7:19 ` Gavin Shan 2015-05-11 7:19 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 14/21] powerpc/powernv: Functions to get/reset PCI slot status Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-09 14:44 ` Alexey Kardashevskiy 2015-05-09 14:44 ` Alexey Kardashevskiy 2015-05-01 6:03 ` [PATCH v4 15/21] powerpc/pci: Delay creating pci_dn Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-09 14:55 ` Alexey Kardashevskiy 2015-05-09 14:55 ` Alexey Kardashevskiy 2015-05-11 7:21 ` Gavin Shan 2015-05-11 7:21 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 16/21] powerpc/pci: Create eeh_dev while " Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-09 15:08 ` Alexey Kardashevskiy 2015-05-09 15:08 ` Alexey Kardashevskiy 2015-05-11 7:24 ` Gavin Shan 2015-05-11 7:24 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 17/21] powerpc/pci: Export traverse_pci_device_nodes() Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 18/21] powerpc/pci: Update bridge windows on PCI plugging Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 19/21] drivers/of: Support adding sub-tree Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-01 12:54 ` Rob Herring 2015-05-01 12:54 ` Rob Herring 2015-05-01 15:22 ` Benjamin Herrenschmidt 2015-05-01 15:22 ` Benjamin Herrenschmidt 2015-05-01 18:46 ` Rob Herring 2015-05-01 18:46 ` Rob Herring 2015-05-01 22:57 ` Benjamin Herrenschmidt 2015-05-01 22:57 ` Benjamin Herrenschmidt 2015-05-01 23:29 ` Benjamin Herrenschmidt 2015-05-01 23:29 ` Benjamin Herrenschmidt 2015-05-02 2:48 ` Benjamin Herrenschmidt 2015-05-02 2:48 ` Benjamin Herrenschmidt 2015-05-04 1:30 ` Gavin Shan 2015-05-04 1:30 ` Gavin Shan 2015-05-04 4:51 ` Benjamin Herrenschmidt 2015-05-04 4:51 ` Benjamin Herrenschmidt 2015-05-04 0:23 ` Gavin Shan 2015-05-04 0:23 ` Gavin Shan [not found] ` <1430521038.7979.70.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2015-05-04 16:41 ` Pantelis Antoniou 2015-05-04 16:41 ` Pantelis Antoniou 2015-05-04 16:41 ` Pantelis Antoniou 2015-05-04 21:14 ` Benjamin Herrenschmidt 2015-05-04 21:14 ` Benjamin Herrenschmidt 2015-05-13 23:35 ` Benjamin Herrenschmidt 2015-05-13 23:35 ` Benjamin Herrenschmidt [not found] ` <1431560124.20218.91.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2015-05-14 0:18 ` Rob Herring 2015-05-14 0:18 ` Rob Herring 2015-05-14 0:18 ` Rob Herring [not found] ` <CAL_JsqKqTa5eg3eOqx3bkeNdO_920WwDiRbQaxwWLEWpCypFmA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-05-14 0:54 ` Benjamin Herrenschmidt 2015-05-14 0:54 ` Benjamin Herrenschmidt 2015-05-14 0:54 ` Benjamin Herrenschmidt 2015-05-14 6:23 ` Pantelis Antoniou 2015-05-14 6:23 ` Pantelis Antoniou 2015-05-14 6:46 ` Benjamin Herrenschmidt 2015-05-14 6:46 ` Benjamin Herrenschmidt 2015-05-14 7:04 ` Pantelis Antoniou 2015-05-14 7:04 ` Pantelis Antoniou [not found] ` <3988EABE-3DE9-4E1C-9778-22E35138E359-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org> 2015-05-14 7:14 ` Benjamin Herrenschmidt 2015-05-14 7:14 ` Benjamin Herrenschmidt 2015-05-14 7:14 ` Benjamin Herrenschmidt 2015-05-14 7:19 ` Pantelis Antoniou 2015-05-14 7:19 ` Pantelis Antoniou 2015-05-14 7:19 ` Pantelis Antoniou [not found] ` <75F026CA-5AC1-4106-B2F0-AB0D006DEF5A-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org> 2015-05-14 7:25 ` Benjamin Herrenschmidt 2015-05-14 7:25 ` Benjamin Herrenschmidt 2015-05-14 7:25 ` Benjamin Herrenschmidt 2015-05-14 7:29 ` Benjamin Herrenschmidt 2015-05-14 7:29 ` Benjamin Herrenschmidt [not found] ` <1431588358.4160.42.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2015-05-14 7:34 ` Pantelis Antoniou 2015-05-14 7:34 ` Pantelis Antoniou 2015-05-14 7:34 ` Pantelis Antoniou [not found] ` <D7FC0542-DD1A-428F-8E75-81620C6D83DC-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org> 2015-05-14 7:47 ` Benjamin Herrenschmidt 2015-05-14 7:47 ` Benjamin Herrenschmidt 2015-05-14 7:47 ` Benjamin Herrenschmidt 2015-05-14 11:02 ` Pantelis Antoniou 2015-05-14 11:02 ` Pantelis Antoniou 2015-05-14 11:02 ` Pantelis Antoniou 2015-05-14 23:25 ` Benjamin Herrenschmidt 2015-05-14 23:25 ` Benjamin Herrenschmidt [not found] ` <1431564871.4160.8.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2015-06-07 7:54 ` Grant Likely 2015-06-07 7:54 ` Grant Likely [not found] ` <20150607075422.6ECE9C40A12-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 2015-06-08 20:57 ` Benjamin Herrenschmidt 2015-06-08 20:57 ` Benjamin Herrenschmidt [not found] ` <1433797073.4526.163.camel-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org> 2015-06-08 21:34 ` Grant Likely 2015-06-08 21:34 ` Grant Likely 2015-06-10 6:55 ` Gavin Shan 2015-05-03 23:28 ` Gavin Shan 2015-05-03 23:28 ` Gavin Shan 2015-05-15 1:27 ` Gavin Shan 2015-05-15 1:27 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 20/21] powerpc/powernv: Select OF_DYNAMIC Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-01 6:03 ` [PATCH v4 21/21] pci/hotplug: PowerPC PowerNV PCI hotplug driver Gavin Shan 2015-05-01 6:03 ` Gavin Shan 2015-05-09 15:54 ` Alexey Kardashevskiy 2015-05-09 15:54 ` Alexey Kardashevskiy 2015-05-11 7:38 ` Gavin Shan 2015-05-11 7:38 ` Gavin Shan 2015-05-08 23:59 ` [PATCH v4 00/21] PowerPC/PowerNV: PCI Slot Management Alexey Kardashevskiy 2015-05-08 23:59 ` Alexey Kardashevskiy 2015-05-11 7:40 ` Gavin Shan 2015-05-11 7:40 ` 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=20150512000449.GD4646@gwshan \ --to=gwshan@linux.vnet.ibm.com \ --cc=aik@ozlabs.ru \ --cc=benh@kernel.crashing.org \ --cc=bhelgaas@google.com \ --cc=linux-pci@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.