| Message ID | 20230614074253.22318-1-linux@zary.sk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 57c1aae01a2bb33a90c6096fb7f7d6bbabb71322 |
| Headers | show |
| Series | PCI/PM: Extend Elo i2 quirk to all systems using Continental Z2 board | expand |
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 >
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
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(-)