From patchwork Wed Jun 14 07:42:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 107771 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1066869vqr; Wed, 14 Jun 2023 00:51:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4IJxJMg+Qp9fnRbPOn7GL86Wdd69N3MvBAHMxrfpqnATG+q6h7/2J9T1iRVxX/Ei21+ZCF X-Received: by 2002:a17:907:3da6:b0:978:73fb:1771 with SMTP id he38-20020a1709073da600b0097873fb1771mr731972ejc.32.1686729112145; Wed, 14 Jun 2023 00:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686729112; cv=none; d=google.com; s=arc-20160816; b=YlsRp24quSG1W1vu7dZpDtKLfR4P2h8AHZ/PvLlYbmm5wj2Zogum4d6YBEdOqKXeUE iFJZsi95eyQdnwQADy/60SemI3qHbr+q0Mb++p0c10L6v5+4hjAfDWXMw33jiBpFRHc7 wZc+//Ts1uo49xJ/PXhjFMCPJe0wg/JC9RQFV9zRA6tKL9cUa9H/R3tPkGAz+dLpJ9Gl hd8UV9M9Ta/lXX1aadomd+d6sF59VKRPSK1O1TNYEhPPxy6A+6vzlvm1ihTy7tOuhhWa Bbs7/TPwwX92DlgQ1BxFWps6T7sy0gLy/K8J0WhK0fxNldfX/my4SbdJkuzHa2sXbRM/ LR0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=chELkFfOih8hhbPzYd0dk4ELkRD8JNUEU7NsD8ng/DM=; b=ZPDASYQvJaZvYoxxBLIBtgki2hAZcd1C9aWgA4zb3e34pXfa3WSRqSRn7TdSRdN6Xc qelMv7U52ypxxSJ6WeCF5qP7YlGQ5SfMybdUQkqpC9YeWlcxtX966pWEXgDLeEoTSeEd e8Z9Pcy/tLw7Wdm+ygr1Q5sQlBMJv4cGy7IB6PUG3CH60Nui5V1GzebqjdSHy+osk1af nuRglkey2umOo/pKw5RPKGTJ3dBqFzGI8wPFyogTgiavMqpQrlhuGYxFf0uzm4tbj+BW LMURfR6suqUfgkAbJ+6UjezuByc1IVOLjQnbi23gYq+7cYS61Y/ATBO1ljm0teDJlbqp YKHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r4-20020a1709062cc400b009722bcd89fesi7278915ejr.543.2023.06.14.00.51.27; Wed, 14 Jun 2023 00:51:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243375AbjFNHnK (ORCPT + 99 others); Wed, 14 Jun 2023 03:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234847AbjFNHnC (ORCPT ); Wed, 14 Jun 2023 03:43:02 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 286B01727; Wed, 14 Jun 2023 00:43:00 -0700 (PDT) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 490267A0158; Wed, 14 Jun 2023 09:42:58 +0200 (CEST) From: Ondrej Zary To: helgaas@kernel.org Cc: rjw@rjwysocki.net, gottwald@igel.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-pm@vger.kernel.org, mika.westerberg@linux.intel.com Subject: [PATCH] PCI/PM: Extend Elo i2 quirk to all systems using Continental Z2 board Date: Wed, 14 Jun 2023 09:42:53 +0200 Message-Id: <20230614074253.22318-1-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230608203158.GA1213764@bhelgaas> References: <20230608203158.GA1213764@bhelgaas> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768663665575036752?= X-GMAIL-MSGID: =?utf-8?q?1768663665575036752?= 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 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