Commit 967ef98b authored by Huacai Chen's avatar Huacai Chen Committed by sanglipeng
Browse files

PCI: loongson: Add more devices that need MRRS quirk 

stable inclusion
from stable-v5.10.173
commit faa050d2ff8820f450b69b84645e74b6934ed5ad
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7X0QU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=faa050d2ff8820f450b69b84645e74b6934ed5ad

--------------------------------

[ Upstream commit c768f8c5 ]

Loongson-2K SOC and LS7A2000 chipset add new PCI IDs that need MRRS
quirk.  Add them.

Link: https://lore.kernel.org/r/20230211023321.3530080-1-chenhuacai@loongson.cn


Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 9c7067ed

drivers/pci/controller/pci-loongson.c

+24 −9
Original line number Diff line number Diff line
@@ -16,9 +16,14 @@ 
#include "../pci.h"



/* Device IDs */

#define DEV_PCIE_PORT_0	0x7a09

#define DEV_PCIE_PORT_1	0x7a19

#define DEV_PCIE_PORT_2	0x7a29

#define DEV_LS2K_PCIE_PORT0	0x1a05

#define DEV_LS7A_PCIE_PORT0	0x7a09

#define DEV_LS7A_PCIE_PORT1	0x7a19

#define DEV_LS7A_PCIE_PORT2	0x7a29

#define DEV_LS7A_PCIE_PORT3	0x7a39

#define DEV_LS7A_PCIE_PORT4	0x7a49

#define DEV_LS7A_PCIE_PORT5	0x7a59

#define DEV_LS7A_PCIE_PORT6	0x7a69



#define DEV_PCIE_PORT_4 0x7a39

#define DEV_PCIE_PORT_5 0x7a49
@@ -61,11 +66,11 @@ static void bridge_class_quirk(struct pci_dev *dev) 
	dev->class = PCI_CLASS_BRIDGE_PCI << 8;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_0, bridge_class_quirk);

			DEV_LS7A_PCIE_PORT0, bridge_class_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_1, bridge_class_quirk);

			DEV_LS7A_PCIE_PORT1, bridge_class_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_2, bridge_class_quirk);

			DEV_LS7A_PCIE_PORT2, bridge_class_quirk);



static void system_bus_quirk(struct pci_dev *pdev)

{
@@ -109,11 +114,21 @@ static void loongson_mrrs_quirk(struct pci_dev *pdev) 
	bridge->no_inc_mrrs = 1;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_0, loongson_mrrs_quirk);

			DEV_LS2K_PCIE_PORT0, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_1, loongson_mrrs_quirk);

			DEV_LS7A_PCIE_PORT0, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_PCIE_PORT_2, loongson_mrrs_quirk);

			DEV_LS7A_PCIE_PORT1, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_LS7A_PCIE_PORT2, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_LS7A_PCIE_PORT3, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_LS7A_PCIE_PORT4, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_LS7A_PCIE_PORT5, loongson_mrrs_quirk);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_LOONGSON,

			DEV_LS7A_PCIE_PORT6, loongson_mrrs_quirk);



static void loongson_pci_pin_quirk(struct pci_dev *pdev)

{