[PATCH v3 0/7] Microchip PolarFire SoC support

classic Classic list List threaded Threaded
20 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v3 0/7] Microchip PolarFire SoC support

Padmarao Begari-2
This patch set adds Microchip PolarFire SoC Icicle Kit support
to RISC-V U-Boot.

The patches are based upon latest U-Boot tree
(https://gitlab.denx.de/u-boot/u-boot.git) at commit id
1ae955e3a58f46918ef99b0b6c562967ba1bf39e

All drivers namely: NS16550 Serial, Microchip clock,
Cadence eMMC and Cadence MACB Ethernet work fine on actual
Microchip PolarFire SoC Icicle Kit.

Changes in v3:
- Add 'default y if 64BIT' for config DMA_ADDR_T_64BIT
- Update MACB driver for 32-bit/64-bit DMA based on design config register
- Add phy-handle in MACB driver to read the phy address from device tree
- Fix checkpatch warnings in the clock driver
- Remove fu540 related compatible strings from soc device tree node
- Move refclk device tree node under /soc device tree node
- Use local-mac-address instead of mac-address in the device tree
- Rename device tree to microchip-mpfs-icicle-kit.dts
- Add U-Boot specific dts microchip-mpfs-icicle-kit-u-boot.dtsi file
- Drop the imply DMA_ADDR_T_64BIT from board config
- Fix some typos
- Update doc with Microchip and Custom boot-flow

Changes in v2:
- Add clock frequency for the clint device tree node
- Move peripheral device tree nodes under /soc device tree node
- Device tree nodes are in order based on the address
- Enable UART0 for U-Boot logs
- Update doc for the U-Boot logs are on UART0
- Move clock and reset index source into patch4
- Remove "dma_addr_r" type in the macb driver
- Add lower_32_bits() for 32-bit address in the macb driver
- Add set_rate() returns the new clock rate in the clock driver

Padmarao Begari (7):
  riscv: Add DMA 64-bit address support
  net: macb: Add DMA 64-bit address support for macb
  net: macb: Add phy address to read it from device tree
  clk: Add Microchip PolarFire SoC clock driver
  riscv: dts: Add device tree for Microchip Icicle Kit
  riscv: Add Microchip MPFS Icicle Kit support
  doc: board: Add Microchip MPFS Icicle Kit doc

 arch/riscv/Kconfig                            |   4 +
 arch/riscv/dts/Makefile                       |   1 +
 .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
 arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 +++++++++
 arch/riscv/include/asm/types.h                |   4 +
 board/microchip/mpfs_icicle/Kconfig           |  24 +
 board/microchip/mpfs_icicle/mpfs_icicle.c     |  97 +-
 configs/microchip_mpfs_icicle_defconfig       |   9 +-
 doc/board/index.rst                           |   1 +
 doc/board/microchip/index.rst                 |   9 +
 doc/board/microchip/mpfs_icicle.rst           | 827 ++++++++++++++++++
 drivers/clk/Kconfig                           |   1 +
 drivers/clk/Makefile                          |   1 +
 drivers/clk/microchip/Kconfig                 |   5 +
 drivers/clk/microchip/Makefile                |   1 +
 drivers/clk/microchip/clk_pfsoc.c             | 127 +++
 drivers/clk/microchip/clk_pfsoc.h             |  19 +
 drivers/clk/microchip/clk_pfsoc_cfg.c         | 134 +++
 drivers/clk/microchip/clk_pfsoc_periph.c      | 173 ++++
 drivers/net/macb.c                            | 138 ++-
 drivers/net/macb.h                            |   6 +
 include/configs/microchip_mpfs_icicle.h       |  60 +-
 .../dt-bindings/clock/microchip,pfsoc-clock.h |  45 +
 23 files changed, 2060 insertions(+), 62 deletions(-)
 create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
 create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
 create mode 100644 doc/board/microchip/index.rst
 create mode 100644 doc/board/microchip/mpfs_icicle.rst
 create mode 100644 drivers/clk/microchip/Kconfig
 create mode 100644 drivers/clk/microchip/Makefile
 create mode 100644 drivers/clk/microchip/clk_pfsoc.c
 create mode 100644 drivers/clk/microchip/clk_pfsoc.h
 create mode 100644 drivers/clk/microchip/clk_pfsoc_cfg.c
 create mode 100644 drivers/clk/microchip/clk_pfsoc_periph.c
 create mode 100644 include/dt-bindings/clock/microchip,pfsoc-clock.h

--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 1/7] riscv: Add DMA 64-bit address support

Padmarao Begari-2
dma_addr_t holds any valid DMA address. If the DMA API only uses 32/64-bit
addresses, dma_addr_t need only be 32/64 bits wide.

Signed-off-by: Padmarao Begari <[hidden email]>
Reviewed-by: Anup Patel <[hidden email]>
---
 arch/riscv/Kconfig             | 4 ++++
 arch/riscv/include/asm/types.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 30b05408b1..55eaee2da6 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -152,6 +152,10 @@ config 32BIT
 config 64BIT
  bool
 
+config DMA_ADDR_T_64BIT
+ bool
+ default y if 64BIT
+
 config SIFIVE_CLINT
  bool
  depends on RISCV_MMODE || SPL_RISCV_MMODE
diff --git a/arch/riscv/include/asm/types.h b/arch/riscv/include/asm/types.h
index 403cf9a48f..b800b2d221 100644
--- a/arch/riscv/include/asm/types.h
+++ b/arch/riscv/include/asm/types.h
@@ -29,7 +29,11 @@ typedef unsigned short umode_t;
 
 #include <stddef.h>
 
+#ifdef CONFIG_DMA_ADDR_T_64BIT
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 
 typedef unsigned long phys_addr_t;
 typedef unsigned long phys_size_t;
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 2/7] net: macb: Add DMA 64-bit address support for macb

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
Enable 32-bit or 64-bit DMA in the macb driver based on the design
config debug6 register of MACB hardware which supports 32-bit or
64-bit DMA.

Signed-off-by: Padmarao Begari <[hidden email]>
---
 drivers/net/macb.c | 121 +++++++++++++++++++++++++++++++++++++++------
 drivers/net/macb.h |   6 +++
 2 files changed, 112 insertions(+), 15 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b80a259ff7..9ccbb7a166 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -83,7 +83,16 @@ struct macb_dma_desc {
  u32 ctrl;
 };
 
-#define DMA_DESC_BYTES(n) (n * sizeof(struct macb_dma_desc))
+struct macb_dma_desc_64 {
+ u32 addrh;
+ u32 unused;
+};
+
+#define HW_DMA_CAP_32B 0
+#define HW_DMA_CAP_64B 1
+
+#define DMA_DESC_SIZE 16
+#define DMA_DESC_BYTES(n) ((n) * DMA_DESC_SIZE)
 #define MACB_TX_DMA_DESC_SIZE (DMA_DESC_BYTES(MACB_TX_RING_SIZE))
 #define MACB_RX_DMA_DESC_SIZE (DMA_DESC_BYTES(MACB_RX_RING_SIZE))
 #define MACB_TX_DUMMY_DMA_DESC_SIZE (DMA_DESC_BYTES(1))
@@ -133,6 +142,7 @@ struct macb_device {
 #endif
  phy_interface_t phy_interface;
 #endif
+ unsigned short hw_dma_cap;
 };
 
 struct macb_config {
@@ -307,6 +317,24 @@ static inline void macb_invalidate_rx_buffer(struct macb_device *macb)
 
 #if defined(CONFIG_CMD_NET)
 
+static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc *desc)
+{
+ return (struct macb_dma_desc_64 *)((void *)desc
+ + sizeof(struct macb_dma_desc));
+}
+
+static void macb_set_addr(struct macb_device *macb, struct macb_dma_desc *desc,
+  ulong addr)
+{
+ struct macb_dma_desc_64 *desc_64;
+
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ desc_64 = macb_64b_desc(desc);
+ desc_64->addrh = upper_32_bits(addr);
+ }
+ desc->addr = lower_32_bits(addr);
+}
+
 static int _macb_send(struct macb_device *macb, const char *name, void *packet,
       int length)
 {
@@ -325,8 +353,12 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
  macb->tx_head++;
  }
 
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ tx_head = tx_head * 2;
+
  macb->tx_ring[tx_head].ctrl = ctrl;
- macb->tx_ring[tx_head].addr = paddr;
+ macb_set_addr(macb, &macb->tx_ring[tx_head], paddr);
+
  barrier();
  macb_flush_ring_desc(macb, TX);
  macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
@@ -363,19 +395,28 @@ static void reclaim_rx_buffers(struct macb_device *macb,
        unsigned int new_tail)
 {
  unsigned int i;
+ unsigned int count;
 
  i = macb->rx_tail;
 
  macb_invalidate_ring_desc(macb, RX);
  while (i > new_tail) {
- macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ count = i * 2;
+ else
+ count = i;
+ macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
  i++;
  if (i > MACB_RX_RING_SIZE)
  i = 0;
  }
 
  while (i < new_tail) {
- macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ count = i * 2;
+ else
+ count = i;
+ macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
  i++;
  }
 
@@ -390,16 +431,25 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
  void *buffer;
  int length;
  u32 status;
+ u8 flag = false;
 
  macb->wrapped = false;
  for (;;) {
  macb_invalidate_ring_desc(macb, RX);
 
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ next_rx_tail = next_rx_tail * 2;
+
  if (!(macb->rx_ring[next_rx_tail].addr & MACB_BIT(RX_USED)))
  return -EAGAIN;
 
  status = macb->rx_ring[next_rx_tail].ctrl;
  if (status & MACB_BIT(RX_SOF)) {
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ next_rx_tail = next_rx_tail / 2;
+ flag = true;
+ }
+
  if (next_rx_tail != macb->rx_tail)
  reclaim_rx_buffers(macb, next_rx_tail);
  macb->wrapped = false;
@@ -426,11 +476,22 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
  *packetp = buffer;
  }
 
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ if (!flag)
+ next_rx_tail = next_rx_tail / 2;
+ }
+
  if (++next_rx_tail >= MACB_RX_RING_SIZE)
  next_rx_tail = 0;
  macb->next_rx_tail = next_rx_tail;
  return length;
  } else {
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ if (!flag)
+ next_rx_tail = next_rx_tail / 2;
+ flag = false;
+ }
+
  if (++next_rx_tail >= MACB_RX_RING_SIZE) {
  macb->wrapped = true;
  next_rx_tail = 0;
@@ -718,6 +779,7 @@ static int gmac_init_multi_queues(struct macb_device *macb)
 {
  int i, num_queues = 1;
  u32 queue_mask;
+ unsigned long paddr;
 
  /* bit 0 is never set but queue 0 always exists */
  queue_mask = gem_readl(macb, DCFG6) & 0xff;
@@ -731,10 +793,18 @@ static int gmac_init_multi_queues(struct macb_device *macb)
  macb->dummy_desc->addr = 0;
  flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma +
  ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN));
-
- for (i = 1; i < num_queues; i++)
- gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i - 1);
-
+ paddr = macb->dummy_desc_dma;
+
+ for (i = 1; i < num_queues; i++) {
+ gem_writel_queue_TBQP(macb, lower_32_bits(paddr), i - 1);
+ gem_writel_queue_RBQP(macb, lower_32_bits(paddr), i - 1);
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ gem_writel_queue_TBQPH(macb, upper_32_bits(paddr),
+       i - 1);
+ gem_writel_queue_RBQPH(macb, upper_32_bits(paddr),
+       i - 1);
+ }
+ }
  return 0;
 }
 
@@ -760,6 +830,9 @@ static void gmac_configure_dma(struct macb_device *macb)
  dmacfg &= ~GEM_BIT(ENDIA_DESC);
 
  dmacfg &= ~GEM_BIT(ADDR64);
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ dmacfg |= GEM_BIT(ADDR64);
+
  gem_writel(macb, DMACFG, dmacfg);
 }
 
@@ -775,6 +848,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
  unsigned long paddr;
  int ret;
  int i;
+ int count;
+
+ if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
+ macb->hw_dma_cap = HW_DMA_CAP_64B;
+ else
+ macb->hw_dma_cap = HW_DMA_CAP_32B;
 
  /*
  * macb_halt should have been called at some point before now,
@@ -786,20 +865,28 @@ static int _macb_init(struct macb_device *macb, const char *name)
  for (i = 0; i < MACB_RX_RING_SIZE; i++) {
  if (i == (MACB_RX_RING_SIZE - 1))
  paddr |= MACB_BIT(RX_WRAP);
- macb->rx_ring[i].addr = paddr;
- macb->rx_ring[i].ctrl = 0;
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ count = i * 2;
+ else
+ count = i;
+ macb->rx_ring[count].ctrl = 0;
+ macb_set_addr(macb, &macb->rx_ring[count], paddr);
  paddr += macb->rx_buffer_size;
  }
  macb_flush_ring_desc(macb, RX);
  macb_flush_rx_buffer(macb);
 
  for (i = 0; i < MACB_TX_RING_SIZE; i++) {
- macb->tx_ring[i].addr = 0;
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B)
+ count = i * 2;
+ else
+ count = i;
+ macb_set_addr(macb, &macb->tx_ring[count], 0);
  if (i == (MACB_TX_RING_SIZE - 1))
- macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) |
+ macb->tx_ring[count].ctrl = MACB_BIT(TX_USED) |
  MACB_BIT(TX_WRAP);
  else
- macb->tx_ring[i].ctrl = MACB_BIT(TX_USED);
+ macb->tx_ring[count].ctrl = MACB_BIT(TX_USED);
  }
  macb_flush_ring_desc(macb, TX);
 
@@ -812,8 +899,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
  gem_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
 #endif
 
- macb_writel(macb, RBQP, macb->rx_ring_dma);
- macb_writel(macb, TBQP, macb->tx_ring_dma);
+ macb_writel(macb, RBQP, lower_32_bits(macb->rx_ring_dma));
+ macb_writel(macb, TBQP, lower_32_bits(macb->tx_ring_dma));
+ if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
+ macb_writel(macb, RBQPH, upper_32_bits(macb->rx_ring_dma));
+ macb_writel(macb, TBQPH, upper_32_bits(macb->tx_ring_dma));
+ }
 
  if (macb_is_gem(macb)) {
  /* Initialize DMA properties */
diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index 9b16383eba..72b84ae96e 100644
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -768,5 +768,11 @@
 #define GEM_RX_CSUM_CHECKED_MASK 2
 #define gem_writel_queue_TBQP(port, value, queue_num) \
  writel((value), (port)->regs + GEM_TBQP(queue_num))
+#define gem_writel_queue_TBQPH(port, value, queue_num) \
+ writel((value), (port)->regs + GEM_TBQPH(queue_num))
+#define gem_writel_queue_RBQP(port, value, queue_num) \
+ writel((value), (port)->regs + GEM_RBQP(queue_num))
+#define gem_writel_queue_RBQPH(port, value, queue_num) \
+ writel((value), (port)->regs + GEM_RBQPH(queue_num))
 
 #endif /* __DRIVERS_MACB_H__ */
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 3/7] net: macb: Add phy address to read it from device tree

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
Read phy address from device tree and use it to find the phy device
if not found then search in the range of 0 to 31.

Signed-off-by: Padmarao Begari <[hidden email]>
---
 drivers/net/macb.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 9ccbb7a166..81b1f1ba26 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -531,6 +531,12 @@ static int macb_phy_find(struct macb_device *macb, const char *name)
  int i;
  u16 phy_id;
 
+ phy_id = macb_mdio_read(macb, macb->phy_addr, MII_PHYSID1);
+ if (phy_id != 0xffff) {
+ printf("%s: PHY present at %d\n", name, macb->phy_addr);
+ return 0;
+ }
+
  /* Search for PHY... */
  for (i = 0; i < 32; i++) {
  macb->phy_addr = i;
@@ -1315,11 +1321,12 @@ static int macb_eth_probe(struct udevice *dev)
 {
  struct eth_pdata *pdata = dev_get_platdata(dev);
  struct macb_device *macb = dev_get_priv(dev);
+ struct ofnode_phandle_args phandle_args;
  const char *phy_mode;
  int ret;
 
- phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
-       NULL);
+ phy_mode = dev_read_prop(dev, "phy-mode", NULL);
+
  if (phy_mode)
  macb->phy_interface = phy_get_interface_by_name(phy_mode);
  if (macb->phy_interface == -1) {
@@ -1327,6 +1334,12 @@ static int macb_eth_probe(struct udevice *dev)
  return -EINVAL;
  }
 
+ /* Read phyaddr from DT */
+ if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
+ &phandle_args))
+ macb->phy_addr = ofnode_read_u32_default(phandle_args.node,
+ "reg", -1);
+
  macb->regs = (void *)pdata->iobase;
 
  macb->is_big_endian = (cpu_to_be32(0x12345678) == 0x12345678);
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 4/7] clk: Add Microchip PolarFire SoC clock driver

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
Add clock driver code for the Microchip PolarFire SoC. This driver
handles reset and clock control of the Microchip PolarFire SoC device.

Signed-off-by: Padmarao Begari <[hidden email]>
Reviewed-by: Anup Patel <[hidden email]>
---
 drivers/clk/Kconfig                           |   1 +
 drivers/clk/Makefile                          |   1 +
 drivers/clk/microchip/Kconfig                 |   5 +
 drivers/clk/microchip/Makefile                |   1 +
 drivers/clk/microchip/clk_pfsoc.c             | 127 +++++++++++++
 drivers/clk/microchip/clk_pfsoc.h             |  19 ++
 drivers/clk/microchip/clk_pfsoc_cfg.c         | 134 ++++++++++++++
 drivers/clk/microchip/clk_pfsoc_periph.c      | 173 ++++++++++++++++++
 .../dt-bindings/clock/microchip,pfsoc-clock.h |  45 +++++
 9 files changed, 506 insertions(+)
 create mode 100644 drivers/clk/microchip/Kconfig
 create mode 100644 drivers/clk/microchip/Makefile
 create mode 100644 drivers/clk/microchip/clk_pfsoc.c
 create mode 100644 drivers/clk/microchip/clk_pfsoc.h
 create mode 100644 drivers/clk/microchip/clk_pfsoc_cfg.c
 create mode 100644 drivers/clk/microchip/clk_pfsoc_periph.c
 create mode 100644 include/dt-bindings/clock/microchip,pfsoc-clock.h

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 4dfbad7986..1161fe7b5a 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -173,6 +173,7 @@ source "drivers/clk/exynos/Kconfig"
 source "drivers/clk/imx/Kconfig"
 source "drivers/clk/kendryte/Kconfig"
 source "drivers/clk/meson/Kconfig"
+source "drivers/clk/microchip/Kconfig"
 source "drivers/clk/mvebu/Kconfig"
 source "drivers/clk/owl/Kconfig"
 source "drivers/clk/renesas/Kconfig"
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index d1e295ac7c..bd8a6eed88 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_CLK_EXYNOS) += exynos/
 obj-$(CONFIG_$(SPL_TPL_)CLK_INTEL) += intel/
 obj-$(CONFIG_CLK_HSDK) += clk-hsdk-cgu.o
 obj-$(CONFIG_CLK_K210) += kendryte/
+obj-$(CONFIG_CLK_MPFS) += microchip/
 obj-$(CONFIG_CLK_MPC83XX) += mpc83xx_clk.o
 obj-$(CONFIG_CLK_OCTEON) += clk_octeon.o
 obj-$(CONFIG_CLK_OWL) += owl/
diff --git a/drivers/clk/microchip/Kconfig b/drivers/clk/microchip/Kconfig
new file mode 100644
index 0000000000..b70241559d
--- /dev/null
+++ b/drivers/clk/microchip/Kconfig
@@ -0,0 +1,5 @@
+config CLK_MPFS
+ bool "Clock support for Microchip PolarFire SoC"
+ depends on CLK && CLK_CCF
+ help
+  This enables support clock driver for Microchip PolarFire SoC platform.
diff --git a/drivers/clk/microchip/Makefile b/drivers/clk/microchip/Makefile
new file mode 100644
index 0000000000..c7f5ad21ae
--- /dev/null
+++ b/drivers/clk/microchip/Makefile
@@ -0,0 +1 @@
+obj-y += clk_pfsoc.o clk_pfsoc_cfg.o clk_pfsoc_periph.o
diff --git a/drivers/clk/microchip/clk_pfsoc.c b/drivers/clk/microchip/clk_pfsoc.c
new file mode 100644
index 0000000000..dd0e9cacb8
--- /dev/null
+++ b/drivers/clk/microchip/clk_pfsoc.c
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+#include <common.h>
+#include <clk.h>
+#include <clk-uclass.h>
+#include <dm.h>
+#include <log.h>
+#include <dm/device.h>
+#include <dm/devres.h>
+#include <dm/uclass.h>
+#include <malloc.h>
+#include <linux/err.h>
+
+#include "clk_pfsoc.h"
+
+/* All methods are delegated to CCF clocks */
+
+static ulong pfsoc_clk_get_rate(struct clk *clk)
+{
+ struct clk *c;
+ int err = clk_get_by_id(clk->id, &c);
+
+ if (err)
+ return err;
+ return clk_get_rate(c);
+}
+
+static ulong pfsoc_clk_set_rate(struct clk *clk, unsigned long rate)
+{
+ struct clk *c;
+ int err = clk_get_by_id(clk->id, &c);
+
+ if (err)
+ return err;
+ return clk_set_rate(c, rate);
+}
+
+static int pfsoc_clk_set_parent(struct clk *clk, struct clk *parent)
+{
+ struct clk *c, *p;
+ int err = clk_get_by_id(clk->id, &c);
+
+ if (err)
+ return err;
+
+ err = clk_get_by_id(parent->id, &p);
+ if (err)
+ return err;
+
+ return clk_set_parent(c, p);
+}
+
+static int pfsoc_clk_endisable(struct clk *clk, bool enable)
+{
+ struct clk *c;
+ int err = clk_get_by_id(clk->id, &c);
+
+ if (err)
+ return err;
+ return enable ? clk_enable(c) : clk_disable(c);
+}
+
+static int pfsoc_clk_enable(struct clk *clk)
+{
+ return pfsoc_clk_endisable(clk, true);
+}
+
+static int pfsoc_clk_disable(struct clk *clk)
+{
+ return pfsoc_clk_endisable(clk, false);
+}
+
+static int pfsoc_clk_probe(struct udevice *dev)
+{
+ int ret;
+ void __iomem *base;
+ u32 clk_rate;
+ struct clk *clk;
+ const char *parent_clk_name;
+
+ base = dev_read_addr_ptr(dev);
+ if (!base)
+ return -ENODEV;
+
+ clk = kzalloc(sizeof(*clk), GFP_KERNEL);
+ if (!clk)
+ return -ENOMEM;
+
+ ret = clk_get_by_index(dev, 0, clk);
+ if (ret)
+ return ret;
+
+ dev_read_u32(clk->dev, "clock-frequency", &clk_rate);
+ parent_clk_name = clk->dev->name;
+
+ ret = pfsoc_clk_register_cfgs(base, clk_rate, parent_clk_name);
+ if (ret)
+ return ret;
+
+ ret = pfsoc_clk_register_periphs(base, clk_rate, "clk_ahb");
+
+ return ret;
+}
+
+static const struct clk_ops pfsoc_clk_ops = {
+ .set_rate = pfsoc_clk_set_rate,
+ .get_rate = pfsoc_clk_get_rate,
+ .set_parent = pfsoc_clk_set_parent,
+ .enable = pfsoc_clk_enable,
+ .disable = pfsoc_clk_disable,
+};
+
+static const struct udevice_id pfsoc_of_match[] = {
+ { .compatible = "microchip,pfsoc-clkcfg" },
+ { }
+};
+
+U_BOOT_DRIVER(pfsoc_clk) = {
+ .name = "pfsoc_clk",
+ .id = UCLASS_CLK,
+ .of_match = pfsoc_of_match,
+ .ops = &pfsoc_clk_ops,
+ .probe = pfsoc_clk_probe,
+};
diff --git a/drivers/clk/microchip/clk_pfsoc.h b/drivers/clk/microchip/clk_pfsoc.h
new file mode 100644
index 0000000000..2647c8e36a
--- /dev/null
+++ b/drivers/clk/microchip/clk_pfsoc.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+#ifndef __MICROCHIP_PFSOC_CLK_H
+#define __MICROCHIP_PFSOC_CLK_H
+
+#include <linux/clk-provider.h>
+
+int pfsoc_clk_register_cfgs(void __iomem *base, u32 clk_rate,
+    const char *parent_name);
+int pfsoc_clk_register_periphs(void __iomem *base, u32 clk_rate,
+       const char *parent_name);
+int divider_get_val(unsigned long rate, unsigned long parent_rate,
+    const struct clk_div_table *table,
+    u8 width, unsigned long flags);
+
+#endif /* __MICROCHIP_PFSOC_CLK_H */
diff --git a/drivers/clk/microchip/clk_pfsoc_cfg.c b/drivers/clk/microchip/clk_pfsoc_cfg.c
new file mode 100644
index 0000000000..e41a223ae6
--- /dev/null
+++ b/drivers/clk/microchip/clk_pfsoc_cfg.c
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+#include <common.h>
+#include <clk.h>
+#include <clk-uclass.h>
+#include <dm/device.h>
+#include <dm/devres.h>
+#include <dm/uclass.h>
+#include <asm/io.h>
+#include <linux/err.h>
+#include <dt-bindings/clock/microchip,pfsoc-clock.h>
+
+#include "clk_pfsoc.h"
+
+#define PFSOC_CFG_CLOCK "pfsoc_cfg_clock"
+
+#define REG_CLOCK_CONFIG_CR 0x08
+
+static const struct clk_div_table pfsoc_div_cpu_axi_table[] = {
+ { 0, 1 }, { 1, 2 }, { 2, 4 }, { 3, 8 },
+ { 0, 0 }
+};
+
+static const struct clk_div_table pfsoc_div_ahb_table[] = {
+ { 1, 2 }, { 2, 4}, { 3, 8 },
+ { 0, 0 }
+};
+
+struct pfsoc_cfg_clock {
+ unsigned int id;
+ const char *name;
+ u8 shift;
+ u8 width;
+ const struct clk_div_table *table;
+ unsigned long flags;
+};
+
+struct pfsoc_cfg_hw_clock {
+ struct pfsoc_cfg_clock cfg;
+ void __iomem *sys_base;
+ u32 prate;
+ struct clk hw;
+};
+
+#define to_pfsoc_cfg_clk(_hw) container_of(_hw, struct pfsoc_cfg_hw_clock, hw)
+
+static ulong pfsoc_cfg_clk_recalc_rate(struct clk *hw)
+{
+ struct pfsoc_cfg_hw_clock *cfg_hw = to_pfsoc_cfg_clk(hw);
+ struct pfsoc_cfg_clock *cfg = &cfg_hw->cfg;
+ void __iomem *base_addr = cfg_hw->sys_base;
+ unsigned long rate;
+ u32 val;
+
+ val = readl(base_addr + REG_CLOCK_CONFIG_CR) >> cfg->shift;
+ val &= clk_div_mask(cfg->width);
+ rate = cfg_hw->prate / (1u << val);
+ hw->rate = rate;
+
+ return rate;
+}
+
+static ulong pfsoc_cfg_clk_set_rate(struct clk *hw, ulong rate)
+{
+ struct pfsoc_cfg_hw_clock *cfg_hw = to_pfsoc_cfg_clk(hw);
+ struct pfsoc_cfg_clock *cfg = &cfg_hw->cfg;
+ void __iomem *base_addr = cfg_hw->sys_base;
+ u32  val;
+ int divider_setting;
+
+ divider_setting = divider_get_val(rate, cfg_hw->prate, cfg->table, cfg->width, cfg->flags);
+
+ if (divider_setting < 0)
+ return divider_setting;
+
+ val = readl(base_addr + REG_CLOCK_CONFIG_CR);
+ val &= ~(clk_div_mask(cfg->width) << cfg_hw->cfg.shift);
+ val |= divider_setting << cfg->shift;
+ writel(val, base_addr + REG_CLOCK_CONFIG_CR);
+
+ return clk_get_rate(hw);
+}
+
+#define CLK_CFG(_id, _name, _shift, _width, _table, _flags) { \
+ .cfg.id = _id, \
+ .cfg.name = _name, \
+ .cfg.shift = _shift, \
+ .cfg.width = _width, \
+ .cfg.table = _table, \
+ .cfg.flags = _flags, \
+ }
+
+static struct pfsoc_cfg_hw_clock pfsoc_cfg_clks[] = {
+ CLK_CFG(CLK_CPU, "clk_cpu", 0, 2, pfsoc_div_cpu_axi_table, 0),
+ CLK_CFG(CLK_AXI, "clk_axi", 2, 2, pfsoc_div_cpu_axi_table, 0),
+ CLK_CFG(CLK_AHB, "clk_ahb", 4, 2, pfsoc_div_ahb_table, 0),
+};
+
+int pfsoc_clk_register_cfgs(void __iomem *base, u32 clk_rate,
+    const char *parent_name)
+{
+ int ret;
+ int i, id, num_clks;
+ const char *name;
+ struct clk *hw;
+
+ num_clks = ARRAY_SIZE(pfsoc_cfg_clks);
+ for (i = 0; i < num_clks; i++) {
+ hw = &pfsoc_cfg_clks[i].hw;
+ pfsoc_cfg_clks[i].sys_base = base;
+ pfsoc_cfg_clks[i].prate = clk_rate;
+ name = pfsoc_cfg_clks[i].cfg.name;
+ ret = clk_register(hw, PFSOC_CFG_CLOCK, name, parent_name);
+ if (ret)
+ ERR_PTR(ret);
+ id = pfsoc_cfg_clks[i].cfg.id;
+ clk_dm(id, hw);
+ }
+ return 0;
+}
+
+const struct clk_ops pfsoc_cfg_clk_ops = {
+ .set_rate = pfsoc_cfg_clk_set_rate,
+ .get_rate = pfsoc_cfg_clk_recalc_rate,
+};
+
+U_BOOT_DRIVER(pfsoc_cfg_clock) = {
+ .name = PFSOC_CFG_CLOCK,
+ .id = UCLASS_CLK,
+ .ops = &pfsoc_cfg_clk_ops,
+};
diff --git a/drivers/clk/microchip/clk_pfsoc_periph.c b/drivers/clk/microchip/clk_pfsoc_periph.c
new file mode 100644
index 0000000000..3a3243a119
--- /dev/null
+++ b/drivers/clk/microchip/clk_pfsoc_periph.c
@@ -0,0 +1,173 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+#include <common.h>
+#include <clk.h>
+#include <clk-uclass.h>
+#include <dm/device.h>
+#include <dm/devres.h>
+#include <dm/uclass.h>
+#include <asm/io.h>
+#include <linux/err.h>
+#include <dt-bindings/clock/microchip,pfsoc-clock.h>
+
+#include "clk_pfsoc.h"
+
+#define PFSOC_PERIPH_CLOCK "pfsoc_periph_clock"
+
+#define REG_CLOCK_CONFIG_CR 0x08
+#define REG_SUBBLK_CLOCK_CR 0x84
+#define REG_SUBBLK_RESET_CR 0x88
+
+#define CFG_CPU_SHIFT   0x0
+#define CFG_AXI_SHIFT   0x2
+#define CFG_AHB_SHIFT   0x4
+#define CFG_WIDTH       0x2
+
+struct pfsoc_periph_clock {
+ unsigned int id;
+ const char *name;
+ u8 shift;
+ unsigned long flags;
+};
+
+struct pfsoc_periph_hw_clock {
+ struct pfsoc_periph_clock periph;
+ void __iomem *sys_base;
+ u32 prate;
+ struct clk hw;
+};
+
+#define to_pfsoc_periph_clk(_hw) container_of(_hw, struct pfsoc_periph_hw_clock, hw)
+
+static int pfsoc_periph_clk_enable(struct clk *hw)
+{
+ struct pfsoc_periph_hw_clock *periph_hw = to_pfsoc_periph_clk(hw);
+ struct pfsoc_periph_clock *periph = &periph_hw->periph;
+ void __iomem *base_addr = periph_hw->sys_base;
+ u32 reg, val;
+
+ if (periph->flags != CLK_IS_CRITICAL) {
+ reg = readl(base_addr + REG_SUBBLK_RESET_CR);
+ val = reg & ~(1u << periph->shift);
+ writel(val, base_addr + REG_SUBBLK_RESET_CR);
+
+ reg = readl(base_addr + REG_SUBBLK_CLOCK_CR);
+ val = reg | (1u << periph->shift);
+ writel(val, base_addr + REG_SUBBLK_CLOCK_CR);
+ }
+
+ return 0;
+}
+
+static int pfsoc_periph_clk_disable(struct clk *hw)
+{
+ struct pfsoc_periph_hw_clock *periph_hw = to_pfsoc_periph_clk(hw);
+ struct pfsoc_periph_clock *periph = &periph_hw->periph;
+ void __iomem *base_addr = periph_hw->sys_base;
+ u32 reg, val;
+
+ if (periph->flags != CLK_IS_CRITICAL) {
+ reg = readl(base_addr + REG_SUBBLK_RESET_CR);
+ val = reg | (1u << periph->shift);
+ writel(val, base_addr + REG_SUBBLK_RESET_CR);
+
+ reg = readl(base_addr + REG_SUBBLK_CLOCK_CR);
+ val = reg & ~(1u << periph->shift);
+ writel(val, base_addr + REG_SUBBLK_CLOCK_CR);
+ }
+
+ return 0;
+}
+
+static ulong pfsoc_periph_clk_recalc_rate(struct clk *hw)
+{
+ struct pfsoc_periph_hw_clock *periph_hw = to_pfsoc_periph_clk(hw);
+ void __iomem *base_addr = periph_hw->sys_base;
+ unsigned long rate;
+ u32 val;
+
+ val = readl(base_addr + REG_CLOCK_CONFIG_CR) >> CFG_AHB_SHIFT;
+ val &= clk_div_mask(CFG_WIDTH);
+ rate = periph_hw->prate / (1u << val);
+ hw->rate = rate;
+
+ return rate;
+}
+
+#define CLK_PERIPH(_id, _name, _shift, _flags) { \
+ .periph.id = _id, \
+ .periph.name = _name, \
+ .periph.shift = _shift, \
+ .periph.flags = _flags, \
+ }
+
+static struct pfsoc_periph_hw_clock pfsoc_periph_clks[] = {
+ CLK_PERIPH(CLK_ENVM, "clk_periph_envm", 0, CLK_IS_CRITICAL),
+ CLK_PERIPH(CLK_MAC0, "clk_periph_mac0", 1, 0),
+ CLK_PERIPH(CLK_MAC1, "clk_periph_mac1", 2, 0),
+ CLK_PERIPH(CLK_MMC, "clk_periph_mmc", 3, 0),
+ CLK_PERIPH(CLK_TIMER, "clk_periph_timer", 4, 0),
+ CLK_PERIPH(CLK_MMUART0, "clk_periph_mmuart0", 5, 0),
+ CLK_PERIPH(CLK_MMUART1, "clk_periph_mmuart1", 6, 0),
+ CLK_PERIPH(CLK_MMUART2, "clk_periph_mmuart2", 7, 0),
+ CLK_PERIPH(CLK_MMUART3, "clk_periph_mmuart3", 8, 0),
+ CLK_PERIPH(CLK_MMUART4, "clk_periph_mmuart4", 9, 0),
+ CLK_PERIPH(CLK_SPI0, "clk_periph_spi0", 10, 0),
+ CLK_PERIPH(CLK_SPI1, "clk_periph_spi1", 11, 0),
+ CLK_PERIPH(CLK_I2C0, "clk_periph_i2c0", 12, 0),
+ CLK_PERIPH(CLK_I2C1, "clk_periph_i2c1", 13, 0),
+ CLK_PERIPH(CLK_CAN0, "clk_periph_can0", 14, 0),
+ CLK_PERIPH(CLK_CAN1, "clk_periph_can1", 15, 0),
+ CLK_PERIPH(CLK_USB, "clk_periph_usb", 16, 0),
+ CLK_PERIPH(CLK_RTC, "clk_periph_rtc", 18, 0),
+ CLK_PERIPH(CLK_QSPI, "clk_periph_qspi", 19, 0),
+ CLK_PERIPH(CLK_GPIO0, "clk_periph_gpio0", 20, 0),
+ CLK_PERIPH(CLK_GPIO1, "clk_periph_gpio1", 21, 0),
+ CLK_PERIPH(CLK_GPIO2, "clk_periph_gpio2", 22, 0),
+ CLK_PERIPH(CLK_DDRC, "clk_periph_ddrc", 23, CLK_IS_CRITICAL),
+ CLK_PERIPH(CLK_FIC0, "clk_periph_fic0", 24, 0),
+ CLK_PERIPH(CLK_FIC1, "clk_periph_fic1", 25, 0),
+ CLK_PERIPH(CLK_FIC2, "clk_periph_fic2", 26, 0),
+ CLK_PERIPH(CLK_FIC3, "clk_periph_fic3", 27, 0),
+ CLK_PERIPH(CLK_ATHENA, "clk_periph_athena", 28, 0),
+ CLK_PERIPH(CLK_CFM, "clk_periph_cfm", 29, 0),
+};
+
+int pfsoc_clk_register_periphs(void __iomem *base, u32 clk_rate,
+       const char *parent_name)
+{
+ int ret;
+ int i, id, num_clks;
+ const char *name;
+ struct clk *hw;
+
+ num_clks = ARRAY_SIZE(pfsoc_periph_clks);
+ for (i = 0; i < num_clks; i++)  {
+ hw = &pfsoc_periph_clks[i].hw;
+ pfsoc_periph_clks[i].sys_base = base;
+ pfsoc_periph_clks[i].prate = clk_rate;
+ name = pfsoc_periph_clks[i].periph.name;
+ ret = clk_register(hw, PFSOC_PERIPH_CLOCK, name, parent_name);
+ if (ret)
+ ERR_PTR(ret);
+ id = pfsoc_periph_clks[i].periph.id;
+ clk_dm(id, hw);
+ }
+
+ return 0;
+}
+
+const struct clk_ops pfsoc_periph_clk_ops = {
+ .enable = pfsoc_periph_clk_enable,
+ .disable = pfsoc_periph_clk_disable,
+ .get_rate = pfsoc_periph_clk_recalc_rate,
+};
+
+U_BOOT_DRIVER(pfsoc_periph_clock) = {
+ .name = PFSOC_PERIPH_CLOCK,
+ .id = UCLASS_CLK,
+ .ops = &pfsoc_periph_clk_ops,
+};
diff --git a/include/dt-bindings/clock/microchip,pfsoc-clock.h b/include/dt-bindings/clock/microchip,pfsoc-clock.h
new file mode 100644
index 0000000000..527cff1a28
--- /dev/null
+++ b/include/dt-bindings/clock/microchip,pfsoc-clock.h
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+
+#ifndef _DT_BINDINGS_CLK_MICROCHIP_PFSOC_H_
+#define _DT_BINDINGS_CLK_MICROCHIP_PFSOC_H_
+
+#define CLK_CPU 0
+#define CLK_AXI 1
+#define CLK_AHB 2
+
+#define CLK_ENVM 3
+#define CLK_MAC0 4
+#define CLK_MAC1 5
+#define CLK_MMC 6
+#define CLK_TIMER 7
+#define CLK_MMUART0 8
+#define CLK_MMUART1 9
+#define CLK_MMUART2 10
+#define CLK_MMUART3 11
+#define CLK_MMUART4 12
+#define CLK_SPI0 13
+#define CLK_SPI1 14
+#define CLK_I2C0 15
+#define CLK_I2C1 16
+#define CLK_CAN0 17
+#define CLK_CAN1 18
+#define CLK_USB 19
+#define CLK_RESERVED 20
+#define CLK_RTC 21
+#define CLK_QSPI 22
+#define CLK_GPIO0 23
+#define CLK_GPIO1 24
+#define CLK_GPIO2 25
+#define CLK_DDRC 26
+#define CLK_FIC0 27
+#define CLK_FIC1 28
+#define CLK_FIC2 29
+#define CLK_FIC3 30
+#define CLK_ATHENA 31
+#define CLK_CFM 32
+
+#endif /* _DT_BINDINGS_CLK_MICROCHIP_PFSOC_H_ */
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
Add device tree for Microchip PolarFire SoC Icicle Kit.

