PNPACPI: cope with invalid device IDs

PATCH In review Dmitry Torokhov 3 participants 8 messages Jun 5, 2010 – Oct 1, 2010

Subsystems (2)

ACPI Pnp support

lore

Share & tools

lore

Dmitry Torokhov

author

2010-06-05 02:24 UTC #0 lore raw

cover PNPACPI: cope with invalid device IDs

Bjorn, Len,

Here is the updated version of the patch that handles invalid _HIDs, this time without adding duplicate entriess into the ID list. There is also a second patch adding error handling into pnp_add_device().

Please consider applying.

Thank you,

Signature · 1 line

Dmitry

Dmitry Torokhov

author

2010-06-05 02:24 UTC #1 lore raw

PATCH 1/2 PNPACPI: cope with invalid device IDs

If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.

This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.

Tested-by Jan-Hendrik Zab <[email protected]>

Signed-off-by Dmitry Torokhov <[email protected]>

---

 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

drivers/pnp/pnpacpi/core.c +24 -5

index f7ff628..2029cb5 100644
@@ -28,7 +28,7 @@
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver that
  * can't use pnp layer. We don't need to blacklist device that are directly

@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
+	char *pnpid;
 	struct acpi_hardware_id *id;
 
 	/*

@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	 * driver should not be loaded.
 	 */
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (!is_exclusive_device(device) || !device->status.present)
 		return 0;
 
-	dev = pnp_alloc_dev(&pnpacpi_protocol, num, acpi_device_hid(device));
+	dev = pnp_alloc_dev(&pnpacpi_protocol, num, pnpid);
 	if (!dev)
 		return -ENOMEM;

