diff mbox series

pinctrl: cherryview: limit Strago DMI workarounds to version 1.0

Message ID 20171128191435.uxftu3bl4x4f2fxi@dtor-ws
State New
Headers show
Series pinctrl: cherryview: limit Strago DMI workarounds to version 1.0 | expand

Commit Message

Dmitry Torokhov Nov. 28, 2017, 7:14 p.m. UTC
As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
virtual interrupt numbers for keyboard/touchpa/touchscreen controllers
in ACPI tables, they will also update BIOS version number from 1.0
to 1.1. Let's limit the DMI quirks that try to preserve virtual IRQ
numbers on Strago boards to those that still carry BIOSes 1.0.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/pinctrl/intel/pinctrl-cherryview.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Mika Westerberg Nov. 28, 2017, 7:29 p.m. UTC | #1
On Tue, Nov 28, 2017 at 11:14:35AM -0800, Dmitry Torokhov wrote:
> As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
> virtual interrupt numbers for keyboard/touchpa/touchscreen controllers
> in ACPI tables, they will also update BIOS version number from 1.0
> to 1.1. Let's limit the DMI quirks that try to preserve virtual IRQ
> numbers on Strago boards to those that still carry BIOSes 1.0.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Assuming there is no version "0.9" or so having the same issue.
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov Nov. 28, 2017, 7:46 p.m. UTC | #2
On Tue, Nov 28, 2017 at 09:29:47PM +0200, Mika Westerberg wrote:
> On Tue, Nov 28, 2017 at 11:14:35AM -0800, Dmitry Torokhov wrote:
> > As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
> > virtual interrupt numbers for keyboard/touchpa/touchscreen controllers
> > in ACPI tables, they will also update BIOS version number from 1.0
> > to 1.1. Let's limit the DMI quirks that try to preserve virtual IRQ
> > numbers on Strago boards to those that still carry BIOSes 1.0.
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> Assuming there is no version "0.9" or so having the same issue.

No, as far as I can tell they all had the default 1.0...
Andy Shevchenko Nov. 28, 2017, 7:47 p.m. UTC | #3
On Tue, 2017-11-28 at 11:46 -0800, Dmitry Torokhov wrote:
> On Tue, Nov 28, 2017 at 09:29:47PM +0200, Mika Westerberg wrote:
> > On Tue, Nov 28, 2017 at 11:14:35AM -0800, Dmitry Torokhov wrote:
> > > As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
> > > virtual interrupt numbers for keyboard/touchpa/touchscreen
> > > controllers
> > > in ACPI tables, they will also update BIOS version number from 1.0
> > > to 1.1. Let's limit the DMI quirks that try to preserve virtual
> > > IRQ
> > > numbers on Strago boards to those that still carry BIOSes 1.0.
> > > 
> > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
> > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > 
> > Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> > 
> > Assuming there is no version "0.9" or so having the same issue.
> 
> No, as far as I can tell they all had the default 1.0...

Thanks for fixing that eventually!
Guenter Roeck Nov. 28, 2017, 9:55 p.m. UTC | #4
On Tue, Nov 28, 2017 at 11:14:35AM -0800, Dmitry Torokhov wrote:
> As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
> virtual interrupt numbers for keyboard/touchpa/touchscreen controllers
> in ACPI tables, they will also update BIOS version number from 1.0
> to 1.1. Let's limit the DMI quirks that try to preserve virtual IRQ
> numbers on Strago boards to those that still carry BIOSes 1.0.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/pinctrl/intel/pinctrl-cherryview.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
> index be37946182e1..b22ea0fe86f1 100644
> --- a/drivers/pinctrl/intel/pinctrl-cherryview.c
> +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
> @@ -1545,6 +1545,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
>  		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
>  			DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"),
> +			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
>  		},
>  	},
>  	{
> @@ -1552,6 +1553,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
>  		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Setzer"),
> +			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
>  		},
>  	},
>  	{
> @@ -1559,6 +1561,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
>  		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"),
> +			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
>  		},
>  	},
>  	{
> @@ -1566,6 +1569,7 @@ static const struct dmi_system_id chv_no_valid_mask[] = {
>  		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "Celes"),
> +			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
>  		},
>  	},
>  	{}
> -- 
> 2.15.0.417.g466bffb3ac-goog
> 
> 
> -- 
> Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov May 22, 2018, 8:44 p.m. UTC | #5
On Tue, Nov 28, 2017 at 09:47:25PM +0200, Andy Shevchenko wrote:
> On Tue, 2017-11-28 at 11:46 -0800, Dmitry Torokhov wrote:
> > On Tue, Nov 28, 2017 at 09:29:47PM +0200, Mika Westerberg wrote:
> > > On Tue, Nov 28, 2017 at 11:14:35AM -0800, Dmitry Torokhov wrote:
> > > > As Google/Intel will fix the BIOS/Coreboot issues with hardcoding
> > > > virtual interrupt numbers for keyboard/touchpa/touchscreen
> > > > controllers
> > > > in ACPI tables, they will also update BIOS version number from 1.0
> > > > to 1.1. Let's limit the DMI quirks that try to preserve virtual
> > > > IRQ
> > > > numbers on Strago boards to those that still carry BIOSes 1.0.
> > > > 
> > > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=197953
> > > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > > 
> > > Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> > > 
> > > Assuming there is no version "0.9" or so having the same issue.
> > 
> > No, as far as I can tell they all had the default 1.0...
> 
> Thanks for fixing that eventually!

Ugh, so this is broken, as 1.0 is BOARD version and not BIOS. Bios
version is in form of Google_BUILD.BRANCH.PATCH, so we can't really use
it to limit the workaround (as we do not have "less than" comparator).

Anyway, in coreboot we changed board version to 1.1, so we should use
it. I'll post v2. Luckily this patch has not been picked by Linus as far
as I can tell.
diff mbox series

Patch

diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
index be37946182e1..b22ea0fe86f1 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -1545,6 +1545,7 @@  static const struct dmi_system_id chv_no_valid_mask[] = {
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
 			DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"),
+			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
 		},
 	},
 	{
@@ -1552,6 +1553,7 @@  static const struct dmi_system_id chv_no_valid_mask[] = {
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Setzer"),
+			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
 		},
 	},
 	{
@@ -1559,6 +1561,7 @@  static const struct dmi_system_id chv_no_valid_mask[] = {
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"),
+			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
 		},
 	},
 	{
@@ -1566,6 +1569,7 @@  static const struct dmi_system_id chv_no_valid_mask[] = {
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Celes"),
+			DMI_MATCH(DMI_BIOS_VERSION, "1.0"),
 		},
 	},
 	{}