Re: [PATCH v2] PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM

From: Lorenzo Pieralisi
Date: Wed Feb 26 2020 - 06:05:58 EST


On Wed, Feb 26, 2020 at 12:56:23PM +0200, Stanimir Varbanov wrote:
> Hi Lorenzo,
>
> On 2/26/20 12:22 PM, Lorenzo Pieralisi wrote:
> > On Thu, Dec 26, 2019 at 05:27:17PM -0800, Bjorn Andersson wrote:
> >> There exists non-bridge PCIe devices with PCI_VENDOR_ID_QCOM, so limit
> >> the fixup to only affect the relevant PCIe bridges.
> >>
> >> Cc: stable@xxxxxxxxxxxxxxx
> >
> > Hi Bjorn,
> >
> > to simplify stable's merging, would you mind helping me with
> > the stable releases you want this patch to apply to please ?
> >
>
> We've to have this in the patch:
>
> Cc: stable@xxxxxxxxxxxxxxx # v5.2+
> Fixes: 322f03436692 ("PCI: qcom: Use default config space read function")

Done, applied to pci/qcom for v5.7.

Thanks,
Lorenzo

> > I will apply it then.
> >
> > Thanks,
> > Lorenzo
> >
> >> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> >> ---
> >>
> >> 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,
> >> --
> >> 2.24.0
> >>
>
> --
> regards,
> Stan