From: Aniket <aniketmaurya@google.com>
To: "Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Jeremy Kerr" <jk@codeconstruct.com.au>,
"Joel Stanley" <joel@jms.id.au>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org,
Aniket <aniketmaurya@google.com>
Subject: [RFC] i3c: master: Simplify table prep for ENTDAA
Date: Fri, 15 Sep 2023 08:02:04 +0000 [thread overview]
Message-ID: <20230915080204.2701640-1-aniketmaurya@google.com> (raw)
Before ENTDAA, device address table is populated with
the dynamic addresses to be assigned to the discovered
devices.
Since these addresses are referenced using consecutive
indices of the table, simply get indices starting
from the last unused position of free_pos. Subsequent
positions are expected to be empty.
Signed-off-by: Aniket <aniketmaurya@google.com>
---
The current way of preparing table seems unnecessarily compilcated.
The device table index is incremented one by one, so we anyways assume
that all positions are empty after the last occupied one. So we can
omit those checks.
drivers/i3c/master/dw-i3c-master.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index 9332ae5f6419..dbbc96bc1587 100644
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -782,17 +782,15 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
struct dw_i3c_master *master = to_dw_i3c_master(m);
struct dw_i3c_xfer *xfer;
struct dw_i3c_cmd *cmd;
- u32 olddevs, newdevs;
u8 p, last_addr = 0;
- int ret, pos;
+ int ret, pos, start_idx, end_idx;
- olddevs = ~(master->free_pos);
+ start_idx = dw_i3c_master_get_free_pos(master);
+ if (start_idx < 0)
+ return start_idx;
/* Prepare DAT before launching DAA. */
- for (pos = 0; pos < master->maxdevs; pos++) {
- if (olddevs & BIT(pos))
- continue;
-
+ for (pos = start_idx; pos < master->maxdevs; pos++) {
ret = i3c_master_get_free_addr(m, last_addr + 1);
if (ret < 0)
return -ENOSPC;
@@ -811,15 +809,10 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
if (!xfer)
return -ENOMEM;
- pos = dw_i3c_master_get_free_pos(master);
- if (pos < 0) {
- dw_i3c_master_free_xfer(xfer);
- return pos;
- }
cmd = &xfer->cmds[0];
cmd->cmd_hi = 0x1;
- cmd->cmd_lo = COMMAND_PORT_DEV_COUNT(master->maxdevs - pos) |
- COMMAND_PORT_DEV_INDEX(pos) |
+ cmd->cmd_lo = COMMAND_PORT_DEV_COUNT(master->maxdevs - start_idx) |
+ COMMAND_PORT_DEV_INDEX(start_idx) |
COMMAND_PORT_CMD(I3C_CCC_ENTDAA) |
COMMAND_PORT_ADDR_ASSGN_CMD |
COMMAND_PORT_TOC |
@@ -829,13 +822,10 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
if (!wait_for_completion_timeout(&xfer->comp, XFER_TIMEOUT))
dw_i3c_master_dequeue_xfer(master, xfer);
- newdevs = GENMASK(master->maxdevs - cmd->rx_len - 1, 0);
- newdevs &= ~olddevs;
+ end_idx = master->maxdevs - cmd->rx_len;
- for (pos = 0; pos < master->maxdevs; pos++) {
- if (newdevs & BIT(pos))
- i3c_master_add_i3c_dev_locked(m, master->devs[pos].addr);
- }
+ for (pos = start_idx; pos < end_idx; pos++)
+ i3c_master_add_i3c_dev_locked(m, master->devs[pos].addr);
dw_i3c_master_free_xfer(xfer);
--
2.42.0.459.ge4e396fd5e-goog
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
reply other threads:[~2023-09-15 8:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230915080204.2701640-1-aniketmaurya@google.com \
--to=aniketmaurya@google.com \
--cc=alexandre.belloni@bootlin.com \
--cc=jk@codeconstruct.com.au \
--cc=joel@jms.id.au \
--cc=linux-i3c@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).