Skip to contentSkip to conversation

PCI: brcmstb: Add Broadcom Settopbox PCIe support (V3)

PATCH Superseded Jim Quinlan 6 participants 24 messages Nov 14, 2017 – Dec 15, 2017

Subsystems (6)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover PCI: brcmstb: Add Broadcom Settopbox PCIe support (V3)

This patch series adds support for the Broadcom Settopbox PCIe host controller. It is targeted to Broadcom Settopbox chips running on ARM, ARM64, and MIPS platforms.

V3 Changes:
- Fold pcie-brcmstb-msi.c into pcie-brcmstb.c
- Use PCI_XXX constants for PCIe capability registers
- Removal of any unused constants
- Change s/pci/pcie/ for filenames, comment text
- Config space access now uses 8/16/32 read/writes
- Use proper multi-line comment style
- Use function names, structure that are common in other host drivers
- DT binding 'brcm,ssc' is now 'brcm,enable-ssc'
- Dropped DT binding 'xyz-supply'
- Not setting CRS support as Linux does it if it is advertised.
- Removed code that was considered "debug code".
- Use of_get_pcie_domain_nr()
- Variable 'bridge_setup_done' removed.

V2 Changes:
* Patch brcmstb-add-memory-API:
- fix DT_PROP_DATA_TO_U32 macro.
- dropped one EXPORT_SYMBOL, changed the other to GPL.
* Patch DT-docs-for-Brcmstb-PCIe:
- change 'brcm,gen' prop to standard 'max-link-speed'.
- rewrite bindings commit to omit standard prop defs.
- change props "supplies", "supply-names" to "xyz-supply"
* Patch removed: export-symbol-arch_setup_dma_ops [4/9]
* Patch brcmstb-add-dma-ranges:
- use get_dma_ops(); also use a const dma_map_ops structure.
- rewrite map_sg(), unmap_sg(), other calls like syng_sg_*()
- omit brcm_mapping_error(), but added code in brcm_dma_supported()
- put all of the notifier code in one compilation unit.

Florian Fainelli (1):
SOC: brcmstb: add memory API

Jim Quinlan (7):
dt-bindings: pci: Add DT docs for Brcmstb PCIe device
PCI: brcmstb: Add Broadcom STB PCIe host controller driver
PCI: brcmstb: Add dma-range mapping for inbound traffic PCI/MSI: Enable PCI_MSI_IRQ_DOMAIN support for MIPS
PCI: brcmstb: Add MSI capability
MIPS: BMIPS: Add PCI bindings for 7425, 7435
MIPS: BMIPS: Enable PCI

 .../devicetree/bindings/pci/brcmstb-pcie.txt       |   59 +
 arch/mips/Kconfig                                  |    3 +
 arch/mips/boot/dts/brcm/bcm7425.dtsi               |   26 +
 arch/mips/boot/dts/brcm/bcm7435.dtsi               |   27 +
 arch/mips/boot/dts/brcm/bcm97425svmb.dts           |    4 +
 arch/mips/boot/dts/brcm/bcm97435svmb.dts           |    4 +
 arch/mips/include/asm/Kbuild                       |    1 +
 drivers/pci/Kconfig                                |    2 +-
 drivers/pci/host/Kconfig                           |    9 +
 drivers/pci/host/Makefile                          |    3 +
 drivers/pci/host/pcie-brcmstb-dma.c                |  319 ++++
 drivers/pci/host/pcie-brcmstb.c                    | 1591 ++++++++++++++++++++
 drivers/pci/host/pcie-brcmstb.h                    |   22 +
 drivers/soc/bcm/brcmstb/Makefile                   |    2 +-
 drivers/soc/bcm/brcmstb/memory.c                   |  172 +++
 include/soc/brcmstb/memory_api.h                   |   25 +
 16 files changed, 2267 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
 create mode 100644 drivers/pci/host/pcie-brcmstb-dma.c
 create mode 100644 drivers/pci/host/pcie-brcmstb.c
 create mode 100644 drivers/pci/host/pcie-brcmstb.h
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
Signature · 1 line
1.9.0.138.g2de3478
#1 lore raw

PATCH v3 1/8 SOC: brcmstb: add memory API

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y				+= common.o biuctrl.o
+obj-y				+= common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +172 -0

172 lines not on this page · raw message

include/soc/brcmstb/memory_api.h new file +25 -0
new file mode 100644
index 0000000..d922906
@@ -0,0 +1,25 @@
+#ifndef __MEMORY_API_H
+#define __MEMORY_API_H
+
+/*
+ * Bus Interface Unit control register setup, must happen early during boot,
+ * before SMP is brought up, called by machine entry point.
+ */
+void brcmstb_biuctrl_init(void);
+
+#ifdef CONFIG_SOC_BRCMSTB
+int brcmstb_memory_phys_addr_to_memc(phys_addr_t pa);
+u64 brcmstb_memory_memc_size(int memc);
+#else
+static inline int brcmstb_memory_phys_addr_to_memc(phys_addr_t pa)
+{
+	return -EINVAL;
+}
+
+static inline u64 brcmstb_memory_memc_size(int memc)
+{
+	return -1;
+}
+#endif
+
+#endif /* __MEMORY_API_H */
Signature · 1 line
1.9.0.138.g2de3478
#2 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y				+= common.o biuctrl.o
+obj-y				+= common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

[1] https://lkml.kernel.org/r/20171204212120.484179273 at linutronix.de

Quoted 16 lines
drivers/soc/bcm/brcmstb/memory.c new file +15 -0
@@ -0,0 +1,172 @@
+/*
+ * Copyright ? 2015-2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * A copy of the GPL is available at
+ * http://www.broadcom.com/licenses/GPLv2.php or from the Free Software
+ * Foundation at https://www.gnu.org/licenses/ .
#3 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

Quoted 40 lines · Bjorn Helgaas

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y				+= common.o biuctrl.o
+obj-y				+= common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Quoted 4 lines

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

[1] https://lkml.kernel.org/r/20171204212120.484179273 at linutronix.de

This was submitted before SPDX was consistently enforced tree wide, so yes we should fix this.

Any other comment besides that?

Signature · 1 line
Florian
#4 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

In reply to Bjorn Helgaas
Quoted 40 lines · Bjorn Helgaas

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y                                += common.o biuctrl.o
+obj-y                                += common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Quoted 5 lines

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

[1] https://lkml.kernel.org/r/20171204212120.484179273 at linutronix.de

Bjorn, Did you get a chance to review the other commits of this submission (V3)? I would like any additional feedback before I send out a V4 with SPDX fixes. Thanks, JimQ

Quoted 16 lines
Quoted 16 lines
drivers/soc/bcm/brcmstb/memory.c new file +15 -0
@@ -0,0 +1,172 @@
+/*
+ * Copyright ? 2015-2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * A copy of the GPL is available at
+ * http://www.broadcom.com/licenses/GPLv2.php or from the Free Software
+ * Foundation at https://www.gnu.org/licenses/ .
#5 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

[+cc Lorenzo]

Quoted 44 lines · Jim Quinlan
Quoted 43 lines · Bjorn Helgaas

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y                                += common.o biuctrl.o
+obj-y                                += common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

Quoted 6 lines
Quoted 2 lines

[1] https://lkml.kernel.org/r/20171204212120.484179273 at linutronix.de

Bjorn, Did you get a chance to review the other commits of this submission (V3)? I would like any additional feedback before I send out a V4 with SPDX fixes. Thanks, JimQ

Lorenzo is taking over drivers/pci/host/* and he'll no doubt have some comments when he gets to this. I'll point out a few quick formatting things in the meantime.

Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
drivers/soc/bcm/brcmstb/memory.c new file +15 -0
@@ -0,0 +1,172 @@
+/*
+ * Copyright ? 2015-2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * A copy of the GPL is available at
+ * http://www.broadcom.com/licenses/GPLv2.php or from the Free Software
+ * Foundation at https://www.gnu.org/licenses/ .
#6 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

Quoted 50 lines · Bjorn Helgaas

[+cc Lorenzo]

Quoted 47 lines · Jim Quinlan
Quoted 45 lines · Bjorn Helgaas

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y                                += common.o biuctrl.o
+obj-y                                += common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

[1] https://lkml.kernel.org/r/[email protected]

Quoted 7 lines
Quoted 3 lines

Bjorn, Did you get a chance to review the other commits of this submission (V3)? I would like any additional feedback before I send out a V4 with SPDX fixes. Thanks, JimQ

Lorenzo is taking over drivers/pci/host/* and he'll no doubt have some comments when he gets to this. I'll point out a few quick formatting things in the meantime.

I need some time to review the code but overall I am quite worried about patches 1 and 4 in particular, it is ok to have platform host bridge drivers but we can't rewrite a DMA layer for a specific host bridge, I really do not like that - it is just not manageable from a maintenance perspective for the mainline kernel.

Lorenzo

#7 lore raw

Re: [PATCH v3 1/8] SOC: brcmstb: add memory API

Quoted 59 lines · Lorenzo Pieralisi
Quoted 50 lines · Bjorn Helgaas

[+cc Lorenzo]

Quoted 47 lines · Jim Quinlan
Quoted 45 lines · Bjorn Helgaas

drivers/soc/bcm/brcmstb/memory.c

Quoted 34 lines · Jim Quinlan

From: Florian Fainelli <[email protected]>

This commit adds a memory API suitable for ascertaining the sizes of each of the N memory controllers in a Broadcom STB chip. Its first user will be the Broadcom STB PCIe root complex driver, which needs to know these sizes to properly set up DMA mappings for inbound regions.

We cannot use memblock here or anything like what Linux provides because it collapses adjacent regions within a larger block, and here we actually need per-memory controller addresses and sizes, which is why we resort to manual DT parsing.

---
 drivers/soc/bcm/brcmstb/Makefile |   2 +-
 drivers/soc/bcm/brcmstb/memory.c | 172 +++++++++++++++++++++++++++++++++++++++
 include/soc/brcmstb/memory_api.h |  25 ++++++
 3 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 create mode 100644 include/soc/brcmstb/memory_api.h
drivers/soc/bcm/brcmstb/Makefile +1 -1
index 9120b27..4cea7b6 100644
@@ -1 +1 @@
-obj-y                                += common.o biuctrl.o
+obj-y                                += common.o biuctrl.o memory.o
drivers/soc/bcm/brcmstb/memory.c new file +0 -0
new file mode 100644
index 0000000..eb647ad9

I sort of assume based on [1] that every new file should have an SPDX identifier ("The Linux kernel requires the precise SPDX identifier in all source files") and that the actual text of the GPL can be omitted.

Only a few files in drivers/pci currently have an SPDX identifier. I don't know if that's oversight or work-in-progress or what.

[1] https://lkml.kernel.org/r/20171204212120.484179273 at linutronix.de

Quoted 7 lines
Quoted 3 lines

Bjorn, Did you get a chance to review the other commits of this submission (V3)? I would like any additional feedback before I send out a V4 with SPDX fixes. Thanks, JimQ

Lorenzo is taking over drivers/pci/host/* and he'll no doubt have some comments when he gets to this. I'll point out a few quick formatting things in the meantime.

Quoted 7 lines

I need some time to review the code but overall I am quite worried about patches 1 and 4 in particular, it is ok to have platform host bridge drivers but we can't rewrite a DMA layer for a specific host bridge, I really do not like that - it is just not manageable from a maintenance perspective for the mainline kernel.

Lorenzo

Hi Lorenzo,
First I note that the file drivers/pci/host/vmd.c appears to do the same thing -- rewrite a layer over the DMA ops. Secondly, there seems to be no other way to accomplish what we need to do, especially that will work with ARM, ARM64, and MIPs. Someone raised the same point you did and suggested I involve ARM/ARM64 maintainers, so I expanded my "--to" list to include Russell. I'm open to ideas. I've asked the HW PCIe folks to redesign the controller to accommodate an identity-map for inbound memory, but it will be a while if that happens, if ever. --Jim

#8 lore raw

PATCH v3 2/8 dt-bindings: pci: Add DT docs for Brcmstb PCIe device

In reply to Jim Quinlan

The DT bindings description of the Brcmstb PCIe device is described. This node can be used by almost all Broadcom settop box chips, using ARM, ARM64, or MIPS CPU architectures.

---
 .../devicetree/bindings/pci/brcmstb-pcie.txt       | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
Documentation/devicetree/bindings/pci/brcmstb-pcie.txt new file +59 -0
new file mode 100644
index 0000000..a1a9ad5
@@ -0,0 +1,59 @@
+Brcmstb PCIe Host Controller Device Tree Bindings
+
+Required Properties:
+- compatible
+  "brcm,bcm7425-pcie" -- for 7425 family MIPS-based SOCs.
+  "brcm,bcm7435-pcie" -- for 7435 family MIPS-based SOCs.
+  "brcm,bcm7445-pcie" -- for 7445 and later ARM based SOCs (not including
+      the 7278).
+  "brcm,bcm7278-pcie"  -- for 7278 family ARM-based SOCs.
+
+- reg -- the register start address and length for the PCIe reg block.
+- interrupts -- two interrupts are specified; the first interrupt is for
+     the PCI host controller and the second is for MSI if the built-in
+     MSI controller is to be used.
+- interrupt-names -- names of the interrupts (above): "pcie" and "msi".
+- #address-cells -- set to <3>.
+- #size-cells -- set to <2>.
+- #interrupt-cells: set to <1>.
+- interrupt-map-mask and interrupt-map, standard PCI properties to define the
+     mapping of the PCIe interface to interrupt numbers.
+- ranges: ranges for the PCI memory and I/O regions.
+- linux,pci-domain -- should be unique per host controller.
+
+Optional Properties:
+- clocks -- phandle of pcie clock.
+- clock-names -- set to "sw_pcie" if clocks is used.
+- dma-ranges -- Specifies the inbound memory mapping regions when
+     an "identity map" is not possible.
+- msi-controller -- this property is typically specified to have the
+     PCIe controller use its internal MSI controller.
+- msi-parent -- set to use an external MSI interrupt controller.
+- brcm,enable-ssc -- (boolean) indicates usage of spread-spectrum clocking.
+- max-link-speed --  (integer) indicates desired generation of link:
+     1 => 2.5 Gbps (gen1), 2 => 5.0 Gbps (gen2), 3 => 8.0 Gbps (gen3).
+
+Example Node:
+
+pcie0: pcie at f0460000 {
+		reg = <0x0 0xf0460000 0x0 0x9310>;
+		interrupts = <0x0 0x0 0x4>;
+		compatible = "brcm,bcm7445-pcie";
+		#address-cells = <3>;
+		#size-cells = <2>;
+		ranges = <0x02000000 0x00000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x08000000
+			  0x02000000 0x00000000 0x08000000 0x00000000 0xc8000000 0x00000000 0x08000000>;
+		#interrupt-cells = <1>;
+		interrupt-map-mask = <0 0 0 7>;
+		interrupt-map = <0 0 0 1 &intc 0 47 3
+				 0 0 0 2 &intc 0 48 3
+				 0 0 0 3 &intc 0 49 3
+				 0 0 0 4 &intc 0 50 3>;
+		clocks = <&sw_pcie0>;
+		clock-names = "sw_pcie";
+		msi-parent = <&pcie0>;  /* use PCIe's internal MSI controller */
+		msi-controller;         /* use PCIe's internal MSI controller */
+		brcm,ssc;
+		max-link-speed = <1>;
+		linux,pci-domain = <0>;
+	};
Signature · 1 line
1.9.0.138.g2de3478
maintainer Acked-by on v3 2/8
#9 lore raw

Re: [PATCH v3 2/8] dt-bindings: pci: Add DT docs for Brcmstb PCIe device

Quoted 9 lines · Jim Quinlan

The DT bindings description of the Brcmstb PCIe device is described. This node can be used by almost all Broadcom settop box chips, using ARM, ARM64, or MIPS CPU architectures.

---
 .../devicetree/bindings/pci/brcmstb-pcie.txt       | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
#10 lore raw

PATCH v3 3/8 PCI: brcmstb: Add Broadcom STB PCIe host controller driver

In reply to Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

---
 drivers/pci/host/Kconfig        |    9 +
 drivers/pci/host/Makefile       |    1 +
 drivers/pci/host/pcie-brcmstb.c | 1124 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 1134 insertions(+)
 create mode 100644 drivers/pci/host/pcie-brcmstb.c
drivers/pci/host/Kconfig +9 -0
index b868803..751463e 100644
@@ -220,4 +220,13 @@ config VMD
 	  To compile this driver as a module, choose M here: the
 	  module will be called vmd.
 
+config PCIE_BRCMSTB
+	tristate "Broadcom Brcmstb PCIe platform host driver"
+	depends on ARCH_BRCMSTB || BMIPS_GENERIC
+	depends on OF
+	depends on SOC_BRCMSTB
+	default ARCH_BRCMSTB || BMIPS_GENERIC
+	help
+	  Adds support for Broadcom Settop Box PCIe host controller.
+
 endmenu
drivers/pci/host/Makefile +1 -0
index 1238278..a8b9923 100644
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
+obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie-brcmstb.c new file +1124 -0

1,124 lines not on this page · raw message

Signature · 1 line
1.9.0.138.g2de3478
#11 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

Quoted 85 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

---
 drivers/pci/host/Kconfig        |    9 +
 drivers/pci/host/Makefile       |    1 +
 drivers/pci/host/pcie-brcmstb.c | 1124 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 1134 insertions(+)
 create mode 100644 drivers/pci/host/pcie-brcmstb.c
drivers/pci/host/Kconfig +9 -0
index b868803..751463e 100644
@@ -220,4 +220,13 @@ config VMD
 	  To compile this driver as a module, choose M here: the
 	  module will be called vmd.
 
+config PCIE_BRCMSTB
+	tristate "Broadcom Brcmstb PCIe platform host driver"
+	depends on ARCH_BRCMSTB || BMIPS_GENERIC
+	depends on OF
+	depends on SOC_BRCMSTB
+	default ARCH_BRCMSTB || BMIPS_GENERIC
+	help
+	  Adds support for Broadcom Settop Box PCIe host controller.
+
 endmenu
drivers/pci/host/Makefile +1 -0
index 1238278..a8b9923 100644
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
+obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie-brcmstb.c new file +30 -0
new file mode 100644
index 0000000..d8a8f7a
@@ -0,0 +1,1124 @@
+/*
+ * Copyright (C) 2009 - 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/compiler.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irqdomain.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/of_pci.h>
+#include <linux/of_platform.h>

drivers/pci/host/pcie-brcmstb.c line 40

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#include <linux/pci.h>
+#include <linux/printk.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <soc/brcmstb/memory_api.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+/* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */
+#define BRCM_PCIE_CAP_REGS				0x00ac

Add a blank line before multi-line comments.

