From: Jeffrey Hugo <jhugo@codeaurora.org>
To: arnd@arndb.de, gregkh@linuxfoundation.org
Cc: manivannan.sadhasivam@linaro.org, bjorn.andersson@linaro.org,
wufan@codeaurora.org, pratanan@codeaurora.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeffrey Hugo <jhugo@codeaurora.org>
Subject: [RFC v2 PATCH 6/8] qaic: Implement PCI link status error handlers
Date: Tue, 19 May 2020 08:14:03 -0600 [thread overview]
Message-ID: <1589897645-17088-7-git-send-email-jhugo@codeaurora.org> (raw)
In-Reply-To: <1589897645-17088-1-git-send-email-jhugo@codeaurora.org>
Whenever the link goes down, the device loses all state. Therefore, we
need to be aware of when the link goes down and comes back up so that
our state is kept in sync with the device. Implement the PCI error
handlers to be notified of links tate changes.
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
---
drivers/misc/qaic/mhi_controller.c | 16 ++++++++++++++++
drivers/misc/qaic/mhi_controller.h | 4 ++++
drivers/misc/qaic/qaic_drv.c | 29 +++++++++++++++++++++++++++++
3 files changed, 49 insertions(+)
diff --git a/drivers/misc/qaic/mhi_controller.c b/drivers/misc/qaic/mhi_controller.c
index a667a2f..9ba74fc 100644
--- a/drivers/misc/qaic/mhi_controller.c
+++ b/drivers/misc/qaic/mhi_controller.c
@@ -495,3 +495,19 @@ void qaic_mhi_free_controller(struct mhi_controller *mhi_cntl, bool link_up)
kfree(mhi_cntl->irq);
kfree(mhi_cntl);
}
+
+void qaic_mhi_link_down(struct mhi_controller *mhi_cntl)
+{
+ mhi_power_down(mhi_cntl, false);
+}
+
+void qaic_mhi_link_up(struct mhi_controller *mhi_cntl)
+{
+ struct pci_dev *pci_dev = container_of(mhi_cntl->cntrl_dev,
+ struct pci_dev, dev);
+ int ret;
+
+ ret = mhi_async_power_up(mhi_cntl);
+ if (ret)
+ pci_err(pci_dev, "mhi_async_power_up failed when link came back %d\n", ret);
+}
diff --git a/drivers/misc/qaic/mhi_controller.h b/drivers/misc/qaic/mhi_controller.h
index f5197f1..6dca59d 100644
--- a/drivers/misc/qaic/mhi_controller.h
+++ b/drivers/misc/qaic/mhi_controller.h
@@ -11,4 +11,8 @@ struct mhi_controller *qaic_mhi_register_controller(struct pci_dev *pci_dev,
int mhi_irq);
void qaic_mhi_free_controller(struct mhi_controller *mhi_cntl, bool link_up);
+
+void qaic_mhi_link_down(struct mhi_controller *mhi_cntl);
+void qaic_mhi_link_up(struct mhi_controller *mhi_cntl);
+
#endif /* MHICONTROLLERQAIC_H_ */
diff --git a/drivers/misc/qaic/qaic_drv.c b/drivers/misc/qaic/qaic_drv.c
index e548881..ac4315a 100644
--- a/drivers/misc/qaic/qaic_drv.c
+++ b/drivers/misc/qaic/qaic_drv.c
@@ -484,6 +484,28 @@ static void qaic_pci_remove(struct pci_dev *pdev)
kfree(qdev);
}
+static pci_ers_result_t qaic_pci_error_detected(struct pci_dev *pdev,
+ enum pci_channel_state error)
+{
+ return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static void qaic_pci_reset_prepare(struct pci_dev *pdev)
+{
+ struct qaic_device *qdev = pci_get_drvdata(pdev);
+
+ qaic_dev_reset_clean_local_state(qdev);
+ qaic_mhi_link_down(qdev->mhi_cntl);
+}
+
+static void qaic_pci_reset_done(struct pci_dev *pdev)
+{
+ struct qaic_device *qdev = pci_get_drvdata(pdev);
+
+ qdev->in_reset = false;
+ qaic_mhi_link_up(qdev->mhi_cntl);
+}
+
static const struct mhi_device_id qaic_mhi_match_table[] = {
{ .chan = "QAIC_CONTROL", },
{},
@@ -507,11 +529,18 @@ static const struct pci_device_id ids[] = {
};
MODULE_DEVICE_TABLE(pci, ids);
+static const struct pci_error_handlers qaic_pci_err_handler = {
+ .error_detected = qaic_pci_error_detected,
+ .reset_prepare = qaic_pci_reset_prepare,
+ .reset_done = qaic_pci_reset_done,
+};
+
static struct pci_driver qaic_pci_driver = {
.name = KBUILD_MODNAME,
.id_table = ids,
.probe = qaic_pci_probe,
.remove = qaic_pci_remove,
+ .err_handler = &qaic_pci_err_handler,
};
static int __init qaic_init(void)
--
Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2020-05-19 14:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 14:13 [RFC v2 PATCH 0/8] Qualcomm Cloud AI 100 driver Jeffrey Hugo
2020-05-19 14:13 ` [RFC v2 PATCH 1/8] qaic: Add skeleton driver Jeffrey Hugo
2020-05-19 14:13 ` [RFC v2 PATCH 2/8] qaic: Add and init a basic mhi controller Jeffrey Hugo
2020-05-19 14:14 ` [RFC v2 PATCH 3/8] qaic: Create misc dev Jeffrey Hugo
2020-05-19 14:14 ` [RFC v2 PATCH 4/8] qaic: Implement control path Jeffrey Hugo
2020-05-19 14:14 ` [RFC v2 PATCH 5/8] qaic: Implement data path Jeffrey Hugo
2020-05-19 14:14 ` Jeffrey Hugo [this message]
2020-05-19 14:14 ` [RFC v2 PATCH 7/8] qaic: Implement MHI error status handler Jeffrey Hugo
2020-05-19 14:14 ` [RFC v2 PATCH 8/8] MAINTAINERS: Add entry for QAIC driver Jeffrey Hugo
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=1589897645-17088-7-git-send-email-jhugo@codeaurora.org \
--to=jhugo@codeaurora.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=pratanan@codeaurora.org \
--cc=wufan@codeaurora.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).