Signed-off-by: Padmarao Begari <[hidden email]>
Reviewed-by: Anup Patel <[hidden email]>
---
 arch/riscv/dts/Makefile                       |   1 +
 .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
 arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
 3 files changed, 437 insertions(+)
 create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
 create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts

diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
index 3a6f96c67d..01331b0aa1 100644
--- a/arch/riscv/dts/Makefile
+++ b/arch/riscv/dts/Makefile
@@ -3,6 +3,7 @@
 dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb
 dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb
 dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb
+dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb
 
 targets += $(dtb-y)
 
diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
new file mode 100644
index 0000000000..f1738c8a24
--- /dev/null
+++ b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2020 Microchip Technology Inc.
+ * Padmarao Begari <[hidden email]>
+ */
+
+/ {
+ aliases {
+ cpu1 = &cpu1;
+ cpu2 = &cpu2;
+ cpu3 = &cpu3;
+ cpu4 = &cpu4;
+ };
+};
+
diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
new file mode 100644
index 0000000000..67e797255b
--- /dev/null
+++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
@@ -0,0 +1,421 @@
+// SPDX-License-Identifier: GPL-2.0+
+/* Copyright (c) 2020 Microchip Technology Inc */
+
+/dts-v1/;
+#include "dt-bindings/clock/microchip,pfsoc-clock.h"
+
+/* Clock frequency (in Hz) of the rtcclk */
+#define RTCCLK_FREQ 1000000
+
+/ {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ model = "Microchip PolarFire-SoC";
+ compatible = "microchip,polarfire-soc";
+
+ aliases {
+ serial0 = &uart0;
+ ethernet0 = &emac1;
+ };
+
+ chosen {
+ stdout-path = "serial0";
+ };
+
+ cpucomplex: cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ timebase-frequency = <RTCCLK_FREQ>;
+ cpu0: cpu@0 {
+ clocks = <&clkcfg CLK_CPU>;
+ compatible = "sifive,e51", "sifive,rocket0", "riscv";
+ device_type = "cpu";
+ i-cache-block-size = <64>;
+ i-cache-sets = <128>;
+ i-cache-size = <16384>;
+ reg = <0>;
+ riscv,isa = "rv64imac";
+ status = "disabled";
+ operating-points = <
+ /* kHz uV */
+ 600000  1100000
+ 300000   950000
+ 150000   750000
+ >;
+ cpu0intc: interrupt-controller {
+ #interrupt-cells = <1>;
+ compatible = "riscv,cpu-intc";
+ interrupt-controller;
+ };
+ };
+ cpu1: cpu@1 {
+ clocks = <&clkcfg CLK_CPU>;
+ compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+ d-cache-block-size = <64>;
+ d-cache-sets = <64>;
+ d-cache-size = <32768>;
+ d-tlb-sets = <1>;
+ d-tlb-size = <32>;
+ device_type = "cpu";
+ i-cache-block-size = <64>;
+ i-cache-sets = <64>;
+ i-cache-size = <32768>;
+ i-tlb-sets = <1>;
+ i-tlb-size = <32>;
+ mmu-type = "riscv,sv39";
+ reg = <1>;
+ riscv,isa = "rv64imafdc";
+ tlb-split;
+ status = "okay";
+ operating-points = <
+ /* kHz uV */
+ 600000  1100000
+ 300000   950000
+ 150000   750000
+ >;
+ cpu1intc: interrupt-controller {
+ #interrupt-cells = <1>;
+ compatible = "riscv,cpu-intc";
+ interrupt-controller;
+ };
+ };
+ cpu2: cpu@2 {
+ clocks = <&clkcfg CLK_CPU>;
+ compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+ d-cache-block-size = <64>;
+ d-cache-sets = <64>;
+ d-cache-size = <32768>;
+ d-tlb-sets = <1>;
+ d-tlb-size = <32>;
+ device_type = "cpu";
+ i-cache-block-size = <64>;
+ i-cache-sets = <64>;
+ i-cache-size = <32768>;
+ i-tlb-sets = <1>;
+ i-tlb-size = <32>;
+ mmu-type = "riscv,sv39";
+ reg = <2>;
+ riscv,isa = "rv64imafdc";
+ tlb-split;
+ status = "okay";
+ operating-points = <
+ /* kHz uV */
+ 600000  1100000
+ 300000   950000
+ 150000   750000
+ >;
+ cpu2intc: interrupt-controller {
+ #interrupt-cells = <1>;
+ compatible = "riscv,cpu-intc";
+ interrupt-controller;
+ };
+ };
+ cpu3: cpu@3 {
+ clocks = <&clkcfg CLK_CPU>;
+ compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+ d-cache-block-size = <64>;
+ d-cache-sets = <64>;
+ d-cache-size = <32768>;
+ d-tlb-sets = <1>;
+ d-tlb-size = <32>;
+ device_type = "cpu";
+ i-cache-block-size = <64>;
+ i-cache-sets = <64>;
+ i-cache-size = <32768>;
+ i-tlb-sets = <1>;
+ i-tlb-size = <32>;
+ mmu-type = "riscv,sv39";
+ reg = <3>;
+ riscv,isa = "rv64imafdc";
+ tlb-split;
+ status = "okay";
+ operating-points = <
+ /* kHz uV */
+ 600000  1100000
+ 300000   950000
+ 150000   750000
+ >;
+ cpu3intc: interrupt-controller {
+ #interrupt-cells = <1>;
+ compatible = "riscv,cpu-intc";
+ interrupt-controller;
+ };
+ };
+ cpu4: cpu@4 {
+ clocks = <&clkcfg CLK_CPU>;
+ compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+ d-cache-block-size = <64>;
+ d-cache-sets = <64>;
+ d-cache-size = <32768>;
+ d-tlb-sets = <1>;
+ d-tlb-size = <32>;
+ device_type = "cpu";
+ i-cache-block-size = <64>;
+ i-cache-sets = <64>;
+ i-cache-size = <32768>;
+ i-tlb-sets = <1>;
+ i-tlb-size = <32>;
+ mmu-type = "riscv,sv39";
+ reg = <4>;
+ riscv,isa = "rv64imafdc";
+ tlb-split;
+ status = "okay";
+ operating-points = <
+ /* kHz uV */
+ 600000  1100000
+ 300000   950000
+ 150000   750000
+ >;
+ cpu4intc: interrupt-controller {
+ #interrupt-cells = <1>;
+ compatible = "riscv,cpu-intc";
+ interrupt-controller;
+ };
+ };
+ };
+ ddr: memory@80000000 {
+ device_type = "memory";
+ reg = <0x0 0x80000000 0x0 0x40000000>;
+ clocks = <&clkcfg CLK_DDRC>;
+ };
+ soc: soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ compatible = "microchip,polarfire-soc", "simple-bus";
+ ranges;
+ clint0: clint@2000000 {
+ compatible = "riscv,clint0";
+ interrupts-extended = <&cpu0intc 3 &cpu0intc 7
+ &cpu1intc 3 &cpu1intc 7
+ &cpu2intc 3 &cpu2intc 7
+ &cpu3intc 3 &cpu3intc 7
+ &cpu4intc 3 &cpu4intc 7>;
+ reg = <0x0 0x2000000 0x0 0x10000>;
+ reg-names = "control";
+ clock-frequency = <RTCCLK_FREQ>;
+ };
+ cachecontroller: cache-controller@2010000 {
+ compatible = "sifive,fu540-c000-ccache", "cache";
+ cache-block-size = <64>;
+ cache-level = <2>;
+ cache-sets = <1024>;
+ cache-size = <2097152>;
+ cache-unified;
+ interrupt-parent = <&plic>;
+ interrupts = <1 2 3>;
+ reg = <0x0 0x2010000 0x0 0x1000>;
+ };
+ plic: interrupt-controller@c000000 {
+ #interrupt-cells = <1>;
+ compatible = "sifive,plic-1.0.0";
+ reg = <0x0 0xc000000 0x0 0x4000000>;
+ riscv,max-priority = <7>;
+ riscv,ndev = <186>;
+ interrupt-controller;
+ interrupts-extended = <
+ &cpu0intc 11
+ &cpu1intc 11 &cpu1intc 9
+ &cpu2intc 11 &cpu2intc 9
+ &cpu3intc 11 &cpu3intc 9
+ &cpu4intc 11 &cpu4intc 9>;
+ };
+ uart0: serial@20000000 {
+ compatible = "ns16550a";
+ reg = <0x0 0x20000000 0x0 0x400>;
+ reg-io-width = <4>;
+ reg-shift = <2>;
+ interrupt-parent = <&plic>;
+ interrupts = <90>;
+ clock-frequency = <150000000>;
+ clocks = <&clkcfg CLK_MMUART0>;
+ status = "okay";
+ };
+ refclk: refclk {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <600000000>;
+ clock-output-names = "msspllclk";
+ };
+ clkcfg: clkcfg@20002000 {
+ compatible = "microchip,pfsoc-clkcfg";
+ reg = <0x0 0x20002000 0x0 0x1000>;
+ reg-names = "mss_sysreg";
+ clocks = <&refclk>;
+ #clock-cells = <1>;
+ clock-output-names = "cpu", "axi", "ahb", "envm",
+ "mac0", "mac1", "mmc", "timer",
+ "mmuart0", "mmuart1", "mmuart2",
+ "mmuart3", "mmuart4", "spi0", "spi1",
+ "i2c0", "i2c1", "can0", "can1", "usb",
+ "reserved", "rtc", "qspi", "gpio0",
+ "gpio1", "gpio2", "ddrc", "fic0",
+ "fic1", "fic2", "fic3", "athena",
+ "cfm";
+ };
+ emmc: mmc@20008000 {
+ compatible = "cdns,sd4hc";
+ reg = <0x0 0x20008000 0x0 0x1000>;
+ interrupt-parent = <&plic>;
+ interrupts = <88 89>;
+ pinctrl-names = "default";
+ clocks = <&clkcfg CLK_MMC>;
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ mmc-ddr-3_3v;
+ max-frequency = <200000000>;
+ non-removable;
+ no-sd;
+ no-sdio;
+ voltage-ranges = <3300 3300>;
+ status = "okay";
+ };
+ sdcard: sd@20008000 {
+ compatible = "cdns,sd4hc";
+ reg = <0x0 0x20008000 0x0 0x1000>;
+ interrupt-parent = <&plic>;
+ interrupts = <88>;
+ pinctrl-names = "default";
+ clocks = <&clkcfg CLK_MMC>;
+ bus-width = <4>;
+ disable-wp;
+ cap-sd-highspeed;
+ card-detect-delay = <200>;
+ sd-uhs-sdr12;
+ sd-uhs-sdr25;
+ sd-uhs-sdr50;
+ sd-uhs-sdr104;
+ max-frequency = <200000000>;
+ status = "disabled";
+ };
+ uart1: serial@20100000 {
+ compatible = "ns16550a";
+ reg = <0x0 0x20100000 0x0 0x400>;
+ reg-io-width = <4>;
+ reg-shift = <2>;
+ interrupt-parent = <&plic>;
+ interrupts = <91>;
+ clock-frequency = <150000000>;
+ clocks = <&clkcfg CLK_MMUART1>;
+ status = "okay";
+ };
+ uart2: serial@20102000 {
+ compatible = "ns16550a";
+ reg = <0x0 0x20102000 0x0 0x400>;
+ reg-io-width = <4>;
+ reg-shift = <2>;
+ interrupt-parent = <&plic>;
+ interrupts = <92>;
+ clock-frequency = <150000000>;
+ clocks = <&clkcfg CLK_MMUART2>;
+ status = "okay";
+ };
+ uart3: serial@20104000 {
+ compatible = "ns16550a";
+ reg = <0x0 0x20104000 0x0 0x400>;
+ reg-io-width = <4>;
+ reg-shift = <2>;
+ interrupt-parent = <&plic>;
+ interrupts = <93>;
+ clock-frequency = <150000000>;
+ clocks = <&clkcfg CLK_MMUART3>;
+ status = "okay";
+ };
+ i2c0: i2c@02010a000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "microsemi,ms-pf-mss-i2c";
+ reg = <0x0 0x2010a000 0x0 0x1000>;
+ interrupt-parent = <&plic>;
+ interrupts = <58>;
+ clocks = <&clkcfg CLK_I2C0>;
+ status = "disabled";
+ };
+ i2c1: i2c@02010b000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "microsemi,ms-pf-mss-i2c";
+ reg = <0x0 0x2010b000 0x0 0x1000>;
+ interrupt-parent = <&plic>;
+ interrupts = <61>;
+ clocks = <&clkcfg CLK_I2C1>;
+ status = "disabled";
+ pac193x@0x10 {
+ compatible = "microchip,pac1934";
+ reg = <0x10>;
+ samp-rate = <64>;
+ status = "disabled";
+ ch1: channel@0 {
+ uohms-shunt-res = <10000>;
+ rail-name = "VDD";
+ channel_enabled;
+ };
+ ch2: channel@1 {
+ uohms-shunt-res = <10000>;
+ rail-name = "VDDA25";
+ channel_enabled;
+ };
+ ch3: channel@2 {
+ uohms-shunt-res = <10000>;
+ rail-name = "VDD25";
+ channel_enabled;
+ };
+ ch4: channel@3 {
+ uohms-shunt-res = <10000>;
+ rail-name = "VDDA";
+ channel_enabled;
+ };
+ };
+ };
+ emac0: ethernet@20110000 {
+ compatible = "cdns,macb";
+ reg = <0x0 0x20110000 0x0 0x2000>;
+ interrupt-parent = <&plic>;
+ interrupts = <64 65 66 67>;
+ local-mac-address = [00 00 00 00 00 00];
+ phy-mode = "sgmii";
+ clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AXI>;
+ clock-names = "pclk", "hclk";
+ status = "disabled";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ phy-handle = <&phy0>;
+ phy0: ethernet-phy@8 {
+ reg = <8>;
+ ti,fifo-depth = <0x01>;
+ };
+ };
+ emac1: ethernet@20112000 {
+ compatible = "cdns,macb";
+ reg = <0x0 0x20112000 0x0 0x2000>;
+ interrupt-parent = <&plic>;
+ interrupts = <70 71 72 73>;
+ local-mac-address = [00 00 00 00 00 00];
+ phy-mode = "sgmii";
+ clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
+ clock-names = "pclk", "hclk";
+ status = "okay";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ phy-handle = <&phy1>;
+ phy1: ethernet-phy@9 {
+ reg = <9>;
+ ti,fifo-depth = <0x01>;
+ };
+ };
+ gpio: gpio@0x20122000 {
+ compatible = "microsemi,ms-pf-mss-gpio";
+ interrupt-parent = <&plic>;
+ interrupts = <13 14 15 16 17 18 19 20 21 22 23 24 25 26
+ 27 28 29 30 31 32 33 34 35 36 37 38 39
+ 40 41 42 43 44>;
+ gpio-controller;
+ clocks = <&clkcfg CLK_GPIO2>;
+ reg = <0x00 0x20122000 0x0 0x1000>;
+ reg-names = "control";
+ #gpio-cells = <2>;
+ status = "disabled";
+ };
+ };
+};
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 6/7] riscv: Add Microchip MPFS Icicle Kit support

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
This patch adds Microchip MPFS Icicle Kit support. For now, only
NS16550 Serial, Microchip clock, Cadence eMMC and MACB drivers are
only enabled. The Microchip MPFS Icicle defconfig by default builds
U-Boot for S-Mode because U-Boot on Microchip PolarFire SoC will run
in S-Mode as payload of HSS + OpenSBI.

Signed-off-by: Padmarao Begari <[hidden email]>
Reviewed-by: Anup Patel <[hidden email]>
---
 board/microchip/mpfs_icicle/Kconfig       | 24 ++++++
 board/microchip/mpfs_icicle/mpfs_icicle.c | 97 ++++++++++++++++++++++-
 configs/microchip_mpfs_icicle_defconfig   |  9 ++-
 include/configs/microchip_mpfs_icicle.h   | 60 +++++---------
 4 files changed, 145 insertions(+), 45 deletions(-)

diff --git a/board/microchip/mpfs_icicle/Kconfig b/board/microchip/mpfs_icicle/Kconfig
index bf8e1a13ec..f4e705a07b 100644
--- a/board/microchip/mpfs_icicle/Kconfig
+++ b/board/microchip/mpfs_icicle/Kconfig
@@ -20,7 +20,31 @@ config BOARD_SPECIFIC_OPTIONS # dummy
  def_bool y
  select GENERIC_RISCV
  select BOARD_EARLY_INIT_F
+ select BOARD_LATE_INIT
  imply SMP
+ imply CLK_CCF
+ imply CLK_MPFS
  imply SYS_NS16550
+ imply CMD_DHCP
+ imply CMD_EXT2
+ imply CMD_EXT4
+ imply CMD_FAT
+ imply CMD_FS_GENERIC
+ imply CMD_NET
+ imply CMD_PING
+ imply CMD_MMC
+ imply DOS_PARTITION
+ imply EFI_PARTITION
+ imply IP_DYN
+ imply ISO_PARTITION
+ imply MACB
+ imply MII
+ imply NET_RANDOM_ETHADDR
+ imply PHY_LIB
+ imply PHY_VITESSE
+ imply MMC
+ imply MMC_WRITE
+ imply MMC_SDHCI
+ imply MMC_SDHCI_CADENCE
 
 endif
diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
index 8381361ec3..420ea25ac2 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
@@ -6,10 +6,47 @@
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <init.h>
 #include <asm/io.h>
 
-#define MPFS_SYSREG_SOFT_RESET ((unsigned int *)0x20002088)
+#define MPFS_SYSREG_SOFT_RESET ((unsigned int *)0x20002088)
+#define MPFS_SYS_SERVICE_CR ((unsigned int *)0x37020050)
+#define MPFS_SYS_SERVICE_SR ((unsigned int *)0x37020054)
+#define MPFS_SYS_SERVICE_MAILBOX ((unsigned char *)0x37020800)
+
+#define PERIPH_RESET_VALUE 0x1e8u
+#define SERVICE_CR_REQ 0x1u
+#define SERVICE_SR_BUSY 0x2u
+
+static void read_device_serial_number(u8 *response, u8 response_size)
+{
+ u8 idx;
+ u8 *response_buf;
+ unsigned int val;
+
+ response_buf = (u8 *)response;
+
+ writel(SERVICE_CR_REQ, MPFS_SYS_SERVICE_CR);
+ /*
+ * REQ bit will remain set till the system controller starts
+ * processing.
+ */
+ do {
+ val = readl(MPFS_SYS_SERVICE_CR);
+ } while (SERVICE_CR_REQ == (val & SERVICE_CR_REQ));
+
+ /*
+ * Once system controller starts processing the busy bit will
+ * go high and service is completed when busy bit is gone low
+ */
+ do {
+ val = readl(MPFS_SYS_SERVICE_SR);
+ } while (SERVICE_SR_BUSY == (val & SERVICE_SR_BUSY));
+
+ for (idx = 0; idx < response_size; idx++)
+ response_buf[idx] = readb(MPFS_SYS_SERVICE_MAILBOX + idx);
+}
 
 int board_init(void)
 {
@@ -22,10 +59,64 @@ int board_early_init_f(void)
 {
  unsigned int val;
 
- /* Reset uart peripheral */
+ /* Reset uart, mmc peripheral */
  val = readl(MPFS_SYSREG_SOFT_RESET);
- val = (val & ~(1u << 5u));
+ val = (val & ~(PERIPH_RESET_VALUE));
  writel(val, MPFS_SYSREG_SOFT_RESET);
 
  return 0;
 }
+
+int board_late_init(void)
+{
+ u32 ret;
+ u32 node;
+ u8 idx;
+ u8 device_serial_number[16] = { 0 };
+ unsigned char mac_addr[6];
+ char icicle_mac_addr[20];
+ void *blob = (void *)gd->fdt_blob;
+
+ node = fdt_path_offset(blob, "ethernet0");
+ if (node < 0) {
+ printf("No ethernet0 path offset\n");
+ return -ENODEV;
+ }
+
+ ret = fdtdec_get_byte_array(blob, node, "local-mac-address", mac_addr, 6);
+ if (ret) {
+ printf("No local-mac-address property\n");
+ return -EINVAL;
+ }
+
+ read_device_serial_number(device_serial_number, 16);
+
+ /* Update MAC address with device serial number */
+ mac_addr[0] = 0x00;
+ mac_addr[1] = 0x04;
+ mac_addr[2] = 0xA3;
+ mac_addr[3] = device_serial_number[2];
+ mac_addr[4] = device_serial_number[1];
+ mac_addr[5] = device_serial_number[0];
+
+ ret = fdt_setprop(blob, node, "local-mac-address", mac_addr, 6);
+ if (ret) {
+ printf("Error setting local-mac-address property\n");
+ return -ENODEV;
+ }
+
+ icicle_mac_addr[0] = '[';
+
+ sprintf(&icicle_mac_addr[1], "%pM", mac_addr);
+
+ icicle_mac_addr[18] = ']';
+ icicle_mac_addr[19] = '\0';
+
+ for (idx = 0; idx < 20; idx++) {
+ if (icicle_mac_addr[idx] == ':')
+ icicle_mac_addr[idx] = ' ';
+ }
+ env_set("icicle_mac_addr", icicle_mac_addr);
+
+ return 0;
+}
diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig
index 2977966473..9abbc18a89 100644
--- a/configs/microchip_mpfs_icicle_defconfig
+++ b/configs/microchip_mpfs_icicle_defconfig
@@ -1,12 +1,15 @@
 CONFIG_RISCV=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_TARGET_MICROCHIP_ICICLE=y
-CONFIG_NR_CPUS=5
 CONFIG_ARCH_RV64I=y
+CONFIG_RISCV_SMODE=y
+CONFIG_SBI_V01=y
+CONFIG_DEFAULT_DEVICE_TREE="microchip-mpfs-icicle-kit"
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_FIT=y
-CONFIG_BOOTDELAY=3
 CONFIG_SYS_PROMPT="RISC-V # "
-CONFIG_OF_PRIOR_STAGE=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM_MTD=y
diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 8a7470545b..97547057b9 100644
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -7,53 +7,35 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * CPU and Board Configuration Options
- */
+#include <linux/sizes.h>
 
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
+#define CONFIG_SYS_SDRAM_BASE       0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR     (CONFIG_SYS_SDRAM_BASE + SZ_2M)
 
-/*
- * Print Buffer Size
- */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_LOAD_ADDR        (CONFIG_SYS_SDRAM_BASE + SZ_2M)
 
-/*
- * max number of command args
- */
-#define CONFIG_SYS_MAXARGS 16
+#define CONFIG_SYS_MALLOC_LEN       SZ_8M
 
-/*
- * Boot Argument Buffer Size
- */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-
-/*
- * Size of malloc() pool
- * 512kB is suggested, (CONFIG_ENV_SIZE + 128 * 1024) was not enough
- */
-#define CONFIG_SYS_MALLOC_LEN (512 << 10)
+#define CONFIG_SYS_BOOTM_LEN        SZ_64M
 
-/*
- * Physical Memory Map
- */
-#define PHYS_SDRAM_0 0x80000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_0_SIZE 0x40000000 /* 1 GB */
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_0
+#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
 
-/* Init Stack Pointer */
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x200000)
+/* Environment options */
 
