Skip to contentSkip to conversation

USB host support for Raspberry Pi 4 board

PATCH Superseded Sylwester Nawrocki 5 participants 28 messages Apr 24, 2020 – Apr 29, 2020 1 message not in the archive

Subsystems (10)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): CGME20200424165117eucas1p2129c3887e2cfc2d372580f27cbcc7871@eucas1p2.samsung.com

#1 lore raw

cover USB host support for Raspberry Pi 4 board

Hi all,

This patch series adds USB host support for Raspberry Pi 4 board. It includes the Broadcom STB PCIe driver ported from Linux kernel, a memory mapping update for the xHCI controller behind a PCIe bridge for 32-bit and 64-bit system builds and some related fixes and updates in the usb/xhci and the pci core code.

Any changes since previous (RFC) version are listed in individual patches. The most significant change was rewriting the PCIe driver to align with current mainline Linux kernel version. As suggested, readq/writeq have been removed from xhci_{readq/writeq} helpers instead of adding a Kconfig option.

This patch series is based on v2020.04 tag.

Regards,
Sylwester

Marek Szyprowski (4):
rpi4: shorten a mapping for the DRAM
rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM

    64bit)
  rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM
    32bit)

config: Enable support for the XHCI controller on RPI4 board

Nicolas Saenz Julienne (1):
linux/bitfield.h: Add primitives for manipulating bitfields both in
host- and fixed-endian.

Sylwester Nawrocki (5):
usb: xhci: Add missing cache flush in the scratchpad array
initialization
usb: xhci: Use only 32-bit accesses in xhci_writeq/xhci_readq
pci: Move some PCIe register offset definitions to a common header
pci: Add some PCI Express capability register offset definitions
pci: Add driver for Broadcom STB PCIe controller

 arch/arm/mach-bcm283x/Kconfig             |   1 +
 arch/arm/mach-bcm283x/include/mach/base.h |   7 +
 arch/arm/mach-bcm283x/init.c              |  72 +++-
 configs/rpi_4_32b_defconfig               |   9 +
 configs/rpi_4_defconfig                   |  10 +
 configs/rpi_arm64_defconfig               |   9 +-
 drivers/pci/Kconfig                       |   6 +
 drivers/pci/Makefile                      |   1 +
 drivers/pci/pci-rcar-gen3.c               |   8 -
 drivers/pci/pcie_brcmstb.c                | 593 ++++++++++++++++++++++++++++++
 drivers/pci/pcie_intel_fpga.c             |   3 -
 drivers/usb/host/xhci-mem.c               |   3 +
 include/linux/bitfield.h                  |  46 +++
 include/pci.h                             |  19 +-
 include/usb/xhci.h                        |   8 -
 15 files changed, 769 insertions(+), 26 deletions(-)
 create mode 100644 drivers/pci/pcie_brcmstb.c
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/10 usb: xhci: Add missing cache flush in the scratchpad array initialization

In current code there is no cache flush after initializing the scratchpad buffer array with the scratchpad buffer pointers. This leads to a failure of the "slot enable" command on the rpi4 board (Broadcom STB PCIe controller + VL805 USB hub) - the very first TRB transfer on the command ring fails and there is a timeout while waiting for the command completion event. After adding the missing cache flush everything seems to be working as expected.

---
Changes since RFC:
- none.

---
 drivers/usb/host/xhci-mem.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-mem.c +3 -0
index 93450ee..729bdc3 100644
@@ -393,6 +393,9 @@ static int xhci_scratchpad_alloc(struct xhci_ctrl *ctrl)
 		scratchpad->sp_array[i] = cpu_to_le64(ptr);
 	}
 
+	xhci_flush_cache((uintptr_t)scratchpad->sp_array,
+			 sizeof(u64) * num_sp);
+
 	return 0;
 
 fail_sp3:
Signature · 1 line
2.7.4
#3 lore raw

PATCH 1/10 usb: xhci: Add missing cache flush in the scratchpad array initialization

Quoted 10 lines · Sylwester Nawrocki

In current code there is no cache flush after initializing the scratchpad buffer array with the scratchpad buffer pointers. This leads to a failure of the "slot enable" command on the rpi4 board (Broadcom STB PCIe controller + VL805 USB hub) - the very first TRB transfer on the command ring fails and there is a timeout while waiting for the command completion event. After adding the missing cache flush everything seems to be working as expected.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/9f7302dd/attachment.sig>

#4 lore raw

PATCH 2/10 usb: xhci: Use only 32-bit accesses in xhci_writeq/xhci_readq

In reply to Sylwester Nawrocki

There might be hardware configurations where 64-bit data accesses to XHCI registers are not supported properly. This patch removes the readq/writeq so always two 32-bit accesses are used to read/write 64-bit XHCI registers, similarly as it is done in Linux kernel.

This patch fixes operation of the XHCI controller on RPI4 Broadcom BCM2711 SoC based board, where the VL805 USB XHCI controller is connected to the PCIe Root Complex, which is attached to the system through the SCB bridge.

Even though the architecture is 64-bit the PCIe BAR is 32-bit and likely the 64-bit wide register accesses initiated by the CPU are not properly translated to a sequence of 32-bit PCIe accesses. xhci_readq(), for example, always returns same value in upper and lower 32-bits, e.g. 0xabcd1234abcd1234 instead of 0x00000000abcd1234.

Cc Sergey Temerkhanov <[email protected]>

---
Changes since RFC:
- dropped Kconfig option, switched to not using readq/writeq unconditionally.

---
 include/usb/xhci.h | 8 --------
 1 file changed, 8 deletions(-)
