cc: linux-usb
On 04/26/2012 04:50 AM, Lan Tianyu wrote:
> ACPI _PLD and _UPC aml methord can be used to identify the position and
> connectability of usb port. So it is necessary to bind usb with acpi.
>
> Current acpi glue only can bind one struct device to one acpi device node.
> This can not work with usb3.0 hub. The usb3.0 hub has two logical devices.
> Each works for usb2.0 and usb3.0 devices. In the usb subsystem, those two
> logical hubs are treated as two seperate devices that have two struct
> devices. But in the ACPI DSDT, these two logical hubs share one acpi device
> node. So there is a requirement to bind multi struct devices to one acpi
> node. This patch is to resolve such problem.
>
> Following is the acpi device nodes' description under xhci hcd.
> Device (XHC)
> Device (RHUB)
> Device (HSP1)
> Device (HSP2)
> Device (HSP3)
> Device (HSP4)
> Device (SSP1)
> Device (SSP2)
> Device (SSP3)
> Device (SSP4)
>
> Topology in the linux
> device XHC
> usb2.0 logical hub usb3.0 logical hub
> HSP1 SSP1
> HSP2 SSP2
> HSP3 SSP3
> HSP4 SSP4
>
> The acpi node "Device (RHUB)" has two associated linux devices.
> Add list in the acpi_device to record all the struct devices associated
> with the acpi device node. Set maxmium count of devices binding to 16
> for good expansibility. Originally, a link file "physical_node" will
> be created in the procedure. Allocate a node_id and use it to name the
> link file such as "physical_node0". node_id from 0 to 15 according to
> maximum count.
Will user-space be surprised to see "physical_node"
re-named to "physical_node0"?
I think this ABI change
may merit some broader review,
and someplace an ABI Documentation file
will surely have to be updated...
> ACPI node may be binded or unbinded frequently. For
> example, usb devices which support hot plug. Introduce a bitmap
> "physical_node_id_bitmap" to manage the node_id. For example, there
> are 7 devices binding to one acpi node. These devices occupy id0~6.
> One device may be removed and its id is free. Next time, when a device
> is added, the free id can be reused.
please include an example here of the syntax change
to the contents of /proc/acpi/wakeup
>
> Signed-off-by: Lan Tianyu <tianyu.lan@xxxxxxxxx>
> ---
> drivers/acpi/glue.c | 116 +++++++++++++++++++++++++------------------
> drivers/acpi/proc.c | 53 +++++++++++++-------
> drivers/acpi/scan.c | 1 +
> drivers/pnp/pnpacpi/core.c | 7 +--
> include/acpi/acpi_bus.h | 14 +++++-
> 5 files changed, 115 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
> index 29a4a5c..7ba1de0 100644
> --- a/drivers/acpi/glue.c
> +++ b/drivers/acpi/glue.c
> @@ -122,84 +122,102 @@ acpi_handle acpi_get_child(acpi_handle parent, u64 address)
>
> EXPORT_SYMBOL(acpi_get_child);
>
> -/* Link ACPI devices with physical devices */
> -static void acpi_glue_data_handler(acpi_handle handle,
> - void *context)
> -{
> - /* we provide an empty handler */
> -}
> -
> -/* Note: a success call will increase reference count by one */
> -struct device *acpi_get_physical_device(acpi_handle handle)
> -{
> - acpi_status status;
> - struct device *dev;
> -
> - status = acpi_get_data(handle, acpi_glue_data_handler, (void **)&dev);
> - if (ACPI_SUCCESS(status))
> - return get_device(dev);
> - return NULL;
> -}
> -
> -EXPORT_SYMBOL(acpi_get_physical_device);
> -
> static int acpi_bind_one(struct device *dev, acpi_handle handle)
> {
> struct acpi_device *acpi_dev;
> acpi_status status;
> + struct acpi_device_physical_node *physical_node;
> + char physical_node_name[strlen("phyisal_node") + 3];
please use sizeof, #define, and spell it "physical_node"
>
> if (dev->archdata.acpi_handle) {
> dev_warn(dev, "Drivers changed 'acpi_handle'\n");
> return -EINVAL;
> }
> +
> get_device(dev);
> - status = acpi_attach_data(handle, acpi_glue_data_handler, dev);
> - if (ACPI_FAILURE(status)) {
> - put_device(dev);
> - return -EINVAL;
> + status = acpi_bus_get_device(handle, &acpi_dev);
> + if (ACPI_FAILURE(status))
> + goto err;
> +
> + physical_node = kzalloc(sizeof(struct acpi_device_physical_node),
> + GFP_KERNEL);
> + if (!physical_node) {
> + DBG("Memory allocation err!\n");
delete DBG
retval = -ENOMEM
> + goto err;
> }
> - dev->archdata.acpi_handle = handle;
>
> - status = acpi_bus_get_device(handle, &acpi_dev);
> - if (!ACPI_FAILURE(status)) {
> - int ret;
> -
> - ret = sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
> - "firmware_node");
> - ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
> - "physical_node");
> - if (acpi_dev->wakeup.flags.valid)
> - device_set_wakeup_capable(dev, true);
> + /* allocate phyisal node id according to physical_node_id_bitmap */
> + physical_node->node_id =
> + find_first_zero_bit(acpi_dev->physical_node_id_bitmap,
> + ACPI_MAX_PHYSICAL_NODE);
> + if (physical_node->node_id >= ACPI_MAX_PHYSICAL_NODE) {
> + DBG("No free physical node id!\n");
delete DBG
retval = -ENOSPACE?
> + goto err;
> }
>
> + set_bit(physical_node->node_id, acpi_dev->physical_node_id_bitmap);
> + physical_node->dev = dev;
> + list_add_tail(&physical_node->node, &acpi_dev->physical_node_list);
> + acpi_dev->physical_node_count++;
> + dev->archdata.acpi_handle = handle;
> +
> + sprintf(physical_node_name, "physical_node%d", physical_node->node_id);
> + sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
> + physical_node_name);
> + sysfs_create_link(&dev->kobj, &acpi_dev->dev.kobj,
> + "firmware_node");
> +
> + if (acpi_dev->wakeup.flags.valid)
> + device_set_wakeup_capable(dev, true);
> +
> return 0;
> +
> + err:
> + put_device(dev);
> + return -EINVAL;
return retval...
> }
>
> static int acpi_unbind_one(struct device *dev)
> {
> + struct acpi_device_physical_node *entry;
> + struct acpi_device *acpi_dev;
> + acpi_status status;
> + struct list_head *node, *next;
> +
> if (!dev->archdata.acpi_handle)
> return 0;
> - if (dev == acpi_get_physical_device(dev->archdata.acpi_handle)) {
> - struct acpi_device *acpi_dev;
>
> - /* acpi_get_physical_device increase refcnt by one */
> - put_device(dev);
> + status = acpi_bus_get_device(dev->archdata.acpi_handle,
> + &acpi_dev);
> + if (ACPI_FAILURE(status))
> + goto err;
>
> - if (!acpi_bus_get_device(dev->archdata.acpi_handle,
> - &acpi_dev)) {
> - sysfs_remove_link(&dev->kobj, "firmware_node");
> - sysfs_remove_link(&acpi_dev->dev.kobj, "physical_node");
> - }
> + list_for_each_safe(node, next, &acpi_dev->physical_node_list) {
> + char physical_node_name[20];
> +
> + entry = list_entry(node, struct acpi_device_physical_node,
> + node);
> + if (entry->dev != dev)
> + continue;
>
> - acpi_detach_data(dev->archdata.acpi_handle,
> - acpi_glue_data_handler);
> + list_del(node);
> + clear_bit(entry->node_id, acpi_dev->physical_node_id_bitmap);
> +
please check if bind and unbind can run at same time.
if yes, then we need some sort of locking here...
> + acpi_dev->physical_node_count--;
> + sprintf(physical_node_name, "physical_node%d", entry->node_id);
> + sysfs_remove_link(&acpi_dev->dev.kobj, physical_node_name);
> + sysfs_remove_link(&dev->kobj, "firmware_node");
> dev->archdata.acpi_handle = NULL;
> /* acpi_bind_one increase refcnt by one */
> put_device(dev);
> - } else {
> - dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
> + kfree(entry);
> }
> +
> return 0;
> +
> +err:
> + dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
> + return -EINVAL;
> }
>
> static int acpi_platform_notify(struct device *dev)
> diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
> index 251c7b62..bdcb827 100644
> --- a/drivers/acpi/proc.c
> +++ b/drivers/acpi/proc.c
> @@ -302,26 +302,39 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
> list_for_each_safe(node, next, &acpi_wakeup_device_list) {
> struct acpi_device *dev =
> container_of(node, struct acpi_device, wakeup_list);
> - struct device *ldev;
> + struct acpi_device_physical_node *entry;
>
> if (!dev->wakeup.flags.valid)
> continue;
>
> - ldev = acpi_get_physical_device(dev->handle);
> - seq_printf(seq, "%s\t S%d\t%c%-8s ",
> + seq_printf(seq, "%s\t S%d\t%c",
> dev->pnp.bus_id,
> (u32) dev->wakeup.sleep_state,
> - dev->wakeup.flags.run_wake ? '*' : ' ',
> - (device_may_wakeup(&dev->dev)
> - || (ldev && device_may_wakeup(ldev))) ?
> - "enabled" : "disabled");
> - if (ldev)
> - seq_printf(seq, "%s:%s",
> - ldev->bus ? ldev->bus->name : "no-bus",
> - dev_name(ldev));
> - seq_printf(seq, "\n");
> - put_device(ldev);
> -
> + dev->wakeup.flags.run_wake ? '*' : ' ');
> +
> + if (!dev->physical_node_count)
> + seq_printf(seq, "%-8s\n", "disabled");
> + else {
> + struct device *ldev;
> + list_for_each_entry(entry, &dev->physical_node_list,
> + node) {
> + ldev = get_device(entry->dev);
> + if (!ldev)
> + continue;
> +
> + if (&entry->node !=
> + dev->physical_node_list.next)
> + seq_printf(seq, "\t\t");
> +
> + seq_printf(seq, "%-8s %s:%s\n",
> + (device_may_wakeup(&dev->dev) ||
> + (ldev && device_may_wakeup(ldev))) ?
> + "enabled" : "disabled",
> + ldev->bus ? ldev->bus->name :
> + "no-bus", dev_name(ldev));
> + put_device(ldev);
> + }
> + }
> }
> mutex_unlock(&acpi_device_lock);
> return 0;
> @@ -329,12 +342,14 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
>
> static void physical_device_enable_wakeup(struct acpi_device *adev)
> {
> - struct device *dev = acpi_get_physical_device(adev->handle);
> + struct acpi_device_physical_node *entry;
>
> - if (dev && device_can_wakeup(dev)) {
> - bool enable = !device_may_wakeup(dev);
> - device_set_wakeup_enable(dev, enable);
> - }
> + list_for_each_entry(entry,
> + &adev->physical_node_list, node)
> + if (entry->dev && device_can_wakeup(entry->dev)) {
> + bool enable = !device_may_wakeup(entry->dev);
> + device_set_wakeup_enable(entry->dev, enable);
> + }
> }
>
> static ssize_t
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 767e2dc..28cd793 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -463,6 +463,7 @@ static int acpi_device_register(struct acpi_device *device)
> INIT_LIST_HEAD(&device->children);
> INIT_LIST_HEAD(&device->node);
> INIT_LIST_HEAD(&device->wakeup_list);
> + INIT_LIST_HEAD(&device->physical_node_list);
>
> new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
> if (!new_bus_id) {
> diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
> index d21e8f5..d33f006 100644
> --- a/drivers/pnp/pnpacpi/core.c
> +++ b/drivers/pnp/pnpacpi/core.c
> @@ -321,14 +321,9 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
> {
> struct acpi_device *acpi = to_acpi_device(dev);
> struct pnp_dev *pnp = _pnp;
> - struct device *physical_device;
> -
> - physical_device = acpi_get_physical_device(acpi->handle);
> - if (physical_device)
> - put_device(physical_device);
>
> /* true means it matched */
> - return !physical_device
> + return !acpi->physical_node_count
> && compare_pnp_id(pnp->id, acpi_device_hid(acpi));
> }
>
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index f1c8ca6..ff1a6ea 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -252,8 +252,16 @@ struct acpi_device_wakeup {
> int prepare_count;
> };
>
> -/* Device */
> +struct acpi_device_physical_node {
> + u8 node_id;
> + struct list_head node;
> + struct device *dev;
> +};
>
> +/* set maximum of phyisal nodes to 16 for expansibility */
> +#define ACPI_MAX_PHYSICAL_NODE 16
> +
> +/* Device */
> struct acpi_device {
> int device_type;
> acpi_handle handle; /* no handle for fixed hardware */
> @@ -274,6 +282,9 @@ struct acpi_device {
> struct device dev;
> struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */
> enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
> + u8 physical_node_count;
> + struct list_head physical_node_list;
> + DECLARE_BITMAP(physical_node_id_bitmap, ACPI_MAX_PHYSICAL_NODE);
> };
>
> static inline void *acpi_driver_data(struct acpi_device *d)
> @@ -358,7 +369,6 @@ struct acpi_bus_type {
> };
> int register_acpi_bus_type(struct acpi_bus_type *);
> int unregister_acpi_bus_type(struct acpi_bus_type *);
> -struct device *acpi_get_physical_device(acpi_handle);
>
> struct acpi_pci_root {
> struct list_head node;
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