-#define CONFIG_SYS_LOAD_ADDR 0x80000000 /* SDRAM */
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+ func(DHCP, dhcp, na)
 
-/*
- * memtest works on DRAM
- */
+#include <config_distro_bootcmd.h>
 
-/* When we use RAM as ENV */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "fdt_high=0xffffffffffffffff\0" \
+ "initrd_high=0xffffffffffffffff\0" \
+ "kernel_addr_r=0x84000000\0" \
+ "fdt_addr_r=0x88000000\0" \
+ "scriptaddr=0x88100000\0" \
+ "pxefile_addr_r=0x88200000\0" \
+ "ramdisk_addr_r=0x88300000\0" \
+ BOOTENV
 
 #endif /* __CONFIG_H */
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH v3 7/7] doc: board: Add Microchip MPFS Icicle Kit doc

Padmarao Begari-2
In reply to this post by Padmarao Begari-2
This doc describes the procedure to build, flash and
boot Linux using U-boot on Microchip MPFS Icicle Kit.

Signed-off-by: Padmarao Begari <[hidden email]>
---
 doc/board/index.rst                 |   1 +
 doc/board/microchip/index.rst       |   9 +
 doc/board/microchip/mpfs_icicle.rst | 827 ++++++++++++++++++++++++++++
 3 files changed, 837 insertions(+)
 create mode 100644 doc/board/microchip/index.rst
 create mode 100644 doc/board/microchip/mpfs_icicle.rst

diff --git a/doc/board/index.rst b/doc/board/index.rst
index 4b6a996eb1..e329e2744c 100644
--- a/doc/board/index.rst
+++ b/doc/board/index.rst
@@ -15,6 +15,7 @@ Board-specific doc
    freescale/index
    google/index
    intel/index
+   microchip/index
    kontron/index
    renesas/index
    rockchip/index
