Re: [PATCH V5 06/12] ACPI: introduce platform_id flag

[Rafael J. Wysocki]

On Tuesday, April 08, 2014 12:06:53 AM Zhang Rui wrote:
> Only certain kind of ACPI device objects can be enumerated to platform bus.
> These ACPI device objects include
> 1. ACPI device objects that have _HID control method.
> 2. some ACPI device objects that have Linux specified HID strings.
> 
> In order to distinguish those device objects from the others, a new flag
> platform_id and a new function acpi_add_platform_id() are introduced
> in this patch.
> 
> Currently, only devices with _HID method have this flag set.
> If you want platform devices to be created for device objects without _HID,
> use acpi_add_platform_id() when adding artificial Linux-specific ID strings
> to them.
> 
> Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>

It looks like [12/12] should be folded into this one or bisection may be broken
for somebody.

> ---
>  drivers/acpi/scan.c     |    9 ++++++++-
>  include/acpi/acpi_bus.h |    3 ++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index c82ab73..451e7d9 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1730,6 +1730,13 @@ static void acpi_add_id(struct acpi_device_pnp *pnp, const char *dev_id)
>  	pnp->type.hardware_id = 1;
>  }
>  
> +static void acpi_add_platform_id(struct acpi_device_pnp *pnp,
> +				 const char *dev_id)
> +{
> +	acpi_add_id(pnp, dev_id);
> +	pnp->type.platform_id = 1;
> +}
> +
>  /*
>   * Old IBM workstations have a DSDT bug wherein the SMBus object
>   * lacks the SMBUS01 HID and the methods do not have the necessary "_"
> @@ -1794,7 +1801,7 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
>  		}
>  
>  		if (info->valid & ACPI_VALID_HID)
> -			acpi_add_id(pnp, info->hardware_id.string);
> +			acpi_add_platform_id(pnp, info->hardware_id.string);
>  		if (info->valid & ACPI_VALID_CID) {
>  			cid_list = &info->compatible_id_list;
>  			for (i = 0; i < cid_list->count; i++)
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index ba679af..ec92ad3 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -233,7 +233,8 @@ struct acpi_hardware_id {
>  struct acpi_pnp_type {
>  	u32 hardware_id:1;
>  	u32 bus_address:1;
> -	u32 reserved:30;
> +	u32 platform_id:1;
> +	u32 reserved:29;
>  };
>  
>  struct acpi_device_pnp {
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/