From: Boris Brezillon <boris.brezillon@collabora.com>
To: Vitor Soares <Vitor.Soares@synopsys.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
Joao.Pinto@synopsys.com, bbrezillon@kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
pgaj@cadence.com, robh+dt@kernel.org,
linux-i3c@lists.infradead.org
Subject: Re: [PATCH v3 2/5] i3c: master: make sure ->boardinfo is initialized in add_i3c_dev_locked()
Date: Thu, 3 Oct 2019 16:29:43 +0200 [thread overview]
Message-ID: <20191003162943.4a0d0274@collabora.com> (raw)
In-Reply-To: <ed18fd927b5759a6a1edb351113ceca615283189.1567608245.git.vitor.soares@synopsys.com>
On Thu, 5 Sep 2019 12:00:35 +0200
Vitor Soares <Vitor.Soares@synopsys.com> wrote:
> The newdev->boardinfo assignment was missing in
> i3c_master_add_i3c_dev_locked() and hence the ->of_node info isn't
> propagated to i3c_dev_desc.
>
> Fix this by trying to initialize device i3c_dev_boardinfo if available.
>
> Cc: <stable@vger.kernel.org>
> Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure")
> Signed-off-by: Vitor Soares <vitor.soares@synopsys.com>
> ---
> Change in v3:
> - None
>
> Changes in v2:
> - Change commit message
> - Change i3c_master_search_i3c_boardinfo(newdev) to
> i3c_master_init_i3c_dev_boardinfo(newdev)
> - Add fixes, stable tags
>
> drivers/i3c/master.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> index 586e34f..9fb99bc 100644
> --- a/drivers/i3c/master.c
> +++ b/drivers/i3c/master.c
> @@ -1798,6 +1798,22 @@ i3c_master_search_i3c_dev_duplicate(struct i3c_dev_desc *refdev)
> return NULL;
> }
>
> +static void i3c_master_init_i3c_dev_boardinfo(struct i3c_dev_desc *dev)
> +{
> + struct i3c_master_controller *master = i3c_dev_get_master(dev);
> + struct i3c_dev_boardinfo *boardinfo;
> +
> + if (dev->boardinfo)
> + return;
> +
> + list_for_each_entry(boardinfo, &master->boardinfo.i3c, node) {
> + if (dev->info.pid == boardinfo->pid) {
> + dev->boardinfo = boardinfo;
> + return;
> + }
> + }
> +}
> +
> /**
> * i3c_master_add_i3c_dev_locked() - add an I3C slave to the bus
> * @master: master used to send frames on the bus
> @@ -1818,8 +1834,9 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
> u8 addr)
> {
> struct i3c_device_info info = { .dyn_addr = addr };
> - struct i3c_dev_desc *newdev, *olddev;
> u8 old_dyn_addr = addr, expected_dyn_addr;
> + enum i3c_addr_slot_status addrstatus;
> + struct i3c_dev_desc *newdev, *olddev;
> struct i3c_ibi_setup ibireq = { };
> bool enable_ibi = false;
> int ret;
> @@ -1878,6 +1895,8 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
> if (ret)
> goto err_detach_dev;
>
> + i3c_master_init_i3c_dev_boardinfo(newdev);
> +
> /*
> * Depending on our previous state, the expected dynamic address might
> * differ:
> @@ -1895,7 +1914,11 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
> else
> expected_dyn_addr = newdev->info.dyn_addr;
>
> - if (newdev->info.dyn_addr != expected_dyn_addr) {
> + addrstatus = i3c_bus_get_addr_slot_status(&master->bus,
> + expected_dyn_addr);
> +
> + if (newdev->info.dyn_addr != expected_dyn_addr &&
> + addrstatus == I3C_ADDR_SLOT_FREE) {
First, this change shouldn't be part of this patch, since the commit
message only mentions the boardinfo init stuff, not the extra 'is slot
free check'. Plus, I want the fix to be backported so we should avoid
any unneeded deps.
But even with those 2 things addressed, I'm still convinced the
'free desc when device is not reachable' change you do in patch 1 is
not that great, and the fact that you can't pre-reserve the address to
make sure no one uses it until the device had a chance to show up tends
to prove me right.
Can we please do what I suggest and solve the "not enough dev slots"
problem later on (if we really have to).
> /*
> * Try to apply the expected dynamic address. If it fails, keep
> * the address assigned by the master.
_______________________________________________
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
next prev parent reply other threads:[~2019-10-04 20:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 10:00 [PATCH v3 0/5] i3c: detach/free device fail pre_assign_dyn_addr() Vitor Soares
2019-09-05 10:00 ` [PATCH v3 1/5] i3c: master: detach/free devices fail on pre_assign_dyn_addr() Vitor Soares
2019-09-17 10:02 ` Vitor Soares
2019-09-05 10:00 ` [PATCH v3 2/5] i3c: master: make sure ->boardinfo is initialized in add_i3c_dev_locked() Vitor Soares
2019-10-03 14:29 ` Boris Brezillon [this message]
2019-10-03 17:37 ` Vitor Soares
2019-10-03 18:35 ` Boris Brezillon
2019-09-05 10:00 ` [PATCH v3 3/5] dt-bindings: i3c: Make 'assigned-address' valid if static address == 0 Vitor Soares
2019-09-05 10:00 ` [PATCH v3 4/5] dt-bindings: i3c: add a note for no guarantee of 'assigned-address' use Vitor Soares
2019-09-05 10:00 ` [PATCH v3 5/5] i3c: master: dw: reattach device on first available location of address table Vitor Soares
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=20191003162943.4a0d0274@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=Joao.Pinto@synopsys.com \
--cc=Vitor.Soares@synopsys.com \
--cc=bbrezillon@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-i3c@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pgaj@cadence.com \
--cc=robh+dt@kernel.org \
--cc=stable@vger.kernel.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).