From patchwork Fri Dec 27 01:27:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11310801 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 AC492138C for ; Fri, 27 Dec 2019 01:27:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F0BE20838 for ; Fri, 27 Dec 2019 01:27:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="btjOcsmz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727000AbfL0B1y (ORCPT ); Thu, 26 Dec 2019 20:27:54 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35668 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726804AbfL0B1x (ORCPT ); Thu, 26 Dec 2019 20:27:53 -0500 Received: by mail-pf1-f196.google.com with SMTP id i23so8580066pfo.2 for ; Thu, 26 Dec 2019 17:27:53 -0800 (PST) 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=yRlWtIcQUsLKShnJr6O+2Jcc7yVY+hw3WSlirQFQtWs=; b=btjOcsmzB3eli/6pjctJta/MabRyX8p1QS6dwLFAxMubblG9fXM8Bf7onRm+8ZDxXU SOsq7s5EreR2eT+mDSaLjY61yRlndP8HeEAhUp7ezBMFy+K/way9A54AMsn2JgGuaIuP STn5JbYY+xgWbvXLOAOhsosDu3SQrCzB5qDrFaB9EWG3/s1eFdYWVgLMtc+pOSgWM5jX EPTGIkidysOVI3UCiTtUw69zbGG8pd+jVt8SE5eTBu8kKWNp/TpmDsU8U67DWKfS41Cj K5u8AtWCGBB5hCGLOwSDa4RICEtQshr5kwkVVYNLJRTvh4ent9GFXM8bvRXtVnZnUGfW Y6/A== 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=yRlWtIcQUsLKShnJr6O+2Jcc7yVY+hw3WSlirQFQtWs=; b=dz0YTirbLL7FJemtOvUH/f1AkuXa8I538BWN14j66mqYlanJvB6WVk8NxBY2tiCVZ5 7pp3TVQnnTFKtCyhugkZ7Ob/nOEl6yDYxkvtU9rF+tJ6Db4QROR+DMNp9OhS3RVOfpfx aFb/sGUut8UViz8aAgwcV2UPdsO2ov7ILAz2q8/7cfgySucvVyH98UGpxA3kXA35lZ2L nJs/ebofR4H790w1aT4NZYw1SmN0ifxT8vbC2ppMKeaurFiCNBriztroa6Ulek3NdUP2 lk6nnL9Fy13OvDTSci1u0t+lqlfa8vIJ/mDIhYsUHCp/SPpmTEId1TW9SgO1yIk+MCDx HsGw== X-Gm-Message-State: APjAAAU9XKz4t6kzO7BmxgMiXJMZAl45/N7Mrv9otqsTFxsJy9s5Qfjm T+0pEVV7xPgmAsYcE8yyyq+igQ== X-Google-Smtp-Source: APXvYqxh78dSzfk4bN9uQtL+xMtUE95dpqDcuu+Cy1dcRpt9DnzYP8G4XdfL7ANBtCsLOLGzENG0Bw== X-Received: by 2002:a63:7311:: with SMTP id o17mr49136128pgc.29.1577410072994; Thu, 26 Dec 2019 17:27:52 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id s21sm16769185pfe.20.2019.12.26.17.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 17:27:52 -0800 (PST) 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, Marc Gonzalez , stable@vger.kernel.org Subject: [PATCH v2] PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM Date: Thu, 26 Dec 2019 17:27:17 -0800 Message-Id: <20191227012717.78965-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.24.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 relevant PCIe bridges. Cc: stable@vger.kernel.org Signed-off-by: Bjorn Andersson Acked-by: Stanimir Varbanov --- Stan, I picked up all the suggested device id's from the previous thread and added 0x1000 for QCS404. I looked at creating platform specific defines in pci_ids.h, but SDM845 has both 106 and 107... Please let me know if you would prefer that I do this anyway. drivers/pci/controller/dwc/pcie-qcom.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 5ea527a6bd9f..138e1a2d21cc 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1439,7 +1439,13 @@ 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, 0x0101, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x0104, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x0106, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x0107, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x0302, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x1000, qcom_fixup_class); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x1001, qcom_fixup_class); static struct platform_driver qcom_pcie_driver = { .probe = qcom_pcie_probe,