1. Patchew
  2. linux
  3. View series

[PATCH] PCI: PM: Extend Elo i2 quirk to all systems using Continental Z2 board

Ondrej Zary posted 1 patch 2 years, 8 months ago 
drivers/pci/pci.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH] PCI: PM: Extend Elo i2 quirk to all systems using Continental Z2 board
Posted by Ondrej Zary 2 years, 8 months ago 
The quirk for Elo i2 is also needed by EloPOS E2/S2/H2 which uses the
same Continental Z2 board. Change the quirk to match the board instead
of system.
---
 drivers/pci/pci.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5ede93222bc1..c779eb4d7fb8 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2949,13 +2949,13 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
 	{
 		/*
 		 * Downstream device is not accessible after putting a root port
-		 * into D3cold and back into D0 on Elo i2.
+		 * into D3cold and back into D0 on Elo Continental Z2 board
 		 */
-		.ident = "Elo i2",
+		.ident = "Elo Continental Z2",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Elo Touch Solutions"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Elo i2"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"),
+			DMI_MATCH(DMI_BOARD_VENDOR, "Elo Touch Solutions"),
+			DMI_MATCH(DMI_BOARD_NAME, "Geminilake"),
+			DMI_MATCH(DMI_BOARD_VERSION, "Continental Z2"),
 		},
 	},
 #endif
-- 
2.39.2
Re: [PATCH] PCI: PM: Extend Elo i2 quirk to all systems using Continental Z2 board
Posted by Bjorn Helgaas 2 years, 8 months ago 
[+cc Stefan]

s|PCI: PM:|PCI/PM| in the subject to match history.

On Fri, May 19, 2023 at 10:58:53AM +0200, Ondrej Zary wrote:
> The quirk for Elo i2 is also needed by EloPOS E2/S2/H2 which uses the
> same Continental Z2 board. Change the quirk to match the board instead
> of system.

I would mention 92597f97a40b ("PCI/PM: Avoid putting Elo i2 PCIe Ports in 
D3cold") here since it has more details that might be relevant.

Is there a problem report we can point to here?  Oh, I see you chimed
in on https://bugzilla.kernel.org/show_bug.cgi?id=215715.  Let's
include that link here, too.

This also needs a Signed-off-by tag; see
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=v6.3#n363

Maybe also a stable tag since 92597f97a40b had one.

After we have the above tweaks, I plan to apply this unless somebody
objects.

Bjorn

> ---
>  drivers/pci/pci.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 5ede93222bc1..c779eb4d7fb8 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -2949,13 +2949,13 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
>  	{
>  		/*
>  		 * Downstream device is not accessible after putting a root port
> -		 * into D3cold and back into D0 on Elo i2.
> +		 * into D3cold and back into D0 on Elo Continental Z2 board
>  		 */
> -		.ident = "Elo i2",
> +		.ident = "Elo Continental Z2",
>  		.matches = {
> -			DMI_MATCH(DMI_SYS_VENDOR, "Elo Touch Solutions"),
> -			DMI_MATCH(DMI_PRODUCT_NAME, "Elo i2"),
> -			DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"),
> +			DMI_MATCH(DMI_BOARD_VENDOR, "Elo Touch Solutions"),
> +			DMI_MATCH(DMI_BOARD_NAME, "Geminilake"),
> +			DMI_MATCH(DMI_BOARD_VERSION, "Continental Z2"),
>  		},
>  	},
>  #endif
> -- 
> 2.39.2
>
[PATCH] PCI/PM: Extend Elo i2 quirk to all systems using Continental Z2 board
Posted by Ondrej Zary 2 years, 7 months ago 
The quirk for Elo i2 introduced in commit 92597f97a40b ("PCI/PM: Avoid
putting Elo i2 PCIe Ports in D3cold") is also needed by EloPOS E2/S2/H2
which uses the same Continental Z2 board.

Change the quirk to match the board instead of system.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=215715
Signed-off-by: Ondrej Zary <linux@zary.sk>
Cc: stable@vger.kernel.org
---
 drivers/pci/pci.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5ede93222bc1..c779eb4d7fb8 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2949,13 +2949,13 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
 	{
 		/*
 		 * Downstream device is not accessible after putting a root port
-		 * into D3cold and back into D0 on Elo i2.
+		 * into D3cold and back into D0 on Elo Continental Z2 board
 		 */
-		.ident = "Elo i2",
+		.ident = "Elo Continental Z2",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Elo Touch Solutions"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Elo i2"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"),
+			DMI_MATCH(DMI_BOARD_VENDOR, "Elo Touch Solutions"),
+			DMI_MATCH(DMI_BOARD_NAME, "Geminilake"),
+			DMI_MATCH(DMI_BOARD_VERSION, "Continental Z2"),
 		},
 	},
 #endif
-- 
2.39.2
Re: [PATCH] PCI/PM: Extend Elo i2 quirk to all systems using Continental Z2 board
Posted by Bjorn Helgaas 2 years, 7 months ago 
On Wed, Jun 14, 2023 at 09:42:53AM +0200, Ondrej Zary wrote:
> The quirk for Elo i2 introduced in commit 92597f97a40b ("PCI/PM: Avoid
> putting Elo i2 PCIe Ports in D3cold") is also needed by EloPOS E2/S2/H2
> which uses the same Continental Z2 board.
> 
> Change the quirk to match the board instead of system.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=215715
> Signed-off-by: Ondrej Zary <linux@zary.sk>
> Cc: stable@vger.kernel.org

Thanks, I applied this to pci/pm for v6.5 with the following subject
to try to make it easier to connect to product names:

  PCI/PM: Avoid putting EloPOS E2/S2/H2 PCIe Ports in D3cold

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 578bf0d3ec3c..0fb0116ae69f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2956,13 +2956,13 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
 	{
 		/*
 		 * Downstream device is not accessible after putting a root port
-		 * into D3cold and back into D0 on Elo i2.
+		 * into D3cold and back into D0 on Elo Continental Z2 board
 		 */
-		.ident = "Elo i2",
+		.ident = "Elo Continental Z2",
 		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Elo Touch Solutions"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "Elo i2"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"),
+			DMI_MATCH(DMI_BOARD_VENDOR, "Elo Touch Solutions"),
+			DMI_MATCH(DMI_BOARD_NAME, "Geminilake"),
+			DMI_MATCH(DMI_BOARD_VERSION, "Continental Z2"),
 		},
 	},
 #endif

> ---
>  drivers/pci/pci.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 5ede93222bc1..c779eb4d7fb8 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -2949,13 +2949,13 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
>  	{
>  		/*
>  		 * Downstream device is not accessible after putting a root port
> -		 * into D3cold and back into D0 on Elo i2.
> +		 * into D3cold and back into D0 on Elo Continental Z2 board
>  		 */
> -		.ident = "Elo i2",
> +		.ident = "Elo Continental Z2",
>  		.matches = {
> -			DMI_MATCH(DMI_SYS_VENDOR, "Elo Touch Solutions"),
> -			DMI_MATCH(DMI_PRODUCT_NAME, "Elo i2"),
> -			DMI_MATCH(DMI_PRODUCT_VERSION, "RevB"),
> +			DMI_MATCH(DMI_BOARD_VENDOR, "Elo Touch Solutions"),
> +			DMI_MATCH(DMI_BOARD_NAME, "Geminilake"),
> +			DMI_MATCH(DMI_BOARD_VERSION, "Continental Z2"),
>  		},
>  	},
>  #endif
> -- 
> 2.39.2
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.