From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 13 Jan 2022 15:57:51 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/bridge-emul'
X-Git-Tag: v6.1-rc5~2209^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2709f0338d4c8cb17e11b448f0257afefae57475;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'remotes/lorenzo/pci/bridge-emul'

- Make emulated ROM BAR read-only by default (Pali Rohár)

- Make some emulated legacy PCI bits read-only for PCIe devices (Pali
  Rohár)

- Update reserved bits in emulated PCIe Capability (Pali Rohár)

- Allow drivers to emulate different PCIe Capability versions (Pali Rohár)

- Set emulated Capabilities List bit for all PCIe devices, since they must
  have at least a PCIe Capability (Pali Rohár)

* remotes/lorenzo/pci/bridge-emul:
  PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe device
  PCI: pci-bridge-emul: Correctly set PCIe capabilities
  PCI: pci-bridge-emul: Fix definitions of reserved bits
  PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config space
  PCI: pci-bridge-emul: Make expansion ROM Base Address register read-only
---

2709f0338d4c8cb17e11b448f0257afefae57475
diff --cc drivers/pci/controller/pci-aardvark.c
index b654d06,62fc55f..a3987e7
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@@ -883,16 -881,10 +883,15 @@@ advk_pci_bridge_emul_pcie_conf_read(str
  		return PCI_BRIDGE_EMUL_HANDLED;
  	}
  
- 	case PCI_CAP_LIST_ID:
  	case PCI_EXP_DEVCAP:
  	case PCI_EXP_DEVCTL:
 +	case PCI_EXP_DEVCAP2:
 +	case PCI_EXP_DEVCTL2:
 +	case PCI_EXP_LNKCAP2:
 +	case PCI_EXP_LNKCTL2:
  		*value = advk_readl(pcie, PCIE_CORE_PCIEXP_CAP + reg);
  		return PCI_BRIDGE_EMUL_HANDLED;
 +
  	default:
  		return PCI_BRIDGE_EMUL_NOT_HANDLED;
  	}
diff --cc drivers/pci/controller/pci-mvebu.c
index d7de48c,2dc6890..4f2508d
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@@ -720,9 -570,11 +720,11 @@@ static struct pci_bridge_emul_ops mvebu
   * Initialize the configuration space of the PCI-to-PCI bridge
   * associated with the given PCIe interface.
   */
 -static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port)
 +static int mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port)
  {
  	struct pci_bridge_emul *bridge = &port->bridge;
+ 	u32 pcie_cap = mvebu_readl(port, PCIE_CAP_PCIEXP);
+ 	u8 pcie_cap_ver = ((pcie_cap >> 16) & PCI_EXP_FLAGS_VERS);
  
  	bridge->conf.vendor = PCI_VENDOR_ID_MARVELL;
  	bridge->conf.device = mvebu_readl(port, PCIE_DEV_ID_OFF) >> 16;