From: Davidlohr Bueso <dave@stgolabs.net>
To: dan.j.williams@intel.com, dave.jiang@intel.com
Cc: jonathan.cameron@huawei.com, alison.schofield@intel.com,
vishal.l.verma@intel.com, ira.weiny@intel.com,
fan.ni@samsung.com, a.manzanares@samsung.com,
sthanneeru.opensrc@micron.com, emirakhur@micron.com,
ajayjoshi@micron.com, Ravis.OpenSrc@micron.com,
sthanneeru@micron.com, dave@stgolabs.net,
linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] cxl/pci: rename cxl_mbox_background_complete()
Date: Mon, 21 Oct 2024 20:18:09 -0700 [thread overview]
Message-ID: <20241022031809.242591-4-dave@stgolabs.net> (raw)
In-Reply-To: <20241022031809.242591-1-dave@stgolabs.net>
With the abort functionality, this is a misleading name,
rename to cxl_mbox_background_done() instead.
Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>
---
drivers/cxl/pci.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 5da50e26e4c4..7b0fad7f6c4d 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -111,7 +111,7 @@ static int cxl_request_irq(struct cxl_dev_state *cxlds, int irq,
dev_id);
}
-static bool cxl_mbox_background_complete(struct cxl_dev_state *cxlds)
+static bool cxl_mbox_background_done(struct cxl_dev_state *cxlds)
{
u64 reg;
@@ -128,7 +128,7 @@ static irqreturn_t cxl_pci_mbox_irq(int irq, void *id)
struct cxl_mailbox *cxl_mbox = &cxlds->cxl_mbox;
struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlds);
- if (!cxl_mbox_background_complete(cxlds))
+ if (!cxl_mbox_background_done(cxlds))
return IRQ_NONE;
reg = readq(cxlds->regs.mbox + CXLDEV_MBOX_BG_CMD_STATUS_OFFSET);
@@ -157,7 +157,7 @@ static void cxl_mbox_sanitize_work(struct work_struct *work)
struct cxl_mailbox *cxl_mbox = &cxlds->cxl_mbox;
mutex_lock(&cxl_mbox->mbox_mutex);
- if (cxl_mbox_background_complete(cxlds)) {
+ if (cxl_mbox_background_done(cxlds)) {
mds->security.poll_tmo_secs = 0;
if (mds->security.sanitize_node)
sysfs_notify_dirent(mds->security.sanitize_node);
@@ -359,7 +359,7 @@ static bool cxl_try_to_cancel_background(struct cxl_mailbox *cxl_mbox)
return false;
}
- if (!cxl_mbox_background_complete(cxlds))
+ if (!cxl_mbox_background_done(cxlds))
return false;
if (mds->security.sanitize_active) {
@@ -398,7 +398,7 @@ static int cxl_pci_mbox_send(struct cxl_mailbox *cxl_mbox,
mutex_lock_io(&cxl_mbox->mbox_mutex);
/*
- * Ensure cxl_mbox_background_complete() checks are safe amongst
+ * Ensure cxl_mbox_background_done() checks are safe amongst
* each other: no new bg operation can occur in between while polling.
*/
if (cxl_is_background_cmd(cmd->opcode)) {
@@ -434,7 +434,7 @@ static int cxl_pci_mbox_send(struct cxl_mailbox *cxl_mbox,
timeout = cmd->poll_interval_ms;
for (i = 0; i < cmd->poll_count; i++) {
if (rcuwait_wait_event_timeout(&cxl_mbox->mbox_wait,
- cxl_mbox_background_complete(cxlds),
+ cxl_mbox_background_done(cxlds),
TASK_UNINTERRUPTIBLE,
msecs_to_jiffies(timeout)) > 0)
break;
@@ -445,7 +445,7 @@ static int cxl_pci_mbox_send(struct cxl_mailbox *cxl_mbox,
* until the next successful command submission and the driver
* can get back in sync with the hardware state.
*/
- if (!cxl_mbox_background_complete(cxlds)) {
+ if (!cxl_mbox_background_done(cxlds)) {
dev_err(dev, "timeout waiting for background (%d ms)\n",
timeout * cmd->poll_count);
rc = -ETIMEDOUT;
--
2.46.1
next prev parent reply other threads:[~2024-10-22 3:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 3:18 [PATCH 0/3] cxl/mbox: support background operation abort requests Davidlohr Bueso
2024-10-22 3:18 ` [PATCH 1/3] cxl/pci: lockless background synchronous polling Davidlohr Bueso
2025-01-14 16:12 ` Dave Jiang
2025-01-14 18:40 ` Jonathan Cameron
2025-01-14 19:30 ` Davidlohr Bueso
2024-10-22 3:18 ` [PATCH 2/3] cxl/mbox: support aborting the current background operation Davidlohr Bueso
2025-01-14 17:00 ` Dave Jiang
2025-01-14 19:33 ` Davidlohr Bueso
2025-01-14 20:25 ` Dave Jiang
2024-10-22 3:18 ` Davidlohr Bueso [this message]
2025-01-14 17:26 ` [PATCH 3/3] cxl/pci: rename cxl_mbox_background_complete() Dave Jiang
2024-10-23 5:32 ` [PATCH 0/3] cxl/mbox: support background operation abort requests Ravis OpenSrc
2024-10-23 14:29 ` Davidlohr Bueso
2024-10-23 21:17 ` Ravis OpenSrc
2024-10-23 23:35 ` Davidlohr Bueso
2024-10-24 6:30 ` Ravis OpenSrc
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=20241022031809.242591-4-dave@stgolabs.net \
--to=dave@stgolabs.net \
--cc=Ravis.OpenSrc@micron.com \
--cc=a.manzanares@samsung.com \
--cc=ajayjoshi@micron.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=emirakhur@micron.com \
--cc=fan.ni@samsung.com \
--cc=ira.weiny@intel.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sthanneeru.opensrc@micron.com \
--cc=sthanneeru@micron.com \
--cc=vishal.l.verma@intel.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: 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