drivers/pci/host/pcie-brcmstb.c line 44

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+/*
+ * Broadcom Settop Box PCIE Register Offsets. The names are from
+ * the chip's RDB and we use them here so that a script can correlate
+ * this code and the RDB to prevent discrepancies.

Use "PCIe" capitalization in English text and messages.

Quoted 264 lines
drivers/pci/host/pcie-brcmstb.c new file +264 -0
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1		0x0188
+#define PCIE_RC_CFG_PRIV1_ID_VAL3			0x043c
+#define PCIE_RC_DL_MDIO_ADDR				0x1100
+#define PCIE_RC_DL_MDIO_WR_DATA				0x1104
+#define PCIE_RC_DL_MDIO_RD_DATA				0x1108
+#define PCIE_MISC_MISC_CTRL				0x4008
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO		0x400c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI		0x4010
+#define PCIE_MISC_RC_BAR1_CONFIG_LO			0x402c
+#define PCIE_MISC_RC_BAR2_CONFIG_LO			0x4034
+#define PCIE_MISC_RC_BAR2_CONFIG_HI			0x4038
+#define PCIE_MISC_RC_BAR3_CONFIG_LO			0x403c
+#define PCIE_MISC_PCIE_CTRL				0x4064
+#define PCIE_MISC_PCIE_STATUS				0x4068
+#define PCIE_MISC_REVISION				0x406c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT	0x4070
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI		0x4080
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI		0x4084
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG			0x4204
+#define PCIE_INTR2_CPU_BASE				0x4300
+
+/*
+ * Broadcom Settop Box PCIE Register Field shift and mask info. The
+ * names are from the chip's RDB and we use them here so that a script
+ * can correlate this code and the RDB to prevent discrepancies.
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK	0xc
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_SHIFT	0x2
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK		0xffffff
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_SHIFT		0x0
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK			0x1000
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_SHIFT			0xc
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK		0x2000
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_SHIFT		0xd
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK			0x300000
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_SHIFT		0x14
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK			0xf8000000
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_SHIFT			0x1b
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK			0x7c00000
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_SHIFT			0x16
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK			0x1f
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_SHIFT			0x0
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK			0x1f
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_SHIFT			0x0
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_MASK			0x1f
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_SHIFT			0x0
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK			0x1f
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_SHIFT			0x0
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK			0x4
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_SHIFT			0x2
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK		0x1
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_SHIFT		0x0
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK			0x80
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_SHIFT			0x7
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_MASK		0x20
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_SHIFT		0x5
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_MASK		0x10
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_SHIFT		0x4
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_MASK		0x40
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_SHIFT		0x6
+#define PCIE_MISC_REVISION_MAJMIN_MASK				0xffff
+#define PCIE_MISC_REVISION_MAJMIN_SHIFT				0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK	0xfff00000
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_SHIFT	0x14
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_MASK	0xfff0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_SHIFT	0x4
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS	0xc
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_MASK		0xff
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_SHIFT	0x0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_MASK	0xff
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_SHIFT	0x0
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK	0x2
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_SHIFT 0x1
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x08000000
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_SHIFT	0x1b
+#define PCIE_RGR1_SW_INIT_1_PERST_MASK				0x1
+#define PCIE_RGR1_SW_INIT_1_PERST_SHIFT				0x0
+
+#define BRCM_NUM_PCIE_OUT_WINS		0x4
+#define BRCM_MAX_SCB			0x4
+
+#define BRCM_MSI_TARGET_ADDR_LT_4GB	0x0fffffffcULL
+#define BRCM_MSI_TARGET_ADDR_GT_4GB	0xffffffffcULL
+
+#define BURST_SIZE_128			0
+#define BURST_SIZE_256			1
+#define BURST_SIZE_512			2
+
+/* Offsets from PCIE_INTR2_CPU_BASE */
+#define STATUS				0x0
+#define SET				0x4
+#define CLR				0x8
+#define MASK_STATUS			0xc
+#define MASK_SET			0x10
+#define MASK_CLR			0x14
+
+#define PCIE_BUSNUM_SHIFT		20
+#define PCIE_SLOT_SHIFT			15
+#define PCIE_FUNC_SHIFT			12
+
+#if defined(__BIG_ENDIAN)
+#define	DATA_ENDIAN		2	/* PCIe->DDR inbound accesses */
+#define MMIO_ENDIAN		2	/* CPU->PCIe outbound accesses */
+#else
+#define	DATA_ENDIAN		0
+#define MMIO_ENDIAN		0
+#endif
+
+#define MDIO_PORT0		0x0
+#define MDIO_DATA_MASK		0x7fffffff
+#define MDIO_DATA_SHIFT		0x0
+#define MDIO_PORT_MASK		0xf0000
+#define MDIO_PORT_SHIFT		0x16
+#define MDIO_REGAD_MASK		0xffff
+#define MDIO_REGAD_SHIFT	0x0
+#define MDIO_CMD_MASK		0xfff00000
+#define MDIO_CMD_SHIFT		0x14
+#define MDIO_CMD_READ		0x1
+#define MDIO_CMD_WRITE		0x0
+#define MDIO_DATA_DONE_MASK	0x80000000
+#define MDIO_RD_DONE(x)		(((x) & MDIO_DATA_DONE_MASK) ? 1 : 0)
+#define MDIO_WT_DONE(x)		(((x) & MDIO_DATA_DONE_MASK) ? 0 : 1)
+#define SSC_REGS_ADDR		0x1100
+#define SET_ADDR_OFFSET		0x1f
+#define SSC_CNTL_OFFSET		0x2
+#define SSC_CNTL_OVRD_EN_MASK	0x8000
+#define SSC_CNTL_OVRD_EN_SHIFT	0xf
+#define SSC_CNTL_OVRD_VAL_MASK	0x4000
+#define SSC_CNTL_OVRD_VAL_SHIFT	0xe
+#define SSC_STATUS_OFFSET	0x1
+#define SSC_STATUS_SSC_MASK	0x400
+#define SSC_STATUS_SSC_SHIFT	0xa
+#define SSC_STATUS_PLL_LOCK_MASK	0x800
+#define SSC_STATUS_PLL_LOCK_SHIFT	0xb
+
+#define IDX_ADDR(pcie)	\
+	((pcie)->reg_offsets[EXT_CFG_INDEX])
+#define DATA_ADDR(pcie)	\
+	((pcie)->reg_offsets[EXT_CFG_DATA])
+#define PCIE_RGR1_SW_INIT_1(pcie) \
+	((pcie)->reg_offsets[RGR1_SW_INIT_1])
+
+enum {
+	RGR1_SW_INIT_1,
+	EXT_CFG_INDEX,
+	EXT_CFG_DATA,
+};
+
+enum {
+	RGR1_SW_INIT_1_INIT_MASK,
+	RGR1_SW_INIT_1_INIT_SHIFT,
+	RGR1_SW_INIT_1_PERST_MASK,
+	RGR1_SW_INIT_1_PERST_SHIFT,
+};
+
+enum pcie_type {
+	BCM7425,
+	BCM7435,
+	GENERIC,
+	BCM7278,
+};
+
+struct brcm_window {
+	dma_addr_t pcie_addr;
+	phys_addr_t cpu_addr;
+	dma_addr_t size;
+};
+
+/* Internal PCIe Host Controller Information.*/
+struct brcm_pcie {
+	struct list_head	list;
+	struct device		*dev;
+	void __iomem		*base;
+	struct list_head	resources;
+	int			irq;
+	struct clk		*clk;
+	struct pci_bus		*root_bus;
+	struct device_node	*dn;
+	int			id;
+	bool			suspended;
+	int			num_out_wins;
+	bool			ssc;
+	int			gen;
+	struct brcm_window	out_wins[BRCM_NUM_PCIE_OUT_WINS];
+	unsigned int		rev;
+	const int		*reg_offsets;
+	const int		*reg_field_info;
+	enum pcie_type		type;
+};
+
+struct pcie_cfg_data {
+	const int *reg_field_info;
+	const int *offsets;
+	const enum pcie_type type;
+};
+
+static const int pcie_reg_field_info[] = {
+	[RGR1_SW_INIT_1_INIT_MASK] = 0x2,
+	[RGR1_SW_INIT_1_INIT_SHIFT] = 0x1,
+};
+
+static const int pcie_reg_field_info_bcm7278[] = {
+	[RGR1_SW_INIT_1_INIT_MASK] = 0x1,
+	[RGR1_SW_INIT_1_INIT_SHIFT] = 0x0,
+};
+
+static const int pcie_offset_bcm7425[] = {
+	[RGR1_SW_INIT_1] = 0x8010,
+	[EXT_CFG_INDEX]  = 0x8300,
+	[EXT_CFG_DATA]   = 0x8304,
+};
+
+static const struct pcie_cfg_data bcm7425_cfg = {
+	.reg_field_info	= pcie_reg_field_info,
+	.offsets	= pcie_offset_bcm7425,
+	.type		= BCM7425,
+};
+
+static const int pcie_offsets[] = {
+	[RGR1_SW_INIT_1] = 0x9210,
+	[EXT_CFG_INDEX]  = 0x9000,
+	[EXT_CFG_DATA]   = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7435_cfg = {
+	.reg_field_info	= pcie_reg_field_info,
+	.offsets	= pcie_offsets,
+	.type		= BCM7435,
+};
+
+static const struct pcie_cfg_data generic_cfg = {
+	.reg_field_info	= pcie_reg_field_info,
+	.offsets	= pcie_offsets,
+	.type		= GENERIC,
+};
+
+static const int pcie_offset_bcm7278[] = {
+	[RGR1_SW_INIT_1] = 0xc010,
+	[EXT_CFG_INDEX] = 0x9000,
+	[EXT_CFG_DATA] = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7278_cfg = {
+	.reg_field_info = pcie_reg_field_info_bcm7278,
+	.offsets	= pcie_offset_bcm7278,
+	.type		= BCM7278,
+};
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
+					int where);
+
+static struct pci_ops brcm_pcie_ops = {
+	.map_bus = brcm_pcie_map_conf,
+	.read = pci_generic_config_read,
+	.write = pci_generic_config_write,
+};
+
+#if defined(CONFIG_MIPS)
+/* Broadcom MIPs HW implicitly does the swapping if necessary */
+#define bcm_readl(a)		__raw_readl(a)
+#define bcm_writel(d, a)	__raw_writel(d, a)
+#define bcm_readw(a)		__raw_readw(a)
+#define bcm_writew(d, a)	__raw_writew(d, a)

drivers/pci/host/pcie-brcmstb.c line 318

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#else
+#define bcm_readl(a)		readl(a)
+#define bcm_writel(d, a)	writel(d, a)
+#define bcm_readw(a)		readw(a)
+#define bcm_writew(d, a)	writew(d, a)
+#endif
+
+/*
+ * These macros are designed to sxtract/insert fields to host controller's
+ * register set.

s/are designed to s/ e/ (I assume they actually *do* extract/insert)

Quoted 60 lines
drivers/pci/host/pcie-brcmstb.c new file +60 -0
+ */
+#define RD_FLD(base, reg, field) \
+	rd_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT)
+#define WR_FLD(base, reg, field, val) \
+	wr_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT, val)
+#define WR_FLD_RB(base, reg, field, val) \
+	wr_fld_rb(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT, val)
+#define WR_FLD_WITH_OFFSET(base, off, reg, field, val) \
+	wr_fld(base + reg + off, reg##_##field##_MASK, \
+	       reg##_##field##_SHIFT, val)
+#define EXTRACT_FIELD(val, reg, field) \
+	((val & reg##_##field##_MASK) >> reg##_##field##_SHIFT)
+#define INSERT_FIELD(val, reg, field, field_val) \
+	((val & ~reg##_##field##_MASK) | \
+	 (reg##_##field##_MASK & (field_val << reg##_##field##_SHIFT)))
+
+static struct list_head brcm_pcie = LIST_HEAD_INIT(brcm_pcie);
+static phys_addr_t scb_size[BRCM_MAX_SCB];
+static int num_memc;
+static DEFINE_MUTEX(brcm_pcie_lock);
+
+static u32 rd_fld(void __iomem *p, u32 mask, int shift)
+{
+	return (bcm_readl(p) & mask) >> shift;
+}
+
+static void wr_fld(void __iomem *p, u32 mask, int shift, u32 val)
+{
+	u32 reg = bcm_readl(p);
+
+	reg = (reg & ~mask) | ((val << shift) & mask);
+	bcm_writel(reg, p);
+}
+
+static void wr_fld_rb(void __iomem *p, u32 mask, int shift, u32 val)
+{
+	wr_fld(p, mask, shift, val);
+	(void)bcm_readl(p);
+}
+
+static const char *link_speed_to_str(int s)
+{
+	switch (s) {
+	case 1:
+		return "2.5";
+	case 2:
+		return "5.0";
+	case 3:
+		return "8.0";
+	default:
+		break;
+	}
+	return "???";
+}
+
+/*
+ * The roundup_pow_of_two() from log2.h invokes
+ * __roundup_pow_of_two(unsigned long), but we really need a
+ * such a function to take a native u64 since unsigned long
+ * is 32 bits on some configurations.  So we provide this helper

drivers/pci/host/pcie-brcmstb.c line 388

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+ * function below.
+ */
+static u64 roundup_pow_of_two_64(u64 n)
+{
+	return 1ULL << fls64(n - 1);
+}
+
+/*
+ * This is to convert the size of the inbound bar region to the
+ * non-liniear values of PCIE_X_MISC_RC_BAR[123]_CONFIG_LO.SIZE

s/bar/BAR/ (This doesn't sound like a BAR in the PCI spec sense, but if that's what you call it, might as well spell it as the acronym)

s/non-liniear/non-linear/

Quoted 59 lines
drivers/pci/host/pcie-brcmstb.c new file +59 -0
+ */
+int encode_ibar_size(u64 size)
+{
+	int log2_in = ilog2(size);
+
+	if (log2_in >= 12 && log2_in <= 15)
+		/* Covers 4KB to 32KB (inclusive) */
+		return (log2_in - 12) + 0x1c;
+	else if (log2_in >= 16 && log2_in <= 37)
+		/* Covers 64KB to 32GB, (inclusive) */
+		return log2_in - 15;
+	/* Something is awry so disable */
+	return 0;
+}
+
+static u32 mdio_form_pkt(int port, int regad, int cmd)
+{
+	u32 pkt = 0;
+
+	pkt |= (port << MDIO_PORT_SHIFT) & MDIO_PORT_MASK;
+	pkt |= (regad << MDIO_REGAD_SHIFT) & MDIO_REGAD_MASK;
+	pkt |= (cmd << MDIO_CMD_SHIFT) & MDIO_CMD_MASK;
+
+	return pkt;
+}
+
+/* negative return value indicates error */
+static int mdio_read(void __iomem *base, u8 port, u8 regad)
+{
+	int tries;
+	u32 data;
+
+	bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_READ),
+		   base + PCIE_RC_DL_MDIO_ADDR);
+	bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+
+	data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+	for (tries = 0; !MDIO_RD_DONE(data) && tries < 10; tries++) {
+		udelay(10);
+		data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+	}
+
+	return MDIO_RD_DONE(data)
+		? (data & MDIO_DATA_MASK) >> MDIO_DATA_SHIFT
+		: -EIO;
+}
+
+/* negative return value indicates error */
+static int mdio_write(void __iomem *base, u8 port, u8 regad, u16 wrdata)
+{
+	int tries;
+	u32 data;
+
+	bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_WRITE),
+		   base + PCIE_RC_DL_MDIO_ADDR);
+	bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+	bcm_writel(MDIO_DATA_DONE_MASK | wrdata,
+		   base + PCIE_RC_DL_MDIO_WR_DATA);
+

drivers/pci/host/pcie-brcmstb.c line 457

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+	for (tries = 0; !MDIO_WT_DONE(data) && tries < 10; tries++) {
+		udelay(10);
+		data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+	}
+
+	return MDIO_WT_DONE(data) ? 0 : -EIO;
+}
+
+/* configures device for ssc mode; negative return value indicates error */

I guess "ssc" means Spread Spectrum Clocking? Maybe spell out the first occurrence and spell as acronym in English text?

Quoted 113 lines
drivers/pci/host/pcie-brcmstb.c new file +113 -0
+static int set_ssc(void __iomem *base)
+{
+	int tmp;
+	u16 wrdata;
+	int pll, ssc;
+
+	tmp = mdio_write(base, MDIO_PORT0, SET_ADDR_OFFSET, SSC_REGS_ADDR);
+	if (tmp < 0)
+		return tmp;
+
+	tmp = mdio_read(base, MDIO_PORT0, SSC_CNTL_OFFSET);
+	if (tmp < 0)
+		return tmp;
+
+	wrdata = INSERT_FIELD(tmp, SSC_CNTL_OVRD, EN, 1);
+	wrdata = INSERT_FIELD(wrdata, SSC_CNTL_OVRD, VAL, 1);
+	tmp = mdio_write(base, MDIO_PORT0, SSC_CNTL_OFFSET, wrdata);
+	if (tmp < 0)
+		return tmp;
+
+	usleep_range(1000, 2000);
+	tmp = mdio_read(base, MDIO_PORT0, SSC_STATUS_OFFSET);
+	if (tmp < 0)
+		return tmp;
+
+	ssc = EXTRACT_FIELD(tmp, SSC_STATUS, SSC);
+	pll = EXTRACT_FIELD(tmp, SSC_STATUS, PLL_LOCK);
+
+	return (ssc && pll) ? 0 : -EIO;
+}
+
+/* limits operation to a specific generation (1, 2, or 3) */
+static void set_gen(void __iomem *base, int gen)
+{
+	u32 lnkcap = bcm_readl(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+	u16 lnkctl2 = bcm_readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2);
+
+	lnkcap = (lnkcap & ~PCI_EXP_LNKCAP_SLS) | gen;
+	bcm_writel(lnkcap, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+
+	lnkctl2 = (lnkctl2 & ~0xf) | gen;
+	bcm_writew(lnkctl2, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2);
+}
+
+static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie,
+				       unsigned int win, phys_addr_t cpu_addr,
+				       dma_addr_t  pcie_addr, dma_addr_t size)
+{
+	void __iomem *base = pcie->base;
+	phys_addr_t cpu_addr_mb, limit_addr_mb;
+	u32 tmp;
+
+	/* Set the base of the pcie_addr window */
+	bcm_writel(lower_32_bits(pcie_addr) + MMIO_ENDIAN,
+		   base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO + (win * 8));
+	bcm_writel(upper_32_bits(pcie_addr),
+		   base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI + (win * 8));
+
+	cpu_addr_mb = cpu_addr >> 20;
+	limit_addr_mb = (cpu_addr + size - 1) >> 20;
+
+	/* Write the addr base low register */
+	WR_FLD_WITH_OFFSET(base, (win * 4),
+			   PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,
+			   BASE, cpu_addr_mb);
+	/* Write the addr limit low register */
+	WR_FLD_WITH_OFFSET(base, (win * 4),
+			   PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,
+			   LIMIT, limit_addr_mb);
+
+	if (pcie->type != BCM7435 && pcie->type != BCM7425) {
+		/* Write the cpu addr high register */
+		tmp = (u32)(cpu_addr_mb >>
+			PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS);
+		WR_FLD_WITH_OFFSET(base, (win * 8),
+				   PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI,
+				   BASE, tmp);
+		/* Write the cpu limit high register */
+		tmp = (u32)(limit_addr_mb >>
+			PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS);
+		WR_FLD_WITH_OFFSET(base, (win * 8),
+				   PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI,
+				   LIMIT, tmp);
+	}
+}
+
+/* Configuration space read/write support */
+static int cfg_index(int busnr, int devfn, int reg)
+{
+	return ((PCI_SLOT(devfn) & 0x1f) << PCIE_SLOT_SHIFT)
+		| ((PCI_FUNC(devfn) & 0x07) << PCIE_FUNC_SHIFT)
+		| (busnr << PCIE_BUSNUM_SHIFT)
+		| (reg & ~3);
+}
+
+static bool brcm_pcie_rc_mode(struct brcm_pcie *pcie)
+{
+	void __iomem *base = pcie->base;
+	u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+
+	return !!EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_PORT);
+}
+
+static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
+{
+	void __iomem *base = pcie->base;
+	u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+	u32 dla = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_DL_ACTIVE);
+	u32 plu = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_PHYLINKUP);
+
+	return  (dla && plu) ? true : false;
+}
+

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct pci_bus *bus,
+				   int dev)
+{
+	if (pci_is_root_bus(bus)) {
+		if (dev > 0)
+			return false;
+	} else {
+		/* If there is no link, then there is no device */
+		if (!brcm_pcie_link_up(pcie))
+			return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+	}
+
+	return true;
+}
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
+					int where)
+{
+	struct brcm_pcie *pcie = bus->sysdata;
+	void __iomem *base = pcie->base;
+	int idx;
+
+	if (!brcm_pcie_valid_device(pcie, bus, PCI_SLOT(devfn)))

drivers/pci/host/pcie-brcmstb.c line 603

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+		return NULL;
+
+	/* Accesses to the RC go right to the RC registers */
+	if (pci_is_root_bus(bus))
+		return base + where;
+
+	/* For devices, write to the config space index register */
+	idx = cfg_index(bus->number, devfn, where);
+	bcm_writel(idx, pcie->base + IDX_ADDR(pcie));
+	return base + DATA_ADDR(pcie) + (where & 0x3);

I guess this is protected by a higher-level config access lock?

Quoted 54 lines
drivers/pci/host/pcie-brcmstb.c new file +54 -0
+}
+
+static inline void brcm_pcie_bridge_sw_init_set(struct brcm_pcie *pcie,
+						unsigned int val)
+{
+	unsigned int offset;
+	unsigned int shift = pcie->reg_field_info[RGR1_SW_INIT_1_INIT_SHIFT];
+	u32 mask =  pcie->reg_field_info[RGR1_SW_INIT_1_INIT_MASK];
+
+	if (pcie->type != BCM7278) {
+		wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask, shift,
+			  val);
+	} else if (of_machine_is_compatible("brcm,bcm7278a0")) {
+		/*
+		 * The two PCIe instances on 7278a0 are not even consistent with
+		 * respect to each other for internal offsets, here we offset
+		 * by 0x14000 + RGR1_SW_INIT_1's relative offset to account for
+		 * that.
+		 */
+		offset = pcie->id ? 0x14010 : pcie->reg_offsets[RGR1_SW_INIT_1];
+		wr_fld_rb(pcie->base + offset, mask, shift, val);
+	} else {
+		wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask, shift,
+			  val);
+	}
+}
+
+static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie,
+				       unsigned int val)
+{
+	if (pcie->type != BCM7278)
+		wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie),
+			  PCIE_RGR1_SW_INIT_1_PERST_MASK,
+			  PCIE_RGR1_SW_INIT_1_PERST_SHIFT, val);
+	else
+		/* Assert = 0, de-assert = 1 on 7278 */
+		WR_FLD_RB(pcie->base, PCIE_MISC_PCIE_CTRL, PCIE_PERSTB, !val);
+}
+
+static int brcm_pcie_add_controller(struct brcm_pcie *pcie)
+{
+	mutex_lock(&brcm_pcie_lock);
+	list_add_tail(&pcie->list, &brcm_pcie);
+	mutex_unlock(&brcm_pcie_lock);
+
+	return 0;
+}
+
+static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
+{
+	struct list_head *pos, *q;
+	struct brcm_pcie *tmp;
+
+	mutex_lock(&brcm_pcie_lock);

drivers/pci/host/pcie-brcmstb.c line 667

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	list_for_each_safe(pos, q, &brcm_pcie) {
+		tmp = list_entry(pos, struct brcm_pcie, list);
+		if (tmp == pcie) {
+			list_del(pos);
+			if (list_empty(&brcm_pcie))
+				num_memc = 0;
+			break;
+		}
+	}
+	mutex_unlock(&brcm_pcie_lock);

I'm missing something. I don't see that num_memc is ever set to anything *other* than zero.

This pattern of keeping a list of controllers is highly unusual and needs some explanation.

Quoted 42 lines
drivers/pci/host/pcie-brcmstb.c new file +42 -0
+}
+
+static int brcm_pcie_parse_request_of_pci_ranges(struct brcm_pcie *pcie)
+{
+	struct resource_entry *win;
+	int ret;
+
+	ret = of_pci_get_host_bridge_resources(pcie->dn, 0, 0xff,
+					       &pcie->resources, NULL);
+	if (ret) {
+		dev_err(pcie->dev, "failed to get host resources\n");
+		return ret;
+	}
+
+	resource_list_for_each_entry(win, &pcie->resources) {
+		struct resource *parent, *res = win->res;
+		dma_addr_t offset = (dma_addr_t)win->offset;
+
+		if (resource_type(res) == IORESOURCE_IO) {
+			parent = &ioport_resource;
+		} else if (resource_type(res) == IORESOURCE_MEM) {
+			if (pcie->num_out_wins >= BRCM_NUM_PCIE_OUT_WINS) {
+				dev_err(pcie->dev, "too many outbound wins\n");
+				return -EINVAL;
+			}
+			pcie->out_wins[pcie->num_out_wins].cpu_addr
+				= (phys_addr_t)res->start;
+			pcie->out_wins[pcie->num_out_wins].pcie_addr
+				= (dma_addr_t)(res->start
+					       - (phys_addr_t)offset);
+			pcie->out_wins[pcie->num_out_wins].size
+				= (dma_addr_t)(res->end - res->start + 1);
+			pcie->num_out_wins++;
+			parent = &iomem_resource;
+		} else {
+			continue;
+		}
+
+		ret = devm_request_resource(pcie->dev, parent, res);
+		if (ret) {
+			dev_err(pcie->dev, "failed to get res %pR\n", res);
+			return ret;

drivers/pci/host/pcie-brcmstb.c line 719

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+		}
+	}
+	return 0;
+}
+
+static int brcm_pcie_setup(struct brcm_pcie *pcie)
+{
+	void __iomem *base = pcie->base;
+	unsigned int scb_size_val;
+	u64 rc_bar2_size = 0, rc_bar2_offset = 0, total_mem_size = 0;

Unnecessary initializations (at least of rc_bar2_size, I didn't check the rest).

Add

  struct device *dev = pcie->dev;

then use it below.

drivers/pci/host/pcie-brcmstb.c line 726

Quoted 7 lines
drivers/pci/host/pcie-brcmstb.c new file +7 -0
+	u32 tmp, burst;
+	int i, j, ret, limit;
+	u16 nlw, cls, lnksta;
+	bool ssc_good = false;
+
+	/* reset the bridge and the endpoint device */
+	/* field: PCIE_BRIDGE_SW_INIT = 1 */

Not sure what these "field: ..." comments mean. Are they for some automated tool? To a human, it looks like they repeat what the code does.

Quoted 95 lines
drivers/pci/host/pcie-brcmstb.c new file +95 -0
+	brcm_pcie_bridge_sw_init_set(pcie, 1);
+
+	/* field: PCIE_SW_PERST = 1, on 7278, we start de-asserted already */
+	if (pcie->type != BCM7278)
+		brcm_pcie_perst_set(pcie, 1);
+
+	usleep_range(100, 200);
+
+	/* take the bridge out of reset */
+	/* field: PCIE_BRIDGE_SW_INIT = 0 */
+	brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+	WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+	/* wait for serdes to be stable */
+	usleep_range(100, 200);
+
+	/* Grab the PCIe hw revision number */
+	tmp = bcm_readl(base + PCIE_MISC_REVISION);
+	pcie->rev = EXTRACT_FIELD(tmp, PCIE_MISC_REVISION, MAJMIN);
+
+	/* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */
+	tmp = INSERT_FIELD(0, PCIE_MISC_MISC_CTRL, SCB_ACCESS_EN, 1);
+	tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, CFG_READ_UR_MODE, 1);
+	burst = (pcie->type == GENERIC || pcie->type == BCM7278)
+		? BURST_SIZE_512 : BURST_SIZE_256;
+	tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, MAX_BURST_SIZE, burst);
+	bcm_writel(tmp, base + PCIE_MISC_MISC_CTRL);
+
+	/*
+	 * Set up inbound memory view for the EP (called RC_BAR2,
+	 * not to be confused with the BARs that are advertised by
+	 * the EP).
+	 */
+	for (i = 0; i < num_memc; i++)
+		total_mem_size += scb_size[i];
+
+	/*
+	 * The PCIe host controller by design must set the inbound
+	 * viewport to be a contiguous arrangement of all of the
+	 * system's memory.  In addition, its size mut be a power of
+	 * two.  To further complicate matters, the viewport must
+	 * start on a pcie-address that is aligned on a multiple of its
+	 * size.  If a portion of the viewport does not represent
+	 * system memory -- e.g. 3GB of memory requires a 4GB viewport
+	 * -- we can map the outbound memory in or after 3GB and even
+	 * though the viewport will overlap the outbound memory the
+	 * controller will know to send outbound memory downstream and
+	 * everything else upstream.
+	 */
+	rc_bar2_size = roundup_pow_of_two_64(total_mem_size);
+
+	/*
+	 * Set simple configuration based on memory sizes
+	 * only.  We always start the viewport at address 0.
+	 */
+	rc_bar2_offset = 0;
+
+	tmp = lower_32_bits(rc_bar2_offset);
+	tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
+			   encode_ibar_size(rc_bar2_size));
+	bcm_writel(tmp, base + PCIE_MISC_RC_BAR2_CONFIG_LO);
+	bcm_writel(upper_32_bits(rc_bar2_offset),
+		   base + PCIE_MISC_RC_BAR2_CONFIG_HI);
+
+	/* field: SCB0_SIZE, default = 0xf (1 GB) */
+	scb_size_val = scb_size[0]
+		? ilog2(scb_size[0]) - 15 : 0xf;
+	WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB0_SIZE, scb_size_val);
+
+	/* field: SCB1_SIZE, default = 0xf (1 GB) */
+	if (num_memc > 1) {
+		scb_size_val = scb_size[1]
+			? ilog2(scb_size[1]) - 15 : 0xf;
+		WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB1_SIZE, scb_size_val);
+	}
+
+	/* field: SCB2_SIZE, default = 0xf (1 GB) */
+	if (num_memc > 2) {
+		scb_size_val = scb_size[2]
+			? ilog2(scb_size[2]) - 15 : 0xf;
+		WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB2_SIZE, scb_size_val);
+	}
+
+	/* disable the PCIe->GISB memory window (RC_BAR1) */
+	WR_FLD(base, PCIE_MISC_RC_BAR1_CONFIG_LO, SIZE, 0);
+
+	/* disable the PCIe->SCB memory window (RC_BAR3) */
+	WR_FLD(base, PCIE_MISC_RC_BAR3_CONFIG_LO, SIZE, 0);
+
+	if (!pcie->suspended) {
+		/* clear any interrupts we find on boot */
+		bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + CLR);
+		(void)bcm_readl(base + PCIE_INTR2_CPU_BASE + CLR);
+	}
+

drivers/pci/host/pcie-brcmstb.c line 831

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	/* Mask all interrupts since we are not handling any yet */
+	bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + MASK_SET);
+	(void)bcm_readl(base + PCIE_INTR2_CPU_BASE + MASK_SET);
+
+	if (pcie->gen)
+		set_gen(base, pcie->gen);
+
+	/* take the EP device out of reset */
+	/* field: PCIE_SW_PERST = 0 */
+	brcm_pcie_perst_set(pcie, 0);

<raises eyebrows> Take the *EP* out of reset? The host controller driver shouldn't be touching an EP directly. Maybe the comment doesn't match what the code actually does.

Quoted 64 lines
drivers/pci/host/pcie-brcmstb.c new file +64 -0
+
+	/*
+	 * Give the RC/EP time to wake up, before trying to configure RC.
+	 * Intermittently check status for link-up, up to a total of 100ms
+	 * when we don't know if the device is there, and up to 1000ms if
+	 * we do know the device is there.
+	 */
+	limit = pcie->suspended ? 1000 : 100;
+	for (i = 1, j = 0; j < limit && !brcm_pcie_link_up(pcie);
+	     j += i, i = i * 2)
+		msleep(i + j > limit ? limit - j : i);
+
+	if (!brcm_pcie_link_up(pcie)) {
+		dev_info(pcie->dev, "link down\n");
+		return -ENODEV;
+	}
+
+	if (!brcm_pcie_rc_mode(pcie)) {
+		dev_err(pcie->dev, "PCIe misconfigured; is in EP mode\n");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < pcie->num_out_wins; i++)
+		brcm_pcie_set_outbound_win(pcie, i, pcie->out_wins[i].cpu_addr,
+					   pcie->out_wins[i].pcie_addr,
+					   pcie->out_wins[i].size);
+
+	/*
+	 * For config space accesses on the RC, show the right class for
+	 * a PCIe-PCIe bridge (the default setting is to be EP mode).
+	 */
+	WR_FLD_RB(base, PCIE_RC_CFG_PRIV1_ID_VAL3, CLASS_CODE, 0x060400);
+
+	if (pcie->ssc) {
+		ret = set_ssc(base);
+		if (ret == 0)
+			ssc_good = true;
+		else
+			dev_err(pcie->dev,
+				"failed attempt to enter ssc mode\n");
+	}
+
+	lnksta = bcm_readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKSTA);
+	cls = lnksta & PCI_EXP_LNKSTA_CLS;
+	nlw = (lnksta & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;
+	dev_info(pcie->dev, "link up, %s Gbps x%u %s\n", link_speed_to_str(cls),
+		 nlw, ssc_good ? "(SSC)" : "(!SSC)");
+
+	/* PCIe->SCB endian mode for BAR */
+	/* field ENDIAN_MODE_BAR2 = DATA_ENDIAN */
+	WR_FLD_RB(base, PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1,
+		  ENDIAN_MODE_BAR2, DATA_ENDIAN);
+
+	/*
+	 * Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1
+	 * is enabled =>  setting the CLKREQ_DEBUG_ENABLE field to 1.
+	 */
+	WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, CLKREQ_DEBUG_ENABLE, 1);
+
+	return 0;
+}
+
+static void enter_l23(struct brcm_pcie *pcie)
+{

drivers/pci/host/pcie-brcmstb.c line 905

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	void __iomem *base = pcie->base;
+	int tries, l23;
+
+	/* assert request for L23 */
+	WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 1);
+	/* poll L23 status */
+	for (tries = 0, l23 = 0; tries < 1000 && !l23; tries++)
+		l23 = RD_FLD(base, PCIE_MISC_PCIE_STATUS, PCIE_LINK_IN_L23);
+	if (!l23)
+		dev_err(pcie->dev, "failed to enter L23\n");

What does "L23" mean? Some power management thing?

Quoted 29 lines
drivers/pci/host/pcie-brcmstb.c new file +29 -0
+}
+
+static void turn_off(struct brcm_pcie *pcie)
+{
+	void __iomem *base = pcie->base;
+
+	if (brcm_pcie_link_up(pcie))
+		enter_l23(pcie);
+	/* Reset endpoint device */
+	brcm_pcie_perst_set(pcie, 1);
+	/* deassert request for L23 in case it was asserted */
+	WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 0);
+	/* SERDES_IDDQ = 1 */
+	WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 1);
+	/* Shutdown PCIe bridge */
+	brcm_pcie_bridge_sw_init_set(pcie, 1);
+}
+
+static int brcm_pcie_suspend(struct device *dev)
+{
+	struct brcm_pcie *pcie = dev_get_drvdata(dev);
+
+	turn_off(pcie);
+	clk_disable_unprepare(pcie->clk);
+	pcie->suspended = true;
+
+	return 0;
+}
+

drivers/pci/host/pcie-brcmstb.c line 944

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static int brcm_pcie_resume(struct device *dev)
+{
+	struct brcm_pcie *pcie = dev_get_drvdata(dev);
+	void __iomem *base;
+	int ret;
+
+	base = pcie->base;
+	clk_prepare_enable(pcie->clk);
+
+	/* Take bridge out of reset so we can access the SERDES reg */

Some comments above and below spell it "serdes"; here you spell it "SERDES".

Quoted 73 lines
drivers/pci/host/pcie-brcmstb.c new file +73 -0
+	brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+	/* SERDES_IDDQ = 0 */
+	WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+	/* wait for serdes to be stable */
+	usleep_range(100, 200);
+
+	ret = brcm_pcie_setup(pcie);
+	if (ret)
+		return ret;
+
+	pcie->suspended = false;
+
+	return 0;
+}
+
+static void _brcm_pcie_remove(struct brcm_pcie *pcie)
+{
+	turn_off(pcie);
+	clk_disable_unprepare(pcie->clk);
+	clk_put(pcie->clk);
+	brcm_pcie_remove_controller(pcie);
+}
+
+static int brcm_pcie_remove(struct platform_device *pdev)
+{
+	struct brcm_pcie *pcie = platform_get_drvdata(pdev);
+
+	pci_stop_root_bus(pcie->root_bus);
+	pci_remove_root_bus(pcie->root_bus);
+	_brcm_pcie_remove(pcie);
+
+	return 0;
+}
+
+static const struct of_device_id brcm_pcie_match[] = {
+	{ .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
+	{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
+	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
+	{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
+	{},
+};
+MODULE_DEVICE_TABLE(of, brcm_pcie_match);
+
+static int brcm_pcie_probe(struct platform_device *pdev)
+{
+	struct device_node *dn = pdev->dev.of_node;
+	const struct of_device_id *of_id;
+	const struct pcie_cfg_data *data;
+	int ret;
+	struct brcm_pcie *pcie;
+	struct resource *res;
+	void __iomem *base;
+	u32 tmp;
+	struct pci_host_bridge *bridge;
+	struct pci_bus *child;
+
+	bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));
+	if (!bridge)
+		return -ENOMEM;
+
+	pcie = pci_host_bridge_priv(bridge);
+	INIT_LIST_HEAD(&pcie->resources);
+
+	of_id = of_match_node(brcm_pcie_match, dn);
+	if (!of_id) {
+		dev_err(&pdev->dev, "failed to look up compatible string\n");
+		return -EINVAL;
+	}
+
+	if (of_property_read_u32(dn, "dma-ranges", &tmp) == 0) {
+		dev_err(&pdev->dev, "cannot yet handle dma-ranges\n");
+		return -EINVAL;

drivers/pci/host/pcie-brcmstb.c line 1027

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	}
+
+	data = of_id->data;
+	pcie->reg_offsets = data->offsets;
+	pcie->reg_field_info = data->reg_field_info;
+	pcie->type = data->type;
+	pcie->dn = dn;
+	pcie->dev = &pdev->dev;
+
+	pcie->id = of_get_pci_domain_nr(dn);

Why do you call of_get_pci_domain_nr() directly? No other driver does.

Quoted 72 lines
drivers/pci/host/pcie-brcmstb.c new file +72 -0
+	if (pcie->id < 0)
+		return pcie->id;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res)
+		return -EINVAL;
+
+	base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
+
+	pcie->clk = of_clk_get_by_name(dn, "sw_pcie");
+	if (IS_ERR(pcie->clk)) {
+		dev_err(&pdev->dev, "could not get clock\n");
+		pcie->clk = NULL;
+	}
+	pcie->base = base;
+
+	ret = of_pci_get_max_link_speed(dn);
+	pcie->gen = (ret < 0) ? 0 : ret;
+
+	pcie->ssc = of_property_read_bool(dn, "brcm,enable-ssc");
+
+	ret = irq_of_parse_and_map(pdev->dev.of_node, 0);
+	if (ret == 0)
+		/* keep going, as we don't use this intr yet */
+		dev_warn(pcie->dev, "cannot get pcie interrupt\n");
+	else
+		pcie->irq = ret;
+
+	ret = brcm_pcie_parse_request_of_pci_ranges(pcie);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(pcie->clk);
+	if (ret) {
+		dev_err(&pdev->dev, "could not enable clock\n");
+		return ret;
+	}
+
+	ret = brcm_pcie_add_controller(pcie);
+	if (ret)
+		return ret;
+
+	ret = brcm_pcie_setup(pcie);
+	if (ret)
+		goto fail;
+
+	list_splice_init(&pcie->resources, &bridge->windows);
+	bridge->dev.parent = &pdev->dev;
+	bridge->busnr = 0;
+	bridge->ops = &brcm_pcie_ops;
+	bridge->sysdata = pcie;
+	bridge->map_irq = of_irq_parse_and_map_pci;
+	bridge->swizzle_irq = pci_common_swizzle;
+
+	ret = pci_scan_root_bus_bridge(bridge);
+	if (ret < 0) {
+		dev_err(pcie->dev, "Scanning root bridge failed");
+		goto fail;
+	}
+
+	pci_assign_unassigned_bus_resources(bridge->bus);
+	list_for_each_entry(child, &bridge->bus->children, node)
+		pcie_bus_configure_settings(child);
+	pci_bus_add_devices(bridge->bus);
+	platform_set_drvdata(pdev, pcie);
+	pcie->root_bus = bridge->bus;
+
+	return 0;
+
+fail:

drivers/pci/host/pcie-brcmstb.c line 1109

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+	_brcm_pcie_remove(pcie);
+	return ret;
+}
+
+static const struct dev_pm_ops brcm_pcie_pm_ops = {
+	.suspend_noirq = brcm_pcie_suspend,
+	.resume_noirq = brcm_pcie_resume,
+};
+
+static struct platform_driver __refdata brcm_pcie_driver = {

Why do you need __refdata? There's only only other occurrence in drivers/pci, and I'm dubious about that one as well.

drivers/pci/host/pcie-brcmstb.c line 1122

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+	.probe = brcm_pcie_probe,
+	.remove = brcm_pcie_remove,
+	.driver = {
+		.name = "brcm-pcie",
+		.owner = THIS_MODULE,
+		.of_match_table = brcm_pcie_match,
+		.pm = &brcm_pcie_pm_ops,
+	},
+};
+
+module_platform_driver(brcm_pcie_driver);
+
+MODULE_LICENSE("GPL");

