From: Hans de Goede <hdegoede@redhat.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Darren Hart <dvhart@infradead.org>,
platform-driver-x86@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-acpi@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Wolfram Sang <wsa@the-dreams.de>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-i2c@vger.kernel.org,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1 09/15] platform/x86: i2c-multi-instantiate: Count I2cSerialBus() resources
Date: Wed, 21 Nov 2018 13:03:35 +0100 [thread overview]
Message-ID: <0241e59f-f00b-f1be-9861-62d5da184b24@redhat.com> (raw)
In-Reply-To: <20181120155924.10773-10-andriy.shevchenko@linux.intel.com>
Hi,
On 20-11-18 16:59, Andy Shevchenko wrote:
> Instead of relying on hard coded and thus expected number of I2C clients,
> count the real amount provided by firmware.
>
> This allows to support non-fixed amount of the slaves.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/platform/x86/i2c-multi-instantiate.c | 34 ++++++++++++++++++--
> 1 file changed, 31 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
> index 16a0eabe1e31..d17686e10d08 100644
> --- a/drivers/platform/x86/i2c-multi-instantiate.c
> +++ b/drivers/platform/x86/i2c-multi-instantiate.c
> @@ -12,6 +12,7 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> +#include <linux/types.h>
>
> struct i2c_inst_data {
> const char *type;
> @@ -23,6 +24,31 @@ struct i2c_multi_inst_data {
> struct i2c_client *clients[0];
> };
>
> +static int i2c_multi_inst_count(struct acpi_resource *ares, void *data)
> +{
> + struct acpi_resource_i2c_serialbus *sb;
> + int *count = data;
> +
> + if (i2c_acpi_get_i2c_resource(ares, &sb))
> + *count = *count + 1;
> +
> + return 1;
> +}
> +
> +static int i2c_multi_inst_count_resources(struct acpi_device *adev)
> +{
> + LIST_HEAD(r);
> + int count = 0;
> + int ret;
> +
> + ret = acpi_dev_get_resources(adev, &r, i2c_multi_inst_count, &count);
> + if (ret < 0)
> + return ret;
> +
> + acpi_dev_free_resource_list(&r);
> + return count;
> +}
> +
> static int i2c_multi_inst_probe(struct platform_device *pdev)
> {
> struct i2c_multi_inst_data *multi;
> @@ -44,15 +70,17 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
> adev = ACPI_COMPANION(dev);
>
> /* Count number of clients to instantiate */
> - for (i = 0; inst_data[i].type; i++) {}
> + ret = i2c_multi_inst_count_resources(adev);
> + if (ret < 0)
> + return ret;
>
> multi = devm_kmalloc(dev,
> - offsetof(struct i2c_multi_inst_data, clients[i]),
> + offsetof(struct i2c_multi_inst_data, clients[ret]),
> GFP_KERNEL);
> if (!multi)
> return -ENOMEM;
>
> - multi->num_clients = i;
> + multi->num_clients = ret;
>
> for (i = 0; i < multi->num_clients; i++) {
> memset(&board_info, 0, sizeof(board_info));
Now you end up indexing inst_data with i without checking that inst_data
holds enough data. Not using all of inst_data in case there are less
I2cSerialBus resources then inst_data entries is fine. But you need to
deal with the case when there are more I2cSerialBus resources then inst_data
entries, either by erroring out or ignoring the extra I2cSerialBus resources.
Also it might be better to make the i2c_multi_inst_count_resources() function
a generic helper under drivers/acpi, so that it can be used in other places,
see my comments to the BOSC0200 patch.
Regards,
Hans
next prev parent reply other threads:[~2018-11-21 12:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 15:59 [PATCH v1 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 01/15] platform/x86: intel_cht_int33fe: Remove duplicate NULL check Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 02/15] platform/x86: intel_cht_int33fe: Accept errors of i2c_acpi_new_device() Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 03/15] platform/x86: i2c-multi-instantiate: " Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 04/15] platform/x86: i2c-mutli-instantiate: Defer probe when no adapter found Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 05/15] i2c: acpi: Return error pointers from i2c_acpi_new_device() Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 06/15] i2c: acpi: Assign fwnode for devices created via i2c_acpi_new_device() Andy Shevchenko
2018-11-21 11:44 ` Hans de Goede
2018-11-21 13:35 ` Andy Shevchenko
2018-11-21 14:15 ` Heikki Krogerus
2018-11-20 15:59 ` [PATCH v1 07/15] i2c: acpi: Use ACPI_FAILURE instead of !ACPI_SUCCESS Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 08/15] i2c: acpi: Introduce i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 09/15] platform/x86: i2c-multi-instantiate: Count I2cSerialBus() resources Andy Shevchenko
2018-11-21 12:03 ` Hans de Goede [this message]
2018-11-26 14:32 ` Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 10/15] platform/x86: i2c-multi-instantiate: Distinguish IRQ resource type Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 11/15] platform/x86: i2c-multi-instantiate: Introduce IOAPIC IRQ support Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 12/15] platform/x86: i2c-multi-instantiate: Allow to have same slaves Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 13/15] ACPI / scan: Create platform device for INT3515 ACPI nodes Andy Shevchenko
2018-11-20 15:59 ` [PATCH v1 14/15] ACPI / scan: Create platform device for BOSC0200 " Andy Shevchenko
2018-11-21 12:29 ` Hans de Goede
2018-11-20 15:59 ` [PATCH v1 15/15] iio: inv_mpu6050: Use i2c_acpi_get_i2c_resource() helper Andy Shevchenko
2018-11-21 11:27 ` [PATCH v1 00/15] i2c-multi-instantiate: Adapt for INT3515 and alike Hans de Goede
2018-11-21 12:00 ` Hans de Goede
2018-11-26 14:55 ` Andy Shevchenko
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=0241e59f-f00b-f1be-9861-62d5da184b24@redhat.com \
--to=hdegoede@redhat.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dvhart@infradead.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=jic23@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=wsa@the-dreams.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 NNTP newsgroup(s).