]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
pci: iproc: Set all 24 bits of PCI class code
authorPali Rohár <pali@kernel.org>
Wed, 5 Jan 2022 09:50:20 +0000 (10:50 +0100)
committerTom Rini <trini@konsulko.com>
Mon, 24 Jan 2022 21:03:27 +0000 (16:03 -0500)
Register 0x43c in its low 24 bits contains PCI class code.

Update code to set all 24 bits of PCI class code and not only upper 16 bits
of PCI class code.

Use standard U-Boot macro (PCI_CLASS_BRIDGE_PCI << 8) for constructing all
24-bits of PCI class for PCI bridge Normal decode.

Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Roman Bacik <roman.bacik@broadcom.com>
drivers/pci/pcie_iproc.c

index a31e74a0f2e3fff1f749968cff53fdbd1f206a24..85dfab5c720f41d23a4614e9141241f8a136d935 100644 (file)
@@ -1116,15 +1116,14 @@ static int iproc_pcie_check_link(struct iproc_pcie *pcie)
        u32 link_status, class;
 
        pcie->link_is_active = false;
-       /* force class to PCI_CLASS_BRIDGE_PCI (0x0604) */
+       /* force class to PCI bridge Normal decode (0x060400) */
 #define PCI_BRIDGE_CTRL_REG_OFFSET      0x43c
-#define PCI_CLASS_BRIDGE_MASK           0xffff00
-#define PCI_CLASS_BRIDGE_SHIFT          8
+#define PCI_BRIDGE_CTRL_REG_CLASS_MASK  0xffffff
        iproc_pci_raw_config_read32(pcie, 0,
                                    PCI_BRIDGE_CTRL_REG_OFFSET,
                                    4, &class);
-       class &= ~PCI_CLASS_BRIDGE_MASK;
-       class |= (PCI_CLASS_BRIDGE_PCI << PCI_CLASS_BRIDGE_SHIFT);
+       class &= ~PCI_BRIDGE_CTRL_REG_CLASS_MASK;
+       class |= (PCI_CLASS_BRIDGE_PCI << 8);
        iproc_pci_raw_config_write32(pcie, 0,
                                     PCI_BRIDGE_CTRL_REG_OFFSET,
                                     4, class);