Copyright notice above says "GPL v2", which is not the same as the "GPL" here.

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+MODULE_DESCRIPTION("Broadcom STB PCIE RC driver");
+MODULE_AUTHOR("Broadcom");
Signature · 7 lines
1.9.0.138.g2de3478


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#12 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

Quoted 651 lines · Bjorn Helgaas
Quoted 85 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

---
 drivers/pci/host/Kconfig        |    9 +
 drivers/pci/host/Makefile       |    1 +
 drivers/pci/host/pcie-brcmstb.c | 1124 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 1134 insertions(+)
 create mode 100644 drivers/pci/host/pcie-brcmstb.c
drivers/pci/host/Kconfig +9 -0
index b868803..751463e 100644
@@ -220,4 +220,13 @@ config VMD
        To compile this driver as a module, choose M here: the
        module will be called vmd.
 
+config PCIE_BRCMSTB
+     tristate "Broadcom Brcmstb PCIe platform host driver"
+     depends on ARCH_BRCMSTB || BMIPS_GENERIC
+     depends on OF
+     depends on SOC_BRCMSTB
+     default ARCH_BRCMSTB || BMIPS_GENERIC
+     help
+       Adds support for Broadcom Settop Box PCIe host controller.
+
 endmenu
drivers/pci/host/Makefile +1 -0
index 1238278..a8b9923 100644
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
+obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie-brcmstb.c new file +30 -0
new file mode 100644
index 0000000..d8a8f7a
@@ -0,0 +1,1124 @@
+/*
+ * Copyright (C) 2009 - 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/compiler.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irqdomain.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/of_pci.h>
+#include <linux/of_platform.h>

drivers/pci/host/pcie-brcmstb.c line 40

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#include <linux/pci.h>
+#include <linux/printk.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <soc/brcmstb/memory_api.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+/* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */
+#define BRCM_PCIE_CAP_REGS                           0x00ac

Add a blank line before multi-line comments.

drivers/pci/host/pcie-brcmstb.c line 44

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+/*
+ * Broadcom Settop Box PCIE Register Offsets. The names are from
+ * the chip's RDB and we use them here so that a script can correlate
+ * this code and the RDB to prevent discrepancies.

Use "PCIe" capitalization in English text and messages.

Quoted 264 lines
drivers/pci/host/pcie-brcmstb.c new file +264 -0
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1              0x0188
+#define PCIE_RC_CFG_PRIV1_ID_VAL3                    0x043c
+#define PCIE_RC_DL_MDIO_ADDR                         0x1100
+#define PCIE_RC_DL_MDIO_WR_DATA                              0x1104
+#define PCIE_RC_DL_MDIO_RD_DATA                              0x1108
+#define PCIE_MISC_MISC_CTRL                          0x4008
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO             0x400c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI             0x4010
+#define PCIE_MISC_RC_BAR1_CONFIG_LO                  0x402c
+#define PCIE_MISC_RC_BAR2_CONFIG_LO                  0x4034
+#define PCIE_MISC_RC_BAR2_CONFIG_HI                  0x4038
+#define PCIE_MISC_RC_BAR3_CONFIG_LO                  0x403c
+#define PCIE_MISC_PCIE_CTRL                          0x4064
+#define PCIE_MISC_PCIE_STATUS                                0x4068
+#define PCIE_MISC_REVISION                           0x406c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT     0x4070
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI                0x4080
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI               0x4084
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG                       0x4204
+#define PCIE_INTR2_CPU_BASE                          0x4300
+
+/*
+ * Broadcom Settop Box PCIE Register Field shift and mask info. The
+ * names are from the chip's RDB and we use them here so that a script
+ * can correlate this code and the RDB to prevent discrepancies.
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK        0xc
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_SHIFT       0x2
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK            0xffffff
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_SHIFT           0x0
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK                       0x1000
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_SHIFT                      0xc
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK            0x2000
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_SHIFT           0xd
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK                      0x300000
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_SHIFT             0x14
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK                   0xf8000000
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_SHIFT                  0x1b
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK                   0x7c00000
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_SHIFT                  0x16
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK                   0x1f
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_SHIFT                  0x0
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK                        0x1f
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_SHIFT                       0x0
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_MASK                        0x1f
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_SHIFT                       0x0
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK                        0x1f
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_SHIFT                       0x0
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK                 0x4
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_SHIFT                        0x2
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK            0x1
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_SHIFT           0x0
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK                 0x80
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_SHIFT                        0x7
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_MASK            0x20
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_SHIFT           0x5
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_MASK            0x10
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_SHIFT           0x4
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_MASK          0x40
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_SHIFT         0x6
+#define PCIE_MISC_REVISION_MAJMIN_MASK                               0xffff
+#define PCIE_MISC_REVISION_MAJMIN_SHIFT                              0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK  0xfff00000
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_SHIFT 0x14
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_MASK   0xfff0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_SHIFT  0x4
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS       0xc
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_MASK              0xff
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_SHIFT     0x0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_MASK    0xff
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_SHIFT   0x0
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK      0x2
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_SHIFT 0x1
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK              0x08000000
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_SHIFT     0x1b
+#define PCIE_RGR1_SW_INIT_1_PERST_MASK                               0x1
+#define PCIE_RGR1_SW_INIT_1_PERST_SHIFT                              0x0
+
+#define BRCM_NUM_PCIE_OUT_WINS               0x4
+#define BRCM_MAX_SCB                 0x4
+
+#define BRCM_MSI_TARGET_ADDR_LT_4GB  0x0fffffffcULL
+#define BRCM_MSI_TARGET_ADDR_GT_4GB  0xffffffffcULL
+
+#define BURST_SIZE_128                       0
+#define BURST_SIZE_256                       1
+#define BURST_SIZE_512                       2
+
+/* Offsets from PCIE_INTR2_CPU_BASE */
+#define STATUS                               0x0
+#define SET                          0x4
+#define CLR                          0x8
+#define MASK_STATUS                  0xc
+#define MASK_SET                     0x10
+#define MASK_CLR                     0x14
+
+#define PCIE_BUSNUM_SHIFT            20
+#define PCIE_SLOT_SHIFT                      15
+#define PCIE_FUNC_SHIFT                      12
+
+#if defined(__BIG_ENDIAN)
+#define      DATA_ENDIAN             2       /* PCIe->DDR inbound accesses */
+#define MMIO_ENDIAN          2       /* CPU->PCIe outbound accesses */
+#else
+#define      DATA_ENDIAN             0
+#define MMIO_ENDIAN          0
+#endif
+
+#define MDIO_PORT0           0x0
+#define MDIO_DATA_MASK               0x7fffffff
+#define MDIO_DATA_SHIFT              0x0
+#define MDIO_PORT_MASK               0xf0000
+#define MDIO_PORT_SHIFT              0x16
+#define MDIO_REGAD_MASK              0xffff
+#define MDIO_REGAD_SHIFT     0x0
+#define MDIO_CMD_MASK                0xfff00000
+#define MDIO_CMD_SHIFT               0x14
+#define MDIO_CMD_READ                0x1
+#define MDIO_CMD_WRITE               0x0
+#define MDIO_DATA_DONE_MASK  0x80000000
+#define MDIO_RD_DONE(x)              (((x) & MDIO_DATA_DONE_MASK) ? 1 : 0)
+#define MDIO_WT_DONE(x)              (((x) & MDIO_DATA_DONE_MASK) ? 0 : 1)
+#define SSC_REGS_ADDR                0x1100
+#define SET_ADDR_OFFSET              0x1f
+#define SSC_CNTL_OFFSET              0x2
+#define SSC_CNTL_OVRD_EN_MASK        0x8000
+#define SSC_CNTL_OVRD_EN_SHIFT       0xf
+#define SSC_CNTL_OVRD_VAL_MASK       0x4000
+#define SSC_CNTL_OVRD_VAL_SHIFT      0xe
+#define SSC_STATUS_OFFSET    0x1
+#define SSC_STATUS_SSC_MASK  0x400
+#define SSC_STATUS_SSC_SHIFT 0xa
+#define SSC_STATUS_PLL_LOCK_MASK     0x800
+#define SSC_STATUS_PLL_LOCK_SHIFT    0xb
+
+#define IDX_ADDR(pcie)       \
+     ((pcie)->reg_offsets[EXT_CFG_INDEX])
+#define DATA_ADDR(pcie)      \
+     ((pcie)->reg_offsets[EXT_CFG_DATA])
+#define PCIE_RGR1_SW_INIT_1(pcie) \
+     ((pcie)->reg_offsets[RGR1_SW_INIT_1])
+
+enum {
+     RGR1_SW_INIT_1,
+     EXT_CFG_INDEX,
+     EXT_CFG_DATA,
+};
+
+enum {
+     RGR1_SW_INIT_1_INIT_MASK,
+     RGR1_SW_INIT_1_INIT_SHIFT,
+     RGR1_SW_INIT_1_PERST_MASK,
+     RGR1_SW_INIT_1_PERST_SHIFT,
+};
+
+enum pcie_type {
+     BCM7425,
+     BCM7435,
+     GENERIC,
+     BCM7278,
+};
+
+struct brcm_window {
+     dma_addr_t pcie_addr;
+     phys_addr_t cpu_addr;
+     dma_addr_t size;
+};
+
+/* Internal PCIe Host Controller Information.*/
+struct brcm_pcie {
+     struct list_head        list;
+     struct device           *dev;
+     void __iomem            *base;
+     struct list_head        resources;
+     int                     irq;
+     struct clk              *clk;
+     struct pci_bus          *root_bus;
+     struct device_node      *dn;
+     int                     id;
+     bool                    suspended;
+     int                     num_out_wins;
+     bool                    ssc;
+     int                     gen;
+     struct brcm_window      out_wins[BRCM_NUM_PCIE_OUT_WINS];
+     unsigned int            rev;
+     const int               *reg_offsets;
+     const int               *reg_field_info;
+     enum pcie_type          type;
+};
+
+struct pcie_cfg_data {
+     const int *reg_field_info;
+     const int *offsets;
+     const enum pcie_type type;
+};
+
+static const int pcie_reg_field_info[] = {
+     [RGR1_SW_INIT_1_INIT_MASK] = 0x2,
+     [RGR1_SW_INIT_1_INIT_SHIFT] = 0x1,
+};
+
+static const int pcie_reg_field_info_bcm7278[] = {
+     [RGR1_SW_INIT_1_INIT_MASK] = 0x1,
+     [RGR1_SW_INIT_1_INIT_SHIFT] = 0x0,
+};
+
+static const int pcie_offset_bcm7425[] = {
+     [RGR1_SW_INIT_1] = 0x8010,
+     [EXT_CFG_INDEX]  = 0x8300,
+     [EXT_CFG_DATA]   = 0x8304,
+};
+
+static const struct pcie_cfg_data bcm7425_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offset_bcm7425,
+     .type           = BCM7425,
+};
+
+static const int pcie_offsets[] = {
+     [RGR1_SW_INIT_1] = 0x9210,
+     [EXT_CFG_INDEX]  = 0x9000,
+     [EXT_CFG_DATA]   = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7435_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offsets,
+     .type           = BCM7435,
+};
+
+static const struct pcie_cfg_data generic_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offsets,
+     .type           = GENERIC,
+};
+
+static const int pcie_offset_bcm7278[] = {
+     [RGR1_SW_INIT_1] = 0xc010,
+     [EXT_CFG_INDEX] = 0x9000,
+     [EXT_CFG_DATA] = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7278_cfg = {
+     .reg_field_info = pcie_reg_field_info_bcm7278,
+     .offsets        = pcie_offset_bcm7278,
+     .type           = BCM7278,
+};
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
+                                     int where);
+
+static struct pci_ops brcm_pcie_ops = {
+     .map_bus = brcm_pcie_map_conf,
+     .read = pci_generic_config_read,
+     .write = pci_generic_config_write,
+};
+
+#if defined(CONFIG_MIPS)
+/* Broadcom MIPs HW implicitly does the swapping if necessary */
+#define bcm_readl(a)         __raw_readl(a)
+#define bcm_writel(d, a)     __raw_writel(d, a)
+#define bcm_readw(a)         __raw_readw(a)
+#define bcm_writew(d, a)     __raw_writew(d, a)

drivers/pci/host/pcie-brcmstb.c line 318

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#else
+#define bcm_readl(a)         readl(a)
+#define bcm_writel(d, a)     writel(d, a)
+#define bcm_readw(a)         readw(a)
+#define bcm_writew(d, a)     writew(d, a)
+#endif
+
+/*
+ * These macros are designed to sxtract/insert fields to host controller's
+ * register set.

s/are designed to s/ e/ (I assume they actually *do* extract/insert)

Quoted 60 lines
drivers/pci/host/pcie-brcmstb.c new file +60 -0
+ */
+#define RD_FLD(base, reg, field) \
+     rd_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT)
+#define WR_FLD(base, reg, field, val) \
+     wr_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT, val)
+#define WR_FLD_RB(base, reg, field, val) \
+     wr_fld_rb(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT, val)
+#define WR_FLD_WITH_OFFSET(base, off, reg, field, val) \
+     wr_fld(base + reg + off, reg##_##field##_MASK, \
+            reg##_##field##_SHIFT, val)
+#define EXTRACT_FIELD(val, reg, field) \
+     ((val & reg##_##field##_MASK) >> reg##_##field##_SHIFT)
+#define INSERT_FIELD(val, reg, field, field_val) \
+     ((val & ~reg##_##field##_MASK) | \
+      (reg##_##field##_MASK & (field_val << reg##_##field##_SHIFT)))
+
+static struct list_head brcm_pcie = LIST_HEAD_INIT(brcm_pcie);
+static phys_addr_t scb_size[BRCM_MAX_SCB];
+static int num_memc;
+static DEFINE_MUTEX(brcm_pcie_lock);
+
+static u32 rd_fld(void __iomem *p, u32 mask, int shift)
+{
+     return (bcm_readl(p) & mask) >> shift;
+}
+
+static void wr_fld(void __iomem *p, u32 mask, int shift, u32 val)
+{
+     u32 reg = bcm_readl(p);
+
+     reg = (reg & ~mask) | ((val << shift) & mask);
+     bcm_writel(reg, p);
+}
+
+static void wr_fld_rb(void __iomem *p, u32 mask, int shift, u32 val)
+{
+     wr_fld(p, mask, shift, val);
+     (void)bcm_readl(p);
+}
+
+static const char *link_speed_to_str(int s)
+{
+     switch (s) {
+     case 1:
+             return "2.5";
+     case 2:
+             return "5.0";
+     case 3:
+             return "8.0";
+     default:
+             break;
+     }
+     return "???";
+}
+
+/*
+ * The roundup_pow_of_two() from log2.h invokes
+ * __roundup_pow_of_two(unsigned long), but we really need a
+ * such a function to take a native u64 since unsigned long
+ * is 32 bits on some configurations.  So we provide this helper

drivers/pci/host/pcie-brcmstb.c line 388

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+ * function below.
+ */
+static u64 roundup_pow_of_two_64(u64 n)
+{
+     return 1ULL << fls64(n - 1);
+}
+
+/*
+ * This is to convert the size of the inbound bar region to the
+ * non-liniear values of PCIE_X_MISC_RC_BAR[123]_CONFIG_LO.SIZE

s/bar/BAR/ (This doesn't sound like a BAR in the PCI spec sense, but if that's what you call it, might as well spell it as the acronym)

s/non-liniear/non-linear/

Quoted 59 lines
drivers/pci/host/pcie-brcmstb.c new file +59 -0
+ */
+int encode_ibar_size(u64 size)
+{
+     int log2_in = ilog2(size);
+
+     if (log2_in >= 12 && log2_in <= 15)
+             /* Covers 4KB to 32KB (inclusive) */
+             return (log2_in - 12) + 0x1c;
+     else if (log2_in >= 16 && log2_in <= 37)
+             /* Covers 64KB to 32GB, (inclusive) */
+             return log2_in - 15;
+     /* Something is awry so disable */
+     return 0;
+}
+
+static u32 mdio_form_pkt(int port, int regad, int cmd)
+{
+     u32 pkt = 0;
+
+     pkt |= (port << MDIO_PORT_SHIFT) & MDIO_PORT_MASK;
+     pkt |= (regad << MDIO_REGAD_SHIFT) & MDIO_REGAD_MASK;
+     pkt |= (cmd << MDIO_CMD_SHIFT) & MDIO_CMD_MASK;
+
+     return pkt;
+}
+
+/* negative return value indicates error */
+static int mdio_read(void __iomem *base, u8 port, u8 regad)
+{
+     int tries;
+     u32 data;
+
+     bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_READ),
+                base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+
+     data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+     for (tries = 0; !MDIO_RD_DONE(data) && tries < 10; tries++) {
+             udelay(10);
+             data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+     }
+
+     return MDIO_RD_DONE(data)
+             ? (data & MDIO_DATA_MASK) >> MDIO_DATA_SHIFT
+             : -EIO;
+}
+
+/* negative return value indicates error */
+static int mdio_write(void __iomem *base, u8 port, u8 regad, u16 wrdata)
+{
+     int tries;
+     u32 data;
+
+     bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_WRITE),
+                base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_writel(MDIO_DATA_DONE_MASK | wrdata,
+                base + PCIE_RC_DL_MDIO_WR_DATA);
+

drivers/pci/host/pcie-brcmstb.c line 457

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+     for (tries = 0; !MDIO_WT_DONE(data) && tries < 10; tries++) {
+             udelay(10);
+             data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+     }
+
+     return MDIO_WT_DONE(data) ? 0 : -EIO;
+}
+
+/* configures device for ssc mode; negative return value indicates error */

I guess "ssc" means Spread Spectrum Clocking? Maybe spell out the first occurrence and spell as acronym in English text?

Quoted 119 lines
drivers/pci/host/pcie-brcmstb.c new file +119 -0
+static int set_ssc(void __iomem *base)
+{
+     int tmp;
+     u16 wrdata;
+     int pll, ssc;
+
+     tmp = mdio_write(base, MDIO_PORT0, SET_ADDR_OFFSET, SSC_REGS_ADDR);
+     if (tmp < 0)
+             return tmp;
+
+     tmp = mdio_read(base, MDIO_PORT0, SSC_CNTL_OFFSET);
+     if (tmp < 0)
+             return tmp;
+
+     wrdata = INSERT_FIELD(tmp, SSC_CNTL_OVRD, EN, 1);
+     wrdata = INSERT_FIELD(wrdata, SSC_CNTL_OVRD, VAL, 1);
+     tmp = mdio_write(base, MDIO_PORT0, SSC_CNTL_OFFSET, wrdata);
+     if (tmp < 0)
+             return tmp;
+
+     usleep_range(1000, 2000);
+     tmp = mdio_read(base, MDIO_PORT0, SSC_STATUS_OFFSET);
+     if (tmp < 0)
+             return tmp;
+
+     ssc = EXTRACT_FIELD(tmp, SSC_STATUS, SSC);
+     pll = EXTRACT_FIELD(tmp, SSC_STATUS, PLL_LOCK);
+
+     return (ssc && pll) ? 0 : -EIO;
+}
+
+/* limits operation to a specific generation (1, 2, or 3) */
+static void set_gen(void __iomem *base, int gen)
+{
+     u32 lnkcap = bcm_readl(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+     u16 lnkctl2 = bcm_readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2);
+
+     lnkcap = (lnkcap & ~PCI_EXP_LNKCAP_SLS) | gen;
+     bcm_writel(lnkcap, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+
+     lnkctl2 = (lnkctl2 & ~0xf) | gen;
+     bcm_writew(lnkctl2, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2);
+}
+
+static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie,
+                                    unsigned int win, phys_addr_t cpu_addr,
+                                    dma_addr_t  pcie_addr, dma_addr_t size)
+{
+     void __iomem *base = pcie->base;
+     phys_addr_t cpu_addr_mb, limit_addr_mb;
+     u32 tmp;
+
+     /* Set the base of the pcie_addr window */
+     bcm_writel(lower_32_bits(pcie_addr) + MMIO_ENDIAN,
+                base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO + (win * 8));
+     bcm_writel(upper_32_bits(pcie_addr),
+                base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI + (win * 8));
+
+     cpu_addr_mb = cpu_addr >> 20;
+     limit_addr_mb = (cpu_addr + size - 1) >> 20;
+
+     /* Write the addr base low register */
+     WR_FLD_WITH_OFFSET(base, (win * 4),
+                        PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,
+                        BASE, cpu_addr_mb);
+     /* Write the addr limit low register */
+     WR_FLD_WITH_OFFSET(base, (win * 4),
+                        PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,
+                        LIMIT, limit_addr_mb);
+
+     if (pcie->type != BCM7435 && pcie->type != BCM7425) {
+             /* Write the cpu addr high register */
+             tmp = (u32)(cpu_addr_mb >>
+                     PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS);
+             WR_FLD_WITH_OFFSET(base, (win * 8),
+                                PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI,
+                                BASE, tmp);
+             /* Write the cpu limit high register */
+             tmp = (u32)(limit_addr_mb >>
+                     PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS);
+             WR_FLD_WITH_OFFSET(base, (win * 8),
+                                PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI,
+                                LIMIT, tmp);
+     }
+}
+
+/* Configuration space read/write support */
+static int cfg_index(int busnr, int devfn, int reg)
+{
+     return ((PCI_SLOT(devfn) & 0x1f) << PCIE_SLOT_SHIFT)
+             | ((PCI_FUNC(devfn) & 0x07) << PCIE_FUNC_SHIFT)
+             | (busnr << PCIE_BUSNUM_SHIFT)
+             | (reg & ~3);
+}
+
+static bool brcm_pcie_rc_mode(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+
+     return !!EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_PORT);
+}
+
+static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+     u32 dla = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_DL_ACTIVE);
+     u32 plu = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_PHYLINKUP);
+
+     return  (dla && plu) ? true : false;
+}
+
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct pci_bus *bus,
+                                int dev)
+{
+     if (pci_is_root_bus(bus)) {
+             if (dev > 0)
+                     return false;
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+     } else {
+             /* If there is no link, then there is no device */
+             if (!brcm_pcie_link_up(pcie))
+                     return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

Yes, that can happen but there is really nothing that can be done if the link goes down in that vulnerability window. What do you suggest doing?

Quoted 86 lines
Quoted 14 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+     }
+
+     return true;
+}
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
+                                     int where)
+{
+     struct brcm_pcie *pcie = bus->sysdata;
+     void __iomem *base = pcie->base;
+     int idx;
+
+     if (!brcm_pcie_valid_device(pcie, bus, PCI_SLOT(devfn)))

drivers/pci/host/pcie-brcmstb.c line 603

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+             return NULL;
+
+     /* Accesses to the RC go right to the RC registers */
+     if (pci_is_root_bus(bus))
+             return base + where;
+
+     /* For devices, write to the config space index register */
+     idx = cfg_index(bus->number, devfn, where);
+     bcm_writel(idx, pcie->base + IDX_ADDR(pcie));
+     return base + DATA_ADDR(pcie) + (where & 0x3);

I guess this is protected by a higher-level config access lock?

Quoted 59 lines
drivers/pci/host/pcie-brcmstb.c new file +59 -0
+}
+
+static inline void brcm_pcie_bridge_sw_init_set(struct brcm_pcie *pcie,
+                                             unsigned int val)
+{
+     unsigned int offset;
+     unsigned int shift = pcie->reg_field_info[RGR1_SW_INIT_1_INIT_SHIFT];
+     u32 mask =  pcie->reg_field_info[RGR1_SW_INIT_1_INIT_MASK];
+
+     if (pcie->type != BCM7278) {
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask, shift,
+                       val);
+     } else if (of_machine_is_compatible("brcm,bcm7278a0")) {
+             /*
+              * The two PCIe instances on 7278a0 are not even consistent with
+              * respect to each other for internal offsets, here we offset
+              * by 0x14000 + RGR1_SW_INIT_1's relative offset to account for
+              * that.
+              */
+             offset = pcie->id ? 0x14010 : pcie->reg_offsets[RGR1_SW_INIT_1];
+             wr_fld_rb(pcie->base + offset, mask, shift, val);
+     } else {
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask, shift,
+                       val);
+     }
+}
+
+static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie,
+                                    unsigned int val)
+{
+     if (pcie->type != BCM7278)
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie),
+                       PCIE_RGR1_SW_INIT_1_PERST_MASK,
+                       PCIE_RGR1_SW_INIT_1_PERST_SHIFT, val);
+     else
+             /* Assert = 0, de-assert = 1 on 7278 */
+             WR_FLD_RB(pcie->base, PCIE_MISC_PCIE_CTRL, PCIE_PERSTB, !val);
+}
+
+static int brcm_pcie_add_controller(struct brcm_pcie *pcie)
+{
+     mutex_lock(&brcm_pcie_lock);
+     list_add_tail(&pcie->list, &brcm_pcie);
+     mutex_unlock(&brcm_pcie_lock);
+
+     return 0;
+}
+
+static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
+{
+     struct list_head *pos, *q;
+     struct brcm_pcie *tmp;
+
+     mutex_lock(&brcm_pcie_lock);
+     list_for_each_safe(pos, q, &brcm_pcie) {
+             tmp = list_entry(pos, struct brcm_pcie, list);
+             if (tmp == pcie) {
+                     list_del(pos);
+                     if (list_empty(&brcm_pcie))
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 667

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+                             num_memc = 0;
+                     break;
+             }
+     }
+     mutex_unlock(&brcm_pcie_lock);

I'm missing something. I don't see that num_memc is ever set to anything *other* than zero.

The num_memc is set and used in the dma commit. I will remove its declaration from this commit.

Quoted 2 lines

This pattern of keeping a list of controllers is highly unusual and needs some explanation.

I think I can remove the list but still need brcm_pcie_lock.

Quoted 253 lines
Quoted 43 lines
drivers/pci/host/pcie-brcmstb.c new file +42 -0
+}
+
+static int brcm_pcie_parse_request_of_pci_ranges(struct brcm_pcie *pcie)
+{
+     struct resource_entry *win;
+     int ret;
+
+     ret = of_pci_get_host_bridge_resources(pcie->dn, 0, 0xff,
+                                            &pcie->resources, NULL);
+     if (ret) {
+             dev_err(pcie->dev, "failed to get host resources\n");
+             return ret;
+     }
+
+     resource_list_for_each_entry(win, &pcie->resources) {
+             struct resource *parent, *res = win->res;
+             dma_addr_t offset = (dma_addr_t)win->offset;
+
+             if (resource_type(res) == IORESOURCE_IO) {
+                     parent = &ioport_resource;
+             } else if (resource_type(res) == IORESOURCE_MEM) {
+                     if (pcie->num_out_wins >= BRCM_NUM_PCIE_OUT_WINS) {
+                             dev_err(pcie->dev, "too many outbound wins\n");
+                             return -EINVAL;
+                     }
+                     pcie->out_wins[pcie->num_out_wins].cpu_addr
+                             = (phys_addr_t)res->start;
+                     pcie->out_wins[pcie->num_out_wins].pcie_addr
+                             = (dma_addr_t)(res->start
+                                            - (phys_addr_t)offset);
+                     pcie->out_wins[pcie->num_out_wins].size
+                             = (dma_addr_t)(res->end - res->start + 1);
+                     pcie->num_out_wins++;
+                     parent = &iomem_resource;
+             } else {
+                     continue;
+             }
+
+             ret = devm_request_resource(pcie->dev, parent, res);
+             if (ret) {
+                     dev_err(pcie->dev, "failed to get res %pR\n", res);
+                     return ret;

drivers/pci/host/pcie-brcmstb.c line 719

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+             }
+     }
+     return 0;
+}
+
+static int brcm_pcie_setup(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     unsigned int scb_size_val;
+     u64 rc_bar2_size = 0, rc_bar2_offset = 0, total_mem_size = 0;

Unnecessary initializations (at least of rc_bar2_size, I didn't check the rest).

Add

  struct device *dev = pcie->dev;

then use it below.

drivers/pci/host/pcie-brcmstb.c line 726

Quoted 7 lines
drivers/pci/host/pcie-brcmstb.c new file +7 -0
+     u32 tmp, burst;
+     int i, j, ret, limit;
+     u16 nlw, cls, lnksta;
+     bool ssc_good = false;
+
+     /* reset the bridge and the endpoint device */
+     /* field: PCIE_BRIDGE_SW_INIT = 1 */

Not sure what these "field: ..." comments mean. Are they for some automated tool? To a human, it looks like they repeat what the code does.

Quoted 95 lines
drivers/pci/host/pcie-brcmstb.c new file +95 -0
+     brcm_pcie_bridge_sw_init_set(pcie, 1);
+
+     /* field: PCIE_SW_PERST = 1, on 7278, we start de-asserted already */
+     if (pcie->type != BCM7278)
+             brcm_pcie_perst_set(pcie, 1);
+
+     usleep_range(100, 200);
+
+     /* take the bridge out of reset */
+     /* field: PCIE_BRIDGE_SW_INIT = 0 */
+     brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+     /* wait for serdes to be stable */
+     usleep_range(100, 200);
+
+     /* Grab the PCIe hw revision number */
+     tmp = bcm_readl(base + PCIE_MISC_REVISION);
+     pcie->rev = EXTRACT_FIELD(tmp, PCIE_MISC_REVISION, MAJMIN);
+
+     /* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */
+     tmp = INSERT_FIELD(0, PCIE_MISC_MISC_CTRL, SCB_ACCESS_EN, 1);
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, CFG_READ_UR_MODE, 1);
+     burst = (pcie->type == GENERIC || pcie->type == BCM7278)
+             ? BURST_SIZE_512 : BURST_SIZE_256;
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, MAX_BURST_SIZE, burst);
+     bcm_writel(tmp, base + PCIE_MISC_MISC_CTRL);
+
+     /*
+      * Set up inbound memory view for the EP (called RC_BAR2,
+      * not to be confused with the BARs that are advertised by
+      * the EP).
+      */
+     for (i = 0; i < num_memc; i++)
+             total_mem_size += scb_size[i];
+
+     /*
+      * The PCIe host controller by design must set the inbound
+      * viewport to be a contiguous arrangement of all of the
+      * system's memory.  In addition, its size mut be a power of
+      * two.  To further complicate matters, the viewport must
+      * start on a pcie-address that is aligned on a multiple of its
+      * size.  If a portion of the viewport does not represent
+      * system memory -- e.g. 3GB of memory requires a 4GB viewport
+      * -- we can map the outbound memory in or after 3GB and even
+      * though the viewport will overlap the outbound memory the
+      * controller will know to send outbound memory downstream and
+      * everything else upstream.
+      */
+     rc_bar2_size = roundup_pow_of_two_64(total_mem_size);
+
+     /*
+      * Set simple configuration based on memory sizes
+      * only.  We always start the viewport at address 0.
+      */
+     rc_bar2_offset = 0;
+
+     tmp = lower_32_bits(rc_bar2_offset);
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
+                        encode_ibar_size(rc_bar2_size));
+     bcm_writel(tmp, base + PCIE_MISC_RC_BAR2_CONFIG_LO);
+     bcm_writel(upper_32_bits(rc_bar2_offset),
+                base + PCIE_MISC_RC_BAR2_CONFIG_HI);
+
+     /* field: SCB0_SIZE, default = 0xf (1 GB) */
+     scb_size_val = scb_size[0]
+             ? ilog2(scb_size[0]) - 15 : 0xf;
+     WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB0_SIZE, scb_size_val);
+
+     /* field: SCB1_SIZE, default = 0xf (1 GB) */
+     if (num_memc > 1) {
+             scb_size_val = scb_size[1]
+                     ? ilog2(scb_size[1]) - 15 : 0xf;
+             WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB1_SIZE, scb_size_val);
+     }
+
+     /* field: SCB2_SIZE, default = 0xf (1 GB) */
+     if (num_memc > 2) {
+             scb_size_val = scb_size[2]
+                     ? ilog2(scb_size[2]) - 15 : 0xf;
+             WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB2_SIZE, scb_size_val);
+     }
+
+     /* disable the PCIe->GISB memory window (RC_BAR1) */
+     WR_FLD(base, PCIE_MISC_RC_BAR1_CONFIG_LO, SIZE, 0);
+
+     /* disable the PCIe->SCB memory window (RC_BAR3) */
+     WR_FLD(base, PCIE_MISC_RC_BAR3_CONFIG_LO, SIZE, 0);
+
+     if (!pcie->suspended) {
+             /* clear any interrupts we find on boot */
+             bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + CLR);
+             (void)bcm_readl(base + PCIE_INTR2_CPU_BASE + CLR);
+     }
+

