msi-laptop: Add N014 N051 dmi information to scm models table
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/4 msi-laptop: Add N014 N051 dmi information to scm models table
From: Lee, Chun-Yi <[email protected]>
Add new MSI netbook N014 and N051 dmi information to scm models table.
--- drivers/platform/x86/msi-laptop.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-)
drivers/platform/x86/msi-laptop.c +22 -0
@@ -469,6 +469,26 @@ static struct dmi_system_id __initdata msi_dmi_table[] = { }, .callback = dmi_check_cb }, + { + .ident = "MSI N051", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "MICRO-STAR INTERNATIONAL CO., LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-N051"), + DMI_MATCH(DMI_CHASSIS_VENDOR, + "MICRO-STAR INTERNATIONAL CO., LTD") + }, + .callback = dmi_check_cb + }, + { + .ident = "MSI N014", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "MICRO-STAR INTERNATIONAL CO., LTD"), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-N014"), + }, + .callback = dmi_check_cb + }, { } };
@@ -788,3 +808,5 @@ MODULE_ALIAS("dmi:*:svnMicro-StarInternational:pnMS-1058:pvr0581:rvnMSI:rnMS-105MODULE_ALIAS ("dmi:*:svnMicro-StarInternational:pnMS-1412:*:rvnMSI:rnMS-1412:*:cvnMICRO-STARINT'LCO.,LTD:ct10:*" );MODULE_ALIAS ("dmi:*:svnNOTEBOOK:pnSAM2000:pvr0131*:cvnMICRO-STARINT'LCO.,LTD:ct10:*" );MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N034:*" ); +MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N051:*" ); +MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N014:*" );
Signature · 1 line
1.7.1
PATCH 2/4 msi-laptop: Add MSI CR620 notebook dmi information to scm models table
In reply to a message not in the archiveFrom: Lee, Chun-Yi <[email protected]>
Add new MSI notebook CR620 dmi information to scm models table.
--- drivers/platform/x86/msi-laptop.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
drivers/platform/x86/msi-laptop.c +10 -0
@@ -489,6 +489,15 @@ static struct dmi_system_id __initdata msi_dmi_table[] = { }, .callback = dmi_check_cb }, + { + .ident = "MSI CR620", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, + "Micro-Star International"), + DMI_MATCH(DMI_PRODUCT_NAME, "CR620"), + }, + .callback = dmi_check_cb + }, { } };
@@ -810,3 +819,4 @@ MODULE_ALIAS("dmi:*:svnNOTEBOOK:pnSAM2000:pvr0131*:cvnMICRO-STARINT'LCO.,LTD:ct1MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N034:*" );MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N051:*" );MODULE_ALIAS ("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N014:*" ); +MODULE_ALIAS ("dmi:*:svnMicro-StarInternational*:pnCR620:*" );
Signature · 1 line
1.7.1
PATCH 3/4 msi-laptop: Set rfkill init state when msi-laptop intiial
In reply to a message not in the archiveFrom: Lee, Chun-Yi <[email protected]>
Setup Wlan/Bluetooth/3G rfkill initial state to sync with the hardware state from EC 0x2e address.
--- drivers/platform/x86/msi-laptop.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
drivers/platform/x86/msi-laptop.c +24 -0
@@ -581,11 +581,31 @@ static void rfkill_cleanup(void) } } +static void msi_init_rfkill (struct work_struct *ignored) +{ +if (rfk_wlan) { +rfkill_set_sw_state (rfk_wlan, !wlan_s); +rfkill_wlan_set (NULL , !wlan_s); + } +if (rfk_bluetooth) { +rfkill_set_sw_state (rfk_bluetooth, !bluetooth_s); +rfkill_bluetooth_set (NULL , !bluetooth_s); + } +if (rfk_threeg) { +rfkill_set_sw_state (rfk_threeg, !threeg_s); +rfkill_threeg_set (NULL , !threeg_s); + } +} +static DECLARE_DELAYED_WORK(msi_rfkill_init, msi_init_rfkill); +static int rfkill_init (struct platform_device *sdev) {/* add rfkill */ int retval; +/* keep the hardware wireless state */ +get_wireless_state_ec_standard (); + rfk_bluetooth =rfkill_alloc ("msi-bluetooth" , &sdev->dev,RFKILL_TYPE_BLUETOOTH , &rfkill_bluetooth_ops,NULL );
@@ -619,6 +639,10 @@ static int rfkill_init(struct platform_device *sdev) goto err_threeg; } +/* schedule to run rfkill state initial */ +schedule_delayed_work (&msi_rfkill_init, +round_jiffies_relative (1 *HZ )); +return 0 ; err_threeg:
Signature · 1 line
1.7.1
PATCH 4/4 msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
In reply to a message not in the archiveFrom: Lee, Chun-Yi <[email protected]>
There have some MSI netbook change devices state by EC when user press wlan/bluetooth/wwan function keys. So, add a i8042 filter to sync sw state with BIOS when function keys pressed.
--- drivers/platform/x86/msi-laptop.c | 59 ++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-)
drivers/platform/x86/msi-laptop.c +58 -1
@@ -59,6 +59,7 @@#include <linux/backlight.h> #include <linux/platform_device.h> #include <linux/rfkill.h> +#include <linux/i8042.h> #define MSI_DRIVER_VERSION "0.5"
@@ -581,6 +582,46 @@ static void rfkill_cleanup(void) } } +static void msi_update_rfkill (struct work_struct *ignored) +{ +get_wireless_state_ec_standard (); + +if (rfk_wlan) +rfkill_set_sw_state (rfk_wlan, !wlan_s); +if (rfk_bluetooth) +rfkill_set_sw_state (rfk_bluetooth, !bluetooth_s); +if (rfk_threeg) +rfkill_set_sw_state (rfk_threeg, !threeg_s); +} +static DECLARE_DELAYED_WORK(msi_rfkill_work, msi_update_rfkill); + +bool msi_laptop_i8042_filter (unsigned char data,unsigned char str, +struct serio *port) +{ +static bool extended; + +if (str &0x20 ) +return false; + +/* 0x54 wwan, 0x62 bluetooth, 0x76 wlan*/ +if (unlikely (data ==0xe0 )) { + extended = true; +return false; + }else if (unlikely (extended)) { +switch (data) { +case 0x54 : +case 0x62 : +case 0x76 : +schedule_delayed_work (&msi_rfkill_work, +round_jiffies_relative (0.5 *HZ )); +break ; + } + extended = false; + } + +return false; +} +static void msi_init_rfkill (struct work_struct *ignored) {if (rfk_wlan) {
@@ -706,9 +747,24 @@ static int load_scm_model_init(struct platform_device *sdev)/* initial rfkill */ result =rfkill_init (sdev);if (result <0 ) -return result; + goto fail_rfkill; + + result =i8042_install_filter (msi_laptop_i8042_filter); +if (result) { +printk (KERN_WARNING +"msi-laptop: Unable to install key filter\n" ); + goto fail_filter; + }return 0 ; + +fail_filter: +rfkill_cleanup (); + +fail_rfkill: + +return result; + }static int __init msi_init (void )
@@ -819,6 +875,7 @@ static void __exit msi_cleanup(void)platform_driver_unregister (&msipf_driver);backlight_device_unregister (msibl_device); +i8042_remove_filter (msi_laptop_i8042_filter);rfkill_cleanup ();/* Enable automatic brightness control again */
Signature · 1 line
1.7.1
Re: [PATCH 4/4] msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
Quoted 33 lines · Greg Kroah-Hartman
From: Lee, Chun-Yi <[email protected]>
There have some MSI netbook change devices state by EC when user press wlan/bluetooth/wwan function keys. So, add a i8042 filter to sync sw state with BIOS when function keys pressed.
Signed-off-by Lee, Chun-Yi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/platform/x86/msi-laptop.c | 59 ++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-)drivers/platform/x86/msi-laptop.c +6
-0@@ -59,6 +59,7 @@#include <linux/backlight.h> #include <linux/platform_device.h> #include <linux/rfkill.h> +#include <linux/i8042.h> #define MSI_DRIVER_VERSION "0.5"@@ -581,6 +582,46 @@ static void rfkill_cleanup(void) } } +static void msi_update_rfkill (struct work_struct *ignored) +{ +get_wireless_state_ec_standard (); + +if (rfk_wlan)
drivers/platform/x86/msi-laptop.c static void rfkill_cleanup(void) · line 599
Quoted 10 lines
drivers/platform/x86/msi-laptop.c +10
-0+rfkill_set_sw_state (rfk_wlan, !wlan_s); +if (rfk_bluetooth) +rfkill_set_sw_state (rfk_bluetooth, !bluetooth_s); +if (rfk_threeg) +rfkill_set_sw_state (rfk_threeg, !threeg_s); +} +static DECLARE_DELAYED_WORK(msi_rfkill_work, msi_update_rfkill); + +bool msi_laptop_i8042_filter (unsigned char data,unsigned char str, +struct serio *port)
Make it static bool...
Quoted 29 lines
drivers/platform/x86/msi-laptop.c +25
-0+{ +static bool extended; + +if (str &0x20 ) +return false; + +/* 0x54 wwan, 0x62 bluetooth, 0x76 wlan*/ +if (unlikely (data ==0xe0 )) { + extended = true; +return false; + }else if (unlikely (extended)) { +switch (data) { +case 0x54 : +case 0x62 : +case 0x76 : +schedule_delayed_work (&msi_rfkill_work, +round_jiffies_relative (0.5 *HZ )); +break ; + } + extended = false; + } + +return false; +} +static void msi_init_rfkill (struct work_struct *ignored) {if (rfk_wlan) {
drivers/platform/x86/msi-laptop.c static int load_scm_model_init(struct platform_device *sdev) · line 754
Quoted 9 lines
drivers/platform/x86/msi-laptop.c +5
-1@@ -706,9 +747,24 @@ static int load_scm_model_init(struct platform_device *sdev)/* initial rfkill */ result =rfkill_init (sdev);if (result <0 ) -return result; + goto fail_rfkill; + + result =i8042_install_filter (msi_laptop_i8042_filter); +if (result) { + printk(KERN_WARNING
Since we fail driver load this should be error, not warning message.
Quoted 24 lines
drivers/platform/x86/msi-laptop.c +12
-0+ "msi-laptop: Unable to install key filter\n"); + goto fail_filter; + }return 0 ; + +fail_filter: +rfkill_cleanup (); + +fail_rfkill: + +return result; + }static int __init msi_init (void )@@ -819,6 +875,7 @@ static void __exit msi_cleanup(void)platform_driver_unregister (&msipf_driver);backlight_device_unregister (msibl_device); +i8042_remove_filter (msi_laptop_i8042_filter);rfkill_cleanup ();/* Enable automatic brightness control again */
Signature · 1 line
Dmitry
PATCH 4/4 msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
From: Lee, Chun-Yi <[email protected]>
There have some MSI netbook change devices state by EC when user press wlan/bluetooth/wwan function keys. So, add a i8042 filter to sync sw state with BIOS when function keys pressed.
---
v2 - fixed some things Dmitry pointed out - gregkh
drivers/platform/x86/msi-laptop.c | 59 ++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-)
drivers/platform/x86/msi-laptop.c +58 -1
@@ -59,6 +59,7 @@#include <linux/backlight.h> #include <linux/platform_device.h> #include <linux/rfkill.h> +#include <linux/i8042.h> #define MSI_DRIVER_VERSION "0.5"
@@ -581,6 +582,46 @@ static void rfkill_cleanup(void) } } +static void msi_update_rfkill (struct work_struct *ignored) +{ +get_wireless_state_ec_standard (); + +if (rfk_wlan) +rfkill_set_sw_state (rfk_wlan, !wlan_s); +if (rfk_bluetooth) +rfkill_set_sw_state (rfk_bluetooth, !bluetooth_s); +if (rfk_threeg) +rfkill_set_sw_state (rfk_threeg, !threeg_s); +} +static DECLARE_DELAYED_WORK(msi_rfkill_work, msi_update_rfkill); + +static bool msi_laptop_i8042_filter (unsigned char data,unsigned char str, +struct serio *port) +{ +static bool extended; + +if (str &0x20 ) +return false; + +/* 0x54 wwan, 0x62 bluetooth, 0x76 wlan*/ +if (unlikely (data ==0xe0 )) { + extended = true; +return false; + }else if (unlikely (extended)) { +switch (data) { +case 0x54 : +case 0x62 : +case 0x76 : +schedule_delayed_work (&msi_rfkill_work, +round_jiffies_relative (0.5 *HZ )); +break ; + } + extended = false; + } + +return false; +} +static void msi_init_rfkill (struct work_struct *ignored) {if (rfk_wlan) {
@@ -706,9 +747,24 @@ static int load_scm_model_init(struct platform_device *sdev)/* initial rfkill */ result =rfkill_init (sdev);if (result <0 ) -return result; + goto fail_rfkill; + + result =i8042_install_filter (msi_laptop_i8042_filter); +if (result) { +printk (KERN_ERR +"msi-laptop: Unable to install key filter\n" ); + goto fail_filter; + }return 0 ; + +fail_filter: +rfkill_cleanup (); + +fail_rfkill: + +return result; + }static int __init msi_init (void )
@@ -819,6 +875,7 @@ static void __exit msi_cleanup(void)platform_driver_unregister (&msipf_driver);backlight_device_unregister (msibl_device); +i8042_remove_filter (msi_laptop_i8042_filter);rfkill_cleanup ();/* Enable automatic brightness control again */
Re: [PATCH 4/4] msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
drivers/platform/x86/msi-laptop.c static void __exit msi_cleanup(void) · line 878
Quoted 6 lines · Greg KH
static int
__initmsi_init(void)drivers/platform/x86/msi-laptop.c +1
-0@@ -819,6 +875,7 @@ static void __exit msi_cleanup(void)platform_driver_unregister (&msipf_driver);backlight_device_unregister (msibl_device); +i8042_remove_filter (msi_laptop_i8042_filter);
You also need cancel_delayed_work_sync() here. Sorry for not noticing this before.
Quoted 3 lines
drivers/platform/x86/msi-laptop.c +0
-0rfkill_cleanup ();/* Enable automatic brightness control again */
Signature · 1 line
Dmitry
Re: [PATCH 4/4] msi-laptop: Add i8042 filter to sync sw state with BIOS when function key pressed
In reply to Dmitry TorokhovQuoted 38 lines · Dmitry Torokhov
Quoted 37 lines · Greg Kroah-Hartman
From: Lee, Chun-Yi <[email protected]>
There have some MSI netbook change devices state by EC when user press wlan/bluetooth/wwan function keys. So, add a i8042 filter to sync sw state with BIOS when function keys pressed.
Signed-off-by Lee, Chun-Yi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/platform/x86/msi-laptop.c | 59 ++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-)drivers/platform/x86/msi-laptop.c +10
-0@@ -59,6 +59,7 @@#include <linux/backlight.h> #include <linux/platform_device.h> #include <linux/rfkill.h> +#include <linux/i8042.h> #define MSI_DRIVER_VERSION "0.5"@@ -581,6 +582,46 @@ static void rfkill_cleanup(void) } } +static void msi_update_rfkill (struct work_struct *ignored) +{ +get_wireless_state_ec_standard (); + +if (rfk_wlan) +rfkill_set_sw_state (rfk_wlan, !wlan_s); +if (rfk_bluetooth) +rfkill_set_sw_state (rfk_bluetooth, !bluetooth_s); +if (rfk_threeg)
Quoted 8 lines
drivers/platform/x86/msi-laptop.c static void rfkill_cleanup(void) · line 599
Quoted 6 lines
drivers/platform/x86/msi-laptop.c +6
-0+rfkill_set_sw_state (rfk_threeg, !threeg_s); +} +static DECLARE_DELAYED_WORK(msi_rfkill_work, msi_update_rfkill); + +bool msi_laptop_i8042_filter (unsigned char data,unsigned char str, +struct serio *port)Make it static bool...
Will do.
Quoted 7 lines
Quoted 7 lines
drivers/platform/x86/msi-laptop.c +0
-0static void msi_init_rfkill (struct work_struct *ignored) {if (rfk_wlan) {@@ -706,9 +747,24 @@ static int load_scm_model_init(struct platform_device *sdev)/* initial rfkill */ result =rfkill_init (sdev);if (result <0 )
Quoted 8 lines
drivers/platform/x86/msi-laptop.c static int load_scm_model_init(struct platform_device *sdev) · line 754
Quoted 6 lines
drivers/platform/x86/msi-laptop.c +5
-1-return result; + goto fail_rfkill; + + result =i8042_install_filter (msi_laptop_i8042_filter); +if (result) { + printk(KERN_WARNINGSince we fail driver load this should be error, not warning message.
Good point, I'll fix that up as well.
I'll respin this now.
thanks,
greg k-h