Skip to contentSkip to conversation

toshiba_acpi: Make toshiba_eco_mode_available more robust

PATCH In review Azael Avalos 2 participants 3 messages Feb 10, 2015

Subsystems (2)
lore
Share & tools
lore

Azael Avalos

author maintainer
#0 lore raw

PATCH v2 1/1 toshiba_acpi: Make toshiba_eco_mode_available more robust

Some Toshiba laptops do not come with the ECO led installed, however, the driver is registering support for it when it should not.

This patch makes the toshiba_eco_mode_available function more robust in detecting ECO led capabilities, not registering the led on laptops that do not support it and registering the led when it really does.

The ECO led function now returns 0x8e00 (Not Installed) by querying with in[3] = 0, whenever theres no physical LED installed, and returning 0x8300 (Input Data Error) when it is, however, there are some BIOSes that have stub function calls not returning anything and and the LED device was being registered too, hence the change of the default return value from 1 to 0.

---
Changes since v1:
- Removed the comment block from the TOS_NOT_INSTALLED check, the error code as well as the pr_info message is self explanatory.
- Expanded the comment block from the TOS_INPUT_DATA_ERROR check.
- Expanded the commit log a bit explaining some of the changes made in this patch

 drivers/platform/x86/toshiba_acpi.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)
drivers/platform/x86/toshiba_acpi.c +22 -5
index 8b4a78b..278b4bb 100644
@@ -108,6 +108,7 @@ MODULE_LICENSE("GPL");
 #define TOS_FIFO_EMPTY			0x8c00
 #define TOS_DATA_NOT_AVAILABLE		0x8d20
 #define TOS_NOT_INITIALIZED		0x8d50
+#define TOS_NOT_INSTALLED		0x8e00
 
 /* registers */
 #define HCI_FAN				0x0004
@@ -701,16 +702,32 @@ static int toshiba_touchpad_get(struct toshiba_acpi_dev *dev, u32 *state)
 static int toshiba_eco_mode_available(struct toshiba_acpi_dev *dev)
 {
 	acpi_status status;
-	u32 in[TCI_WORDS] = { HCI_GET, HCI_ECO_MODE, 0, 1, 0, 0 };
+	u32 in[TCI_WORDS] = { HCI_GET, HCI_ECO_MODE, 0, 0, 0, 0 };
 	u32 out[TCI_WORDS];
 
 	status = tci_raw(dev, in, out);
-	if (ACPI_FAILURE(status) || out[0] == TOS_INPUT_DATA_ERROR) {
-		pr_info("ACPI call to get ECO led failed\n");
-		return 0;
+	if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
+		pr_err("ACPI call to get ECO led failed\n");
+	} else if (out[0] == TOS_NOT_INSTALLED) {
+		pr_info("ECO led not installed");
+	} else if (out[0] == TOS_INPUT_DATA_ERROR) {
+		/* If we receive 0x8300 (Input Data Error), it means that the
+		 * LED device is present, but that we just screwed the input
+		 * parameters.
+		 * 
+		 * Let's query the status of the LED to see if we really have a
+		 * success response, indicating the truly presense of the LED,
+		 * bail out otherwise.
+		 */
+		in[3] = 1;
+		status = tci_raw(dev, in, out);
+		if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE)
+			pr_err("ACPI call to get ECO led failed\n");
+		else if (out[0] == TOS_SUCCESS)
+			return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 static enum led_brightness toshiba_eco_mode_get_status(struct led_classdev *cdev)
Signature · 1 line
2.2.2
#1 lore raw
Quoted 7 lines · Azael Avalos

Some Toshiba laptops do not come with the ECO led installed, however, the driver is registering support for it when it should not.

This patch makes the toshiba_eco_mode_available function more robust in detecting ECO led capabilities, not registering the led on laptops that do not support it and registering the led when it really does.

Quoted 8 lines

The ECO led function now returns 0x8e00 (Not Installed) by querying with in[3] = 0, whenever theres no physical LED installed, and returning 0x8300 (Input Data Error) when it is, however, there are some BIOSes that have stub function calls not returning anything and and the LED device was being registered too, hence the change of the default return value from 1 to 0.

Careful with whitespace errors caught by checkpatch. Fixed that and corrected a minor grammatical issue in the comment block - since I was late in reviewing ;-)

Applied and queued, thanks.

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center
author maintainer
#2 lore raw

Hi Darren,

2015-02-09 21:22 GMT-07:00 Darren Hart <[email protected]>:

Quoted 15 lines · Azael Avalos
Quoted 14 lines

Some Toshiba laptops do not come with the ECO led installed, however, the driver is registering support for it when it should not.

This patch makes the toshiba_eco_mode_available function more robust in detecting ECO led capabilities, not registering the led on laptops that do not support it and registering the led when it really does.

The ECO led function now returns 0x8e00 (Not Installed) by querying with in[3] = 0, whenever theres no physical LED installed, and returning 0x8300 (Input Data Error) when it is, however, there are some BIOSes that have stub function calls not returning anything and and the LED device was being registered too, hence the change of the default return value from 1 to 0.

Quoted 4 lines
Quoted 1 line

Careful with whitespace errors caught by checkpatch. Fixed that and corrected a minor grammatical issue in the comment block - since I was late in reviewing ;-)

Apologies for that, between my bit of dyslexia (I tend to switch numbers and letters)
and my bad English...

Good thing I'm not working at a bank or stock exchange ;-)

Quoted 6 lines

Applied and queued, thanks.

--
Darren Hart
Intel Open Source Technology Center

Cheers
Azael

Signature · 1 line
-- El mundo apesta y vosotros apestais tambien --