| Message ID | 1497153938-26074-3-git-send-email-oza.oza@broadcom.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On Sun, Jun 11, 2017 at 09:35:38AM +0530, Oza Pawandeep wrote: > PERST# must be asserted around ~500ms before > the reboot is applied. > > During soft reset (e.g., "reboot" from Linux) on some iProc based SoCs > LCPLL clock and PERST both goes off simultaneously. > This will cause certain Endpoints Intel NVMe not get detected, upon > next boot sequence. > > This happens because; Endpoint is expecting the clock for some amount of > time after PERST is asserted, which is not happening in our case > (Compare to Intel X86 boards, will have clocks running). > this cause NVMe to behave in undefined way. This doesn't smell right. The description makes this sound like a band-aid that happens to "solve" a problem with one particular device. It doesn't sound like this is making iProc adhere to something in the PCIe spec. Is there some PCIe spec timing requirement that tells you about this 500ms number? Please include the reference if so. > Essentially clock will remain alive for 500ms with PERST# = 0 > before reboot. > This patch adds platform shutdown where it should be > called in device_shutdown while reboot command is issued. > > So in sequence first Endpoint Shutdown (e.g. nvme_shutdown) > followed by RC shutdown is called, which issues safe PERST > assertion. > > Signed-off-by: Oza Pawandeep <oza.oza@broadcom.com> > Reviewed-by: Ray Jui <ray.jui@broadcom.com> > Reviewed-by: Scott Branden <scott.branden@broadcom.com> > > diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c > index 90d2bdd..9512960 100644 > --- a/drivers/pci/host/pcie-iproc-platform.c > +++ b/drivers/pci/host/pcie-iproc-platform.c > @@ -131,6 +131,13 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) > return iproc_pcie_remove(pcie); > } > > +static void iproc_pcie_pltfm_shutdown(struct platform_device *pdev) > +{ > + struct iproc_pcie *pcie = platform_get_drvdata(pdev); > + > + iproc_pcie_shutdown(pcie); > +} > + > static struct platform_driver iproc_pcie_pltfm_driver = { > .driver = { > .name = "iproc-pcie", > @@ -138,6 +145,7 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) > }, > .probe = iproc_pcie_pltfm_probe, > .remove = iproc_pcie_pltfm_remove, > + .shutdown = iproc_pcie_pltfm_shutdown, > }; > module_platform_driver(iproc_pcie_pltfm_driver); > > diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c > index 05a3647..bb61376 100644 > --- a/drivers/pci/host/pcie-iproc.c > +++ b/drivers/pci/host/pcie-iproc.c > @@ -608,32 +608,40 @@ static int iproc_pcie_config_write32(struct pci_bus *bus, unsigned int devfn, > .write = iproc_pcie_config_write32, > }; > > -static void iproc_pcie_reset(struct iproc_pcie *pcie) > +static void iproc_pcie_perst_ctrl(struct iproc_pcie *pcie, bool assert) > { > u32 val; > > /* > - * PAXC and the internal emulated endpoint device downstream should not > - * be reset. If firmware has been loaded on the endpoint device at an > - * earlier boot stage, reset here causes issues. > + * The internal emulated endpoints (such as PAXC) device downstream > + * should not be reset. If firmware has been loaded on the endpoint > + * device at an earlier boot stage, reset here causes issues. > */ > if (pcie->ep_is_internal) > return; > > - /* > - * Select perst_b signal as reset source. Put the device into reset, > - * and then bring it out of reset > - */ > - val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > - val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & > - ~RC_PCIE_RST_OUTPUT; > - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > - udelay(250); > - > - val |= RC_PCIE_RST_OUTPUT; > - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > - msleep(100); > + if (assert) { > + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > + val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & > + ~RC_PCIE_RST_OUTPUT; > + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > + udelay(250); > + } else { > + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > + val |= RC_PCIE_RST_OUTPUT; > + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > + msleep(100); > + } > +} > + > +int iproc_pcie_shutdown(struct iproc_pcie *pcie) > +{ > + iproc_pcie_perst_ctrl(pcie, true); > + msleep(500); > + > + return 0; > } > +EXPORT_SYMBOL(iproc_pcie_shutdown); > > static int iproc_pcie_check_link(struct iproc_pcie *pcie, struct pci_bus *bus) > { > @@ -1310,7 +1318,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) > goto err_exit_phy; > } > > - iproc_pcie_reset(pcie); > + iproc_pcie_perst_ctrl(pcie, true); > + iproc_pcie_perst_ctrl(pcie, false); > > if (pcie->need_ob_cfg) { > ret = iproc_pcie_map_ranges(pcie, res); > diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h > index 0bbe2ea..a6b55ce 100644 > --- a/drivers/pci/host/pcie-iproc.h > +++ b/drivers/pci/host/pcie-iproc.h > @@ -110,6 +110,7 @@ struct iproc_pcie { > > int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); > int iproc_pcie_remove(struct iproc_pcie *pcie); > +int iproc_pcie_shutdown(struct iproc_pcie *pcie); > > #ifdef CONFIG_PCIE_IPROC_MSI > int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node); > -- > 1.9.1 >
On Tue, Jun 13, 2017 at 5:13 AM, Bjorn Helgaas <helgaas@kernel.org> wrote: > On Sun, Jun 11, 2017 at 09:35:38AM +0530, Oza Pawandeep wrote: >> PERST# must be asserted around ~500ms before >> the reboot is applied. >> >> During soft reset (e.g., "reboot" from Linux) on some iProc based SoCs >> LCPLL clock and PERST both goes off simultaneously. >> This will cause certain Endpoints Intel NVMe not get detected, upon >> next boot sequence. >> >> This happens because; Endpoint is expecting the clock for some amount of >> time after PERST is asserted, which is not happening in our case >> (Compare to Intel X86 boards, will have clocks running). >> this cause NVMe to behave in undefined way. > > This doesn't smell right. The description makes this sound like a > band-aid that happens to "solve" a problem with one particular device. > It doesn't sound like this is making iProc adhere to something in the > PCIe spec. > > Is there some PCIe spec timing requirement that tells you about this > 500ms number? Please include the reference if so. On chip PLL which sources the reference clock to the device gets reset when soft reset is applied; the soft reset also asserts PERST#. This simultaneous assertion of reset and clock being lost is a problem with some NVME cards. The delay is added to keep clock alive while PERST gets asserted. The time delay number can be set to a number that will allow the NVME device to go into reset state. 500 ms delay is picked for that reason only, which is long enough to get EP into reset correctly. > >> Essentially clock will remain alive for 500ms with PERST# = 0 >> before reboot. > >> This patch adds platform shutdown where it should be >> called in device_shutdown while reboot command is issued. >> >> So in sequence first Endpoint Shutdown (e.g. nvme_shutdown) >> followed by RC shutdown is called, which issues safe PERST >> assertion. >> >> Signed-off-by: Oza Pawandeep <oza.oza@broadcom.com> >> Reviewed-by: Ray Jui <ray.jui@broadcom.com> >> Reviewed-by: Scott Branden <scott.branden@broadcom.com> >> >> diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c >> index 90d2bdd..9512960 100644 >> --- a/drivers/pci/host/pcie-iproc-platform.c >> +++ b/drivers/pci/host/pcie-iproc-platform.c >> @@ -131,6 +131,13 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) >> return iproc_pcie_remove(pcie); >> } >> >> +static void iproc_pcie_pltfm_shutdown(struct platform_device *pdev) >> +{ >> + struct iproc_pcie *pcie = platform_get_drvdata(pdev); >> + >> + iproc_pcie_shutdown(pcie); >> +} >> + >> static struct platform_driver iproc_pcie_pltfm_driver = { >> .driver = { >> .name = "iproc-pcie", >> @@ -138,6 +145,7 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) >> }, >> .probe = iproc_pcie_pltfm_probe, >> .remove = iproc_pcie_pltfm_remove, >> + .shutdown = iproc_pcie_pltfm_shutdown, >> }; >> module_platform_driver(iproc_pcie_pltfm_driver); >> >> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c >> index 05a3647..bb61376 100644 >> --- a/drivers/pci/host/pcie-iproc.c >> +++ b/drivers/pci/host/pcie-iproc.c >> @@ -608,32 +608,40 @@ static int iproc_pcie_config_write32(struct pci_bus *bus, unsigned int devfn, >> .write = iproc_pcie_config_write32, >> }; >> >> -static void iproc_pcie_reset(struct iproc_pcie *pcie) >> +static void iproc_pcie_perst_ctrl(struct iproc_pcie *pcie, bool assert) >> { >> u32 val; >> >> /* >> - * PAXC and the internal emulated endpoint device downstream should not >> - * be reset. If firmware has been loaded on the endpoint device at an >> - * earlier boot stage, reset here causes issues. >> + * The internal emulated endpoints (such as PAXC) device downstream >> + * should not be reset. If firmware has been loaded on the endpoint >> + * device at an earlier boot stage, reset here causes issues. >> */ >> if (pcie->ep_is_internal) >> return; >> >> - /* >> - * Select perst_b signal as reset source. Put the device into reset, >> - * and then bring it out of reset >> - */ >> - val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> - val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & >> - ~RC_PCIE_RST_OUTPUT; >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> - udelay(250); >> - >> - val |= RC_PCIE_RST_OUTPUT; >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> - msleep(100); >> + if (assert) { >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> + val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & >> + ~RC_PCIE_RST_OUTPUT; >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> + udelay(250); >> + } else { >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> + val |= RC_PCIE_RST_OUTPUT; >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> + msleep(100); >> + } >> +} >> + >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie) >> +{ >> + iproc_pcie_perst_ctrl(pcie, true); >> + msleep(500); >> + >> + return 0; >> } >> +EXPORT_SYMBOL(iproc_pcie_shutdown); >> >> static int iproc_pcie_check_link(struct iproc_pcie *pcie, struct pci_bus *bus) >> { >> @@ -1310,7 +1318,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) >> goto err_exit_phy; >> } >> >> - iproc_pcie_reset(pcie); >> + iproc_pcie_perst_ctrl(pcie, true); >> + iproc_pcie_perst_ctrl(pcie, false); >> >> if (pcie->need_ob_cfg) { >> ret = iproc_pcie_map_ranges(pcie, res); >> diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h >> index 0bbe2ea..a6b55ce 100644 >> --- a/drivers/pci/host/pcie-iproc.h >> +++ b/drivers/pci/host/pcie-iproc.h >> @@ -110,6 +110,7 @@ struct iproc_pcie { >> >> int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); >> int iproc_pcie_remove(struct iproc_pcie *pcie); >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie); >> >> #ifdef CONFIG_PCIE_IPROC_MSI >> int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node); >> -- >> 1.9.1 >>
On Wed, Jun 14, 2017 at 10:24:11AM +0530, Oza Oza wrote: > On Tue, Jun 13, 2017 at 5:13 AM, Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Sun, Jun 11, 2017 at 09:35:38AM +0530, Oza Pawandeep wrote: > >> PERST# must be asserted around ~500ms before > >> the reboot is applied. > >> > >> During soft reset (e.g., "reboot" from Linux) on some iProc based SoCs > >> LCPLL clock and PERST both goes off simultaneously. > >> This will cause certain Endpoints Intel NVMe not get detected, upon > >> next boot sequence. > >> > >> This happens because; Endpoint is expecting the clock for some amount of > >> time after PERST is asserted, which is not happening in our case > >> (Compare to Intel X86 boards, will have clocks running). > >> this cause NVMe to behave in undefined way. > > > > This doesn't smell right. The description makes this sound like a > > band-aid that happens to "solve" a problem with one particular device. > > It doesn't sound like this is making iProc adhere to something in the > > PCIe spec. > > > > Is there some PCIe spec timing requirement that tells you about this > > 500ms number? Please include the reference if so. > > On chip PLL which sources the reference clock to the device gets reset > when soft reset is applied; the soft reset also asserts PERST#. > This simultaneous assertion of reset and clock being lost is a problem > with some NVME cards. > The delay is added to keep clock alive while PERST gets asserted. > The time delay number can be set to a number that will allow the NVME > device to go into reset state. > 500 ms delay is picked for that reason only, which is long enough to > get EP into reset correctly. This doesn't really tell me anything new. We're talking about the protocol on the link between the RC and the endpoint. That *should* be completely specified by the PCIe spec. If there's some requirement that the clock keep running after PERST is asserted, that should be in the spec. If it's not in the spec, and an endpoint relies on it, the endpoint is non-compliant, and we'll likely see similar issues with that endpoint on other platforms. If we need a workaround for a specific endpoint, that might be OK; the world isn't perfect. But if that's the case, we should include more specifics about the device, e.g., vendor/device IDs and "lspci -vv" output. > >> Essentially clock will remain alive for 500ms with PERST# = 0 > >> before reboot. > > > >> This patch adds platform shutdown where it should be > >> called in device_shutdown while reboot command is issued. > >> > >> So in sequence first Endpoint Shutdown (e.g. nvme_shutdown) > >> followed by RC shutdown is called, which issues safe PERST > >> assertion. > >> > >> Signed-off-by: Oza Pawandeep <oza.oza@broadcom.com> > >> Reviewed-by: Ray Jui <ray.jui@broadcom.com> > >> Reviewed-by: Scott Branden <scott.branden@broadcom.com> > >> > >> diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c > >> index 90d2bdd..9512960 100644 > >> --- a/drivers/pci/host/pcie-iproc-platform.c > >> +++ b/drivers/pci/host/pcie-iproc-platform.c > >> @@ -131,6 +131,13 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) > >> return iproc_pcie_remove(pcie); > >> } > >> > >> +static void iproc_pcie_pltfm_shutdown(struct platform_device *pdev) > >> +{ > >> + struct iproc_pcie *pcie = platform_get_drvdata(pdev); > >> + > >> + iproc_pcie_shutdown(pcie); > >> +} > >> + > >> static struct platform_driver iproc_pcie_pltfm_driver = { > >> .driver = { > >> .name = "iproc-pcie", > >> @@ -138,6 +145,7 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) > >> }, > >> .probe = iproc_pcie_pltfm_probe, > >> .remove = iproc_pcie_pltfm_remove, > >> + .shutdown = iproc_pcie_pltfm_shutdown, > >> }; > >> module_platform_driver(iproc_pcie_pltfm_driver); > >> > >> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c > >> index 05a3647..bb61376 100644 > >> --- a/drivers/pci/host/pcie-iproc.c > >> +++ b/drivers/pci/host/pcie-iproc.c > >> @@ -608,32 +608,40 @@ static int iproc_pcie_config_write32(struct pci_bus *bus, unsigned int devfn, > >> .write = iproc_pcie_config_write32, > >> }; > >> > >> -static void iproc_pcie_reset(struct iproc_pcie *pcie) > >> +static void iproc_pcie_perst_ctrl(struct iproc_pcie *pcie, bool assert) > >> { > >> u32 val; > >> > >> /* > >> - * PAXC and the internal emulated endpoint device downstream should not > >> - * be reset. If firmware has been loaded on the endpoint device at an > >> - * earlier boot stage, reset here causes issues. > >> + * The internal emulated endpoints (such as PAXC) device downstream > >> + * should not be reset. If firmware has been loaded on the endpoint > >> + * device at an earlier boot stage, reset here causes issues. > >> */ > >> if (pcie->ep_is_internal) > >> return; > >> > >> - /* > >> - * Select perst_b signal as reset source. Put the device into reset, > >> - * and then bring it out of reset > >> - */ > >> - val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > >> - val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & > >> - ~RC_PCIE_RST_OUTPUT; > >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > >> - udelay(250); > >> - > >> - val |= RC_PCIE_RST_OUTPUT; > >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > >> - msleep(100); > >> + if (assert) { > >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > >> + val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & > >> + ~RC_PCIE_RST_OUTPUT; > >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > >> + udelay(250); > >> + } else { > >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); > >> + val |= RC_PCIE_RST_OUTPUT; > >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); > >> + msleep(100); > >> + } > >> +} > >> + > >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie) > >> +{ > >> + iproc_pcie_perst_ctrl(pcie, true); > >> + msleep(500); > >> + > >> + return 0; > >> } > >> +EXPORT_SYMBOL(iproc_pcie_shutdown); > >> > >> static int iproc_pcie_check_link(struct iproc_pcie *pcie, struct pci_bus *bus) > >> { > >> @@ -1310,7 +1318,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) > >> goto err_exit_phy; > >> } > >> > >> - iproc_pcie_reset(pcie); > >> + iproc_pcie_perst_ctrl(pcie, true); > >> + iproc_pcie_perst_ctrl(pcie, false); > >> > >> if (pcie->need_ob_cfg) { > >> ret = iproc_pcie_map_ranges(pcie, res); > >> diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h > >> index 0bbe2ea..a6b55ce 100644 > >> --- a/drivers/pci/host/pcie-iproc.h > >> +++ b/drivers/pci/host/pcie-iproc.h > >> @@ -110,6 +110,7 @@ struct iproc_pcie { > >> > >> int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); > >> int iproc_pcie_remove(struct iproc_pcie *pcie); > >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie); > >> > >> #ifdef CONFIG_PCIE_IPROC_MSI > >> int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node); > >> -- > >> 1.9.1 > >>
On Thu, Jun 15, 2017 at 7:11 PM, Bjorn Helgaas <helgaas@kernel.org> wrote: > On Wed, Jun 14, 2017 at 10:24:11AM +0530, Oza Oza wrote: >> On Tue, Jun 13, 2017 at 5:13 AM, Bjorn Helgaas <helgaas@kernel.org> wrote: >> > On Sun, Jun 11, 2017 at 09:35:38AM +0530, Oza Pawandeep wrote: >> >> PERST# must be asserted around ~500ms before >> >> the reboot is applied. >> >> >> >> During soft reset (e.g., "reboot" from Linux) on some iProc based SoCs >> >> LCPLL clock and PERST both goes off simultaneously. >> >> This will cause certain Endpoints Intel NVMe not get detected, upon >> >> next boot sequence. >> >> >> >> This happens because; Endpoint is expecting the clock for some amount of >> >> time after PERST is asserted, which is not happening in our case >> >> (Compare to Intel X86 boards, will have clocks running). >> >> this cause NVMe to behave in undefined way. >> > >> > This doesn't smell right. The description makes this sound like a >> > band-aid that happens to "solve" a problem with one particular device. >> > It doesn't sound like this is making iProc adhere to something in the >> > PCIe spec. >> > >> > Is there some PCIe spec timing requirement that tells you about this >> > 500ms number? Please include the reference if so. >> >> On chip PLL which sources the reference clock to the device gets reset >> when soft reset is applied; the soft reset also asserts PERST#. >> This simultaneous assertion of reset and clock being lost is a problem >> with some NVME cards. >> The delay is added to keep clock alive while PERST gets asserted. >> The time delay number can be set to a number that will allow the NVME >> device to go into reset state. >> 500 ms delay is picked for that reason only, which is long enough to >> get EP into reset correctly. > > This doesn't really tell me anything new. > > We're talking about the protocol on the link between the RC and the > endpoint. That *should* be completely specified by the PCIe spec. If > there's some requirement that the clock keep running after PERST is > asserted, that should be in the spec. > > If it's not in the spec, and an endpoint relies on it, the endpoint is > non-compliant, and we'll likely see similar issues with that endpoint > on other platforms. > > If we need a workaround for a specific endpoint, that might be OK; the > world isn't perfect. But if that's the case, we should include more > specifics about the device, e.g., vendor/device IDs and "lspci -vv" > output. > This is specifically happening with Intel P3700 400 gb series. http://ark.intel.com/products/79625/Intel-SSD-DC-P3700-Series-400GB-2_5in-PCIe-3_0-20nm-MLC but on Intel board you will not find this problem, because ref clock is supplied by on-board oscillator. But our board(s) do not have clock coming from on-board, rather it is derived from PLL coming from SOC. Besides, PCI spec does not stipulate about such timings. In-fact it does not tell us, whether PCIe device should consider refclk to be available or not to be. 500 ms is just based on the observation and taken as safe margin. So, this is partly because of the Endpoint behavior and partly due to the way our boards are designed. with the same SSD, we will not see this issue on x86 boards, or even any other ARM based boards, who supplies there ref clock by on-bard oscillator, so in case of reboot, ref clock does not go off. please also refer to the link below which stipulate on clk being active after PERST being asserted. http://www.eetimes.com/document.asp?doc_id=1279299 Product: Intel P3700 400 gb SSD Vendor ID: 8086 Device ID: 0953. I am sorry, but we have made replacement order of those disks, so I dont have lspci -vv output. but hope that above information is sufficient. >> >> Essentially clock will remain alive for 500ms with PERST# = 0 >> >> before reboot. >> > >> >> This patch adds platform shutdown where it should be >> >> called in device_shutdown while reboot command is issued. >> >> >> >> So in sequence first Endpoint Shutdown (e.g. nvme_shutdown) >> >> followed by RC shutdown is called, which issues safe PERST >> >> assertion. >> >> >> >> Signed-off-by: Oza Pawandeep <oza.oza@broadcom.com> >> >> Reviewed-by: Ray Jui <ray.jui@broadcom.com> >> >> Reviewed-by: Scott Branden <scott.branden@broadcom.com> >> >> >> >> diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c >> >> index 90d2bdd..9512960 100644 >> >> --- a/drivers/pci/host/pcie-iproc-platform.c >> >> +++ b/drivers/pci/host/pcie-iproc-platform.c >> >> @@ -131,6 +131,13 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) >> >> return iproc_pcie_remove(pcie); >> >> } >> >> >> >> +static void iproc_pcie_pltfm_shutdown(struct platform_device *pdev) >> >> +{ >> >> + struct iproc_pcie *pcie = platform_get_drvdata(pdev); >> >> + >> >> + iproc_pcie_shutdown(pcie); >> >> +} >> >> + >> >> static struct platform_driver iproc_pcie_pltfm_driver = { >> >> .driver = { >> >> .name = "iproc-pcie", >> >> @@ -138,6 +145,7 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) >> >> }, >> >> .probe = iproc_pcie_pltfm_probe, >> >> .remove = iproc_pcie_pltfm_remove, >> >> + .shutdown = iproc_pcie_pltfm_shutdown, >> >> }; >> >> module_platform_driver(iproc_pcie_pltfm_driver); >> >> >> >> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c >> >> index 05a3647..bb61376 100644 >> >> --- a/drivers/pci/host/pcie-iproc.c >> >> +++ b/drivers/pci/host/pcie-iproc.c >> >> @@ -608,32 +608,40 @@ static int iproc_pcie_config_write32(struct pci_bus *bus, unsigned int devfn, >> >> .write = iproc_pcie_config_write32, >> >> }; >> >> >> >> -static void iproc_pcie_reset(struct iproc_pcie *pcie) >> >> +static void iproc_pcie_perst_ctrl(struct iproc_pcie *pcie, bool assert) >> >> { >> >> u32 val; >> >> >> >> /* >> >> - * PAXC and the internal emulated endpoint device downstream should not >> >> - * be reset. If firmware has been loaded on the endpoint device at an >> >> - * earlier boot stage, reset here causes issues. >> >> + * The internal emulated endpoints (such as PAXC) device downstream >> >> + * should not be reset. If firmware has been loaded on the endpoint >> >> + * device at an earlier boot stage, reset here causes issues. >> >> */ >> >> if (pcie->ep_is_internal) >> >> return; >> >> >> >> - /* >> >> - * Select perst_b signal as reset source. Put the device into reset, >> >> - * and then bring it out of reset >> >> - */ >> >> - val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> >> - val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & >> >> - ~RC_PCIE_RST_OUTPUT; >> >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> >> - udelay(250); >> >> - >> >> - val |= RC_PCIE_RST_OUTPUT; >> >> - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> >> - msleep(100); >> >> + if (assert) { >> >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> >> + val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & >> >> + ~RC_PCIE_RST_OUTPUT; >> >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> >> + udelay(250); >> >> + } else { >> >> + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); >> >> + val |= RC_PCIE_RST_OUTPUT; >> >> + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); >> >> + msleep(100); >> >> + } >> >> +} >> >> + >> >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie) >> >> +{ >> >> + iproc_pcie_perst_ctrl(pcie, true); >> >> + msleep(500); >> >> + >> >> + return 0; >> >> } >> >> +EXPORT_SYMBOL(iproc_pcie_shutdown); >> >> >> >> static int iproc_pcie_check_link(struct iproc_pcie *pcie, struct pci_bus *bus) >> >> { >> >> @@ -1310,7 +1318,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) >> >> goto err_exit_phy; >> >> } >> >> >> >> - iproc_pcie_reset(pcie); >> >> + iproc_pcie_perst_ctrl(pcie, true); >> >> + iproc_pcie_perst_ctrl(pcie, false); >> >> >> >> if (pcie->need_ob_cfg) { >> >> ret = iproc_pcie_map_ranges(pcie, res); >> >> diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h >> >> index 0bbe2ea..a6b55ce 100644 >> >> --- a/drivers/pci/host/pcie-iproc.h >> >> +++ b/drivers/pci/host/pcie-iproc.h >> >> @@ -110,6 +110,7 @@ struct iproc_pcie { >> >> >> >> int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); >> >> int iproc_pcie_remove(struct iproc_pcie *pcie); >> >> +int iproc_pcie_shutdown(struct iproc_pcie *pcie); >> >> >> >> #ifdef CONFIG_PCIE_IPROC_MSI >> >> int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node); >> >> -- >> >> 1.9.1 >> >>
diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c index 90d2bdd..9512960 100644 --- a/drivers/pci/host/pcie-iproc-platform.c +++ b/drivers/pci/host/pcie-iproc-platform.c @@ -131,6 +131,13 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) return iproc_pcie_remove(pcie); } +static void iproc_pcie_pltfm_shutdown(struct platform_device *pdev) +{ + struct iproc_pcie *pcie = platform_get_drvdata(pdev); + + iproc_pcie_shutdown(pcie); +} + static struct platform_driver iproc_pcie_pltfm_driver = { .driver = { .name = "iproc-pcie", @@ -138,6 +145,7 @@ static int iproc_pcie_pltfm_remove(struct platform_device *pdev) }, .probe = iproc_pcie_pltfm_probe, .remove = iproc_pcie_pltfm_remove, + .shutdown = iproc_pcie_pltfm_shutdown, }; module_platform_driver(iproc_pcie_pltfm_driver); diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index 05a3647..bb61376 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -608,32 +608,40 @@ static int iproc_pcie_config_write32(struct pci_bus *bus, unsigned int devfn, .write = iproc_pcie_config_write32, }; -static void iproc_pcie_reset(struct iproc_pcie *pcie) +static void iproc_pcie_perst_ctrl(struct iproc_pcie *pcie, bool assert) { u32 val; /* - * PAXC and the internal emulated endpoint device downstream should not - * be reset. If firmware has been loaded on the endpoint device at an - * earlier boot stage, reset here causes issues. + * The internal emulated endpoints (such as PAXC) device downstream + * should not be reset. If firmware has been loaded on the endpoint + * device at an earlier boot stage, reset here causes issues. */ if (pcie->ep_is_internal) return; - /* - * Select perst_b signal as reset source. Put the device into reset, - * and then bring it out of reset - */ - val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); - val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & - ~RC_PCIE_RST_OUTPUT; - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); - udelay(250); - - val |= RC_PCIE_RST_OUTPUT; - iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); - msleep(100); + if (assert) { + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); + val &= ~EP_PERST_SOURCE_SELECT & ~EP_MODE_SURVIVE_PERST & + ~RC_PCIE_RST_OUTPUT; + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); + udelay(250); + } else { + val = iproc_pcie_read_reg(pcie, IPROC_PCIE_CLK_CTRL); + val |= RC_PCIE_RST_OUTPUT; + iproc_pcie_write_reg(pcie, IPROC_PCIE_CLK_CTRL, val); + msleep(100); + } +} + +int iproc_pcie_shutdown(struct iproc_pcie *pcie) +{ + iproc_pcie_perst_ctrl(pcie, true); + msleep(500); + + return 0; } +EXPORT_SYMBOL(iproc_pcie_shutdown); static int iproc_pcie_check_link(struct iproc_pcie *pcie, struct pci_bus *bus) { @@ -1310,7 +1318,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) goto err_exit_phy; } - iproc_pcie_reset(pcie); + iproc_pcie_perst_ctrl(pcie, true); + iproc_pcie_perst_ctrl(pcie, false); if (pcie->need_ob_cfg) { ret = iproc_pcie_map_ranges(pcie, res); diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h index 0bbe2ea..a6b55ce 100644 --- a/drivers/pci/host/pcie-iproc.h +++ b/drivers/pci/host/pcie-iproc.h @@ -110,6 +110,7 @@ struct iproc_pcie { int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res); int iproc_pcie_remove(struct iproc_pcie *pcie); +int iproc_pcie_shutdown(struct iproc_pcie *pcie); #ifdef CONFIG_PCIE_IPROC_MSI int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node);