mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 21:03:32 +00:00
ACPI: scan: Use unique number for instance_no
[ Upstream commiteb50aaf960
] The decrementation of acpi_device_bus_id->instance_no in acpi_device_del() is incorrect, because it may cause a duplicate instance number to be allocated next time a device with the same acpi_device_bus_id is added. Replace above mentioned approach by using IDA framework. While at it, define the instance range to be [0, 4096). Fixes:e49bd2dd5a
("ACPI: use PNPID:instance_no as bus_id of ACPI device") Fixes:ca9dc8d42b
("ACPI / scan: Fix acpi_bus_id_list bookkeeping") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: 4.10+ <stable@vger.kernel.org> # 4.10+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b38568fe75
commit
e5cdbe4190
3 changed files with 34 additions and 6 deletions
|
@ -18,6 +18,8 @@
|
||||||
#ifndef _ACPI_INTERNAL_H_
|
#ifndef _ACPI_INTERNAL_H_
|
||||||
#define _ACPI_INTERNAL_H_
|
#define _ACPI_INTERNAL_H_
|
||||||
|
|
||||||
|
#include <linux/idr.h>
|
||||||
|
|
||||||
#define PREFIX "ACPI: "
|
#define PREFIX "ACPI: "
|
||||||
|
|
||||||
int early_acpi_osi_init(void);
|
int early_acpi_osi_init(void);
|
||||||
|
@ -97,9 +99,11 @@ void acpi_scan_table_handler(u32 event, void *table, void *context);
|
||||||
|
|
||||||
extern struct list_head acpi_bus_id_list;
|
extern struct list_head acpi_bus_id_list;
|
||||||
|
|
||||||
|
#define ACPI_MAX_DEVICE_INSTANCES 4096
|
||||||
|
|
||||||
struct acpi_device_bus_id {
|
struct acpi_device_bus_id {
|
||||||
const char *bus_id;
|
const char *bus_id;
|
||||||
unsigned int instance_no;
|
struct ida instance_ida;
|
||||||
struct list_head node;
|
struct list_head node;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -481,9 +481,8 @@ static void acpi_device_del(struct acpi_device *device)
|
||||||
list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node)
|
list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node)
|
||||||
if (!strcmp(acpi_device_bus_id->bus_id,
|
if (!strcmp(acpi_device_bus_id->bus_id,
|
||||||
acpi_device_hid(device))) {
|
acpi_device_hid(device))) {
|
||||||
if (acpi_device_bus_id->instance_no > 0)
|
ida_simple_remove(&acpi_device_bus_id->instance_ida, device->pnp.instance_no);
|
||||||
acpi_device_bus_id->instance_no--;
|
if (ida_is_empty(&acpi_device_bus_id->instance_ida)) {
|
||||||
else {
|
|
||||||
list_del(&acpi_device_bus_id->node);
|
list_del(&acpi_device_bus_id->node);
|
||||||
kfree_const(acpi_device_bus_id->bus_id);
|
kfree_const(acpi_device_bus_id->bus_id);
|
||||||
kfree(acpi_device_bus_id);
|
kfree(acpi_device_bus_id);
|
||||||
|
@ -634,6 +633,21 @@ static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int acpi_device_set_name(struct acpi_device *device,
|
||||||
|
struct acpi_device_bus_id *acpi_device_bus_id)
|
||||||
|
{
|
||||||
|
struct ida *instance_ida = &acpi_device_bus_id->instance_ida;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
result = ida_simple_get(instance_ida, 0, ACPI_MAX_DEVICE_INSTANCES, GFP_KERNEL);
|
||||||
|
if (result < 0)
|
||||||
|
return result;
|
||||||
|
|
||||||
|
device->pnp.instance_no = result;
|
||||||
|
dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, result);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int acpi_device_add(struct acpi_device *device,
|
int acpi_device_add(struct acpi_device *device,
|
||||||
void (*release)(struct device *))
|
void (*release)(struct device *))
|
||||||
{
|
{
|
||||||
|
@ -668,7 +682,9 @@ int acpi_device_add(struct acpi_device *device,
|
||||||
|
|
||||||
acpi_device_bus_id = acpi_device_bus_id_match(acpi_device_hid(device));
|
acpi_device_bus_id = acpi_device_bus_id_match(acpi_device_hid(device));
|
||||||
if (acpi_device_bus_id) {
|
if (acpi_device_bus_id) {
|
||||||
acpi_device_bus_id->instance_no++;
|
result = acpi_device_set_name(device, acpi_device_bus_id);
|
||||||
|
if (result)
|
||||||
|
goto err_unlock;
|
||||||
} else {
|
} else {
|
||||||
acpi_device_bus_id = kzalloc(sizeof(*acpi_device_bus_id),
|
acpi_device_bus_id = kzalloc(sizeof(*acpi_device_bus_id),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
@ -684,9 +700,16 @@ int acpi_device_add(struct acpi_device *device,
|
||||||
goto err_unlock;
|
goto err_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ida_init(&acpi_device_bus_id->instance_ida);
|
||||||
|
|
||||||
|
result = acpi_device_set_name(device, acpi_device_bus_id);
|
||||||
|
if (result) {
|
||||||
|
kfree(acpi_device_bus_id);
|
||||||
|
goto err_unlock;
|
||||||
|
}
|
||||||
|
|
||||||
list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
|
list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
|
||||||
}
|
}
|
||||||
dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
|
|
||||||
|
|
||||||
if (device->parent)
|
if (device->parent)
|
||||||
list_add_tail(&device->node, &device->parent->children);
|
list_add_tail(&device->node, &device->parent->children);
|
||||||
|
|
|
@ -241,6 +241,7 @@ struct acpi_pnp_type {
|
||||||
|
|
||||||
struct acpi_device_pnp {
|
struct acpi_device_pnp {
|
||||||
acpi_bus_id bus_id; /* Object name */
|
acpi_bus_id bus_id; /* Object name */
|
||||||
|
int instance_no; /* Instance number of this object */
|
||||||
struct acpi_pnp_type type; /* ID type */
|
struct acpi_pnp_type type; /* ID type */
|
||||||
acpi_bus_address bus_address; /* _ADR */
|
acpi_bus_address bus_address; /* _ADR */
|
||||||
char *unique_id; /* _UID */
|
char *unique_id; /* _UID */
|
||||||
|
|
Loading…
Reference in a new issue