drivers/pci/host/pcie-brcmstb.c line 831

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     /* Mask all interrupts since we are not handling any yet */
+     bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + MASK_SET);
+     (void)bcm_readl(base + PCIE_INTR2_CPU_BASE + MASK_SET);
+
+     if (pcie->gen)
+             set_gen(base, pcie->gen);
+
+     /* take the EP device out of reset */
+     /* field: PCIE_SW_PERST = 0 */
+     brcm_pcie_perst_set(pcie, 0);

<raises eyebrows> Take the *EP* out of reset? The host controller driver shouldn't be touching an EP directly. Maybe the comment doesn't match what the code actually does.

Quoted 68 lines
drivers/pci/host/pcie-brcmstb.c new file +68 -0
+
+     /*
+      * Give the RC/EP time to wake up, before trying to configure RC.
+      * Intermittently check status for link-up, up to a total of 100ms
+      * when we don't know if the device is there, and up to 1000ms if
+      * we do know the device is there.
+      */
+     limit = pcie->suspended ? 1000 : 100;
+     for (i = 1, j = 0; j < limit && !brcm_pcie_link_up(pcie);
+          j += i, i = i * 2)
+             msleep(i + j > limit ? limit - j : i);
+
+     if (!brcm_pcie_link_up(pcie)) {
+             dev_info(pcie->dev, "link down\n");
+             return -ENODEV;
+     }
+
+     if (!brcm_pcie_rc_mode(pcie)) {
+             dev_err(pcie->dev, "PCIe misconfigured; is in EP mode\n");
+             return -EINVAL;
+     }
+
+     for (i = 0; i < pcie->num_out_wins; i++)
+             brcm_pcie_set_outbound_win(pcie, i, pcie->out_wins[i].cpu_addr,
+                                        pcie->out_wins[i].pcie_addr,
+                                        pcie->out_wins[i].size);
+
+     /*
+      * For config space accesses on the RC, show the right class for
+      * a PCIe-PCIe bridge (the default setting is to be EP mode).
+      */
+     WR_FLD_RB(base, PCIE_RC_CFG_PRIV1_ID_VAL3, CLASS_CODE, 0x060400);
+
+     if (pcie->ssc) {
+             ret = set_ssc(base);
+             if (ret == 0)
+                     ssc_good = true;
+             else
+                     dev_err(pcie->dev,
+                             "failed attempt to enter ssc mode\n");
+     }
+
+     lnksta = bcm_readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKSTA);
+     cls = lnksta & PCI_EXP_LNKSTA_CLS;
+     nlw = (lnksta & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;
+     dev_info(pcie->dev, "link up, %s Gbps x%u %s\n", link_speed_to_str(cls),
+              nlw, ssc_good ? "(SSC)" : "(!SSC)");
+
+     /* PCIe->SCB endian mode for BAR */
+     /* field ENDIAN_MODE_BAR2 = DATA_ENDIAN */
+     WR_FLD_RB(base, PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1,
+               ENDIAN_MODE_BAR2, DATA_ENDIAN);
+
+     /*
+      * Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1
+      * is enabled =>  setting the CLKREQ_DEBUG_ENABLE field to 1.
+      */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, CLKREQ_DEBUG_ENABLE, 1);
+
+     return 0;
+}
+
+static void enter_l23(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     int tries, l23;
+
+     /* assert request for L23 */
Quoted 9 lines

drivers/pci/host/pcie-brcmstb.c line 905

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+     WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 1);
+     /* poll L23 status */
+     for (tries = 0, l23 = 0; tries < 1000 && !l23; tries++)
+             l23 = RD_FLD(base, PCIE_MISC_PCIE_STATUS, PCIE_LINK_IN_L23);
+     if (!l23)
+             dev_err(pcie->dev, "failed to enter L23\n");

What does "L23" mean? Some power management thing?

Yes, it is a low power link state. I will add a comment.

Quoted 121 lines
Quoted 29 lines
drivers/pci/host/pcie-brcmstb.c new file +29 -0
+}
+
+static void turn_off(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+
+     if (brcm_pcie_link_up(pcie))
+             enter_l23(pcie);
+     /* Reset endpoint device */
+     brcm_pcie_perst_set(pcie, 1);
+     /* deassert request for L23 in case it was asserted */
+     WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 0);
+     /* SERDES_IDDQ = 1 */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 1);
+     /* Shutdown PCIe bridge */
+     brcm_pcie_bridge_sw_init_set(pcie, 1);
+}
+
+static int brcm_pcie_suspend(struct device *dev)
+{
+     struct brcm_pcie *pcie = dev_get_drvdata(dev);
+
+     turn_off(pcie);
+     clk_disable_unprepare(pcie->clk);
+     pcie->suspended = true;
+
+     return 0;
+}
+

