From patchwork Sat Nov 2 00:24:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11223957 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B846113BD for ; Sat, 2 Nov 2019 00:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 982C8218DE for ; Sat, 2 Nov 2019 00:24:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eHKbe+UO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727995AbfKBAYZ (ORCPT ); Fri, 1 Nov 2019 20:24:25 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36200 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727297AbfKBAYZ (ORCPT ); Fri, 1 Nov 2019 20:24:25 -0400 Received: by mail-pf1-f194.google.com with SMTP id v19so8108143pfm.3 for ; Fri, 01 Nov 2019 17:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LezSatWohHihzh0HhIGiufhnWt/TD8Ia5dOfWYhDmnY=; b=eHKbe+UOONcj8qkQTHzjdB9YYIqtDnUbEK2VSdeH95FZDWFVAfOtEc1Oy+JCWXu8hh xw05ztBdQFe6LPohjURqTJHPjJ58E+jyhwzeUI/MNCnX7+p1LywE8ZcoT9StWNK400Zm bL16uEvikVZD3tbygPl698Yb5b7AW7DtE1XPY3wCFvJTdx8Of+yLO5Ne5FXkdxjuRitt NRVq99tAntXAHmKtQRwQ1Qp7HCGRRiwyf4wO/7+2lRPRM8SMAFo1rE75W/PgqI9VBFyd GgewgMy5KvCVJDPLk2IV+ayc8DAm1UE/bqJHd364XY7SzUP06ZsLDyUwH7GMqbCV90MX x/SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LezSatWohHihzh0HhIGiufhnWt/TD8Ia5dOfWYhDmnY=; b=O7HsONxk6eFR6iIPfLrpqmGixrB800nOLri7fOoNLjZ2VInOqxP4ZS8eFI3PvTu4xz tP+cNhqY2Lrx98uay+AJ18AVn3KtI7QN93IlS1A7rsEdU5IP+sM6hU20SUBudxwdg+f8 1OpfEA1WUACAwyr8El0pNdYbP7FiZEnrBmXTuZ4Xp2GZNCrfofMUAZQLgeZbP78xD847 q43PD0FNdiZcsE5bqjyjm+Ush0LgOczDlZRnYC069p2PE2zdlp1Xs9Ue4cJmqfO/1oWd j3DKODZmJ959iub08KI4Zf6nv69eR9w9WvUuL5/mmZVsebF46LPb9QOG5ErxDLVv6NTT 6tCQ== X-Gm-Message-State: APjAAAWI91GRJJLQ1nT9T2+hAhKwuBRxYB7nDwII9OBI9py1qXFISs5m MFqh5U+yTqYtrHGWRizmI+WcPA== X-Google-Smtp-Source: APXvYqyHLo4acaa9eCPQ/NgX/Aw4ZtDtvPs0Mzt7YxuCoeTrNIOJiDCbToJ+lxt4mDByh+WDd3q+yg== X-Received: by 2002:a62:1d8d:: with SMTP id d135mr9250453pfd.172.1572654264076; Fri, 01 Nov 2019 17:24:24 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id w2sm7700833pgr.78.2019.11.01.17.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 17:24:23 -0700 (PDT) From: Bjorn Andersson To: Stanimir Varbanov , Lorenzo Pieralisi , Andrew Murray , Bjorn Helgaas Cc: linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM Date: Fri, 1 Nov 2019 17:24:20 -0700 Message-Id: <20191102002420.4091061-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There exists non-bridge PCIe devices with PCI_VENDOR_ID_QCOM, so limit the fixup to only affect the PCIe 2.0 (0x106) and PCIe 3.0 (0x107) bridges. Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson Reviewed-by: Vinod Koul --- drivers/pci/controller/dwc/pcie-qcom.c | 3 ++- include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 35f4980480bb..b91abf4d4905 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1441,7 +1441,8 @@ static void qcom_fixup_class(struct pci_dev *dev) { dev->class = PCI_CLASS_BRIDGE_PCI << 8; } -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCI_ANY_ID, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCIE_DEVICE_ID_QCOM_PCIE20, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, PCIE_DEVICE_ID_QCOM_PCIE30, qcom_fixup_class); static struct platform_driver qcom_pcie_driver = { .probe = qcom_pcie_probe, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 21a572469a4e..3d0724ee4d2f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2413,6 +2413,8 @@ #define PCI_VENDOR_ID_LENOVO 0x17aa #define PCI_VENDOR_ID_QCOM 0x17cb +#define PCIE_DEVICE_ID_QCOM_PCIE20 0x0106 +#define PCIE_DEVICE_ID_QCOM_PCIE30 0x0107 #define PCI_VENDOR_ID_CDNS 0x17cd