diff --git a/doc/board/microchip/index.rst b/doc/board/microchip/index.rst
new file mode 100644
index 0000000000..b09e6788af
--- /dev/null
+++ b/doc/board/microchip/index.rst
@@ -0,0 +1,9 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Microchip
+======
+
+.. toctree::
+   :maxdepth: 2
+
+   mpfs_icicle
diff --git a/doc/board/microchip/mpfs_icicle.rst b/doc/board/microchip/mpfs_icicle.rst
new file mode 100644
index 0000000000..745e28a944
--- /dev/null
+++ b/doc/board/microchip/mpfs_icicle.rst
@@ -0,0 +1,827 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Microchip PolarFire SoC Icicle Kit
+==================================
+
+RISC-V PolarFire SoC
+---------------------
+The PolarFire SoC is the 4+1 64-bit RISC-V SoC from Microchip.
+
+The Icicle Kit development platform is based on PolarFire SoC and capable
+of running Linux.
+
+Mainline support
+----------------
+The support for following drivers are already enabled:
+
+1. NS16550 UART Driver.
+2. Microchip Clock Driver.
+3. Cadence MACB ethernet driver for networking support.
+4. Cadence MMC Driver for eMMC/SD support.
+
+Booting from eMMC using HSS
+---------------------------
+
+Building U-Boot
+---------------
+
+1. Add the RISC-V toolchain to your PATH.
+2. Setup ARCH & cross compilation environment variable:
+
+.. code-block:: none
+
+   export CROSS_COMPILE=<riscv64 toolchain prefix>
+
+3. make microchip_mpfs_icicle_defconfig
+4. make
+
+Flashing
+--------
+
+The current U-Boot port is supported in S-mode only and loaded from DRAM.
+
+A prior stage M-mode firmware/bootloader (e.g HSS with OpenSBI) is required to
+boot the u-boot.bin in S-mode.
+
+Currently, the u-boot.bin is used as a payload of the HSS firmware(Microchip
+boot-flow) and OpenSBI generic platform fw_payload.bin (with u-boot.bin embedded)
+as HSS payload(Custom boot-flow)
+
+Microchip boot-flow
+-------------------
+HSS with OpenSBI(M-Mode) -> U-Boot(S-Mode) -> Linux(S-Mode)
+
+Build the HSS((Hart Software Services) - Microchip boot-flow
+------------------------------------------------------------
+(Note: HSS git repo is at
+https://github.com/polarfire-soc/hart-software-services)
+
+1. Configure
+
+.. code-block:: none
+
+   make BOARD=icicle-kit-es config
+
+Alternatively, copy the default config for Microchip boot-flow.
+
+.. code-block:: none
+
+   cp boards/icicle-kit-es/def_config .config
+
+2. make BOARD=icicle-kit-es
+3. In the Default subdirectory, the standard build will create hss.elf and
+   various binary formats (hss.hex and hss.bin).
+
+The FPGA design will use the hss.hex or hss.bin.
+
+FPGA design with HSS programming file
+-------------------------------------
+https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
+/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md
+
+The HSS firmware runs from the PolarFire SoC eNVM on reset.
+
+Creating the HSS payload - Microchip boot-flow
+----------------------------------------------
+1. You will be creating a payload from `u-boot-dtb.bin`.
+   Copy this file to the HSS/tools/hss-payload-generator/test directory.
+2. Go to hss-payload-generator source directory.
+
+.. code-block:: none
+
+   cd hart-software-services/tools/hss-payload-generator
+
+3. Edit test/uboot.yaml file for hart entry points and correct name of the binary file.
+
+ hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000',
+ u54_3: '0x80200000', u54_4: '0x80200000'}
+
+ payloads:
+   test/u-boot-dtb.bin: {exec-addr: '0x80200000', owner-hart: u54_1,
+ secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4,
+ priv-mode: prv_s}
+
+4. Generate payload
+
+.. code-block:: none
+
+   ./hss-payload-generator -c test/uboot.yaml payload.bin
+
+Once the payload binary is generated, it should be copied to the eMMC.
+
+Please refer to HSS documenation to build the HSS firmware for payload.
+(Note: HSS git repo is at
+https://github.com/polarfire-soc/hart-software-services/blob/master
+/tools/hss-payload-generator/README.md)
+
+Custom boot-flow
+----------------
+HSS without OpenSBI(M-Mode) -> OpenSBI(M-Mode) -> U-Boot(S-Mode) -> Linux(S-Mode)
+
+Build OpenSBI
+-------------
+
+1. Get the OpenSBI source
+
+.. code-block:: none
+
+   git clone https://github.com/riscv/opensbi.git
+   cd opensbi
+
+2. Build
+
+.. code-block:: none
+
+   make PLATFORM=generic FW_PAYLOAD_PATH=<u-boot-directory>/u-boot.bin
+   FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/microchip-mpfs-icicle-kit-.dtb
+
+3. Output "fw_payload.bin" file available at
+   "<opensbi-directory>/build/platform/generic/firmware/fw_payload.bin"
+
+Build the HSS((Hart Software Services)- Custom boot-flow
+--------------------------------------------------------
+(Note: HSS git repo is at
+https://github.com/polarfire-soc/hart-software-services)
+
+1. Configure
+
+.. code-block:: none
+
+   make BOARD=icicle-kit-es config
+
+Alternatively, copy the default custom config for Custom boot-flow.
+
+.. code-block:: none
+
+   cp boards/icicle-kit-es/def_config_custom .config
+
+2. make BOARD=icicle-kit-es
+3. In the Default subdirectory, the standard build will create hss.elf and
+   various binary formats (hss.hex and hss.bin).
+
+The FPGA design will use the hss.hex or hss.bin.
+
+Creating the HSS payload - Custom boot-flow
+-------------------------------------------
+1. You will be creating a payload from `fw_payload.bin`.
+   Copy this file to the HSS/tools/hss-payload-generator/test directory.
+2. Go to hss-payload-generator source directory.
+
+.. code-block:: none
+
+   cd hart-software-services/tools/hss-payload-generator
+
+3. Edit test/uboot.yaml file for hart entry points and correct name of the binary file.
+
+ hart-entry-points: {u54_1: '0x80000000', u54_2: '0x80000000',
+ u54_3: '0x80000000', u54_4: '0x80000000'}
+
+ payloads:
+   test/fw_payload.bin: {exec-addr: '0x80000000', owner-hart: u54_1,
+ secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4,
+ priv-mode: prv_s}
+
+4. Generate payload
+
+.. code-block:: none
+
+   ./hss-payload-generator -c test/uboot.yaml payload.bin
+
+Once the payload binary is generated, it should be copied to the eMMC.
+
+Please refer to HSS documenation to build the HSS firmware for payload.
+(Note: HSS git repo is at
+https://github.com/polarfire-soc/hart-software-services/blob/master
+/tools/hss-payload-generator/README.md)
+
+eMMC
+----
+Program eMMC with payload binary is explained in the PolarFire SoC documentation.
+(Note: PolarFire SoC Documentation git repo is at
+https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
+/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md#eMMC
+
+Once the payload image is copied to the eMMC, press CTRL+C in the HSS command
+line interface, then type 'boot' and enter to boot the newly copied image.
+
+.. code-block:: none
+
+    sudo dd if=<payload_binary> of=/dev/sdX bs=512
+
+GUID type
+---------
+The HSS always picks up HSS payload from a GPT partition with
+GIUD type "21686148-6449-6E6F-744E-656564454649" or sector '0' of the eMMC if no
+GPT partition.
+
+Booting
+-------
+you should see the U-Boot prompt on UART0.
+
+Sample boot log from MPFS Icicle Kit
+-------------------------------------------
+
+.. code-block:: none
+
+   U-Boot 2021.01-rc1-00391-gb6c870e58b (Nov 10 2020 - 01:21:12 +0530)
+
+   CPU:   rv64imafdc
+   Model: Microchip PolarFire-SoC
+   DRAM:  1 GiB
+   MMC:   sdhc@20008000: 0
+   In:    serial@20100000
+   Out:   serial@20100000
+   Err:   serial@20100000
+   Net:   eth0: ethernet@20112000
+   Hit any key to stop autoboot:  0
+
+Now you can configure your networking, tftp server and use tftp boot method to
+load uImage(with initramfs).
+
+.. code-block:: none
+
+   RISC-V # setenv kernel_addr_r 0x80200000
+   RISC-V # setenv fdt_addr_r 0x82200000
+
+   RISC-V # setenv ipaddr 192.168.1.5
+   RISC-V # setenv netmask 255.255.255.0
+   RISC-V # setenv serverip 192.168.1.3
+   RISC-V # setenv gateway 192.168.1.1
+
+   RISC-V # tftpboot ${kernel_addr_r} uImage
+   ethernet@20112000: PHY present at 9
+   ethernet@20112000: Starting autonegotiation...
+   ethernet@20112000: Autonegotiation complete
+   ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800)
+   Using ethernet@20112000 device
+   TFTP from server 192.168.1.3; our IP address is 192.168.1.5
+   Filename 'uImage'.
+   Load address: 0x80200000
+   Loading: #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    #################################################################
+    ############
+    6.4 MiB/s
+   done
+   Bytes transferred = 14482480 (dcfc30 hex)
+
+   RISC-V # tftpboot ${fdt_addr_r} microchip-mpfs-icicle-kit.dtb
+   ethernet@20112000: PHY present at 9
+   ethernet@20112000: Starting autonegotiation...
+   ethernet@20112000: Autonegotiation complete
+   ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800)
+   Using ethernet@20112000 device
+   TFTP from server 192.168.1.3; our IP address is 192.168.1.5
+   Filename 'microchip-mpfs-icicle-kit.dtb'.
+   Load address: 0x82200000
+   Loading: #
+ 2.5 MiB/s
+   done
+   Bytes transferred = 10282 (282a hex)
+
+   RISC-V # bootm ${kernel_addr_r} - ${fdt_addr_r}
+   ## Booting kernel from Legacy Image at 80200000 ...
+ Image Name:   Linux
+ Image Type:   RISC-V Linux Kernel Image (uncompressed)
+ Data Size:    14482416 Bytes = 13.8 MiB
+ Load Address: 80200000
+ Entry Point:  80200000
+ Verifying Checksum ... OK
+   ## Flattened Device Tree blob at 82200000
+ Booting using the fdt blob at 0x82200000
+ Loading Kernel Image
+ Using Device Tree in place at 0000000082200000, end 0000000082205829
+
+   Starting kernel ...
+
+   [    0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000
+   [    0.000000] Linux version 5.6.17 (padmarao@padmarao-VirtualBox) (gcc version 7.2.0 (GCC)) #2 SMP Tue Jun 16 21:27:50 IST 2020
+   [    0.000000] initrd not found or empty - disabling initrd
+   [    0.000000] Zone ranges:
+   [    0.000000]   DMA32    [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000]   Normal   empty
+   [    0.000000] Movable zone start for each node
+   [    0.000000] Early memory node ranges
+   [    0.000000]   node   0: [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000] software IO TLB: mapped [mem 0xbb1f5000-0xbf1f5000] (64MB)
+   [    0.000000] elf_hwcap is 0x112d
+   [    0.000000] percpu: Embedded 14 pages/cpu s24856 r0 d32488 u57344
+   [    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 258055
+   [    0.000000] Kernel command line: console=ttyS0,115200n8
+   [    0.000000] Dentry cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+   [    0.000000] Inode-cache hash table entries: 65536 (order: 7, 524288 bytes, linear)
+   [    0.000000] Sorting __ex_table...
+   [    0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+   [    0.000000] Memory: 950308K/1046528K available (3289K kernel code, 212K rwdata, 900K rodata, 9476K init, 250K bss, 96220K reserved, 0K cma-reserved)
+   [    0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
+   [    0.000000] rcu: Hierarchical RCU implementation.
+   [    0.000000] rcu: RCU event tracing is enabled.
+   [    0.000000] rcu: RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=4.
+   [    0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies.
+   [    0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
+   [    0.000000] NR_IRQS: 0, nr_irqs: 0, preallocated irqs: 0
+   [    0.000000] plic: mapped 186 interrupts with 4 handlers for 9 contexts.
+   [    0.000000] riscv_timer_init_dt: Registering clocksource cpuid [0] hartid [1]
+   [    0.000000] clocksource: riscv_clocksource: mask: 0xffffffffffffffff max_cycles: 0x1d854df40, max_idle_ns: 3526361616960 ns
+   [    0.000015] sched_clock: 64 bits at 1000kHz, resolution 1000ns, wraps every 2199023255500ns
+   [    0.000311] Calibrating delay loop (skipped), value calculated using timer frequency.. 2.00 BogoMIPS (lpj=10000)
+   [    0.000349] pid_max: default: 32768 minimum: 301
+   [    0.000846] Mount-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
+   [    0.000964] Mountpoint-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
+   [    0.005630] rcu: Hierarchical SRCU implementation.
+   [    0.006901] smp: Bringing up secondary CPUs ...
+   [    0.012545] smp: Brought up 1 node, 4 CPUs
+   [    0.014431] devtmpfs: initialized
+   [    0.020526] random: get_random_bytes called from setup_net+0x36/0x192 with crng_init=0
+   [    0.020928] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
+   [    0.020999] futex hash table entries: 1024 (order: 4, 65536 bytes, linear)
+   [    0.022768] NET: Registered protocol family 16
+   [    0.035478] microchip-pfsoc-clkcfg 20002000.clkcfg: Registered PFSOC core clocks
+   [    0.048429] SCSI subsystem initialized
+   [    0.049694] pps_core: LinuxPPS API ver. 1 registered
+   [    0.049719] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <[hidden email]>
+   [    0.049780] PTP clock support registered
+   [    0.051781] clocksource: Switched to clocksource riscv_clocksource
+   [    0.055326] NET: Registered protocol family 2
+   [    0.056922] tcp_listen_portaddr_hash hash table entries: 512 (order: 1, 8192 bytes, linear)
+   [    0.057053] TCP established hash table entries: 8192 (order: 4, 65536 bytes, linear)
+   [    0.057648] TCP bind hash table entries: 8192 (order: 5, 131072 bytes, linear)
+   [    0.058579] TCP: Hash tables configured (established 8192 bind 8192)
+   [    0.059648] UDP hash table entries: 512 (order: 2, 16384 bytes, linear)
+   [    0.059837] UDP-Lite hash table entries: 512 (order: 2, 16384 bytes, linear)
+   [    0.060707] NET: Registered protocol family 1
+   [    0.266229] workingset: timestamp_bits=62 max_order=18 bucket_order=0
+   [    0.287107] io scheduler mq-deadline registered
+   [    0.287140] io scheduler kyber registered
+   [    0.429601] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+   [    0.433979] printk: console [ttyS0] disabled
+   [    0.434154] 20000000.serial: ttyS0 at MMIO 0x20000000 (irq = 18, base_baud = 9375000) is a 16550A
+   [    0.928039] printk: console [ttyS0] enabled
+   [    0.939804] libphy: Fixed MDIO Bus: probed
+   [    0.948702] libphy: MACB_mii_bus: probed
+   [    0.993698] macb 20112000.ethernet eth0: Cadence GEM rev 0x0107010c at 0x20112000 irq 21 (56:34:12:00:fc:00)
+   [    1.006751] mousedev: PS/2 mouse device common for all mice
+   [    1.013803] i2c /dev entries driver
+   [    1.019451] sdhci: Secure Digital Host Controller Interface driver
+   [    1.027242] sdhci: Copyright(c) Pierre Ossman
+   [    1.032731] sdhci-pltfm: SDHCI platform and OF driver helper
+   [    1.091826] mmc0: SDHCI controller on 20008000.sdhc [20008000.sdhc] using ADMA 64-bit
+   [    1.102738] NET: Registered protocol family 17
+   [    1.170326] Freeing unused kernel memory: 9476K
+   [    1.176067] This architecture does not have kernel memory protection.
+   [    1.184157] Run /init as init process
+   Starting logging: OK
+   Starting mdev...
+   /etc/init.d/S10mdev: line 21: can't create /proc/sys/kernel/hotplug: nonexiste[    1.331981] mmc0: mmc_select_hs200 failed, error -74
+   nt directory
+   [    1.355011] mmc0: new MMC card at address 0001
+   [    1.363981] mmcblk0: mmc0:0001 DG4008 7.28 GiB
+   [    1.372248] mmcblk0boot0: mmc0:0001 DG4008 partition 1 4.00 MiB
+   [    1.382292] mmcblk0boot1: mmc0:0001 DG4008 partition 2 4.00 MiB
+   [    1.390265] mmcblk0rpmb: mmc0:0001 DG4008 partition 3 4.00 MiB, chardev (251:0)
+   [    1.425234] GPT:Primary header thinks Alt. header is not at the end of the disk.
+   [    1.434656] GPT:2255809 != 15273599
+   [    1.439038] GPT:Alternate GPT header not at the end of the disk.
+   [    1.446671] GPT:2255809 != 15273599
+   [    1.451048] GPT: Use GNU Parted to correct GPT errors.
+   [    1.457755]  mmcblk0: p1 p2 p3
+   sort: /sys/devices/platform/Fixed: No such file or directory
+   modprobe: can't change directory to '/lib/modules': No such file or directory
+   Initializing random number generator... [    2.830198] random: dd: uninitialized urandom read (512 bytes read)
+   done.
+   Starting network...
+   [    3.061867] macb 20112000.ethernet eth0: PHY [20112000.ethernet-ffffffff:09] driver [Vitesse VSC8662] (irq=POLL)
+   [    3.074674] macb 20112000.ethernet eth0: configuring for phy/sgmii link mode
+   [    3.084263] pps pps0: new PPS source ptp0
+   [    3.089710] macb 20112000.ethernet: gem-ptp-timer ptp clock registered.
+   udhcpc (v1.24.2) started
+   Sending discover...
+   Sending discover...
+   [    6.380169] macb 20112000.ethernet eth0: Link is Up - 1Gbps/Full - flow control tx
+   Sending discover...
+   Sending select for 192.168.1.2...
+   Lease of 192.168.1.2 obtained, lease time 86400
+   deleting routers
+   adding dns 192.168.1.1
+   Starting dropbear sshd: [   11.385619] random: dropbear: uninitialized urandom read (32 bytes read)
+   OK
+
+   Welcome to Buildroot
+   buildroot login: root
+   Password:
+   #
+
+Booting U-Boot and Linux from eMMC
+----------------------------------
+
+FPGA design with HSS programming file and Linux Image
+-----------------------------------------------------
+https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
+/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md
+
+The HSS firmware runs from the PolarFire SoC eNVM on reset.
+
+eMMC
+----
+Program eMMC with payload binary and Linux image is explained in the
+PolarFire SoC documentation.
+The payload binary should copied to partition 2 of the eMMC.
+
+(Note: PolarFire SoC Documentation git repo is at
+https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
+/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md#eMMC)
+
+once the Linux image and payload binary is copied to the eMMC, press CTRL+C
+in the HSS command line interface, then type 'boot' and enter to boot the newly
+copied payload and Linux image.
+
+.. code-block:: none
+
+    zcat <linux-image>.wic.gz | sudo dd of=/dev/sdX bs=4096 iflag=fullblock oflag=direct conv=fsync status=progress
+
+    sudo dd if=<payload_binary> of=/dev/sdX2 bs=512
+
+You should see the U-Boot prompt on UART0.
+
+GUID type
+---------
+The HSS always picks up HSS payload from a GPT partition with
+GIUD type "21686148-6449-6E6F-744E-656564454649" or sector '0' of the eMMC if no
+GPT partition.
+
+Sample boot log from MPFS Icicle Kit
+-------------------------------------------
+
+.. code-block:: none
+
+   U-Boot 2021.01-rc1-00391-gb6c870e58b (Nov 10 2020 - 01:21:12 +0530)
+
+   CPU:   rv64imafdc
+   Model: Microchip PolarFire-SoC
+   DRAM:  1 GiB
+   MMC:   sdhc@20008000: 0
+   In:    serial@20100000
+   Out:   serial@20100000
+   Err:   serial@20100000
+   Net:   eth0: ethernet@20112000
+   Hit any key to stop autoboot:  0
+
+   RISC-V # mmc info
+   Device: sdhc@20008000
+   Manufacturer ID: 45
+   OEM: 100
+   Name: DG400
+   Bus Speed: 52000000
+   Mode: MMC High Speed (52MHz)
+   Rd Block Len: 512
+   MMC version 5.1
+   High Capacity: Yes
+   Capacity: 7.3 GiB
+   Bus Width: 4-bit
+   Erase Group Size: 512 KiB
+   HC WP Group Size: 8 MiB
+   User Capacity: 7.3 GiB WRREL
+   Boot Capacity: 4 MiB ENH
+   RPMB Capacity: 4 MiB ENH
+
+   RISC-V # mmc part
+   Partition Map for MMC device 0  --   Partition Type: EFI
+
+   Part Start LBA End LBA Name
+ Attributes
+ Type GUID
+ Partition GUID
+ 1 0x00002000 0x0000b031 "boot"
+ attrs: 0x0000000000000004
+ type: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7
+ guid: 99ff6a94-f2e7-44dd-a7df-f3a2da106ef9
+ 2 0x0000b032 0x0000f031 "primary"
+ attrs: 0x0000000000000000
+ type: 21686148-6449-6e6f-744e-656564454649
+ guid: 12006052-e64b-4423-beb0-b956ea00f1ba
+ 3 0x00010000 0x00226b9f "root"
+ attrs: 0x0000000000000000
+ type: 0fc63daf-8483-4772-8e79-3d69d8477de4
+ guid: dd2c5619-2272-4c3c-8dc2-e21942e17ce6
+
+   RISC-V # fatload mmc 0 ${ramdisk_addr_r} fitimage
+   RISC-V # bootm ${ramdisk_addr_r}
+   ## Loading kernel from FIT Image at 88300000 ...
+   Using '[hidden email]' configuration
+   Trying 'kernel@1' kernel subimage
+     Description:  Linux kernel
+     Type:         Kernel Image
+     Compression:  gzip compressed
+     Data Start:   0x883000fc
+     Data Size:    3574555 Bytes = 3.4 MiB
+     Architecture: RISC-V
+     OS:           Linux
+     Load Address: 0x80200000
+     Entry Point:  0x80200000
+     Hash algo:    sha256
+     Hash value:   21f18d72cf2f0a7192220abb577ad25c77c26960052d779aa02bf55dbf0a6403
+   Verifying Hash Integrity ... sha256+ OK
+   ## Loading fdt from FIT Image at 88300000 ...
+   Using '[hidden email]' configuration
+   Trying '[hidden email]' fdt subimage
+     Description:  Flattened Device Tree blob
+     Type:         Flat Device Tree
+     Compression:  uncompressed
+     Data Start:   0x88668d44
+     Data Size:    9760 Bytes = 9.5 KiB
+     Architecture: RISC-V
+     Load Address: 0x82200000
+     Hash algo:    sha256
+     Hash value:   5c3a9f30d41b6b8e53b47916e1f339b3a4d454006554d1f7e1f552ed62409f4b
+   Verifying Hash Integrity ... sha256+ OK
+   Loading fdt from 0x88668d44 to 0x82200000
+   Booting using the fdt blob at 0x82200000
+   Uncompressing Kernel Image
+   Using Device Tree in place at 0000000082200000, end 000000008220561f
+
+   Starting kernel ...
+
+   [    0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000
+   [    0.000000] Linux version 5.6.16 (oe-user@oe-host) (gcc version 9.3.0 (GCC)) #1 SMP Fri Oct 9 11:49:47 UTC 2020
+   [    0.000000] earlycon: sbi0 at I/O port 0x0 (options '')
+   [    0.000000] printk: bootconsole [sbi0] enabled
+   [    0.000000] Zone ranges:
+   [    0.000000]   DMA32    [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000]   Normal   empty
+   [    0.000000] Movable zone start for each node
+   [    0.000000] Early memory node ranges
+   [    0.000000]   node   0: [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000] Zeroed struct page in unavailable ranges: 512 pages
+   [    0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x00000000bfffffff]
+   [    0.000000] software IO TLB: mapped [mem 0xb9e00000-0xbde00000] (64MB)
+   [    0.000000] CPU with hartid=0 is not available
+   [    0.000000] CPU with hartid=0 is not available
+   [    0.000000] elf_hwcap is 0x112d
+   [    0.000000] percpu: Embedded 17 pages/cpu s29784 r8192 d31656 u69632
+   [    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 258055
+   [    0.000000] Kernel command line: earlycon=sbi root=/dev/mmcblk0p3 rootwait console=ttyS0,115200n8 uio_pdrv_genirq.of_id=generic-uio
+   [    0.000000] Dentry cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+   [    0.000000] Inode-cache hash table entries: 65536 (order: 7, 524288 bytes, linear)
+   [    0.000000] Sorting __ex_table...
+   [    0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
+   [    0.000000] Memory: 941440K/1046528K available (4118K kernel code, 280K rwdata, 1687K rodata, 169K init, 273K bss, 105088K reserved, 0K cma-reserved)
+   [    0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
+   [    0.000000] rcu: Hierarchical RCU implementation.
+   [    0.000000] rcu: RCU event tracing is enabled.
+   [    0.000000] rcu: RCU restricting CPUs from NR_CPUS=5 to nr_cpu_ids=4.
+   [    0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies.
+   [    0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
+   [    0.000000] NR_IRQS: 0, nr_irqs: 0, preallocated irqs: 0
+   [    0.000000] plic: mapped 53 interrupts with 4 handlers for 9 contexts.
+   [    0.000000] riscv_timer_init_dt: Registering clocksource cpuid [0] hartid [1]
+   [    0.000000] clocksource: riscv_clocksource: mask: 0xffffffffffffffff max_cycles: 0x1d854df40, max_idle_ns: 3526361616960 ns
+   [    0.000015] sched_clock: 64 bits at 1000kHz, resolution 1000ns, wraps every 2199023255500ns
+   [    0.008679] Console: colour dummy device 80x25
+   [    0.013112] Calibrating delay loop (skipped), value calculated using timer frequency.. 2.00 BogoMIPS (lpj=10000)
+   [    0.023368] pid_max: default: 32768 minimum: 301
+   [    0.028314] Mount-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
+   [    0.035766] Mountpoint-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
+   [    0.047099] rcu: Hierarchical SRCU implementation.
+   [    0.052813] smp: Bringing up secondary CPUs ...
+   [    0.061581] smp: Brought up 1 node, 4 CPUs
+   [    0.067069] devtmpfs: initialized
+   [    0.073621] random: get_random_u32 called from bucket_table_alloc.isra.0+0x4e/0x150 with crng_init=0
+   [    0.074409] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
+   [    0.093399] futex hash table entries: 1024 (order: 4, 65536 bytes, linear)
+   [    0.101879] NET: Registered protocol family 16
+   [    0.110336] microchip-pfsoc-clkcfg 20002000.clkcfg: Registered PFSOC core clocks
+   [    0.132717] usbcore: registered new interface driver usbfs
+   [    0.138225] usbcore: registered new interface driver hub
+   [    0.143813] usbcore: registered new device driver usb
+   [    0.148939] pps_core: LinuxPPS API ver. 1 registered
+   [    0.153929] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <[hidden email]>
+   [    0.163071] PTP clock support registered
+   [    0.168521] clocksource: Switched to clocksource riscv_clocksource
+   [    0.174927] VFS: Disk quotas dquot_6.6.0
+   [    0.179016] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
+   [    0.205536] NET: Registered protocol family 2
+   [    0.210944] tcp_listen_portaddr_hash hash table entries: 512 (order: 1, 8192 bytes, linear)
+   [    0.219393] TCP established hash table entries: 8192 (order: 4, 65536 bytes, linear)
+   [    0.227497] TCP bind hash table entries: 8192 (order: 5, 131072 bytes, linear)
+   [    0.235440] TCP: Hash tables configured (established 8192 bind 8192)
+   [    0.242537] UDP hash table entries: 512 (order: 2, 16384 bytes, linear)
+   [    0.249285] UDP-Lite hash table entries: 512 (order: 2, 16384 bytes, linear)
+   [    0.256690] NET: Registered protocol family 1
+   [    0.262585] workingset: timestamp_bits=62 max_order=18 bucket_order=0
+   [    0.281036] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 249)
+   [    0.288481] io scheduler mq-deadline registered
+   [    0.292983] io scheduler kyber registered
+   [    0.298895] microsemi,mss-gpio 20122000.gpio: Microsemi MSS GPIO registered 32 GPIOs
+   [    0.453723] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+   [    0.462911] printk: console [ttyS0] disabled
+   [    0.467216] 20100000.serial: ttyS0 at MMIO 0x20100000 (irq = 12, base_baud = 9375000) is a 16550A
+   [    0.476201] printk: console [ttyS0] enabled
+   [    0.476201] printk: console [ttyS0] enabled
+   [    0.484576] printk: bootconsole [sbi0] disabled
+   [    0.484576] printk: bootconsole [sbi0] disabled
+   [    0.494920] 20102000.serial: ttyS1 at MMIO 0x20102000 (irq = 13, base_baud = 9375000) is a 16550A
+   [    0.505068] 20104000.serial: ttyS2 at MMIO 0x20104000 (irq = 14, base_baud = 9375000) is a 16550A
+   [    0.533336] loop: module loaded
+   [    0.572284] Rounding down aligned max_sectors from 4294967295 to 4294967288
+   [    0.580000] db_root: cannot open: /etc/target
+   [    0.585413] libphy: Fixed MDIO Bus: probed
+   [    0.591526] libphy: MACB_mii_bus: probed
+   [    0.598060] macb 20112000.ethernet eth0: Cadence GEM rev 0x0107010c at 0x20112000 irq 17 (56:34:12:00:fc:00)
+   [    0.608352] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
+   [    0.615001] ehci-platform: EHCI generic platform driver
+   [    0.620446] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
+   [    0.626632] ohci-platform: OHCI generic platform driver
+   [    0.632326] usbcore: registered new interface driver cdc_acm
+   [    0.637996] cdc_acm: USB Abstract Control Model driver for USB modems and ISDN adapters
+   [    0.646459] i2c /dev entries driver
+   [    0.650852] microsemi-mss-i2c 2010b000.i2c: Microsemi I2C Probe Complete
+   [    0.658010] sdhci: Secure Digital Host Controller Interface driver
+   [    0.664326] sdhci: Copyright(c) Pierre Ossman
+   [    0.668754] sdhci-pltfm: SDHCI platform and OF driver helper
+   [    0.706845] mmc0: SDHCI controller on 20008000.sdhc [20008000.sdhc] using ADMA 64-bit
+   [    0.715052] usbcore: registered new interface driver usbhid
+   [    0.720722] usbhid: USB HID core driver
+   [    0.725174] pac193x 0-0010: Chip revision: 0x03
+   [    0.733339] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 0 active
+   [    0.740127] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 1 active
+   [    0.746881] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 2 active
+   [    0.753686] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 3 active
+   [    0.760495] pac193x 0-0010: :pac193x_prep_iio_channels: Active chip channels: 25
+   [    0.778006] NET: Registered protocol family 10
+   [    0.784929] Segment Routing with IPv6
+   [    0.788875] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver
+   [    0.795743] NET: Registered protocol family 17
+   [    0.801191] hctosys: unable to open rtc device (rtc0)
+   [    0.807774] Waiting for root device /dev/mmcblk0p3...
+   [    0.858506] mmc0: mmc_select_hs200 failed, error -74
+   [    0.865764] mmc0: new MMC card at address 0001
+   [    0.872564] mmcblk0: mmc0:0001 DG4008 7.28 GiB
+   [    0.878777] mmcblk0boot0: mmc0:0001 DG4008 partition 1 4.00 MiB
+   [    0.886182] mmcblk0boot1: mmc0:0001 DG4008 partition 2 4.00 MiB
+   [    0.892633] mmcblk0rpmb: mmc0:0001 DG4008 partition 3 4.00 MiB, chardev (247:0)
+   [    0.919029] GPT:Primary header thinks Alt. header is not at the end of the disk.
+   [    0.926448] GPT:2255841 != 15273599
+   [    0.930019] GPT:Alternate GPT header not at the end of the disk.
+   [    0.936029] GPT:2255841 != 15273599
+   [    0.939583] GPT: Use GNU Parted to correct GPT errors.
+   [    0.944800]  mmcblk0: p1 p2 p3
+   [    0.966696] EXT4-fs (mmcblk0p3): INFO: recovery required on readonly filesystem
+   [    0.974105] EXT4-fs (mmcblk0p3): write access will be enabled during recovery
+   [    1.052362] random: fast init done
+   [    1.057961] EXT4-fs (mmcblk0p3): recovery complete
+   [    1.065734] EXT4-fs (mmcblk0p3): mounted filesystem with ordered data mode. Opts: (null)
+   [    1.074002] VFS: Mounted root (ext4 filesystem) readonly on device 179:3.
+   [    1.081654] Freeing unused kernel memory: 168K
+   [    1.086108] This architecture does not have kernel memory protection.
+   [    1.092629] Run /sbin/init as init process
+   [    1.702217] systemd[1]: System time before build time, advancing clock.
+   [    1.754192] systemd[1]: systemd 244.3+ running in system mode. (+PAM -AUDIT -SELINUX +IMA -APPARMOR -SMACK +SYSVINIT +UTMP -LIBCRYPTSETUP -GCRYPT -GNUTLS +ACL +XZ -LZ4 -SECCOMP +BLKID -ELFUTILS +KMOD -IDN2 -IDN -PCRE2 default-hierarchy=hybrid)
+   [    1.776361] systemd[1]: Detected architecture riscv64.
+
+   Welcome to OpenEmbedded nodistro.0!
+
+   [    1.829651] systemd[1]: Set hostname to <icicle-kit-es>.
+   [    2.648597] random: systemd: uninitialized urandom read (16 bytes read)
+   [    2.657485] systemd[1]: Created slice system-getty.slice.
+   [  OK  ] Created slice system-getty.slice.
+   [    2.698779] random: systemd: uninitialized urandom read (16 bytes read)
+   [    2.706317] systemd[1]: Created slice system-serial\x2dgetty.slice.
+   [  OK  ] Created slice system-serial\x2dgetty.slice.
+   [    2.748716] random: systemd: uninitialized urandom read (16 bytes read)
+   [    2.756098] systemd[1]: Created slice User and Session Slice.
+   [  OK  ] Created slice User and Session Slice.
+   [    2.789065] systemd[1]: Started Dispatch Password Requests to Console Directory Watch.
+   [  OK  ] Started Dispatch Password …ts to Console Directory Watch.
+   [    2.828974] systemd[1]: Started Forward Password Requests to Wall Directory Watch.
+   [  OK  ] Started Forward Password R…uests to Wall Directory Watch.
+   [    2.869009] systemd[1]: Reached target Paths.
+   [  OK  ] Reached target Paths.
+   [    2.898808] systemd[1]: Reached target Remote File Systems.
+   [  OK  ] Reached target Remote File Systems.
+   [    2.938771] systemd[1]: Reached target Slices.
+   [  OK  ] Reached target Slices.
+   [    2.968754] systemd[1]: Reached target Swap.
+   [  OK  ] Reached target Swap.
+   [    2.999283] systemd[1]: Listening on initctl Compatibility Named Pipe.
+   [  OK  ] Listening on initctl Compatibility Named Pipe.
+   [    3.060458] systemd[1]: Condition check resulted in Journal Audit Socket being skipped.
+   [    3.069826] systemd[1]: Listening on Journal Socket (/dev/log).
+   [  OK  ] Listening on Journal Socket (/dev/log).
+   [    3.109601] systemd[1]: Listening on Journal Socket.
+   [  OK  ] Listening on Journal Socket.
+   [    3.149868] systemd[1]: Listening on Network Service Netlink Socket.
+   [  OK  ] Listening on Network Service Netlink Socket.
+   [    3.189419] systemd[1]: Listening on udev Control Socket.
+   [  OK  ] Listening on udev Control Socket.
+   [    3.229179] systemd[1]: Listening on udev Kernel Socket.
+   [  OK  ] Listening on udev Kernel Socket.
+   [    3.269520] systemd[1]: Condition check resulted in Huge Pages File System being skipped.
+   [    3.278477] systemd[1]: Condition check resulted in POSIX Message Queue File System being skipped.
+   [    3.288200] systemd[1]: Condition check resulted in Kernel Debug File System being skipped.
+   [    3.302570] systemd[1]: Mounting Temporary Directory (/tmp)...
+            Mounting Temporary Directory (/tmp)...
+   [    3.339226] systemd[1]: Condition check resulted in Create list of static device nodes for the current kernel being skipped.
+   [    3.355883] systemd[1]: Starting File System Check on Root Device...
+            Starting File System Check on Root Device...
+   [    3.407220] systemd[1]: Starting Journal Service...
+            Starting Journal Service...
+   [    3.422441] systemd[1]: Condition check resulted in Load Kernel Modules being skipped.
+   [    3.431770] systemd[1]: Condition check resulted in FUSE Control File System being skipped.
+   [    3.446415] systemd[1]: Mounting Kernel Configuration File System...
+            Mounting Kernel Configuration File System...
+   [    3.458983] systemd[1]: Starting Apply Kernel Variables...
+            Starting Apply Kernel Variables...
+   [    3.471368] systemd[1]: Starting udev Coldplug all Devices...
+            Starting udev Coldplug all Devices...
+   [    3.491071] systemd[1]: Mounted Temporary Directory (/tmp).
+   [  OK      3.498114] systemd[1]: Mounted Kernel Configuration File System.
+   0m] Mounted Temporary Directory (/tmp).
+   [  OK  ] Mounted Kernel Configuration File System.
+   [    3.550853] systemd[1]: Started Apply Kernel Variables.
+   [  OK      3.557535] systemd[1]: Started Journal Service.
+   0m] Started Apply Kernel Variables.
+   [  OK  ] Started Journal Service.
+   [  OK  ] Started udev Coldplug all Devices.
+   [  OK  ] Started File System Check on Root Device.
+            Starting Remount Root and Kernel File Systems...
+   [    8.133469] EXT4-fs (mmcblk0p3): re-mounted. Opts: (null)
+   [  OK  ] Started Remount Root and Kernel File Systems.
+            Starting Flush Journal to Persistent Storage...
+   [    8.215327] systemd-journald[77]: Received client request to flush runtime journal.
+            Starting Create Static Device Nodes in /dev...
+   [  OK  ] Started Flush Journal to Persistent Storage.
+   [  OK  ] Started Create Static Device Nodes in /dev.
+   [  OK  ] Reached target Local File Systems (Pre).
+            Mounting /var/volatile...
+            Starting udev Kernel Device Manager...
+   [  OK  ] Mounted /var/volatile.
+            Starting Load/Save Random Seed...
+   [  OK  ] Reached target Local File Systems.
+            Starting Create Volatile Files and Directories...
+   [  OK  ] Started udev Kernel Device Manager.
+   [  OK  ] Started Create Volatile Files and Directories.
+            Starting Network Time Synchronization...
+            Starting Update UTMP about System Boot/Shutdown...
+   [  OK  ] Started Update UTMP about System Boot/Shutdown.
+   [  OK  ] Started Network Time Synchronization.
+   [   11.618575] random: crng init done
+   [   11.622007] random: 7 urandom warning(s) missed due to ratelimiting
+   [  OK  ] Started Load/Save Random Seed.
+   [  OK  ] Reached target System Initialization.
+   [  OK  ] Started Daily Cleanup of Temporary Directories.
+   [  OK  ] Reached target System Time Set.
+   [  OK  ] Reached target System Time Synchronized.
+   [  OK  ] Reached target Timers.
+   [  OK  ] Listening on D-Bus System Message Bus Socket.
+   [  OK  ] Listening on dropbear.socket.
+   [  OK  ] Reached target Sockets.
+   [  OK  ] Reached target Basic System.
+   [  OK  ] Started D-Bus System Message Bus.
+            Starting IPv6 Packet Filtering Framework...
+            Starting IPv4 Packet Filtering Framework...
+            Starting Login Service...
+   [  OK  ] Started IPv6 Packet Filtering Framework.
+   [  OK  ] Started IPv4 Packet Filtering Framework.
+   [  OK  ] Reached target Network (Pre).
+            Starting Network Service...
+   [  OK  ] Started Login Service.
+   [   12.602455] macb 20112000.ethernet eth0: PHY [20112000.ethernet-ffffffff:09] driver [Vitesse VSC8662] (irq=POLL)
+   [   12.612795] macb 20112000.ethernet eth0: configuring for phy/sgmii link mode
+   [   12.622153] pps pps0: new PPS source ptp0
+   [  OK     12.626725] macb 20112000.ethernet: gem-ptp-timer ptp clock registered.
+   0m] Started Network Service.
+            Starting Network Name Resolution...
+   [  OK  ] Started Network Name Resolution.
+   [  OK  ] Reached target Network.
+   [  OK  ] Reached target Host and Network Name Lookups.
+   [  OK  ] Started Collectd.
+   [  OK  ] Started Collectd.
+            Starting Permit User Sessions...
+   [  OK  ] Started Permit User Sessions.
+   [  OK  ] Started Getty on tty1.
+   [  OK  ] Started Serial Getty on ttyS0.
+   [  OK  ] Reached target Login Prompts.
+   [  OK  ] Reached target Multi-User System.
+            Starting Update UTMP about System Runlevel Changes...
+   [  OK  ] Started Update UTMP about System Runlevel Changes.
+
+   OpenEmbedded nodistro.0 icicle-kit-es ttyS0
+
+   icicle-kit-es login: [   15.795564] macb 20112000.ethernet eth0: Link is Up - 1Gbps/Full - flow control tx
+   [   15.803306] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
+
+   icicle-kit-es login: root
+   root@icicle-kit-es:~#
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Bin Meng-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 6:46 PM Padmarao Begari
<[hidden email]> wrote:

>
> Add device tree for Microchip PolarFire SoC Icicle Kit.
>
> Signed-off-by: Padmarao Begari <[hidden email]>
> Reviewed-by: Anup Patel <[hidden email]>
> ---
>  arch/riscv/dts/Makefile                       |   1 +
>  .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
>  arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
>  3 files changed, 437 insertions(+)
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>

I believe we will need to wait for Atish's Linux kernel patch to be
reviewed upstream before we can merge U-Boot's ?

Regards,
Bin
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Atish Patra-2
On Tue, Nov 10, 2020 at 5:40 AM Bin Meng <[hidden email]> wrote:

>
> On Tue, Nov 10, 2020 at 6:46 PM Padmarao Begari
> <[hidden email]> wrote:
> >
> > Add device tree for Microchip PolarFire SoC Icicle Kit.
> >
> > Signed-off-by: Padmarao Begari <[hidden email]>
> > Reviewed-by: Anup Patel <[hidden email]>
> > ---
> >  arch/riscv/dts/Makefile                       |   1 +
> >  .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
> >  arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
> >  3 files changed, 437 insertions(+)
> >  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
> >  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> >
>
> I believe we will need to wait for Atish's Linux kernel patch to be
> reviewed upstream before we can merge U-Boot's ?
>

What should we do with eMMC/SD card nodes ? As per the current fpga,
both can not be enabled at the same time.
The U-Boot DT seems to enable eMMC while I enabled SD card in Linux
one as it allows more storage.

I am assuming it is okay that both device trees can diverge a little
until fpga bit streams are updated. Let me know if there
is any concerns regarding that.

> Regards,
> Bin



--
Regards,
Atish
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Daire McNamara


On 12/11/2020, 08:15, "Atish Patra" <[hidden email]> wrote:

    On Tue, Nov 10, 2020 at 5:40 AM Bin Meng <[hidden email]> wrote:
    >
    > On Tue, Nov 10, 2020 at 6:46 PM Padmarao Begari
    > <[hidden email]> wrote:
    > >
    > > Add device tree for Microchip PolarFire SoC Icicle Kit.
    > >
    > > Signed-off-by: Padmarao Begari <[hidden email]>
    > > Reviewed-by: Anup Patel <[hidden email]>
    > > ---
    > >  arch/riscv/dts/Makefile                       |   1 +
    > >  .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
    > >  arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
    > >  3 files changed, 437 insertions(+)
    > >  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
    > >  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
    > >
    >
    > I believe we will need to wait for Atish's Linux kernel patch to be
    > reviewed upstream before we can merge U-Boot's ?
    >

    What should we do with eMMC/SD card nodes ? As per the current fpga,
    both can not be enabled at the same time.
    The U-Boot DT seems to enable eMMC while I enabled SD card in Linux
    one as it allows more storage.

    I am assuming it is okay that both device trees can diverge a little
    until fpga bit streams are updated. Let me know if there
    is any concerns regarding that.
Yes, from our point of view, that's absolutely fine at the moment.  We'd prefer if both enabled eMMC for the time being but it's not a deal-breaker. We're working on a bit stream to unify them in any case.

    > Regards,
    > Bin



    --
    Regards,
    Atish

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 2/7] net: macb: Add DMA 64-bit address support for macb

Anup Patel-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 4:16 PM Padmarao Begari
<[hidden email]> wrote:

>
> Enable 32-bit or 64-bit DMA in the macb driver based on the design
> config debug6 register of MACB hardware which supports 32-bit or
> 64-bit DMA.
>
> Signed-off-by: Padmarao Begari <[hidden email]>
> ---
>  drivers/net/macb.c | 121 +++++++++++++++++++++++++++++++++++++++------
>  drivers/net/macb.h |   6 +++
>  2 files changed, 112 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index b80a259ff7..9ccbb7a166 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -83,7 +83,16 @@ struct macb_dma_desc {
>         u32     ctrl;
>  };
>
> -#define DMA_DESC_BYTES(n)      (n * sizeof(struct macb_dma_desc))
> +struct macb_dma_desc_64 {
> +       u32 addrh;
> +       u32 unused;
> +};
> +
> +#define HW_DMA_CAP_32B         0
> +#define HW_DMA_CAP_64B         1
> +
> +#define DMA_DESC_SIZE          16
> +#define DMA_DESC_BYTES(n)      ((n) * DMA_DESC_SIZE)
>  #define MACB_TX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_TX_RING_SIZE))
>  #define MACB_RX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_RX_RING_SIZE))
>  #define MACB_TX_DUMMY_DMA_DESC_SIZE    (DMA_DESC_BYTES(1))
> @@ -133,6 +142,7 @@ struct macb_device {
>  #endif
>         phy_interface_t         phy_interface;
>  #endif
> +       unsigned short          hw_dma_cap;
>  };
>
>  struct macb_config {
> @@ -307,6 +317,24 @@ static inline void macb_invalidate_rx_buffer(struct macb_device *macb)
>
>  #if defined(CONFIG_CMD_NET)
>
> +static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc *desc)
> +{
> +       return (struct macb_dma_desc_64 *)((void *)desc
> +               + sizeof(struct macb_dma_desc));
> +}
> +
> +static void macb_set_addr(struct macb_device *macb, struct macb_dma_desc *desc,
> +                         ulong addr)
> +{
> +       struct macb_dma_desc_64 *desc_64;
> +
> +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +               desc_64 = macb_64b_desc(desc);
> +               desc_64->addrh = upper_32_bits(addr);
> +       }
> +       desc->addr = lower_32_bits(addr);
> +}
> +
>  static int _macb_send(struct macb_device *macb, const char *name, void *packet,
>                       int length)
>  {
> @@ -325,8 +353,12 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
>                 macb->tx_head++;
>         }
>
> +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +               tx_head = tx_head * 2;
> +
>         macb->tx_ring[tx_head].ctrl = ctrl;
> -       macb->tx_ring[tx_head].addr = paddr;
> +       macb_set_addr(macb, &macb->tx_ring[tx_head], paddr);
> +
>         barrier();
>         macb_flush_ring_desc(macb, TX);
>         macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
> @@ -363,19 +395,28 @@ static void reclaim_rx_buffers(struct macb_device *macb,
>                                unsigned int new_tail)
>  {
>         unsigned int i;
> +       unsigned int count;
>
>         i = macb->rx_tail;
>
>         macb_invalidate_ring_desc(macb, RX);
>         while (i > new_tail) {
> -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +                       count = i * 2;
> +               else
> +                       count = i;
> +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
>                 i++;
>                 if (i > MACB_RX_RING_SIZE)
>                         i = 0;
>         }
>
>         while (i < new_tail) {
> -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +                       count = i * 2;
> +               else
> +                       count = i;
> +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
>                 i++;
>         }
>
> @@ -390,16 +431,25 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
>         void *buffer;
>         int length;
>         u32 status;
> +       u8 flag = false;
>
>         macb->wrapped = false;
>         for (;;) {
>                 macb_invalidate_ring_desc(macb, RX);
>
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +                       next_rx_tail = next_rx_tail * 2;
> +
>                 if (!(macb->rx_ring[next_rx_tail].addr & MACB_BIT(RX_USED)))
>                         return -EAGAIN;
>
>                 status = macb->rx_ring[next_rx_tail].ctrl;
>                 if (status & MACB_BIT(RX_SOF)) {
> +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +                               next_rx_tail = next_rx_tail / 2;
> +                               flag = true;
> +                       }
> +
>                         if (next_rx_tail != macb->rx_tail)
>                                 reclaim_rx_buffers(macb, next_rx_tail);
>                         macb->wrapped = false;
> @@ -426,11 +476,22 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
>                                 *packetp = buffer;
>                         }
>
> +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +                               if (!flag)
> +                                       next_rx_tail = next_rx_tail / 2;
> +                       }
> +
>                         if (++next_rx_tail >= MACB_RX_RING_SIZE)
>                                 next_rx_tail = 0;
>                         macb->next_rx_tail = next_rx_tail;
>                         return length;
>                 } else {
> +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +                               if (!flag)
> +                                       next_rx_tail = next_rx_tail / 2;
> +                               flag = false;
> +                       }
> +
>                         if (++next_rx_tail >= MACB_RX_RING_SIZE) {
>                                 macb->wrapped = true;
>                                 next_rx_tail = 0;
> @@ -718,6 +779,7 @@ static int gmac_init_multi_queues(struct macb_device *macb)
>  {
>         int i, num_queues = 1;
>         u32 queue_mask;
> +       unsigned long paddr;
>
>         /* bit 0 is never set but queue 0 always exists */
>         queue_mask = gem_readl(macb, DCFG6) & 0xff;
> @@ -731,10 +793,18 @@ static int gmac_init_multi_queues(struct macb_device *macb)
>         macb->dummy_desc->addr = 0;
>         flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma +
>                         ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN));
> -
> -       for (i = 1; i < num_queues; i++)
> -               gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i - 1);
> -
> +       paddr = macb->dummy_desc_dma;
> +
> +       for (i = 1; i < num_queues; i++) {
> +               gem_writel_queue_TBQP(macb, lower_32_bits(paddr), i - 1);
> +               gem_writel_queue_RBQP(macb, lower_32_bits(paddr), i - 1);
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +                       gem_writel_queue_TBQPH(macb, upper_32_bits(paddr),
> +                                              i - 1);
> +                       gem_writel_queue_RBQPH(macb, upper_32_bits(paddr),
> +                                              i - 1);
> +               }
> +       }
>         return 0;
>  }
>
> @@ -760,6 +830,9 @@ static void gmac_configure_dma(struct macb_device *macb)
>                 dmacfg &= ~GEM_BIT(ENDIA_DESC);
>
>         dmacfg &= ~GEM_BIT(ADDR64);
> +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +               dmacfg |= GEM_BIT(ADDR64);
> +
>         gem_writel(macb, DMACFG, dmacfg);
>  }
>
> @@ -775,6 +848,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
>         unsigned long paddr;
>         int ret;
>         int i;
> +       int count;
> +
> +       if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
> +               macb->hw_dma_cap = HW_DMA_CAP_64B;
> +       else
> +               macb->hw_dma_cap = HW_DMA_CAP_32B;
>
>         /*
>          * macb_halt should have been called at some point before now,
> @@ -786,20 +865,28 @@ static int _macb_init(struct macb_device *macb, const char *name)
>         for (i = 0; i < MACB_RX_RING_SIZE; i++) {
>                 if (i == (MACB_RX_RING_SIZE - 1))
>                         paddr |= MACB_BIT(RX_WRAP);
> -               macb->rx_ring[i].addr = paddr;
> -               macb->rx_ring[i].ctrl = 0;
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +                       count = i * 2;
> +               else
> +                       count = i;
> +               macb->rx_ring[count].ctrl = 0;
> +               macb_set_addr(macb, &macb->rx_ring[count], paddr);
>                 paddr += macb->rx_buffer_size;
>         }
>         macb_flush_ring_desc(macb, RX);
>         macb_flush_rx_buffer(macb);
>
>         for (i = 0; i < MACB_TX_RING_SIZE; i++) {
> -               macb->tx_ring[i].addr = 0;
> +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> +                       count = i * 2;
> +               else
> +                       count = i;
> +               macb_set_addr(macb, &macb->tx_ring[count], 0);
>                 if (i == (MACB_TX_RING_SIZE - 1))
> -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) |
> +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED) |
>                                 MACB_BIT(TX_WRAP);
>                 else
> -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED);
> +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED);
>         }
>         macb_flush_ring_desc(macb, TX);
>
> @@ -812,8 +899,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
>         gem_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
>  #endif
>
> -       macb_writel(macb, RBQP, macb->rx_ring_dma);
> -       macb_writel(macb, TBQP, macb->tx_ring_dma);
> +       macb_writel(macb, RBQP, lower_32_bits(macb->rx_ring_dma));
> +       macb_writel(macb, TBQP, lower_32_bits(macb->tx_ring_dma));
> +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> +               macb_writel(macb, RBQPH, upper_32_bits(macb->rx_ring_dma));
> +               macb_writel(macb, TBQPH, upper_32_bits(macb->tx_ring_dma));
> +       }
>
>         if (macb_is_gem(macb)) {
>                 /* Initialize DMA properties */
> diff --git a/drivers/net/macb.h b/drivers/net/macb.h
> index 9b16383eba..72b84ae96e 100644
> --- a/drivers/net/macb.h
> +++ b/drivers/net/macb.h
> @@ -768,5 +768,11 @@
>  #define GEM_RX_CSUM_CHECKED_MASK               2
>  #define gem_writel_queue_TBQP(port, value, queue_num)  \
>         writel((value), (port)->regs + GEM_TBQP(queue_num))
> +#define gem_writel_queue_TBQPH(port, value, queue_num) \
> +       writel((value), (port)->regs + GEM_TBQPH(queue_num))
> +#define gem_writel_queue_RBQP(port, value, queue_num)  \
> +       writel((value), (port)->regs + GEM_RBQP(queue_num))
> +#define gem_writel_queue_RBQPH(port, value, queue_num) \
> +       writel((value), (port)->regs + GEM_RBQPH(queue_num))
>
>  #endif /* __DRIVERS_MACB_H__ */
> --
> 2.17.1
>

Looks good to me.

Reviewed-by: Anup Patel <[hidden email]>

We need to test this patch on SiFive Unleashed as well because
it has same ethernet controller.

Regards,
Anup
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 3/7] net: macb: Add phy address to read it from device tree

Anup Patel-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 4:16 PM Padmarao Begari
<[hidden email]> wrote:

>
> Read phy address from device tree and use it to find the phy device
> if not found then search in the range of 0 to 31.
>
> Signed-off-by: Padmarao Begari <[hidden email]>
> ---
>  drivers/net/macb.c | 17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index 9ccbb7a166..81b1f1ba26 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -531,6 +531,12 @@ static int macb_phy_find(struct macb_device *macb, const char *name)
>         int i;
>         u16 phy_id;
>
> +       phy_id = macb_mdio_read(macb, macb->phy_addr, MII_PHYSID1);
> +       if (phy_id != 0xffff) {
> +               printf("%s: PHY present at %d\n", name, macb->phy_addr);
> +               return 0;
> +       }
> +
>         /* Search for PHY... */
>         for (i = 0; i < 32; i++) {
>                 macb->phy_addr = i;
> @@ -1315,11 +1321,12 @@ static int macb_eth_probe(struct udevice *dev)
>  {
>         struct eth_pdata *pdata = dev_get_platdata(dev);
>         struct macb_device *macb = dev_get_priv(dev);
> +       struct ofnode_phandle_args phandle_args;
>         const char *phy_mode;
>         int ret;
>
> -       phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
> -                              NULL);
> +       phy_mode = dev_read_prop(dev, "phy-mode", NULL);
> +
>         if (phy_mode)
>                 macb->phy_interface = phy_get_interface_by_name(phy_mode);
>         if (macb->phy_interface == -1) {
> @@ -1327,6 +1334,12 @@ static int macb_eth_probe(struct udevice *dev)
>                 return -EINVAL;
>         }
>
> +       /* Read phyaddr from DT */
> +       if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
> +                                       &phandle_args))
> +               macb->phy_addr = ofnode_read_u32_default(phandle_args.node,
> +                                                        "reg", -1);
> +
>         macb->regs = (void *)pdata->iobase;
>
>         macb->is_big_endian = (cpu_to_be32(0x12345678) == 0x12345678);
> --
> 2.17.1
>

Looks good to me.

Reviewed-by: Anup Patel <[hidden email]>

This patch also needs to be tested on SiFive Unleashed because it has
same ethernet controller.

Regards,
Anup
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 7/7] doc: board: Add Microchip MPFS Icicle Kit doc

Anup Patel-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 4:17 PM Padmarao Begari
<[hidden email]> wrote:

>
> This doc describes the procedure to build, flash and
> boot Linux using U-boot on Microchip MPFS Icicle Kit.
>
> Signed-off-by: Padmarao Begari <[hidden email]>
> ---
>  doc/board/index.rst                 |   1 +
>  doc/board/microchip/index.rst       |   9 +
>  doc/board/microchip/mpfs_icicle.rst | 827 ++++++++++++++++++++++++++++
>  3 files changed, 837 insertions(+)
>  create mode 100644 doc/board/microchip/index.rst
>  create mode 100644 doc/board/microchip/mpfs_icicle.rst
>
> diff --git a/doc/board/index.rst b/doc/board/index.rst
> index 4b6a996eb1..e329e2744c 100644
> --- a/doc/board/index.rst
> +++ b/doc/board/index.rst
> @@ -15,6 +15,7 @@ Board-specific doc
>     freescale/index
>     google/index
>     intel/index
> +   microchip/index
>     kontron/index
>     renesas/index
>     rockchip/index
> diff --git a/doc/board/microchip/index.rst b/doc/board/microchip/index.rst
> new file mode 100644
> index 0000000000..b09e6788af
> --- /dev/null
> +++ b/doc/board/microchip/index.rst
> @@ -0,0 +1,9 @@
> +.. SPDX-License-Identifier: GPL-2.0+
> +
> +Microchip
> +======
> +
> +.. toctree::
> +   :maxdepth: 2
> +
> +   mpfs_icicle
> diff --git a/doc/board/microchip/mpfs_icicle.rst b/doc/board/microchip/mpfs_icicle.rst
> new file mode 100644
> index 0000000000..745e28a944
> --- /dev/null
> +++ b/doc/board/microchip/mpfs_icicle.rst
> @@ -0,0 +1,827 @@
> +.. SPDX-License-Identifier: GPL-2.0+
> +
> +Microchip PolarFire SoC Icicle Kit
> +==================================
> +
> +RISC-V PolarFire SoC
> +---------------------
> +The PolarFire SoC is the 4+1 64-bit RISC-V SoC from Microchip.
> +
> +The Icicle Kit development platform is based on PolarFire SoC and capable
> +of running Linux.
> +
> +Mainline support
> +----------------
> +The support for following drivers are already enabled:
> +
> +1. NS16550 UART Driver.
> +2. Microchip Clock Driver.
> +3. Cadence MACB ethernet driver for networking support.
> +4. Cadence MMC Driver for eMMC/SD support.
> +
> +Booting from eMMC using HSS
> +---------------------------
> +
> +Building U-Boot
> +---------------
> +
> +1. Add the RISC-V toolchain to your PATH.
> +2. Setup ARCH & cross compilation environment variable:
> +
> +.. code-block:: none
> +
> +   export CROSS_COMPILE=<riscv64 toolchain prefix>
> +
> +3. make microchip_mpfs_icicle_defconfig
> +4. make
> +
> +Flashing
> +--------
> +
> +The current U-Boot port is supported in S-mode only and loaded from DRAM.
> +
> +A prior stage M-mode firmware/bootloader (e.g HSS with OpenSBI) is required to
> +boot the u-boot.bin in S-mode.
> +
> +Currently, the u-boot.bin is used as a payload of the HSS firmware(Microchip
> +boot-flow) and OpenSBI generic platform fw_payload.bin (with u-boot.bin embedded)
> +as HSS payload(Custom boot-flow)
> +
> +Microchip boot-flow
> +-------------------
> +HSS with OpenSBI(M-Mode) -> U-Boot(S-Mode) -> Linux(S-Mode)
> +
> +Build the HSS((Hart Software Services) - Microchip boot-flow
> +------------------------------------------------------------
> +(Note: HSS git repo is at
> +https://github.com/polarfire-soc/hart-software-services)
> +
> +1. Configure
> +
> +.. code-block:: none
> +
> +   make BOARD=icicle-kit-es config
> +
> +Alternatively, copy the default config for Microchip boot-flow.
> +
> +.. code-block:: none
> +
> +   cp boards/icicle-kit-es/def_config .config
> +
> +2. make BOARD=icicle-kit-es
> +3. In the Default subdirectory, the standard build will create hss.elf and
> +   various binary formats (hss.hex and hss.bin).
> +
> +The FPGA design will use the hss.hex or hss.bin.
> +
> +FPGA design with HSS programming file
> +-------------------------------------
> +https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
> +/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md
> +
> +The HSS firmware runs from the PolarFire SoC eNVM on reset.
> +
> +Creating the HSS payload - Microchip boot-flow
> +----------------------------------------------
> +1. You will be creating a payload from `u-boot-dtb.bin`.
> +   Copy this file to the HSS/tools/hss-payload-generator/test directory.
> +2. Go to hss-payload-generator source directory.
> +
> +.. code-block:: none
> +
> +   cd hart-software-services/tools/hss-payload-generator
> +
> +3. Edit test/uboot.yaml file for hart entry points and correct name of the binary file.
> +
> +       hart-entry-points: {u54_1: '0x80200000', u54_2: '0x80200000',
> +                       u54_3: '0x80200000', u54_4: '0x80200000'}
> +
> +       payloads:
> +       test/u-boot-dtb.bin: {exec-addr: '0x80200000', owner-hart: u54_1,
> +               secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4,
> +               priv-mode: prv_s}
> +
> +4. Generate payload
> +
> +.. code-block:: none
> +
> +   ./hss-payload-generator -c test/uboot.yaml payload.bin
> +
> +Once the payload binary is generated, it should be copied to the eMMC.
> +
> +Please refer to HSS documenation to build the HSS firmware for payload.
> +(Note: HSS git repo is at
> +https://github.com/polarfire-soc/hart-software-services/blob/master
> +/tools/hss-payload-generator/README.md)
> +
> +Custom boot-flow
> +----------------
> +HSS without OpenSBI(M-Mode) -> OpenSBI(M-Mode) -> U-Boot(S-Mode) -> Linux(S-Mode)
> +
> +Build OpenSBI
> +-------------
> +
> +1. Get the OpenSBI source
> +
> +.. code-block:: none
> +
> +   git clone https://github.com/riscv/opensbi.git
> +   cd opensbi
> +
> +2. Build
> +
> +.. code-block:: none
> +
> +   make PLATFORM=generic FW_PAYLOAD_PATH=<u-boot-directory>/u-boot.bin
> +   FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/microchip-mpfs-icicle-kit-.dtb
> +
> +3. Output "fw_payload.bin" file available at
> +   "<opensbi-directory>/build/platform/generic/firmware/fw_payload.bin"
> +
> +Build the HSS((Hart Software Services)- Custom boot-flow
> +--------------------------------------------------------
> +(Note: HSS git repo is at
> +https://github.com/polarfire-soc/hart-software-services)
> +
> +1. Configure
> +
> +.. code-block:: none
> +
> +   make BOARD=icicle-kit-es config
> +
> +Alternatively, copy the default custom config for Custom boot-flow.
> +
> +.. code-block:: none
> +
> +   cp boards/icicle-kit-es/def_config_custom .config
> +
> +2. make BOARD=icicle-kit-es
> +3. In the Default subdirectory, the standard build will create hss.elf and
> +   various binary formats (hss.hex and hss.bin).
> +
> +The FPGA design will use the hss.hex or hss.bin.
> +
> +Creating the HSS payload - Custom boot-flow
> +-------------------------------------------
> +1. You will be creating a payload from `fw_payload.bin`.
> +   Copy this file to the HSS/tools/hss-payload-generator/test directory.
> +2. Go to hss-payload-generator source directory.
> +
> +.. code-block:: none
> +
> +   cd hart-software-services/tools/hss-payload-generator
> +
> +3. Edit test/uboot.yaml file for hart entry points and correct name of the binary file.
> +
> +       hart-entry-points: {u54_1: '0x80000000', u54_2: '0x80000000',
> +                       u54_3: '0x80000000', u54_4: '0x80000000'}
> +
> +       payloads:
> +       test/fw_payload.bin: {exec-addr: '0x80000000', owner-hart: u54_1,
> +               secondary-hart: u54_2, secondary-hart: u54_3, secondary-hart: u54_4,
> +               priv-mode: prv_s}
> +
> +4. Generate payload
> +
> +.. code-block:: none
> +
> +   ./hss-payload-generator -c test/uboot.yaml payload.bin
> +
> +Once the payload binary is generated, it should be copied to the eMMC.
> +
> +Please refer to HSS documenation to build the HSS firmware for payload.
> +(Note: HSS git repo is at
> +https://github.com/polarfire-soc/hart-software-services/blob/master
> +/tools/hss-payload-generator/README.md)
> +
> +eMMC
> +----
> +Program eMMC with payload binary is explained in the PolarFire SoC documentation.
> +(Note: PolarFire SoC Documentation git repo is at
> +https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
> +/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md#eMMC
> +
> +Once the payload image is copied to the eMMC, press CTRL+C in the HSS command
> +line interface, then type 'boot' and enter to boot the newly copied image.
> +
> +.. code-block:: none
> +
> +    sudo dd if=<payload_binary> of=/dev/sdX bs=512
> +
> +GUID type
> +---------
> +The HSS always picks up HSS payload from a GPT partition with
> +GIUD type "21686148-6449-6E6F-744E-656564454649" or sector '0' of the eMMC if no
> +GPT partition.
> +
> +Booting
> +-------
> +you should see the U-Boot prompt on UART0.
> +
> +Sample boot log from MPFS Icicle Kit
> +-------------------------------------------
> +
> +.. code-block:: none
> +
> +   U-Boot 2021.01-rc1-00391-gb6c870e58b (Nov 10 2020 - 01:21:12 +0530)
> +
> +   CPU:   rv64imafdc
> +   Model: Microchip PolarFire-SoC
> +   DRAM:  1 GiB
> +   MMC:   sdhc@20008000: 0
> +   In:    serial@20100000
> +   Out:   serial@20100000
> +   Err:   serial@20100000
> +   Net:   eth0: ethernet@20112000
> +   Hit any key to stop autoboot:  0
> +
> +Now you can configure your networking, tftp server and use tftp boot method to
> +load uImage(with initramfs).
> +
> +.. code-block:: none
> +
> +   RISC-V # setenv kernel_addr_r 0x80200000
> +   RISC-V # setenv fdt_addr_r 0x82200000
> +
> +   RISC-V # setenv ipaddr 192.168.1.5
> +   RISC-V # setenv netmask 255.255.255.0
> +   RISC-V # setenv serverip 192.168.1.3
> +   RISC-V # setenv gateway 192.168.1.1
> +
> +   RISC-V # tftpboot ${kernel_addr_r} uImage
> +   ethernet@20112000: PHY present at 9
> +   ethernet@20112000: Starting autonegotiation...
> +   ethernet@20112000: Autonegotiation complete
> +   ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800)
> +   Using ethernet@20112000 device
> +   TFTP from server 192.168.1.3; our IP address is 192.168.1.5
> +   Filename 'uImage'.
> +   Load address: 0x80200000
> +   Loading: #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           #################################################################
> +           ############
> +           6.4 MiB/s
> +   done
> +   Bytes transferred = 14482480 (dcfc30 hex)
> +
> +   RISC-V # tftpboot ${fdt_addr_r} microchip-mpfs-icicle-kit.dtb
> +   ethernet@20112000: PHY present at 9
> +   ethernet@20112000: Starting autonegotiation...
> +   ethernet@20112000: Autonegotiation complete
> +   ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800)
> +   Using ethernet@20112000 device
> +   TFTP from server 192.168.1.3; our IP address is 192.168.1.5
> +   Filename 'microchip-mpfs-icicle-kit.dtb'.
> +   Load address: 0x82200000
> +   Loading: #
> +                       2.5 MiB/s
> +   done
> +   Bytes transferred = 10282 (282a hex)
> +
> +   RISC-V # bootm ${kernel_addr_r} - ${fdt_addr_r}
> +   ## Booting kernel from Legacy Image at 80200000 ...
> +               Image Name:   Linux
> +               Image Type:   RISC-V Linux Kernel Image (uncompressed)
> +               Data Size:    14482416 Bytes = 13.8 MiB
> +               Load Address: 80200000
> +               Entry Point:  80200000
> +               Verifying Checksum ... OK
> +   ## Flattened Device Tree blob at 82200000
> +               Booting using the fdt blob at 0x82200000
> +               Loading Kernel Image
> +               Using Device Tree in place at 0000000082200000, end 0000000082205829
> +
> +   Starting kernel ...
> +
> +   [    0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000
> +   [    0.000000] Linux version 5.6.17 (padmarao@padmarao-VirtualBox) (gcc version 7.2.0 (GCC)) #2 SMP Tue Jun 16 21:27:50 IST 2020
> +   [    0.000000] initrd not found or empty - disabling initrd
> +   [    0.000000] Zone ranges:
> +   [    0.000000]   DMA32    [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000]   Normal   empty
> +   [    0.000000] Movable zone start for each node
> +   [    0.000000] Early memory node ranges
> +   [    0.000000]   node   0: [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000] software IO TLB: mapped [mem 0xbb1f5000-0xbf1f5000] (64MB)
> +   [    0.000000] elf_hwcap is 0x112d
> +   [    0.000000] percpu: Embedded 14 pages/cpu s24856 r0 d32488 u57344
> +   [    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 258055
> +   [    0.000000] Kernel command line: console=ttyS0,115200n8
> +   [    0.000000] Dentry cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
> +   [    0.000000] Inode-cache hash table entries: 65536 (order: 7, 524288 bytes, linear)
> +   [    0.000000] Sorting __ex_table...
> +   [    0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
> +   [    0.000000] Memory: 950308K/1046528K available (3289K kernel code, 212K rwdata, 900K rodata, 9476K init, 250K bss, 96220K reserved, 0K cma-reserved)
> +   [    0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
> +   [    0.000000] rcu: Hierarchical RCU implementation.
> +   [    0.000000] rcu:         RCU event tracing is enabled.
> +   [    0.000000] rcu:         RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=4.
> +   [    0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies.
> +   [    0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
> +   [    0.000000] NR_IRQS: 0, nr_irqs: 0, preallocated irqs: 0
> +   [    0.000000] plic: mapped 186 interrupts with 4 handlers for 9 contexts.
> +   [    0.000000] riscv_timer_init_dt: Registering clocksource cpuid [0] hartid [1]
> +   [    0.000000] clocksource: riscv_clocksource: mask: 0xffffffffffffffff max_cycles: 0x1d854df40, max_idle_ns: 3526361616960 ns
> +   [    0.000015] sched_clock: 64 bits at 1000kHz, resolution 1000ns, wraps every 2199023255500ns
> +   [    0.000311] Calibrating delay loop (skipped), value calculated using timer frequency.. 2.00 BogoMIPS (lpj=10000)
> +   [    0.000349] pid_max: default: 32768 minimum: 301
> +   [    0.000846] Mount-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
> +   [    0.000964] Mountpoint-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
> +   [    0.005630] rcu: Hierarchical SRCU implementation.
> +   [    0.006901] smp: Bringing up secondary CPUs ...
> +   [    0.012545] smp: Brought up 1 node, 4 CPUs
> +   [    0.014431] devtmpfs: initialized
> +   [    0.020526] random: get_random_bytes called from setup_net+0x36/0x192 with crng_init=0
> +   [    0.020928] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
> +   [    0.020999] futex hash table entries: 1024 (order: 4, 65536 bytes, linear)
> +   [    0.022768] NET: Registered protocol family 16
> +   [    0.035478] microchip-pfsoc-clkcfg 20002000.clkcfg: Registered PFSOC core clocks
> +   [    0.048429] SCSI subsystem initialized
> +   [    0.049694] pps_core: LinuxPPS API ver. 1 registered
> +   [    0.049719] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <[hidden email]>
> +   [    0.049780] PTP clock support registered
> +   [    0.051781] clocksource: Switched to clocksource riscv_clocksource
> +   [    0.055326] NET: Registered protocol family 2
> +   [    0.056922] tcp_listen_portaddr_hash hash table entries: 512 (order: 1, 8192 bytes, linear)
> +   [    0.057053] TCP established hash table entries: 8192 (order: 4, 65536 bytes, linear)
> +   [    0.057648] TCP bind hash table entries: 8192 (order: 5, 131072 bytes, linear)
> +   [    0.058579] TCP: Hash tables configured (established 8192 bind 8192)
> +   [    0.059648] UDP hash table entries: 512 (order: 2, 16384 bytes, linear)
> +   [    0.059837] UDP-Lite hash table entries: 512 (order: 2, 16384 bytes, linear)
> +   [    0.060707] NET: Registered protocol family 1
> +   [    0.266229] workingset: timestamp_bits=62 max_order=18 bucket_order=0
> +   [    0.287107] io scheduler mq-deadline registered
> +   [    0.287140] io scheduler kyber registered
> +   [    0.429601] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
> +   [    0.433979] printk: console [ttyS0] disabled
> +   [    0.434154] 20000000.serial: ttyS0 at MMIO 0x20000000 (irq = 18, base_baud = 9375000) is a 16550A
> +   [    0.928039] printk: console [ttyS0] enabled
> +   [    0.939804] libphy: Fixed MDIO Bus: probed
> +   [    0.948702] libphy: MACB_mii_bus: probed
> +   [    0.993698] macb 20112000.ethernet eth0: Cadence GEM rev 0x0107010c at 0x20112000 irq 21 (56:34:12:00:fc:00)
> +   [    1.006751] mousedev: PS/2 mouse device common for all mice
> +   [    1.013803] i2c /dev entries driver
> +   [    1.019451] sdhci: Secure Digital Host Controller Interface driver
> +   [    1.027242] sdhci: Copyright(c) Pierre Ossman
> +   [    1.032731] sdhci-pltfm: SDHCI platform and OF driver helper
> +   [    1.091826] mmc0: SDHCI controller on 20008000.sdhc [20008000.sdhc] using ADMA 64-bit
> +   [    1.102738] NET: Registered protocol family 17
> +   [    1.170326] Freeing unused kernel memory: 9476K
> +   [    1.176067] This architecture does not have kernel memory protection.
> +   [    1.184157] Run /init as init process
> +   Starting logging: OK
> +   Starting mdev...
> +   /etc/init.d/S10mdev: line 21: can't create /proc/sys/kernel/hotplug: nonexiste[    1.331981] mmc0: mmc_select_hs200 failed, error -74
> +   nt directory
> +   [    1.355011] mmc0: new MMC card at address 0001
> +   [    1.363981] mmcblk0: mmc0:0001 DG4008 7.28 GiB
> +   [    1.372248] mmcblk0boot0: mmc0:0001 DG4008 partition 1 4.00 MiB
> +   [    1.382292] mmcblk0boot1: mmc0:0001 DG4008 partition 2 4.00 MiB
> +   [    1.390265] mmcblk0rpmb: mmc0:0001 DG4008 partition 3 4.00 MiB, chardev (251:0)
> +   [    1.425234] GPT:Primary header thinks Alt. header is not at the end of the disk.
> +   [    1.434656] GPT:2255809 != 15273599
> +   [    1.439038] GPT:Alternate GPT header not at the end of the disk.
> +   [    1.446671] GPT:2255809 != 15273599
> +   [    1.451048] GPT: Use GNU Parted to correct GPT errors.
> +   [    1.457755]  mmcblk0: p1 p2 p3
> +   sort: /sys/devices/platform/Fixed: No such file or directory
> +   modprobe: can't change directory to '/lib/modules': No such file or directory
> +   Initializing random number generator... [    2.830198] random: dd: uninitialized urandom read (512 bytes read)
> +   done.
> +   Starting network...
> +   [    3.061867] macb 20112000.ethernet eth0: PHY [20112000.ethernet-ffffffff:09] driver [Vitesse VSC8662] (irq=POLL)
> +   [    3.074674] macb 20112000.ethernet eth0: configuring for phy/sgmii link mode
> +   [    3.084263] pps pps0: new PPS source ptp0
> +   [    3.089710] macb 20112000.ethernet: gem-ptp-timer ptp clock registered.
> +   udhcpc (v1.24.2) started
> +   Sending discover...
> +   Sending discover...
> +   [    6.380169] macb 20112000.ethernet eth0: Link is Up - 1Gbps/Full - flow control tx
> +   Sending discover...
> +   Sending select for 192.168.1.2...
> +   Lease of 192.168.1.2 obtained, lease time 86400
> +   deleting routers
> +   adding dns 192.168.1.1
> +   Starting dropbear sshd: [   11.385619] random: dropbear: uninitialized urandom read (32 bytes read)
> +   OK
> +
> +   Welcome to Buildroot
> +   buildroot login: root
> +   Password:
> +   #
> +
> +Booting U-Boot and Linux from eMMC
> +----------------------------------
> +
> +FPGA design with HSS programming file and Linux Image
> +-----------------------------------------------------
> +https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
> +/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md
> +
> +The HSS firmware runs from the PolarFire SoC eNVM on reset.
> +
> +eMMC
> +----
> +Program eMMC with payload binary and Linux image is explained in the
> +PolarFire SoC documentation.
> +The payload binary should copied to partition 2 of the eMMC.
> +
> +(Note: PolarFire SoC Documentation git repo is at
> +https://github.com/polarfire-soc/polarfire-soc-documentation/blob/master/boards
> +/mpfs-icicle-kit-es/updating-icicle-kit/updating-icicle-kit-design-and-linux.md#eMMC)
> +
> +once the Linux image and payload binary is copied to the eMMC, press CTRL+C
> +in the HSS command line interface, then type 'boot' and enter to boot the newly
> +copied payload and Linux image.
> +
> +.. code-block:: none
> +
> +    zcat <linux-image>.wic.gz | sudo dd of=/dev/sdX bs=4096 iflag=fullblock oflag=direct conv=fsync status=progress
> +
> +    sudo dd if=<payload_binary> of=/dev/sdX2 bs=512
> +
> +You should see the U-Boot prompt on UART0.
> +
> +GUID type
> +---------
> +The HSS always picks up HSS payload from a GPT partition with
> +GIUD type "21686148-6449-6E6F-744E-656564454649" or sector '0' of the eMMC if no
> +GPT partition.
> +
> +Sample boot log from MPFS Icicle Kit
> +-------------------------------------------
> +
> +.. code-block:: none
> +
> +   U-Boot 2021.01-rc1-00391-gb6c870e58b (Nov 10 2020 - 01:21:12 +0530)
> +
> +   CPU:   rv64imafdc
> +   Model: Microchip PolarFire-SoC
> +   DRAM:  1 GiB
> +   MMC:   sdhc@20008000: 0
> +   In:    serial@20100000
> +   Out:   serial@20100000
> +   Err:   serial@20100000
> +   Net:   eth0: ethernet@20112000
> +   Hit any key to stop autoboot:  0
> +
> +   RISC-V # mmc info
> +   Device: sdhc@20008000
> +   Manufacturer ID: 45
> +   OEM: 100
> +   Name: DG400
> +   Bus Speed: 52000000
> +   Mode: MMC High Speed (52MHz)
> +   Rd Block Len: 512
> +   MMC version 5.1
> +   High Capacity: Yes
> +   Capacity: 7.3 GiB
> +   Bus Width: 4-bit
> +   Erase Group Size: 512 KiB
> +   HC WP Group Size: 8 MiB
> +   User Capacity: 7.3 GiB WRREL
> +   Boot Capacity: 4 MiB ENH
> +   RPMB Capacity: 4 MiB ENH
> +
> +   RISC-V # mmc part
> +   Partition Map for MMC device 0  --   Partition Type: EFI
> +
> +   Part        Start LBA       End LBA         Name
> +               Attributes
> +               Type GUID
> +               Partition GUID
> +       1       0x00002000      0x0000b031      "boot"
> +               attrs:  0x0000000000000004
> +               type:   ebd0a0a2-b9e5-4433-87c0-68b6b72699c7
> +               guid:   99ff6a94-f2e7-44dd-a7df-f3a2da106ef9
> +       2       0x0000b032      0x0000f031      "primary"
> +               attrs:  0x0000000000000000
> +               type:   21686148-6449-6e6f-744e-656564454649
> +               guid:   12006052-e64b-4423-beb0-b956ea00f1ba
> +       3       0x00010000      0x00226b9f      "root"
> +               attrs:  0x0000000000000000
> +               type:   0fc63daf-8483-4772-8e79-3d69d8477de4
> +               guid:   dd2c5619-2272-4c3c-8dc2-e21942e17ce6
> +
> +   RISC-V # fatload mmc 0 ${ramdisk_addr_r} fitimage
> +   RISC-V # bootm ${ramdisk_addr_r}
> +   ## Loading kernel from FIT Image at 88300000 ...
> +   Using '[hidden email]' configuration
> +   Trying 'kernel@1' kernel subimage
> +     Description:  Linux kernel
> +     Type:         Kernel Image
> +     Compression:  gzip compressed
> +     Data Start:   0x883000fc
> +     Data Size:    3574555 Bytes = 3.4 MiB
> +     Architecture: RISC-V
> +     OS:           Linux
> +     Load Address: 0x80200000
> +     Entry Point:  0x80200000
> +     Hash algo:    sha256
> +     Hash value:   21f18d72cf2f0a7192220abb577ad25c77c26960052d779aa02bf55dbf0a6403
> +   Verifying Hash Integrity ... sha256+ OK
> +   ## Loading fdt from FIT Image at 88300000 ...
> +   Using '[hidden email]' configuration
> +   Trying '[hidden email]' fdt subimage
> +     Description:  Flattened Device Tree blob
> +     Type:         Flat Device Tree
> +     Compression:  uncompressed
> +     Data Start:   0x88668d44
> +     Data Size:    9760 Bytes = 9.5 KiB
> +     Architecture: RISC-V
> +     Load Address: 0x82200000
> +     Hash algo:    sha256
> +     Hash value:   5c3a9f30d41b6b8e53b47916e1f339b3a4d454006554d1f7e1f552ed62409f4b
> +   Verifying Hash Integrity ... sha256+ OK
> +   Loading fdt from 0x88668d44 to 0x82200000
> +   Booting using the fdt blob at 0x82200000
> +   Uncompressing Kernel Image
> +   Using Device Tree in place at 0000000082200000, end 000000008220561f
> +
> +   Starting kernel ...
> +
> +   [    0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000
> +   [    0.000000] Linux version 5.6.16 (oe-user@oe-host) (gcc version 9.3.0 (GCC)) #1 SMP Fri Oct 9 11:49:47 UTC 2020
> +   [    0.000000] earlycon: sbi0 at I/O port 0x0 (options '')
> +   [    0.000000] printk: bootconsole [sbi0] enabled
> +   [    0.000000] Zone ranges:
> +   [    0.000000]   DMA32    [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000]   Normal   empty
> +   [    0.000000] Movable zone start for each node
> +   [    0.000000] Early memory node ranges
> +   [    0.000000]   node   0: [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000] Zeroed struct page in unavailable ranges: 512 pages
> +   [    0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x00000000bfffffff]
> +   [    0.000000] software IO TLB: mapped [mem 0xb9e00000-0xbde00000] (64MB)
> +   [    0.000000] CPU with hartid=0 is not available
> +   [    0.000000] CPU with hartid=0 is not available
> +   [    0.000000] elf_hwcap is 0x112d
> +   [    0.000000] percpu: Embedded 17 pages/cpu s29784 r8192 d31656 u69632
> +   [    0.000000] Built 1 zonelists, mobility grouping on.  Total pages: 258055
> +   [    0.000000] Kernel command line: earlycon=sbi root=/dev/mmcblk0p3 rootwait console=ttyS0,115200n8 uio_pdrv_genirq.of_id=generic-uio
> +   [    0.000000] Dentry cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
> +   [    0.000000] Inode-cache hash table entries: 65536 (order: 7, 524288 bytes, linear)
> +   [    0.000000] Sorting __ex_table...
> +   [    0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off
> +   [    0.000000] Memory: 941440K/1046528K available (4118K kernel code, 280K rwdata, 1687K rodata, 169K init, 273K bss, 105088K reserved, 0K cma-reserved)
> +   [    0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
> +   [    0.000000] rcu: Hierarchical RCU implementation.
> +   [    0.000000] rcu:         RCU event tracing is enabled.
> +   [    0.000000] rcu:         RCU restricting CPUs from NR_CPUS=5 to nr_cpu_ids=4.
> +   [    0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies.
> +   [    0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
> +   [    0.000000] NR_IRQS: 0, nr_irqs: 0, preallocated irqs: 0
> +   [    0.000000] plic: mapped 53 interrupts with 4 handlers for 9 contexts.
> +   [    0.000000] riscv_timer_init_dt: Registering clocksource cpuid [0] hartid [1]
> +   [    0.000000] clocksource: riscv_clocksource: mask: 0xffffffffffffffff max_cycles: 0x1d854df40, max_idle_ns: 3526361616960 ns
> +   [    0.000015] sched_clock: 64 bits at 1000kHz, resolution 1000ns, wraps every 2199023255500ns
> +   [    0.008679] Console: colour dummy device 80x25
> +   [    0.013112] Calibrating delay loop (skipped), value calculated using timer frequency.. 2.00 BogoMIPS (lpj=10000)
> +   [    0.023368] pid_max: default: 32768 minimum: 301
> +   [    0.028314] Mount-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
> +   [    0.035766] Mountpoint-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
> +   [    0.047099] rcu: Hierarchical SRCU implementation.
> +   [    0.052813] smp: Bringing up secondary CPUs ...
> +   [    0.061581] smp: Brought up 1 node, 4 CPUs
> +   [    0.067069] devtmpfs: initialized
> +   [    0.073621] random: get_random_u32 called from bucket_table_alloc.isra.0+0x4e/0x150 with crng_init=0
> +   [    0.074409] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
> +   [    0.093399] futex hash table entries: 1024 (order: 4, 65536 bytes, linear)
> +   [    0.101879] NET: Registered protocol family 16
> +   [    0.110336] microchip-pfsoc-clkcfg 20002000.clkcfg: Registered PFSOC core clocks
> +   [    0.132717] usbcore: registered new interface driver usbfs
> +   [    0.138225] usbcore: registered new interface driver hub
> +   [    0.143813] usbcore: registered new device driver usb
> +   [    0.148939] pps_core: LinuxPPS API ver. 1 registered
> +   [    0.153929] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <[hidden email]>
> +   [    0.163071] PTP clock support registered
> +   [    0.168521] clocksource: Switched to clocksource riscv_clocksource
> +   [    0.174927] VFS: Disk quotas dquot_6.6.0
> +   [    0.179016] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
> +   [    0.205536] NET: Registered protocol family 2
> +   [    0.210944] tcp_listen_portaddr_hash hash table entries: 512 (order: 1, 8192 bytes, linear)
> +   [    0.219393] TCP established hash table entries: 8192 (order: 4, 65536 bytes, linear)
> +   [    0.227497] TCP bind hash table entries: 8192 (order: 5, 131072 bytes, linear)
> +   [    0.235440] TCP: Hash tables configured (established 8192 bind 8192)
> +   [    0.242537] UDP hash table entries: 512 (order: 2, 16384 bytes, linear)
> +   [    0.249285] UDP-Lite hash table entries: 512 (order: 2, 16384 bytes, linear)
> +   [    0.256690] NET: Registered protocol family 1
> +   [    0.262585] workingset: timestamp_bits=62 max_order=18 bucket_order=0
> +   [    0.281036] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 249)
> +   [    0.288481] io scheduler mq-deadline registered
> +   [    0.292983] io scheduler kyber registered
> +   [    0.298895] microsemi,mss-gpio 20122000.gpio: Microsemi MSS GPIO registered 32 GPIOs
> +   [    0.453723] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
> +   [    0.462911] printk: console [ttyS0] disabled
> +   [    0.467216] 20100000.serial: ttyS0 at MMIO 0x20100000 (irq = 12, base_baud = 9375000) is a 16550A
> +   [    0.476201] printk: console [ttyS0] enabled
> +   [    0.476201] printk: console [ttyS0] enabled
> +   [    0.484576] printk: bootconsole [sbi0] disabled
> +   [    0.484576] printk: bootconsole [sbi0] disabled
> +   [    0.494920] 20102000.serial: ttyS1 at MMIO 0x20102000 (irq = 13, base_baud = 9375000) is a 16550A
> +   [    0.505068] 20104000.serial: ttyS2 at MMIO 0x20104000 (irq = 14, base_baud = 9375000) is a 16550A
> +   [    0.533336] loop: module loaded
> +   [    0.572284] Rounding down aligned max_sectors from 4294967295 to 4294967288
> +   [    0.580000] db_root: cannot open: /etc/target
> +   [    0.585413] libphy: Fixed MDIO Bus: probed
> +   [    0.591526] libphy: MACB_mii_bus: probed
> +   [    0.598060] macb 20112000.ethernet eth0: Cadence GEM rev 0x0107010c at 0x20112000 irq 17 (56:34:12:00:fc:00)
> +   [    0.608352] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
> +   [    0.615001] ehci-platform: EHCI generic platform driver
> +   [    0.620446] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
> +   [    0.626632] ohci-platform: OHCI generic platform driver
> +   [    0.632326] usbcore: registered new interface driver cdc_acm
> +   [    0.637996] cdc_acm: USB Abstract Control Model driver for USB modems and ISDN adapters
> +   [    0.646459] i2c /dev entries driver
> +   [    0.650852] microsemi-mss-i2c 2010b000.i2c: Microsemi I2C Probe Complete
> +   [    0.658010] sdhci: Secure Digital Host Controller Interface driver
> +   [    0.664326] sdhci: Copyright(c) Pierre Ossman
> +   [    0.668754] sdhci-pltfm: SDHCI platform and OF driver helper
> +   [    0.706845] mmc0: SDHCI controller on 20008000.sdhc [20008000.sdhc] using ADMA 64-bit
> +   [    0.715052] usbcore: registered new interface driver usbhid
> +   [    0.720722] usbhid: USB HID core driver
> +   [    0.725174] pac193x 0-0010: Chip revision: 0x03
> +   [    0.733339] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 0 active
> +   [    0.740127] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 1 active
> +   [    0.746881] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 2 active
> +   [    0.753686] pac193x 0-0010: :pac193x_prep_iio_channels: Channel 3 active
> +   [    0.760495] pac193x 0-0010: :pac193x_prep_iio_channels: Active chip channels: 25
> +   [    0.778006] NET: Registered protocol family 10
> +   [    0.784929] Segment Routing with IPv6
> +   [    0.788875] sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver
> +   [    0.795743] NET: Registered protocol family 17
> +   [    0.801191] hctosys: unable to open rtc device (rtc0)
> +   [    0.807774] Waiting for root device /dev/mmcblk0p3...
> +   [    0.858506] mmc0: mmc_select_hs200 failed, error -74
> +   [    0.865764] mmc0: new MMC card at address 0001
> +   [    0.872564] mmcblk0: mmc0:0001 DG4008 7.28 GiB
> +   [    0.878777] mmcblk0boot0: mmc0:0001 DG4008 partition 1 4.00 MiB
> +   [    0.886182] mmcblk0boot1: mmc0:0001 DG4008 partition 2 4.00 MiB
> +   [    0.892633] mmcblk0rpmb: mmc0:0001 DG4008 partition 3 4.00 MiB, chardev (247:0)
> +   [    0.919029] GPT:Primary header thinks Alt. header is not at the end of the disk.
> +   [    0.926448] GPT:2255841 != 15273599
> +   [    0.930019] GPT:Alternate GPT header not at the end of the disk.
> +   [    0.936029] GPT:2255841 != 15273599
> +   [    0.939583] GPT: Use GNU Parted to correct GPT errors.
> +   [    0.944800]  mmcblk0: p1 p2 p3
> +   [    0.966696] EXT4-fs (mmcblk0p3): INFO: recovery required on readonly filesystem
> +   [    0.974105] EXT4-fs (mmcblk0p3): write access will be enabled during recovery
> +   [    1.052362] random: fast init done
> +   [    1.057961] EXT4-fs (mmcblk0p3): recovery complete
> +   [    1.065734] EXT4-fs (mmcblk0p3): mounted filesystem with ordered data mode. Opts: (null)
> +   [    1.074002] VFS: Mounted root (ext4 filesystem) readonly on device 179:3.
> +   [    1.081654] Freeing unused kernel memory: 168K
> +   [    1.086108] This architecture does not have kernel memory protection.
> +   [    1.092629] Run /sbin/init as init process
> +   [    1.702217] systemd[1]: System time before build time, advancing clock.
> +   [    1.754192] systemd[1]: systemd 244.3+ running in system mode. (+PAM -AUDIT -SELINUX +IMA -APPARMOR -SMACK +SYSVINIT +UTMP -LIBCRYPTSETUP -GCRYPT -GNUTLS +ACL +XZ -LZ4 -SECCOMP +BLKID -ELFUTILS +KMOD -IDN2 -IDN -PCRE2 default-hierarchy=hybrid)
> +   [    1.776361] systemd[1]: Detected architecture riscv64.
> +
> +   Welcome to OpenEmbedded nodistro.0!
> +
> +   [    1.829651] systemd[1]: Set hostname to <icicle-kit-es>.
> +   [    2.648597] random: systemd: uninitialized urandom read (16 bytes read)
> +   [    2.657485] systemd[1]: Created slice system-getty.slice.
> +   [  OK  ] Created slice system-getty.slice.
> +   [    2.698779] random: systemd: uninitialized urandom read (16 bytes read)
> +   [    2.706317] systemd[1]: Created slice system-serial\x2dgetty.slice.
> +   [  OK  ] Created slice system-serial\x2dgetty.slice.
> +   [    2.748716] random: systemd: uninitialized urandom read (16 bytes read)
> +   [    2.756098] systemd[1]: Created slice User and Session Slice.
> +   [  OK  ] Created slice User and Session Slice.
> +   [    2.789065] systemd[1]: Started Dispatch Password Requests to Console Directory Watch.
> +   [  OK  ] Started Dispatch Password …ts to Console Directory Watch.
> +   [    2.828974] systemd[1]: Started Forward Password Requests to Wall Directory Watch.
> +   [  OK  ] Started Forward Password R…uests to Wall Directory Watch.
> +   [    2.869009] systemd[1]: Reached target Paths.
> +   [  OK  ] Reached target Paths.
> +   [    2.898808] systemd[1]: Reached target Remote File Systems.
> +   [  OK  ] Reached target Remote File Systems.
> +   [    2.938771] systemd[1]: Reached target Slices.
> +   [  OK  ] Reached target Slices.
> +   [    2.968754] systemd[1]: Reached target Swap.
> +   [  OK  ] Reached target Swap.
> +   [    2.999283] systemd[1]: Listening on initctl Compatibility Named Pipe.
> +   [  OK  ] Listening on initctl Compatibility Named Pipe.
> +   [    3.060458] systemd[1]: Condition check resulted in Journal Audit Socket being skipped.
> +   [    3.069826] systemd[1]: Listening on Journal Socket (/dev/log).
> +   [  OK  ] Listening on Journal Socket (/dev/log).
> +   [    3.109601] systemd[1]: Listening on Journal Socket.
> +   [  OK  ] Listening on Journal Socket.
> +   [    3.149868] systemd[1]: Listening on Network Service Netlink Socket.
> +   [  OK  ] Listening on Network Service Netlink Socket.
> +   [    3.189419] systemd[1]: Listening on udev Control Socket.
> +   [  OK  ] Listening on udev Control Socket.
> +   [    3.229179] systemd[1]: Listening on udev Kernel Socket.
> +   [  OK  ] Listening on udev Kernel Socket.
> +   [    3.269520] systemd[1]: Condition check resulted in Huge Pages File System being skipped.
> +   [    3.278477] systemd[1]: Condition check resulted in POSIX Message Queue File System being skipped.
> +   [    3.288200] systemd[1]: Condition check resulted in Kernel Debug File System being skipped.
> +   [    3.302570] systemd[1]: Mounting Temporary Directory (/tmp)...
> +            Mounting Temporary Directory (/tmp)...
> +   [    3.339226] systemd[1]: Condition check resulted in Create list of static device nodes for the current kernel being skipped.
> +   [    3.355883] systemd[1]: Starting File System Check on Root Device...
> +            Starting File System Check on Root Device...
> +   [    3.407220] systemd[1]: Starting Journal Service...
> +            Starting Journal Service...
> +   [    3.422441] systemd[1]: Condition check resulted in Load Kernel Modules being skipped.
> +   [    3.431770] systemd[1]: Condition check resulted in FUSE Control File System being skipped.
> +   [    3.446415] systemd[1]: Mounting Kernel Configuration File System...
> +            Mounting Kernel Configuration File System...
> +   [    3.458983] systemd[1]: Starting Apply Kernel Variables...
> +            Starting Apply Kernel Variables...
> +   [    3.471368] systemd[1]: Starting udev Coldplug all Devices...
> +            Starting udev Coldplug all Devices...
> +   [    3.491071] systemd[1]: Mounted Temporary Directory (/tmp).
> +   [  OK      3.498114] systemd[1]: Mounted Kernel Configuration File System.
> +   0m] Mounted Temporary Directory (/tmp).
> +   [  OK  ] Mounted Kernel Configuration File System.
> +   [    3.550853] systemd[1]: Started Apply Kernel Variables.
> +   [  OK      3.557535] systemd[1]: Started Journal Service.
> +   0m] Started Apply Kernel Variables.
> +   [  OK  ] Started Journal Service.
> +   [  OK  ] Started udev Coldplug all Devices.
> +   [  OK  ] Started File System Check on Root Device.
> +            Starting Remount Root and Kernel File Systems...
> +   [    8.133469] EXT4-fs (mmcblk0p3): re-mounted. Opts: (null)
> +   [  OK  ] Started Remount Root and Kernel File Systems.
> +            Starting Flush Journal to Persistent Storage...
> +   [    8.215327] systemd-journald[77]: Received client request to flush runtime journal.
> +            Starting Create Static Device Nodes in /dev...
> +   [  OK  ] Started Flush Journal to Persistent Storage.
> +   [  OK  ] Started Create Static Device Nodes in /dev.
> +   [  OK  ] Reached target Local File Systems (Pre).
> +            Mounting /var/volatile...
> +            Starting udev Kernel Device Manager...
> +   [  OK  ] Mounted /var/volatile.
> +            Starting Load/Save Random Seed...
> +   [  OK  ] Reached target Local File Systems.
> +            Starting Create Volatile Files and Directories...
> +   [  OK  ] Started udev Kernel Device Manager.
> +   [  OK  ] Started Create Volatile Files and Directories.
> +            Starting Network Time Synchronization...
> +            Starting Update UTMP about System Boot/Shutdown...
> +   [  OK  ] Started Update UTMP about System Boot/Shutdown.
> +   [  OK  ] Started Network Time Synchronization.
> +   [   11.618575] random: crng init done
> +   [   11.622007] random: 7 urandom warning(s) missed due to ratelimiting
> +   [  OK  ] Started Load/Save Random Seed.
> +   [  OK  ] Reached target System Initialization.
> +   [  OK  ] Started Daily Cleanup of Temporary Directories.
> +   [  OK  ] Reached target System Time Set.
> +   [  OK  ] Reached target System Time Synchronized.
> +   [  OK  ] Reached target Timers.
> +   [  OK  ] Listening on D-Bus System Message Bus Socket.
> +   [  OK  ] Listening on dropbear.socket.
> +   [  OK  ] Reached target Sockets.
> +   [  OK  ] Reached target Basic System.
> +   [  OK  ] Started D-Bus System Message Bus.
> +            Starting IPv6 Packet Filtering Framework...
> +            Starting IPv4 Packet Filtering Framework...
> +            Starting Login Service...
> +   [  OK  ] Started IPv6 Packet Filtering Framework.
> +   [  OK  ] Started IPv4 Packet Filtering Framework.
> +   [  OK  ] Reached target Network (Pre).
> +            Starting Network Service...
> +   [  OK  ] Started Login Service.
> +   [   12.602455] macb 20112000.ethernet eth0: PHY [20112000.ethernet-ffffffff:09] driver [Vitesse VSC8662] (irq=POLL)
> +   [   12.612795] macb 20112000.ethernet eth0: configuring for phy/sgmii link mode
> +   [   12.622153] pps pps0: new PPS source ptp0
> +   [  OK     12.626725] macb 20112000.ethernet: gem-ptp-timer ptp clock registered.
> +   0m] Started Network Service.
> +            Starting Network Name Resolution...
> +   [  OK  ] Started Network Name Resolution.
> +   [  OK  ] Reached target Network.
> +   [  OK  ] Reached target Host and Network Name Lookups.
> +   [  OK  ] Started Collectd.
> +   [  OK  ] Started Collectd.
> +            Starting Permit User Sessions...
> +   [  OK  ] Started Permit User Sessions.
> +   [  OK  ] Started Getty on tty1.
> +   [  OK  ] Started Serial Getty on ttyS0.
> +   [  OK  ] Reached target Login Prompts.
> +   [  OK  ] Reached target Multi-User System.
> +            Starting Update UTMP about System Runlevel Changes...
> +   [  OK  ] Started Update UTMP about System Runlevel Changes.
> +
> +   OpenEmbedded nodistro.0 icicle-kit-es ttyS0
> +
> +   icicle-kit-es login: [   15.795564] macb 20112000.ethernet eth0: Link is Up - 1Gbps/Full - flow control tx
> +   [   15.803306] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
> +
> +   icicle-kit-es login: root
> +   root@icicle-kit-es:~#
> --
> 2.17.1
>

Thanks for including "custom boot flow" documentation.

This looks good to me.

Reviewed-by: Anup Patel <[hidden email]>

Regards,
Anup
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 0/7] Microchip PolarFire SoC support

Anup Patel-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 4:15 PM Padmarao Begari
<[hidden email]> wrote:

>
> This patch set adds Microchip PolarFire SoC Icicle Kit support
> to RISC-V U-Boot.
>
> The patches are based upon latest U-Boot tree
> (https://gitlab.denx.de/u-boot/u-boot.git) at commit id
> 1ae955e3a58f46918ef99b0b6c562967ba1bf39e
>
> All drivers namely: NS16550 Serial, Microchip clock,
> Cadence eMMC and Cadence MACB Ethernet work fine on actual
> Microchip PolarFire SoC Icicle Kit.
>
> Changes in v3:
> - Add 'default y if 64BIT' for config DMA_ADDR_T_64BIT
> - Update MACB driver for 32-bit/64-bit DMA based on design config register
> - Add phy-handle in MACB driver to read the phy address from device tree
> - Fix checkpatch warnings in the clock driver
> - Remove fu540 related compatible strings from soc device tree node
> - Move refclk device tree node under /soc device tree node
> - Use local-mac-address instead of mac-address in the device tree
> - Rename device tree to microchip-mpfs-icicle-kit.dts
> - Add U-Boot specific dts microchip-mpfs-icicle-kit-u-boot.dtsi file
> - Drop the imply DMA_ADDR_T_64BIT from board config
> - Fix some typos
> - Update doc with Microchip and Custom boot-flow
>
> Changes in v2:
> - Add clock frequency for the clint device tree node
> - Move peripheral device tree nodes under /soc device tree node
> - Device tree nodes are in order based on the address
> - Enable UART0 for U-Boot logs
> - Update doc for the U-Boot logs are on UART0
> - Move clock and reset index source into patch4
> - Remove "dma_addr_r" type in the macb driver
> - Add lower_32_bits() for 32-bit address in the macb driver
> - Add set_rate() returns the new clock rate in the clock driver
>
> Padmarao Begari (7):
>   riscv: Add DMA 64-bit address support
>   net: macb: Add DMA 64-bit address support for macb
>   net: macb: Add phy address to read it from device tree
>   clk: Add Microchip PolarFire SoC clock driver
>   riscv: dts: Add device tree for Microchip Icicle Kit
>   riscv: Add Microchip MPFS Icicle Kit support
>   doc: board: Add Microchip MPFS Icicle Kit doc
>
>  arch/riscv/Kconfig                            |   4 +
>  arch/riscv/dts/Makefile                       |   1 +
>  .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
>  arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 +++++++++
>  arch/riscv/include/asm/types.h                |   4 +
>  board/microchip/mpfs_icicle/Kconfig           |  24 +
>  board/microchip/mpfs_icicle/mpfs_icicle.c     |  97 +-
>  configs/microchip_mpfs_icicle_defconfig       |   9 +-
>  doc/board/index.rst                           |   1 +
>  doc/board/microchip/index.rst                 |   9 +
>  doc/board/microchip/mpfs_icicle.rst           | 827 ++++++++++++++++++
>  drivers/clk/Kconfig                           |   1 +
>  drivers/clk/Makefile                          |   1 +
>  drivers/clk/microchip/Kconfig                 |   5 +
>  drivers/clk/microchip/Makefile                |   1 +
>  drivers/clk/microchip/clk_pfsoc.c             | 127 +++
>  drivers/clk/microchip/clk_pfsoc.h             |  19 +
>  drivers/clk/microchip/clk_pfsoc_cfg.c         | 134 +++
>  drivers/clk/microchip/clk_pfsoc_periph.c      | 173 ++++
>  drivers/net/macb.c                            | 138 ++-
>  drivers/net/macb.h                            |   6 +
>  include/configs/microchip_mpfs_icicle.h       |  60 +-
>  .../dt-bindings/clock/microchip,pfsoc-clock.h |  45 +
>  23 files changed, 2060 insertions(+), 62 deletions(-)
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>  create mode 100644 doc/board/microchip/index.rst
>  create mode 100644 doc/board/microchip/mpfs_icicle.rst
>  create mode 100644 drivers/clk/microchip/Kconfig
>  create mode 100644 drivers/clk/microchip/Makefile
>  create mode 100644 drivers/clk/microchip/clk_pfsoc.c
>  create mode 100644 drivers/clk/microchip/clk_pfsoc.h
>  create mode 100644 drivers/clk/microchip/clk_pfsoc_cfg.c
>  create mode 100644 drivers/clk/microchip/clk_pfsoc_periph.c
>  create mode 100644 include/dt-bindings/clock/microchip,pfsoc-clock.h
>
> --
> 2.17.1
>

Overall this series seems to be in good shape.

I would insist on testing this series on SiFive unleashed for ensuring
that MACB patches don't break SiFive unleashed.

Regards,
Anup
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Bin Meng-2
In reply to this post by Padmarao Begari-2
On Tue, Nov 10, 2020 at 6:46 PM Padmarao Begari
<[hidden email]> wrote:

>
> Add device tree for Microchip PolarFire SoC Icicle Kit.
>
> Signed-off-by: Padmarao Begari <[hidden email]>
> Reviewed-by: Anup Patel <[hidden email]>
> ---
>  arch/riscv/dts/Makefile                       |   1 +
>  .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
>  arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
>  3 files changed, 437 insertions(+)
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>  create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>
> diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
> index 3a6f96c67d..01331b0aa1 100644
> --- a/arch/riscv/dts/Makefile
> +++ b/arch/riscv/dts/Makefile
> @@ -3,6 +3,7 @@
>  dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb
>  dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb
>  dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb
> +dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb
>
>  targets += $(dtb-y)
>
> diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
> new file mode 100644
> index 0000000000..f1738c8a24
> --- /dev/null
> +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +/*
> + * Copyright (C) 2020 Microchip Technology Inc.
> + * Padmarao Begari <[hidden email]>
> + */
> +
> +/ {
> +       aliases {
> +               cpu1 = &cpu1;
> +               cpu2 = &cpu2;
> +               cpu3 = &cpu3;
> +               cpu4 = &cpu4;
> +       };
> +};
> +
> diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> new file mode 100644
> index 0000000000..67e797255b
> --- /dev/null
> +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
> @@ -0,0 +1,421 @@
> +// SPDX-License-Identifier: GPL-2.0+

Please make this dual-licensed, GPL or MIT.
See https://github.com/polarfire-soc/meta-polarfire-soc-yocto-bsp/blob/master/recipes-kernel/linux/files/icicle-kit-es/icicle-kit-es-a000-microchip.dts

> +/* Copyright (c) 2020 Microchip Technology Inc */
> +
> +/dts-v1/;
> +#include "dt-bindings/clock/microchip,pfsoc-clock.h"
> +
> +/* Clock frequency (in Hz) of the rtcclk */
> +#define RTCCLK_FREQ            1000000
> +
> +/ {
> +       #address-cells = <2>;
> +       #size-cells = <2>;
> +       model = "Microchip PolarFire-SoC";
> +       compatible = "microchip,polarfire-soc";
> +
> +       aliases {
> +               serial0 = &uart0;
> +               ethernet0 = &emac1;
> +       };
> +
> +       chosen {
> +               stdout-path = "serial0";
> +       };
> +
> +       cpucomplex: cpus {
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               timebase-frequency = <RTCCLK_FREQ>;
> +               cpu0: cpu@0 {
> +                       clocks = <&clkcfg CLK_CPU>;
> +                       compatible = "sifive,e51", "sifive,rocket0", "riscv";
> +                       device_type = "cpu";
> +                       i-cache-block-size = <64>;
> +                       i-cache-sets = <128>;
> +                       i-cache-size = <16384>;
> +                       reg = <0>;
> +                       riscv,isa = "rv64imac";
> +                       status = "disabled";
> +                       operating-points = <
> +                               /* kHz  uV */
> +                               600000  1100000
> +                               300000   950000
> +                               150000   750000
> +                       >;
> +                       cpu0intc: interrupt-controller {
> +                               #interrupt-cells = <1>;
> +                               compatible = "riscv,cpu-intc";
> +                               interrupt-controller;
> +                       };
> +               };
> +               cpu1: cpu@1 {
> +                       clocks = <&clkcfg CLK_CPU>;
> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
> +                       d-cache-block-size = <64>;
> +                       d-cache-sets = <64>;
> +                       d-cache-size = <32768>;
> +                       d-tlb-sets = <1>;
> +                       d-tlb-size = <32>;
> +                       device_type = "cpu";
> +                       i-cache-block-size = <64>;
> +                       i-cache-sets = <64>;
> +                       i-cache-size = <32768>;
> +                       i-tlb-sets = <1>;
> +                       i-tlb-size = <32>;
> +                       mmu-type = "riscv,sv39";
> +                       reg = <1>;
> +                       riscv,isa = "rv64imafdc";
> +                       tlb-split;
> +                       status = "okay";
> +                       operating-points = <
> +                               /* kHz  uV */
> +                               600000  1100000
> +                               300000   950000
> +                               150000   750000
> +                       >;
> +                       cpu1intc: interrupt-controller {
> +                               #interrupt-cells = <1>;
> +                               compatible = "riscv,cpu-intc";
> +                               interrupt-controller;
> +                       };
> +               };
> +               cpu2: cpu@2 {
> +                       clocks = <&clkcfg CLK_CPU>;
> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
> +                       d-cache-block-size = <64>;
> +                       d-cache-sets = <64>;
> +                       d-cache-size = <32768>;
> +                       d-tlb-sets = <1>;
> +                       d-tlb-size = <32>;
> +                       device_type = "cpu";
> +                       i-cache-block-size = <64>;
> +                       i-cache-sets = <64>;
> +                       i-cache-size = <32768>;
> +                       i-tlb-sets = <1>;
> +                       i-tlb-size = <32>;
> +                       mmu-type = "riscv,sv39";
> +                       reg = <2>;
> +                       riscv,isa = "rv64imafdc";
> +                       tlb-split;
> +                       status = "okay";
> +                       operating-points = <
> +                               /* kHz  uV */
> +                               600000  1100000
> +                               300000   950000
> +                               150000   750000
> +                       >;
> +                       cpu2intc: interrupt-controller {
> +                               #interrupt-cells = <1>;
> +                               compatible = "riscv,cpu-intc";
> +                               interrupt-controller;
> +                       };
> +               };
> +               cpu3: cpu@3 {
> +                       clocks = <&clkcfg CLK_CPU>;
> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
> +                       d-cache-block-size = <64>;
> +                       d-cache-sets = <64>;
> +                       d-cache-size = <32768>;
> +                       d-tlb-sets = <1>;
> +                       d-tlb-size = <32>;
> +                       device_type = "cpu";
> +                       i-cache-block-size = <64>;
> +                       i-cache-sets = <64>;
> +                       i-cache-size = <32768>;
> +                       i-tlb-sets = <1>;
> +                       i-tlb-size = <32>;
> +                       mmu-type = "riscv,sv39";
> +                       reg = <3>;
> +                       riscv,isa = "rv64imafdc";
> +                       tlb-split;
> +                       status = "okay";
> +                       operating-points = <
> +                               /* kHz  uV */
> +                               600000  1100000
> +                               300000   950000
> +                               150000   750000
> +                       >;
> +                       cpu3intc: interrupt-controller {
> +                               #interrupt-cells = <1>;
> +                               compatible = "riscv,cpu-intc";
> +                               interrupt-controller;
> +                       };
> +               };
> +               cpu4: cpu@4 {
> +                       clocks = <&clkcfg CLK_CPU>;
> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
> +                       d-cache-block-size = <64>;
> +                       d-cache-sets = <64>;
> +                       d-cache-size = <32768>;
> +                       d-tlb-sets = <1>;
> +                       d-tlb-size = <32>;
> +                       device_type = "cpu";
> +                       i-cache-block-size = <64>;
> +                       i-cache-sets = <64>;
> +                       i-cache-size = <32768>;
> +                       i-tlb-sets = <1>;
> +                       i-tlb-size = <32>;
> +                       mmu-type = "riscv,sv39";
> +                       reg = <4>;
> +                       riscv,isa = "rv64imafdc";
> +                       tlb-split;
> +                       status = "okay";
> +                       operating-points = <
> +                               /* kHz  uV */
> +                               600000  1100000
> +                               300000   950000
> +                               150000   750000
> +                       >;
> +                       cpu4intc: interrupt-controller {
> +                               #interrupt-cells = <1>;
> +                               compatible = "riscv,cpu-intc";
> +                               interrupt-controller;
> +                       };
> +               };
> +       };
> +       ddr: memory@80000000 {
> +               device_type = "memory";
> +               reg = <0x0 0x80000000 0x0 0x40000000>;
> +               clocks = <&clkcfg CLK_DDRC>;
> +       };
> +       soc: soc {
> +               #address-cells = <2>;
> +               #size-cells = <2>;
> +               compatible = "microchip,polarfire-soc", "simple-bus";
> +               ranges;
> +               clint0: clint@2000000 {
> +                       compatible = "riscv,clint0";
> +                       interrupts-extended = <&cpu0intc 3 &cpu0intc 7
> +                                               &cpu1intc 3 &cpu1intc 7
> +                                               &cpu2intc 3 &cpu2intc 7
> +                                               &cpu3intc 3 &cpu3intc 7
> +                                               &cpu4intc 3 &cpu4intc 7>;
> +                       reg = <0x0 0x2000000 0x0 0x10000>;
> +                       reg-names = "control";
> +                       clock-frequency = <RTCCLK_FREQ>;
> +               };
> +               cachecontroller: cache-controller@2010000 {
> +                       compatible = "sifive,fu540-c000-ccache", "cache";
> +                       cache-block-size = <64>;
> +                       cache-level = <2>;
> +                       cache-sets = <1024>;
> +                       cache-size = <2097152>;
> +                       cache-unified;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <1 2 3>;
> +                       reg = <0x0 0x2010000 0x0 0x1000>;
> +               };
> +               plic: interrupt-controller@c000000 {
> +                       #interrupt-cells = <1>;
> +                       compatible = "sifive,plic-1.0.0";
> +                       reg = <0x0 0xc000000 0x0 0x4000000>;
> +                       riscv,max-priority = <7>;
> +                       riscv,ndev = <186>;
> +                       interrupt-controller;
> +                       interrupts-extended = <
> +                               &cpu0intc 11
> +                               &cpu1intc 11 &cpu1intc 9
> +                               &cpu2intc 11 &cpu2intc 9
> +                               &cpu3intc 11 &cpu3intc 9
> +                               &cpu4intc 11 &cpu4intc 9>;
> +               };
> +               uart0: serial@20000000 {
> +                       compatible = "ns16550a";
> +                       reg = <0x0 0x20000000 0x0 0x400>;
> +                       reg-io-width = <4>;
> +                       reg-shift = <2>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <90>;
> +                       clock-frequency = <150000000>;
> +                       clocks = <&clkcfg CLK_MMUART0>;
> +                       status = "okay";
> +               };
> +               refclk: refclk {
> +                       compatible = "fixed-clock";
> +                       #clock-cells = <0>;
> +                       clock-frequency = <600000000>;
> +                       clock-output-names = "msspllclk";
> +               };
> +               clkcfg: clkcfg@20002000 {
> +                       compatible = "microchip,pfsoc-clkcfg";
> +                       reg = <0x0 0x20002000 0x0 0x1000>;
> +                       reg-names = "mss_sysreg";
> +                       clocks = <&refclk>;
> +                       #clock-cells = <1>;
> +                       clock-output-names = "cpu", "axi", "ahb", "envm",
> +                                       "mac0", "mac1", "mmc", "timer",
> +                                       "mmuart0", "mmuart1", "mmuart2",
> +                                       "mmuart3", "mmuart4", "spi0", "spi1",
> +                                       "i2c0", "i2c1", "can0", "can1", "usb",
> +                                       "reserved", "rtc", "qspi", "gpio0",
> +                                       "gpio1", "gpio2", "ddrc", "fic0",
> +                                       "fic1", "fic2", "fic3", "athena",
> +                                       "cfm";
> +               };
> +               emmc: mmc@20008000 {
> +                       compatible = "cdns,sd4hc";
> +                       reg = <0x0 0x20008000 0x0 0x1000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <88 89>;
> +                       pinctrl-names = "default";
> +                       clocks = <&clkcfg CLK_MMC>;
> +                       bus-width = <4>;
> +                       cap-mmc-highspeed;
> +                       mmc-ddr-3_3v;
> +                       max-frequency = <200000000>;
> +                       non-removable;
> +                       no-sd;
> +                       no-sdio;
> +                       voltage-ranges = <3300 3300>;
> +                       status = "okay";
> +               };
> +               sdcard: sd@20008000 {
> +                       compatible = "cdns,sd4hc";
> +                       reg = <0x0 0x20008000 0x0 0x1000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <88>;
> +                       pinctrl-names = "default";
> +                       clocks = <&clkcfg CLK_MMC>;
> +                       bus-width = <4>;
> +                       disable-wp;
> +                       cap-sd-highspeed;
> +                       card-detect-delay = <200>;
> +                       sd-uhs-sdr12;
> +                       sd-uhs-sdr25;
> +                       sd-uhs-sdr50;
> +                       sd-uhs-sdr104;
> +                       max-frequency = <200000000>;
> +                       status = "disabled";
> +               };
> +               uart1: serial@20100000 {
> +                       compatible = "ns16550a";
> +                       reg = <0x0 0x20100000 0x0 0x400>;
> +                       reg-io-width = <4>;
> +                       reg-shift = <2>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <91>;
> +                       clock-frequency = <150000000>;
> +                       clocks = <&clkcfg CLK_MMUART1>;
> +                       status = "okay";
> +               };
> +               uart2: serial@20102000 {
> +                       compatible = "ns16550a";
> +                       reg = <0x0 0x20102000 0x0 0x400>;
> +                       reg-io-width = <4>;
> +                       reg-shift = <2>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <92>;
> +                       clock-frequency = <150000000>;
> +                       clocks = <&clkcfg CLK_MMUART2>;
> +                       status = "okay";
> +               };
> +               uart3: serial@20104000 {
> +                       compatible = "ns16550a";
> +                       reg = <0x0 0x20104000 0x0 0x400>;
> +                       reg-io-width = <4>;
> +                       reg-shift = <2>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <93>;
> +                       clock-frequency = <150000000>;
> +                       clocks = <&clkcfg CLK_MMUART3>;
> +                       status = "okay";
> +               };
> +               i2c0: i2c@02010a000 {
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       compatible = "microsemi,ms-pf-mss-i2c";
> +                       reg = <0x0 0x2010a000 0x0 0x1000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <58>;
> +                       clocks = <&clkcfg CLK_I2C0>;
> +                       status = "disabled";
> +               };
> +               i2c1: i2c@02010b000 {
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       compatible = "microsemi,ms-pf-mss-i2c";
> +                       reg = <0x0 0x2010b000 0x0 0x1000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <61>;
> +                       clocks = <&clkcfg CLK_I2C1>;
> +                       status = "disabled";
> +                       pac193x@0x10 {
> +                               compatible = "microchip,pac1934";
> +                               reg = <0x10>;
> +                               samp-rate = <64>;
> +                               status = "disabled";
> +                               ch1: channel@0 {
> +                                       uohms-shunt-res = <10000>;
> +                                       rail-name = "VDD";
> +                                       channel_enabled;
> +                               };
> +                               ch2: channel@1 {
> +                                       uohms-shunt-res = <10000>;
> +                                       rail-name = "VDDA25";
> +                                       channel_enabled;
> +                               };
> +                               ch3: channel@2 {
> +                                       uohms-shunt-res = <10000>;
> +                                       rail-name = "VDD25";
> +                                       channel_enabled;
> +                               };
> +                               ch4: channel@3 {
> +                                       uohms-shunt-res = <10000>;
> +                                       rail-name = "VDDA";
> +                                       channel_enabled;
> +                               };
> +                       };
> +               };
> +               emac0: ethernet@20110000 {
> +                       compatible = "cdns,macb";
> +                       reg = <0x0 0x20110000 0x0 0x2000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <64 65 66 67>;
> +                       local-mac-address = [00 00 00 00 00 00];
> +                       phy-mode = "sgmii";
> +                       clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AXI>;
> +                       clock-names = "pclk", "hclk";
> +                       status = "disabled";
> +
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       phy-handle = <&phy0>;
> +                       phy0: ethernet-phy@8 {
> +                               reg = <8>;
> +                               ti,fifo-depth = <0x01>;
> +                       };
> +               };
> +               emac1: ethernet@20112000 {
> +                       compatible = "cdns,macb";
> +                       reg = <0x0 0x20112000 0x0 0x2000>;
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <70 71 72 73>;
> +                       local-mac-address = [00 00 00 00 00 00];
> +                       phy-mode = "sgmii";
> +                       clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
> +                       clock-names = "pclk", "hclk";
> +                       status = "okay";
> +
> +                       #address-cells = <1>;
> +                       #size-cells = <0>;
> +                       phy-handle = <&phy1>;
> +                       phy1: ethernet-phy@9 {
> +                               reg = <9>;
> +                               ti,fifo-depth = <0x01>;
> +                       };
> +               };
> +               gpio: gpio@0x20122000 {
> +                       compatible = "microsemi,ms-pf-mss-gpio";
> +                       interrupt-parent = <&plic>;
> +                       interrupts = <13 14 15 16 17 18 19 20 21 22 23 24 25 26
> +                                       27 28 29 30 31 32 33 34 35 36 37 38 39
> +                                       40 41 42 43 44>;
> +                       gpio-controller;
> +                       clocks = <&clkcfg CLK_GPIO2>;
> +                       reg = <0x00 0x20122000 0x0 0x1000>;
> +                       reg-names = "control";
> +                       #gpio-cells = <2>;
> +                       status = "disabled";
> +               };
> +       };
> +};

Regards,
Bin
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 5/7] riscv: dts: Add device tree for Microchip Icicle Kit

Padmarao Begari


> On 17-Nov-2020, at 7:46 AM, Bin Meng <[hidden email]> wrote:
>
> On Tue, Nov 10, 2020 at 6:46 PM Padmarao Begari
> <[hidden email]> wrote:
>>
>> Add device tree for Microchip PolarFire SoC Icicle Kit.
>>
>> Signed-off-by: Padmarao Begari <[hidden email]>
>> Reviewed-by: Anup Patel <[hidden email]>
>> ---
>> arch/riscv/dts/Makefile                       |   1 +
>> .../dts/microchip-mpfs-icicle-kit-u-boot.dtsi |  15 +
>> arch/riscv/dts/microchip-mpfs-icicle-kit.dts  | 421 ++++++++++++++++++
>> 3 files changed, 437 insertions(+)
>> create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>> create mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>>
>> diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile
>> index 3a6f96c67d..01331b0aa1 100644
>> --- a/arch/riscv/dts/Makefile
>> +++ b/arch/riscv/dts/Makefile
>> @@ -3,6 +3,7 @@
>> dtb-$(CONFIG_TARGET_AX25_AE350) += ae350_32.dtb ae350_64.dtb
>> dtb-$(CONFIG_TARGET_SIFIVE_FU540) += hifive-unleashed-a00.dtb
>> dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb
>> +dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb
>>
>> targets += $(dtb-y)
>>
>> diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..f1738c8a24
>> --- /dev/null
>> +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi
>> @@ -0,0 +1,15 @@
>> +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
>> +/*
>> + * Copyright (C) 2020 Microchip Technology Inc.
>> + * Padmarao Begari <[hidden email]>
>> + */
>> +
>> +/ {
>> +       aliases {
>> +               cpu1 = &cpu1;
>> +               cpu2 = &cpu2;
>> +               cpu3 = &cpu3;
>> +               cpu4 = &cpu4;
>> +       };
>> +};
>> +
>> diff --git a/arch/riscv/dts/microchip-mpfs-icicle-kit.dts b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>> new file mode 100644
>> index 0000000000..67e797255b
>> --- /dev/null
>> +++ b/arch/riscv/dts/microchip-mpfs-icicle-kit.dts
>> @@ -0,0 +1,421 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>
> Please make this dual-licensed, GPL or MIT.
> See https://github.com/polarfire-soc/meta-polarfire-soc-yocto-bsp/blob/master/recipes-kernel/linux/files/icicle-kit-es/icicle-kit-es-a000-microchip.dts

Ok

Regards
Padmarao

>
>> +/* Copyright (c) 2020 Microchip Technology Inc */
>> +
>> +/dts-v1/;
>> +#include "dt-bindings/clock/microchip,pfsoc-clock.h"
>> +
>> +/* Clock frequency (in Hz) of the rtcclk */
>> +#define RTCCLK_FREQ            1000000
>> +
>> +/ {
>> +       #address-cells = <2>;
>> +       #size-cells = <2>;
>> +       model = "Microchip PolarFire-SoC";
>> +       compatible = "microchip,polarfire-soc";
>> +
>> +       aliases {
>> +               serial0 = &uart0;
>> +               ethernet0 = &emac1;
>> +       };
>> +
>> +       chosen {
>> +               stdout-path = "serial0";
>> +       };
>> +
>> +       cpucomplex: cpus {
>> +               #address-cells = <1>;
>> +               #size-cells = <0>;
>> +               timebase-frequency = <RTCCLK_FREQ>;
>> +               cpu0: cpu@0 {
>> +                       clocks = <&clkcfg CLK_CPU>;
>> +                       compatible = "sifive,e51", "sifive,rocket0", "riscv";
>> +                       device_type = "cpu";
>> +                       i-cache-block-size = <64>;
>> +                       i-cache-sets = <128>;
>> +                       i-cache-size = <16384>;
>> +                       reg = <0>;
>> +                       riscv,isa = "rv64imac";
>> +                       status = "disabled";
>> +                       operating-points = <
>> +                               /* kHz  uV */
>> +                               600000  1100000
>> +                               300000   950000
>> +                               150000   750000
>> +                       >;
>> +                       cpu0intc: interrupt-controller {
>> +                               #interrupt-cells = <1>;
>> +                               compatible = "riscv,cpu-intc";
>> +                               interrupt-controller;
>> +                       };
>> +               };
>> +               cpu1: cpu@1 {
>> +                       clocks = <&clkcfg CLK_CPU>;
>> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
>> +                       d-cache-block-size = <64>;
>> +                       d-cache-sets = <64>;
>> +                       d-cache-size = <32768>;
>> +                       d-tlb-sets = <1>;
>> +                       d-tlb-size = <32>;
>> +                       device_type = "cpu";
>> +                       i-cache-block-size = <64>;
>> +                       i-cache-sets = <64>;
>> +                       i-cache-size = <32768>;
>> +                       i-tlb-sets = <1>;
>> +                       i-tlb-size = <32>;
>> +                       mmu-type = "riscv,sv39";
>> +                       reg = <1>;
>> +                       riscv,isa = "rv64imafdc";
>> +                       tlb-split;
>> +                       status = "okay";
>> +                       operating-points = <
>> +                               /* kHz  uV */
>> +                               600000  1100000
>> +                               300000   950000
>> +                               150000   750000
>> +                       >;
>> +                       cpu1intc: interrupt-controller {
>> +                               #interrupt-cells = <1>;
>> +                               compatible = "riscv,cpu-intc";
>> +                               interrupt-controller;
>> +                       };
>> +               };
>> +               cpu2: cpu@2 {
>> +                       clocks = <&clkcfg CLK_CPU>;
>> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
>> +                       d-cache-block-size = <64>;
>> +                       d-cache-sets = <64>;
>> +                       d-cache-size = <32768>;
>> +                       d-tlb-sets = <1>;
>> +                       d-tlb-size = <32>;
>> +                       device_type = "cpu";
>> +                       i-cache-block-size = <64>;
>> +                       i-cache-sets = <64>;
>> +                       i-cache-size = <32768>;
>> +                       i-tlb-sets = <1>;
>> +                       i-tlb-size = <32>;
>> +                       mmu-type = "riscv,sv39";
>> +                       reg = <2>;
>> +                       riscv,isa = "rv64imafdc";
>> +                       tlb-split;
>> +                       status = "okay";
>> +                       operating-points = <
>> +                               /* kHz  uV */
>> +                               600000  1100000
>> +                               300000   950000
>> +                               150000   750000
>> +                       >;
>> +                       cpu2intc: interrupt-controller {
>> +                               #interrupt-cells = <1>;
>> +                               compatible = "riscv,cpu-intc";
>> +                               interrupt-controller;
>> +                       };
>> +               };
>> +               cpu3: cpu@3 {
>> +                       clocks = <&clkcfg CLK_CPU>;
>> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
>> +                       d-cache-block-size = <64>;
>> +                       d-cache-sets = <64>;
>> +                       d-cache-size = <32768>;
>> +                       d-tlb-sets = <1>;
>> +                       d-tlb-size = <32>;
>> +                       device_type = "cpu";
>> +                       i-cache-block-size = <64>;
>> +                       i-cache-sets = <64>;
>> +                       i-cache-size = <32768>;
>> +                       i-tlb-sets = <1>;
>> +                       i-tlb-size = <32>;
>> +                       mmu-type = "riscv,sv39";
>> +                       reg = <3>;
>> +                       riscv,isa = "rv64imafdc";
>> +                       tlb-split;
>> +                       status = "okay";
>> +                       operating-points = <
>> +                               /* kHz  uV */
>> +                               600000  1100000
>> +                               300000   950000
>> +                               150000   750000
>> +                       >;
>> +                       cpu3intc: interrupt-controller {
>> +                               #interrupt-cells = <1>;
>> +                               compatible = "riscv,cpu-intc";
>> +                               interrupt-controller;
>> +                       };
>> +               };
>> +               cpu4: cpu@4 {
>> +                       clocks = <&clkcfg CLK_CPU>;
>> +                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
>> +                       d-cache-block-size = <64>;
>> +                       d-cache-sets = <64>;
>> +                       d-cache-size = <32768>;
>> +                       d-tlb-sets = <1>;
>> +                       d-tlb-size = <32>;
>> +                       device_type = "cpu";
>> +                       i-cache-block-size = <64>;
>> +                       i-cache-sets = <64>;
>> +                       i-cache-size = <32768>;
>> +                       i-tlb-sets = <1>;
>> +                       i-tlb-size = <32>;
>> +                       mmu-type = "riscv,sv39";
>> +                       reg = <4>;
>> +                       riscv,isa = "rv64imafdc";
>> +                       tlb-split;
>> +                       status = "okay";
>> +                       operating-points = <
>> +                               /* kHz  uV */
>> +                               600000  1100000
>> +                               300000   950000
>> +                               150000   750000
>> +                       >;
>> +                       cpu4intc: interrupt-controller {
>> +                               #interrupt-cells = <1>;
>> +                               compatible = "riscv,cpu-intc";
>> +                               interrupt-controller;
>> +                       };
>> +               };
>> +       };
>> +       ddr: memory@80000000 {
>> +               device_type = "memory";
>> +               reg = <0x0 0x80000000 0x0 0x40000000>;
>> +               clocks = <&clkcfg CLK_DDRC>;
>> +       };
>> +       soc: soc {
>> +               #address-cells = <2>;
>> +               #size-cells = <2>;
>> +               compatible = "microchip,polarfire-soc", "simple-bus";
>> +               ranges;
>> +               clint0: clint@2000000 {
>> +                       compatible = "riscv,clint0";
>> +                       interrupts-extended = <&cpu0intc 3 &cpu0intc 7
>> +                                               &cpu1intc 3 &cpu1intc 7
>> +                                               &cpu2intc 3 &cpu2intc 7
>> +                                               &cpu3intc 3 &cpu3intc 7
>> +                                               &cpu4intc 3 &cpu4intc 7>;
>> +                       reg = <0x0 0x2000000 0x0 0x10000>;
>> +                       reg-names = "control";
>> +                       clock-frequency = <RTCCLK_FREQ>;
>> +               };
>> +               cachecontroller: cache-controller@2010000 {
>> +                       compatible = "sifive,fu540-c000-ccache", "cache";
>> +                       cache-block-size = <64>;
>> +                       cache-level = <2>;
>> +                       cache-sets = <1024>;
>> +                       cache-size = <2097152>;
>> +                       cache-unified;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <1 2 3>;
>> +                       reg = <0x0 0x2010000 0x0 0x1000>;
>> +               };
>> +               plic: interrupt-controller@c000000 {
>> +                       #interrupt-cells = <1>;
>> +                       compatible = "sifive,plic-1.0.0";
>> +                       reg = <0x0 0xc000000 0x0 0x4000000>;
>> +                       riscv,max-priority = <7>;
>> +                       riscv,ndev = <186>;
>> +                       interrupt-controller;
>> +                       interrupts-extended = <
>> +                               &cpu0intc 11
>> +                               &cpu1intc 11 &cpu1intc 9
>> +                               &cpu2intc 11 &cpu2intc 9
>> +                               &cpu3intc 11 &cpu3intc 9
>> +                               &cpu4intc 11 &cpu4intc 9>;
>> +               };
>> +               uart0: serial@20000000 {
>> +                       compatible = "ns16550a";
>> +                       reg = <0x0 0x20000000 0x0 0x400>;
>> +                       reg-io-width = <4>;
>> +                       reg-shift = <2>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <90>;
>> +                       clock-frequency = <150000000>;
>> +                       clocks = <&clkcfg CLK_MMUART0>;
>> +                       status = "okay";
>> +               };
>> +               refclk: refclk {
>> +                       compatible = "fixed-clock";
>> +                       #clock-cells = <0>;
>> +                       clock-frequency = <600000000>;
>> +                       clock-output-names = "msspllclk";
>> +               };
>> +               clkcfg: clkcfg@20002000 {
>> +                       compatible = "microchip,pfsoc-clkcfg";
>> +                       reg = <0x0 0x20002000 0x0 0x1000>;
>> +                       reg-names = "mss_sysreg";
>> +                       clocks = <&refclk>;
>> +                       #clock-cells = <1>;
>> +                       clock-output-names = "cpu", "axi", "ahb", "envm",
>> +                                       "mac0", "mac1", "mmc", "timer",
>> +                                       "mmuart0", "mmuart1", "mmuart2",
>> +                                       "mmuart3", "mmuart4", "spi0", "spi1",
>> +                                       "i2c0", "i2c1", "can0", "can1", "usb",
>> +                                       "reserved", "rtc", "qspi", "gpio0",
>> +                                       "gpio1", "gpio2", "ddrc", "fic0",
>> +                                       "fic1", "fic2", "fic3", "athena",
>> +                                       "cfm";
>> +               };
>> +               emmc: mmc@20008000 {
>> +                       compatible = "cdns,sd4hc";
>> +                       reg = <0x0 0x20008000 0x0 0x1000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <88 89>;
>> +                       pinctrl-names = "default";
>> +                       clocks = <&clkcfg CLK_MMC>;
>> +                       bus-width = <4>;
>> +                       cap-mmc-highspeed;
>> +                       mmc-ddr-3_3v;
>> +                       max-frequency = <200000000>;
>> +                       non-removable;
>> +                       no-sd;
>> +                       no-sdio;
>> +                       voltage-ranges = <3300 3300>;
>> +                       status = "okay";
>> +               };
>> +               sdcard: sd@20008000 {
>> +                       compatible = "cdns,sd4hc";
>> +                       reg = <0x0 0x20008000 0x0 0x1000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <88>;
>> +                       pinctrl-names = "default";
>> +                       clocks = <&clkcfg CLK_MMC>;
>> +                       bus-width = <4>;
>> +                       disable-wp;
>> +                       cap-sd-highspeed;
>> +                       card-detect-delay = <200>;
>> +                       sd-uhs-sdr12;
>> +                       sd-uhs-sdr25;
>> +                       sd-uhs-sdr50;
>> +                       sd-uhs-sdr104;
>> +                       max-frequency = <200000000>;
>> +                       status = "disabled";
>> +               };
>> +               uart1: serial@20100000 {
>> +                       compatible = "ns16550a";
>> +                       reg = <0x0 0x20100000 0x0 0x400>;
>> +                       reg-io-width = <4>;
>> +                       reg-shift = <2>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <91>;
>> +                       clock-frequency = <150000000>;
>> +                       clocks = <&clkcfg CLK_MMUART1>;
>> +                       status = "okay";
>> +               };
>> +               uart2: serial@20102000 {
>> +                       compatible = "ns16550a";
>> +                       reg = <0x0 0x20102000 0x0 0x400>;
>> +                       reg-io-width = <4>;
>> +                       reg-shift = <2>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <92>;
>> +                       clock-frequency = <150000000>;
>> +                       clocks = <&clkcfg CLK_MMUART2>;
>> +                       status = "okay";
>> +               };
>> +               uart3: serial@20104000 {
>> +                       compatible = "ns16550a";
>> +                       reg = <0x0 0x20104000 0x0 0x400>;
>> +                       reg-io-width = <4>;
>> +                       reg-shift = <2>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <93>;
>> +                       clock-frequency = <150000000>;
>> +                       clocks = <&clkcfg CLK_MMUART3>;
>> +                       status = "okay";
>> +               };
>> +               i2c0: i2c@02010a000 {
>> +                       #address-cells = <1>;
>> +                       #size-cells = <0>;
>> +                       compatible = "microsemi,ms-pf-mss-i2c";
>> +                       reg = <0x0 0x2010a000 0x0 0x1000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <58>;
>> +                       clocks = <&clkcfg CLK_I2C0>;
>> +                       status = "disabled";
>> +               };
>> +               i2c1: i2c@02010b000 {
>> +                       #address-cells = <1>;
>> +                       #size-cells = <0>;
>> +                       compatible = "microsemi,ms-pf-mss-i2c";
>> +                       reg = <0x0 0x2010b000 0x0 0x1000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <61>;
>> +                       clocks = <&clkcfg CLK_I2C1>;
>> +                       status = "disabled";
>> +                       pac193x@0x10 {
>> +                               compatible = "microchip,pac1934";
>> +                               reg = <0x10>;
>> +                               samp-rate = <64>;
>> +                               status = "disabled";
>> +                               ch1: channel@0 {
>> +                                       uohms-shunt-res = <10000>;
>> +                                       rail-name = "VDD";
>> +                                       channel_enabled;
>> +                               };
>> +                               ch2: channel@1 {
>> +                                       uohms-shunt-res = <10000>;
>> +                                       rail-name = "VDDA25";
>> +                                       channel_enabled;
>> +                               };
>> +                               ch3: channel@2 {
>> +                                       uohms-shunt-res = <10000>;
>> +                                       rail-name = "VDD25";
>> +                                       channel_enabled;
>> +                               };
>> +                               ch4: channel@3 {
>> +                                       uohms-shunt-res = <10000>;
>> +                                       rail-name = "VDDA";
>> +                                       channel_enabled;
>> +                               };
>> +                       };
>> +               };
>> +               emac0: ethernet@20110000 {
>> +                       compatible = "cdns,macb";
>> +                       reg = <0x0 0x20110000 0x0 0x2000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <64 65 66 67>;
>> +                       local-mac-address = [00 00 00 00 00 00];
>> +                       phy-mode = "sgmii";
>> +                       clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AXI>;
>> +                       clock-names = "pclk", "hclk";
>> +                       status = "disabled";
>> +
>> +                       #address-cells = <1>;
>> +                       #size-cells = <0>;
>> +                       phy-handle = <&phy0>;
>> +                       phy0: ethernet-phy@8 {
>> +                               reg = <8>;
>> +                               ti,fifo-depth = <0x01>;
>> +                       };
>> +               };
>> +               emac1: ethernet@20112000 {
>> +                       compatible = "cdns,macb";
>> +                       reg = <0x0 0x20112000 0x0 0x2000>;
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <70 71 72 73>;
>> +                       local-mac-address = [00 00 00 00 00 00];
>> +                       phy-mode = "sgmii";
>> +                       clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
>> +                       clock-names = "pclk", "hclk";
>> +                       status = "okay";
>> +
>> +                       #address-cells = <1>;
>> +                       #size-cells = <0>;
>> +                       phy-handle = <&phy1>;
>> +                       phy1: ethernet-phy@9 {
>> +                               reg = <9>;
>> +                               ti,fifo-depth = <0x01>;
>> +                       };
>> +               };
>> +               gpio: gpio@0x20122000 {
>> +                       compatible = "microsemi,ms-pf-mss-gpio";
>> +                       interrupt-parent = <&plic>;
>> +                       interrupts = <13 14 15 16 17 18 19 20 21 22 23 24 25 26
>> +                                       27 28 29 30 31 32 33 34 35 36 37 38 39
>> +                                       40 41 42 43 44>;
>> +                       gpio-controller;
>> +                       clocks = <&clkcfg CLK_GPIO2>;
>> +                       reg = <0x00 0x20122000 0x0 0x1000>;
>> +                       reg-names = "control";
>> +                       #gpio-cells = <2>;
>> +                       status = "disabled";
>> +               };
>> +       };
>> +};
>
> Regards,
> Bin
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 2/7] net: macb: Add DMA 64-bit address support for macb

Padmarao Begari
In reply to this post by Anup Patel-2
Hi Anup

I have tested the MACB driver patch with the SiFive unleashed board and
it's not working because of the GEM_DCFG6 register.
The SiFive FU540 is supporting DMA address width is 64-bit while reading
the GEM_DCFG6 register but it supports
scatter-gather 32-bit wide bus mastering DMA. The SiFive unleashed board
supports 32-bit DMA not 64-bit DMA.

We can't check dynamically the support of DMA.

+    if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
+           macb->hw_dma_cap = HW_DMA_CAP_64B;
+   else
+          macb->hw_dma_cap = HW_DMA_CAP_32B;

Can we use preprocessor macro(like below) to check DMA support?

#ifdef CONFIG_DMA_ADDR_T_64BIT
    macb->hw_dma_cap = HW_DMA_CAP_64B;
#else
    macb->hw_dma_cap = HW_DMA_CAP_32B;
#endif

By default CONFIG_DMA_ADDR_T_64BIT is not set, whichever the board supports
64-bit DMA then the board config can set the CONFIG_DMA_ADDR_T_64BIT.

Regards
Padmarao

On Sun, Nov 15, 2020 at 5:40 PM Anup Patel <[hidden email]> wrote:

> On Tue, Nov 10, 2020 at 4:16 PM Padmarao Begari
> <[hidden email]> wrote:
> >
> > Enable 32-bit or 64-bit DMA in the macb driver based on the design
> > config debug6 register of MACB hardware which supports 32-bit or
> > 64-bit DMA.
> >
> > Signed-off-by: Padmarao Begari <[hidden email]>
> > ---
> >  drivers/net/macb.c | 121 +++++++++++++++++++++++++++++++++++++++------
> >  drivers/net/macb.h |   6 +++
> >  2 files changed, 112 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> > index b80a259ff7..9ccbb7a166 100644
> > --- a/drivers/net/macb.c
> > +++ b/drivers/net/macb.c
> > @@ -83,7 +83,16 @@ struct macb_dma_desc {
> >         u32     ctrl;
> >  };
> >
> > -#define DMA_DESC_BYTES(n)      (n * sizeof(struct macb_dma_desc))
> > +struct macb_dma_desc_64 {
> > +       u32 addrh;
> > +       u32 unused;
> > +};
> > +
> > +#define HW_DMA_CAP_32B         0
> > +#define HW_DMA_CAP_64B         1
> > +
> > +#define DMA_DESC_SIZE          16
> > +#define DMA_DESC_BYTES(n)      ((n) * DMA_DESC_SIZE)
> >  #define MACB_TX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_TX_RING_SIZE))
> >  #define MACB_RX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_RX_RING_SIZE))
> >  #define MACB_TX_DUMMY_DMA_DESC_SIZE    (DMA_DESC_BYTES(1))
> > @@ -133,6 +142,7 @@ struct macb_device {
> >  #endif
> >         phy_interface_t         phy_interface;
> >  #endif
> > +       unsigned short          hw_dma_cap;
> >  };
> >
> >  struct macb_config {
> > @@ -307,6 +317,24 @@ static inline void macb_invalidate_rx_buffer(struct
> macb_device *macb)
> >
> >  #if defined(CONFIG_CMD_NET)
> >
> > +static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc
> *desc)
> > +{
> > +       return (struct macb_dma_desc_64 *)((void *)desc
> > +               + sizeof(struct macb_dma_desc));
> > +}
> > +
> > +static void macb_set_addr(struct macb_device *macb, struct
> macb_dma_desc *desc,
> > +                         ulong addr)
> > +{
> > +       struct macb_dma_desc_64 *desc_64;
> > +
> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +               desc_64 = macb_64b_desc(desc);
> > +               desc_64->addrh = upper_32_bits(addr);
> > +       }
> > +       desc->addr = lower_32_bits(addr);
> > +}
> > +
> >  static int _macb_send(struct macb_device *macb, const char *name, void
> *packet,
> >                       int length)
> >  {
> > @@ -325,8 +353,12 @@ static int _macb_send(struct macb_device *macb,
> const char *name, void *packet,
> >                 macb->tx_head++;
> >         }
> >
> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +               tx_head = tx_head * 2;
> > +
> >         macb->tx_ring[tx_head].ctrl = ctrl;
> > -       macb->tx_ring[tx_head].addr = paddr;
> > +       macb_set_addr(macb, &macb->tx_ring[tx_head], paddr);
> > +
> >         barrier();
> >         macb_flush_ring_desc(macb, TX);
> >         macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) |
> MACB_BIT(TSTART));
> > @@ -363,19 +395,28 @@ static void reclaim_rx_buffers(struct macb_device
> *macb,
> >                                unsigned int new_tail)
> >  {
> >         unsigned int i;
> > +       unsigned int count;
> >
> >         i = macb->rx_tail;
> >
> >         macb_invalidate_ring_desc(macb, RX);
> >         while (i > new_tail) {
> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +                       count = i * 2;
> > +               else
> > +                       count = i;
> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
> >                 i++;
> >                 if (i > MACB_RX_RING_SIZE)
> >                         i = 0;
> >         }
> >
> >         while (i < new_tail) {
> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +                       count = i * 2;
> > +               else
> > +                       count = i;
> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
> >                 i++;
> >         }
> >
> > @@ -390,16 +431,25 @@ static int _macb_recv(struct macb_device *macb,
> uchar **packetp)
> >         void *buffer;
> >         int length;
> >         u32 status;
> > +       u8 flag = false;
> >
> >         macb->wrapped = false;
> >         for (;;) {
> >                 macb_invalidate_ring_desc(macb, RX);
> >
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +                       next_rx_tail = next_rx_tail * 2;
> > +
> >                 if (!(macb->rx_ring[next_rx_tail].addr &
> MACB_BIT(RX_USED)))
> >                         return -EAGAIN;
> >
> >                 status = macb->rx_ring[next_rx_tail].ctrl;
> >                 if (status & MACB_BIT(RX_SOF)) {
> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +                               next_rx_tail = next_rx_tail / 2;
> > +                               flag = true;
> > +                       }
> > +
> >                         if (next_rx_tail != macb->rx_tail)
> >                                 reclaim_rx_buffers(macb, next_rx_tail);
> >                         macb->wrapped = false;
> > @@ -426,11 +476,22 @@ static int _macb_recv(struct macb_device *macb,
> uchar **packetp)
> >                                 *packetp = buffer;
> >                         }
> >
> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +                               if (!flag)
> > +                                       next_rx_tail = next_rx_tail / 2;
> > +                       }
> > +
> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE)
> >                                 next_rx_tail = 0;
> >                         macb->next_rx_tail = next_rx_tail;
> >                         return length;
> >                 } else {
> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +                               if (!flag)
> > +                                       next_rx_tail = next_rx_tail / 2;
> > +                               flag = false;
> > +                       }
> > +
> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE) {
> >                                 macb->wrapped = true;
> >                                 next_rx_tail = 0;
> > @@ -718,6 +779,7 @@ static int gmac_init_multi_queues(struct macb_device
> *macb)
> >  {
> >         int i, num_queues = 1;
> >         u32 queue_mask;
> > +       unsigned long paddr;
> >
> >         /* bit 0 is never set but queue 0 always exists */
> >         queue_mask = gem_readl(macb, DCFG6) & 0xff;
> > @@ -731,10 +793,18 @@ static int gmac_init_multi_queues(struct
> macb_device *macb)
> >         macb->dummy_desc->addr = 0;
> >         flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma +
> >                         ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN));
> > -
> > -       for (i = 1; i < num_queues; i++)
> > -               gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i - 1);
> > -
> > +       paddr = macb->dummy_desc_dma;
> > +
> > +       for (i = 1; i < num_queues; i++) {
> > +               gem_writel_queue_TBQP(macb, lower_32_bits(paddr), i - 1);
> > +               gem_writel_queue_RBQP(macb, lower_32_bits(paddr), i - 1);
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +                       gem_writel_queue_TBQPH(macb,
> upper_32_bits(paddr),
> > +                                              i - 1);
> > +                       gem_writel_queue_RBQPH(macb,
> upper_32_bits(paddr),
> > +                                              i - 1);
> > +               }
> > +       }
> >         return 0;
> >  }
> >
> > @@ -760,6 +830,9 @@ static void gmac_configure_dma(struct macb_device
> *macb)
> >                 dmacfg &= ~GEM_BIT(ENDIA_DESC);
> >
> >         dmacfg &= ~GEM_BIT(ADDR64);
> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +               dmacfg |= GEM_BIT(ADDR64);
> > +
> >         gem_writel(macb, DMACFG, dmacfg);
> >  }
> >
> > @@ -775,6 +848,12 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >         unsigned long paddr;
> >         int ret;
> >         int i;
> > +       int count;
> > +
> > +       if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
> > +               macb->hw_dma_cap = HW_DMA_CAP_64B;
> > +       else
> > +               macb->hw_dma_cap = HW_DMA_CAP_32B;
> >
> >         /*
> >          * macb_halt should have been called at some point before now,
> > @@ -786,20 +865,28 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >         for (i = 0; i < MACB_RX_RING_SIZE; i++) {
> >                 if (i == (MACB_RX_RING_SIZE - 1))
> >                         paddr |= MACB_BIT(RX_WRAP);
> > -               macb->rx_ring[i].addr = paddr;
> > -               macb->rx_ring[i].ctrl = 0;
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +                       count = i * 2;
> > +               else
> > +                       count = i;
> > +               macb->rx_ring[count].ctrl = 0;
> > +               macb_set_addr(macb, &macb->rx_ring[count], paddr);
> >                 paddr += macb->rx_buffer_size;
> >         }
> >         macb_flush_ring_desc(macb, RX);
> >         macb_flush_rx_buffer(macb);
> >
> >         for (i = 0; i < MACB_TX_RING_SIZE; i++) {
> > -               macb->tx_ring[i].addr = 0;
> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> > +                       count = i * 2;
> > +               else
> > +                       count = i;
> > +               macb_set_addr(macb, &macb->tx_ring[count], 0);
> >                 if (i == (MACB_TX_RING_SIZE - 1))
> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) |
> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED) |
> >                                 MACB_BIT(TX_WRAP);
> >                 else
> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED);
> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED);
> >         }
> >         macb_flush_ring_desc(macb, TX);
> >
> > @@ -812,8 +899,12 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >         gem_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
> >  #endif
> >
> > -       macb_writel(macb, RBQP, macb->rx_ring_dma);
> > -       macb_writel(macb, TBQP, macb->tx_ring_dma);
> > +       macb_writel(macb, RBQP, lower_32_bits(macb->rx_ring_dma));
> > +       macb_writel(macb, TBQP, lower_32_bits(macb->tx_ring_dma));
> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> > +               macb_writel(macb, RBQPH,
> upper_32_bits(macb->rx_ring_dma));
> > +               macb_writel(macb, TBQPH,
> upper_32_bits(macb->tx_ring_dma));
> > +       }
> >
> >         if (macb_is_gem(macb)) {
> >                 /* Initialize DMA properties */
> > diff --git a/drivers/net/macb.h b/drivers/net/macb.h
> > index 9b16383eba..72b84ae96e 100644
> > --- a/drivers/net/macb.h
> > +++ b/drivers/net/macb.h
> > @@ -768,5 +768,11 @@
> >  #define GEM_RX_CSUM_CHECKED_MASK               2
> >  #define gem_writel_queue_TBQP(port, value, queue_num)  \
> >         writel((value), (port)->regs + GEM_TBQP(queue_num))
> > +#define gem_writel_queue_TBQPH(port, value, queue_num) \
> > +       writel((value), (port)->regs + GEM_TBQPH(queue_num))
> > +#define gem_writel_queue_RBQP(port, value, queue_num)  \
> > +       writel((value), (port)->regs + GEM_RBQP(queue_num))
> > +#define gem_writel_queue_RBQPH(port, value, queue_num) \
> > +       writel((value), (port)->regs + GEM_RBQPH(queue_num))
> >
> >  #endif /* __DRIVERS_MACB_H__ */
> > --
> > 2.17.1
> >
>
> Looks good to me.
>
> Reviewed-by: Anup Patel <[hidden email]>
>
> We need to test this patch on SiFive Unleashed as well because
> it has same ethernet controller.
>
> Regards,
> Anup
>
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 2/7] net: macb: Add DMA 64-bit address support for macb

