LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: John Garry <john.garry@huawei.com>
Cc: rjw@rjwysocki.net, andriy.shevchenko@linux.intel.com,
	linux-acpi@vger.kernel.org, lenb@kernel.org,
	lorenzo.pieralisi@arm.com, linux-kernel@vger.kernel.org,
	arnd@arndb.de, graeme.gregory@linaro.org, helgaas@kernel.org,
	linuxarm@huawei.com, z.liuxinliang@hisilicon.com
Subject: Re: [RFC PATCH 2/2] HISI LPC: Add PNP device support
Date: Fri, 20 Apr 2018 16:12:29 +0300	[thread overview]
Message-ID: <20180420131229.GW2173@lahna.fi.intel.com> (raw)
In-Reply-To: <1524218846-169934-3-git-send-email-john.garry@huawei.com>

On Fri, Apr 20, 2018 at 06:07:26PM +0800, John Garry wrote:
> Currently the driver creates an per-ACPI device mfd_cell
> for child devices. This does not suit devices which are
> PNP-compatible, as we expect PNP-compatible devices to
> derive PNP devices.
> 
> To add PNP device support, we continue to allow the PNP
> scan code to create the PNP device (which have the
> enumeration_by_parent flag set), but expect the PNP
> scan to defer adding the device to allow the host probe
> code to do this. In addition, no longer do we create an
> mfd_cell (platform_device) for PNP-compatible devices.
> 
> We take this approach so that host probe code can
> translate the IO resources of the PNP device prior
> to adding the device.
> 
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
>  drivers/bus/hisi_lpc.c | 38 +++++++++++++++++++++++++++++++++++++-
>  1 file changed, 37 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
> index 2d4611e..d228bc5 100644
> --- a/drivers/bus/hisi_lpc.c
> +++ b/drivers/bus/hisi_lpc.c
> @@ -17,8 +17,11 @@
>  #include <linux/of_address.h>
>  #include <linux/of_platform.h>
>  #include <linux/pci.h>
> +#include <linux/pnp.h>
>  #include <linux/slab.h>
>  
> +#include "../pnp/base.h"
> +
>  #define DRV_NAME "hisi-lpc"
>  
>  /*
> @@ -469,8 +472,11 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
>  	struct acpi_device *child;
>  	int size, ret, count = 0, cell_num = 0;
>  
> -	list_for_each_entry(child, &adev->children, node)
> +	list_for_each_entry(child, &adev->children, node) {
> +		if (acpi_is_pnp_device(child))
> +			continue;
>  		cell_num++;
> +	}
>  
>  	/* allocate the mfd cell and companion ACPI info, one per child */
>  	size = sizeof(*mfd_cells) + sizeof(*hisi_lpc_mfd_cells);
> @@ -492,6 +498,9 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
>  			.pnpid = pnpid,
>  		};
>  
> +		if (acpi_is_pnp_device(child))
> +			continue;
> +
>  		/*
>  		 * For any instances of this host controller (Hip06 and Hip07
>  		 * are the only chipsets), we would not have multiple slaves
> @@ -523,6 +532,33 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
>  		return ret;
>  	}
>  
> +	list_for_each_entry(child, &adev->children, node) {
> +		struct pnp_resource *pnp_res;
> +		struct pnp_dev *pnp_dev;
> +		int rc;
> +
> +		if (!acpi_is_pnp_device(child))
> +			continue;
> +
> +		pnp_dev = child->driver_data;

...or better yet a PNP helper function that makes this more
understandable.

> +
> +		/*
> +		 * Prior to adding the device, we need to translate the
> +		 * resources to logical PIO addresses.
> +		 */
> +		list_for_each_entry(pnp_res, &pnp_dev->resources, list) {
> +			struct resource *res = &pnp_res->res;
> +
> +			if (res->flags | IORESOURCE_IO)

I think you should use

	if (resource_type(res) == IORESOURCE_IO)

instead.

> +				hisi_lpc_acpi_xlat_io_res(child, adev, res);
> +		}
> +		rc = pnp_add_device(pnp_dev);
> +		if (rc) {
> +			put_device(&pnp_dev->dev);
> +			return rc;
> +		}
> +	}
> +
>  	return 0;
>  }
>  
> -- 
> 1.9.1

  parent reply	other threads:[~2018-04-20 13:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-20 10:07 [RFC PATCH 0/2] " John Garry
2018-04-20 10:07 ` [RFC PATCH 1/2] ACPI / PNP: Don't add "enumeration_by_parent" devices John Garry
2018-04-20 13:07   ` Mika Westerberg
2018-04-20 13:24     ` John Garry
2018-04-20 13:52       ` Mika Westerberg
2018-04-20 14:09         ` John Garry
2018-04-26 13:49           ` John Garry
2018-04-26 14:08             ` Mika Westerberg
2018-04-26 14:23               ` John Garry
2018-04-26 14:40                 ` Mika Westerberg
2018-04-27  9:17                 ` John Garry
2018-04-30  5:36                   ` Lee Jones
2018-04-30  9:00                     ` John Garry
2018-04-30  9:26                       ` Lee Jones
2018-04-30  9:35                         ` John Garry
2018-04-30 10:46                           ` Lee Jones
2018-04-30 10:57                             ` John Garry
2018-04-20 10:07 ` [RFC PATCH 2/2] HISI LPC: Add PNP device support John Garry
2018-04-20 12:50   ` Andy Shevchenko
2018-04-20 13:09     ` John Garry
2018-04-20 13:28       ` Andy Shevchenko
2018-04-20 13:32         ` John Garry
2018-04-20 13:12   ` Mika Westerberg [this message]
2018-04-20 13:36     ` John Garry

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=20180420131229.GW2173@lahna.fi.intel.com \
    --to=mika.westerberg@linux.intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=graeme.gregory@linaro.org \
    --cc=helgaas@kernel.org \
    --cc=john.garry@huawei.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=rjw@rjwysocki.net \
    --cc=z.liuxinliang@hisilicon.com \
    --subject='Re: [RFC PATCH 2/2] HISI LPC: Add PNP device support' \
    /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

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).