| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAHp75Vdzegj_s035==TRHcN+ix1h5A3LPiRfNXpj61UShxiOUA@mail.gmail.com>
Date: Fri, 12 Apr 2019 18:29:45 +0300
From: Andy Shevchenko <andy.shevchenko@...il.com>
To: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Hans de Goede <hdegoede@...hat.com>,
Darren Hart <dvhart@...radead.org>,
Andy Shevchenko <andy@...radead.org>,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Platform Driver <platform-driver-x86@...r.kernel.org>
Subject: Re: [PATCH v3 10/13] platform/x86: intel_cht_int33fe: Provide
software nodes for the devices
On Fri, Apr 12, 2019 at 4:41 PM Heikki Krogerus
<heikki.krogerus@...ux.intel.com> wrote:
>
> Software nodes provide two features that we will need later.
> 1) Software nodes can have references to other software nodes.
> 2) Software nodes can exist before a device entry is created.
>
Reviewed-by: Andy Shevchenko <andy.shevchenko@...il.com>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
> ---
> drivers/platform/x86/intel_cht_int33fe.c | 68 +++++++++++++++++++++---
> 1 file changed, 62 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
> index d586bb22d7e8..863a792d9282 100644
> --- a/drivers/platform/x86/intel_cht_int33fe.c
> +++ b/drivers/platform/x86/intel_cht_int33fe.c
> @@ -27,12 +27,21 @@
>
> #define EXPECTED_PTYPE 4
>
> +enum {
> + INT33FE_NODE_FUSB302,
> + INT33FE_NODE_MAX17047,
> + INT33FE_NODE_PI3USB30532,
> + INT33FE_NODE_MAX,
> +};
> +
> struct cht_int33fe_data {
> struct i2c_client *max17047;
> struct i2c_client *fusb302;
> struct i2c_client *pi3usb30532;
> /* Contain a list-head must be per device */
> struct device_connection connections[4];
> +
> + struct fwnode_handle *node[INT33FE_NODE_MAX];
> };
>
> /*
> @@ -73,6 +82,7 @@ static const struct property_entry max17047_props[] = {
> static int
> cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
> {
> + struct fwnode_handle *fwnode = data->node[INT33FE_NODE_MAX17047];
> struct i2c_client *max17047 = NULL;
> struct i2c_board_info board_info;
> int ret;
> @@ -80,9 +90,7 @@ cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
> i2c_for_each_dev(&max17047, cht_int33fe_check_for_max17047);
> if (max17047) {
> /* Pre-existing i2c-client for the max17047, add device-props */
> - ret = device_add_properties(&max17047->dev, max17047_props);
> - if (ret)
> - return ret;
> + max17047->dev.fwnode->secondary = fwnode;
> /* And re-probe to get the new device-props applied. */
> ret = device_reprobe(&max17047->dev);
> if (ret)
> @@ -93,7 +101,7 @@ cht_int33fe_register_max17047(struct device *dev, struct cht_int33fe_data *data)
> memset(&board_info, 0, sizeof(board_info));
> strlcpy(board_info.type, "max17047", I2C_NAME_SIZE);
> board_info.dev_name = "max17047";
> - board_info.properties = max17047_props;
> + board_info.fwnode = fwnode;
> data->max17047 = i2c_acpi_new_device(dev, 1, &board_info);
> if (IS_ERR(data->max17047))
> return PTR_ERR(data->max17047);
> @@ -109,6 +117,45 @@ static const struct property_entry fusb302_props[] = {
> { }
> };
>
> +static const struct property_entry *props[] = {
> + [INT33FE_NODE_FUSB302] = fusb302_props,
> + [INT33FE_NODE_MAX17047] = max17047_props,
> + [INT33FE_NODE_PI3USB30532] = NULL,
> +};
> +
> +static void cht_int33fe_remove_nodes(struct cht_int33fe_data *data)
> +{
> + int i;
> +
> + for (i = 0; i < INT33FE_NODE_MAX; i++) {
> + fwnode_remove_software_node(data->node[i]);
> + data->node[i] = NULL;
> + }
> +}
> +
> +static int cht_int33fe_add_nodes(struct cht_int33fe_data *data)
> +{
> + struct fwnode_handle *fwnode;
> + int ret;
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(props); i++) {
> + fwnode = fwnode_create_software_node(props[i], NULL);
> + if (IS_ERR(fwnode)) {
> + ret = PTR_ERR(fwnode);
> + goto err_remove_nodes;
> + }
> + data->node[i] = fwnode;
> + }
> +
> + return 0;
> +
> +err_remove_nodes:
> + cht_int33fe_remove_nodes(data);
> +
> + return ret;
> +}
> +
> static int cht_int33fe_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -173,10 +220,14 @@ static int cht_int33fe_probe(struct platform_device *pdev)
> if (!data)
> return -ENOMEM;
>
> + ret = cht_int33fe_add_nodes(data);
> + if (ret)
> + return ret;
> +
> /* Work around BIOS bug, see comment on cht_int33fe_check_for_max17047 */
> ret = cht_int33fe_register_max17047(dev, data);
> if (ret)
> - return ret;
> + goto out_remove_nodes;
>
> data->connections[0].endpoint[0] = "port0";
> data->connections[0].endpoint[1] = "i2c-pi3usb30532-switch";
> @@ -193,7 +244,7 @@ static int cht_int33fe_probe(struct platform_device *pdev)
> memset(&board_info, 0, sizeof(board_info));
> strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
> board_info.dev_name = "fusb302";
> - board_info.properties = fusb302_props;
> + board_info.fwnode = data->node[INT33FE_NODE_FUSB302];
> board_info.irq = fusb302_irq;
>
> data->fusb302 = i2c_acpi_new_device(dev, 2, &board_info);
> @@ -204,6 +255,7 @@ static int cht_int33fe_probe(struct platform_device *pdev)
>
> memset(&board_info, 0, sizeof(board_info));
> board_info.dev_name = "pi3usb30532";
> + board_info.fwnode = data->node[INT33FE_NODE_PI3USB30532];
> strlcpy(board_info.type, "pi3usb30532", I2C_NAME_SIZE);
>
> data->pi3usb30532 = i2c_acpi_new_device(dev, 3, &board_info);
> @@ -224,6 +276,9 @@ static int cht_int33fe_probe(struct platform_device *pdev)
>
> device_connections_remove(data->connections);
>
> +out_remove_nodes:
> + cht_int33fe_remove_nodes(data);
> +
> return ret;
> }
>
> @@ -236,6 +291,7 @@ static int cht_int33fe_remove(struct platform_device *pdev)
> i2c_unregister_device(data->max17047);
>
> device_connections_remove(data->connections);
> + cht_int33fe_remove_nodes(data);
>
> return 0;
> }
> --
> 2.20.1
>
--
With Best Regards,
Andy Shevchenko
Powered by blists - more mailing lists