Anup Patel-2
On Thu, Nov 26, 2020 at 10:33 AM Padmarao Begari <[hidden email]> wrote:
>
> Hi Anup
>
> I have tested the MACB driver patch with the SiFive unleashed board and it's not working because of the GEM_DCFG6 register.
> The SiFive FU540 is supporting DMA address width is 64-bit while reading the GEM_DCFG6 register but it supports
> scatter-gather 32-bit wide bus mastering DMA. The SiFive unleashed board supports 32-bit DMA not 64-bit DMA.

Thanks for trying this out.

>
> We can't check dynamically the support of DMA.

We can still check this capability.

I would suggest to detect 64bit DMA support based on
compatible string as follows:
1. Add MACB compatible string for Microchip polarfire
    in <linux>/Documentation/devicetree/bindings/net/macb.txt
2. Use MACB polarfir compatible string to enable 64bit
    DMA feature in U-Boot MACB driver.

This way your patch will work fine for both SiFive Unleashed
and Microchip Polarfire.

>
> +    if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
> +           macb->hw_dma_cap = HW_DMA_CAP_64B;
> +   else
> +          macb->hw_dma_cap = HW_DMA_CAP_32B;
>
> Can we use preprocessor macro(like below) to check DMA support?
>
> #ifdef CONFIG_DMA_ADDR_T_64BIT
>     macb->hw_dma_cap = HW_DMA_CAP_64B;
> #else
>     macb->hw_dma_cap = HW_DMA_CAP_32B;
> #endif
>
> By default CONFIG_DMA_ADDR_T_64BIT is not set, whichever the board supports 64-bit DMA then the board config can set the CONFIG_DMA_ADDR_T_64BIT.