include/usb/xhci.h +0 -8
index 6017504..c16106a 100644
@@ -1111,28 +1111,20 @@ static inline void xhci_writel(uint32_t volatile *regs, const unsigned int val)
  */
 static inline u64 xhci_readq(__le64 volatile *regs)
 {
-#if BITS_PER_LONG == 64
-	return readq(regs);
-#else
 	__u32 *ptr = (__u32 *)regs;
 	u64 val_lo = readl(ptr);
 	u64 val_hi = readl(ptr + 1);
 	return val_lo + (val_hi << 32);
-#endif
 }
 
 static inline void xhci_writeq(__le64 volatile *regs, const u64 val)
 {
-#if BITS_PER_LONG == 64
-	writeq(val, regs);
-#else
 	__u32 *ptr = (__u32 *)regs;
 	u32 val_lo = lower_32_bits(val);
 	/* FIXME */
 	u32 val_hi = upper_32_bits(val);
 	writel(val_lo, ptr);
 	writel(val_hi, ptr + 1);
-#endif
 }
 
 int xhci_hcd_init(int index, struct xhci_hccr **ret_hccr,
Signature · 1 line
2.7.4
#5 lore raw

PATCH 2/10 usb: xhci: Use only 32-bit accesses in xhci_writeq/xhci_readq

Quoted 19 lines · Sylwester Nawrocki

There might be hardware configurations where 64-bit data accesses to XHCI registers are not supported properly. This patch removes the readq/writeq so always two 32-bit accesses are used to read/write 64-bit XHCI registers, similarly as it is done in Linux kernel.

This patch fixes operation of the XHCI controller on RPI4 Broadcom BCM2711 SoC based board, where the VL805 USB XHCI controller is connected to the PCIe Root Complex, which is attached to the system through the SCB bridge.

Even though the architecture is 64-bit the PCIe BAR is 32-bit and likely the 64-bit wide register accesses initiated by the CPU are not properly translated to a sequence of 32-bit PCIe accesses. xhci_readq(), for example, always returns same value in upper and lower 32-bits, e.g. 0xabcd1234abcd1234 instead of 0x00000000abcd1234.

Cc Sergey Temerkhanov <[email protected]>
Quoted 8 lines

---
Changes since RFC:
- dropped Kconfig option, switched to not using readq/writeq unconditionally.

---
 include/usb/xhci.h | 8 --------
 1 file changed, 8 deletions(-)
#6 lore raw

PATCH 2/10 usb: xhci: Use only 32-bit accesses in xhci_writeq/xhci_readq

In reply to Sylwester Nawrocki
Quoted 16 lines · Sylwester Nawrocki

There might be hardware configurations where 64-bit data accesses to XHCI registers are not supported properly. This patch removes the readq/writeq so always two 32-bit accesses are used to read/write 64-bit XHCI registers, similarly as it is done in Linux kernel.

This patch fixes operation of the XHCI controller on RPI4 Broadcom BCM2711 SoC based board, where the VL805 USB XHCI controller is connected to the PCIe Root Complex, which is attached to the system through the SCB bridge.

Even though the architecture is 64-bit the PCIe BAR is 32-bit and likely the 64-bit wide register accesses initiated by the CPU are not properly translated to a sequence of 32-bit PCIe accesses. xhci_readq(), for example, always returns same value in upper and lower 32-bits, e.g. 0xabcd1234abcd1234 instead of 0x00000000abcd1234.

Quoted 6 lines
Cc Sergey Temerkhanov <[email protected]>

---
Changes since RFC:
- dropped Kconfig option, switched to not using readq/writeq unconditionally.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/28bcedf3/attachment.sig>

#7 lore raw

PATCH 3/10 pci: Move some PCIe register offset definitions to a common header

In reply to Sylwester Nawrocki

Some PCI Express register offsets are currently defined in multiple drivers, move them to a common header to avoid re-definitions and as a pre-requisite for adding new PCIe driver.
While at it replace some spaces with tabs.

---
Changes since RFC:
- whitespace clean up.

---
 drivers/pci/pci-rcar-gen3.c   |  8 --------
 drivers/pci/pcie_intel_fpga.c |  3 ---
 include/pci.h                 | 13 +++++++++++--
 3 files changed, 11 insertions(+), 13 deletions(-)
drivers/pci/pci-rcar-gen3.c +0 -8
index 30eff67..393f1c9 100644
@@ -117,14 +117,6 @@
 #define RCAR_PCI_MAX_RESOURCES	4
 #define MAX_NR_INBOUND_MAPS	6
 
-#define PCI_EXP_FLAGS		2		/* Capabilities register */
-#define PCI_EXP_FLAGS_TYPE	0x00f0		/* Device/Port type */
-#define PCI_EXP_TYPE_ROOT_PORT	0x4		/* Root Port */
-#define PCI_EXP_LNKCAP		12		/* Link Capabilities */
-#define PCI_EXP_LNKCAP_DLLLARC	0x00100000	/* Data Link Layer Link Active Reporting Capable */
-#define PCI_EXP_SLTCAP		20		/* Slot Capabilities */
-#define PCI_EXP_SLTCAP_PSN	0xfff80000	/* Physical Slot Number */
-
 enum {
 	RCAR_PCI_ACCESS_READ,
 	RCAR_PCI_ACCESS_WRITE,
drivers/pci/pcie_intel_fpga.c +0 -3
index 6a9f29c..69363a0 100644
@@ -65,9 +65,6 @@
 #define IS_ROOT_PORT(pcie, bdf)				\
 		((PCI_BUS(bdf) == pcie->first_busno) ? true : false)
 
-#define PCI_EXP_LNKSTA		18	/* Link Status */
-#define PCI_EXP_LNKSTA_DLLLA	0x2000	/* Data Link Layer Link Active */
-
 /**
  * struct intel_fpga_pcie - Intel FPGA PCIe controller state
  * @bus: Pointer to the PCI bus
include/pci.h +11 -2
index 174ddd4..5bf91a4 100644
@@ -471,10 +471,19 @@
 #define  PCI_EA_FIELD_MASK	0xfffffffc	/* For Base & Max Offset */
 
 /* PCI Express capabilities */
+#define PCI_EXP_FLAGS		2	/* Capabilities register */
+#define  PCI_EXP_FLAGS_TYPE	0x00f0	/* Device/Port type */
+#define  PCI_EXP_TYPE_ROOT_PORT 0x4	/* Root Port */
 #define PCI_EXP_DEVCAP		4	/* Device capabilities */
-#define  PCI_EXP_DEVCAP_FLR     0x10000000 /* Function Level Reset */
+#define  PCI_EXP_DEVCAP_FLR	0x10000000 /* Function Level Reset */
 #define PCI_EXP_DEVCTL		8	/* Device Control */
-#define  PCI_EXP_DEVCTL_BCR_FLR 0x8000  /* Bridge Configuration Retry / FLR */
+#define  PCI_EXP_DEVCTL_BCR_FLR	0x8000  /* Bridge Configuration Retry / FLR */
+#define PCI_EXP_LNKCAP		12	/* Link Capabilities */
+#define  PCI_EXP_LNKCAP_DLLLARC	0x00100000 /* Data Link Layer Link Active Reporting Capable */
+#define PCI_EXP_LNKSTA		18	/* Link Status */
+#define  PCI_EXP_LNKSTA_DLLLA	0x2000	/* Data Link Layer Link Active */
+#define PCI_EXP_SLTCAP		20	/* Slot Capabilities */
+#define  PCI_EXP_SLTCAP_PSN	0xfff80000 /* Physical Slot Number */
 
 /* Include the ID list */
 
Signature · 1 line
2.7.4
#8 lore raw

PATCH 3/10 pci: Move some PCIe register offset definitions to a common header

Quoted 7 lines · Sylwester Nawrocki

Some PCI Express register offsets are currently defined in multiple drivers, move them to a common header to avoid re-definitions and as a pre-requisite for adding new PCIe driver.
While at it replace some spaces with tabs.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/021e84b1/attachment.sig>

#9 lore raw

PATCH 4/10 rpi4: shorten a mapping for the DRAM

In reply to Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

Remove the overlap between DRAM and device's IO area.

---
Changes since RFC:
- none.

---
 arch/arm/mach-bcm283x/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-bcm283x/init.c +1 -1
index 9966d6c..4295356 100644
@@ -38,7 +38,7 @@ static struct mm_region bcm2711_mem_map[] = {
 	{
 		.virt = 0x00000000UL,
 		.phys = 0x00000000UL,
-		.size = 0xfe000000UL,
+		.size = 0xfc000000UL,
 		.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
 			 PTE_BLOCK_INNER_SHARE
 	}, {
Signature · 1 line
2.7.4
#10 lore raw

PATCH 4/10 rpi4: shorten a mapping for the DRAM

Quoted 8 lines · Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

Remove the overlap between DRAM and device's IO area.

---
Changes since RFC:
- none.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/d158184f/attachment.sig>

#11 lore raw

PATCH 5/10 rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 64bit)

In reply to Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

Create a non-cacheable mapping for the 0x600000000 physical memory region, where MMIO registers for the PCIe XHCI controller are instantiated by the PCIe bridge.

---
Changes since RFC:
- none.

---
 arch/arm/mach-bcm283x/init.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
arch/arm/mach-bcm283x/init.c +15 -3
index 4295356..6a748da 100644
@@ -11,10 +11,15 @@
 #include <dm/device.h>
 #include <fdt_support.h>
 
+#define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS	0x600000000UL
+#define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE	0x800000UL
+
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>
 
-static struct mm_region bcm283x_mem_map[] = {
+#define MAX_MAP_MAX_ENTRIES (4)
+
+static struct mm_region bcm283x_mem_map[MAX_MAP_MAX_ENTRIES] = {
 	{
 		.virt = 0x00000000UL,
 		.phys = 0x00000000UL,
@@ -34,7 +39,7 @@ static struct mm_region bcm283x_mem_map[] = {
 	}
 };
 
-static struct mm_region bcm2711_mem_map[] = {
+static struct mm_region bcm2711_mem_map[MAX_MAP_MAX_ENTRIES] = {
 	{
 		.virt = 0x00000000UL,
 		.phys = 0x00000000UL,
@@ -49,6 +54,13 @@ static struct mm_region bcm2711_mem_map[] = {
 			 PTE_BLOCK_NON_SHARE |
 			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
 	}, {
+		.virt = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
+		.phys = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
+		.size = BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE,
+		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+			 PTE_BLOCK_NON_SHARE |
+			 PTE_BLOCK_PXN | PTE_BLOCK_UXN
+	}, {
 		/* List terminator */
 		0,
 	}
@@ -71,7 +83,7 @@ static void _rpi_update_mem_map(struct mm_region *pd)
 {
 	int i;
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < MAX_MAP_MAX_ENTRIES; i++) {
 		mem_map[i].virt = pd[i].virt;
 		mem_map[i].phys = pd[i].phys;
 		mem_map[i].size = pd[i].size;
Signature · 1 line
2.7.4
#12 lore raw

PATCH 5/10 rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 64bit)

Quoted 10 lines · Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

Create a non-cacheable mapping for the 0x600000000 physical memory region, where MMIO registers for the PCIe XHCI controller are instantiated by the PCIe bridge.

---
Changes since RFC:
- none.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/e1e6e7b8/attachment.sig>

#13 lore raw

PATCH 6/10 rpi4: add a mapping for the PCIe XHCI controller MMIO registers (ARM 32bit)

In reply to Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

Create a non-cacheable mapping for the 0x600000000 physical memory region, where MMIO registers for the PCIe XHCI controller are instantiated by the PCIe bridge. Due to 32bit limit in the CPU virtual address space in ARM 32bit mode, this region is mapped at 0xff800000 CPU virtual address.

---
Changes since RFC:
- none.

---
 arch/arm/mach-bcm283x/Kconfig             |  1 +
 arch/arm/mach-bcm283x/include/mach/base.h |  7 +++++
 arch/arm/mach-bcm283x/init.c              | 52 +++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
arch/arm/mach-bcm283x/Kconfig +1 -0
index 00419bf..bcb7f1d 100644
@@ -36,6 +36,7 @@ config BCM2711_32B
 	select BCM2711
 	select ARMV7_LPAE
 	select CPU_V7A
+	select PHYS_64BIT
 
 config BCM2711_64B
 	bool "Broadcom BCM2711 SoC 64-bit support"
arch/arm/mach-bcm283x/include/mach/base.h +7 -0
index c4ae398..1d10dc9 100644
@@ -6,6 +6,13 @@
 #ifndef _BCM283x_BASE_H_
 #define _BCM283x_BASE_H_
 
+#include <linux/types.h>
+
 extern unsigned long rpi_bcm283x_base;
 
+#ifdef CONFIG_ARMV7_LPAE
+extern void *rpi4_phys_to_virt(phys_addr_t paddr);
+#define phys_to_virt(x) rpi4_phys_to_virt(x)
+#endif
+
 #endif
arch/arm/mach-bcm283x/init.c +52 -0

58 lines not on this page · raw message

Signature · 1 line
2.7.4
#14 lore raw

PATCH 7/10 linux/bitfield.h: Add primitives for manipulating bitfields both in host- and fixed-endian.

In reply to Sylwester Nawrocki

From: Nicolas Saenz Julienne <[email protected]>

Imports Al Viro's original Linux commit 00b0c9b82663a, which contains an in depth explanation and two fixes from Johannes Berg:
e7d4a95da86e0 "bitfield: fix *_encode_bits()", 37a3862e12382 "bitfield: add u8 helpers".

---
Changes since RFC:
- new patch.

---
 include/linux/bitfield.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
include/linux/bitfield.h +46 -0
index 8b9d6ff..4964213 100644
@@ -103,4 +103,50 @@
 		(typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask));	\
 	})
 
+extern void __compiletime_error("value doesn't fit into mask")
+__field_overflow(void);
+extern void __compiletime_error("bad bitfield mask")
+__bad_mask(void);
+static __always_inline u64 field_multiplier(u64 field)
+{
+	if ((field | (field - 1)) & ((field | (field - 1)) + 1))
+		__bad_mask();
+	return field & -field;
+}
+static __always_inline u64 field_mask(u64 field)
+{
+	return field / field_multiplier(field);
+}
+#define ____MAKE_OP(type,base,to,from)					\
+static __always_inline __##type type##_encode_bits(base v, base field)	\
+{									\
+	if (__builtin_constant_p(v) && (v & ~field_mask(field)))	\
+		__field_overflow();					\
+	return to((v & field_mask(field)) * field_multiplier(field));	\
+}									\
+static __always_inline __##type type##_replace_bits(__##type old,	\
+					base val, base field)		\
+{									\
+	return (old & ~to(field)) | type##_encode_bits(val, field);	\
+}									\
+static __always_inline void type##p_replace_bits(__##type *p,		\
+					base val, base field)		\
+{									\
+	*p = (*p & ~to(field)) | type##_encode_bits(val, field);	\
+}									\
+static __always_inline base type##_get_bits(__##type v, base field)	\
+{									\
+	return (from(v) & field)/field_multiplier(field);		\
+}
+#define __MAKE_OP(size)							\
+	____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu)	\
+	____MAKE_OP(be##size,u##size,cpu_to_be##size,be##size##_to_cpu)	\
+	____MAKE_OP(u##size,u##size,,)
+____MAKE_OP(u8,u8,,)
+__MAKE_OP(16)
+__MAKE_OP(32)
+__MAKE_OP(64)
+#undef __MAKE_OP
+#undef ____MAKE_OP
+
 #endif
Signature · 1 line
2.7.4
#15 lore raw

PATCH 7/10 linux/bitfield.h: Add primitives for manipulating bitfields both in host- and fixed-endian.

Quoted 10 lines · Sylwester Nawrocki

From: Nicolas Saenz Julienne <[email protected]>

Imports Al Viro's original Linux commit 00b0c9b82663a, which contains an in depth explanation and two fixes from Johannes Berg:
e7d4a95da86e0 "bitfield: fix *_encode_bits()", 37a3862e12382 "bitfield: add u8 helpers".

nits: remove the ending period in the commit title

Quoted 52 lines

---
Changes since RFC:
- new patch.

---
 include/linux/bitfield.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
include/linux/bitfield.h +37 -0
index 8b9d6ff..4964213 100644
@@ -103,4 +103,50 @@
                (typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \
        })
 
+extern void __compiletime_error("value doesn't fit into mask")
+__field_overflow(void);
+extern void __compiletime_error("bad bitfield mask")
+__bad_mask(void);
+static __always_inline u64 field_multiplier(u64 field)
+{
+       if ((field | (field - 1)) & ((field | (field - 1)) + 1))
+               __bad_mask();
+       return field & -field;
+}
+static __always_inline u64 field_mask(u64 field)
+{
+       return field / field_multiplier(field);
+}
+#define ____MAKE_OP(type,base,to,from)                                 \
+static __always_inline __##type type##_encode_bits(base v, base field) \
+{                                                                      \
+       if (__builtin_constant_p(v) && (v & ~field_mask(field)))        \
+               __field_overflow();                                     \
+       return to((v & field_mask(field)) * field_multiplier(field));   \
+}                                                                      \
+static __always_inline __##type type##_replace_bits(__##type old,      \
+                                       base val, base field)           \
+{                                                                      \
+       return (old & ~to(field)) | type##_encode_bits(val, field);     \
+}                                                                      \
+static __always_inline void type##p_replace_bits(__##type *p,          \
+                                       base val, base field)           \
+{                                                                      \
+       *p = (*p & ~to(field)) | type##_encode_bits(val, field);        \
+}                                                                      \
+static __always_inline base type##_get_bits(__##type v, base field)    \
+{                                                                      \
+       return (from(v) & field)/field_multiplier(field);               \
+}
+#define __MAKE_OP(size)                                                        \
+       ____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \

include/linux/bitfield.h line 152

Quoted 10 lines
include/linux/bitfield.h +9 -0
+       ____MAKE_OP(be##size,u##size,cpu_to_be##size,be##size##_to_cpu) \
+       ____MAKE_OP(u##size,u##size,,)
+____MAKE_OP(u8,u8,,)
+__MAKE_OP(16)
+__MAKE_OP(32)
+__MAKE_OP(64)
+#undef __MAKE_OP
+#undef ____MAKE_OP
+
 #endif

Could we add blank line between macros and functions to improve some readablity?

Regards,
Bin

#16 lore raw

PATCH 7/10 linux/bitfield.h: Add primitives for manipulating bitfields both in host- and fixed-endian.

Hi Bin,

Quoted 2 lines · Bin Meng

Could we add blank line between macros and functions to improve some readablity?

Thanks for your review. It might be indeed a bit easier to read with some extra empty lines, given there is no any comments to those macro definitions. I have made a change as follows for the next iteration.

---------------------8<---------------------

include/linux/bitfield.h +1 -0
index 4964213..7acba4c 100644
@@ -117,6 +117,7 @@ static __always_inline u64 field_mask(u64 field)
  {
         return field / field_multiplier(field);
  }
+
  #define ____MAKE_OP(type,base,to,from)                                 \
  static __always_inline __##type type##_encode_bits(base v, base field) \
  { \
@@ -138,14 +139,17 @@ static __always_inline base 

type##_get_bits(__##type v, base field) \

  { \
         return (from(v) & field)/field_multiplier(field);               \

}
+
#define __MAKE_OP(size) \
____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \

____MAKE_OP(be##size,u##size,cpu_to_be##size,be##size##_to_cpu) \
         ____MAKE_OP(u##size,u##size,,)

+
____MAKE_OP(u8,u8,,)
__MAKE_OP(16)
__MAKE_OP(32)
__MAKE_OP(64)
+
#undef __MAKE_OP
#undef ____MAKE_OP
--------------------->8---------------------

--
Regards,
Sylwester

#17 lore raw

PATCH 8/10 pci: Add some PCI Express capability register offset definitions

In reply to Sylwester Nawrocki

Add PCI Express capability definitions required by the Broadcom STB PCIe controller driver.

---
Changes since RFC:
- ensure the entries are added in order, sorted by ascending address values.

---
 include/pci.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/pci.h +6 -0
index 5bf91a4..5307478 100644
@@ -479,11 +479,17 @@
 #define PCI_EXP_DEVCTL		8	/* Device Control */
 #define  PCI_EXP_DEVCTL_BCR_FLR	0x8000  /* Bridge Configuration Retry / FLR */
 #define PCI_EXP_LNKCAP		12	/* Link Capabilities */
+#define  PCI_EXP_LNKCAP_SLS	0x0000000f /* Supported Link Speeds */
+#define  PCI_EXP_LNKCAP_MLW	0x000003f0 /* Maximum Link Width */
 #define  PCI_EXP_LNKCAP_DLLLARC	0x00100000 /* Data Link Layer Link Active Reporting Capable */
 #define PCI_EXP_LNKSTA		18	/* Link Status */
+#define  PCI_EXP_LNKSTA_CLS	0x000f	/* Current Link Speed */
+#define  PCI_EXP_LNKSTA_NLW	0x03f0	/* Negotiated Link Width */
+#define  PCI_EXP_LNKSTA_NLW_SHIFT 4	/* start of NLW mask in link status */
 #define  PCI_EXP_LNKSTA_DLLLA	0x2000	/* Data Link Layer Link Active */
 #define PCI_EXP_SLTCAP		20	/* Slot Capabilities */
 #define  PCI_EXP_SLTCAP_PSN	0xfff80000 /* Physical Slot Number */
+#define PCI_EXP_LNKCTL2		48	/* Link Control 2 */
 
 /* Include the ID list */
 
Signature · 1 line
2.7.4
#18 lore raw

PATCH 8/10 pci: Add some PCI Express capability register offset definitions

Quoted 9 lines · Sylwester Nawrocki

Add PCI Express capability definitions required by the Broadcom STB PCIe controller driver.

---
Changes since RFC:
- ensure the entries are added in order, sorted by ascending address values.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/e4ec48b3/attachment.sig>

#19 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

In reply to Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
- reworked to align with current Linux mainline version and u-boot driver by Nicolas Saenz Julienne

---
 drivers/pci/Kconfig        |   6 +
 drivers/pci/Makefile       |   1 +
 drivers/pci/pcie_brcmstb.c | 593 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 600 insertions(+)
 create mode 100644 drivers/pci/pcie_brcmstb.c
drivers/pci/Kconfig +6 -0
index 437cd9a..056a021 100644
@@ -197,4 +197,10 @@ config PCIE_MEDIATEK
 	  Say Y here if you want to enable Gen2 PCIe controller,
 	  which could be found on MT7623 SoC family.
 
+config PCI_BRCMSTB
+	bool "Broadcom STB PCIe controller"
+	depends on DM_PCI
+	depends on ARCH_BCM283X
+	help
+	  Say Y here if you want to enable Broadcom STB PCIe controller support.
 endif
drivers/pci/Makefile +1 -0
index c051ecc..3e53b1f 100644
@@ -43,3 +43,4 @@ obj-$(CONFIG_PCI_PHYTIUM) += pcie_phytium.o
 obj-$(CONFIG_PCIE_INTEL_FPGA) += pcie_intel_fpga.o
 obj-$(CONFIG_PCI_KEYSTONE) += pcie_dw_ti.o
 obj-$(CONFIG_PCIE_MEDIATEK) += pcie_mediatek.o
+obj-$(CONFIG_PCI_BRCMSTB) += pcie_brcmstb.o
drivers/pci/pcie_brcmstb.c new file +593 -0

593 lines not on this page · raw message

Signature · 1 line
2.7.4
#20 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

Quoted 14 lines · Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
- reworked to align with current Linux mainline version and u-boot driver by Nicolas Saenz Julienne

[...]

drivers/pci/pcie_brcmstb.c line 442

Quoted 7 lines
drivers/pci/pcie_brcmstb.c new file +7 -0
+
+	/*
+	 * TODO: Use the base address and size(s) provided in the dma-ranges
+	 * property.
+	 */
+	rc_bar2_offset = 0;
+	rc_bar2_size = 1ULL << 32;

From experience this works fine, although it highly depends on how DMA memory is handled in u-boot.

For example, in arm64 Linux, DMA memory was allocated from ZONE_DMA32, which would return memory smaller than 4GB. This was not good enough for bcm2711b0 -- revision b0 of rpi4's SoC, so far the most common out there -- which has an internal wiring bug that prevents PCIe from accessing memory higher than 3GB (RPi4 might have up to 4GB). So we had to introduce a ZONE_DMA, which covers the lower GB of memory, in order to allocate suitable DMA memory for PCI and other DMA limited devices.

While playing around with u-boot's xHCI I saw that all memory is allocated is located in the lower 1GB. But never got to look into why. I'm curious to know if someone knows how's that handled in u-boot. Ultimately, depending on how it works, we might be able to just disregard dma-ranges altogether.

For some extra context xhci_malloc() gets its memory from memalign(). And it's not clear to me how that function decides which memory to use.

Quoted 5 lines
drivers/pci/pcie_brcmstb.c new file +5 -0
+
+	tmp = lower_32_bits(rc_bar2_offset);
+	u32p_replace_bits(&tmp, brcm_pcie_encode_ibar_size(rc_bar2_size),
+			  PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_MASK);
+	writel(tmp, base + PCIE_MISC_RC_BAR2_CONFIG_LO);

drivers/pci/pcie_brcmstb.c line 457

Quoted 10 lines
drivers/pci/pcie_brcmstb.c new file +10 -0
+	writel(upper_32_bits(rc_bar2_offset),
+	       base + PCIE_MISC_RC_BAR2_CONFIG_HI);
+
+	scb_size_val = rc_bar2_size ?
+		       ilog2(rc_bar2_size) - 15 : 0xf; /* 0xf is 1GB */
+	tmp = readl(base + PCIE_MISC_MISC_CTRL);
+	u32p_replace_bits(&tmp, scb_size_val,
+			  PCIE_MISC_MISC_CTRL_SCB0_SIZE_MASK);
+	writel(tmp, base + PCIE_MISC_MISC_CTRL);
+

[...]

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/70b780ca/attachment.sig>

#21 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

Hi Nicolas,

Quoted 35 lines · Nicolas Saenz Julienne
Quoted 14 lines · Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
- reworked to align with current Linux mainline version and u-boot driver by Nicolas Saenz Julienne

[...]

drivers/pci/pcie_brcmstb.c line 442

Quoted 7 lines
drivers/pci/pcie_brcmstb.c new file +7 -0
+
+	/*
+	 * TODO: Use the base address and size(s) provided in the dma-ranges
+	 * property.
+	 */
+	rc_bar2_offset = 0;
+	rc_bar2_size = 1ULL << 32;

From experience this works fine, although it highly depends on how DMA memory is
handled in u-boot.

For example, in arm64 Linux, DMA memory was allocated from ZONE_DMA32, which would return memory smaller than 4GB. This was not good enough for bcm2711b0 -- revision b0 of rpi4's SoC, so far the most common out there -- which has an internal wiring bug that prevents PCIe from accessing memory higher than 3GB (RPi4 might have up to 4GB). So we had to introduce a ZONE_DMA, which covers the lower GB of memory, in order to allocate suitable DMA memory for PCI and other DMA limited devices.

Quoted 7 lines

While playing around with u-boot's xHCI I saw that all memory is allocated is located in the lower 1GB. But never got to look into why. I'm curious to know if someone knows how's that handled in u-boot. Ultimately, depending on how it works, we might be able to just disregard dma-ranges altogether.

For some extra context xhci_malloc() gets its memory from memalign(). And it's not clear to me how that function decides which memory to use.

I think that memalign() allocates memory from the uboot's defined SDRAM (from its end). Assuming that CONFIG_SYS_SDRAM_SIZE is set to 128M in include/configs/rpi.h it should be always safe, but I will check that tomorrow to be 100% sure.

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#22 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

Hi All,

Quoted 53 lines · Marek Szyprowski
Quoted 52 lines · Nicolas Saenz Julienne
Quoted 15 lines · Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
? - reworked to align with current Linux mainline version and u-boot driver
??? by Nicolas Saenz Julienne

[...]

Quoted 8 lines

+
+??? /*
+???? * TODO: Use the base address and size(s) provided in the dma-ranges
+???? * property.
+???? */
+??? rc_bar2_offset = 0;
+??? rc_bar2_size = 1ULL << 32;

?From experience this works fine, although it highly depends on how DMA memory is
handled in u-boot.

For example, in arm64 Linux, DMA memory was allocated from ZONE_DMA32, which
would return memory smaller than 4GB. This was not good enough for bcm2711b0 --
revision b0 of rpi4's SoC, so far the most common out there -- which has an
internal wiring bug that prevents PCIe from accessing memory higher than 3GB
(RPi4 might have up to 4GB).? So we had to introduce a ZONE_DMA, which covers
the lower GB of memory, in order to allocate suitable DMA memory for PCI and
other DMA limited devices.

While playing around with u-boot's xHCI I saw that all memory is allocated is
located in the lower 1GB. But never got to look into why. I'm curious to know
if someone knows how's that handled in u-boot. Ultimately, depending on how it
works, we might be able to just disregard dma-ranges altogether.

Quoted 8 lines
Quoted 3 lines

For some extra context xhci_malloc() gets its memory from memalign(). And it's
not clear to me how that function decides which memory to use.

I think that memalign() allocates memory from the uboot's defined SDRAM (from its end). Assuming that CONFIG_SYS_SDRAM_SIZE is set to 128M in include/configs/rpi.h it should be always safe, but I will check that tomorrow to be 100% sure.

Okay, I've checked and memalign always get memory from the malloc pool, which is set almost at the end of the first memory bank (in runtime), so it is always below the first 1GiB. So this should be safe.

It is however not safe for explicit reads (and possible other transactions) above 3rd GiB, see the log below:

Initialising SDRAM 'Samsung' 16Gb x2 total-size: 32 Gbit Loading recovery.elf hnd: 0x00000000
Failed to read recovery.elf error: 3
Loading start4x.elf hnd: 0x000011de
Loading fixup4x.dat hnd: 0x00000259
MEM GPU: 76 ARM: 948 TOTAL: 1024
FIXUP src: 128 256 dst: 948 1024
Starting start4x.elf @ 0xfec00200

U-Boot 2020.04-00011-gaefcd8d-dirty (Apr 28 2020 - 10:13:31 +0200)

DRAM:? 3.9 GiB
RPI 4 Model B (0xc03112)
MMC:?? emmc2 at 7e340000: 0, mmcnr at 7e300000: 1
Loading Environment from FAT... OK
In:??? serial
Out:?? serial
Err:?? serial
Net:?? eth0: genet at 7d580000
PCIe BRCM: link up, 5.0 Gbps x1 (!SSC)
starting USB...
Bus Register 5000420 NbrPorts 5
Starting the controller
USB XHCI 1.00
scanning bus xhci_pci for devices...
3 USB Device(s) found
?????? scanning usb for storage devices... 1 Storage Device(s) found
Hit any key to stop autoboot:? 0
U-Boot> md 00001000
00001000: 04000000 54020000 02000000 03000000??? .......T........ 00001010: 08000000 65020000 61666564 00746c75??? .......edefault. 00001020: 03000000 04000000 54010000 0f000000??? ...........T.... 00001030: 01000000 5f697064 6f697067 00000030??? ....dpi_gpio0... 00001040: 03000000 70000000 73020000 00000000??? .......p...s.... 00001050: 01000000 02000000 03000000 04000000??? ................ 00001060: 05000000 06000000 07000000 08000000??? ................ 00001070: 09000000 0a000000 0b000000 0c000000??? ................ 00001080: 0d000000 0e000000 0f000000 10000000??? ................ 00001090: 11000000 12000000 13000000 14000000??? ................ 000010a0: 15000000 16000000 17000000 18000000??? ................ 000010b0: 19000000 1a000000 1b000000 03000000??? ................ 000010c0: 04000000 7d020000 06000000 03000000??? .......}........ 000010d0: 04000000 54010000 39000000 02000000??? .......T...9.... 000010e0: 01000000 636d6d65 6970675f 0032326f??? ....emmc_gpio22. 000010f0: 03000000 18000000 73020000 16000000??? ...........s.... U-Boot> usb read 00001000 0 10

usb read: device 0 block # 0, count 16 ... 16 blocks read: OK U-Boot> md 00001000
00001000: 1000b8fa 00bcd08e 0000b8b0 c08ed88e??? ................ 00001010: 7c00befb b90600bf a4f30200 000621ea??? ...|.........!.. 00001020: 07bebe00 0b750438 8110c683 7507fefe??? ....8.u........u 00001030: b416ebf3 bb01b002 80b27c00 8b01748a??? .........|...t.. 00001040: 13cd024c 007c00ea 00feeb00 00000000??? L.....|......... 00001050: 00000000 00000000 00000000 00000000??? ................ 00001060: 00000000 00000000 00000000 00000000??? ................ 00001070: 00000000 00000000 00000000 00000000??? ................ 00001080: 00000000 00000000 00000000 00000000??? ................ 00001090: 00000000 00000000 00000000 00000000??? ................ 000010a0: 00000000 00000000 00000000 00000000??? ................ 000010b0: 00000000 00000000 00000000 00000000??? ................ 000010c0: 00000000 00000000 00000000 00000000??? ................ 000010d0: 00000000 00000000 00000000 00000000??? ................ 000010e0: 00000000 00000000 00000000 00000000??? ................ 000010f0: 00000000 00000000 00000000 00000000??? ................ U-Boot> md 40001000
40001000: ffffffff ffffffff ffffffff ffffffff??? ................ 40001010: ffffffff ffffffff ffffffff ffffffff??? ................ 40001020: ffdfffff ffffffff ffffffff fffffffd??? ................ 40001030: ffffefff ffffffff ffffffff ffffffff??? ................ 40001040: ffffffff fe7fffff ffffff7f ffffffff??? ................ 40001050: ff7fdfff fdffffff ffffffff ffffffff??? ................ 40001060: ffffffff 77ffbfdf ffffffff ffffdfff??? .......w........ 40001070: fffdffdf fffff7ff ffffffff fffffdff??? ................ 40001080: ffffffff ffffffff fffffffd ffffffff??? ................ 40001090: fffffffb ffffffff ffffffff ffffffff??? ................ 400010a0: ffffffff fffff7ff fffffdff fff7ffff??? ................ 400010b0: ffffffff ffffffff fffeffff f7ffffff??? ................ 400010c0: ffffffff ffffffff ffffffff fffffffd??? ................ 400010d0: ffffffff ffdfffff fffdffff ffffffff??? ................ 400010e0: 7fff7ffd ffffffff 7fffffff ffffffff??? ................ 400010f0: ffffff7f ffbfffbf ffffdfff fffffffe??? ................ U-Boot> usb read 40001000 0 10

usb read: device 0 block # 0, count 16 ... 16 blocks read: OK U-Boot> md 40001000
40001000: 1000b8fa 00bcd08e 0000b8b0 c08ed88e??? ................ 40001010: 7c00befb b90600bf a4f30200 000621ea??? ...|.........!.. 40001020: 07bebe00 0b750438 8110c683 7507fefe??? ....8.u........u 40001030: b416ebf3 bb01b002 80b27c00 8b01748a??? .........|...t.. 40001040: 13cd024c 007c00ea 00feeb00 00000000??? L.....|......... 40001050: 00000000 00000000 00000000 00000000??? ................ 40001060: 00000000 00000000 00000000 00000000??? ................ 40001070: 00000000 00000000 00000000 00000000??? ................ 40001080: 00000000 00000000 00000000 00000000??? ................ 40001090: 00000000 00000000 00000000 00000000??? ................ 400010a0: 00000000 00000000 00000000 00000000??? ................ 400010b0: 00000000 00000000 00000000 00000000??? ................ 400010c0: 00000000 00000000 00000000 00000000??? ................ 400010d0: 00000000 00000000 00000000 00000000??? ................ 400010e0: 00000000 00000000 00000000 00000000??? ................ 400010f0: 00000000 00000000 00000000 00000000??? ................ U-Boot> md 80001000
80001000: 6d254fbc 252fa38e e985672f 03b6d513??? .O%m../%/g...... 80001010: 3e681fbe d65269ad b503e985 be48b50b ..h>.iR.......H. 80001020: 6ddacf4f 25d0a371 e97a67d9 0341d5ec??? O..mq..%.gz...A. 80001030: 3e971fc1 d6ad695e b5f4e96e beb7b5f4 ...>^i..n....... 80001040: dd117c69 5c71e187 42f6a0c7 1c71f2e6??? i|....q\...B..q. 80001050: b6c2f1cb 63a6939a 945719b1 21cf29ad??? .......c..W..).! 80001060: ddeefc9e 5c8ce97e 4209a82e 1c86520d??? ....~..\...B.R.. 80001070: b6b53164 63599365 c4a8194e a030a952??? d1..e.YcN...R.0. 80001080: d9d1919f be400dbd 98d16e64 22e6f443??? ...... at .dn..C.." 80001090: 567291df 12f2eae6 8c555bba bf08666e??? ..rV.....[U.nf.. 800010a0: d82e9164 febf8dc6 d82feebf 2211f4ae??? d........./...." 800010b0: 568d1160 1205ea3b 8ca31b45 3ff7a681??? `..V;...E......? 800010c0: 11bb547b 46761efb 87165bb6 fc41e2ce??? {T....vF.[....A. 800010d0: 951b2ba4 4737b38b 3f286527 073e22ee .+....7G'e(?.">. 800010e0: 1144ddaf 46891e87 87e35b49 fcbca221??? ..D....FI[..!... 800010f0: 95e5ab5f 45c9b364 3fd565c8 07c12a17??? _...d..E.e.?.*.. U-Boot> usb read 80001000 0 10

usb read: device 0 block # 0, count 16 ... 16 blocks read: OK U-Boot> md 80001000
80001000: 1000b8fa 00bcd08e 0000b8b0 c08ed88e??? ................ 80001010: 7c00befb b90600bf a4f30200 000621ea??? ...|.........!.. 80001020: 07bebe00 0b750438 8110c683 7507fefe??? ....8.u........u 80001030: b416ebf3 bb01b002 80b27c00 8b01748a??? .........|...t.. 80001040: 13cd024c 007c00ea 00feeb00 00000000??? L.....|......... 80001050: 00000000 00000000 00000000 00000000??? ................ 80001060: 00000000 00000000 00000000 00000000??? ................ 80001070: 00000000 00000000 00000000 00000000??? ................ 80001080: 00000000 00000000 00000000 00000000??? ................ 80001090: 00000000 00000000 00000000 00000000??? ................ 800010a0: 00000000 00000000 00000000 00000000??? ................ 800010b0: 00000000 00000000 00000000 00000000??? ................ 800010c0: 00000000 00000000 00000000 00000000??? ................ 800010d0: 00000000 00000000 00000000 00000000??? ................ 800010e0: 00000000 00000000 00000000 00000000??? ................ 800010f0: 00000000 00000000 00000000 00000000??? ................ U-Boot> md c0001000
c0001000: ff6fffff fffff7ff fffffff7 ffffffff??? ..o.............
c0001010: 7ffffdff ffeff7ff ff7fffff ffffdfff??? ................
c0001020: feffffff ffffbdff ffffffff fffff77f??? ................
c0001030: ffffffff ffdfffff fffffff7 efffffff??? ................
c0001040: fdffffff ffffdfff 7ff5fdff ffffffef??? ................
c0001050: ffbfffff fffffdf7 fff7dfff ffffffff??? ................
c0001060: ff7fffff ffffffff ffffffff ffffffff??? ................
c0001070: dff7ffff ffffffff ffffffff dfffffff??? ................
c0001080: ffffffff fbffffff ffffffff ffffff7f??? ................
c0001090: ffffffdf ff7ffeff ffffffff ffffdfff??? ................
c00010a0: ffffffff ffffffff 7ffffeff ffffdfff??? ................
c00010b0: ffffffff ffffffff ffffffff ffffffff??? ................
c00010c0: feffffff ffffffff ffffbfff 7fffdfff??? ................
c00010d0: ffffffff dfffffff 7fffffff ffffffff??? ................
c00010e0: ffff7fdf ffffffff dfbfffff ffffffff??? ................
c00010f0: ffffffff ffffffff ff7ff5ff ffffffff??? ................ U-Boot> usb read c0001000 0 10

usb read: device 0 block # 0, count 16 ... 16 blocks read: OK U-Boot> md c0001000
c0001000: ff6fffff fffff7ff fffffff7 ffffffff??? ..o.............
c0001010: 7ffffdff ffeff7ff ff7fffff ffffdfff??? ................
c0001020: feffffff ffffbdff ffffffff fffff77f??? ................
c0001030: ffffffff ffdfffff fffffff7 efffffff??? ................
c0001040: fdffffff ffffdfff 7ff5fdff ffffffef??? ................
c0001050: ffbfffff fffffdf7 fff7dfff ffffffff??? ................
c0001060: ff7fffff ffffffff ffffffff ffffffff??? ................
c0001070: dff7ffff ffffffff ffffffff dfffffff??? ................
c0001080: ffffffff fbffffff ffffffff ffffff7f??? ................
c0001090: ffffffdf ff7ffeff ffffffff ffffdfff??? ................
c00010a0: ffffffff ffffffff 7ffffeff ffffdfff??? ................
c00010b0: ffffffff ffffffff ffffffff ffffffff??? ................
c00010c0: feffffff ffffffff ffffbfff 7fffdfff??? ................
c00010d0: ffffffff dfffffff 7fffffff ffffffff??? ................
c00010e0: ffff7fdf ffffffff dfbfffff ffffffff??? ................
c00010f0: ffffffff ffffffff ff7ff5ff ffffffff??? ................ U-Boot>

I think that there cannot be done much about it. u-boot doesn't have any true DMA-mapping layer or a way to express the current limitations. IMHO it is enough that it works for malloc'ed memory and everything else should be considered as not really supported.

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#23 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

Hi Maerk,

Quoted 64 lines · Marek Szyprowski

Hi All,

Quoted 61 lines · Marek Szyprowski
Quoted 52 lines · Nicolas Saenz Julienne
Quoted 15 lines · Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
- reworked to align with current Linux mainline version and u-boot
driver
by Nicolas Saenz Julienne

[...]

drivers/pci/pcie_brcmstb.c line 442

Quoted 8 lines
drivers/pci/pcie_brcmstb.c new file +3 -0
+
+    /*
+     * TODO: Use the base address and size(s) provided in the 

dma-ranges

drivers/pci/pcie_brcmstb.c new file +4 -0
+     * property.
+     */
+    rc_bar2_offset = 0;
+    rc_bar2_size = 1ULL << 32;

From experience this works fine, although it highly depends on how
DMA memory is
handled in u-boot.

For example, in arm64 Linux, DMA memory was allocated from ZONE_DMA32, which
would return memory smaller than 4GB. This was not good enough for bcm2711b0 --
revision b0 of rpi4's SoC, so far the most common out there -- which has an
internal wiring bug that prevents PCIe from accessing memory higher than 3GB
(RPi4 might have up to 4GB). So we had to introduce a ZONE_DMA, which covers
the lower GB of memory, in order to allocate suitable DMA memory for PCI and
other DMA limited devices.

While playing around with u-boot's xHCI I saw that all memory is allocated is
located in the lower 1GB. But never got to look into why. I'm curious to know
if someone knows how's that handled in u-boot. Ultimately, depending on how it
works, we might be able to just disregard dma-ranges altogether.

Quoted 3 lines

For some extra context xhci_malloc() gets its memory from memalign(). And it's
not clear to me how that function decides which memory to use.

I think that memalign() allocates memory from the uboot's defined SDRAM (from its end). Assuming that CONFIG_SYS_SDRAM_SIZE is set to 128M in include/configs/rpi.h it should be always safe, but I will check that tomorrow to be 100% sure.

Thanks for having a look at this!

Quoted 3 lines

Okay, I've checked and memalign always get memory from the malloc pool, which is set almost at the end of the first memory bank (in runtime), so it is always below the first 1GiB. So this should be safe.

I see.

Quoted 2 lines

It is however not safe for explicit reads (and possible other transactions) above 3rd GiB, see the log below:

[...]

Quoted 4 lines

I think that there cannot be done much about it. u-boot doesn't have any true DMA-mapping layer or a way to express the current limitations. IMHO it is enough that it works for malloc'ed memory and everything else should be considered as not really supported.

I agree. And on the good side, it's very unlikeyly we'll ever have to parse the dma-rages.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200428/36ef2d8d/attachment.sig>

#24 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

In reply to Sylwester Nawrocki

Hi Sylwester,

Quoted 14 lines · Sylwester Nawrocki

This patch adds basic driver for the Broadcom STB PCIe host controller. The code is based on Linux upstream driver (pcie-brcmstb.c) with MSI handling removed. The inbound access memory region is not currently parsed from dma-ranges DT property and a fixed 4GB region is used.

The patch has been tested on RPI4 board, i.e. on BCM2711 SoC with VL805 USB Host Controller.

---
Changes since RFC:
- reworked to align with current Linux mainline version and u-boot driver by Nicolas Saenz Julienne

[...]

drivers/pci/pcie_brcmstb.c line 521

Quoted 12 lines
drivers/pci/pcie_brcmstb.c new file +12 -0
+
+	/*
+	 * For config space accesses on the RC, show the right class for
+	 * a PCIe-PCIe bridge (the default setting is to be EP mode).
+	 */
+	tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3);
+	u32p_replace_bits(&tmp, 0x060400,
+			  PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK);
+	writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3);
+
+	if (pcie->ssc) {
+		ret = brcm_pcie_set_ssc(base);

This call should be like this:

	ret = brcm_pcie_set_ssc(pcie);

It builds alright since base is a void pointer. But it obvioulsy causes issues further down the line.

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200428/46d2b639/attachment.sig>

#25 lore raw

PATCH 9/10 pci: Add driver for Broadcom STB PCIe controller

Hi Nicolas,

Quoted 14 lines · Nicolas Saenz Julienne

drivers/pci/pcie_brcmstb.c line 521

Quoted 11 lines
drivers/pci/pcie_brcmstb.c new file +11 -0
+	/*
+	 * For config space accesses on the RC, show the right class for
+	 * a PCIe-PCIe bridge (the default setting is to be EP mode).
+	 */
+	tmp = readl(base + PCIE_RC_CFG_PRIV1_ID_VAL3);
+	u32p_replace_bits(&tmp, 0x060400,
+			  PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK);
+	writel(tmp, base + PCIE_RC_CFG_PRIV1_ID_VAL3);
+
+	if (pcie->ssc) {
+		ret = brcm_pcie_set_ssc(base);

This call should be like this:

Quoted 4 lines
	ret = brcm_pcie_set_ssc(pcie);

It builds alright since base is a void pointer. But it obvioulsy causes issues further down the line.

Thanks for pointing this out, I have fixed it and re-tested again with SSC enabled and disabled.

--
Regards,
Sylwester

#26 lore raw

PATCH 10/10 config: Enable support for the XHCI controller on RPI4 board

In reply to Sylwester Nawrocki

From: Marek Szyprowski <[email protected]>

This requires enabling BRCMSTB PCIe and XHCI_PCI drivers as well as PCI and USB commands. To get it working one has to call the following commands:
"pci enum; usb start;", thus such commands have been added to the default "preboot" environment variable. One has to update their environment if it is already configured to get this feature working out of the box.

---
Changes since RFC:
- none.

---
 configs/rpi_4_32b_defconfig |  9 +++++++++
 configs/rpi_4_defconfig     | 10 ++++++++++
 configs/rpi_arm64_defconfig |  9 ++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
configs/rpi_4_32b_defconfig +9 -0
index 72cda5d..0dd763f 100644
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="pci enum; usb start;"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -15,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_OF_BOARD=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
@@ -28,12 +32,17 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_DM_ETH=y
 CONFIG_BCMGENET=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCI_BRCMSTB=y
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_GENERIC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB_GADGET=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/rpi_4_defconfig +10 -0
index 6d148da..f80e5da 100644
@@ -8,6 +8,8 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="pci enum; usb start;"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -15,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_OF_BOARD=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
@@ -28,12 +32,18 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_DM_ETH=y
 CONFIG_BCMGENET=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCI_BRCMSTB=y
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_GENERIC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_USB_GADGET=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_XHCI_64BIT_DWORD_ACCESS_ONLY=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/rpi_arm64_defconfig +8 -1
index fea86be..926dfc3 100644
@@ -7,13 +7,14 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="usb start"
+CONFIG_PREBOOT="pci enum; usb start;"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_FS_UUID=y
 CONFIG_OF_BOARD=y
@@ -26,11 +27,17 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_DM_ETH=y
 CONFIG_BCMGENET=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCI_BRCMSTB=y
 CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_GENERIC is not set
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_XHCI_64BIT_DWORD_ACCESS_ONLY=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_DWC2=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_HOST_ETHER=y
Signature · 1 line
2.7.4
#27 lore raw

PATCH 10/10 config: Enable support for the XHCI controller on RPI4 board

Quoted 1 line · Sylwester Nawrocki

+CONFIG_XHCI_64BIT_DWORD_ACCESS_ONLY=y

This one slipped trough :)

Regards,
Nicolas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200427/381a8e64/attachment.sig>

#28 lore raw

PATCH 10/10 config: Enable support for the XHCI controller on RPI4 board

Quoted 3 lines · Nicolas Saenz Julienne
Quoted 1 line · Sylwester Nawrocki

+CONFIG_XHCI_64BIT_DWORD_ACCESS_ONLY=y

This one slipped trough :)

Indeed, I have already removed it for next iteration.

Signature · 2 lines
Regards,
Sylwester