From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v2] PCI: imx6: Save and restore MSI control of RC in suspend and resume Date: Thu, 8 Dec 2022 14:05:34 +0800 [thread overview] Message-ID: <1670479534-22154-1-git-send-email-hongxing.zhu@nxp.com> (raw) The MSI Enable bit controls delivery of MSI interrupts from components below the Root Port. This bit might lost during the suspend, should be re-stored during resume. Save the MSI control during suspend, and restore it in resume. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- Changes v1-->v2: New create one save/restore function, used save the setting in suspend and restore the configuration in resume. v1 https://patchwork.kernel.org/project/linux-pci/patch/1667289595-12440-1-git-send-email-hongxing.zhu@nxp.com/ --- drivers/pci/controller/dwc/pci-imx6.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 1dde5c579edc..aa3096890c3b 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -76,6 +76,7 @@ struct imx6_pcie { struct clk *pcie; struct clk *pcie_aux; struct regmap *iomuxc_gpr; + u16 msi_ctrl; u32 controller_id; struct reset_control *pciephy_reset; struct reset_control *apps_reset; @@ -1042,6 +1043,26 @@ static void imx6_pcie_pm_turnoff(struct imx6_pcie *imx6_pcie) usleep_range(1000, 10000); } +static void imx6_pcie_msi_save_restore(struct imx6_pcie *imx6_pcie, bool save) +{ + u8 offset; + u16 val; + struct dw_pcie *pci = imx6_pcie->pci; + + if (pci_msi_enabled()) { + offset = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI); + if (save) { + val = dw_pcie_readw_dbi(pci, offset + PCI_MSI_FLAGS); + imx6_pcie->msi_ctrl = val; + } else { + dw_pcie_dbi_ro_wr_en(pci); + val = imx6_pcie->msi_ctrl; + dw_pcie_writew_dbi(pci, offset + PCI_MSI_FLAGS, val); + dw_pcie_dbi_ro_wr_dis(pci); + } + } +} + static int imx6_pcie_suspend_noirq(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); @@ -1050,6 +1071,7 @@ static int imx6_pcie_suspend_noirq(struct device *dev) if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND)) return 0; + imx6_pcie_msi_save_restore(imx6_pcie, true); imx6_pcie_pm_turnoff(imx6_pcie); imx6_pcie_stop_link(imx6_pcie->pci); imx6_pcie_host_exit(pp); @@ -1069,6 +1091,7 @@ static int imx6_pcie_resume_noirq(struct device *dev) ret = imx6_pcie_host_init(pp); if (ret) return ret; + imx6_pcie_msi_save_restore(imx6_pcie, false); dw_pcie_setup_rc(pp); if (imx6_pcie->link_is_up) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v2] PCI: imx6: Save and restore MSI control of RC in suspend and resume Date: Thu, 8 Dec 2022 14:05:34 +0800 [thread overview] Message-ID: <1670479534-22154-1-git-send-email-hongxing.zhu@nxp.com> (raw) The MSI Enable bit controls delivery of MSI interrupts from components below the Root Port. This bit might lost during the suspend, should be re-stored during resume. Save the MSI control during suspend, and restore it in resume. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- Changes v1-->v2: New create one save/restore function, used save the setting in suspend and restore the configuration in resume. v1 https://patchwork.kernel.org/project/linux-pci/patch/1667289595-12440-1-git-send-email-hongxing.zhu@nxp.com/ --- drivers/pci/controller/dwc/pci-imx6.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 1dde5c579edc..aa3096890c3b 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -76,6 +76,7 @@ struct imx6_pcie { struct clk *pcie; struct clk *pcie_aux; struct regmap *iomuxc_gpr; + u16 msi_ctrl; u32 controller_id; struct reset_control *pciephy_reset; struct reset_control *apps_reset; @@ -1042,6 +1043,26 @@ static void imx6_pcie_pm_turnoff(struct imx6_pcie *imx6_pcie) usleep_range(1000, 10000); } +static void imx6_pcie_msi_save_restore(struct imx6_pcie *imx6_pcie, bool save) +{ + u8 offset; + u16 val; + struct dw_pcie *pci = imx6_pcie->pci; + + if (pci_msi_enabled()) { + offset = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI); + if (save) { + val = dw_pcie_readw_dbi(pci, offset + PCI_MSI_FLAGS); + imx6_pcie->msi_ctrl = val; + } else { + dw_pcie_dbi_ro_wr_en(pci); + val = imx6_pcie->msi_ctrl; + dw_pcie_writew_dbi(pci, offset + PCI_MSI_FLAGS, val); + dw_pcie_dbi_ro_wr_dis(pci); + } + } +} + static int imx6_pcie_suspend_noirq(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); @@ -1050,6 +1071,7 @@ static int imx6_pcie_suspend_noirq(struct device *dev) if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND)) return 0; + imx6_pcie_msi_save_restore(imx6_pcie, true); imx6_pcie_pm_turnoff(imx6_pcie); imx6_pcie_stop_link(imx6_pcie->pci); imx6_pcie_host_exit(pp); @@ -1069,6 +1091,7 @@ static int imx6_pcie_resume_noirq(struct device *dev) ret = imx6_pcie_host_init(pp); if (ret) return ret; + imx6_pcie_msi_save_restore(imx6_pcie, false); dw_pcie_setup_rc(pp); if (imx6_pcie->link_is_up) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-12-08 6:28 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-08 6:05 Richard Zhu [this message] 2022-12-08 6:05 ` [PATCH v2] PCI: imx6: Save and restore MSI control of RC in suspend and resume Richard Zhu 2022-12-30 15:06 ` Lorenzo Pieralisi 2022-12-30 15:06 ` Lorenzo Pieralisi 2023-01-09 2:08 ` Hongxing Zhu 2023-01-09 2:08 ` Hongxing Zhu 2023-03-10 16:13 ` Lorenzo Pieralisi 2023-03-10 16:13 ` Lorenzo Pieralisi 2023-03-13 2:50 ` Hongxing Zhu 2023-03-13 2:50 ` Hongxing Zhu 2023-03-13 17:49 ` Bjorn Helgaas 2023-03-13 17:49 ` Bjorn Helgaas 2023-03-14 3:24 ` Hongxing Zhu 2023-03-14 3:24 ` Hongxing Zhu 2023-03-14 10:27 ` Lorenzo Pieralisi 2023-03-14 10:27 ` Lorenzo Pieralisi 2023-03-16 7:37 ` Hongxing Zhu 2023-03-16 7:37 ` Hongxing Zhu 2023-03-16 8:10 ` Lorenzo Pieralisi 2023-03-16 8:10 ` Lorenzo Pieralisi 2023-03-17 7:38 ` Hongxing Zhu 2023-03-17 7:38 ` Hongxing Zhu 2023-03-17 22:24 ` Bjorn Helgaas 2023-03-17 22:24 ` Bjorn Helgaas 2023-03-20 7:02 ` Hongxing Zhu 2023-03-20 7:02 ` Hongxing Zhu 2023-03-24 15:59 ` Lorenzo Pieralisi 2023-03-24 15:59 ` Lorenzo Pieralisi 2023-03-27 0:22 ` Hongxing Zhu 2023-03-27 0:22 ` Hongxing Zhu 2023-04-05 15:55 ` Lorenzo Pieralisi 2023-04-05 15:55 ` Lorenzo Pieralisi 2023-04-10 6:48 ` Hongxing Zhu 2023-04-10 6:48 ` Hongxing Zhu 2023-06-19 9:07 ` Lorenzo Pieralisi 2023-06-19 9:07 ` Lorenzo Pieralisi 2023-04-11 2:36 ` Serge Semin 2023-04-11 2:36 ` Serge Semin 2023-06-19 9:38 ` Lorenzo Pieralisi 2023-06-19 9:38 ` Lorenzo Pieralisi
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=1670479534-22154-1-git-send-email-hongxing.zhu@nxp.com \ --to=hongxing.zhu@nxp.com \ --cc=bhelgaas@google.com \ --cc=kernel@pengutronix.de \ --cc=l.stach@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ /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.