Please see above suggestion.

Regards,
Anup

>
> Regards
> Padmarao
>
> On Sun, Nov 15, 2020 at 5:40 PM Anup Patel <[hidden email]> wrote:
>>
>> On Tue, Nov 10, 2020 at 4:16 PM Padmarao Begari
>> <[hidden email]> wrote:
>> >
>> > Enable 32-bit or 64-bit DMA in the macb driver based on the design
>> > config debug6 register of MACB hardware which supports 32-bit or
>> > 64-bit DMA.
>> >
>> > Signed-off-by: Padmarao Begari <[hidden email]>
>> > ---
>> >  drivers/net/macb.c | 121 +++++++++++++++++++++++++++++++++++++++------
>> >  drivers/net/macb.h |   6 +++
>> >  2 files changed, 112 insertions(+), 15 deletions(-)
>> >
>> > diff --git a/drivers/net/macb.c b/drivers/net/macb.c
>> > index b80a259ff7..9ccbb7a166 100644
>> > --- a/drivers/net/macb.c
>> > +++ b/drivers/net/macb.c
>> > @@ -83,7 +83,16 @@ struct macb_dma_desc {
>> >         u32     ctrl;
>> >  };
>> >
>> > -#define DMA_DESC_BYTES(n)      (n * sizeof(struct macb_dma_desc))
>> > +struct macb_dma_desc_64 {
>> > +       u32 addrh;
>> > +       u32 unused;
>> > +};
>> > +
>> > +#define HW_DMA_CAP_32B         0
>> > +#define HW_DMA_CAP_64B         1
>> > +
>> > +#define DMA_DESC_SIZE          16
>> > +#define DMA_DESC_BYTES(n)      ((n) * DMA_DESC_SIZE)
>> >  #define MACB_TX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_TX_RING_SIZE))
>> >  #define MACB_RX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_RX_RING_SIZE))
>> >  #define MACB_TX_DUMMY_DMA_DESC_SIZE    (DMA_DESC_BYTES(1))
>> > @@ -133,6 +142,7 @@ struct macb_device {
>> >  #endif
>> >         phy_interface_t         phy_interface;
>> >  #endif
>> > +       unsigned short          hw_dma_cap;
>> >  };
>> >
>> >  struct macb_config {
>> > @@ -307,6 +317,24 @@ static inline void macb_invalidate_rx_buffer(struct macb_device *macb)
>> >
>> >  #if defined(CONFIG_CMD_NET)
>> >
>> > +static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc *desc)
>> > +{
>> > +       return (struct macb_dma_desc_64 *)((void *)desc
>> > +               + sizeof(struct macb_dma_desc));
>> > +}
>> > +
>> > +static void macb_set_addr(struct macb_device *macb, struct macb_dma_desc *desc,
>> > +                         ulong addr)
>> > +{
>> > +       struct macb_dma_desc_64 *desc_64;
>> > +
>> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +               desc_64 = macb_64b_desc(desc);
>> > +               desc_64->addrh = upper_32_bits(addr);
>> > +       }
>> > +       desc->addr = lower_32_bits(addr);
>> > +}
>> > +
>> >  static int _macb_send(struct macb_device *macb, const char *name, void *packet,
>> >                       int length)
>> >  {
>> > @@ -325,8 +353,12 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
>> >                 macb->tx_head++;
>> >         }
>> >
>> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +               tx_head = tx_head * 2;
>> > +
>> >         macb->tx_ring[tx_head].ctrl = ctrl;
>> > -       macb->tx_ring[tx_head].addr = paddr;
>> > +       macb_set_addr(macb, &macb->tx_ring[tx_head], paddr);
>> > +
>> >         barrier();
>> >         macb_flush_ring_desc(macb, TX);
>> >         macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
>> > @@ -363,19 +395,28 @@ static void reclaim_rx_buffers(struct macb_device *macb,
>> >                                unsigned int new_tail)
>> >  {
>> >         unsigned int i;
>> > +       unsigned int count;
>> >
>> >         i = macb->rx_tail;
>> >
>> >         macb_invalidate_ring_desc(macb, RX);
>> >         while (i > new_tail) {
>> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +                       count = i * 2;
>> > +               else
>> > +                       count = i;
>> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
>> >                 i++;
>> >                 if (i > MACB_RX_RING_SIZE)
>> >                         i = 0;
>> >         }
>> >
>> >         while (i < new_tail) {
>> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +                       count = i * 2;
>> > +               else
>> > +                       count = i;
>> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
>> >                 i++;
>> >         }
>> >
>> > @@ -390,16 +431,25 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
>> >         void *buffer;
>> >         int length;
>> >         u32 status;
>> > +       u8 flag = false;
>> >
>> >         macb->wrapped = false;
>> >         for (;;) {
>> >                 macb_invalidate_ring_desc(macb, RX);
>> >
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +                       next_rx_tail = next_rx_tail * 2;
>> > +
>> >                 if (!(macb->rx_ring[next_rx_tail].addr & MACB_BIT(RX_USED)))
>> >                         return -EAGAIN;
>> >
>> >                 status = macb->rx_ring[next_rx_tail].ctrl;
>> >                 if (status & MACB_BIT(RX_SOF)) {
>> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +                               next_rx_tail = next_rx_tail / 2;
>> > +                               flag = true;
>> > +                       }
>> > +
>> >                         if (next_rx_tail != macb->rx_tail)
>> >                                 reclaim_rx_buffers(macb, next_rx_tail);
>> >                         macb->wrapped = false;
>> > @@ -426,11 +476,22 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp)
>> >                                 *packetp = buffer;
>> >                         }
>> >
>> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +                               if (!flag)
>> > +                                       next_rx_tail = next_rx_tail / 2;
>> > +                       }
>> > +
>> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE)
>> >                                 next_rx_tail = 0;
>> >                         macb->next_rx_tail = next_rx_tail;
>> >                         return length;
>> >                 } else {
>> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +                               if (!flag)
>> > +                                       next_rx_tail = next_rx_tail / 2;
>> > +                               flag = false;
>> > +                       }
>> > +
>> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE) {
>> >                                 macb->wrapped = true;
>> >                                 next_rx_tail = 0;
>> > @@ -718,6 +779,7 @@ static int gmac_init_multi_queues(struct macb_device *macb)
>> >  {
>> >         int i, num_queues = 1;
>> >         u32 queue_mask;
>> > +       unsigned long paddr;
>> >
>> >         /* bit 0 is never set but queue 0 always exists */
>> >         queue_mask = gem_readl(macb, DCFG6) & 0xff;
>> > @@ -731,10 +793,18 @@ static int gmac_init_multi_queues(struct macb_device *macb)
>> >         macb->dummy_desc->addr = 0;
>> >         flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma +
>> >                         ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN));
>> > -
>> > -       for (i = 1; i < num_queues; i++)
>> > -               gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i - 1);
>> > -
>> > +       paddr = macb->dummy_desc_dma;
>> > +
>> > +       for (i = 1; i < num_queues; i++) {
>> > +               gem_writel_queue_TBQP(macb, lower_32_bits(paddr), i - 1);
>> > +               gem_writel_queue_RBQP(macb, lower_32_bits(paddr), i - 1);
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +                       gem_writel_queue_TBQPH(macb, upper_32_bits(paddr),
>> > +                                              i - 1);
>> > +                       gem_writel_queue_RBQPH(macb, upper_32_bits(paddr),
>> > +                                              i - 1);
>> > +               }
>> > +       }
>> >         return 0;
>> >  }
>> >
>> > @@ -760,6 +830,9 @@ static void gmac_configure_dma(struct macb_device *macb)
>> >                 dmacfg &= ~GEM_BIT(ENDIA_DESC);
>> >
>> >         dmacfg &= ~GEM_BIT(ADDR64);
>> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +               dmacfg |= GEM_BIT(ADDR64);
>> > +
>> >         gem_writel(macb, DMACFG, dmacfg);
>> >  }
>> >
>> > @@ -775,6 +848,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
>> >         unsigned long paddr;
>> >         int ret;
>> >         int i;
>> > +       int count;
>> > +
>> > +       if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
>> > +               macb->hw_dma_cap = HW_DMA_CAP_64B;
>> > +       else
>> > +               macb->hw_dma_cap = HW_DMA_CAP_32B;
>> >
>> >         /*
>> >          * macb_halt should have been called at some point before now,
>> > @@ -786,20 +865,28 @@ static int _macb_init(struct macb_device *macb, const char *name)
>> >         for (i = 0; i < MACB_RX_RING_SIZE; i++) {
>> >                 if (i == (MACB_RX_RING_SIZE - 1))
>> >                         paddr |= MACB_BIT(RX_WRAP);
>> > -               macb->rx_ring[i].addr = paddr;
>> > -               macb->rx_ring[i].ctrl = 0;
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +                       count = i * 2;
>> > +               else
>> > +                       count = i;
>> > +               macb->rx_ring[count].ctrl = 0;
>> > +               macb_set_addr(macb, &macb->rx_ring[count], paddr);
>> >                 paddr += macb->rx_buffer_size;
>> >         }
>> >         macb_flush_ring_desc(macb, RX);
>> >         macb_flush_rx_buffer(macb);
>> >
>> >         for (i = 0; i < MACB_TX_RING_SIZE; i++) {
>> > -               macb->tx_ring[i].addr = 0;
>> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
>> > +                       count = i * 2;
>> > +               else
>> > +                       count = i;
>> > +               macb_set_addr(macb, &macb->tx_ring[count], 0);
>> >                 if (i == (MACB_TX_RING_SIZE - 1))
>> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) |
>> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED) |
>> >                                 MACB_BIT(TX_WRAP);
>> >                 else
>> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED);
>> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED);
>> >         }
>> >         macb_flush_ring_desc(macb, TX);
>> >
>> > @@ -812,8 +899,12 @@ static int _macb_init(struct macb_device *macb, const char *name)
>> >         gem_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
>> >  #endif
>> >
>> > -       macb_writel(macb, RBQP, macb->rx_ring_dma);
>> > -       macb_writel(macb, TBQP, macb->tx_ring_dma);
>> > +       macb_writel(macb, RBQP, lower_32_bits(macb->rx_ring_dma));
>> > +       macb_writel(macb, TBQP, lower_32_bits(macb->tx_ring_dma));
>> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
>> > +               macb_writel(macb, RBQPH, upper_32_bits(macb->rx_ring_dma));
>> > +               macb_writel(macb, TBQPH, upper_32_bits(macb->tx_ring_dma));
>> > +       }
>> >
>> >         if (macb_is_gem(macb)) {
>> >                 /* Initialize DMA properties */
>> > diff --git a/drivers/net/macb.h b/drivers/net/macb.h
>> > index 9b16383eba..72b84ae96e 100644
>> > --- a/drivers/net/macb.h
>> > +++ b/drivers/net/macb.h
>> > @@ -768,5 +768,11 @@
>> >  #define GEM_RX_CSUM_CHECKED_MASK               2
>> >  #define gem_writel_queue_TBQP(port, value, queue_num)  \
>> >         writel((value), (port)->regs + GEM_TBQP(queue_num))
>> > +#define gem_writel_queue_TBQPH(port, value, queue_num) \
>> > +       writel((value), (port)->regs + GEM_TBQPH(queue_num))
>> > +#define gem_writel_queue_RBQP(port, value, queue_num)  \
>> > +       writel((value), (port)->regs + GEM_RBQP(queue_num))
>> > +#define gem_writel_queue_RBQPH(port, value, queue_num) \
>> > +       writel((value), (port)->regs + GEM_RBQPH(queue_num))
>> >
>> >  #endif /* __DRIVERS_MACB_H__ */
>> > --
>> > 2.17.1
>> >
>>
>> Looks good to me.
>>
>> Reviewed-by: Anup Patel <[hidden email]>
>>
>> We need to test this patch on SiFive Unleashed as well because
>> it has same ethernet controller.
>>
>> Regards,
>> Anup
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v3 2/7] net: macb: Add DMA 64-bit address support for macb