drivers/pci/host/pcie-brcmstb.c line 944

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static int brcm_pcie_resume(struct device *dev)
+{
+     struct brcm_pcie *pcie = dev_get_drvdata(dev);
+     void __iomem *base;
+     int ret;
+
+     base = pcie->base;
+     clk_prepare_enable(pcie->clk);
+
+     /* Take bridge out of reset so we can access the SERDES reg */

Some comments above and below spell it "serdes"; here you spell it "SERDES".

Quoted 78 lines
drivers/pci/host/pcie-brcmstb.c new file +78 -0
+     brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+     /* SERDES_IDDQ = 0 */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+     /* wait for serdes to be stable */
+     usleep_range(100, 200);
+
+     ret = brcm_pcie_setup(pcie);
+     if (ret)
+             return ret;
+
+     pcie->suspended = false;
+
+     return 0;
+}
+
+static void _brcm_pcie_remove(struct brcm_pcie *pcie)
+{
+     turn_off(pcie);
+     clk_disable_unprepare(pcie->clk);
+     clk_put(pcie->clk);
+     brcm_pcie_remove_controller(pcie);
+}
+
+static int brcm_pcie_remove(struct platform_device *pdev)
+{
+     struct brcm_pcie *pcie = platform_get_drvdata(pdev);
+
+     pci_stop_root_bus(pcie->root_bus);
+     pci_remove_root_bus(pcie->root_bus);
+     _brcm_pcie_remove(pcie);
+
+     return 0;
+}
+
+static const struct of_device_id brcm_pcie_match[] = {
+     { .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
+     { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
+     { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
+     { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
+     {},
+};
+MODULE_DEVICE_TABLE(of, brcm_pcie_match);
+
+static int brcm_pcie_probe(struct platform_device *pdev)
+{
+     struct device_node *dn = pdev->dev.of_node;
+     const struct of_device_id *of_id;
+     const struct pcie_cfg_data *data;
+     int ret;
+     struct brcm_pcie *pcie;
+     struct resource *res;
+     void __iomem *base;
+     u32 tmp;
+     struct pci_host_bridge *bridge;
+     struct pci_bus *child;
+
+     bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));
+     if (!bridge)
+             return -ENOMEM;
+
+     pcie = pci_host_bridge_priv(bridge);
+     INIT_LIST_HEAD(&pcie->resources);
+
+     of_id = of_match_node(brcm_pcie_match, dn);
+     if (!of_id) {
+             dev_err(&pdev->dev, "failed to look up compatible string\n");
+             return -EINVAL;
+     }
+
+     if (of_property_read_u32(dn, "dma-ranges", &tmp) == 0) {
+             dev_err(&pdev->dev, "cannot yet handle dma-ranges\n");
+             return -EINVAL;
+     }
+
+     data = of_id->data;
+     pcie->reg_offsets = data->offsets;
+     pcie->reg_field_info = data->reg_field_info;
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 1027

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+     pcie->type = data->type;
+     pcie->dn = dn;
+     pcie->dev = &pdev->dev;
+
+     pcie->id = of_get_pci_domain_nr(dn);

Why do you call of_get_pci_domain_nr() directly? No other driver does.

We use the domain as the controller number (id). We use the id to identify and fix a HW bug that only affects the 2nd controller; see the clause
" } else if (of_machine_is_compatible("brcm,bcm7278a0")) {".

Quoted 114 lines
Quoted 73 lines
drivers/pci/host/pcie-brcmstb.c new file +72 -0
+     if (pcie->id < 0)
+             return pcie->id;
+
+     res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     if (!res)
+             return -EINVAL;
+
+     base = devm_ioremap_resource(&pdev->dev, res);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     pcie->clk = of_clk_get_by_name(dn, "sw_pcie");
+     if (IS_ERR(pcie->clk)) {
+             dev_err(&pdev->dev, "could not get clock\n");
+             pcie->clk = NULL;
+     }
+     pcie->base = base;
+
+     ret = of_pci_get_max_link_speed(dn);
+     pcie->gen = (ret < 0) ? 0 : ret;
+
+     pcie->ssc = of_property_read_bool(dn, "brcm,enable-ssc");
+
+     ret = irq_of_parse_and_map(pdev->dev.of_node, 0);
+     if (ret == 0)
+             /* keep going, as we don't use this intr yet */
+             dev_warn(pcie->dev, "cannot get pcie interrupt\n");
+     else
+             pcie->irq = ret;
+
+     ret = brcm_pcie_parse_request_of_pci_ranges(pcie);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(pcie->clk);
+     if (ret) {
+             dev_err(&pdev->dev, "could not enable clock\n");
+             return ret;
+     }
+
+     ret = brcm_pcie_add_controller(pcie);
+     if (ret)
+             return ret;
+
+     ret = brcm_pcie_setup(pcie);
+     if (ret)
+             goto fail;
+
+     list_splice_init(&pcie->resources, &bridge->windows);
+     bridge->dev.parent = &pdev->dev;
+     bridge->busnr = 0;
+     bridge->ops = &brcm_pcie_ops;
+     bridge->sysdata = pcie;
+     bridge->map_irq = of_irq_parse_and_map_pci;
+     bridge->swizzle_irq = pci_common_swizzle;
+
+     ret = pci_scan_root_bus_bridge(bridge);
+     if (ret < 0) {
+             dev_err(pcie->dev, "Scanning root bridge failed");
+             goto fail;
+     }
+
+     pci_assign_unassigned_bus_resources(bridge->bus);
+     list_for_each_entry(child, &bridge->bus->children, node)
+             pcie_bus_configure_settings(child);
+     pci_bus_add_devices(bridge->bus);
+     platform_set_drvdata(pdev, pcie);
+     pcie->root_bus = bridge->bus;
+
+     return 0;
+
+fail:

drivers/pci/host/pcie-brcmstb.c line 1109

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     _brcm_pcie_remove(pcie);
+     return ret;
+}
+
+static const struct dev_pm_ops brcm_pcie_pm_ops = {
+     .suspend_noirq = brcm_pcie_suspend,
+     .resume_noirq = brcm_pcie_resume,
+};
+
+static struct platform_driver __refdata brcm_pcie_driver = {

Why do you need __refdata? There's only only other occurrence in drivers/pci, and I'm dubious about that one as well.

drivers/pci/host/pcie-brcmstb.c line 1122

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+     .probe = brcm_pcie_probe,
+     .remove = brcm_pcie_remove,
+     .driver = {
+             .name = "brcm-pcie",
+             .owner = THIS_MODULE,
+             .of_match_table = brcm_pcie_match,
+             .pm = &brcm_pcie_pm_ops,
+     },
+};
+
+module_platform_driver(brcm_pcie_driver);
+
+MODULE_LICENSE("GPL");

Copyright notice above says "GPL v2", which is not the same as the "GPL" here.

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -1
+MODULE_DESCRIPTION("Broadcom STB PCIE RC driver");
+MODULE_AUTHOR("Broadcom");
--

1.9.0.138.g2de3478

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#13 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

Quoted 29 lines · Jim Quinlan
Quoted 11 lines · Bjorn Helgaas
Quoted 10 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

...

Quoted 6 lines
Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct pci_bus *bus,
+                                int dev)
+{
+     if (pci_is_root_bus(bus)) {
+             if (dev > 0)
+                     return false;
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+     } else {
+             /* If there is no link, then there is no device */
+             if (!brcm_pcie_link_up(pcie))
+                     return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

Quoted 3 lines

Yes, that can happen but there is really nothing that can be done if the link goes down in that vulnerability window. What do you suggest doing?

Most hardware drops writes and returns ~0 on reads if the link is down. I assume your hardware does something similar, and that should be enough. You shouldn't have to check whether the link is up.

The hardware might report errors, e.g., via AER, if the link is down. And we might not not handle those nicely. If we have issues there, we should find out and fix them.

I see that dwc, altera, rockchip, and xilinx all do check for link up there, too. I can't remember if they had a legitimate reason, or if I just missed it.

Quoted 19 lines
Quoted 11 lines
Quoted 11 lines
drivers/pci/host/pcie-brcmstb.c new file +11 -0
+static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
+{
+     struct list_head *pos, *q;
+     struct brcm_pcie *tmp;
+
+     mutex_lock(&brcm_pcie_lock);
+     list_for_each_safe(pos, q, &brcm_pcie) {
+             tmp = list_entry(pos, struct brcm_pcie, list);
+             if (tmp == pcie) {
+                     list_del(pos);
+                     if (list_empty(&brcm_pcie))
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 667

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+                             num_memc = 0;
+                     break;
+             }
+     }
+     mutex_unlock(&brcm_pcie_lock);

I'm missing something. I don't see that num_memc is ever set to anything *other* than zero.

Quoted 2 lines

The num_memc is set and used in the dma commit. I will remove its declaration from this commit.

Thanks, that will make the patches much easier to read.

Quoted 9 lines
Quoted 4 lines
Quoted 1 line

+ pcie->id = of_get_pci_domain_nr(dn);

Why do you call of_get_pci_domain_nr() directly? No other driver does.

We use the domain as the controller number (id). We use the id to identify and fix a HW bug that only affects the 2nd controller; see the clause
" } else if (of_machine_is_compatible("brcm,bcm7278a0")) {".

pci_register_host_bridge() already sets bus->domain_nr for every host
bridge. That path calls of_get_pci_domain_nr() eventually. But I
guess that's too late for your use case, because you have this:

  brcm_pcie_probe
    brcm_pcie_setup
      brcm_pcie_bridge_sw_init_set
        if (of_machine_is_compatible("brcm,bcm7278a0")) {
          offset = pcie->id ? ...                    <--- use
    pci_scan_root_bus_bridge
      pci_register_host_bridge
        bus->domain_nr = pci_bus_find_domain_nr      <--- available

I guess you haven't added a binding for brcm,bcm7278a0 yet?

I'm not really sure that using the linux,pci-domain DT property is the best way to distinguish the two controllers. Maybe Rob has an opinion?

Quoted 2 lines
Quoted 2 lines

drivers/pci/host/pcie-brcmstb.c line 1029

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+     if (pcie->id < 0)
+             return pcie->id;

Bjorn

#14 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

Quoted 30 lines · Bjorn Helgaas
Quoted 29 lines · Jim Quinlan
Quoted 11 lines · Bjorn Helgaas
Quoted 10 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

...

Quoted 14 lines

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct pci_bus *bus,
+                                int dev)
+{
+     if (pci_is_root_bus(bus)) {
+             if (dev > 0)
+                     return false;
+     } else {
+             /* If there is no link, then there is no device */
+             if (!brcm_pcie_link_up(pcie))
+                     return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

Quoted 7 lines
Quoted 3 lines

Yes, that can happen but there is really nothing that can be done if the link goes down in that vulnerability window. What do you suggest doing?

Most hardware drops writes and returns ~0 on reads if the link is down. I assume your hardware does something similar, and that should be enough. You shouldn't have to check whether the link is up.

Unfortunately our HW is quite unforgiving and effects a synchronous or asynchronous abort when doing a config access when the link or power has gone down on the EP. I will open a discussion with the PCIe HW folks regarding why our controller does not behave like "most hardware". Thanks, Jim

Quoted 66 lines

The hardware might report errors, e.g., via AER, if the link is down. And we might not not handle those nicely. If we have issues there, we should find out and fix them.

I see that dwc, altera, rockchip, and xilinx all do check for link up there, too. I can't remember if they had a legitimate reason, or if I just missed it.

Quoted 19 lines
Quoted 11 lines
Quoted 11 lines
drivers/pci/host/pcie-brcmstb.c new file +11 -0
+static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
+{
+     struct list_head *pos, *q;
+     struct brcm_pcie *tmp;
+
+     mutex_lock(&brcm_pcie_lock);
+     list_for_each_safe(pos, q, &brcm_pcie) {
+             tmp = list_entry(pos, struct brcm_pcie, list);
+             if (tmp == pcie) {
+                     list_del(pos);
+                     if (list_empty(&brcm_pcie))
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 667

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+                             num_memc = 0;
+                     break;
+             }
+     }
+     mutex_unlock(&brcm_pcie_lock);

I'm missing something. I don't see that num_memc is ever set to anything *other* than zero.

Quoted 2 lines

The num_memc is set and used in the dma commit. I will remove its declaration from this commit.

Thanks, that will make the patches much easier to read.

Quoted 9 lines
Quoted 4 lines
Quoted 1 line

+ pcie->id = of_get_pci_domain_nr(dn);

Why do you call of_get_pci_domain_nr() directly? No other driver does.

We use the domain as the controller number (id). We use the id to identify and fix a HW bug that only affects the 2nd controller; see the clause
" } else if (of_machine_is_compatible("brcm,bcm7278a0")) {".

pci_register_host_bridge() already sets bus->domain_nr for every host
bridge. That path calls of_get_pci_domain_nr() eventually. But I
guess that's too late for your use case, because you have this:

  brcm_pcie_probe
    brcm_pcie_setup
      brcm_pcie_bridge_sw_init_set
        if (of_machine_is_compatible("brcm,bcm7278a0")) {
          offset = pcie->id ? ...                    <--- use
    pci_scan_root_bus_bridge
      pci_register_host_bridge
        bus->domain_nr = pci_bus_find_domain_nr      <--- available

I guess you haven't added a binding for brcm,bcm7278a0 yet?

I'm not really sure that using the linux,pci-domain DT property is the best way to distinguish the two controllers. Maybe Rob has an opinion?

Quoted 2 lines
Quoted 2 lines

drivers/pci/host/pcie-brcmstb.c line 1029

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+     if (pcie->id < 0)
+             return pcie->id;

Bjorn

#15 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

Quoted 35 lines · Jim Quinlan
Quoted 34 lines · Bjorn Helgaas
Quoted 32 lines · Jim Quinlan
Quoted 11 lines · Bjorn Helgaas
Quoted 10 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

...

Quoted 6 lines
Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct pci_bus *bus,
+                                int dev)
+{
+     if (pci_is_root_bus(bus)) {
+             if (dev > 0)
+                     return false;
Quoted 8 lines

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+     } else {
+             /* If there is no link, then there is no device */
+             if (!brcm_pcie_link_up(pcie))
+                     return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

Yes, that can happen but there is really nothing that can be done if the link goes down in that vulnerability window. What do you suggest doing?

Quoted 8 lines
Quoted 3 lines

Most hardware drops writes and returns ~0 on reads if the link is down. I assume your hardware does something similar, and that should be enough. You shouldn't have to check whether the link is up.

Unfortunately our HW is quite unforgiving and effects a synchronous or asynchronous abort when doing a config access when the link or power has gone down on the EP. I will open a discussion with the PCIe HW folks regarding why our controller does not behave like "most hardware". Thanks, Jim

I mentioned in the other thread [1] that I think the best way to handle this is to figure out how to deal with the abort cleanly. Using a test like *_pcie_link_up() to try to avoid it is a 99% solution that means we'll see rare failures that are very difficult to reproduce and debug.

Quoted 3 lines
Quoted 3 lines

The hardware might report errors, e.g., via AER, if the link is down. And we might not not handle those nicely. If we have issues there, we should find out and fix them.

[1] https://lkml.kernel.org/r/20171214225821.GN30595 at bhelgaas-glaptop.roam.corp.google.com

#16 lore raw

Re: [PATCH v3 3/8] PCI: brcmstb: Add Broadcom STB PCIe host controller driver

In reply to Bjorn Helgaas
Quoted 716 lines · Bjorn Helgaas
Quoted 11 lines · Jim Quinlan

This commit adds the basic Broadcom STB PCIe controller. Missing is the ability to process MSI and also handle dma-ranges for inbound memory accesses. These two functionalities are added in subsequent commits.

The PCIe block contains an MDIO interface. This is a local interface only accessible by the PCIe controller. It cannot be used or shared by any other HW. As such, the small amount of code for this controller is included in this driver as there is little upside to put it elsewhere.

Quoted 5 lines
---
 drivers/pci/host/Kconfig        |    9 +
 drivers/pci/host/Makefile       |    1 +
 drivers/pci/host/pcie-brcmstb.c | 1124 ++++++++++++++++++++++++++++++

+++++++++

drivers/pci/host/pcie-

Quoted 34 lines
 3 files changed, 1134 insertions(+)
 create mode 100644 drivers/pci/host/pcie-brcmstb.c
drivers/pci/host/Kconfig +9 -0
index b868803..751463e 100644
@@ -220,4 +220,13 @@ config VMD
        To compile this driver as a module, choose M here: the
        module will be called vmd.
 
+config PCIE_BRCMSTB
+     tristate "Broadcom Brcmstb PCIe platform host driver"
+     depends on ARCH_BRCMSTB || BMIPS_GENERIC
+     depends on OF
+     depends on SOC_BRCMSTB
+     default ARCH_BRCMSTB || BMIPS_GENERIC
+     help
+       Adds support for Broadcom Settop Box PCIe host controller.
+
 endmenu
drivers/pci/host/Makefile +1 -0
index 1238278..a8b9923 100644
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
+obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie- renamed from drivers/pci/host/pcie-brcmstb.c +0 -0

brcmstb.c

Quoted 34 lines

new file mode 100644
index 0000000..d8a8f7a

drivers/pci/host/pcie-brcmstb.c new file +29 -0
@@ -0,0 +1,1124 @@
+/*
+ * Copyright (C) 2009 - 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/clk.h>
+#include <linux/compiler.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irqdomain.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/of_pci.h>

drivers/pci/host/pcie-brcmstb.c line 39

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#include <linux/of_platform.h>
+#include <linux/pci.h>
+#include <linux/printk.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+#include <soc/brcmstb/memory_api.h>
+#include <linux/string.h>
+#include <linux/types.h>
+
+/* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs

*/

drivers/pci/host/pcie-brcmstb.c line 40

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define BRCM_PCIE_CAP_REGS                           0x00ac

Add a blank line before multi-line comments.

drivers/pci/host/pcie-brcmstb.c line 44

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+/*
+ * Broadcom Settop Box PCIE Register Offsets. The names are from
+ * the chip's RDB and we use them here so that a script can correlate
+ * this code and the RDB to prevent discrepancies.

Use "PCIe" capitalization in English text and messages.

Quoted 18 lines
drivers/pci/host/pcie-brcmstb.c new file +18 -0
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1              0x0188
+#define PCIE_RC_CFG_PRIV1_ID_VAL3                    0x043c
+#define PCIE_RC_DL_MDIO_ADDR                         0x1100
+#define PCIE_RC_DL_MDIO_WR_DATA                              0x1104
+#define PCIE_RC_DL_MDIO_RD_DATA                              0x1108
+#define PCIE_MISC_MISC_CTRL                          0x4008
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO             0x400c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI             0x4010
+#define PCIE_MISC_RC_BAR1_CONFIG_LO                  0x402c
+#define PCIE_MISC_RC_BAR2_CONFIG_LO                  0x4034
+#define PCIE_MISC_RC_BAR2_CONFIG_HI                  0x4038
+#define PCIE_MISC_RC_BAR3_CONFIG_LO                  0x403c
+#define PCIE_MISC_PCIE_CTRL                          0x4064
+#define PCIE_MISC_PCIE_STATUS                                0x4068
+#define PCIE_MISC_REVISION                           0x406c
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT     0x4070
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI                0x4080

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI               0x4084
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG                       0x4204
+#define PCIE_INTR2_CPU_BASE                          0x4300
+
+/*
+ * Broadcom Settop Box PCIE Register Field shift and mask info. The
+ * names are from the chip's RDB and we use them here so that a script
+ * can correlate this code and the RDB to prevent discrepancies.
+ */
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK
      0xc

drivers/pci/host/pcie-brcmstb.c line 73

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_SHIFT
     0x2

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK            0xffffff
+#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_SHIFT           0x0
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK

0x1000

drivers/pci/host/pcie-brcmstb.c line 77

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_SHIFT

0xc

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK            0x2000
+#define PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_SHIFT           0xd
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK

0x300000

drivers/pci/host/pcie-brcmstb.c

Quoted 8 lines
drivers/pci/host/pcie-brcmstb.c new file +8 -0
+#define PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_SHIFT             0x14
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK                   0xf8000000
+#define PCIE_MISC_MISC_CTRL_SCB0_SIZE_SHIFT                  0x1b
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_MASK                   0x7c00000
+#define PCIE_MISC_MISC_CTRL_SCB1_SIZE_SHIFT                  0x16
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_MASK                   0x1f
+#define PCIE_MISC_MISC_CTRL_SCB2_SIZE_SHIFT                  0x0
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK

0x1f

drivers/pci/host/pcie-brcmstb.c line 89

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_SHIFT

0x0

drivers/pci/host/pcie-brcmstb.c line 90

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_MASK

0x1f

drivers/pci/host/pcie-brcmstb.c line 91

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_SHIFT

0x0

drivers/pci/host/pcie-brcmstb.c line 92

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK

0x1f

drivers/pci/host/pcie-brcmstb.c line 93

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_SHIFT

0x0

drivers/pci/host/pcie-brcmstb.c line 95

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK                 0x4
+#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_SHIFT

0x2

drivers/pci/host/pcie-brcmstb.c

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK            0x1
+#define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_SHIFT           0x0
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK                 0x80
+#define PCIE_MISC_PCIE_STATUS_PCIE_PORT_SHIFT

0x7

drivers/pci/host/pcie-brcmstb.c

Quoted 7 lines
drivers/pci/host/pcie-brcmstb.c new file +7 -0
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_MASK            0x20
+#define PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_SHIFT           0x5
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_MASK            0x10
+#define PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_SHIFT           0x4
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_MASK          0x40
+#define PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_SHIFT         0x6
+#define PCIE_MISC_REVISION_MAJMIN_MASK

0xffff

drivers/pci/host/pcie-brcmstb.c

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+#define PCIE_MISC_REVISION_MAJMIN_SHIFT                              0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_MASK  0xfff00000
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_LIMIT_SHIFT 0x14
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_MASK   0xfff0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_BASE_SHIFT  0x4
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT_NUM_MASK_BITS

0xc

drivers/pci/host/pcie-brcmstb.c line 113

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_MASK

0xff

drivers/pci/host/pcie-brcmstb.c

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI_BASE_SHIFT     0x0
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_MASK    0xff
+#define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI_LIMIT_SHIFT   0x0
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK

0x2

drivers/pci/host/pcie-brcmstb.c line 119

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_SHIFT 0x1
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK

0x08000000

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_SHIFT     0x1b
+#define PCIE_RGR1_SW_INIT_1_PERST_MASK                               0x1
+#define PCIE_RGR1_SW_INIT_1_PERST_SHIFT

0x0

Quoted 15 lines
drivers/pci/host/pcie-brcmstb.c new file +15 -0
+
+#define BRCM_NUM_PCIE_OUT_WINS               0x4
+#define BRCM_MAX_SCB                 0x4
+
+#define BRCM_MSI_TARGET_ADDR_LT_4GB  0x0fffffffcULL
+#define BRCM_MSI_TARGET_ADDR_GT_4GB  0xffffffffcULL
+
+#define BURST_SIZE_128                       0
+#define BURST_SIZE_256                       1
+#define BURST_SIZE_512                       2
+
+/* Offsets from PCIE_INTR2_CPU_BASE */
+#define STATUS                               0x0
+#define SET                          0x4
+#define CLR                          0x8

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#define MASK_STATUS                  0xc
+#define MASK_SET                     0x10
+#define MASK_CLR                     0x14
+
+#define PCIE_BUSNUM_SHIFT            20
+#define PCIE_SLOT_SHIFT                      15
+#define PCIE_FUNC_SHIFT                      12
+
+#if defined(__BIG_ENDIAN)
+#define      DATA_ENDIAN             2       /* PCIe->DDR inbound

accesses */

Quoted 9 lines
drivers/pci/host/pcie-brcmstb.c new file +9 -0
+#define MMIO_ENDIAN          2       /* CPU->PCIe outbound accesses */
+#else
+#define      DATA_ENDIAN             0
+#define MMIO_ENDIAN          0
+#endif
+
+#define MDIO_PORT0           0x0
+#define MDIO_DATA_MASK               0x7fffffff
+#define MDIO_DATA_SHIFT              0x0

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#define MDIO_PORT_MASK               0xf0000
+#define MDIO_PORT_SHIFT              0x16
+#define MDIO_REGAD_MASK              0xffff
+#define MDIO_REGAD_SHIFT     0x0
+#define MDIO_CMD_MASK                0xfff00000
+#define MDIO_CMD_SHIFT               0x14
+#define MDIO_CMD_READ                0x1
+#define MDIO_CMD_WRITE               0x0
+#define MDIO_DATA_DONE_MASK  0x80000000
+#define MDIO_RD_DONE(x)              (((x) & MDIO_DATA_DONE_MASK) ? 1 :

0)

drivers/pci/host/pcie-brcmstb.c line 167

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+#define MDIO_WT_DONE(x)              (((x) & MDIO_DATA_DONE_MASK) ? 0 :

1)

Quoted 117 lines
drivers/pci/host/pcie-brcmstb.c new file +117 -0
+#define SSC_REGS_ADDR                0x1100
+#define SET_ADDR_OFFSET              0x1f
+#define SSC_CNTL_OFFSET              0x2
+#define SSC_CNTL_OVRD_EN_MASK        0x8000
+#define SSC_CNTL_OVRD_EN_SHIFT       0xf
+#define SSC_CNTL_OVRD_VAL_MASK       0x4000
+#define SSC_CNTL_OVRD_VAL_SHIFT      0xe
+#define SSC_STATUS_OFFSET    0x1
+#define SSC_STATUS_SSC_MASK  0x400
+#define SSC_STATUS_SSC_SHIFT 0xa
+#define SSC_STATUS_PLL_LOCK_MASK     0x800
+#define SSC_STATUS_PLL_LOCK_SHIFT    0xb
+
+#define IDX_ADDR(pcie)       \
+     ((pcie)->reg_offsets[EXT_CFG_INDEX])
+#define DATA_ADDR(pcie)      \
+     ((pcie)->reg_offsets[EXT_CFG_DATA])
+#define PCIE_RGR1_SW_INIT_1(pcie) \
+     ((pcie)->reg_offsets[RGR1_SW_INIT_1])
+
+enum {
+     RGR1_SW_INIT_1,
+     EXT_CFG_INDEX,
+     EXT_CFG_DATA,
+};
+
+enum {
+     RGR1_SW_INIT_1_INIT_MASK,
+     RGR1_SW_INIT_1_INIT_SHIFT,
+     RGR1_SW_INIT_1_PERST_MASK,
+     RGR1_SW_INIT_1_PERST_SHIFT,
+};
+
+enum pcie_type {
+     BCM7425,
+     BCM7435,
+     GENERIC,
+     BCM7278,
+};
+
+struct brcm_window {
+     dma_addr_t pcie_addr;
+     phys_addr_t cpu_addr;
+     dma_addr_t size;
+};
+
+/* Internal PCIe Host Controller Information.*/
+struct brcm_pcie {
+     struct list_head        list;
+     struct device           *dev;
+     void __iomem            *base;
+     struct list_head        resources;
+     int                     irq;
+     struct clk              *clk;
+     struct pci_bus          *root_bus;
+     struct device_node      *dn;
+     int                     id;
+     bool                    suspended;
+     int                     num_out_wins;
+     bool                    ssc;
+     int                     gen;
+     struct brcm_window      out_wins[BRCM_NUM_PCIE_OUT_WINS];
+     unsigned int            rev;
+     const int               *reg_offsets;
+     const int               *reg_field_info;
+     enum pcie_type          type;
+};
+
+struct pcie_cfg_data {
+     const int *reg_field_info;
+     const int *offsets;
+     const enum pcie_type type;
+};
+
+static const int pcie_reg_field_info[] = {
+     [RGR1_SW_INIT_1_INIT_MASK] = 0x2,
+     [RGR1_SW_INIT_1_INIT_SHIFT] = 0x1,
+};
+
+static const int pcie_reg_field_info_bcm7278[] = {
+     [RGR1_SW_INIT_1_INIT_MASK] = 0x1,
+     [RGR1_SW_INIT_1_INIT_SHIFT] = 0x0,
+};
+
+static const int pcie_offset_bcm7425[] = {
+     [RGR1_SW_INIT_1] = 0x8010,
+     [EXT_CFG_INDEX]  = 0x8300,
+     [EXT_CFG_DATA]   = 0x8304,
+};
+
+static const struct pcie_cfg_data bcm7425_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offset_bcm7425,
+     .type           = BCM7425,
+};
+
+static const int pcie_offsets[] = {
+     [RGR1_SW_INIT_1] = 0x9210,
+     [EXT_CFG_INDEX]  = 0x9000,
+     [EXT_CFG_DATA]   = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7435_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offsets,
+     .type           = BCM7435,
+};
+
+static const struct pcie_cfg_data generic_cfg = {
+     .reg_field_info = pcie_reg_field_info,
+     .offsets        = pcie_offsets,
+     .type           = GENERIC,
+};
+
+static const int pcie_offset_bcm7278[] = {
+     [RGR1_SW_INIT_1] = 0xc010,
+     [EXT_CFG_INDEX] = 0x9000,

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     [EXT_CFG_DATA] = 0x9004,
+};
+
+static const struct pcie_cfg_data bcm7278_cfg = {
+     .reg_field_info = pcie_reg_field_info_bcm7278,
+     .offsets        = pcie_offset_bcm7278,
+     .type           = BCM7278,
+};
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned

int devfn,

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+                                     int where);
+
+static struct pci_ops brcm_pcie_ops = {
+     .map_bus = brcm_pcie_map_conf,
+     .read = pci_generic_config_read,
+     .write = pci_generic_config_write,
+};
+
+#if defined(CONFIG_MIPS)
+/* Broadcom MIPs HW implicitly does the swapping if necessary */
+#define bcm_readl(a)         __raw_readl(a)
+#define bcm_writel(d, a)     __raw_writel(d, a)
+#define bcm_readw(a)         __raw_readw(a)

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+#define bcm_writew(d, a)     __raw_writew(d, a)
+#else
+#define bcm_readl(a)         readl(a)
+#define bcm_writel(d, a)     writel(d, a)
+#define bcm_readw(a)         readw(a)
+#define bcm_writew(d, a)     writew(d, a)
+#endif
+
+/*
+ * These macros are designed to sxtract/insert fields to host

controller's

drivers/pci/host/pcie-brcmstb.c line 318

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+ * register set.

s/are designed to s/ e/ (I assume they actually *do* extract/insert)

drivers/pci/host/pcie-brcmstb.c

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+ */
+#define RD_FLD(base, reg, field) \
+     rd_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT)
+#define WR_FLD(base, reg, field, val) \
+     wr_fld(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT,

val)

drivers/pci/host/pcie-brcmstb.c line 325

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+#define WR_FLD_RB(base, reg, field, val) \
+     wr_fld_rb(base + reg, reg##_##field##_MASK, reg##_##field##_SHIFT,

val)

Quoted 53 lines
drivers/pci/host/pcie-brcmstb.c new file +53 -0
+#define WR_FLD_WITH_OFFSET(base, off, reg, field, val) \
+     wr_fld(base + reg + off, reg##_##field##_MASK, \
+            reg##_##field##_SHIFT, val)
+#define EXTRACT_FIELD(val, reg, field) \
+     ((val & reg##_##field##_MASK) >> reg##_##field##_SHIFT)
+#define INSERT_FIELD(val, reg, field, field_val) \
+     ((val & ~reg##_##field##_MASK) | \
+      (reg##_##field##_MASK & (field_val << reg##_##field##_SHIFT)))
+
+static struct list_head brcm_pcie = LIST_HEAD_INIT(brcm_pcie);
+static phys_addr_t scb_size[BRCM_MAX_SCB];
+static int num_memc;
+static DEFINE_MUTEX(brcm_pcie_lock);
+
+static u32 rd_fld(void __iomem *p, u32 mask, int shift)
+{
+     return (bcm_readl(p) & mask) >> shift;
+}
+
+static void wr_fld(void __iomem *p, u32 mask, int shift, u32 val)
+{
+     u32 reg = bcm_readl(p);
+
+     reg = (reg & ~mask) | ((val << shift) & mask);
+     bcm_writel(reg, p);
+}
+
+static void wr_fld_rb(void __iomem *p, u32 mask, int shift, u32 val)
+{
+     wr_fld(p, mask, shift, val);
+     (void)bcm_readl(p);
+}
+
+static const char *link_speed_to_str(int s)
+{
+     switch (s) {
+     case 1:
+             return "2.5";
+     case 2:
+             return "5.0";
+     case 3:
+             return "8.0";
+     default:
+             break;
+     }
+     return "???";
+}
+
+/*
+ * The roundup_pow_of_two() from log2.h invokes
+ * __roundup_pow_of_two(unsigned long), but we really need a
+ * such a function to take a native u64 since unsigned long
+ * is 32 bits on some configurations.  So we provide this helper

drivers/pci/host/pcie-brcmstb.c line 388

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+ * function below.
+ */
+static u64 roundup_pow_of_two_64(u64 n)
+{
+     return 1ULL << fls64(n - 1);
+}
+
+/*
+ * This is to convert the size of the inbound bar region to the
+ * non-liniear values of PCIE_X_MISC_RC_BAR[123]_CONFIG_LO.SIZE

s/bar/BAR/ (This doesn't sound like a BAR in the PCI spec sense, but if that's what you call it, might as well spell it as the acronym)

s/non-liniear/non-linear/

Quoted 59 lines
drivers/pci/host/pcie-brcmstb.c new file +59 -0
+ */
+int encode_ibar_size(u64 size)
+{
+     int log2_in = ilog2(size);
+
+     if (log2_in >= 12 && log2_in <= 15)
+             /* Covers 4KB to 32KB (inclusive) */
+             return (log2_in - 12) + 0x1c;
+     else if (log2_in >= 16 && log2_in <= 37)
+             /* Covers 64KB to 32GB, (inclusive) */
+             return log2_in - 15;
+     /* Something is awry so disable */
+     return 0;
+}
+
+static u32 mdio_form_pkt(int port, int regad, int cmd)
+{
+     u32 pkt = 0;
+
+     pkt |= (port << MDIO_PORT_SHIFT) & MDIO_PORT_MASK;
+     pkt |= (regad << MDIO_REGAD_SHIFT) & MDIO_REGAD_MASK;
+     pkt |= (cmd << MDIO_CMD_SHIFT) & MDIO_CMD_MASK;
+
+     return pkt;
+}
+
+/* negative return value indicates error */
+static int mdio_read(void __iomem *base, u8 port, u8 regad)
+{
+     int tries;
+     u32 data;
+
+     bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_READ),
+                base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+
+     data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+     for (tries = 0; !MDIO_RD_DONE(data) && tries < 10; tries++) {
+             udelay(10);
+             data = bcm_readl(base + PCIE_RC_DL_MDIO_RD_DATA);
+     }
+
+     return MDIO_RD_DONE(data)
+             ? (data & MDIO_DATA_MASK) >> MDIO_DATA_SHIFT
+             : -EIO;
+}
+
+/* negative return value indicates error */
+static int mdio_write(void __iomem *base, u8 port, u8 regad, u16 wrdata)
+{
+     int tries;
+     u32 data;
+
+     bcm_writel(mdio_form_pkt(port, regad, MDIO_CMD_WRITE),
+                base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_readl(base + PCIE_RC_DL_MDIO_ADDR);
+     bcm_writel(MDIO_DATA_DONE_MASK | wrdata,
+                base + PCIE_RC_DL_MDIO_WR_DATA);
+

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+     for (tries = 0; !MDIO_WT_DONE(data) && tries < 10; tries++) {
+             udelay(10);
+             data = bcm_readl(base + PCIE_RC_DL_MDIO_WR_DATA);
+     }
+
+     return MDIO_WT_DONE(data) ? 0 : -EIO;
+}
+
+/* configures device for ssc mode; negative return value indicates

error */

I guess "ssc" means Spread Spectrum Clocking? Maybe spell out the first occurrence and spell as acronym in English text?

Quoted 26 lines
drivers/pci/host/pcie-brcmstb.c new file +26 -0
+static int set_ssc(void __iomem *base)
+{
+     int tmp;
+     u16 wrdata;
+     int pll, ssc;
+
+     tmp = mdio_write(base, MDIO_PORT0, SET_ADDR_OFFSET, SSC_REGS_ADDR);
+     if (tmp < 0)
+             return tmp;
+
+     tmp = mdio_read(base, MDIO_PORT0, SSC_CNTL_OFFSET);
+     if (tmp < 0)
+             return tmp;
+
+     wrdata = INSERT_FIELD(tmp, SSC_CNTL_OVRD, EN, 1);
+     wrdata = INSERT_FIELD(wrdata, SSC_CNTL_OVRD, VAL, 1);
+     tmp = mdio_write(base, MDIO_PORT0, SSC_CNTL_OFFSET, wrdata);
+     if (tmp < 0)
+             return tmp;
+
+     usleep_range(1000, 2000);
+     tmp = mdio_read(base, MDIO_PORT0, SSC_STATUS_OFFSET);
+     if (tmp < 0)
+             return tmp;
+
+     ssc = EXTRACT_FIELD(tmp, SSC_STATUS, SSC);

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     pll = EXTRACT_FIELD(tmp, SSC_STATUS, PLL_LOCK);
+
+     return (ssc && pll) ? 0 : -EIO;
+}
+
+/* limits operation to a specific generation (1, 2, or 3) */
+static void set_gen(void __iomem *base, int gen)
+{
+     u32 lnkcap = bcm_readl(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+     u16 lnkctl2 = bcm_readw(base + BRCM_PCIE_CAP_REGS +

PCI_EXP_LNKCTL2);

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+
+     lnkcap = (lnkcap & ~PCI_EXP_LNKCAP_SLS) | gen;
+     bcm_writel(lnkcap, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP);
+
+     lnkctl2 = (lnkctl2 & ~0xf) | gen;
+     bcm_writew(lnkctl2, base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2);
+}
+
+static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie,
+                                    unsigned int win, phys_addr_t

cpu_addr,

drivers/pci/host/pcie-brcmstb.c line 504

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+                                    dma_addr_t  pcie_addr, dma_addr_t

size)

Quoted 17 lines
drivers/pci/host/pcie-brcmstb.c new file +17 -0
+{
+     void __iomem *base = pcie->base;
+     phys_addr_t cpu_addr_mb, limit_addr_mb;
+     u32 tmp;
+
+     /* Set the base of the pcie_addr window */
+     bcm_writel(lower_32_bits(pcie_addr) + MMIO_ENDIAN,
+                base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LO + (win * 8));
+     bcm_writel(upper_32_bits(pcie_addr),
+                base + PCIE_MISC_CPU_2_PCIE_MEM_WIN0_HI + (win * 8));
+
+     cpu_addr_mb = cpu_addr >> 20;
+     limit_addr_mb = (cpu_addr + size - 1) >> 20;
+
+     /* Write the addr base low register */
+     WR_FLD_WITH_OFFSET(base, (win * 4),
+                        PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+                        BASE, cpu_addr_mb);
+     /* Write the addr limit low register */
+     WR_FLD_WITH_OFFSET(base, (win * 4),
+                        PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_LIMIT,
+                        LIMIT, limit_addr_mb);
+
+     if (pcie->type != BCM7435 && pcie->type != BCM7425) {
+             /* Write the cpu addr high register */
+             tmp = (u32)(cpu_addr_mb >>
+                     PCIE_MISC_CPU_2_PCIE_MEM_WIN0_

BASE_LIMIT_NUM_MASK_BITS);

drivers/pci/host/pcie-brcmstb.c

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+             WR_FLD_WITH_OFFSET(base, (win * 8),
+                                PCIE_MISC_CPU_2_PCIE_MEM_WIN0_BASE_HI,
+                                BASE, tmp);
+             /* Write the cpu limit high register */
+             tmp = (u32)(limit_addr_mb >>
+                     PCIE_MISC_CPU_2_PCIE_MEM_WIN0_

BASE_LIMIT_NUM_MASK_BITS);

Quoted 18 lines
drivers/pci/host/pcie-brcmstb.c new file +18 -0
+             WR_FLD_WITH_OFFSET(base, (win * 8),
+                                PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI,
+                                LIMIT, tmp);
+     }
+}
+
+/* Configuration space read/write support */
+static int cfg_index(int busnr, int devfn, int reg)
+{
+     return ((PCI_SLOT(devfn) & 0x1f) << PCIE_SLOT_SHIFT)
+             | ((PCI_FUNC(devfn) & 0x07) << PCIE_FUNC_SHIFT)
+             | (busnr << PCIE_BUSNUM_SHIFT)
+             | (reg & ~3);
+}
+
+static bool brcm_pcie_rc_mode(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+
+     return !!EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS, PCIE_PORT);
+}
+
+static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     u32 val = bcm_readl(base + PCIE_MISC_PCIE_STATUS);
+     u32 dla = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS,

PCIE_DL_ACTIVE);

drivers/pci/host/pcie-brcmstb.c line 566

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+     u32 plu = EXTRACT_FIELD(val, PCIE_MISC_PCIE_STATUS,

PCIE_PHYLINKUP);

drivers/pci/host/pcie-brcmstb.c

Quoted 5 lines
drivers/pci/host/pcie-brcmstb.c new file +5 -0
+
+     return  (dla && plu) ? true : false;
+}
+
+static bool brcm_pcie_valid_device(struct brcm_pcie *pcie, struct

pci_bus *bus,

drivers/pci/host/pcie-brcmstb.c line 580

Quoted 9 lines
drivers/pci/host/pcie-brcmstb.c new file +9 -0
+                                int dev)
+{
+     if (pci_is_root_bus(bus)) {
+             if (dev > 0)
+                     return false;
+     } else {
+             /* If there is no link, then there is no device */
+             if (!brcm_pcie_link_up(pcie))
+                     return false;

This is racy, since the link can go down after you check but before you do the config access. I assume your hardware can deal with a config access that targets a link that is down?

drivers/pci/host/pcie-brcmstb.c

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+     }
+
+     return true;
+}
+
+static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned

int devfn,

Quoted 11 lines
drivers/pci/host/pcie-brcmstb.c new file +11 -0
+                                     int where)
+{
+     struct brcm_pcie *pcie = bus->sysdata;
+     void __iomem *base = pcie->base;
+     int idx;
+
+     if (!brcm_pcie_valid_device(pcie, bus, PCI_SLOT(devfn)))
+             return NULL;
+
+     /* Accesses to the RC go right to the RC registers */
+     if (pci_is_root_bus(bus))
Quoted 9 lines

drivers/pci/host/pcie-brcmstb.c line 603

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+             return base + where;
+
+     /* For devices, write to the config space index register */
+     idx = cfg_index(bus->number, devfn, where);
+     bcm_writel(idx, pcie->base + IDX_ADDR(pcie));
+     return base + DATA_ADDR(pcie) + (where & 0x3);

I guess this is protected by a higher-level config access lock?

All pci config space accessor functions -- pci_bus_{read,write}_{byte,word,dword}() -- use a spinlock (pci_lock). These routines, covered by the spinlock, call pci_generic_{read,write}(), and those two functions call ops->map_bus(), aka our brcm_pcie_map_conf().

Unless CONFIG_PCI_LOCKLESS_CONFIG is set to "y", which it is not.

Quoted 594 lines

drivers/pci/host/pcie-brcmstb.c

Quoted 7 lines
drivers/pci/host/pcie-brcmstb.c new file +7 -0
+}
+
+static inline void brcm_pcie_bridge_sw_init_set(struct brcm_pcie *pcie,
+                                             unsigned int val)
+{
+     unsigned int offset;
+     unsigned int shift = pcie->reg_field_info[RGR1_SW_

INIT_1_INIT_SHIFT];

drivers/pci/host/pcie-brcmstb.c

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+     u32 mask =  pcie->reg_field_info[RGR1_SW_INIT_1_INIT_MASK];
+
+     if (pcie->type != BCM7278) {
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask,

shift,

drivers/pci/host/pcie-brcmstb.c

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+                       val);
+     } else if (of_machine_is_compatible("brcm,bcm7278a0")) {
+             /*
+              * The two PCIe instances on 7278a0 are not even

consistent with

drivers/pci/host/pcie-brcmstb.c line 619

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+              * respect to each other for internal offsets, here we

offset

drivers/pci/host/pcie-brcmstb.c line 620

Quoted 1 line
drivers/pci/host/pcie-brcmstb.c new file +1 -0
+              * by 0x14000 + RGR1_SW_INIT_1's relative offset to

account for

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+              * that.
+              */
+             offset = pcie->id ? 0x14010 : pcie->reg_offsets[RGR1_SW_

INIT_1];

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+             wr_fld_rb(pcie->base + offset, mask, shift, val);
+     } else {
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie), mask,

shift,

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+                       val);
+     }
+}
+

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie,
+                                    unsigned int val)
+{
+     if (pcie->type != BCM7278)
+             wr_fld_rb(pcie->base + PCIE_RGR1_SW_INIT_1(pcie),
+                       PCIE_RGR1_SW_INIT_1_PERST_MASK,
+                       PCIE_RGR1_SW_INIT_1_PERST_SHIFT, val);
+     else
+             /* Assert = 0, de-assert = 1 on 7278 */
+             WR_FLD_RB(pcie->base, PCIE_MISC_PCIE_CTRL, PCIE_PERSTB,

!val);

Quoted 17 lines
drivers/pci/host/pcie-brcmstb.c new file +17 -0
+}
+
+static int brcm_pcie_add_controller(struct brcm_pcie *pcie)
+{
+     mutex_lock(&brcm_pcie_lock);
+     list_add_tail(&pcie->list, &brcm_pcie);
+     mutex_unlock(&brcm_pcie_lock);
+
+     return 0;
+}
+
+static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
+{
+     struct list_head *pos, *q;
+     struct brcm_pcie *tmp;
+
+     mutex_lock(&brcm_pcie_lock);

drivers/pci/host/pcie-brcmstb.c line 667

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     list_for_each_safe(pos, q, &brcm_pcie) {
+             tmp = list_entry(pos, struct brcm_pcie, list);
+             if (tmp == pcie) {
+                     list_del(pos);
+                     if (list_empty(&brcm_pcie))
+                             num_memc = 0;
+                     break;
+             }
+     }
+     mutex_unlock(&brcm_pcie_lock);

I'm missing something. I don't see that num_memc is ever set to anything *other* than zero.

This pattern of keeping a list of controllers is highly unusual and needs some explanation.

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+}
+
+static int brcm_pcie_parse_request_of_pci_ranges(struct brcm_pcie

*pcie)

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+{
+     struct resource_entry *win;
+     int ret;
+
+     ret = of_pci_get_host_bridge_resources(pcie->dn, 0, 0xff,
+                                            &pcie->resources, NULL);
+     if (ret) {
+             dev_err(pcie->dev, "failed to get host resources\n");
+             return ret;
+     }

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+
+     resource_list_for_each_entry(win, &pcie->resources) {
+             struct resource *parent, *res = win->res;
+             dma_addr_t offset = (dma_addr_t)win->offset;
+
+             if (resource_type(res) == IORESOURCE_IO) {
+                     parent = &ioport_resource;
+             } else if (resource_type(res) == IORESOURCE_MEM) {
+                     if (pcie->num_out_wins >= BRCM_NUM_PCIE_OUT_WINS) {
+                             dev_err(pcie->dev, "too many outbound

wins\n");

Quoted 19 lines
drivers/pci/host/pcie-brcmstb.c new file +19 -0
+                             return -EINVAL;
+                     }
+                     pcie->out_wins[pcie->num_out_wins].cpu_addr
+                             = (phys_addr_t)res->start;
+                     pcie->out_wins[pcie->num_out_wins].pcie_addr
+                             = (dma_addr_t)(res->start
+                                            - (phys_addr_t)offset);
+                     pcie->out_wins[pcie->num_out_wins].size
+                             = (dma_addr_t)(res->end - res->start + 1);
+                     pcie->num_out_wins++;
+                     parent = &iomem_resource;
+             } else {
+                     continue;
+             }
+
+             ret = devm_request_resource(pcie->dev, parent, res);
+             if (ret) {
+                     dev_err(pcie->dev, "failed to get res %pR\n", res);
+                     return ret;

drivers/pci/host/pcie-brcmstb.c line 719

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+             }
+     }
+     return 0;
+}
+
+static int brcm_pcie_setup(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     unsigned int scb_size_val;
+     u64 rc_bar2_size = 0, rc_bar2_offset = 0, total_mem_size = 0;

Unnecessary initializations (at least of rc_bar2_size, I didn't check the rest).

Add

  struct device *dev = pcie->dev;

then use it below.

drivers/pci/host/pcie-brcmstb.c line 726

Quoted 7 lines
drivers/pci/host/pcie-brcmstb.c new file +7 -0
+     u32 tmp, burst;
+     int i, j, ret, limit;
+     u16 nlw, cls, lnksta;
+     bool ssc_good = false;
+
+     /* reset the bridge and the endpoint device */
+     /* field: PCIE_BRIDGE_SW_INIT = 1 */

Not sure what these "field: ..." comments mean. Are they for some automated tool? To a human, it looks like they repeat what the code does.

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+     brcm_pcie_bridge_sw_init_set(pcie, 1);
+
+     /* field: PCIE_SW_PERST = 1, on 7278, we start de-asserted already

*/

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+     if (pcie->type != BCM7278)
+             brcm_pcie_perst_set(pcie, 1);
+
+     usleep_range(100, 200);
+
+     /* take the bridge out of reset */
+     /* field: PCIE_BRIDGE_SW_INIT = 0 */
+     brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+     /* wait for serdes to be stable */
+     usleep_range(100, 200);
+

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     /* Grab the PCIe hw revision number */
+     tmp = bcm_readl(base + PCIE_MISC_REVISION);
+     pcie->rev = EXTRACT_FIELD(tmp, PCIE_MISC_REVISION, MAJMIN);
+
+     /* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */
+     tmp = INSERT_FIELD(0, PCIE_MISC_MISC_CTRL, SCB_ACCESS_EN, 1);
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, CFG_READ_UR_MODE, 1);
+     burst = (pcie->type == GENERIC || pcie->type == BCM7278)
+             ? BURST_SIZE_512 : BURST_SIZE_256;
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_MISC_CTRL, MAX_BURST_SIZE,

burst);

Quoted 69 lines
drivers/pci/host/pcie-brcmstb.c new file +69 -0
+     bcm_writel(tmp, base + PCIE_MISC_MISC_CTRL);
+
+     /*
+      * Set up inbound memory view for the EP (called RC_BAR2,
+      * not to be confused with the BARs that are advertised by
+      * the EP).
+      */
+     for (i = 0; i < num_memc; i++)
+             total_mem_size += scb_size[i];
+
+     /*
+      * The PCIe host controller by design must set the inbound
+      * viewport to be a contiguous arrangement of all of the
+      * system's memory.  In addition, its size mut be a power of
+      * two.  To further complicate matters, the viewport must
+      * start on a pcie-address that is aligned on a multiple of its
+      * size.  If a portion of the viewport does not represent
+      * system memory -- e.g. 3GB of memory requires a 4GB viewport
+      * -- we can map the outbound memory in or after 3GB and even
+      * though the viewport will overlap the outbound memory the
+      * controller will know to send outbound memory downstream and
+      * everything else upstream.
+      */
+     rc_bar2_size = roundup_pow_of_two_64(total_mem_size);
+
+     /*
+      * Set simple configuration based on memory sizes
+      * only.  We always start the viewport at address 0.
+      */
+     rc_bar2_offset = 0;
+
+     tmp = lower_32_bits(rc_bar2_offset);
+     tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
+                        encode_ibar_size(rc_bar2_size));
+     bcm_writel(tmp, base + PCIE_MISC_RC_BAR2_CONFIG_LO);
+     bcm_writel(upper_32_bits(rc_bar2_offset),
+                base + PCIE_MISC_RC_BAR2_CONFIG_HI);
+
+     /* field: SCB0_SIZE, default = 0xf (1 GB) */
+     scb_size_val = scb_size[0]
+             ? ilog2(scb_size[0]) - 15 : 0xf;
+     WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB0_SIZE, scb_size_val);
+
+     /* field: SCB1_SIZE, default = 0xf (1 GB) */
+     if (num_memc > 1) {
+             scb_size_val = scb_size[1]
+                     ? ilog2(scb_size[1]) - 15 : 0xf;
+             WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB1_SIZE, scb_size_val);
+     }
+
+     /* field: SCB2_SIZE, default = 0xf (1 GB) */
+     if (num_memc > 2) {
+             scb_size_val = scb_size[2]
+                     ? ilog2(scb_size[2]) - 15 : 0xf;
+             WR_FLD(base, PCIE_MISC_MISC_CTRL, SCB2_SIZE, scb_size_val);
+     }
+
+     /* disable the PCIe->GISB memory window (RC_BAR1) */
+     WR_FLD(base, PCIE_MISC_RC_BAR1_CONFIG_LO, SIZE, 0);
+
+     /* disable the PCIe->SCB memory window (RC_BAR3) */
+     WR_FLD(base, PCIE_MISC_RC_BAR3_CONFIG_LO, SIZE, 0);
+
+     if (!pcie->suspended) {
+             /* clear any interrupts we find on boot */
+             bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + CLR);
+             (void)bcm_readl(base + PCIE_INTR2_CPU_BASE + CLR);
+     }
+