@@ -204,7 +223,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 		pnpacpi_parse_resource_option_data(dev);
 
 	list_for_each_entry(id, &device->pnp.ids, list) {
-		if (!strcmp(id->id, acpi_device_hid(device)))
+		if (!strcmp(id->id, pnpid))
 			continue;
 		if (!ispnpidacpi(id->id))
 			continue;

Bjorn Helgaas

2010-09-17 22:38 UTC #2 lore raw

Quoted 6 lines · Dmitry Torokhov

If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.
This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.

Sorry, we seem to have dropped the ball on this. Looking at it again, I have another question below:

Quoted 46 lines

 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

drivers/pnp/pnpacpi/core.c +14 -2

index f7ff628..2029cb5 100644
@@ -28,7 +28,7 @@
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver that
  * can't use pnp layer. We don't need to blacklist device that are directly

@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
+	char *pnpid;
 	struct acpi_hardware_id *id;
 
 	/*

@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	 * driver should not be loaded.
 	 */
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||

drivers/pnp/pnpacpi/core.c static int __init pnpacpi_add_device(struct acpi_device *device) · line 193

Quoted 10 lines

drivers/pnp/pnpacpi/core.c +8 -1

-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (!is_exclusive_device(device) || !device->status.present)
 		return 0;

Doesn't this change the sense of the is_exclusive_device() test?

Looks good to me otherwise.

Bjorn

Quoted 16 lines

drivers/pnp/pnpacpi/core.c +2 -2

-	dev = pnp_alloc_dev(&pnpacpi_protocol, num, acpi_device_hid(device));
+	dev = pnp_alloc_dev(&pnpacpi_protocol, num, pnpid);
 	if (!dev)
 		return -ENOMEM;

@@ -204,7 +223,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 		pnpacpi_parse_resource_option_data(dev);
 
 	list_for_each_entry(id, &device->pnp.ids, list) {
-		if (!strcmp(id->id, acpi_device_hid(device)))
+		if (!strcmp(id->id, pnpid))
 			continue;
 		if (!ispnpidacpi(id->id))
 			continue;

Dmitry Torokhov

author

2010-09-17 22:49 UTC #3 lore raw

Quoted 82 lines · Bjorn Helgaas

Quoted 6 lines · Dmitry Torokhov

If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.
This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.

Sorry, we seem to have dropped the ball on this. Looking at it again,

I have another question below:

Quoted 71 lines

 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

drivers/pnp/pnpacpi/core.c +1 -1

index f7ff628..2029cb5 100644
@@ -28,7 +28,7 @@
 
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver

that

* can't use pnp layer. We don't need to blacklist device that are directly

drivers/pnp/pnpacpi/core.c +21 -2

@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = {
 
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
 
+	char *pnpid;
 
 	struct acpi_hardware_id *id;
 
 	/*

@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(struct
 acpi_device *device)
 
 	 * driver should not be loaded.
 	 */
 
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
 
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (!is_exclusive_device(device) || !device->status.present)

Quoted 3 lines

drivers/pnp/pnpacpi/core.c static int __init pnpacpi_add_device(struct acpi_device *device) · line 193
Quoted 1 line
drivers/pnp/pnpacpi/core.c +0 -0
 		return 0;
Doesn't this change the sense of the is_exclusive_device() test?

Yes, it does, "!" shoudl be dropped.

OTOH maybe we should keep the "primary" ID as is (so SYNSYN0003 would still be _the_ id) but only refuse device if none of it's IDs (neither _HID nor _CID) satisfy ispnpidacpi() requirements.

Thanks.

Signature · 1 line

Dmitry

Bjorn Helgaas

2010-09-17 22:56 UTC #4 lore raw

Quoted 87 lines · Dmitry Torokhov

Quoted 82 lines · Bjorn Helgaas
Quoted 6 lines · Dmitry Torokhov
If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.
This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.
Sorry, we seem to have dropped the ball on this. Looking at it again,
I have another question below:
Quoted 71 lines
 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
drivers/pnp/pnpacpi/core.c +1 -1
index f7ff628..2029cb5 100644
@@ -28,7 +28,7 @@
 
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver
that
* can't use pnp layer. We don't need to blacklist device that are directly
drivers/pnp/pnpacpi/core.c +21 -2
@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = {
 
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
 
+	char *pnpid;
 
 	struct acpi_hardware_id *id;
 
 	/*
@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(struct
 acpi_device *device)
 
 	 * driver should not be loaded.
 	 */
 
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
 
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (!is_exclusive_device(device) || !device->status.present)
 
Quoted 3 lines
drivers/pnp/pnpacpi/core.c static int __init pnpacpi_add_device(struct acpi_device *device) · line 193
Quoted 1 line
drivers/pnp/pnpacpi/core.c +0 -0
 		return 0;
Doesn't this change the sense of the is_exclusive_device() test?

Quoted 5 lines

Yes, it does, "!" shoudl be dropped.
OTOH maybe we should keep the "primary" ID as is (so SYNSYN0003 would still be _the_ id) but only refuse device if none of it's IDs (neither _HID nor _CID) satisfy ispnpidacpi() requirements.

I think we *should* keep the entire SYNSYN0003 ID, but I don't think we currently can because we use a fixed-length array to store it. I haven't had time or motivation to fix that yet.

Do you want to post an update fixing the is_exclusive_device() thing?

Bjorn

Dmitry Torokhov

author

2010-09-18 17:11 UTC #5 lore raw

Quoted 90 lines · Bjorn Helgaas

Quoted 89 lines · Dmitry Torokhov
Quoted 82 lines · Bjorn Helgaas
Quoted 6 lines · Dmitry Torokhov
If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.
This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.
Sorry, we seem to have dropped the ball on this. Looking at it again,
I have another question below:
Quoted 71 lines
 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
drivers/pnp/pnpacpi/core.c +1 -1
index f7ff628..2029cb5 100644
@@ -28,7 +28,7 @@
 
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver
that
* can't use pnp layer. We don't need to blacklist device that are directly
drivers/pnp/pnpacpi/core.c +21 -2
@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = {
 
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
 
+	char *pnpid;
 
 	struct acpi_hardware_id *id;
 
 	/*
@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(struct
 acpi_device *device)
 
 	 * driver should not be loaded.
 	 */
 
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
 
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (!is_exclusive_device(device) || !device->status.present)
 
Quoted 3 lines
drivers/pnp/pnpacpi/core.c static int __init pnpacpi_add_device(struct · line 198
Quoted 1 line
drivers/pnp/pnpacpi/core.c +0 -0
 		return 0;
Doesn't this change the sense of the is_exclusive_device() test?
Yes, it does, "!" shoudl be dropped.

Quoted 8 lines

Quoted 3 lines
OTOH maybe we should keep the "primary" ID as is (so SYNSYN0003 would still be _the_ id) but only refuse device if none of it's IDs (neither _HID nor _CID) satisfy ispnpidacpi() requirements.
I think we *should* keep the entire SYNSYN0003 ID, but I don't think we currently can because we use a fixed-length array to store it. I haven't had time or motivation to fix that yet.

Ah, right...

Quoted 2 lines

Do you want to post an update fixing the is_exclusive_device() thing?

Here it is.

Signature · 20 lines

Dmitry


PNPACPI: cope with invalid device IDs

From: Dmitry Torokhov <[email protected]>

If primary ID (HID) is invalid try locating first valid ID on compatible
ID list before giving up.

This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1
which uses SNYSYN0003 as HID. Without the patch users are forced to
boot with i8042.nopnp to make use of their touchpads.

Tested-by: Jan-Hendrik Zab <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
---

 drivers/pnp/pnpacpi/core.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

drivers/pnp/pnpacpi/core.c +24 -5

index dc4e32e..0d943ee 100644
@@ -28,7 +28,7 @@
 #include "../base.h"
 #include "pnpacpi.h"
 
-static int num = 0;
+static int num;
 
 /* We need only to blacklist devices that have already an acpi driver that
  * can't use pnp layer. We don't need to blacklist device that are directly

@@ -180,11 +180,24 @@ struct pnp_protocol pnpacpi_protocol = {
 };
 EXPORT_SYMBOL(pnpacpi_protocol);
 
+static char *pnpacpi_get_id(struct acpi_device *device)
+{
+	struct acpi_hardware_id *id;
+
+	list_for_each_entry(id, &device->pnp.ids, list) {
+		if (ispnpidacpi(id->id))
+			return id->id;
+	}
+
+	return NULL;
+}
+
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
 	acpi_handle temp = NULL;
 	acpi_status status;
 	struct pnp_dev *dev;
+	char *pnpid;
 	struct acpi_hardware_id *id;
 
 	/*

@@ -192,11 +205,17 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	 * driver should not be loaded.
 	 */
 	status = acpi_get_handle(device->handle, "_CRS", &temp);
-	if (ACPI_FAILURE(status) || !ispnpidacpi(acpi_device_hid(device)) ||
-	    is_exclusive_device(device) || (!device->status.present))
+	if (ACPI_FAILURE(status))
+		return 0;
+
+	pnpid = pnpacpi_get_id(device);
+	if (!pnpid)
+		return 0;
+
+	if (is_exclusive_device(device) || !device->status.present)
 		return 0;
 
-	dev = pnp_alloc_dev(&pnpacpi_protocol, num, acpi_device_hid(device));
+	dev = pnp_alloc_dev(&pnpacpi_protocol, num, pnpid);
 	if (!dev)
 		return -ENOMEM;

@@ -227,7 +246,7 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 		pnpacpi_parse_resource_option_data(dev);
 
 	list_for_each_entry(id, &device->pnp.ids, list) {
-		if (!strcmp(id->id, acpi_device_hid(device)))
+		if (!strcmp(id->id, pnpid))
 			continue;
 		if (!ispnpidacpi(id->id))
 			continue;

Len Brown

reviewer

2010-10-01 06:09 UTC #6 lore raw

applied to acpi-test

thanks,
Len Brown, Intel Open Source Technology Center

Dmitry Torokhov

author

2010-06-05 02:24 UTC #7 lore raw

PATCH 2/2 PNPACPI: check return value of pnp_add_device()

In reply to Dmitry Torokhov

pnp_add_device() may fail so we need to ihandle errors and avoid leaking memory. Also, do not use ACPI-specific return codes (AE_OK) but rather standard ones.

Signed-off-by Dmitry Torokhov <[email protected]>

---

 drivers/pnp/pnpacpi/core.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

drivers/pnp/pnpacpi/core.c +10 -3

index 2029cb5..8c5142d 100644
@@ -171,8 +171,9 @@ static char *pnpacpi_get_id(struct acpi_device *device)
 
 static int __init pnpacpi_add_device(struct acpi_device *device)
 {
-	acpi_handle temp = NULL;
+	acpi_handle temp;
 	acpi_status status;
+	int error;
 	struct pnp_dev *dev;
 	char *pnpid;
 	struct acpi_hardware_id *id;

@@ -233,10 +234,16 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	/* clear out the damaged flags */
 	if (!dev->active)
 		pnp_init_resources(dev);
-	pnp_add_device(dev);
+
+	error = pnp_add_device(dev);
+	if (error) {
+		put_device(&dev->dev);
+		return error;
+	}
+
 	num++;
 
-	return AE_OK;
+	return 0;
 }
 
 static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,