Padmarao Begari
Hi Anup,

On Thu, Nov 26, 2020 at 11:08 AM Anup Patel <[hidden email]> wrote:

> On Thu, Nov 26, 2020 at 10:33 AM Padmarao Begari <[hidden email]>
> wrote:
> >
> > Hi Anup
> >
> > I have tested the MACB driver patch with the SiFive unleashed board and
> it's not working because of the GEM_DCFG6 register.
> > The SiFive FU540 is supporting DMA address width is 64-bit while reading
> the GEM_DCFG6 register but it supports
> > scatter-gather 32-bit wide bus mastering DMA. The SiFive unleashed board
> supports 32-bit DMA not 64-bit DMA.
>
> Thanks for trying this out.
>
> >
> > We can't check dynamically the support of DMA.
>
> We can still check this capability.
>
> I would suggest to detect 64bit DMA support based on
> compatible string as follows:
> 1. Add MACB compatible string for Microchip polarfire
>     in <linux>/Documentation/devicetree/bindings/net/macb.txt
> 2. Use MACB polarfir compatible string to enable 64bit
>     DMA feature in U-Boot MACB driver.
>
> This way your patch will work fine for both SiFive Unleashed
> and Microchip Polarfire.
>
>
ok, I will add a MACB compatible string for Microchip PolarFire SoC.