drivers/pci/host/pcie-brcmstb.c line 831

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     /* Mask all interrupts since we are not handling any yet */
+     bcm_writel(0xffffffff, base + PCIE_INTR2_CPU_BASE + MASK_SET);
+     (void)bcm_readl(base + PCIE_INTR2_CPU_BASE + MASK_SET);
+
+     if (pcie->gen)
+             set_gen(base, pcie->gen);
+
+     /* take the EP device out of reset */
+     /* field: PCIE_SW_PERST = 0 */
+     brcm_pcie_perst_set(pcie, 0);

<raises eyebrows> Take the *EP* out of reset? The host controller driver shouldn't be touching an EP directly. Maybe the comment doesn't match what the code actually does.

Quoted 14 lines
drivers/pci/host/pcie-brcmstb.c new file +14 -0
+
+     /*
+      * Give the RC/EP time to wake up, before trying to configure RC.
+      * Intermittently check status for link-up, up to a total of 100ms
+      * when we don't know if the device is there, and up to 1000ms if
+      * we do know the device is there.
+      */
+     limit = pcie->suspended ? 1000 : 100;
+     for (i = 1, j = 0; j < limit && !brcm_pcie_link_up(pcie);
+          j += i, i = i * 2)
+             msleep(i + j > limit ? limit - j : i);
+
+     if (!brcm_pcie_link_up(pcie)) {
+             dev_info(pcie->dev, "link down\n");

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+             return -ENODEV;
+     }
+
+     if (!brcm_pcie_rc_mode(pcie)) {
+             dev_err(pcie->dev, "PCIe misconfigured; is in EP mode\n");
+             return -EINVAL;
+     }
+
+     for (i = 0; i < pcie->num_out_wins; i++)
+             brcm_pcie_set_outbound_win(pcie, i,

pcie->out_wins[i].cpu_addr,

Quoted 12 lines
drivers/pci/host/pcie-brcmstb.c new file +12 -0
+                                        pcie->out_wins[i].pcie_addr,
+                                        pcie->out_wins[i].size);
+
+     /*
+      * For config space accesses on the RC, show the right class for
+      * a PCIe-PCIe bridge (the default setting is to be EP mode).
+      */
+     WR_FLD_RB(base, PCIE_RC_CFG_PRIV1_ID_VAL3, CLASS_CODE, 0x060400);
+
+     if (pcie->ssc) {
+             ret = set_ssc(base);
+             if (ret == 0)

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+                     ssc_good = true;
+             else
+                     dev_err(pcie->dev,
+                             "failed attempt to enter ssc mode\n");
+     }
+
+     lnksta = bcm_readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKSTA);
+     cls = lnksta & PCI_EXP_LNKSTA_CLS;
+     nlw = (lnksta & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;
+     dev_info(pcie->dev, "link up, %s Gbps x%u %s\n",

link_speed_to_str(cls),

drivers/pci/host/pcie-brcmstb.c

Quoted 9 lines
drivers/pci/host/pcie-brcmstb.c new file +9 -0
+              nlw, ssc_good ? "(SSC)" : "(!SSC)");
+
+     /* PCIe->SCB endian mode for BAR */
+     /* field ENDIAN_MODE_BAR2 = DATA_ENDIAN */
+     WR_FLD_RB(base, PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1,
+               ENDIAN_MODE_BAR2, DATA_ENDIAN);
+
+     /*
+      * Refclk from RC should be gated with CLKREQ# input when ASPM

L0s,L1

drivers/pci/host/pcie-brcmstb.c

Quoted 3 lines
drivers/pci/host/pcie-brcmstb.c new file +3 -0
+      * is enabled =>  setting the CLKREQ_DEBUG_ENABLE field to 1.
+      */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG,

CLKREQ_DEBUG_ENABLE, 1);

Quoted 4 lines
drivers/pci/host/pcie-brcmstb.c new file +4 -0
+
+     return 0;
+}
+

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static void enter_l23(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+     int tries, l23;
+
+     /* assert request for L23 */
+     WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 1);
+     /* poll L23 status */
+     for (tries = 0, l23 = 0; tries < 1000 && !l23; tries++)
+             l23 = RD_FLD(base, PCIE_MISC_PCIE_STATUS,

PCIE_LINK_IN_L23);

drivers/pci/host/pcie-brcmstb.c line 905

Quoted 2 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -0
+     if (!l23)
+             dev_err(pcie->dev, "failed to enter L23\n");

What does "L23" mean? Some power management thing?

Quoted 29 lines
drivers/pci/host/pcie-brcmstb.c new file +29 -0
+}
+
+static void turn_off(struct brcm_pcie *pcie)
+{
+     void __iomem *base = pcie->base;
+
+     if (brcm_pcie_link_up(pcie))
+             enter_l23(pcie);
+     /* Reset endpoint device */
+     brcm_pcie_perst_set(pcie, 1);
+     /* deassert request for L23 in case it was asserted */
+     WR_FLD_RB(base, PCIE_MISC_PCIE_CTRL, PCIE_L23_REQUEST, 0);
+     /* SERDES_IDDQ = 1 */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 1);
+     /* Shutdown PCIe bridge */
+     brcm_pcie_bridge_sw_init_set(pcie, 1);
+}
+
+static int brcm_pcie_suspend(struct device *dev)
+{
+     struct brcm_pcie *pcie = dev_get_drvdata(dev);
+
+     turn_off(pcie);
+     clk_disable_unprepare(pcie->clk);
+     pcie->suspended = true;
+
+     return 0;
+}
+

