Skip to contentSkip to conversation

sony-laptop for Donald Duck's car plate linux

PATCH In review Mattia Dongili 2 participants 4 messages Nov 12, 2013 – Nov 20, 2013

Subsystems (2)
lore
Share & tools
lore

Mattia Dongili

author maintainer
#0 lore raw

cover sony-laptop for Donald Duck's car plate linux

Hi Matthew,
This small set is for 3.13 and includes a patch that I sent previously for inclusion.

[PATCH 1/2] sony-laptop: warn on multiple KBD backlight handles [PATCH 2/2] sony-laptop: fixe typos in sony_laptop_input_keycode_map

Thanks,

Signature · 1 line
Mattia
author maintainer
#1 lore raw

PATCH 1/2 sony-laptop: warn on multiple KBD backlight handles

Some BIOS versions/Vaio models apparently ship with two nearly identical functions to handle backlight related controls.
The only difference seems to be:

        If (LEqual (BUF1, 0x40))
        {
            Store (0x40, P80H)
            Store (BUF2, Local0)
-           And (Local0, One, Local0)
+           And (Local0, 0x03, Local0)
            Store (Local0, ^^H_EC.KLPC)
        }

Avoid erroring out on initialization and messing things up on cleanup for now since we never call into these methods with anything different than 1 or 0.
This issue was found on a Sony VPCSE1V9E/BIOS R2087H4.

---
 drivers/platform/x86/sony-laptop.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/platform/x86/sony-laptop.c +12 -4
index 13ec195..6b63329 100644
@@ -145,7 +145,8 @@ static void sony_nc_thermal_resume(void);
 #endif
 static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
 		unsigned int handle);
-static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd);
+static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd,
+		unsigned int handle);
 
 static int sony_nc_battery_care_setup(struct platform_device *pd,
 		unsigned int handle);
@@ -1444,7 +1445,7 @@ static void sony_nc_function_cleanup(struct platform_device *pd)
 		case 0x014b:
 		case 0x014c:
 		case 0x0163:
-			sony_nc_kbd_backlight_cleanup(pd);
+			sony_nc_kbd_backlight_cleanup(pd, handle);
 			break;
 		default:
 			continue;
@@ -1825,6 +1826,12 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd,
 	int result;
 	int ret = 0;
 
+	if (kbdbl_ctl) {
+		pr_warn("handle 0x%.4x: keyboard backlight setup already done for 0x%.4x\n",
+				handle, kbdbl_ctl->handle);
+		return -EBUSY;
+	}
+
 	/* verify the kbd backlight presence, these handles are not used for
 	 * keyboard backlight only
 	 */
@@ -1884,9 +1891,10 @@ outkzalloc:
 	return ret;
 }
 
-static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd)
+static void sony_nc_kbd_backlight_cleanup(struct platform_device *pd,
+		unsigned int handle)
 {
-	if (kbdbl_ctl) {
+	if (kbdbl_ctl && handle == kbdbl_ctl->handle) {
 		device_remove_file(&pd->dev, &kbdbl_ctl->mode_attr);
 		device_remove_file(&pd->dev, &kbdbl_ctl->timeout_attr);
 		kfree(kbdbl_ctl);
Signature · 1 line
1.8.4.2
#2 lore raw

Re: [PATCH 1/2] sony-laptop: warn on multiple KBD backlight handles

Applied the pair, sorry about the delay.

Signature · 1 line
Matthew Garrett <[email protected]>
author maintainer
#3 lore raw

PATCH 2/2 sony-laptop: fixe typos in sony_laptop_input_keycode_map

In reply to Mattia Dongili

From: Stephen Gildea <[email protected]>

---
 drivers/platform/x86/sony-laptop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/sony-laptop.c +2 -2
index 6b63329..8d80f2c 100644
@@ -305,8 +305,8 @@ static int sony_laptop_input_keycode_map[] = {
 	KEY_FN_F10,	/* 14 SONYPI_EVENT_FNKEY_F10 */
 	KEY_FN_F11,	/* 15 SONYPI_EVENT_FNKEY_F11 */
 	KEY_FN_F12,	/* 16 SONYPI_EVENT_FNKEY_F12 */
-	KEY_FN_F1,	/* 17 SONYPI_EVENT_FNKEY_1 */
-	KEY_FN_F2,	/* 18 SONYPI_EVENT_FNKEY_2 */
+	KEY_FN_1,	/* 17 SONYPI_EVENT_FNKEY_1 */
+	KEY_FN_2,	/* 18 SONYPI_EVENT_FNKEY_2 */
 	KEY_FN_D,	/* 19 SONYPI_EVENT_FNKEY_D */
 	KEY_FN_E,	/* 20 SONYPI_EVENT_FNKEY_E */
 	KEY_FN_F,	/* 21 SONYPI_EVENT_FNKEY_F */
Signature · 1 line
1.8.4.2