Regards
Padmarao

> >
> > +    if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
> > +           macb->hw_dma_cap = HW_DMA_CAP_64B;
> > +   else
> > +          macb->hw_dma_cap = HW_DMA_CAP_32B;
> >
> > Can we use preprocessor macro(like below) to check DMA support?
> >
> > #ifdef CONFIG_DMA_ADDR_T_64BIT
> >     macb->hw_dma_cap = HW_DMA_CAP_64B;
> > #else
> >     macb->hw_dma_cap = HW_DMA_CAP_32B;
> > #endif
> >
> > By default CONFIG_DMA_ADDR_T_64BIT is not set, whichever the board
> supports 64-bit DMA then the board config can set the
> CONFIG_DMA_ADDR_T_64BIT.
>
> Please see above suggestion.
>
> Regards,
> Anup
>
> >
> > Regards
> > Padmarao
> >
> > On Sun, Nov 15, 2020 at 5:40 PM Anup Patel <[hidden email]> wrote:
> >>
> >> On Tue, Nov 10, 2020 at 4:16 PM Padmarao Begari
> >> <[hidden email]> wrote:
> >> >
> >> > Enable 32-bit or 64-bit DMA in the macb driver based on the design
> >> > config debug6 register of MACB hardware which supports 32-bit or
> >> > 64-bit DMA.
> >> >
> >> > Signed-off-by: Padmarao Begari <[hidden email]>
> >> > ---
> >> >  drivers/net/macb.c | 121
> +++++++++++++++++++++++++++++++++++++++------
> >> >  drivers/net/macb.h |   6 +++
> >> >  2 files changed, 112 insertions(+), 15 deletions(-)
> >> >
> >> > diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> >> > index b80a259ff7..9ccbb7a166 100644
> >> > --- a/drivers/net/macb.c
> >> > +++ b/drivers/net/macb.c
> >> > @@ -83,7 +83,16 @@ struct macb_dma_desc {
> >> >         u32     ctrl;
> >> >  };
> >> >
> >> > -#define DMA_DESC_BYTES(n)      (n * sizeof(struct macb_dma_desc))
> >> > +struct macb_dma_desc_64 {
> >> > +       u32 addrh;
> >> > +       u32 unused;
> >> > +};
> >> > +
> >> > +#define HW_DMA_CAP_32B         0
> >> > +#define HW_DMA_CAP_64B         1
> >> > +
> >> > +#define DMA_DESC_SIZE          16
> >> > +#define DMA_DESC_BYTES(n)      ((n) * DMA_DESC_SIZE)
> >> >  #define MACB_TX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_TX_RING_SIZE))
> >> >  #define MACB_RX_DMA_DESC_SIZE  (DMA_DESC_BYTES(MACB_RX_RING_SIZE))
> >> >  #define MACB_TX_DUMMY_DMA_DESC_SIZE    (DMA_DESC_BYTES(1))
> >> > @@ -133,6 +142,7 @@ struct macb_device {
> >> >  #endif
> >> >         phy_interface_t         phy_interface;
> >> >  #endif
> >> > +       unsigned short          hw_dma_cap;
> >> >  };
> >> >
> >> >  struct macb_config {
> >> > @@ -307,6 +317,24 @@ static inline void
> macb_invalidate_rx_buffer(struct macb_device *macb)
> >> >
> >> >  #if defined(CONFIG_CMD_NET)
> >> >
> >> > +static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc
> *desc)
> >> > +{
> >> > +       return (struct macb_dma_desc_64 *)((void *)desc
> >> > +               + sizeof(struct macb_dma_desc));
> >> > +}
> >> > +
> >> > +static void macb_set_addr(struct macb_device *macb, struct
> macb_dma_desc *desc,
> >> > +                         ulong addr)
> >> > +{
> >> > +       struct macb_dma_desc_64 *desc_64;
> >> > +
> >> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +               desc_64 = macb_64b_desc(desc);
> >> > +               desc_64->addrh = upper_32_bits(addr);
> >> > +       }
> >> > +       desc->addr = lower_32_bits(addr);
> >> > +}
> >> > +
> >> >  static int _macb_send(struct macb_device *macb, const char *name,
> void *packet,
> >> >                       int length)
> >> >  {
> >> > @@ -325,8 +353,12 @@ static int _macb_send(struct macb_device *macb,
> const char *name, void *packet,
> >> >                 macb->tx_head++;
> >> >         }
> >> >
> >> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +               tx_head = tx_head * 2;
> >> > +
> >> >         macb->tx_ring[tx_head].ctrl = ctrl;
> >> > -       macb->tx_ring[tx_head].addr = paddr;
> >> > +       macb_set_addr(macb, &macb->tx_ring[tx_head], paddr);
> >> > +
> >> >         barrier();
> >> >         macb_flush_ring_desc(macb, TX);
> >> >         macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) |
> MACB_BIT(TSTART));
> >> > @@ -363,19 +395,28 @@ static void reclaim_rx_buffers(struct
> macb_device *macb,
> >> >                                unsigned int new_tail)
> >> >  {
> >> >         unsigned int i;
> >> > +       unsigned int count;
> >> >
> >> >         i = macb->rx_tail;
> >> >
> >> >         macb_invalidate_ring_desc(macb, RX);
> >> >         while (i > new_tail) {
> >> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +                       count = i * 2;
> >> > +               else
> >> > +                       count = i;
> >> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
> >> >                 i++;
> >> >                 if (i > MACB_RX_RING_SIZE)
> >> >                         i = 0;
> >> >         }
> >> >
> >> >         while (i < new_tail) {
> >> > -               macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED);
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +                       count = i * 2;
> >> > +               else
> >> > +                       count = i;
> >> > +               macb->rx_ring[count].addr &= ~MACB_BIT(RX_USED);
> >> >                 i++;
> >> >         }
> >> >
> >> > @@ -390,16 +431,25 @@ static int _macb_recv(struct macb_device *macb,
> uchar **packetp)
> >> >         void *buffer;
> >> >         int length;
> >> >         u32 status;
> >> > +       u8 flag = false;
> >> >
> >> >         macb->wrapped = false;
> >> >         for (;;) {
> >> >                 macb_invalidate_ring_desc(macb, RX);
> >> >
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +                       next_rx_tail = next_rx_tail * 2;
> >> > +
> >> >                 if (!(macb->rx_ring[next_rx_tail].addr &
> MACB_BIT(RX_USED)))
> >> >                         return -EAGAIN;
> >> >
> >> >                 status = macb->rx_ring[next_rx_tail].ctrl;
> >> >                 if (status & MACB_BIT(RX_SOF)) {
> >> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +                               next_rx_tail = next_rx_tail / 2;
> >> > +                               flag = true;
> >> > +                       }
> >> > +
> >> >                         if (next_rx_tail != macb->rx_tail)
> >> >                                 reclaim_rx_buffers(macb,
> next_rx_tail);
> >> >                         macb->wrapped = false;
> >> > @@ -426,11 +476,22 @@ static int _macb_recv(struct macb_device *macb,
> uchar **packetp)
> >> >                                 *packetp = buffer;
> >> >                         }
> >> >
> >> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +                               if (!flag)
> >> > +                                       next_rx_tail = next_rx_tail /
> 2;
> >> > +                       }
> >> > +
> >> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE)
> >> >                                 next_rx_tail = 0;
> >> >                         macb->next_rx_tail = next_rx_tail;
> >> >                         return length;
> >> >                 } else {
> >> > +                       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +                               if (!flag)
> >> > +                                       next_rx_tail = next_rx_tail /
> 2;
> >> > +                               flag = false;
> >> > +                       }
> >> > +
> >> >                         if (++next_rx_tail >= MACB_RX_RING_SIZE) {
> >> >                                 macb->wrapped = true;
> >> >                                 next_rx_tail = 0;
> >> > @@ -718,6 +779,7 @@ static int gmac_init_multi_queues(struct
> macb_device *macb)
> >> >  {
> >> >         int i, num_queues = 1;
> >> >         u32 queue_mask;
> >> > +       unsigned long paddr;
> >> >
> >> >         /* bit 0 is never set but queue 0 always exists */
> >> >         queue_mask = gem_readl(macb, DCFG6) & 0xff;
> >> > @@ -731,10 +793,18 @@ static int gmac_init_multi_queues(struct
> macb_device *macb)
> >> >         macb->dummy_desc->addr = 0;
> >> >         flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma
> +
> >> >                         ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN));
> >> > -
> >> > -       for (i = 1; i < num_queues; i++)
> >> > -               gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i -
> 1);
> >> > -
> >> > +       paddr = macb->dummy_desc_dma;
> >> > +
> >> > +       for (i = 1; i < num_queues; i++) {
> >> > +               gem_writel_queue_TBQP(macb, lower_32_bits(paddr), i -
> 1);
> >> > +               gem_writel_queue_RBQP(macb, lower_32_bits(paddr), i -
> 1);
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +                       gem_writel_queue_TBQPH(macb,
> upper_32_bits(paddr),
> >> > +                                              i - 1);
> >> > +                       gem_writel_queue_RBQPH(macb,
> upper_32_bits(paddr),
> >> > +                                              i - 1);
> >> > +               }
> >> > +       }
> >> >         return 0;
> >> >  }
> >> >
> >> > @@ -760,6 +830,9 @@ static void gmac_configure_dma(struct macb_device
> *macb)
> >> >                 dmacfg &= ~GEM_BIT(ENDIA_DESC);
> >> >
> >> >         dmacfg &= ~GEM_BIT(ADDR64);
> >> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +               dmacfg |= GEM_BIT(ADDR64);
> >> > +
> >> >         gem_writel(macb, DMACFG, dmacfg);
> >> >  }
> >> >
> >> > @@ -775,6 +848,12 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >> >         unsigned long paddr;
> >> >         int ret;
> >> >         int i;
> >> > +       int count;
> >> > +
> >> > +       if (GEM_BFEXT(DAW64, gem_readl(macb, DCFG6)))
> >> > +               macb->hw_dma_cap = HW_DMA_CAP_64B;
> >> > +       else
> >> > +               macb->hw_dma_cap = HW_DMA_CAP_32B;
> >> >
> >> >         /*
> >> >          * macb_halt should have been called at some point before now,
> >> > @@ -786,20 +865,28 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >> >         for (i = 0; i < MACB_RX_RING_SIZE; i++) {
> >> >                 if (i == (MACB_RX_RING_SIZE - 1))
> >> >                         paddr |= MACB_BIT(RX_WRAP);
> >> > -               macb->rx_ring[i].addr = paddr;
> >> > -               macb->rx_ring[i].ctrl = 0;
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +                       count = i * 2;
> >> > +               else
> >> > +                       count = i;
> >> > +               macb->rx_ring[count].ctrl = 0;
> >> > +               macb_set_addr(macb, &macb->rx_ring[count], paddr);
> >> >                 paddr += macb->rx_buffer_size;
> >> >         }
> >> >         macb_flush_ring_desc(macb, RX);
> >> >         macb_flush_rx_buffer(macb);
> >> >
> >> >         for (i = 0; i < MACB_TX_RING_SIZE; i++) {
> >> > -               macb->tx_ring[i].addr = 0;
> >> > +               if (macb->hw_dma_cap & HW_DMA_CAP_64B)
> >> > +                       count = i * 2;
> >> > +               else
> >> > +                       count = i;
> >> > +               macb_set_addr(macb, &macb->tx_ring[count], 0);
> >> >                 if (i == (MACB_TX_RING_SIZE - 1))
> >> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) |
> >> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED)
> |
> >> >                                 MACB_BIT(TX_WRAP);
> >> >                 else
> >> > -                       macb->tx_ring[i].ctrl = MACB_BIT(TX_USED);
> >> > +                       macb->tx_ring[count].ctrl = MACB_BIT(TX_USED);
> >> >         }
> >> >         macb_flush_ring_desc(macb, TX);
> >> >
> >> > @@ -812,8 +899,12 @@ static int _macb_init(struct macb_device *macb,
> const char *name)
> >> >         gem_writel(macb, DMACFG, MACB_ZYNQ_GEM_DMACR_INIT);
> >> >  #endif
> >> >
> >> > -       macb_writel(macb, RBQP, macb->rx_ring_dma);
> >> > -       macb_writel(macb, TBQP, macb->tx_ring_dma);
> >> > +       macb_writel(macb, RBQP, lower_32_bits(macb->rx_ring_dma));
> >> > +       macb_writel(macb, TBQP, lower_32_bits(macb->tx_ring_dma));
> >> > +       if (macb->hw_dma_cap & HW_DMA_CAP_64B) {
> >> > +               macb_writel(macb, RBQPH,
> upper_32_bits(macb->rx_ring_dma));
> >> > +               macb_writel(macb, TBQPH,
> upper_32_bits(macb->tx_ring_dma));
> >> > +       }
> >> >
> >> >         if (macb_is_gem(macb)) {
> >> >                 /* Initialize DMA properties */
> >> > diff --git a/drivers/net/macb.h b/drivers/net/macb.h
> >> > index 9b16383eba..72b84ae96e 100644
> >> > --- a/drivers/net/macb.h
> >> > +++ b/drivers/net/macb.h
> >> > @@ -768,5 +768,11 @@
> >> >  #define GEM_RX_CSUM_CHECKED_MASK               2
> >> >  #define gem_writel_queue_TBQP(port, value, queue_num)  \
> >> >         writel((value), (port)->regs + GEM_TBQP(queue_num))
> >> > +#define gem_writel_queue_TBQPH(port, value, queue_num) \
> >> > +       writel((value), (port)->regs + GEM_TBQPH(queue_num))
> >> > +#define gem_writel_queue_RBQP(port, value, queue_num)  \
> >> > +       writel((value), (port)->regs + GEM_RBQP(queue_num))
> >> > +#define gem_writel_queue_RBQPH(port, value, queue_num) \
> >> > +       writel((value), (port)->regs + GEM_RBQPH(queue_num))
> >> >
> >> >  #endif /* __DRIVERS_MACB_H__ */
> >> > --
> >> > 2.17.1
> >> >
> >>
> >> Looks good to me.
> >>
> >> Reviewed-by: Anup Patel <[hidden email]>
> >>
> >> We need to test this patch on SiFive Unleashed as well because
> >> it has same ethernet controller.
> >>
> >> Regards,
> >> Anup
>