drivers/pci/host/pcie-brcmstb.c line 944

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+static int brcm_pcie_resume(struct device *dev)
+{
+     struct brcm_pcie *pcie = dev_get_drvdata(dev);
+     void __iomem *base;
+     int ret;
+
+     base = pcie->base;
+     clk_prepare_enable(pcie->clk);
+
+     /* Take bridge out of reset so we can access the SERDES reg */

Some comments above and below spell it "serdes"; here you spell it "SERDES".

Quoted 57 lines
drivers/pci/host/pcie-brcmstb.c new file +57 -0
+     brcm_pcie_bridge_sw_init_set(pcie, 0);
+
+     /* SERDES_IDDQ = 0 */
+     WR_FLD_RB(base, PCIE_MISC_HARD_PCIE_HARD_DEBUG, SERDES_IDDQ, 0);
+     /* wait for serdes to be stable */
+     usleep_range(100, 200);
+
+     ret = brcm_pcie_setup(pcie);
+     if (ret)
+             return ret;
+
+     pcie->suspended = false;
+
+     return 0;
+}
+
+static void _brcm_pcie_remove(struct brcm_pcie *pcie)
+{
+     turn_off(pcie);
+     clk_disable_unprepare(pcie->clk);
+     clk_put(pcie->clk);
+     brcm_pcie_remove_controller(pcie);
+}
+
+static int brcm_pcie_remove(struct platform_device *pdev)
+{
+     struct brcm_pcie *pcie = platform_get_drvdata(pdev);
+
+     pci_stop_root_bus(pcie->root_bus);
+     pci_remove_root_bus(pcie->root_bus);
+     _brcm_pcie_remove(pcie);
+
+     return 0;
+}
+
+static const struct of_device_id brcm_pcie_match[] = {
+     { .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
+     { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
+     { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
+     { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
+     {},
+};
+MODULE_DEVICE_TABLE(of, brcm_pcie_match);
+
+static int brcm_pcie_probe(struct platform_device *pdev)
+{
+     struct device_node *dn = pdev->dev.of_node;
+     const struct of_device_id *of_id;
+     const struct pcie_cfg_data *data;
+     int ret;
+     struct brcm_pcie *pcie;
+     struct resource *res;
+     void __iomem *base;
+     u32 tmp;
+     struct pci_host_bridge *bridge;
+     struct pci_bus *child;
+

drivers/pci/host/pcie-brcmstb.c

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));
+     if (!bridge)
+             return -ENOMEM;
+
+     pcie = pci_host_bridge_priv(bridge);
+     INIT_LIST_HEAD(&pcie->resources);
+
+     of_id = of_match_node(brcm_pcie_match, dn);
+     if (!of_id) {
+             dev_err(&pdev->dev, "failed to look up compatible

string\n");

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c new file +6 -0
+             return -EINVAL;
+     }
+
+     if (of_property_read_u32(dn, "dma-ranges", &tmp) == 0) {
+             dev_err(&pdev->dev, "cannot yet handle dma-ranges\n");
+             return -EINVAL;

drivers/pci/host/pcie-brcmstb.c line 1027

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     }
+
+     data = of_id->data;
+     pcie->reg_offsets = data->offsets;
+     pcie->reg_field_info = data->reg_field_info;
+     pcie->type = data->type;
+     pcie->dn = dn;
+     pcie->dev = &pdev->dev;
+
+     pcie->id = of_get_pci_domain_nr(dn);

Why do you call of_get_pci_domain_nr() directly? No other driver does.

Quoted 72 lines
drivers/pci/host/pcie-brcmstb.c new file +72 -0
+     if (pcie->id < 0)
+             return pcie->id;
+
+     res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+     if (!res)
+             return -EINVAL;
+
+     base = devm_ioremap_resource(&pdev->dev, res);
+     if (IS_ERR(base))
+             return PTR_ERR(base);
+
+     pcie->clk = of_clk_get_by_name(dn, "sw_pcie");
+     if (IS_ERR(pcie->clk)) {
+             dev_err(&pdev->dev, "could not get clock\n");
+             pcie->clk = NULL;
+     }
+     pcie->base = base;
+
+     ret = of_pci_get_max_link_speed(dn);
+     pcie->gen = (ret < 0) ? 0 : ret;
+
+     pcie->ssc = of_property_read_bool(dn, "brcm,enable-ssc");
+
+     ret = irq_of_parse_and_map(pdev->dev.of_node, 0);
+     if (ret == 0)
+             /* keep going, as we don't use this intr yet */
+             dev_warn(pcie->dev, "cannot get pcie interrupt\n");
+     else
+             pcie->irq = ret;
+
+     ret = brcm_pcie_parse_request_of_pci_ranges(pcie);
+     if (ret)
+             return ret;
+
+     ret = clk_prepare_enable(pcie->clk);
+     if (ret) {
+             dev_err(&pdev->dev, "could not enable clock\n");
+             return ret;
+     }
+
+     ret = brcm_pcie_add_controller(pcie);
+     if (ret)
+             return ret;
+
+     ret = brcm_pcie_setup(pcie);
+     if (ret)
+             goto fail;
+
+     list_splice_init(&pcie->resources, &bridge->windows);
+     bridge->dev.parent = &pdev->dev;
+     bridge->busnr = 0;
+     bridge->ops = &brcm_pcie_ops;
+     bridge->sysdata = pcie;
+     bridge->map_irq = of_irq_parse_and_map_pci;
+     bridge->swizzle_irq = pci_common_swizzle;
+
+     ret = pci_scan_root_bus_bridge(bridge);
+     if (ret < 0) {
+             dev_err(pcie->dev, "Scanning root bridge failed");
+             goto fail;
+     }
+
+     pci_assign_unassigned_bus_resources(bridge->bus);
+     list_for_each_entry(child, &bridge->bus->children, node)
+             pcie_bus_configure_settings(child);
+     pci_bus_add_devices(bridge->bus);
+     platform_set_drvdata(pdev, pcie);
+     pcie->root_bus = bridge->bus;
+
+     return 0;
+
+fail:

drivers/pci/host/pcie-brcmstb.c line 1109

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +10 -0
+     _brcm_pcie_remove(pcie);
+     return ret;
+}
+
+static const struct dev_pm_ops brcm_pcie_pm_ops = {
+     .suspend_noirq = brcm_pcie_suspend,
+     .resume_noirq = brcm_pcie_resume,
+};
+
+static struct platform_driver __refdata brcm_pcie_driver = {

Why do you need __refdata? There's only only other occurrence in drivers/pci, and I'm dubious about that one as well.

drivers/pci/host/pcie-brcmstb.c line 1122

Quoted 13 lines
drivers/pci/host/pcie-brcmstb.c new file +13 -0
+     .probe = brcm_pcie_probe,
+     .remove = brcm_pcie_remove,
+     .driver = {
+             .name = "brcm-pcie",
+             .owner = THIS_MODULE,
+             .of_match_table = brcm_pcie_match,
+             .pm = &brcm_pcie_pm_ops,
+     },
+};
+
+module_platform_driver(brcm_pcie_driver);
+
+MODULE_LICENSE("GPL");

Copyright notice above says "GPL v2", which is not the same as the "GPL" here.

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c new file +2 -1
+MODULE_DESCRIPTION("Broadcom STB PCIE RC driver");
+MODULE_AUTHOR("Broadcom");
--

1.9.0.138.g2de3478

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#17 lore raw

PATCH v3 4/8 PCI: brcmstb: Add dma-range mapping for inbound traffic

In reply to Jim Quinlan

The Broadcom STB PCIe host controller is intimately related to the memory subsystem. This close relationship adds complexity to how cpu system memory is mapped to PCIe memory. Ideally, this mapping is an identity mapping, or an identity mapping off by a constant. Not so in this case.

Consider the Broadcom reference board BCM97445LCC_4X8 which has 6 GB of system memory. Here is how the PCIe controller maps the system memory to PCIe memory:

memc0-a@[ 0....3fffffff] <=> pci@[ 0....3fffffff]
memc0-b@[100000000...13fffffff] <=> pci@[ 40000000....7fffffff] memc1-a@[ 40000000....7fffffff] <=> pci@[ 80000000....bfffffff] memc1-b@[300000000...33fffffff] <=> pci@[ c0000000....ffffffff] memc2-a@[ 80000000....bfffffff] <=> pci@[100000000...13fffffff] memc2-b@[c00000000...c3fffffff] <=> pci@[140000000...17fffffff]

Although there are some "gaps" that can be added between the individual mappings by software, the permutation of memory regions for the most part is fixed by HW. The solution of having something close to an identity mapping is not possible.

The idea behind this HW design is that the same PCIe module can act as an RC or EP, and if it acts as an EP it concatenates all of system memory into a BAR so anything can be accessed. Unfortunately, when the PCIe block is in the role of an RC it also presents this "BAR" to downstream PCIe devices, rather than offering an identity map between its system memory and PCIe space.

Suppose that an endpoint driver allocs some DMA memory. Suppose this memory is located at 0x6000_0000, which is in the middle of memc1-a. The driver wants a dma_addr_t value that it can pass on to the EP to use. Without doing any custom mapping, the EP will use this value for
DMA: the driver will get a dma_addr_t equal to 0x6000_0000. But this won't work; the device needs a dma_addr_t that reflects the PCIe space address, namely 0xa000_0000.

So, essentially the solution to this problem must modify the dma_addr_t returned by the DMA routines routines. There are two ways (I know of) of doing this:

(a) overriding/redefining the dma_to_phys() and phys_to_dma() calls that are used by the dma_ops routines. This is the approach of

arch/mips/cavium-octeon/dma-octeon.c

In ARM and ARM64 these two routines are defiend in asm/dma-mapping.h as static inline functions.

(b) Subscribe to a notifier that notifies when a device is added to a bus. When this happens, set_dma_ops() can be called for the device. This method is mentioned in:

    http://lxr.free-electrons.com/source/drivers/of/platform.c?v=3.16#L152

where it says as a comment

"In case if platform code need to use own special DMA configuration, it can use Platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE event to fix up DMA configuration."

Solution (b) is what this commit does. It uses its own set of dma_ops which are wrappers around the arch_dma_ops. The wrappers translate the dma addresses before/after invoking the arch_dma_ops, as appropriate.

---
 drivers/pci/host/Makefile           |   4 +-
 drivers/pci/host/pcie-brcmstb-dma.c | 319 ++++++++++++++++++++++++++++++++++++
 drivers/pci/host/pcie-brcmstb.c     | 139 +++++++++++++++-
 drivers/pci/host/pcie-brcmstb.h     |  22 +++
 4 files changed, 474 insertions(+), 10 deletions(-)
 create mode 100644 drivers/pci/host/pcie-brcmstb-dma.c
 create mode 100644 drivers/pci/host/pcie-brcmstb.h
drivers/pci/host/Makefile +3 -1
index a8b9923..6b94c9c 100644
@@ -21,7 +21,9 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
-obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
+
+obj-$(CONFIG_PCIE_BRCMSTB) += brcmstb-pcie.o
+brcmstb-pcie-objs := pcie-brcmstb.o pcie-brcmstb-dma.o
 
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie-brcmstb-dma.c new file +319 -0

319 lines not on this page · raw message

drivers/pci/host/pcie-brcmstb.c +130 -9

203 lines not on this page · raw message

drivers/pci/host/pcie-brcmstb.h new file +22 -0
new file mode 100644
index 0000000..d7233f0
@@ -0,0 +1,22 @@
+#ifndef __BRCMSTB_PCI_H
+#define __BRCMSTB_PCI_H
+/*
+ * Copyright (C) 2015 - 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+int brcm_register_notifier(void);
+int brcm_unregister_notifier(void);
+
+extern struct of_pci_range *dma_ranges;
+extern int num_dma_ranges;
+
+#endif /* __BRCMSTB_PCI_H */
Signature · 1 line
1.9.0.138.g2de3478
#18 lore raw

Re: [PATCH v3 4/8] PCI: brcmstb: Add dma-range mapping for inbound traffic

Quoted 82 lines · Jim Quinlan

The Broadcom STB PCIe host controller is intimately related to the memory subsystem. This close relationship adds complexity to how cpu system memory is mapped to PCIe memory. Ideally, this mapping is an identity mapping, or an identity mapping off by a constant. Not so in this case.

Consider the Broadcom reference board BCM97445LCC_4X8 which has 6 GB of system memory. Here is how the PCIe controller maps the system memory to PCIe memory:

memc0-a@[ 0....3fffffff] <=> pci@[ 0....3fffffff]
memc0-b@[100000000...13fffffff] <=> pci@[ 40000000....7fffffff] memc1-a@[ 40000000....7fffffff] <=> pci@[ 80000000....bfffffff] memc1-b@[300000000...33fffffff] <=> pci@[ c0000000....ffffffff] memc2-a@[ 80000000....bfffffff] <=> pci@[100000000...13fffffff] memc2-b@[c00000000...c3fffffff] <=> pci@[140000000...17fffffff]

Although there are some "gaps" that can be added between the individual mappings by software, the permutation of memory regions for the most part is fixed by HW. The solution of having something close to an identity mapping is not possible.

The idea behind this HW design is that the same PCIe module can act as an RC or EP, and if it acts as an EP it concatenates all of system memory into a BAR so anything can be accessed. Unfortunately, when the PCIe block is in the role of an RC it also presents this "BAR" to downstream PCIe devices, rather than offering an identity map between its system memory and PCIe space.

Suppose that an endpoint driver allocs some DMA memory. Suppose this memory is located at 0x6000_0000, which is in the middle of memc1-a. The driver wants a dma_addr_t value that it can pass on to the EP to use. Without doing any custom mapping, the EP will use this value for
DMA: the driver will get a dma_addr_t equal to 0x6000_0000. But this won't work; the device needs a dma_addr_t that reflects the PCIe space address, namely 0xa000_0000.

So, essentially the solution to this problem must modify the dma_addr_t returned by the DMA routines routines. There are two ways (I know of) of doing this:

(a) overriding/redefining the dma_to_phys() and phys_to_dma() calls that are used by the dma_ops routines. This is the approach of

arch/mips/cavium-octeon/dma-octeon.c

In ARM and ARM64 these two routines are defiend in asm/dma-mapping.h as static inline functions.

(b) Subscribe to a notifier that notifies when a device is added to a bus. When this happens, set_dma_ops() can be called for the device. This method is mentioned in:

    http://lxr.free-electrons.com/source/drivers/of/platform.c?v=3.16#L152

where it says as a comment

"In case if platform code need to use own special DMA configuration, it can use Platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE event to fix up DMA configuration."

Solution (b) is what this commit does. It uses its own set of dma_ops which are wrappers around the arch_dma_ops. The wrappers translate the dma addresses before/after invoking the arch_dma_ops, as appropriate.

---
 drivers/pci/host/Makefile           |   4 +-
 drivers/pci/host/pcie-brcmstb-dma.c | 319 ++++++++++++++++++++++++++++++++++++
 drivers/pci/host/pcie-brcmstb.c     | 139 +++++++++++++++-
 drivers/pci/host/pcie-brcmstb.h     |  22 +++
 4 files changed, 474 insertions(+), 10 deletions(-)
 create mode 100644 drivers/pci/host/pcie-brcmstb-dma.c
 create mode 100644 drivers/pci/host/pcie-brcmstb.h
drivers/pci/host/Makefile +0 -0
index a8b9923..6b94c9c 100644

drivers/pci/host/Makefile obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o · line 26

Quoted 7 lines
drivers/pci/host/Makefile +3 -1
@@ -21,7 +21,9 @@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-rockchip.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
 obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 obj-$(CONFIG_VMD) += vmd.o
-obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
+
+obj-$(CONFIG_PCIE_BRCMSTB) += brcmstb-pcie.o
+brcmstb-pcie-objs := pcie-brcmstb.o pcie-brcmstb-dma.o

I do not like the addition of more files for this driver (we might have talked about this before, I can't remember). If we end up with 2, 3, 4 files for every vendor it's going to be a hassle to manage.

It looks like the only caller of the pcie-brcmstb-dma.c is pcie-brcmstb.c, so for now, at least, I don't see the point of splitting them. They can always be split later if necessary.

Quoted 10 lines
drivers/pci/host/Makefile +0 -0
 # The following drivers are for devices that use the generic ACPI
 # pci_root.c driver but don't support standard ECAM config access.
drivers/pci/host/pcie-brcmstb-dma.c new file +2 -0
new file mode 100644
index 0000000..6c397be
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2015-2017 Broadcom

drivers/pci/host/pcie-brcmstb-dma.c line 12

Quoted 10 lines
drivers/pci/host/pcie-brcmstb-dma.c new file +10 -0
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *

Spurious blank comment line.

Quoted 320 lines
drivers/pci/host/pcie-brcmstb-dma.c new file +307 -0
+ */
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_pci.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/smp.h>
+
+#include "pcie-brcmstb.h"
+
+static const struct dma_map_ops *arch_dma_ops;
+static const struct dma_map_ops *brcm_dma_ops_ptr;
+
+static dma_addr_t brcm_to_pci(dma_addr_t addr)
+{
+	struct of_pci_range *p;
+
+	if (!num_dma_ranges)
+		return addr;
+
+	for (p = dma_ranges; p < &dma_ranges[num_dma_ranges]; p++)
+		if (addr >= p->cpu_addr && addr < (p->cpu_addr + p->size))
+			return addr - p->cpu_addr + p->pci_addr;
+
+	return addr;
+}
+
+static dma_addr_t brcm_to_cpu(dma_addr_t addr)
+{
+	struct of_pci_range *p;
+
+	if (!num_dma_ranges)
+		return addr;
+
+	for (p = dma_ranges; p < &dma_ranges[num_dma_ranges]; p++)
+		if (addr >= p->pci_addr && addr < (p->pci_addr + p->size))
+			return addr - p->pci_addr + p->cpu_addr;
+
+	return addr;
+}
+
+static void *brcm_alloc(struct device *dev, size_t size, dma_addr_t *handle,
+			gfp_t gfp, unsigned long attrs)
+{
+	void *ret;
+
+	ret = arch_dma_ops->alloc(dev, size, handle, gfp, attrs);
+	if (ret)
+		*handle = brcm_to_pci(*handle);
+	return ret;
+}
+
+static void brcm_free(struct device *dev, size_t size, void *cpu_addr,
+		      dma_addr_t handle, unsigned long attrs)
+{
+	handle = brcm_to_cpu(handle);
+	arch_dma_ops->free(dev, size, cpu_addr, handle, attrs);
+}
+
+static int brcm_mmap(struct device *dev, struct vm_area_struct *vma,
+		     void *cpu_addr, dma_addr_t dma_addr, size_t size,
+		     unsigned long attrs)
+{
+	dma_addr = brcm_to_cpu(dma_addr);
+	return arch_dma_ops->mmap(dev, vma, cpu_addr, dma_addr, size, attrs);
+}
+
+static int brcm_get_sgtable(struct device *dev, struct sg_table *sgt,
+			    void *cpu_addr, dma_addr_t handle, size_t size,
+			    unsigned long attrs)
+{
+	handle = brcm_to_cpu(handle);
+	return arch_dma_ops->get_sgtable(dev, sgt, cpu_addr, handle, size,
+				       attrs);
+}
+
+static dma_addr_t brcm_map_page(struct device *dev, struct page *page,
+				unsigned long offset, size_t size,
+				enum dma_data_direction dir,
+				unsigned long attrs)
+{
+	return brcm_to_pci(arch_dma_ops->map_page(dev, page, offset, size,
+						  dir, attrs));
+}
+
+static void brcm_unmap_page(struct device *dev, dma_addr_t handle,
+			    size_t size, enum dma_data_direction dir,
+			    unsigned long attrs)
+{
+	handle = brcm_to_cpu(handle);
+	arch_dma_ops->unmap_page(dev, handle, size, dir, attrs);
+}
+
+static int brcm_map_sg(struct device *dev, struct scatterlist *sgl,
+		       int nents, enum dma_data_direction dir,
+		       unsigned long attrs)
+{
+	int i, j;
+	struct scatterlist *sg;
+
+	for_each_sg(sgl, sg, nents, i) {
+#ifdef CONFIG_NEED_SG_DMA_LENGTH
+		sg->dma_length = sg->length;
+#endif
+		sg->dma_address =
+			brcm_dma_ops_ptr->map_page(dev, sg_page(sg), sg->offset,
+						   sg->length, dir, attrs);
+		if (dma_mapping_error(dev, sg->dma_address))
+			goto bad_mapping;
+	}
+	return nents;
+
+bad_mapping:
+	for_each_sg(sgl, sg, i, j)
+		brcm_dma_ops_ptr->unmap_page(dev, sg_dma_address(sg),
+					     sg_dma_len(sg), dir, attrs);
+	return 0;
+}
+
+static void brcm_unmap_sg(struct device *dev,
+			  struct scatterlist *sgl, int nents,
+			  enum dma_data_direction dir,
+			  unsigned long attrs)
+{
+	int i;
+	struct scatterlist *sg;
+
+	for_each_sg(sgl, sg, nents, i)
+		brcm_dma_ops_ptr->unmap_page(dev, sg_dma_address(sg),
+					     sg_dma_len(sg), dir, attrs);
+}
+
+static void brcm_sync_single_for_cpu(struct device *dev,
+				     dma_addr_t handle, size_t size,
+				     enum dma_data_direction dir)
+{
+	handle = brcm_to_cpu(handle);
+	arch_dma_ops->sync_single_for_cpu(dev, handle, size, dir);
+}
+
+static void brcm_sync_single_for_device(struct device *dev,
+					dma_addr_t handle, size_t size,
+					enum dma_data_direction dir)
+{
+	handle = brcm_to_cpu(handle);
+	arch_dma_ops->sync_single_for_device(dev, handle, size, dir);
+}
+
+static dma_addr_t brcm_map_resource(struct device *dev, phys_addr_t phys,
+				    size_t size,
+				    enum dma_data_direction dir,
+				    unsigned long attrs)
+{
+	if (arch_dma_ops->map_resource)
+		return brcm_to_pci(arch_dma_ops->map_resource
+				   (dev, phys, size, dir, attrs));
+	return brcm_to_pci((dma_addr_t)phys);
+}
+
+static void brcm_unmap_resource(struct device *dev, dma_addr_t handle,
+				size_t size, enum dma_data_direction dir,
+				unsigned long attrs)
+{
+	if (arch_dma_ops->unmap_resource)
+		arch_dma_ops->unmap_resource(dev, brcm_to_cpu(handle), size,
+					     dir, attrs);
+}
+
+void brcm_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl,
+			  int nents, enum dma_data_direction dir)
+{
+	struct scatterlist *sg;
+	int i;
+
+	for_each_sg(sgl, sg, nents, i)
+		brcm_dma_ops_ptr->sync_single_for_cpu(dev, sg_dma_address(sg),
+						      sg->length, dir);
+}
+
+void brcm_sync_sg_for_device(struct device *dev, struct scatterlist *sgl,
+			     int nents, enum dma_data_direction dir)
+{
+	struct scatterlist *sg;
+	int i;
+
+	for_each_sg(sgl, sg, nents, i)
+		brcm_dma_ops_ptr->sync_single_for_device(dev,
+							 sg_dma_address(sg),
+							 sg->length, dir);
+}
+
+static int brcm_mapping_error(struct device *dev, dma_addr_t dma_addr)
+{
+	return arch_dma_ops->mapping_error(dev, dma_addr);
+}
+
+static int brcm_dma_supported(struct device *dev, u64 mask)
+{
+	if (num_dma_ranges) {
+		/*
+		 * It is our translated addresses that the EP will "see", so
+		 * we check all of the ranges for the largest possible value.
+		 */
+		int i;
+
+		for (i = 0; i < num_dma_ranges; i++)
+			if (dma_ranges[i].pci_addr + dma_ranges[i].size - 1
+			    > mask)
+				return 0;
+		return 1;
+	}
+
+	return arch_dma_ops->dma_supported(dev, mask);
+}
+
+#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
+u64 brcm_get_required_mask)(struct device *dev)
+{
+	return arch_dma_ops->get_required_mask(dev);
+}
+#endif
+
+static const struct dma_map_ops brcm_dma_ops = {
+	.alloc			= brcm_alloc,
+	.free			= brcm_free,
+	.mmap			= brcm_mmap,
+	.get_sgtable		= brcm_get_sgtable,
+	.map_page		= brcm_map_page,
+	.unmap_page		= brcm_unmap_page,
+	.map_sg			= brcm_map_sg,
+	.unmap_sg		= brcm_unmap_sg,
+	.map_resource		= brcm_map_resource,
+	.unmap_resource		= brcm_unmap_resource,
+	.sync_single_for_cpu	= brcm_sync_single_for_cpu,
+	.sync_single_for_device	= brcm_sync_single_for_device,
+	.sync_sg_for_cpu	= brcm_sync_sg_for_cpu,
+	.sync_sg_for_device	= brcm_sync_sg_for_device,
+	.mapping_error		= brcm_mapping_error,
+	.dma_supported		= brcm_dma_supported,
+#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
+	.get_required_mask	= brcm_get_required_mask,
+#endif
+};
+
+static void brcm_set_dma_ops(struct device *dev)
+{
+	int ret;
+
+	if (IS_ENABLED(CONFIG_ARM64)) {
+		/*
+		 * We are going to invoke get_dma_ops().  That
+		 * function, at this point in time, invokes
+		 * get_arch_dma_ops(), and for ARM64 that function
+		 * returns a pointer to dummy_dma_ops.  So then we'd
+		 * like to call arch_setup_dma_ops(), but that isn't
+		 * exported.  Instead, we call of_dma_configure(),
+		 * which is exported, and this calls
+		 * arch_setup_dma_ops().  Once we do this the call to
+		 * get_dma_ops() will work properly because
+		 * dev->dma_ops will be set.
+		 */
+		ret = of_dma_configure(dev, dev->of_node);
+		if (ret) {
+			dev_err(dev, "of_dma_configure() failed: %d\n", ret);
+			return;
+		}
+	}
+
+	arch_dma_ops = get_dma_ops(dev);
+	if (!arch_dma_ops) {
+		dev_err(dev, "failed to get arch_dma_ops\n");
+		return;
+	}
+
+	set_dma_ops(dev, &brcm_dma_ops);
+}
+
+static int brcmstb_platform_notifier(struct notifier_block *nb,
+				     unsigned long event, void *__dev)
+{
+	struct device *dev = __dev;
+
+	brcm_dma_ops_ptr = &brcm_dma_ops;
+	if (event != BUS_NOTIFY_ADD_DEVICE)
+		return NOTIFY_DONE;
+
+	brcm_set_dma_ops(dev);
+	return NOTIFY_OK;
+}
+
+static struct notifier_block brcmstb_platform_nb = {
+	.notifier_call = brcmstb_platform_notifier,
+};
+
+int brcm_register_notifier(void)
+{
+	return bus_register_notifier(&pci_bus_type, &brcmstb_platform_nb);
+}
+
+int brcm_unregister_notifier(void)
+{
+	return bus_unregister_notifier(&pci_bus_type, &brcmstb_platform_nb);
+}
drivers/pci/host/pcie-brcmstb.c +1 -0
index d8a8f7a..5f4c6aa 100644
@@ -35,6 +35,7 @@
 #include <soc/brcmstb/memory_api.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include "pcie-brcmstb.h"
 
 /* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */
 #define BRCM_PCIE_CAP_REGS				0x00ac

drivers/pci/host/pcie-brcmstb.c static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn, · line 338

Quoted 6 lines
drivers/pci/host/pcie-brcmstb.c +3 -0
@@ -332,6 +333,10 @@ static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
 	((val & ~reg##_##field##_MASK) | \
 	 (reg##_##field##_MASK & (field_val << reg##_##field##_SHIFT)))
 
+/* Also used by pci-brcmstb-dma.c */
+struct of_pci_range *dma_ranges;
+int num_dma_ranges;

These names are too generic for global symbols.

Quoted 227 lines
drivers/pci/host/pcie-brcmstb.c +126 -9
+
 static struct list_head brcm_pcie = LIST_HEAD_INIT(brcm_pcie);
 static phys_addr_t scb_size[BRCM_MAX_SCB];
 static int num_memc;
@@ -642,25 +647,42 @@ static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie,
 
 static int brcm_pcie_add_controller(struct brcm_pcie *pcie)
 {
+	int ret = 0;
+
 	mutex_lock(&brcm_pcie_lock);
+	if (list_empty(&brcm_pcie)) {
+		ret = brcm_register_notifier();
+		if (ret) {
+			dev_err(pcie->dev,
+				"failed to register pci bus notifier\n");
+			goto done;
+		}
+	}
 	list_add_tail(&pcie->list, &brcm_pcie);
+done:
 	mutex_unlock(&brcm_pcie_lock);
-
-	return 0;
+	return ret;
 }
 
 static void brcm_pcie_remove_controller(struct brcm_pcie *pcie)
 {
 	struct list_head *pos, *q;
 	struct brcm_pcie *tmp;
+	static const char *err_msg = "failed to unregister pci bus notifier\n";
 
 	mutex_lock(&brcm_pcie_lock);
 	list_for_each_safe(pos, q, &brcm_pcie) {
 		tmp = list_entry(pos, struct brcm_pcie, list);
 		if (tmp == pcie) {
 			list_del(pos);
-			if (list_empty(&brcm_pcie))
+			if (list_empty(&brcm_pcie)) {
+				if (brcm_unregister_notifier())
+					dev_err(pcie->dev, err_msg);
+				kfree(dma_ranges);
+				dma_ranges = NULL;
+				num_dma_ranges = 0;
 				num_memc = 0;
+			}
 			break;
 		}
 	}
@@ -712,6 +734,75 @@ static int brcm_pcie_parse_request_of_pci_ranges(struct brcm_pcie *pcie)
 	return 0;
 }
 
+static int pci_dma_range_parser_init(struct of_pci_range_parser *parser,
+				     struct device_node *node)
+{
+	const int na = 3, ns = 2;
+	int rlen;
+
+	parser->node = node;
+	parser->pna = of_n_addr_cells(node);
+	parser->np = parser->pna + na + ns;
+
+	parser->range = of_get_property(node, "dma-ranges", &rlen);
+	if (!parser->range)
+		return -ENOENT;
+
+	parser->end = parser->range + rlen / sizeof(__be32);
+
+	return 0;
+}
+
+static int brcm_pcie_parse_map_dma_ranges(struct brcm_pcie *pcie)
+{
+	int i, ret = 0;
+	struct of_pci_range_parser parser;
+	struct device_node *dn = pcie->dn;
+
+	mutex_lock(&brcm_pcie_lock);
+	if (dma_ranges)
+		goto done;
+
+	/*
+	 * Parse dma-ranges property if present.  If there are multiple
+	 * PCI controllers, we only have to parse from one of them since
+	 * the others will have an identical mapping.
+	 */
+	if (!pci_dma_range_parser_init(&parser, dn)) {
+		unsigned int max_ranges
+			= (parser.end - parser.range) / parser.np;
+
+		dma_ranges = kcalloc(max_ranges, sizeof(struct of_pci_range),
+				     GFP_KERNEL);
+		if (!dma_ranges) {
+			ret =  -ENOMEM;
+			goto done;
+		}
+		for (i = 0; of_pci_range_parser_one(&parser, dma_ranges + i);
+		     i++)
+			num_dma_ranges++;
+	}
+
+	for (i = 0, num_memc = 0; i < BRCM_MAX_SCB; i++) {
+		u64 size = brcmstb_memory_memc_size(i);
+
+		if (size == (u64)-1) {
+			dev_err(pcie->dev, "cannot get memc%d size", i);
+			ret = -EINVAL;
+			goto done;
+		} else if (size) {
+			scb_size[i] = roundup_pow_of_two_64(size);
+			num_memc++;
+		} else {
+			break;
+		}
+	}
+
+done:
+	mutex_unlock(&brcm_pcie_lock);
+	return ret;
+}
+
 static int brcm_pcie_setup(struct brcm_pcie *pcie)
 {
 	void __iomem *base = pcie->base;
@@ -781,6 +872,38 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	 */
 	rc_bar2_offset = 0;
 
+	if (dma_ranges) {
+		/*
+		 * The best-case scenario is to place the inbound
+		 * region in the first 4GB of pci-space, as some
+		 * legacy devices can only address 32bits.
+		 * We would also like to put the MSI under 4GB
+		 * as well, since some devices require a 32bit
+		 * MSI target address.
+		 */
+		if (total_mem_size <= 0xc0000000ULL &&
+		    rc_bar2_size <= 0x100000000ULL) {
+			rc_bar2_offset = 0;
+		} else {
+			/*
+			 * The system memory is 4GB or larger so we
+			 * cannot start the inbound region at location
+			 * 0 (since we have to allow some space for
+			 * outbound memory @ 3GB).  So instead we
+			 * start it at the 1x multiple of its size
+			 */
+			rc_bar2_offset = rc_bar2_size;
+		}
+
+	} else {
+		/*
+		 * Set simple configuration based on memory sizes
+		 * only.  We always start the viewport at address 0,
+		 * and set the MSI target address accordingly.
+		 */
+		rc_bar2_offset = 0;
+	}
+
 	tmp = lower_32_bits(rc_bar2_offset);
 	tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
 			   encode_ibar_size(rc_bar2_size));
@@ -995,7 +1118,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	struct brcm_pcie *pcie;
 	struct resource *res;
 	void __iomem *base;
-	u32 tmp;
 	struct pci_host_bridge *bridge;
 	struct pci_bus *child;
 
@@ -1012,11 +1134,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	if (of_property_read_u32(dn, "dma-ranges", &tmp) == 0) {
-		dev_err(&pdev->dev, "cannot yet handle dma-ranges\n");
-		return -EINVAL;
-	}
-
 	data = of_id->data;
 	pcie->reg_offsets = data->offsets;
 	pcie->reg_field_info = data->reg_field_info;
@@ -1059,6 +1176,10 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	ret = brcm_pcie_parse_map_dma_ranges(pcie);
+	if (ret)
+		return ret;
+
 	ret = clk_prepare_enable(pcie->clk);
 	if (ret) {
 		dev_err(&pdev->dev, "could not enable clock\n");
drivers/pci/host/pcie-brcmstb.h new file +22 -0
new file mode 100644
index 0000000..d7233f0
@@ -0,0 +1,22 @@
+#ifndef __BRCMSTB_PCI_H
+#define __BRCMSTB_PCI_H
+/*
+ * Copyright (C) 2015 - 2017 Broadcom
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+int brcm_register_notifier(void);
+int brcm_unregister_notifier(void);
+
+extern struct of_pci_range *dma_ranges;
+extern int num_dma_ranges;
+
+#endif /* __BRCMSTB_PCI_H */
Signature · 1 line
1.9.0.138.g2de3478
#19 lore raw

PATCH v3 5/8 PCI/MSI: Enable PCI_MSI_IRQ_DOMAIN support for MIPS

In reply to Jim Quinlan

Add MIPS as an arch that supports PCI_MSI_IRQ_DOMAIN and add generation of msi.h in the MIPS arch.

---
 arch/mips/include/asm/Kbuild | 1 +
 drivers/pci/Kconfig          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/mips/include/asm/Kbuild +1 -0
index 7c8aab2..8c78ba7 100644
@@ -9,6 +9,7 @@ generic-y += irq_work.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
+generic-y += msi.h
 generic-y += parport.h
 generic-y += percpu.h
 generic-y += preempt.h
drivers/pci/Kconfig +1 -1
index c32a77f..927c335 100644
@@ -25,7 +25,7 @@ config PCI_MSI
 	   If you don't know what to do here, say Y.
 
 config PCI_MSI_IRQ_DOMAIN
-	def_bool ARC || ARM || ARM64 || X86
+	def_bool ARC || ARM || ARM64 || MIPS || X86
 	depends on PCI_MSI
 	select GENERIC_MSI_IRQ_DOMAIN
 
Signature · 1 line
1.9.0.138.g2de3478
#20 lore raw

PATCH v3 6/8 PCI: brcmstb: Add MSI capability

In reply to Jim Quinlan

This commit adds MSI to the Broadcom STB PCIe host controller. It does not add MSIX since that functionality is not in the HW. The MSI controller is physically located within the PCIe block, however, there is no reason why the MSI controller could not be moved elsewhere in the future.

Since the internal Brcmstb MSI controller is intertwined with the PCIe controller, it is not its own platform device but rather part of the PCIe platform device.

---
 drivers/pci/host/pcie-brcmstb.c | 372 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 359 insertions(+), 13 deletions(-)
drivers/pci/host/pcie-brcmstb.c +359 -13
index 5f4c6aa..89bad31 100644
@@ -11,6 +11,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/bitops.h>
 #include <linux/clk.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
@@ -18,15 +19,16 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/log2.h>
 #include <linux/module.h>
+#include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_pci.h>
-#include <linux/of_pci.h>
 #include <linux/of_platform.h>
 #include <linux/pci.h>
 #include <linux/printk.h>
@@ -56,6 +58,9 @@
 #define PCIE_MISC_RC_BAR2_CONFIG_LO			0x4034
 #define PCIE_MISC_RC_BAR2_CONFIG_HI			0x4038
 #define PCIE_MISC_RC_BAR3_CONFIG_LO			0x403c
+#define PCIE_MISC_MSI_BAR_CONFIG_LO			0x4044
+#define PCIE_MISC_MSI_BAR_CONFIG_HI			0x4048
+#define PCIE_MISC_MSI_DATA_CONFIG			0x404c
 #define PCIE_MISC_PCIE_CTRL				0x4064
 #define PCIE_MISC_PCIE_STATUS				0x4068
 #define PCIE_MISC_REVISION				0x406c
@@ -64,6 +69,7 @@
 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI		0x4084
 #define PCIE_MISC_HARD_PCIE_HARD_DEBUG			0x4204
 #define PCIE_INTR2_CPU_BASE				0x4300
+#define PCIE_MSI_INTR2_BASE				0x4500
 
 /*
  * Broadcom Settop Box PCIE Register Field shift and mask info. The
@@ -124,6 +130,8 @@
 
 #define BRCM_NUM_PCIE_OUT_WINS		0x4
 #define BRCM_MAX_SCB			0x4
+#define BRCM_INT_PCI_MSI_NR		32
+#define BRCM_PCIE_HW_REV_33		0x0303
 
 #define BRCM_MSI_TARGET_ADDR_LT_4GB	0x0fffffffcULL
 #define BRCM_MSI_TARGET_ADDR_GT_4GB	0xffffffffcULL
@@ -212,6 +220,30 @@ struct brcm_window {
 	dma_addr_t size;
 };
 
+struct brcm_msi {
+	struct irq_domain *msi_domain;
+	struct irq_domain *inner_domain;
+	struct mutex lock; /* guards the alloc/free operations */
+	u64 target_addr;
+	int irq;
+	/* intr_base is the base pointer for interrupt status/set/clr regs */
+	void __iomem *intr_base;
+	/* intr_legacy_mask indicates how many bits are MSI interrupts */
+	u32 intr_legacy_mask;
+	/*
+	 * intr_legacy_offset indicates bit position of MSI_01. It is
+	 * to map the register bit position to a hwirq that starts at 0.
+	 */
+	u32 intr_legacy_offset;
+	/* used indicates which MSI interrupts have been alloc'd */
+	unsigned long used;
+
+	void __iomem *base;
+	struct device *dev;
+	struct device_node *dn;
+	unsigned int rev;
+};
+
 /* Internal PCIe Host Controller Information.*/
 struct brcm_pcie {
 	struct list_head	list;
@@ -227,7 +259,10 @@ struct brcm_pcie {
 	int			num_out_wins;
 	bool			ssc;
 	int			gen;
+	u64			msi_target_addr;
 	struct brcm_window	out_wins[BRCM_NUM_PCIE_OUT_WINS];
+	struct brcm_msi		*msi;
+	bool			msi_internal;
 	unsigned int		rev;
 	const int		*reg_offsets;
 	const int		*reg_field_info;
@@ -240,6 +275,13 @@ struct pcie_cfg_data {
 	const enum pcie_type type;
 };
 
+struct brcm_info {
+	int rev;
+	u64 msi_target_addr;
+	void __iomem *base;
+	struct brcm_msi *msi;
+};
+
 static const int pcie_reg_field_info[] = {
 	[RGR1_SW_INIT_1_INIT_MASK] = 0x2,
 	[RGR1_SW_INIT_1_INIT_SHIFT] = 0x1,
@@ -546,6 +588,264 @@ static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie,
 	}
 }
 
+static struct irq_chip brcm_msi_irq_chip = {
+	.name = "Brcm_MSI",
+	.irq_mask = pci_msi_mask_irq,
+	.irq_unmask = pci_msi_unmask_irq,
+};
+
+static struct msi_domain_info brcm_msi_domain_info = {
+	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
+		   MSI_FLAG_PCI_MSIX),
+	.chip	= &brcm_msi_irq_chip,
+};
+
+static void brcm_pcie_msi_isr(struct irq_desc *desc)
+{
+	struct irq_chip *chip = irq_desc_get_chip(desc);
+	struct brcm_msi *msi;
+	unsigned long status, virq;
+	u32 mask, bit, hwirq;
+	struct device *dev;
+
+	chained_irq_enter(chip, desc);
+	msi = irq_desc_get_handler_data(desc);
+	mask = msi->intr_legacy_mask;
+	dev = msi->dev;
+
+	while ((status = bcm_readl(msi->intr_base + STATUS) & mask)) {
+		for_each_set_bit(bit, &status, BRCM_INT_PCI_MSI_NR) {
+			/* clear the interrupt */
+			bcm_writel(1 << bit, msi->intr_base + CLR);
+
+			/* Account for legacy interrupt offset */
+			hwirq = bit - msi->intr_legacy_offset;
+
+			virq = irq_find_mapping(msi->inner_domain, hwirq);
+			if (virq) {
+				if (msi->used & (1 << hwirq))
+					generic_handle_irq(virq);
+				else
+					dev_info(dev, "unhandled MSI %d\n",
+						 hwirq);
+			} else {
+				/* Unknown MSI, just clear it */
+				dev_dbg(dev, "unexpected MSI\n");
+			}
+		}
+	}
+	chained_irq_exit(chip, desc);
+}
+
+static void brcm_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
+{
+	struct brcm_msi *msi = irq_data_get_irq_chip_data(data);
+	u32 temp;
+
+	msg->address_lo = lower_32_bits(msi->target_addr);
+	msg->address_hi = upper_32_bits(msi->target_addr);
+	temp = bcm_readl(msi->base + PCIE_MISC_MSI_DATA_CONFIG);
+	msg->data = ((temp >> 16) & (temp & 0xffff)) | data->hwirq;
+}
+
+static int brcm_msi_set_affinity(struct irq_data *irq_data,
+				 const struct cpumask *mask, bool force)
+{
+	return -EINVAL;
+}
+
+static struct irq_chip brcm_msi_bottom_irq_chip = {
+	.name			= "Brcm_MSI",
+	.irq_compose_msi_msg	= brcm_compose_msi_msg,
+	.irq_set_affinity	= brcm_msi_set_affinity,
+};
+
+static int brcm_msi_alloc(struct brcm_msi *msi)
+{
+	int bit, hwirq;
+
+	mutex_lock(&msi->lock);
+	bit = ~msi->used ? ffz(msi->used) : -1;
+
+	if (bit >= 0 && bit < BRCM_INT_PCI_MSI_NR) {
+		msi->used |= (1 << bit);
+		hwirq = bit - msi->intr_legacy_offset;
+	} else {
+		hwirq = -ENOSPC;
+	}
+
+	mutex_unlock(&msi->lock);
+	return hwirq;
+}
+
+static void brcm_msi_free(struct brcm_msi *msi, unsigned long hwirq)
+{
+	mutex_lock(&msi->lock);
+	msi->used &= ~(1 << (hwirq + msi->intr_legacy_offset));
+	mutex_unlock(&msi->lock);
+}
+
+static int brcm_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
+				 unsigned int nr_irqs, void *args)
+{
+	struct brcm_msi *msi = domain->host_data;
+	int hwirq;
+
+	hwirq = brcm_msi_alloc(msi);
+
+	if (hwirq < 0)
+		return hwirq;
+
+	irq_domain_set_info(domain, virq, (irq_hw_number_t)hwirq,
+			    &brcm_msi_bottom_irq_chip, domain->host_data,
+			    handle_simple_irq, NULL, NULL);
+	return 0;
+}
+
+static void brcm_irq_domain_free(struct irq_domain *domain,
+				 unsigned int virq, unsigned int nr_irqs)
+{
+	struct irq_data *d = irq_domain_get_irq_data(domain, virq);
+	struct brcm_msi *msi = irq_data_get_irq_chip_data(d);
+
+	brcm_msi_free(msi, d->hwirq);
+}
+
+void brcm_msi_set_regs(struct brcm_msi *msi)
+{
+	u32 data_val, msi_lo, msi_hi;
+
+	if (msi->rev >= BRCM_PCIE_HW_REV_33) {
+		/*
+		 * ffe0 -- least sig 5 bits are 0 indicating 32 msgs
+		 * 6540 -- this is our arbitrary unique data value
+		 */
+		data_val = 0xffe06540;
+	} else {
+		/*
+		 * fff8 -- least sig 3 bits are 0 indicating 8 msgs
+		 * 6540 -- this is our arbitrary unique data value
+		 */
+		data_val = 0xfff86540;
+	}
+
+	/*
+	 * Make sure we are not masking MSIs.  Note that MSIs can be masked,
+	 * but that occurs on the PCIe EP device
+	 */
+	bcm_writel(0xffffffff & msi->intr_legacy_mask,
+		   msi->intr_base + MASK_CLR);
+
+	msi_lo = lower_32_bits(msi->target_addr);
+	msi_hi = upper_32_bits(msi->target_addr);
+	/*
+	 * The 0 bit of PCIE_MISC_MSI_BAR_CONFIG_LO is repurposed to MSI
+	 * enable, which we set to 1.
+	 */
+	bcm_writel(msi_lo | 1, msi->base + PCIE_MISC_MSI_BAR_CONFIG_LO);
+	bcm_writel(msi_hi, msi->base + PCIE_MISC_MSI_BAR_CONFIG_HI);
+	bcm_writel(data_val, msi->base + PCIE_MISC_MSI_DATA_CONFIG);
+}
+
+static const struct irq_domain_ops msi_domain_ops = {
+	.alloc	= brcm_irq_domain_alloc,
+	.free	= brcm_irq_domain_free,
+};
+
+static int brcm_allocate_domains(struct brcm_msi *msi)
+{
+	struct fwnode_handle *fwnode = of_node_to_fwnode(msi->dn);
+	struct device *dev = msi->dev;
+
+	msi->inner_domain = irq_domain_add_linear(NULL, BRCM_INT_PCI_MSI_NR,
+						  &msi_domain_ops, msi);
+	if (!msi->inner_domain) {
+		dev_err(dev, "failed to create IRQ domain\n");
+		return -ENOMEM;
+	}
+
+	msi->msi_domain = pci_msi_create_irq_domain(fwnode,
+						    &brcm_msi_domain_info,
+						    msi->inner_domain);
+	if (!msi->msi_domain) {
+		dev_err(dev, "failed to create MSI domain\n");
+		irq_domain_remove(msi->inner_domain);
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+static void brcm_free_domains(struct brcm_msi *msi)
+{
+	irq_domain_remove(msi->msi_domain);
+	irq_domain_remove(msi->inner_domain);
+}
+
+void brcm_msi_remove(struct brcm_msi *msi)
+{
+	if (!msi)
+		return;
+	irq_set_chained_handler(msi->irq, NULL);
+	irq_set_handler_data(msi->irq, NULL);
+	brcm_free_domains(msi);
+}
+
+int brcm_msi_probe(struct platform_device *pdev, struct brcm_info *info)
+{
+	struct brcm_msi *msi;
+	int irq, ret;
+
+	irq = irq_of_parse_and_map(pdev->dev.of_node, 1);
+	if (irq <= 0) {
+		dev_err(&pdev->dev, "cannot map msi intr\n");
+		return -ENODEV;
+	}
+
+	msi = devm_kzalloc(&pdev->dev, sizeof(struct brcm_msi), GFP_KERNEL);
+	if (!msi)
+		return -ENOMEM;
+
+	msi->dev = &pdev->dev;
+	msi->base = info->base;
+	msi->rev =  info->rev;
+	msi->dn = pdev->dev.of_node;
+	msi->target_addr = info->msi_target_addr;
+	msi->irq = irq;
+
+	ret = brcm_allocate_domains(msi);
+	if (ret)
+		return ret;
+
+	irq_set_chained_handler_and_data(msi->irq, brcm_pcie_msi_isr, msi);
+
+	if (msi->rev >= BRCM_PCIE_HW_REV_33) {
+		msi->intr_base = msi->base + PCIE_MSI_INTR2_BASE;
+		/*
+		 * This version of PCIe hw has only 32 intr bits
+		 * starting at bit position 0.
+		 */
+		msi->intr_legacy_mask = 0xffffffff;
+		msi->intr_legacy_offset = 0x0;
+		msi->used = 0x0;
+
+	} else {
+		msi->intr_base = msi->base + PCIE_INTR2_CPU_BASE;
+		/*
+		 * This version of PCIe hw has only 8 intr bits starting
+		 * at bit position 24.
+		 */
+		msi->intr_legacy_mask = 0xff000000;
+		msi->intr_legacy_offset = 24;
+		msi->used = 0x00ffffff;
+	}
+
+	brcm_msi_set_regs(msi);
+	info->msi = msi;
+
+	return 0;
+}
+
 /* Configuration space read/write support */
 static int cfg_index(int busnr, int devfn, int reg)
 {
@@ -812,6 +1112,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	int i, j, ret, limit;
 	u16 nlw, cls, lnksta;
 	bool ssc_good = false;
+	u64 msi_target_addr;
 
 	/* reset the bridge and the endpoint device */
 	/* field: PCIE_BRIDGE_SW_INIT = 1 */
@@ -855,14 +1156,17 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	 * The PCIe host controller by design must set the inbound
 	 * viewport to be a contiguous arrangement of all of the
 	 * system's memory.  In addition, its size mut be a power of
-	 * two.  To further complicate matters, the viewport must
-	 * start on a pcie-address that is aligned on a multiple of its
-	 * size.  If a portion of the viewport does not represent
-	 * system memory -- e.g. 3GB of memory requires a 4GB viewport
-	 * -- we can map the outbound memory in or after 3GB and even
-	 * though the viewport will overlap the outbound memory the
-	 * controller will know to send outbound memory downstream and
-	 * everything else upstream.
+	 * two.  Further, the MSI target address must NOT be placed
+	 * inside this region, as the decoding logic will consider its
+	 * address to be inbound memory traffic.  To further
+	 * complicate matters, the viewport must start on a
+	 * pcie-address that is aligned on a multiple of its size.
+	 * If a portion of the viewport does not represent system
+	 * memory -- e.g. 3GB of memory requires a 4GB viewport --
+	 * we can map the outbound memory in or after 3GB and even
+	 * though the viewport will overlap the outbound memory
+	 * the controller will know to send outbound memory downstream
+	 * and everything else upstream.
 	 */
 	rc_bar2_size = roundup_pow_of_two_64(total_mem_size);
 
@@ -875,7 +1179,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	if (dma_ranges) {
 		/*
 		 * The best-case scenario is to place the inbound
-		 * region in the first 4GB of pci-space, as some
+		 * region in the first 4GB of pcie-space, as some
 		 * legacy devices can only address 32bits.
 		 * We would also like to put the MSI under 4GB
 		 * as well, since some devices require a 32bit
@@ -884,6 +1188,14 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 		if (total_mem_size <= 0xc0000000ULL &&
 		    rc_bar2_size <= 0x100000000ULL) {
 			rc_bar2_offset = 0;
+			/* If the viewport is less then 4GB we can fit
+			 * the MSI target address under 4GB. Otherwise
+			 * put it right below 64GB.
+			 */
+			msi_target_addr =
+				(rc_bar2_size == 0x100000000ULL)
+				? BRCM_MSI_TARGET_ADDR_GT_4GB
+				: BRCM_MSI_TARGET_ADDR_LT_4GB;
 		} else {
 			/*
 			 * The system memory is 4GB or larger so we
@@ -893,8 +1205,12 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 			 * start it at the 1x multiple of its size
 			 */
 			rc_bar2_offset = rc_bar2_size;
-		}
 
+			/* Since we are starting the viewport@4GB or
+			 * higher, put the MSI target address below 4GB
+			 */
+			msi_target_addr = BRCM_MSI_TARGET_ADDR_LT_4GB;
+		}
 	} else {
 		/*
 		 * Set simple configuration based on memory sizes
@@ -902,7 +1218,12 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 		 * and set the MSI target address accordingly.
 		 */
 		rc_bar2_offset = 0;
+
+		msi_target_addr = (rc_bar2_size >= 0x100000000ULL)
+			? BRCM_MSI_TARGET_ADDR_GT_4GB
+			: BRCM_MSI_TARGET_ADDR_LT_4GB;
 	}
+	pcie->msi_target_addr = msi_target_addr;
 
 	tmp = lower_32_bits(rc_bar2_offset);
 	tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
@@ -1076,6 +1397,9 @@ static int brcm_pcie_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	if (pcie->msi && pcie->msi_internal)
+		brcm_msi_set_regs(pcie->msi);
+
 	pcie->suspended = false;
 
 	return 0;
@@ -1083,6 +1407,7 @@ static int brcm_pcie_resume(struct device *dev)
 
 static void _brcm_pcie_remove(struct brcm_pcie *pcie)
 {
+	brcm_msi_remove(pcie->msi);
 	turn_off(pcie);
 	clk_disable_unprepare(pcie->clk);
 	clk_put(pcie->clk);
@@ -1111,7 +1436,7 @@ static int brcm_pcie_remove(struct platform_device *pdev)
 
 static int brcm_pcie_probe(struct platform_device *pdev)
 {
-	struct device_node *dn = pdev->dev.of_node;
+	struct device_node *dn = pdev->dev.of_node, *msi_dn;
 	const struct of_device_id *of_id;
 	const struct pcie_cfg_data *data;
 	int ret;
@@ -1194,6 +1519,28 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		goto fail;
 
+	msi_dn = of_parse_phandle(pcie->dn, "msi-parent", 0);
+	/* Use the internal MSI if no msi-parent property */
+	if (!msi_dn)
+		msi_dn = pcie->dn;
+
+	if (pci_msi_enabled() && msi_dn == pcie->dn) {
+		struct brcm_info info;
+
+		info.rev = pcie->rev;
+		info.msi_target_addr = pcie->msi_target_addr;
+		info.base = pcie->base;
+
+		ret = brcm_msi_probe(pdev, &info);
+		if (ret)
+			dev_err(pcie->dev,
+				"probe of internal MSI failed: %d)", ret);
+		else
+			pcie->msi_internal = true;
+
+		pcie->msi = info.msi;
+	}
+
 	list_splice_init(&pcie->resources, &bridge->windows);
 	bridge->dev.parent = &pdev->dev;
 	bridge->busnr = 0;
@@ -1216,7 +1563,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	pcie->root_bus = bridge->bus;
 
 	return 0;
-
 fail:
 	_brcm_pcie_remove(pcie);
 	return ret;
Signature · 1 line
1.9.0.138.g2de3478
#21 lore raw

Re: [PATCH v3 6/8] PCI: brcmstb: Add MSI capability

Quoted 88 lines · Jim Quinlan

This commit adds MSI to the Broadcom STB PCIe host controller. It does not add MSIX since that functionality is not in the HW. The MSI controller is physically located within the PCIe block, however, there is no reason why the MSI controller could not be moved elsewhere in the future.

Since the internal Brcmstb MSI controller is intertwined with the PCIe controller, it is not its own platform device but rather part of the PCIe platform device.

---
 drivers/pci/host/pcie-brcmstb.c | 372 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 359 insertions(+), 13 deletions(-)
drivers/pci/host/pcie-brcmstb.c +21 -1
index 5f4c6aa..89bad31 100644
@@ -11,6 +11,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/bitops.h>
 #include <linux/clk.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
@@ -18,15 +19,16 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/log2.h>
 #include <linux/module.h>
+#include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_pci.h>
-#include <linux/of_pci.h>
 #include <linux/of_platform.h>
 #include <linux/pci.h>
 #include <linux/printk.h>
@@ -56,6 +58,9 @@
 #define PCIE_MISC_RC_BAR2_CONFIG_LO			0x4034
 #define PCIE_MISC_RC_BAR2_CONFIG_HI			0x4038
 #define PCIE_MISC_RC_BAR3_CONFIG_LO			0x403c
+#define PCIE_MISC_MSI_BAR_CONFIG_LO			0x4044
+#define PCIE_MISC_MSI_BAR_CONFIG_HI			0x4048
+#define PCIE_MISC_MSI_DATA_CONFIG			0x404c
 #define PCIE_MISC_PCIE_CTRL				0x4064
 #define PCIE_MISC_PCIE_STATUS				0x4068
 #define PCIE_MISC_REVISION				0x406c
@@ -64,6 +69,7 @@
 #define PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI		0x4084
 #define PCIE_MISC_HARD_PCIE_HARD_DEBUG			0x4204
 #define PCIE_INTR2_CPU_BASE				0x4300
+#define PCIE_MSI_INTR2_BASE				0x4500
 
 /*
  * Broadcom Settop Box PCIE Register Field shift and mask info. The
@@ -124,6 +130,8 @@
 
 #define BRCM_NUM_PCIE_OUT_WINS		0x4
 #define BRCM_MAX_SCB			0x4
+#define BRCM_INT_PCI_MSI_NR		32
+#define BRCM_PCIE_HW_REV_33		0x0303
 
 #define BRCM_MSI_TARGET_ADDR_LT_4GB	0x0fffffffcULL
 #define BRCM_MSI_TARGET_ADDR_GT_4GB	0xffffffffcULL
@@ -212,6 +220,30 @@ struct brcm_window {
 	dma_addr_t size;
 };
 
+struct brcm_msi {
+	struct irq_domain *msi_domain;
+	struct irq_domain *inner_domain;
+	struct mutex lock; /* guards the alloc/free operations */
+	u64 target_addr;
+	int irq;
+	/* intr_base is the base pointer for interrupt status/set/clr regs */
+	void __iomem *intr_base;
+	/* intr_legacy_mask indicates how many bits are MSI interrupts */
+	u32 intr_legacy_mask;
+	/*
+	 * intr_legacy_offset indicates bit position of MSI_01. It is

drivers/pci/host/pcie-brcmstb.c struct brcm_window { · line 244

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c +10 -0
+	 * to map the register bit position to a hwirq that starts at 0.
+	 */
+	u32 intr_legacy_offset;
+	/* used indicates which MSI interrupts have been alloc'd */
+	unsigned long used;
+
+	void __iomem *base;
+	struct device *dev;
+	struct device_node *dn;
+	unsigned int rev;

I think you aligned the structure elements for brcm_pcie, so do the same here.

Quoted 17 lines
drivers/pci/host/pcie-brcmstb.c +5 -0
+};
+
 /* Internal PCIe Host Controller Information.*/
 struct brcm_pcie {
 	struct list_head	list;
@@ -227,7 +259,10 @@ struct brcm_pcie {
 	int			num_out_wins;
 	bool			ssc;
 	int			gen;
+	u64			msi_target_addr;
 	struct brcm_window	out_wins[BRCM_NUM_PCIE_OUT_WINS];
+	struct brcm_msi		*msi;
+	bool			msi_internal;
 	unsigned int		rev;
 	const int		*reg_offsets;
 	const int		*reg_field_info;

drivers/pci/host/pcie-brcmstb.c struct pcie_cfg_data { · line 282

Quoted 8 lines
drivers/pci/host/pcie-brcmstb.c +5 -0
@@ -240,6 +275,13 @@ struct pcie_cfg_data {
 	const enum pcie_type type;
 };
 
+struct brcm_info {
+	int rev;
+	u64 msi_target_addr;
+	void __iomem *base;
+	struct brcm_msi *msi;

And here.

Quoted 123 lines
drivers/pci/host/pcie-brcmstb.c +116 -0
+};
+
 static const int pcie_reg_field_info[] = {
 	[RGR1_SW_INIT_1_INIT_MASK] = 0x2,
 	[RGR1_SW_INIT_1_INIT_SHIFT] = 0x1,
@@ -546,6 +588,264 @@ static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie,
 	}
 }
 
+static struct irq_chip brcm_msi_irq_chip = {
+	.name = "Brcm_MSI",
+	.irq_mask = pci_msi_mask_irq,
+	.irq_unmask = pci_msi_unmask_irq,
+};
+
+static struct msi_domain_info brcm_msi_domain_info = {
+	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
+		   MSI_FLAG_PCI_MSIX),
+	.chip	= &brcm_msi_irq_chip,
+};
+
+static void brcm_pcie_msi_isr(struct irq_desc *desc)
+{
+	struct irq_chip *chip = irq_desc_get_chip(desc);
+	struct brcm_msi *msi;
+	unsigned long status, virq;
+	u32 mask, bit, hwirq;
+	struct device *dev;
+
+	chained_irq_enter(chip, desc);
+	msi = irq_desc_get_handler_data(desc);
+	mask = msi->intr_legacy_mask;
+	dev = msi->dev;
+
+	while ((status = bcm_readl(msi->intr_base + STATUS) & mask)) {
+		for_each_set_bit(bit, &status, BRCM_INT_PCI_MSI_NR) {
+			/* clear the interrupt */
+			bcm_writel(1 << bit, msi->intr_base + CLR);
+
+			/* Account for legacy interrupt offset */
+			hwirq = bit - msi->intr_legacy_offset;
+
+			virq = irq_find_mapping(msi->inner_domain, hwirq);
+			if (virq) {
+				if (msi->used & (1 << hwirq))
+					generic_handle_irq(virq);
+				else
+					dev_info(dev, "unhandled MSI %d\n",
+						 hwirq);
+			} else {
+				/* Unknown MSI, just clear it */
+				dev_dbg(dev, "unexpected MSI\n");
+			}
+		}
+	}
+	chained_irq_exit(chip, desc);
+}
+
+static void brcm_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
+{
+	struct brcm_msi *msi = irq_data_get_irq_chip_data(data);
+	u32 temp;
+
+	msg->address_lo = lower_32_bits(msi->target_addr);
+	msg->address_hi = upper_32_bits(msi->target_addr);
+	temp = bcm_readl(msi->base + PCIE_MISC_MSI_DATA_CONFIG);
+	msg->data = ((temp >> 16) & (temp & 0xffff)) | data->hwirq;
+}
+
+static int brcm_msi_set_affinity(struct irq_data *irq_data,
+				 const struct cpumask *mask, bool force)
+{
+	return -EINVAL;
+}
+
+static struct irq_chip brcm_msi_bottom_irq_chip = {
+	.name			= "Brcm_MSI",
+	.irq_compose_msi_msg	= brcm_compose_msi_msg,
+	.irq_set_affinity	= brcm_msi_set_affinity,
+};
+
+static int brcm_msi_alloc(struct brcm_msi *msi)
+{
+	int bit, hwirq;
+
+	mutex_lock(&msi->lock);
+	bit = ~msi->used ? ffz(msi->used) : -1;
+
+	if (bit >= 0 && bit < BRCM_INT_PCI_MSI_NR) {
+		msi->used |= (1 << bit);
+		hwirq = bit - msi->intr_legacy_offset;
+	} else {
+		hwirq = -ENOSPC;
+	}
+
+	mutex_unlock(&msi->lock);
+	return hwirq;
+}
+
+static void brcm_msi_free(struct brcm_msi *msi, unsigned long hwirq)
+{
+	mutex_lock(&msi->lock);
+	msi->used &= ~(1 << (hwirq + msi->intr_legacy_offset));
+	mutex_unlock(&msi->lock);
+}
+
+static int brcm_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
+				 unsigned int nr_irqs, void *args)
+{
+	struct brcm_msi *msi = domain->host_data;
+	int hwirq;
+
+	hwirq = brcm_msi_alloc(msi);
+
+	if (hwirq < 0)
+		return hwirq;
+
+	irq_domain_set_info(domain, virq, (irq_hw_number_t)hwirq,
+			    &brcm_msi_bottom_irq_chip, domain->host_data,
+			    handle_simple_irq, NULL, NULL);
+	return 0;
+}
+

drivers/pci/host/pcie-brcmstb.c static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie, · line 714

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c +10 -0
+static void brcm_irq_domain_free(struct irq_domain *domain,
+				 unsigned int virq, unsigned int nr_irqs)
+{
+	struct irq_data *d = irq_domain_get_irq_data(domain, virq);
+	struct brcm_msi *msi = irq_data_get_irq_chip_data(d);
+
+	brcm_msi_free(msi, d->hwirq);
+}
+
+void brcm_msi_set_regs(struct brcm_msi *msi)

Static?

Quoted 61 lines
drivers/pci/host/pcie-brcmstb.c +61 -0
+{
+	u32 data_val, msi_lo, msi_hi;
+
+	if (msi->rev >= BRCM_PCIE_HW_REV_33) {
+		/*
+		 * ffe0 -- least sig 5 bits are 0 indicating 32 msgs
+		 * 6540 -- this is our arbitrary unique data value
+		 */
+		data_val = 0xffe06540;
+	} else {
+		/*
+		 * fff8 -- least sig 3 bits are 0 indicating 8 msgs
+		 * 6540 -- this is our arbitrary unique data value
+		 */
+		data_val = 0xfff86540;
+	}
+
+	/*
+	 * Make sure we are not masking MSIs.  Note that MSIs can be masked,
+	 * but that occurs on the PCIe EP device
+	 */
+	bcm_writel(0xffffffff & msi->intr_legacy_mask,
+		   msi->intr_base + MASK_CLR);
+
+	msi_lo = lower_32_bits(msi->target_addr);
+	msi_hi = upper_32_bits(msi->target_addr);
+	/*
+	 * The 0 bit of PCIE_MISC_MSI_BAR_CONFIG_LO is repurposed to MSI
+	 * enable, which we set to 1.
+	 */
+	bcm_writel(msi_lo | 1, msi->base + PCIE_MISC_MSI_BAR_CONFIG_LO);
+	bcm_writel(msi_hi, msi->base + PCIE_MISC_MSI_BAR_CONFIG_HI);
+	bcm_writel(data_val, msi->base + PCIE_MISC_MSI_DATA_CONFIG);
+}
+
+static const struct irq_domain_ops msi_domain_ops = {
+	.alloc	= brcm_irq_domain_alloc,
+	.free	= brcm_irq_domain_free,
+};
+
+static int brcm_allocate_domains(struct brcm_msi *msi)
+{
+	struct fwnode_handle *fwnode = of_node_to_fwnode(msi->dn);
+	struct device *dev = msi->dev;
+
+	msi->inner_domain = irq_domain_add_linear(NULL, BRCM_INT_PCI_MSI_NR,
+						  &msi_domain_ops, msi);
+	if (!msi->inner_domain) {
+		dev_err(dev, "failed to create IRQ domain\n");
+		return -ENOMEM;
+	}
+
+	msi->msi_domain = pci_msi_create_irq_domain(fwnode,
+						    &brcm_msi_domain_info,
+						    msi->inner_domain);
+	if (!msi->msi_domain) {
+		dev_err(dev, "failed to create MSI domain\n");
+		irq_domain_remove(msi->inner_domain);
+		return -ENOMEM;
+	}
+

drivers/pci/host/pcie-brcmstb.c static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie, · line 785

Quoted 10 lines
drivers/pci/host/pcie-brcmstb.c +10 -0
+	return 0;
+}
+
+static void brcm_free_domains(struct brcm_msi *msi)
+{
+	irq_domain_remove(msi->msi_domain);
+	irq_domain_remove(msi->inner_domain);
+}
+
+void brcm_msi_remove(struct brcm_msi *msi)

Static?

drivers/pci/host/pcie-brcmstb.c static void brcm_pcie_set_outbound_win(struct brcm_pcie *pcie, · line 794

Quoted 9 lines
drivers/pci/host/pcie-brcmstb.c +9 -0
+{
+	if (!msi)
+		return;
+	irq_set_chained_handler(msi->irq, NULL);
+	irq_set_handler_data(msi->irq, NULL);
+	brcm_free_domains(msi);
+}
+
+int brcm_msi_probe(struct platform_device *pdev, struct brcm_info *info)

Static?

I don't think we're probing a separate device here, so this isn't quite the right name. I see it looks like you're using a pattern from altera or xgene. But those have some weird structure where they have extra of_match_tables, and you don't.

Quoted 209 lines
drivers/pci/host/pcie-brcmstb.c +112 -12
+{
+	struct brcm_msi *msi;
+	int irq, ret;
+
+	irq = irq_of_parse_and_map(pdev->dev.of_node, 1);
+	if (irq <= 0) {
+		dev_err(&pdev->dev, "cannot map msi intr\n");
+		return -ENODEV;
+	}
+
+	msi = devm_kzalloc(&pdev->dev, sizeof(struct brcm_msi), GFP_KERNEL);
+	if (!msi)
+		return -ENOMEM;
+
+	msi->dev = &pdev->dev;
+	msi->base = info->base;
+	msi->rev =  info->rev;
+	msi->dn = pdev->dev.of_node;
+	msi->target_addr = info->msi_target_addr;
+	msi->irq = irq;
+
+	ret = brcm_allocate_domains(msi);
+	if (ret)
+		return ret;
+
+	irq_set_chained_handler_and_data(msi->irq, brcm_pcie_msi_isr, msi);
+
+	if (msi->rev >= BRCM_PCIE_HW_REV_33) {
+		msi->intr_base = msi->base + PCIE_MSI_INTR2_BASE;
+		/*
+		 * This version of PCIe hw has only 32 intr bits
+		 * starting at bit position 0.
+		 */
+		msi->intr_legacy_mask = 0xffffffff;
+		msi->intr_legacy_offset = 0x0;
+		msi->used = 0x0;
+
+	} else {
+		msi->intr_base = msi->base + PCIE_INTR2_CPU_BASE;
+		/*
+		 * This version of PCIe hw has only 8 intr bits starting
+		 * at bit position 24.
+		 */
+		msi->intr_legacy_mask = 0xff000000;
+		msi->intr_legacy_offset = 24;
+		msi->used = 0x00ffffff;
+	}
+
+	brcm_msi_set_regs(msi);
+	info->msi = msi;
+
+	return 0;
+}
+
 /* Configuration space read/write support */
 static int cfg_index(int busnr, int devfn, int reg)
 {
@@ -812,6 +1112,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	int i, j, ret, limit;
 	u16 nlw, cls, lnksta;
 	bool ssc_good = false;
+	u64 msi_target_addr;
 
 	/* reset the bridge and the endpoint device */
 	/* field: PCIE_BRIDGE_SW_INIT = 1 */
@@ -855,14 +1156,17 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	 * The PCIe host controller by design must set the inbound
 	 * viewport to be a contiguous arrangement of all of the
 	 * system's memory.  In addition, its size mut be a power of
-	 * two.  To further complicate matters, the viewport must
-	 * start on a pcie-address that is aligned on a multiple of its
-	 * size.  If a portion of the viewport does not represent
-	 * system memory -- e.g. 3GB of memory requires a 4GB viewport
-	 * -- we can map the outbound memory in or after 3GB and even
-	 * though the viewport will overlap the outbound memory the
-	 * controller will know to send outbound memory downstream and
-	 * everything else upstream.
+	 * two.  Further, the MSI target address must NOT be placed
+	 * inside this region, as the decoding logic will consider its
+	 * address to be inbound memory traffic.  To further
+	 * complicate matters, the viewport must start on a
+	 * pcie-address that is aligned on a multiple of its size.
+	 * If a portion of the viewport does not represent system
+	 * memory -- e.g. 3GB of memory requires a 4GB viewport --
+	 * we can map the outbound memory in or after 3GB and even
+	 * though the viewport will overlap the outbound memory
+	 * the controller will know to send outbound memory downstream
+	 * and everything else upstream.
 	 */
 	rc_bar2_size = roundup_pow_of_two_64(total_mem_size);
 
@@ -875,7 +1179,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 	if (dma_ranges) {
 		/*
 		 * The best-case scenario is to place the inbound
-		 * region in the first 4GB of pci-space, as some
+		 * region in the first 4GB of pcie-space, as some
 		 * legacy devices can only address 32bits.
 		 * We would also like to put the MSI under 4GB
 		 * as well, since some devices require a 32bit
@@ -884,6 +1188,14 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 		if (total_mem_size <= 0xc0000000ULL &&
 		    rc_bar2_size <= 0x100000000ULL) {
 			rc_bar2_offset = 0;
+			/* If the viewport is less then 4GB we can fit
+			 * the MSI target address under 4GB. Otherwise
+			 * put it right below 64GB.
+			 */
+			msi_target_addr =
+				(rc_bar2_size == 0x100000000ULL)
+				? BRCM_MSI_TARGET_ADDR_GT_4GB
+				: BRCM_MSI_TARGET_ADDR_LT_4GB;
 		} else {
 			/*
 			 * The system memory is 4GB or larger so we
@@ -893,8 +1205,12 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 			 * start it at the 1x multiple of its size
 			 */
 			rc_bar2_offset = rc_bar2_size;
-		}
 
+			/* Since we are starting the viewport at 4GB or
+			 * higher, put the MSI target address below 4GB
+			 */
+			msi_target_addr = BRCM_MSI_TARGET_ADDR_LT_4GB;
+		}
 	} else {
 		/*
 		 * Set simple configuration based on memory sizes
@@ -902,7 +1218,12 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
 		 * and set the MSI target address accordingly.
 		 */
 		rc_bar2_offset = 0;
+
+		msi_target_addr = (rc_bar2_size >= 0x100000000ULL)
+			? BRCM_MSI_TARGET_ADDR_GT_4GB
+			: BRCM_MSI_TARGET_ADDR_LT_4GB;
 	}
+	pcie->msi_target_addr = msi_target_addr;
 
 	tmp = lower_32_bits(rc_bar2_offset);
 	tmp = INSERT_FIELD(tmp, PCIE_MISC_RC_BAR2_CONFIG_LO, SIZE,
@@ -1076,6 +1397,9 @@ static int brcm_pcie_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	if (pcie->msi && pcie->msi_internal)
+		brcm_msi_set_regs(pcie->msi);
+
 	pcie->suspended = false;
 
 	return 0;
@@ -1083,6 +1407,7 @@ static int brcm_pcie_resume(struct device *dev)
 
 static void _brcm_pcie_remove(struct brcm_pcie *pcie)
 {
+	brcm_msi_remove(pcie->msi);
 	turn_off(pcie);
 	clk_disable_unprepare(pcie->clk);
 	clk_put(pcie->clk);
@@ -1111,7 +1436,7 @@ static int brcm_pcie_remove(struct platform_device *pdev)
 
 static int brcm_pcie_probe(struct platform_device *pdev)
 {
-	struct device_node *dn = pdev->dev.of_node;
+	struct device_node *dn = pdev->dev.of_node, *msi_dn;
 	const struct of_device_id *of_id;
 	const struct pcie_cfg_data *data;
 	int ret;
@@ -1194,6 +1519,28 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		goto fail;
 
+	msi_dn = of_parse_phandle(pcie->dn, "msi-parent", 0);
+	/* Use the internal MSI if no msi-parent property */
+	if (!msi_dn)
+		msi_dn = pcie->dn;
+
+	if (pci_msi_enabled() && msi_dn == pcie->dn) {
+		struct brcm_info info;
+
+		info.rev = pcie->rev;
+		info.msi_target_addr = pcie->msi_target_addr;
+		info.base = pcie->base;
+
+		ret = brcm_msi_probe(pdev, &info);
+		if (ret)
+			dev_err(pcie->dev,
+				"probe of internal MSI failed: %d)", ret);
+		else
+			pcie->msi_internal = true;
+
+		pcie->msi = info.msi;
+	}
+
 	list_splice_init(&pcie->resources, &bridge->windows);
 	bridge->dev.parent = &pdev->dev;
 	bridge->busnr = 0;
@@ -1216,7 +1563,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 	pcie->root_bus = bridge->bus;
 
 	return 0;
-
 fail:
 	_brcm_pcie_remove(pcie);
 	return ret;
Signature · 1 line
1.9.0.138.g2de3478
#22 lore raw

PATCH v3 7/8 MIPS: BMIPS: Add PCI bindings for 7425, 7435

In reply to Jim Quinlan

Adds the PCIe nodes for the Broadcom STB PCIe root complex.

---
 arch/mips/boot/dts/brcm/bcm7425.dtsi     | 26 ++++++++++++++++++++++++++
 arch/mips/boot/dts/brcm/bcm7435.dtsi     | 27 +++++++++++++++++++++++++++
 arch/mips/boot/dts/brcm/bcm97425svmb.dts |  4 ++++
 arch/mips/boot/dts/brcm/bcm97435svmb.dts |  4 ++++
 4 files changed, 61 insertions(+)
arch/mips/boot/dts/brcm/bcm7425.dtsi +26 -0
index f56fb25..c7bd88b 100644
@@ -494,4 +494,30 @@
 			status = "disabled";
 		};
 	};
+
+	pcie: pcie at 10410000 {
+		reg = <0x10410000 0x830c>;
+		compatible = "brcm,bcm7425-pcie";
+		interrupts = <37>, <37>;
+		interrupt-names = "pcie", "msi";
+		interrupt-parent = <&periph_intc>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		linux,pci-domain = <0>;
+		brcm,enable-ssc;
+		bus-range = <0x00 0xff>;
+		msi-controller;
+		#interrupt-cells = <1>;
+		/* 4x128mb windows */
+		ranges = <0x2000000 0x0 0xd0000000 0xd0000000 0 0x08000000>,
+			 <0x2000000 0x0 0xd8000000 0xd8000000 0 0x08000000>,
+			 <0x2000000 0x0 0xe0000000 0xe0000000 0 0x08000000>,
+			 <0x2000000 0x0 0xe8000000 0xe8000000 0 0x08000000>;
+		interrupt-map-mask = <0 0 0 7>;
+		interrupt-map = <0 0 0 1 &periph_intc 33
+				 0 0 0 2 &periph_intc 34
+				 0 0 0 3 &periph_intc 35
+				 0 0 0 4 &periph_intc 36>;
+	};
+
 };
arch/mips/boot/dts/brcm/bcm7435.dtsi +27 -0
index f2cead2..d321042 100644
@@ -509,4 +509,31 @@
 			status = "disabled";
 		};
 	};
+
+	pcie: pcie at 10410000 {
+		reg = <0x10410000 0x930c>;
+		interrupts = <0x27>, <0x27>;
+		interrupt-names = "pcie", "msi";
+		interrupt-parent = <&periph_intc>;
+		compatible = "brcm,bcm7435-pcie";
+		#address-cells = <3>;
+		#size-cells = <2>;
+		linux,pci-domain = <0>;
+		brcm,enable-ssc;
+		bus-range = <0x00 0xff>;
+		msi-controller;
+		#interrupt-cells = <1>;
+		/* 4x128mb windows */
+		ranges = <0x2000000 0x0 0xd0000000 0xd0000000 0 0x08000000>,
+			 <0x2000000 0x0 0xd8000000 0xd8000000 0 0x08000000>,
+			 <0x2000000 0x0 0xe0000000 0xe0000000 0 0x08000000>,
+			 <0x2000000 0x0 0xe8000000 0xe8000000 0 0x08000000>;
+		interrupt-map-mask = <0 0 0 7>;
+		interrupt-map = <0 0 0 1 &periph_intc 35
+				 0 0 0 2 &periph_intc 36
+				 0 0 0 3 &periph_intc 37
+				 0 0 0 4 &periph_intc 38>;
+		status = "disabled";
+	};
+
 };
arch/mips/boot/dts/brcm/bcm97425svmb.dts +4 -0
index 73aa006..3a87ac5 100644
@@ -143,3 +143,7 @@
 &mspi {
 	status = "okay";
 };
+
+&pcie {
+	status = "okay";
+};
arch/mips/boot/dts/brcm/bcm97435svmb.dts +4 -0
index 0a915f3..456d024 100644
@@ -119,3 +119,7 @@
 &mspi {
 	status = "okay";
 };
+
+&pcie {
+	status = "okay";
+};
Signature · 1 line
1.9.0.138.g2de3478
#23 lore raw

PATCH v3 8/8 MIPS: BMIPS: Enable PCI

In reply to Jim Quinlan

Adds the Kconfig hooks to enable the Broadcom STB PCIe root complex driver for Broadcom MIPS systems.

---
 arch/mips/Kconfig | 3 +++
 1 file changed, 3 insertions(+)
arch/mips/Kconfig +3 -0
index cb7fcc4..83ba54d 100644
@@ -209,6 +209,9 @@ config BMIPS_GENERIC
 	select BOOT_RAW
 	select NO_EXCEPT_FILL
 	select USE_OF
+	select HW_HAS_PCI
+	select PCI_DRIVERS_GENERIC
+	select PCI
 	select CEVT_R4K
 	select CSRC_R4K
 	select SYNC_R4K
Signature · 1 line
1.9.0.138.g2de3478