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: 178349 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp1221030ill; Fri, 1 Nov 2019 17:24:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZR5Pijglwx24bi/syoede6ILcfXjRd/KLdpxAg1GkSQaFKuY5vUcdLVbMOjV2cxbVpZnE X-Received: by 2002:a17:907:426e:: with SMTP id nx22mr5312616ejb.139.1572654269766; Fri, 01 Nov 2019 17:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572654269; cv=none; d=google.com; s=arc-20160816; b=l2wO6bWud8EknED6a1+9t0q9Og1UqBYGI6wQi/J2u0RzO/UKRUxnsipSbUr2Lw1F3P oVDxlFtYXDI4kpLn0rQA6rd9P16jxobNcV8cJy5d+NKAWY32V06a8JMDQr5DJmig9rTk wBWPiJDEX4lrn+Rur0Hj+LFtSr1jI73khG7UBmzr6g6Aa37hOjxtHev709VpSCMavpU3 A4V0d7oOcYlOT8Old0GElKv/DqcRiWyhEpns0xx7D5BEL4yx+svf2DmkFulVNAVCUMAm /DWGBxDl/mj2BlJGQi30k2JNGd/u5as3T9ztrXT3popt1r6ng6AXMYCNMBcOpM4K/Gji Aq6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LezSatWohHihzh0HhIGiufhnWt/TD8Ia5dOfWYhDmnY=; b=SJwfWz9rydXvM3MbtIoGhpqOYbZQ4QW8nN1kXS4kfR0bnrqh5SfS6zDpRuhEzsnJwa 0T+sUKOBab2l9twTwKrqWXlL/T7y4UEbQZg4F6T7DFqTozHCyE0CIcVFRrmNOvXYbpu4 V0IX29B/HFmUs/SSljc4paOh9u2Kz6O1T4kxNxYEdcAQLB+ccxUQeRzT7bSngLGjS5r4 QhV2uS10uQ4xL4qqqReRU7JUKlqzqP9uBlIL+v6VBwrNXAC2Youh7EMnmejuDGqtCdoR WlfrvQBP+GvkKk12MFBHbDITJS5IPkyEUArvSU9w/rvMeYHw4F6Jg/zPYrRg0m0/iJLs SPeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eHKbe+UO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id og20si6882833ejb.29.2019.11.01.17.24.29; Fri, 01 Nov 2019 17:24:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eHKbe+UO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728171AbfKBAYZ (ORCPT + 26 others); Fri, 1 Nov 2019 20:24:25 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38096 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727443AbfKBAYZ (ORCPT ); Fri, 1 Nov 2019 20:24:25 -0400 Received: by mail-pf1-f193.google.com with SMTP id c13so8098411pfp.5 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=sPa+1IMlzYHry++lzNi08e+ylYZA9xsQD5Jl+3LeGO99U3Fq1Z1nfKdaxbacxR/p0D VO0GCzUiOdGiv6aZ2J6AT1ztjyYuRI+SWh2TMMO8Ul5YSSzqaMPkvNfqHTdV5IH5ATqy AF8Ut1JnNR9jiZPCQgMRrbMnQUaIVzXjbP7ljR5exvY/uYzyXPqHwxy6VcT6vk/XcChS Cz34UREe2r37z+9GPVWMLaRGWf4VgCjBORV6B0G4wvFeT/+KOY81PZNDscWQytvtdmFu dYZLqlIXqcvTKuBwPJSM6Fa+KinxCADOEAxzhhGWxNGQdu6S3uINVnKlqzql68pVbvze WG8w== X-Gm-Message-State: APjAAAW9f8t8waZqYpekV8ieaGXnFLuij4EUM73k1KowlHGVshi7Sapc wCqse8Ao86CxqYPsTwofTEEKeA== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- drivers/pci/controller/dwc/pcie-qcom.c | 3 ++- include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.23.0 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