]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
PCI: pci-bridge-emul: Add definitions for missing capabilities registers
authorPali Rohár <pali@kernel.org>
Wed, 4 May 2022 16:57:27 +0000 (18:57 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 22 Jun 2022 12:23:25 +0000 (14:23 +0200)
BugLink: https://bugs.launchpad.net/bugs/1978240
commit 8ea673a8b30b4a32516b8adabb15e2a68ff02ec8 upstream.

pci-bridge-emul driver already allocates buffer for capabilities up to the
PCI_EXP_SLTSTA2 register, but does not define bit access behavior for these
registers. Add these missing definitions.

Link: https://lore.kernel.org/r/20211130172913.9727-3-kabel@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/pci/pci-bridge-emul.c

index 0a4e71301537e4111b74d5ab105825e48276faef..c994ebec2360387755bde3ba5456c6a948a2d587 100644 (file)
@@ -270,6 +270,49 @@ struct pci_bridge_reg_behavior pcie_cap_regs_behavior[PCI_CAP_PCIE_SIZEOF / 4] =
                .ro = GENMASK(15, 0) | PCI_EXP_RTSTA_PENDING,
                .w1c = PCI_EXP_RTSTA_PME,
        },
+
+       [PCI_EXP_DEVCAP2 / 4] = {
+               /*
+                * Device capabilities 2 register has reserved bits [30:27].
+                * Also bits [26:24] are reserved for non-upstream ports.
+                */
+               .ro = BIT(31) | GENMASK(23, 0),
+       },
+
+       [PCI_EXP_DEVCTL2 / 4] = {
+               /*
+                * Device control 2 register is RW. Bit 11 is reserved for
+                * non-upstream ports.
+                *
+                * Device status 2 register is reserved.
+                */
+               .rw = GENMASK(15, 12) | GENMASK(10, 0),
+       },
+
+       [PCI_EXP_LNKCAP2 / 4] = {
+               /* Link capabilities 2 register has reserved bits [30:25] and 0. */
+               .ro = BIT(31) | GENMASK(24, 1),
+       },
+
+       [PCI_EXP_LNKCTL2 / 4] = {
+               /*
+                * Link control 2 register is RW.
+                *
+                * Link status 2 register has bits 5, 15 W1C;
+                * bits 10, 11 reserved and others are RO.
+                */
+               .rw = GENMASK(15, 0),
+               .w1c = (BIT(15) | BIT(5)) << 16,
+               .ro = (GENMASK(14, 12) | GENMASK(9, 6) | GENMASK(4, 0)) << 16,
+       },
+
+       [PCI_EXP_SLTCAP2 / 4] = {
+               /* Slot capabilities 2 register is reserved. */
+       },
+
+       [PCI_EXP_SLTCTL2 / 4] = {
+               /* Both Slot control 2 and Slot status 2 registers are reserved. */
+       },
 };
 
 /*