From: Wolfram Sang <wsa+renesas@sang-engineering.com> To: linux-i2c@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, linux-i3c@lists.infradead.org, "Kieran Bingham" <kieran@ksquared.org.uk>, "Niklas Söderlund" <niklas.soderlund@ragnatech.se>, "Luca Ceresoli" <luca@lucaceresoli.net>, "Jacopo Mondi" <jacopo@jmondi.org>, "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>, "Vladimir Zapolskiy" <vz@mleia.com>, linux-kernel@vger.kernel.org, "Wolfram Sang" <wsa+renesas@sang-engineering.com> Subject: [RFC PATCH v2 6/6] i2c: core: hand over reserved devices when requesting ancillary addresses Date: Wed, 18 Mar 2020 16:00:59 +0100 [thread overview] Message-ID: <20200318150059.21714-7-wsa+renesas@sang-engineering.com> (raw) In-Reply-To: <20200318150059.21714-1-wsa+renesas@sang-engineering.com> With i2c_new_ancillary_address, we can check if the intended driver is requesting a reserved address. Update the function to do these checks. If the check passes, the "reserved" device will become a regular "dummy" device. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/i2c-core-base.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 84464e439df5..81fb320de28d 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -974,7 +974,9 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client, const char *name, u16 default_addr) { - struct device_node *np = client->dev.of_node; + struct device_node *reserved_np, *np = client->dev.of_node; + struct device *reserved_dev, *adapter_dev = &client->adapter->dev; + struct i2c_client *reserved_client = NULL; u32 addr = default_addr; int i; @@ -984,7 +986,25 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client, of_property_read_u32_index(np, "reg", i, &addr); } - dev_dbg(&client->adapter->dev, "Address for %s : 0x%x\n", name, addr); + dev_info(adapter_dev, "Address for %s : 0x%x\n", name, addr); + + /* No need to scan muxes, siblings must sit on the same adapter */ + reserved_dev = device_find_child(adapter_dev, &addr, __i2c_check_addr_busy); + if (reserved_dev) { + reserved_np = reserved_dev->of_node; + reserved_client = i2c_verify_client(reserved_dev); + put_device(reserved_dev); + } + + if (reserved_client) { + if (reserved_np != np || + strcmp(reserved_client->name, I2C_RESERVED_DRV_NAME) != 0) + return ERR_PTR(-EBUSY); + + strlcpy(reserved_client->name, I2C_DUMMY_DRV_NAME, sizeof(client->name)); + return reserved_client; + } + return i2c_new_dummy_device(client->adapter, addr); } EXPORT_SYMBOL_GPL(i2c_new_ancillary_device); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa+renesas@sang-engineering.com> To: linux-i2c@vger.kernel.org Cc: "Jacopo Mondi" <jacopo@jmondi.org>, "Niklas Söderlund" <niklas.soderlund@ragnatech.se>, "Wolfram Sang" <wsa+renesas@sang-engineering.com>, linux-kernel@vger.kernel.org, "Vladimir Zapolskiy" <vz@mleia.com>, linux-renesas-soc@vger.kernel.org, "Kieran Bingham" <kieran@bingham.xyz>, "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>, "Luca Ceresoli" <luca@lucaceresoli.net>, linux-i3c@lists.infradead.org Subject: [RFC PATCH v2 6/6] i2c: core: hand over reserved devices when requesting ancillary addresses Date: Wed, 18 Mar 2020 16:00:59 +0100 [thread overview] Message-ID: <20200318150059.21714-7-wsa+renesas@sang-engineering.com> (raw) In-Reply-To: <20200318150059.21714-1-wsa+renesas@sang-engineering.com> With i2c_new_ancillary_address, we can check if the intended driver is requesting a reserved address. Update the function to do these checks. If the check passes, the "reserved" device will become a regular "dummy" device. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/i2c-core-base.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 84464e439df5..81fb320de28d 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -974,7 +974,9 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client, const char *name, u16 default_addr) { - struct device_node *np = client->dev.of_node; + struct device_node *reserved_np, *np = client->dev.of_node; + struct device *reserved_dev, *adapter_dev = &client->adapter->dev; + struct i2c_client *reserved_client = NULL; u32 addr = default_addr; int i; @@ -984,7 +986,25 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client, of_property_read_u32_index(np, "reg", i, &addr); } - dev_dbg(&client->adapter->dev, "Address for %s : 0x%x\n", name, addr); + dev_info(adapter_dev, "Address for %s : 0x%x\n", name, addr); + + /* No need to scan muxes, siblings must sit on the same adapter */ + reserved_dev = device_find_child(adapter_dev, &addr, __i2c_check_addr_busy); + if (reserved_dev) { + reserved_np = reserved_dev->of_node; + reserved_client = i2c_verify_client(reserved_dev); + put_device(reserved_dev); + } + + if (reserved_client) { + if (reserved_np != np || + strcmp(reserved_client->name, I2C_RESERVED_DRV_NAME) != 0) + return ERR_PTR(-EBUSY); + + strlcpy(reserved_client->name, I2C_DUMMY_DRV_NAME, sizeof(client->name)); + return reserved_client; + } + return i2c_new_dummy_device(client->adapter, addr); } EXPORT_SYMBOL_GPL(i2c_new_ancillary_device); -- 2.20.1 _______________________________________________ linux-i3c mailing list linux-i3c@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-i3c
next prev parent reply other threads:[~2020-03-18 15:01 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-18 15:00 [RFC PATCH v2 0/6] i2c: of: reserve unknown and ancillary addresses Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-03-18 15:00 ` [RFC PATCH v2 1/6] i2c: use DEFINE for the dummy driver name Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-04-15 8:09 ` Kieran Bingham 2020-04-15 8:09 ` Kieran Bingham 2020-03-18 15:00 ` [RFC PATCH v2 2/6] i2c: allow DT nodes without 'compatible' Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-04-10 13:49 ` Luca Ceresoli 2020-04-10 13:49 ` Luca Ceresoli 2020-04-15 7:59 ` Wolfram Sang 2020-04-15 7:59 ` Wolfram Sang 2020-04-15 8:07 ` Kieran Bingham 2020-04-15 8:07 ` Kieran Bingham 2020-04-15 8:16 ` Wolfram Sang 2020-04-15 8:16 ` Wolfram Sang 2020-04-15 8:38 ` Kieran Bingham 2020-04-15 8:38 ` Kieran Bingham 2020-04-16 14:53 ` Luca Ceresoli 2020-04-16 14:53 ` Luca Ceresoli 2020-04-15 8:48 ` Kieran Bingham 2020-04-15 8:48 ` Kieran Bingham 2020-04-15 9:46 ` Wolfram Sang 2020-04-15 9:46 ` Wolfram Sang 2020-03-18 15:00 ` [RFC PATCH v2 3/6] i2c: of: remove superfluous parameter from exported function Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-03-19 12:41 ` Boris Brezillon 2020-03-19 12:41 ` Boris Brezillon 2020-04-15 8:13 ` Kieran Bingham 2020-04-15 8:13 ` Kieran Bingham 2020-03-18 15:00 ` [RFC PATCH v2 4/6] i2c: of: error message unification Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-04-10 17:02 ` Luca Ceresoli 2020-04-10 17:02 ` Luca Ceresoli 2020-04-15 8:17 ` Kieran Bingham 2020-04-15 8:17 ` Kieran Bingham 2020-04-15 8:50 ` Kieran Bingham 2020-04-15 8:50 ` Kieran Bingham 2020-03-18 15:00 ` [RFC PATCH v2 5/6] i2c: of: mark a whole array of regs as reserved Wolfram Sang 2020-03-18 15:00 ` Wolfram Sang 2020-04-10 17:05 ` Luca Ceresoli 2020-04-10 17:05 ` Luca Ceresoli 2020-04-13 9:55 ` Luca Ceresoli 2020-04-13 9:55 ` Luca Ceresoli 2020-04-15 8:10 ` Wolfram Sang 2020-04-15 8:10 ` Wolfram Sang 2020-04-15 10:07 ` Luca Ceresoli 2020-04-15 10:07 ` Luca Ceresoli 2020-03-18 15:00 ` Wolfram Sang [this message] 2020-03-18 15:00 ` [RFC PATCH v2 6/6] i2c: core: hand over reserved devices when requesting ancillary addresses Wolfram Sang 2020-04-15 10:07 ` Luca Ceresoli 2020-04-15 10:07 ` Luca Ceresoli 2020-03-28 3:50 ` [RFC PATCH v2 0/6] i2c: of: reserve unknown and " Wolfram Sang 2020-03-28 3:50 ` Wolfram Sang 2020-04-15 8:27 ` Wolfram Sang 2020-04-15 8:27 ` Wolfram Sang 2020-04-15 8:35 ` Kieran Bingham 2020-04-15 8:35 ` Kieran Bingham
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=20200318150059.21714-7-wsa+renesas@sang-engineering.com \ --to=wsa+renesas@sang-engineering.com \ --cc=jacopo@jmondi.org \ --cc=kieran@ksquared.org.uk \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-i3c@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=luca@lucaceresoli.net \ --cc=niklas.soderlund@ragnatech.se \ --cc=vz@mleia.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.