diff mbox

[1/1] platform/x86: ideapad-laptop: Add several models to no_hw_rfkill

Message ID 20170725014809.20741-2-aaron.ma@canonical.com
State New
Headers show

Commit Message

Aaron Ma July 25, 2017, 1:48 a.m. UTC 
From: Yang Jiaxun <yjx@flygoat.com>

BugLink: https://bugs.launchpad.net/linux/+bug/1705378

Some Lenovo ideapad models do not have hardware rfkill switches, but
trying to read the rfkill switches through the ideapad-laptop module.
It caused to always reported blocking breaking wifi.

Fix it by adding those models to no_hw_rfkill_list.

Signed-off-by: Yang Jiaxun <yjx@flygoat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
(cherry picked from commit 710c059c248a24609051f5a3dd1d8468cdc675b0)
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/platform/x86/ideapad-laptop.c | 70 +++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

Comments

Po-Hsu Lin July 25, 2017, 3:09 a.m. UTC | #1 
I can't cherry-pick this patch 710c059c248a24609051f5a3dd1d8468cdc675b0 cleanly.
Do you mean backport instead?

Also, we're not patching Yakkety anymore.

On Tue, Jul 25, 2017 at 9:48 AM, Aaron Ma <aaron.ma@canonical.com> wrote:
> From: Yang Jiaxun <yjx@flygoat.com>
>
> BugLink: https://bugs.launchpad.net/linux/+bug/1705378
>
> Some Lenovo ideapad models do not have hardware rfkill switches, but
> trying to read the rfkill switches through the ideapad-laptop module.
> It caused to always reported blocking breaking wifi.
>
> Fix it by adding those models to no_hw_rfkill_list.
>
> Signed-off-by: Yang Jiaxun <yjx@flygoat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> (cherry picked from commit 710c059c248a24609051f5a3dd1d8468cdc675b0)
> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
> ---
>  drivers/platform/x86/ideapad-laptop.c | 70 +++++++++++++++++++++++++++++++++++
>  1 file changed, 70 insertions(+)
>
> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
> index ab162f0208b0..9e9206c7e9a4 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -867,6 +867,76 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
>                 },
>         },
>         {
> +               .ident = "Lenovo V310-14IKB",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14IKB"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo V310-14ISK",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14ISK"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo V310-15IKB",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-15IKB"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 300-15IBR",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IBR"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 300-15IKB",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IKB"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 300S-11IBR",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300S-11BR"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 310-15ABR",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ABR"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 310-15IAP",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15IAP"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad 310-15ISK",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ISK"),
> +               },
> +       },
> +       {
> +               .ident = "Lenovo ideapad Y700-14ISK",
> +               .matches = {
> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-14ISK"),
> +               },
> +       },
> +       {
>                 .ident = "Lenovo ideapad Y700-15ISK",
>                 .matches = {
>                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> --
> 2.13.3
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Aaron Ma July 25, 2017, 3:21 a.m. UTC | #2 
Yes, I mean backporting.

Do you need me to modify the commit?

Regards,
Aaron

On 07/25/2017 11:09 AM, Po-Hsu Lin (Sam) wrote:
> I can't cherry-pick this patch 710c059c248a24609051f5a3dd1d8468cdc675b0 cleanly.
> Do you mean backport instead?
> 
> Also, we're not patching Yakkety anymore.
> 
> On Tue, Jul 25, 2017 at 9:48 AM, Aaron Ma <aaron.ma@canonical.com> wrote:
>> From: Yang Jiaxun <yjx@flygoat.com>
>>
>> BugLink: https://bugs.launchpad.net/linux/+bug/1705378
>>
>> Some Lenovo ideapad models do not have hardware rfkill switches, but
>> trying to read the rfkill switches through the ideapad-laptop module.
>> It caused to always reported blocking breaking wifi.
>>
>> Fix it by adding those models to no_hw_rfkill_list.
>>
>> Signed-off-by: Yang Jiaxun <yjx@flygoat.com>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> (cherry picked from commit 710c059c248a24609051f5a3dd1d8468cdc675b0)
>> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
>> ---
>>  drivers/platform/x86/ideapad-laptop.c | 70 +++++++++++++++++++++++++++++++++++
>>  1 file changed, 70 insertions(+)
>>
>> diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
>> index ab162f0208b0..9e9206c7e9a4 100644
>> --- a/drivers/platform/x86/ideapad-laptop.c
>> +++ b/drivers/platform/x86/ideapad-laptop.c
>> @@ -867,6 +867,76 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
>>                 },
>>         },
>>         {
>> +               .ident = "Lenovo V310-14IKB",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14IKB"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo V310-14ISK",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14ISK"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo V310-15IKB",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-15IKB"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 300-15IBR",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IBR"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 300-15IKB",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IKB"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 300S-11IBR",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300S-11BR"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 310-15ABR",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ABR"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 310-15IAP",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15IAP"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad 310-15ISK",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ISK"),
>> +               },
>> +       },
>> +       {
>> +               .ident = "Lenovo ideapad Y700-14ISK",
>> +               .matches = {
>> +                       DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> +                       DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-14ISK"),
>> +               },
>> +       },
>> +       {
>>                 .ident = "Lenovo ideapad Y700-15ISK",
>>                 .matches = {
>>                         DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
>> --
>> 2.13.3
>>
>>
>> --
>> kernel-team mailing list
>> kernel-team@lists.ubuntu.com
>> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox

Patch

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index ab162f0208b0..9e9206c7e9a4 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -867,6 +867,76 @@  static const struct dmi_system_id no_hw_rfkill_list[] = {
 		},
 	},
 	{
+		.ident = "Lenovo V310-14IKB",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14IKB"),
+		},
+	},
+	{
+		.ident = "Lenovo V310-14ISK",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14ISK"),
+		},
+	},
+	{
+		.ident = "Lenovo V310-15IKB",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-15IKB"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 300-15IBR",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IBR"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 300-15IKB",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IKB"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 300S-11IBR",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300S-11BR"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 310-15ABR",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ABR"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 310-15IAP",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15IAP"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad 310-15ISK",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ISK"),
+		},
+	},
+	{
+		.ident = "Lenovo ideapad Y700-14ISK",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-14ISK"),
+		},
+	},
+	{
 		.ident = "Lenovo ideapad Y700-15ISK",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),