Skip to contentSkip to conversation

arm: mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5)

PATCH Superseded Chris Packham 3 participants 17 messages Sep 20, 2022 – Sep 21, 2022

Subsystems (9)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm: mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5)

These patches are based on Marvell's bootloader for the AlleyCat5/5X which was based on u-boot 2018.03. I've split that code into consumable chunks and dropped as much unnecessary stuff as I can. I've also tried to sync the device trees as much as possible with the support that will land in Linux 6.0 although there are still some differences

Changes in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitions

Chris Packham (6):
net: mvneta: Add support for AlleyCat5
usb: ehci: ehci-marvell: Support for marvell,ac5-ehci
pinctrl: mvebu: Add AlleyCat5 support
misc: mvebu: Add sample at reset driver
arm: mvebu: Support for 98DX25xx/98DX35xx SoC
arm: mvebu: Add RD-AC5X board

 arch/arm/dts/Makefile                      |   3 +-
 arch/arm/dts/ac5-98dx25xx.dtsi             | 292 +++++++++++++++++++++
 arch/arm/dts/ac5-98dx35xx-rd.dts           | 140 ++++++++++
 arch/arm/dts/ac5-98dx35xx.dtsi             |  17 ++
 arch/arm/mach-mvebu/Kconfig                |  14 +-
 arch/arm/mach-mvebu/Makefile               |   1 +
 arch/arm/mach-mvebu/alleycat5/Makefile     |   9 +
 arch/arm/mach-mvebu/alleycat5/clock.c      |  49 ++++
 arch/arm/mach-mvebu/alleycat5/cpu.c        | 129 +++++++++
 arch/arm/mach-mvebu/alleycat5/soc.c        | 229 ++++++++++++++++
 arch/arm/mach-mvebu/arm64-common.c         |  15 ++
 arch/arm/mach-mvebu/include/mach/clock.h   |  11 +
 arch/arm/mach-mvebu/include/mach/cpu.h     |   4 +
 arch/arm/mach-mvebu/include/mach/soc.h     |   4 +
 board/Marvell/mvebu_alleycat-5/MAINTAINERS |   6 +
 board/Marvell/mvebu_alleycat-5/Makefile    |   3 +
 board/Marvell/mvebu_alleycat-5/board.c     |  35 +++
 configs/mvebu_ac5_rd_defconfig             |  88 +++++++
 drivers/misc/Kconfig                       |   6 +
 drivers/misc/Makefile                      |   1 +
 drivers/misc/mvebu_sar/Makefile            |   4 +
 drivers/misc/mvebu_sar/ac5_sar.c           | 119 +++++++++
 drivers/misc/mvebu_sar/sar-uclass.c        | 146 +++++++++++
 drivers/net/Kconfig                        |   2 +-
 drivers/net/mvneta.c                       |  66 ++++-
 drivers/pinctrl/mvebu/Kconfig              |   2 +-
 drivers/usb/host/Kconfig                   |   1 +
 drivers/usb/host/ehci-marvell.c            |  57 +++-
 include/configs/mvebu_alleycat-5.h         |  71 +++++
 include/dm/uclass-id.h                     |   1 +
 include/fdtdec.h                           |   4 +
 include/mvebu/mvebu_chip_sar.h             |  73 ++++++
 include/mvebu/sar.h                        |  57 ++++
 include/mvebu/var.h                        |  28 ++
 include/sar-uclass.h                       |  23 ++
 lib/fdtdec.c                               |   6 +-
 36 files changed, 1698 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts
 create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi
 create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile
 create mode 100644 arch/arm/mach-mvebu/alleycat5/clock.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c
 create mode 100644 arch/arm/mach-mvebu/include/mach/clock.h
 create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS
 create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile
 create mode 100644 board/Marvell/mvebu_alleycat-5/board.c
 create mode 100644 configs/mvebu_ac5_rd_defconfig
 create mode 100644 drivers/misc/mvebu_sar/Makefile
 create mode 100644 drivers/misc/mvebu_sar/ac5_sar.c
 create mode 100644 drivers/misc/mvebu_sar/sar-uclass.c
 create mode 100644 include/configs/mvebu_alleycat-5.h
 create mode 100644 include/mvebu/mvebu_chip_sar.h
 create mode 100644 include/mvebu/sar.h
 create mode 100644 include/mvebu/var.h
 create mode 100644 include/sar-uclass.h
Signature · 1 line
2.37.3
#1 lore raw

PATCH v2 1/6 net: mvneta: Add support for AlleyCat5

Add support for the AlleyCat5 SoC. This lacks the mbus from the other users of the mvneta.c driver so a new compatible string is needed to allow for a different window configuration.

---

(no changes since v1)

 drivers/net/Kconfig  |  2 +-
 drivers/net/mvneta.c | 66 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)
drivers/net/Kconfig +1 -1
index 6bbbadc5ee..8df3dce6df 100644
@@ -448,7 +448,7 @@ config MVGBE
 
 config MVNETA
 	bool "Marvell Armada XP/385/3700 network interface support"
-	depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
+	depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5
 	select PHYLIB
 	select DM_MDIO
 	help
drivers/net/mvneta.c +63 -3

136 lines not on this page · raw message

Signature · 1 line
2.37.3
Reviewed-by on v2 1/6
#2 lore raw

Re: [PATCH v2 1/6] net: mvneta: Add support for AlleyCat5

Quoted 148 lines · Chris Packham

Add support for the AlleyCat5 SoC. This lacks the mbus from the other users of the mvneta.c driver so a new compatible string is needed to allow for a different window configuration.

---

(no changes since v1)

  drivers/net/Kconfig  |  2 +-
  drivers/net/mvneta.c | 66 ++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 64 insertions(+), 4 deletions(-)
drivers/net/Kconfig +1 -1
index 6bbbadc5ee..8df3dce6df 100644
@@ -448,7 +448,7 @@ config MVGBE
 
  config MVNETA
  	bool "Marvell Armada XP/385/3700 network interface support"
-	depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
+	depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5
  	select PHYLIB
  	select DM_MDIO
  	help
drivers/net/mvneta.c +50 -3
index d2c42c4396..07919d6d35 100644
@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;
  #define MVNETA_WIN_SIZE_MASK			(0xffff0000)
  #define MVNETA_BASE_ADDR_ENABLE                 0x2290
  #define      MVNETA_BASE_ADDR_ENABLE_BIT	0x1
+#define      MVNETA_AC5_CNM_DDR_TARGET		0x2
+#define      MVNETA_AC5_CNM_DDR_ATTR		0xb
  #define MVNETA_PORT_ACCESS_PROTECT              0x2294
  #define      MVNETA_PORT_ACCESS_PROTECT_WIN0_RW	0x3
  #define MVNETA_PORT_CONFIG                      0x2400
@@ -282,6 +284,8 @@ struct mvneta_port {
  	struct gpio_desc phy_reset_gpio;
  	struct gpio_desc sfp_tx_disable_gpio;
  #endif
+
+	uintptr_t dma_base;     /* base address for DMA address decoding */
  };
 
  /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
@@ -513,10 +517,19 @@ static void mvneta_rxq_desc_num_update(struct mvneta_port *pp,
  static struct mvneta_rx_desc *
  mvneta_rxq_next_desc_get(struct mvneta_rx_queue *rxq)
  {
+	struct mvneta_rx_desc *curr;
  	int rx_desc = rxq->next_desc_to_proc;
 
+	/* validate RX descriptor */
+	curr = rxq->descs + rx_desc;
+	if (curr->data_size == 0) {
+		/* do it to read real descriptor next time */
+		DSB;
+		return NULL;
+	}
+
  	rxq->next_desc_to_proc = MVNETA_QUEUE_NEXT_DESC(rxq, rx_desc);
-	return rxq->descs + rx_desc;
+	return curr;
  }
 
  /* Tx descriptors helper methods */
@@ -1343,6 +1356,29 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp)
  	mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable);
  }
 
+static void mvneta_conf_ac5_cnm_xbar_windows(struct mvneta_port *pp)
+{
+	int i;
+
+	/* Clear all windows */
+	for (i = 0; i < 6; i++) {
+		mvreg_write(pp, MVNETA_WIN_BASE(i), 0);
+		mvreg_write(pp, MVNETA_WIN_SIZE(i), 0);
+
+		if (i < 4)
+			mvreg_write(pp, MVNETA_WIN_REMAP(i), 0);
+	}
+
+	/*
+	 * Setup window #0 base 0x0 to target XBAR port 2 (AMB2), attribute 0xb, size 4GB
+	 * AMB2 address decoder remaps 0x0 to DDR 64 bit base address
+	 */
+	mvreg_write(pp, MVNETA_WIN_BASE(0),
+		    (MVNETA_AC5_CNM_DDR_ATTR << 8) | MVNETA_AC5_CNM_DDR_TARGET);
+	mvreg_write(pp, MVNETA_WIN_SIZE(0), 0xffff0000);
+	mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, 0x3e);
+}
+
  /* Power up the port */
  static int mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
  {
@@ -1508,11 +1544,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
  		 */
  		rx_desc = mvneta_rxq_next_desc_get(rxq);
 
+		if (!rx_desc)
+			return 0;
+
  		rx_status = rx_desc->status;
  		if (!mvneta_rxq_desc_is_first_last(rx_status) ||
  		    (rx_status & MVNETA_RXD_ERR_SUMMARY)) {
  			mvneta_rx_error(pp, rx_desc);
-			/* leave the descriptor untouched */
+			/* invalidate the descriptor */
+			rx_desc->data_size = 0;
  			return -EIO;
  		}
 
@@ -1525,13 +1565,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
  		 * No cache invalidation needed here, since the rx_buffer's are
  		 * located in a uncached memory region
  		 */
-		*packetp = data;
+		*packetp = data + pp->dma_base;
 
  		/*
  		 * Only mark one descriptor as free
  		 * since only one was processed
  		 */
  		mvneta_rxq_desc_num_update(pp, rxq, 1, 1);
+		/* invalidate the descriptor */
+		rx_desc->data_size = 0;
  	}
 
  	return rx_bytes;
@@ -1544,6 +1586,11 @@ static int mvneta_probe(struct udevice *dev)
  	struct ofnode_phandle_args sfp_args;
  #endif
  	void *bd_space;
+	void *blob = (void *)gd->fdt_blob;
+	int node = dev_of_offset(dev);
+	const int *cell;
+	int len;
+
 
  	/*
  	 * Allocate buffer area for descs and rx_buffers. This is only
@@ -1577,9 +1624,21 @@ static int mvneta_probe(struct udevice *dev)
  	/* Configure MBUS address windows */
  	if (device_is_compatible(dev, "marvell,armada-3700-neta"))

drivers/net/mvneta.c static int mvneta_probe(struct udevice *dev) · line 1635

Quoted 10 lines
drivers/net/mvneta.c +6 -0
  		mvneta_bypass_mbus_windows(pp);
+	else if (device_is_compatible(dev, "marvell,armada-ac5-neta"))
+		mvneta_conf_ac5_cnm_xbar_windows(pp);
  	else
  		mvneta_conf_mbus_windows(pp);
 
+	/* fetch dma ranges property */
+	cell = fdt_getprop(blob, node, "dma-ranges", &len);
+	if (cell && len >= 4 * sizeof(int)) {
+		/* RAZA - TODO do that in loop by address-cells size */

Is this "TODO" something you wanted to address in the v2 patchset release?

Quoted 10 lines
drivers/net/mvneta.c +6 -0
+		pp->dma_base = fdt32_to_cpu(cell[1]);
+		pp->dma_base = (pp->dma_base << 32) | fdt32_to_cpu(cell[2]);
+	} else {
+		pp->dma_base = 0;
+	}
+
  #if CONFIG_IS_ENABLED(DM_GPIO)
  	if (!dev_read_phandle_with_args(dev, "sfp", NULL, 0, 0, &sfp_args) &&
  	    ofnode_is_enabled(sfp_args.node))

drivers/net/mvneta.c static const struct eth_ops mvneta_ops = { · line 1685

Quoted 7 lines
drivers/net/mvneta.c +1 -0
@@ -1620,6 +1679,7 @@ static const struct eth_ops mvneta_ops = {
 
  static const struct udevice_id mvneta_ids[] = {
  	{ .compatible = "marvell,armada-370-neta" },
+	{ .compatible = "marvell,armada-ac5-neta" },
  	{ .compatible = "marvell,armada-xp-neta" },
  	{ .compatible = "marvell,armada-3700-neta" },
  	{ }

Other than the above:

Thanks,
Stefan

#3 lore raw

Re: [PATCH v2 1/6] net: mvneta: Add support for AlleyCat5

Quoted 156 lines · Stefan Roese
Quoted 154 lines · Chris Packham

Add support for the AlleyCat5 SoC. This lacks the mbus from the other users of the mvneta.c driver so a new compatible string is needed to allow for a different window configuration.

---

(no changes since v1)

  drivers/net/Kconfig  |  2 +-
  drivers/net/mvneta.c | 66 ++++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 64 insertions(+), 4 deletions(-)
drivers/net/Kconfig +1 -1
index 6bbbadc5ee..8df3dce6df 100644
@@ -448,7 +448,7 @@ config MVGBE
 
  config MVNETA
      bool "Marvell Armada XP/385/3700 network interface support"
-     depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
+     depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 || ALLEYCAT_5
      select PHYLIB
      select DM_MDIO
      help
drivers/net/mvneta.c +52 -3
index d2c42c4396..07919d6d35 100644
@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;
  #define MVNETA_WIN_SIZE_MASK                        (0xffff0000)
  #define MVNETA_BASE_ADDR_ENABLE                 0x2290
  #define      MVNETA_BASE_ADDR_ENABLE_BIT    0x1
+#define      MVNETA_AC5_CNM_DDR_TARGET               0x2
+#define      MVNETA_AC5_CNM_DDR_ATTR         0xb
  #define MVNETA_PORT_ACCESS_PROTECT              0x2294
  #define      MVNETA_PORT_ACCESS_PROTECT_WIN0_RW     0x3
  #define MVNETA_PORT_CONFIG                      0x2400
@@ -282,6 +284,8 @@ struct mvneta_port {
      struct gpio_desc phy_reset_gpio;
      struct gpio_desc sfp_tx_disable_gpio;
  #endif
+
+     uintptr_t dma_base;     /* base address for DMA address decoding */
  };
 
  /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
@@ -513,10 +517,19 @@ static void mvneta_rxq_desc_num_update(struct mvneta_port *pp,
  static struct mvneta_rx_desc *
  mvneta_rxq_next_desc_get(struct mvneta_rx_queue *rxq)
  {
+     struct mvneta_rx_desc *curr;
      int rx_desc = rxq->next_desc_to_proc;
 
+     /* validate RX descriptor */
+     curr = rxq->descs + rx_desc;
+     if (curr->data_size == 0) {
+             /* do it to read real descriptor next time */
+             DSB;
+             return NULL;
+     }
+
      rxq->next_desc_to_proc = MVNETA_QUEUE_NEXT_DESC(rxq, rx_desc);
-     return rxq->descs + rx_desc;
+     return curr;
  }
 
  /* Tx descriptors helper methods */
@@ -1343,6 +1356,29 @@ static void mvneta_conf_mbus_windows(struct mvneta_port *pp)
      mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, win_enable);
  }
 
+static void mvneta_conf_ac5_cnm_xbar_windows(struct mvneta_port *pp)
+{
+     int i;
+
+     /* Clear all windows */
+     for (i = 0; i < 6; i++) {
+             mvreg_write(pp, MVNETA_WIN_BASE(i), 0);
+             mvreg_write(pp, MVNETA_WIN_SIZE(i), 0);
+
+             if (i < 4)
+                     mvreg_write(pp, MVNETA_WIN_REMAP(i), 0);
+     }
+
+     /*
+      * Setup window #0 base 0x0 to target XBAR port 2 (AMB2), attribute 0xb, size 4GB
+      * AMB2 address decoder remaps 0x0 to DDR 64 bit base address
+      */
+     mvreg_write(pp, MVNETA_WIN_BASE(0),
+                 (MVNETA_AC5_CNM_DDR_ATTR << 8) | MVNETA_AC5_CNM_DDR_TARGET);
+     mvreg_write(pp, MVNETA_WIN_SIZE(0), 0xffff0000);
+     mvreg_write(pp, MVNETA_BASE_ADDR_ENABLE, 0x3e);
+}
+
  /* Power up the port */
  static int mvneta_port_power_up(struct mvneta_port *pp, int phy_mode)
  {
@@ -1508,11 +1544,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
               */
              rx_desc = mvneta_rxq_next_desc_get(rxq);
 
+             if (!rx_desc)
+                     return 0;
+
              rx_status = rx_desc->status;
              if (!mvneta_rxq_desc_is_first_last(rx_status) ||
                  (rx_status & MVNETA_RXD_ERR_SUMMARY)) {
                      mvneta_rx_error(pp, rx_desc);
-                     /* leave the descriptor untouched */
+                     /* invalidate the descriptor */
+                     rx_desc->data_size = 0;
                      return -EIO;
              }
 
@@ -1525,13 +1565,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
               * No cache invalidation needed here, since the rx_buffer's are
               * located in a uncached memory region
               */
-             *packetp = data;
+             *packetp = data + pp->dma_base;
 
              /*
               * Only mark one descriptor as free
               * since only one was processed
               */
              mvneta_rxq_desc_num_update(pp, rxq, 1, 1);
+             /* invalidate the descriptor */
+             rx_desc->data_size = 0;
      }
 
      return rx_bytes;
@@ -1544,6 +1586,11 @@ static int mvneta_probe(struct udevice *dev)
      struct ofnode_phandle_args sfp_args;
  #endif
      void *bd_space;
+     void *blob = (void *)gd->fdt_blob;
+     int node = dev_of_offset(dev);
+     const int *cell;
+     int len;
+
 
      /*
       * Allocate buffer area for descs and rx_buffers. This is only
@@ -1577,9 +1624,21 @@ static int mvneta_probe(struct udevice *dev)
      /* Configure MBUS address windows */
      if (device_is_compatible(dev, "marvell,armada-3700-neta"))
              mvneta_bypass_mbus_windows(pp);
+     else if (device_is_compatible(dev, "marvell,armada-ac5-neta"))
+             mvneta_conf_ac5_cnm_xbar_windows(pp);
      else
              mvneta_conf_mbus_windows(pp);
 
Quoted 8 lines

drivers/net/mvneta.c static int mvneta_probe(struct udevice *dev) · line 1635

Quoted 4 lines
drivers/net/mvneta.c +4 -0
+     /* fetch dma ranges property */
+     cell = fdt_getprop(blob, node, "dma-ranges", &len);
+     if (cell && len >= 4 * sizeof(int)) {
+             /* RAZA - TODO do that in loop by address-cells size */

Is this "TODO" something you wanted to address in the v2 patchset release?

That's from the original Marvell code. I've no idea who Raza is or if (s)he ever got around to doing this. Pali has other concerns with this part so I'll try to address removing the TODO along with avoiding open coding the parsing.

Quoted 24 lines
Quoted 10 lines
drivers/net/mvneta.c +6 -0
+             pp->dma_base = fdt32_to_cpu(cell[1]);
+             pp->dma_base = (pp->dma_base << 32) | fdt32_to_cpu(cell[2]);
+     } else {
+             pp->dma_base = 0;
+     }
+
  #if CONFIG_IS_ENABLED(DM_GPIO)
      if (!dev_read_phandle_with_args(dev, "sfp", NULL, 0, 0, &sfp_args) &&
          ofnode_is_enabled(sfp_args.node))

drivers/net/mvneta.c static const struct eth_ops mvneta_ops = { · line 1685

Quoted 7 lines
drivers/net/mvneta.c +1 -0
@@ -1620,6 +1679,7 @@ static const struct eth_ops mvneta_ops = {
 
  static const struct udevice_id mvneta_ids[] = {
      { .compatible = "marvell,armada-370-neta" },
+     { .compatible = "marvell,armada-ac5-neta" },
      { .compatible = "marvell,armada-xp-neta" },
      { .compatible = "marvell,armada-3700-neta" },
      { }

Other than the above:

Thanks,
Stefan

#4 lore raw

Re: [PATCH v2 1/6] net: mvneta: Add support for AlleyCat5

In reply to Chris Packham
Quoted 31 lines · On Tuesday 20 September 2022 20:31:48 Chris Packham wrote:
drivers/net/mvneta.c +7 -0
index d2c42c4396..07919d6d35 100644
@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MVNETA_WIN_SIZE_MASK			(0xffff0000)
 #define MVNETA_BASE_ADDR_ENABLE                 0x2290
 #define      MVNETA_BASE_ADDR_ENABLE_BIT	0x1
+#define      MVNETA_AC5_CNM_DDR_TARGET		0x2
+#define      MVNETA_AC5_CNM_DDR_ATTR		0xb
 #define MVNETA_PORT_ACCESS_PROTECT              0x2294
 #define      MVNETA_PORT_ACCESS_PROTECT_WIN0_RW	0x3
 #define MVNETA_PORT_CONFIG                      0x2400
@@ -282,6 +284,8 @@ struct mvneta_port {
 	struct gpio_desc phy_reset_gpio;
 	struct gpio_desc sfp_tx_disable_gpio;
 #endif
+
+	uintptr_t dma_base;     /* base address for DMA address decoding */
 };
 
 /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
@@ -513,10 +517,19 @@ static void mvneta_rxq_desc_num_update(struct mvneta_port *pp,
 static struct mvneta_rx_desc *
 mvneta_rxq_next_desc_get(struct mvneta_rx_queue *rxq)
 {
+	struct mvneta_rx_desc *curr;
 	int rx_desc = rxq->next_desc_to_proc;
 
+	/* validate RX descriptor */
+	curr = rxq->descs + rx_desc;

drivers/net/mvneta.c static void mvneta_rxq_desc_num_update(struct mvneta_port *pp, · line 533

Quoted 10 lines
drivers/net/mvneta.c +7 -1
+	if (curr->data_size == 0) {
+		/* do it to read real descriptor next time */
+		DSB;
+		return NULL;
+	}
+
 	rxq->next_desc_to_proc = MVNETA_QUEUE_NEXT_DESC(rxq, rx_desc);
-	return rxq->descs + rx_desc;
+	return curr;
 }

Hello! This change looks like some fix, and not related to AC5 support. So it should be in separate patch as it affects all mvneta platforms, not only AC5.

Quoted 6 lines
drivers/net/mvneta.c +2 -0
@@ -1508,11 +1544,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
 		 */
 		rx_desc = mvneta_rxq_next_desc_get(rxq);
 
+		if (!rx_desc)
+			return 0;

drivers/net/mvneta.c static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp) · line 1557

Quoted 10 lines
drivers/net/mvneta.c +3 -1
+
 		rx_status = rx_desc->status;
 		if (!mvneta_rxq_desc_is_first_last(rx_status) ||
 		    (rx_status & MVNETA_RXD_ERR_SUMMARY)) {
 			mvneta_rx_error(pp, rx_desc);
-			/* leave the descriptor untouched */
+			/* invalidate the descriptor */
+			rx_desc->data_size = 0;
 			return -EIO;
 		}

ditto.

Quoted 4 lines
drivers/net/mvneta.c +0 -0
@@ -1525,13 +1565,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
 		 * No cache invalidation needed here, since the rx_buffer's are
 		 * located in a uncached memory region
 		 */

drivers/net/mvneta.c static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp) · line 1576

Quoted 10 lines
drivers/net/mvneta.c +3 -1
-		*packetp = data;
+		*packetp = data + pp->dma_base;
 
 		/*
 		 * Only mark one descriptor as free
 		 * since only one was processed
 		 */
 		mvneta_rxq_desc_num_update(pp, rxq, 1, 1);
+		/* invalidate the descriptor */
+		rx_desc->data_size = 0;

ditto.

Quoted 20 lines
drivers/net/mvneta.c +6 -0
 	}
 
 	return rx_bytes;
@@ -1544,6 +1586,11 @@ static int mvneta_probe(struct udevice *dev)
 	struct ofnode_phandle_args sfp_args;
 #endif
 	void *bd_space;
+	void *blob = (void *)gd->fdt_blob;
+	int node = dev_of_offset(dev);
+	const int *cell;
+	int len;
+
 
 	/*
 	 * Allocate buffer area for descs and rx_buffers. This is only
@@ -1577,9 +1624,21 @@ static int mvneta_probe(struct udevice *dev)
 	/* Configure MBUS address windows */
 	if (device_is_compatible(dev, "marvell,armada-3700-neta"))
 		mvneta_bypass_mbus_windows(pp);
+	else if (device_is_compatible(dev, "marvell,armada-ac5-neta"))

drivers/net/mvneta.c static int mvneta_probe(struct udevice *dev) · line 1637

Quoted 10 lines
drivers/net/mvneta.c +7 -0
+		mvneta_conf_ac5_cnm_xbar_windows(pp);
 	else
 		mvneta_conf_mbus_windows(pp);
 
+	/* fetch dma ranges property */
+	cell = fdt_getprop(blob, node, "dma-ranges", &len);
+	if (cell && len >= 4 * sizeof(int)) {
+		/* RAZA - TODO do that in loop by address-cells size */
+		pp->dma_base = fdt32_to_cpu(cell[1]);
+		pp->dma_base = (pp->dma_base << 32) | fdt32_to_cpu(cell[2]);

Probably it should be better to use some function for parsing dma-ranges instead of open-coded implementation. It is not really clear why cell[0] and cell[3] are ignored there, if it is missing intentionally or it is a bug.

And... This should be used only for AC5, right?

Quoted 18 lines
drivers/net/mvneta.c +5 -0
+	} else {
+		pp->dma_base = 0;
+	}
+
 #if CONFIG_IS_ENABLED(DM_GPIO)
 	if (!dev_read_phandle_with_args(dev, "sfp", NULL, 0, 0, &sfp_args) &&
 	    ofnode_is_enabled(sfp_args.node))
@@ -1620,6 +1679,7 @@ static const struct eth_ops mvneta_ops = {
 
 static const struct udevice_id mvneta_ids[] = {
 	{ .compatible = "marvell,armada-370-neta" },
+	{ .compatible = "marvell,armada-ac5-neta" },
 	{ .compatible = "marvell,armada-xp-neta" },
 	{ .compatible = "marvell,armada-3700-neta" },
 	{ }
Signature · 1 line
2.37.3
#5 lore raw

Re: [PATCH v2 1/6] net: mvneta: Add support for AlleyCat5

Quoted 31 lines · Pali Rohár
Quoted 29 lines · On Tuesday 20 September 2022 20:31:48 Chris Packham wrote:
drivers/net/mvneta.c +5 -0
index d2c42c4396..07919d6d35 100644
@@ -91,6 +91,8 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MVNETA_WIN_SIZE_MASK                 (0xffff0000)
 #define MVNETA_BASE_ADDR_ENABLE                 0x2290
 #define      MVNETA_BASE_ADDR_ENABLE_BIT     0x1
+#define      MVNETA_AC5_CNM_DDR_TARGET               0x2
+#define      MVNETA_AC5_CNM_DDR_ATTR         0xb
 #define MVNETA_PORT_ACCESS_PROTECT              0x2294
 #define      MVNETA_PORT_ACCESS_PROTECT_WIN0_RW      0x3
 #define MVNETA_PORT_CONFIG                      0x2400
@@ -282,6 +284,8 @@ struct mvneta_port {
      struct gpio_desc phy_reset_gpio;
      struct gpio_desc sfp_tx_disable_gpio;
 #endif
+
+     uintptr_t dma_base;     /* base address for DMA address decoding */
 };
 
 /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
@@ -513,10 +517,19 @@ static void mvneta_rxq_desc_num_update(struct mvneta_port *pp,
 static struct mvneta_rx_desc *
 mvneta_rxq_next_desc_get(struct mvneta_rx_queue *rxq)
 {
+     struct mvneta_rx_desc *curr;
      int rx_desc = rxq->next_desc_to_proc;
 
Quoted 17 lines

drivers/net/mvneta.c static void mvneta_rxq_desc_num_update(struct mvneta_port *pp, · line 533

Quoted 12 lines
drivers/net/mvneta.c +9 -1
+     /* validate RX descriptor */
+     curr = rxq->descs + rx_desc;
+     if (curr->data_size == 0) {
+             /* do it to read real descriptor next time */
+             DSB;
+             return NULL;
+     }
+
      rxq->next_desc_to_proc = MVNETA_QUEUE_NEXT_DESC(rxq, rx_desc);
-     return rxq->descs + rx_desc;
+     return curr;
 }

Hello! This change looks like some fix, and not related to AC5 support. So it should be in separate patch as it affects all mvneta platforms, not only AC5.

Yep. I'll see if I can get away without this change for the AC5X. So I'll either move it to a new patch or remove it completely in the next round.

Quoted 72 lines
Quoted 6 lines
drivers/net/mvneta.c +2 -0
@@ -1508,11 +1544,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
               */
              rx_desc = mvneta_rxq_next_desc_get(rxq);
 
+             if (!rx_desc)
+                     return 0;

drivers/net/mvneta.c static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp) · line 1557

Quoted 10 lines
drivers/net/mvneta.c +3 -1
+
              rx_status = rx_desc->status;
              if (!mvneta_rxq_desc_is_first_last(rx_status) ||
                  (rx_status & MVNETA_RXD_ERR_SUMMARY)) {
                      mvneta_rx_error(pp, rx_desc);
-                     /* leave the descriptor untouched */
+                     /* invalidate the descriptor */
+                     rx_desc->data_size = 0;
                      return -EIO;
              }

ditto.

Quoted 4 lines
drivers/net/mvneta.c +0 -0
@@ -1525,13 +1565,15 @@ static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp)
               * No cache invalidation needed here, since the rx_buffer's are
               * located in a uncached memory region
               */

drivers/net/mvneta.c static int mvneta_recv(struct udevice *dev, int flags, uchar **packetp) · line 1576

Quoted 10 lines
drivers/net/mvneta.c +3 -1
-             *packetp = data;
+             *packetp = data + pp->dma_base;
 
              /*
               * Only mark one descriptor as free
               * since only one was processed
               */
              mvneta_rxq_desc_num_update(pp, rxq, 1, 1);
+             /* invalidate the descriptor */
+             rx_desc->data_size = 0;

ditto.

Quoted 20 lines
drivers/net/mvneta.c +6 -0
      }
 
      return rx_bytes;
@@ -1544,6 +1586,11 @@ static int mvneta_probe(struct udevice *dev)
      struct ofnode_phandle_args sfp_args;
 #endif
      void *bd_space;
+     void *blob = (void *)gd->fdt_blob;
+     int node = dev_of_offset(dev);
+     const int *cell;
+     int len;
+
 
      /*
       * Allocate buffer area for descs and rx_buffers. This is only
@@ -1577,9 +1624,21 @@ static int mvneta_probe(struct udevice *dev)
      /* Configure MBUS address windows */
      if (device_is_compatible(dev, "marvell,armada-3700-neta"))
              mvneta_bypass_mbus_windows(pp);
+     else if (device_is_compatible(dev, "marvell,armada-ac5-neta"))

drivers/net/mvneta.c static int mvneta_probe(struct udevice *dev) · line 1637

Quoted 10 lines
drivers/net/mvneta.c +7 -0
+             mvneta_conf_ac5_cnm_xbar_windows(pp);
      else
              mvneta_conf_mbus_windows(pp);
 
+     /* fetch dma ranges property */
+     cell = fdt_getprop(blob, node, "dma-ranges", &len);
+     if (cell && len >= 4 * sizeof(int)) {
+             /* RAZA - TODO do that in loop by address-cells size */
+             pp->dma_base = fdt32_to_cpu(cell[1]);
+             pp->dma_base = (pp->dma_base << 32) | fdt32_to_cpu(cell[2]);

Probably it should be better to use some function for parsing dma-ranges instead of open-coded implementation. It is not really clear why cell[0] and cell[3] are ignored there, if it is missing intentionally or it is a bug.

Quoted 2 lines

And... This should be used only for AC5, right?

I think this is about handling 32-bit DMA on a 64-bit system with RAM that starts above the 4GB boundary. So not strictly AC5 specific but the AC5 is the only thing that fits those criteria currently. Certainly the AC5 is the only thing that sets the dma-ranges property on the Ethernet controller. I did find some APIs for parsing dma-ranges but that led me down a rabbit hole of DM_DMA which looks like it (or the SoC) might not be ready for prime-time. I'll see what I can do to avoid the open coding.

Quoted 18 lines
Quoted 18 lines
drivers/net/mvneta.c +5 -1
+     } else {
+             pp->dma_base = 0;
+     }
+
 #if CONFIG_IS_ENABLED(DM_GPIO)
      if (!dev_read_phandle_with_args(dev, "sfp", NULL, 0, 0, &sfp_args) &&
          ofnode_is_enabled(sfp_args.node))
@@ -1620,6 +1679,7 @@ static const struct eth_ops mvneta_ops = {
 
 static const struct udevice_id mvneta_ids[] = {
      { .compatible = "marvell,armada-370-neta" },
+     { .compatible = "marvell,armada-ac5-neta" },
      { .compatible = "marvell,armada-xp-neta" },
      { .compatible = "marvell,armada-3700-neta" },
      { }
--

2.37.3

#6 lore raw

PATCH v2 2/6 usb: ehci: ehci-marvell: Support for marvell,ac5-ehci

In reply to Chris Packham

Unlike the other 64-bit mvebu SoCs the AlleyCat5 uses the older ehci block from the 32-bit SoCs. Adapt the ehci-marvell.c driver to cope with the fact that the ac5 does not have the mbus infrastructure the 32-bit SoCs have and ensure USB_EHCI_IS_TDI is selected.

---

(no changes since v1)

 drivers/usb/host/Kconfig        |  1 +
 drivers/usb/host/ehci-marvell.c | 57 +++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 10 deletions(-)
drivers/usb/host/Kconfig +1 -0
index a0f48f09a7..628078f495 100644
@@ -178,6 +178,7 @@ config USB_EHCI_MARVELL
 	depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
 	default y
 	select USB_EHCI_IS_TDI if !ARM64
+	select USB_EHCI_IS_TDI if ALLEYCAT_5
 	---help---
 	  Enables support for the on-chip EHCI controller on MVEBU SoCs.
 
drivers/usb/host/ehci-marvell.c +47 -10

96 lines not on this page · raw message

Signature · 1 line
2.37.3
#7 lore raw

Re: [PATCH v2 2/6] usb: ehci: ehci-marvell: Support for marvell,ac5-ehci

Quoted 19 lines · On Tuesday 20 September 2022 20:31:49 Chris Packham wrote:

Unlike the other 64-bit mvebu SoCs the AlleyCat5 uses the older ehci block from the 32-bit SoCs. Adapt the ehci-marvell.c driver to cope with the fact that the ac5 does not have the mbus infrastructure the 32-bit SoCs have and ensure USB_EHCI_IS_TDI is selected.

---

(no changes since v1)

 drivers/usb/host/Kconfig        |  1 +
 drivers/usb/host/ehci-marvell.c | 57 +++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 10 deletions(-)
drivers/usb/host/Kconfig +0 -0
index a0f48f09a7..628078f495 100644

drivers/usb/host/Kconfig config USB_EHCI_MARVELL · line 181

Quoted 4 lines
drivers/usb/host/Kconfig +1 -0
@@ -178,6 +178,7 @@ config USB_EHCI_MARVELL
 	depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
 	default y
 	select USB_EHCI_IS_TDI if !ARM64
+	select USB_EHCI_IS_TDI if ALLEYCAT_5

Hello! Is this change correct? Because before this change it was selected from all 32-bit mvebu SoCs and now it is selected only for AC5?

Quoted 110 lines
drivers/usb/host/Kconfig +0 -0
 	---help---
 	  Enables support for the on-chip EHCI controller on MVEBU SoCs.
 
drivers/usb/host/ehci-marvell.c +47 -10
index b7e60c690a..7d859b9cce 100644
@@ -48,12 +48,17 @@ struct ehci_mvebu_priv {
 	fdt_addr_t hcd_base;
 };
 
+#define USB_TO_DRAM_TARGET_ID 0x2
+#define USB_TO_DRAM_ATTR_ID 0x0
+#define USB_DRAM_BASE 0x00000000
+#define USB_DRAM_SIZE 0xfff	/* don't overrun u-boot source (was 0xffff) */
+
 /*
  * Once all the older Marvell SoC's (Orion, Kirkwood) are converted
  * to the common mvebu archticture including the mbus setup, this
  * will be the only function needed to configure the access windows
  */
-static void usb_brg_adrdec_setup(void *base)
+static void usb_brg_adrdec_setup(struct udevice *dev, void *base)
 {
 	const struct mbus_dram_target_info *dram;
 	int i;
@@ -65,16 +70,34 @@ static void usb_brg_adrdec_setup(void *base)
 		writel(0, base + USB_WINDOW_BASE(i));
 	}
 
-	for (i = 0; i < dram->num_cs; i++) {
-		const struct mbus_dram_window *cs = dram->cs + i;
+	if (device_is_compatible(dev, "marvell,ac5-ehci")) {
+		/*
+		 * use decoding window to map dram address seen by usb to 0x0
+		 */
 
 		/* Write size, attributes and target id to control register */
-		writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) |
-		       (dram->mbus_dram_target_id << 4) | 1,
-		       base + USB_WINDOW_CTRL(i));
+		writel((USB_DRAM_SIZE << 16) | (USB_TO_DRAM_ATTR_ID << 8) |
+			   (USB_TO_DRAM_TARGET_ID << 4) | 1,
+			   base + USB_WINDOW_CTRL(0));
 
 		/* Write base address to base register */
-		writel(cs->base, base + USB_WINDOW_BASE(i));
+		writel(USB_DRAM_BASE, base + USB_WINDOW_BASE(0));
+
+		debug("## AC5 decoding windows, ctrl[%p]=0x%x, base[%p]=0x%x\n",
+		      base + USB_WINDOW_CTRL(0), readl(base + USB_WINDOW_CTRL(0)),
+		      base + USB_WINDOW_BASE(0), readl(base + USB_WINDOW_BASE(0)));
+	} else {
+		for (i = 0; i < dram->num_cs; i++) {
+			const struct mbus_dram_window *cs = dram->cs + i;
+
+			/* Write size, attributes and target id to control register */
+			writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) |
+				   (dram->mbus_dram_target_id << 4) | 1,
+				   base + USB_WINDOW_CTRL(i));
+
+			/* Write base address to base register */
+			writel(cs->base, base + USB_WINDOW_BASE(i));
+		}
 	}
 }
 
@@ -126,15 +149,28 @@ static int ehci_mvebu_probe(struct udevice *dev)
 	if (device_is_compatible(dev, "marvell,armada-3700-ehci"))
 		marvell_ehci_ops.powerup_fixup = marvell_ehci_powerup_fixup;
 	else
-		usb_brg_adrdec_setup((void *)priv->hcd_base);
+		usb_brg_adrdec_setup(dev, (void *)priv->hcd_base);
 
 	hccr = (struct ehci_hccr *)(priv->hcd_base + 0x100);
 	hcor = (struct ehci_hcor *)
 		((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
 
 	debug("ehci-marvell: init hccr %lx and hcor %lx hc_length %ld\n",
-	      (uintptr_t)hccr, (uintptr_t)hcor,
-	      (uintptr_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+		  (uintptr_t)hccr, (uintptr_t)hcor,
+		  (uintptr_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+
+#define PHY_CALIB_OFFSET 0x808
+	/*
+	 * Trigger calibration during each usb start/reset:
+	 * BIT 13 to 0, and then to 1
+	 */
+	if (device_is_compatible(dev, "marvell,ac5-ehci")) {
+		void *phy_calib_reg = (void *)(priv->hcd_base + PHY_CALIB_OFFSET);
+		u32 val = readl(phy_calib_reg) & (~BIT(13));
+
+		writel(val, phy_calib_reg);
+		writel(val | BIT(13), phy_calib_reg);
+	}
 
 	return ehci_register(dev, hccr, hcor, &marvell_ehci_ops, 0,
 			     USB_INIT_HOST);
@@ -143,6 +179,7 @@ static int ehci_mvebu_probe(struct udevice *dev)
 static const struct udevice_id ehci_usb_ids[] = {
 	{ .compatible = "marvell,orion-ehci", },
 	{ .compatible = "marvell,armada-3700-ehci", },
+	{ .compatible = "marvell,ac5-ehci", },
 	{ }
 };
 
Signature · 1 line
2.37.3
#8 lore raw

PATCH v2 3/6 pinctrl: mvebu: Add AlleyCat5 support

In reply to Chris Packham

This uses the same IP block as the Armada-8K SoCs.

---

(no changes since v1)

 drivers/pinctrl/mvebu/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/mvebu/Kconfig +1 -1
index 574fb4dfb0..7c51d138c8 100644
@@ -15,7 +15,7 @@ config PINCTRL_ARMADA_37XX
 	   Marvell's Armada-37xx SoC.
 
 config PINCTRL_ARMADA_8K
-	depends on ARMADA_8K && PINCTRL_FULL
+	depends on (ARMADA_8K || ALLEYCAT_5) && PINCTRL_FULL
 	bool "Armada 7k/8k pin control driver"
 	help
 	   Support pin multiplexing and pin configuration control on
Signature · 1 line
2.37.3
#9 lore raw

PATCH v2 4/6 misc: mvebu: Add sample at reset driver

In reply to Chris Packham

Add a new UCLASS_SAR, the generic SAR code and an Alleycat5 driver. This has been adapted from the Marvell SDK but only the AC5 driver has been brought through (other drivers exist for the ap806, ap807 and cp110 IP blocks).

---

(no changes since v1)

 drivers/misc/Kconfig                |   6 ++
 drivers/misc/Makefile               |   1 +
 drivers/misc/mvebu_sar/Makefile     |   4 +
 drivers/misc/mvebu_sar/ac5_sar.c    | 119 +++++++++++++++++++++++
 drivers/misc/mvebu_sar/sar-uclass.c | 146 ++++++++++++++++++++++++++++
 include/dm/uclass-id.h              |   1 +
 include/fdtdec.h                    |   4 +
 include/mvebu/mvebu_chip_sar.h      |  73 ++++++++++++++
 include/mvebu/sar.h                 |  57 +++++++++++
 include/mvebu/var.h                 |  28 ++++++
 include/sar-uclass.h                |  23 +++++
 lib/fdtdec.c                        |   6 +-
 12 files changed, 467 insertions(+), 1 deletion(-)
 create mode 100644 drivers/misc/mvebu_sar/Makefile
 create mode 100644 drivers/misc/mvebu_sar/ac5_sar.c
 create mode 100644 drivers/misc/mvebu_sar/sar-uclass.c
 create mode 100644 include/mvebu/mvebu_chip_sar.h
 create mode 100644 include/mvebu/sar.h
 create mode 100644 include/mvebu/var.h
 create mode 100644 include/sar-uclass.h
drivers/misc/Kconfig +6 -0
index a6da6e215d..4e99ef29d9 100644
@@ -645,4 +645,10 @@ config SL28CPLD
 	  the base driver which provides common access methods for the
 	  sub-drivers.
 
+config MVEBU_SAR
+	bool "MVEBU SAR driver"
+	depends on ARCH_MVEBU
+	help
+	  Support MVEBU SAR driver
+
 endmenu
drivers/misc/Makefile +1 -0
index d494639cd9..3cf976edd8 100644
@@ -62,6 +62,7 @@ obj-$(CONFIG_NUVOTON_NCT6102D) += nuvoton_nct6102d.o
 obj-$(CONFIG_P2SB) += p2sb-uclass.o
 obj-$(CONFIG_PCA9551_LED) += pca9551_led.o
 obj-$(CONFIG_$(SPL_)PWRSEQ) += pwrseq-uclass.o
+obj-$(CONFIG_MVEBU_SAR) += mvebu_sar/
 ifdef CONFIG_QFW
 obj-y += qfw.o
 obj-$(CONFIG_QFW_PIO) += qfw_pio.o
drivers/misc/mvebu_sar/Makefile new file +4 -0
new file mode 100644
index 0000000000..6f339fb7b4
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-$(CONFIG_MVEBU_SAR) += sar-uclass.o
+obj-$(CONFIG_ALLEYCAT_5) += ac5_sar.o
drivers/misc/mvebu_sar/ac5_sar.c new file +119 -0

119 lines not on this page · raw message

drivers/misc/mvebu_sar/sar-uclass.c new file +146 -0

146 lines not on this page · raw message

include/dm/uclass-id.h +1 -0
index a432e43871..2213e76d38 100644
@@ -107,6 +107,7 @@ enum uclass_id {
 	UCLASS_RESET,		/* Reset controller device */
 	UCLASS_RNG,		/* Random Number Generator */
 	UCLASS_RTC,		/* Real time clock device */
+	UCLASS_SAR,		/* Reset Sample Configuration */
 	UCLASS_SCMI_AGENT,	/* Interface with an SCMI server */
 	UCLASS_SCSI,		/* SCSI device */
 	UCLASS_SERIAL,		/* Serial UART */
include/fdtdec.h +4 -0
index 12355afd7f..d8923ba443 100644
@@ -199,6 +199,10 @@ enum fdt_compat_id {
 	COMPAT_ALTERA_SOCFPGA_FPGA0,		/* SOCFPGA FPGA manager */
 	COMPAT_ALTERA_SOCFPGA_NOC,		/* SOCFPGA Arria 10 NOC */
 	COMPAT_ALTERA_SOCFPGA_CLK_INIT,		/* SOCFPGA Arria 10 clk init */
+	COMPAT_MVEBU_SAR,		/* Marvell Sampled-at-Reset */
+	COMPAT_MVEBU_SAR_REG_COMMON,	/* Marvell Sampled-at-Reset Common */
+	COMPAT_MVEBU_SAR_REG_AP806,	/* Marvell Sampled-at-Reset for ap806/ap807 */
+	COMPAT_MVEBU_SAR_REG_CP110,	/* Marvell Sampled-at-Reset for cp110 */
 
 	COMPAT_COUNT,
 };
include/mvebu/mvebu_chip_sar.h new file +73 -0

73 lines not on this page · raw message

include/mvebu/sar.h new file +57 -0

57 lines not on this page · raw message

include/mvebu/var.h new file +28 -0
new file mode 100644
index 0000000000..6bd315c841
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier:       GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#ifndef _VAR_H_
+#define _VAR_H_
+
+#include <linux/compiler.h>
+
+#define INVALID_KEY	0xFF
+#define MAX_VAR_OPTIONS	10
+
+#define VAR_IS_DEFAULT	0x1
+#define VAR_IS_LAST	0x2
+
+struct var_opts {
+	u8 value;
+	char *desc;
+	u8 flags;
+};
+
+struct var_desc {
+	char *key;
+	char *description;
+};
+
+#endif /* _VAR_H_ */
include/sar-uclass.h new file +23 -0
new file mode 100644
index 0000000000..8b9cc08847
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#include <mvebu/mvebu_chip_sar.h>
+
+struct udevice;
+
+struct sar_ops {
+	int (*sar_init_func)(struct udevice *dev);
+	int (*sar_dump_func)(struct udevice *dev);
+	int (*sar_value_get_func)(struct udevice *dev, enum mvebu_sar_opts sar,
+				  struct sar_val *val);
+	int (*sar_bootsrc_get)(struct udevice *dev, u32 *idx);
+};
+
+struct dm_sar_pdata {
+	void __iomem *sar_base;
+	const char *sar_name;
+};
+
+int mvebu_sar_id_register(struct udevice *dev, u32 sar_id);
lib/fdtdec.c +5 -1
index 96b6b71a60..26e5c82bcd 100644
@@ -74,7 +74,11 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(ALTERA_SOCFPGA_F2SDR2, "altr,socfpga-fpga2sdram2-bridge"),
 	COMPAT(ALTERA_SOCFPGA_FPGA0, "altr,socfpga-a10-fpga-mgr"),
 	COMPAT(ALTERA_SOCFPGA_NOC, "altr,socfpga-a10-noc"),
-	COMPAT(ALTERA_SOCFPGA_CLK_INIT, "altr,socfpga-a10-clk-init")
+	COMPAT(ALTERA_SOCFPGA_CLK_INIT, "altr,socfpga-a10-clk-init"),
+	COMPAT(MVEBU_SAR, "marvell,sample-at-reset"),
+	COMPAT(MVEBU_SAR_REG_COMMON, "marvell,sample-at-reset-common"),
+	COMPAT(MVEBU_SAR_REG_AP806, "marvell,sample-at-reset-ap806"),
+	COMPAT(MVEBU_SAR_REG_CP110, "marvell,sample-at-reset-cp110"),
 };
 
 static const char *const fdt_src_name[] = {
Signature · 1 line
2.37.3
#10 lore raw

Re: [PATCH v2 4/6] misc: mvebu: Add sample at reset driver

Quoted 5 lines · On Tuesday 20 September 2022 20:31:51 Chris Packham wrote:
lib/fdtdec.c +0 -0
index 96b6b71a60..26e5c82bcd 100644

lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 82

Quoted 10 lines
lib/fdtdec.c +5 -1
@@ -74,7 +74,11 @@ static const char * const compat_names[COMPAT_COUNT] = {
 	COMPAT(ALTERA_SOCFPGA_F2SDR2, "altr,socfpga-fpga2sdram2-bridge"),
 	COMPAT(ALTERA_SOCFPGA_FPGA0, "altr,socfpga-a10-fpga-mgr"),
 	COMPAT(ALTERA_SOCFPGA_NOC, "altr,socfpga-a10-noc"),
-	COMPAT(ALTERA_SOCFPGA_CLK_INIT, "altr,socfpga-a10-clk-init")
+	COMPAT(ALTERA_SOCFPGA_CLK_INIT, "altr,socfpga-a10-clk-init"),
+	COMPAT(MVEBU_SAR, "marvell,sample-at-reset"),
+	COMPAT(MVEBU_SAR_REG_COMMON, "marvell,sample-at-reset-common"),
+	COMPAT(MVEBU_SAR_REG_AP806, "marvell,sample-at-reset-ap806"),
+	COMPAT(MVEBU_SAR_REG_CP110, "marvell,sample-at-reset-cp110"),
 };

Hello! You should really not to extend compat_names[]. This list here is just for old u-boot code and entries should be removed from it only.

#11 lore raw

PATCH v2 5/6 arm: mvebu: Support for 98DX25xx/98DX35xx SoC

In reply to Chris Packham

Add support for the Allecat5/Alleycat5X SoC. These are L3 switches with an integrated CPU (referred to as the CnM block in Marvell's documentation). These have dual ARMv8.2 CPUs (Cortex-A55). This support has been ported from Marvell's SDK which is based on a much older version of U-Boot.

---

(no changes since v1)

 arch/arm/dts/ac5-98dx25xx.dtsi           | 292 +++++++++++++++++++++++
 arch/arm/dts/ac5-98dx35xx.dtsi           |  17 ++
 arch/arm/mach-mvebu/Kconfig              |   5 +
 arch/arm/mach-mvebu/Makefile             |   1 +
 arch/arm/mach-mvebu/alleycat5/Makefile   |   9 +
 arch/arm/mach-mvebu/alleycat5/clock.c    |  49 ++++
 arch/arm/mach-mvebu/alleycat5/cpu.c      | 129 ++++++++++
 arch/arm/mach-mvebu/alleycat5/soc.c      | 229 ++++++++++++++++++
 arch/arm/mach-mvebu/arm64-common.c       |  15 ++
 arch/arm/mach-mvebu/include/mach/clock.h |  11 +
 arch/arm/mach-mvebu/include/mach/cpu.h   |   4 +
 arch/arm/mach-mvebu/include/mach/soc.h   |   4 +
 12 files changed, 765 insertions(+)
 create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi
 create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile
 create mode 100644 arch/arm/mach-mvebu/alleycat5/clock.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c
 create mode 100644 arch/arm/mach-mvebu/include/mach/clock.h
arch/arm/dts/ac5-98dx25xx.dtsi new file +292 -0
new file mode 100644
index 0000000000..c31d2f08cf
@@ -0,0 +1,292 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For AC5.
+ *
+ * Copyright (C) 2021 Marvell
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	model = "Marvell AC5 SoC";
+	compatible = "marvell,ac5";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	cpus {
+		#address-cells = <2>;
+		#size-cells = <0>;
+
+		cpu-map {
+			cluster0 {
+				core0 {
+					cpu = <&cpu0>;
+				};
+				core1 {
+					cpu = <&cpu1>;
+				};
+			};
+		};
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x0 0x0>;
+			enable-method = "psci";
+			next-level-cache = <&l2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a55";
+			reg = <0x0 0x100>;
+			enable-method = "psci";
+			next-level-cache = <&l2>;
+		};
+
+		l2: l2-cache {
+			compatible = "cache";
+		};
+	};
+
+	psci {
+		compatible = "arm,psci-0.2";
+		method = "smc";
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	pmu {
+		compatible = "arm,armv8-pmuv3";
+		interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	config-space {
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+		compatible = "simple-bus";
+
+		sar-reg {
+			compatible = "marvell,sample-at-reset-common";
+			sar-driver = "ac5_sar";
+			sar-name = "ac5_sar";
+			status = "okay";
+		};
+	};
+
+	soc {
+		compatible = "simple-bus";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		dma-ranges;
+
+		internal-regs@7f000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "simple-bus";
+			/* 16M internal register @ 0x7f00_0000 */
+			ranges = <0x0 0x0 0x7f000000 0x1000000>;
+			dma-coherent;
+
+			uart0: serial@12000 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x12000 0x100>;
+				reg-shift = <2>;
+				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+				reg-io-width = <1>;
+				clocks = <&cnm_clock>;
+				status = "okay";
+			};
+
+			uart1: serial@12100 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x12100 0x100>;
+				reg-shift = <2>;
+				reg-io-width = <1>;
+				clocks = <&cnm_clock>;
+				status = "disabled";
+			};
+
+			uart2: serial@12200 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x12200 0x100>;
+				reg-shift = <2>;
+				reg-io-width = <1>;
+				clocks = <&cnm_clock>;
+				status = "disabled";
+			};
+
+			uart3: serial@12300 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x12300 0x100>;
+				reg-shift = <2>;
+				reg-io-width = <1>;
+				clocks = <&cnm_clock>;
+				status = "disabled";
+			};
+
+			mdio: mdio@22004 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "marvell,orion-mdio";
+				reg = <0x22004 0x4>;
+				clocks = <&cnm_clock>;
+			};
+
+			i2c0: i2c@11000 {
+				compatible = "marvell,mv78230-i2c";
+				reg = <0x11000 0x20>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				clocks = <&cnm_clock>;
+				clock-names = "core";
+				interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency=<100000>;
+				status = "disabled";
+			};
+
+			i2c1: i2c@11100 {
+				compatible = "marvell,mv78230-i2c";
+				reg = <0x11100 0x20>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				clocks = <&cnm_clock>;
+				clock-names = "core";
+				interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency=<100000>;
+				status = "disabled";
+			};
+
+			gpio0: gpio@18100 {
+				compatible = "marvell,orion-gpio";
+				reg = <0x18100 0x40>;
+				ngpios = <32>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				status = "okay";
+			};
+
+			gpio1: gpio@18140 {
+				reg = <0x18140 0x40>;
+				compatible = "marvell,orion-gpio";
+				ngpios = <14>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				status = "okay";
+			};
+		};
+
+		/*
+		 * Dedicated section for devices behind 32bit controllers so we
+		 * can configure specific DMA mapping for them
+		 */
+		behind-32bit-controller@7f000000 {
+			compatible = "simple-bus";
+			#address-cells = <0x2>;
+			#size-cells = <0x2>;
+			ranges = <0x0 0x0 0x0 0x7f000000 0x0 0x1000000>;
+			/* Host phy ram starts at 0x200M */
+			dma-ranges = <0x0 0x0 0x2 0x0 0x1 0x0>;
+			dma-coherent;
+
+			eth0: ethernet@20000 {
+				compatible = "marvell,armada-ac5-neta";
+				reg = <0x0 0x20000 0x0 0x4000>;
+				dma-ranges = <0 2 0 0x40000000>;
+				interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&cnm_clock>;
+				phy-mode = "sgmii";
+				status = "disabled";
+			};
+
+			eth1: ethernet@24000 {
+				compatible = "marvell,armada-ac5-neta";
+				reg = <0x0 0x24000 0x0 0x4000>;
+				dma-ranges = <0 2 0 0x40000000>;
+				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&cnm_clock>;
+				phy-mode = "sgmii";
+				status = "disabled";
+			};
+
+			usb0: usb@80000 {
+				compatible = "marvell,ac5-ehci";
+				reg = <0x0 0x80000 0x0 0x500>;
+				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+				status = "disabled";
+			};
+
+			usb1: usb@a0000 {
+				compatible = "marvell,ac5-ehci";
+				reg = <0x0 0xa0000 0x0 0x500>;
+				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+				status = "disabled";
+			};
+		};
+
+		pinctrl0: pinctrl@80020100 {
+			compatible = "marvell,mvebu-pinctrl";
+			reg = <0 0x80020100 0 0x20>;
+			pin-count = <46>;
+			max-func = <0xf>;
+			status = "okay";
+		};
+
+		spi0: spi@805a0000 {
+			compatible = "marvell,armada-3700-spi";
+			reg = <0x0 0x805a0000 0x0 0x50>;
+			#address-cells = <0x1>;
+			#size-cells = <0x0>;
+			clocks = <&spi_clock>;
+			interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
+			num-cs = <1>;
+			status = "disabled";
+		};
+
+		spi1: spi@805a8000 {
+			compatible = "marvell,armada-3700-spi";
+			reg = <0x0 0x805a8000 0x0 0x50>;
+			#address-cells = <0x1>;
+			#size-cells = <0x0>;
+			clocks = <&spi_clock>;
+			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+			num-cs = <1>;
+			status = "disabled";
+		};
+
+		gic: interrupt-controller@80600000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-controller;
+			reg = <0x0 0x80600000 0x0 0x10000>, /* GICD */
+			      <0x0 0x80660000 0x0 0x40000>; /* GICR */
+			interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>;
+		};
+	};
+
+	clocks {
+		cnm_clock: cnm-clock {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <328000000>;
+		};
+
+		spi_clock: spi-clock {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <200000000>;
+		};
+	};
+};
arch/arm/dts/ac5-98dx35xx.dtsi new file +17 -0
new file mode 100644
index 0000000000..2ab72f854b
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For AC5X.
+ *
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+
+#include "ac5-98dx25xx.dtsi"
+
+/ {
+	model = "Marvell AC5X SoC";
+	compatible = "marvell,ac5x", "marvell,ac5";
+};
+
+&cnm_clock {
+	clock-frequency = <325000000>;
+};
arch/arm/mach-mvebu/Kconfig +5 -0
index a81b8e2b0d..400a308985 100644
@@ -49,6 +49,11 @@ config ARMADA_8K
 	bool
 	select ARM64
 
+config ALLEYCAT_5
+	bool
+	select ARM64
+	select HAVE_MVEBU_EFUSE
+
 # Armada PLL frequency (used for NAND clock generation)
 config SYS_MVEBU_PLL_CLOCK
 	int
arch/arm/mach-mvebu/Makefile +1 -0
index 103e64cf20..f7d7f5f8ef 100644
@@ -6,6 +6,7 @@ ifdef CONFIG_ARM64
 
 obj-$(CONFIG_ARMADA_3700) += armada3700/
 obj-$(CONFIG_ARMADA_8K) += armada8k/
+obj-$(CONFIG_ALLEYCAT_5) += alleycat5/
 obj-y += arm64-common.o
 
 else # CONFIG_ARM64
arch/arm/mach-mvebu/alleycat5/Makefile new file +9 -0
new file mode 100644
index 0000000000..43b8b70c84
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2016 Stefan Roese <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y = cpu.o
+obj-y += soc.o
+obj-y += clock.o
arch/arm/mach-mvebu/alleycat5/clock.c new file +49 -0

49 lines not on this page · raw message

arch/arm/mach-mvebu/alleycat5/cpu.c new file +129 -0

129 lines not on this page · raw message

arch/arm/mach-mvebu/alleycat5/soc.c new file +229 -0

229 lines not on this page · raw message

arch/arm/mach-mvebu/arm64-common.c +15 -0
index 238edbe6ba..c9b6f16c63 100644
@@ -53,6 +53,8 @@ __weak int dram_init_banksize(void)
 		return a8k_dram_init_banksize();
 	else if (CONFIG_IS_ENABLED(ARMADA_3700))
 		return a3700_dram_init_banksize();
+	else if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+		return alleycat5_dram_init_banksize();
 	else
 		return fdtdec_setup_memory_banksize();
 }
@@ -68,6 +70,9 @@ __weak int dram_init(void)
 	if (CONFIG_IS_ENABLED(ARMADA_3700))
 		return a3700_dram_init();
 
+	if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+		return alleycat5_dram_init();
+
 	if (fdtdec_setup_mem_size_base() != 0)
 		return -EINVAL;
 
@@ -100,6 +105,16 @@ int arch_early_init_r(void)
 			break;
 	}
 
+	i = 0;
+	while (1) {
+		/* Call the pinctrl code via the PINCTRL uclass driver */
+		ret = uclass_get_device(UCLASS_PINCTRL, i++, &dev);
+
+		/* We're done, once no further CP110 device is found */
+		if (ret)
+			break;
+	}
+
 	/* Cause the SATA device to do its early init */
 	uclass_first_device(UCLASS_AHCI, &dev);
 
arch/arm/mach-mvebu/include/mach/clock.h new file +11 -0
new file mode 100644
index 0000000000..93d965ad5a
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#ifndef _MVEBU_CLOCK_H_
+#define _MVEBU_CLOCK_H_
+
+void soc_print_clock_info(void);
+
+#endif /* _MVEBU_CLOCK_H_ */
arch/arm/mach-mvebu/include/mach/cpu.h +4 -0
index b127fce865..c17c2440f1 100644
@@ -174,6 +174,10 @@ int a3700_dram_init_banksize(void);
 /* A3700 PCIe regions fixer for device tree */
 int a3700_fdt_fix_pcie_regions(void *blob);
 
+/* Alleycat5 dram functions */
+int alleycat5_dram_init(void);
+int alleycat5_dram_init_banksize(void);
+
 /*
  * get_ref_clk
  *
arch/arm/mach-mvebu/include/mach/soc.h +4 -0
index 3b9618852c..b9312e37dc 100644
@@ -212,4 +212,8 @@
 #define CONFIG_SYS_TCLK		250000000	/* 250MHz */
 #endif
 
+#ifndef __ASSEMBLY__
+void soc_print_device_info(void);
+int soc_early_init_f(void);
+#endif /* __ASSEMBLY__ */
 #endif /* _MVEBU_SOC_H */
Signature · 1 line
2.37.3
#12 lore raw

Re: [PATCH v2 5/6] arm: mvebu: Support for 98DX25xx/98DX35xx SoC

Quoted 32 lines · On Tuesday 20 September 2022 20:31:52 Chris Packham wrote:

Add support for the Allecat5/Alleycat5X SoC. These are L3 switches with an integrated CPU (referred to as the CnM block in Marvell's documentation). These have dual ARMv8.2 CPUs (Cortex-A55). This support has been ported from Marvell's SDK which is based on a much older version of U-Boot.

---

(no changes since v1)

 arch/arm/dts/ac5-98dx25xx.dtsi           | 292 +++++++++++++++++++++++
 arch/arm/dts/ac5-98dx35xx.dtsi           |  17 ++
 arch/arm/mach-mvebu/Kconfig              |   5 +
 arch/arm/mach-mvebu/Makefile             |   1 +
 arch/arm/mach-mvebu/alleycat5/Makefile   |   9 +
 arch/arm/mach-mvebu/alleycat5/clock.c    |  49 ++++
 arch/arm/mach-mvebu/alleycat5/cpu.c      | 129 ++++++++++
 arch/arm/mach-mvebu/alleycat5/soc.c      | 229 ++++++++++++++++++
 arch/arm/mach-mvebu/arm64-common.c       |  15 ++
 arch/arm/mach-mvebu/include/mach/clock.h |  11 +
 arch/arm/mach-mvebu/include/mach/cpu.h   |   4 +
 arch/arm/mach-mvebu/include/mach/soc.h   |   4 +
 12 files changed, 765 insertions(+)
 create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi
 create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile
 create mode 100644 arch/arm/mach-mvebu/alleycat5/clock.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c
 create mode 100644 arch/arm/mach-mvebu/include/mach/clock.h

...

arch/arm/mach-mvebu/Kconfig config ARMADA_8K · line 55

Quoted 12 lines
arch/arm/mach-mvebu/Kconfig +4 -0
index a81b8e2b0d..400a308985 100644
@@ -49,6 +49,11 @@ config ARMADA_8K
 	bool
 	select ARM64
 
+config ALLEYCAT_5
+	bool
+	select ARM64
+	select HAVE_MVEBU_EFUSE

Hello! You are not adding any efuse implementation for AC5 platform, so selecting this symbol seems to be wrong.

Or are you reusing A3720 or A38x OTP implementation for AC5? This is not clear from the patch.

Quoted 4 lines
arch/arm/mach-mvebu/Kconfig +1 -0
+
 # Armada PLL frequency (used for NAND clock generation)
 config SYS_MVEBU_PLL_CLOCK
 	int

...

Quoted 26 lines
arch/arm/mach-mvebu/arm64-common.c +5 -0
index 238edbe6ba..c9b6f16c63 100644
@@ -53,6 +53,8 @@ __weak int dram_init_banksize(void)
 		return a8k_dram_init_banksize();
 	else if (CONFIG_IS_ENABLED(ARMADA_3700))
 		return a3700_dram_init_banksize();
+	else if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+		return alleycat5_dram_init_banksize();
 	else
 		return fdtdec_setup_memory_banksize();
 }
@@ -68,6 +70,9 @@ __weak int dram_init(void)
 	if (CONFIG_IS_ENABLED(ARMADA_3700))
 		return a3700_dram_init();
 
+	if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+		return alleycat5_dram_init();
+
 	if (fdtdec_setup_mem_size_base() != 0)
 		return -EINVAL;
 
@@ -100,6 +105,16 @@ int arch_early_init_r(void)
 			break;
 	}

arch/arm/mach-mvebu/arm64-common.c int arch_early_init_r(void) · line 116

Quoted 10 lines
arch/arm/mach-mvebu/arm64-common.c +9 -0
 
+	i = 0;
+	while (1) {
+		/* Call the pinctrl code via the PINCTRL uclass driver */
+		ret = uclass_get_device(UCLASS_PINCTRL, i++, &dev);
+
+		/* We're done, once no further CP110 device is found */
+		if (ret)
+			break;
+	}

This code is unconditionally called for all 64-bit mvebu platforms, not only for new AC5. So if this is some fix, it should be in separate commit. If not then it should be marked AC5 specific and explained why.

Quoted 10 lines
arch/arm/mach-mvebu/arm64-common.c +1 -0
+
 	/* Cause the SATA device to do its early init */
 	uclass_first_device(UCLASS_AHCI, &dev);
 
arch/arm/mach-mvebu/include/mach/clock.h new file +0 -0
new file mode 100644
index 0000000000..93d965ad5a

arch/arm/mach-mvebu/include/mach/clock.h line 9

Quoted 9 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +9 -0
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#ifndef _MVEBU_CLOCK_H_
+#define _MVEBU_CLOCK_H_
+
+void soc_print_clock_info(void);

I'm not sure if this function needs to be exported. You are using it only in AC5 cpu.c file, in function print_cpuinfo(). So probably you can move soc_print_clock_info() into that file and then global mvebu clock.h would not be needed at all.

Quoted 22 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +2 -0
+
+#endif /* _MVEBU_CLOCK_H_ */
arch/arm/mach-mvebu/include/mach/cpu.h +4 -0
index b127fce865..c17c2440f1 100644
@@ -174,6 +174,10 @@ int a3700_dram_init_banksize(void);
 /* A3700 PCIe regions fixer for device tree */
 int a3700_fdt_fix_pcie_regions(void *blob);
 
+/* Alleycat5 dram functions */
+int alleycat5_dram_init(void);
+int alleycat5_dram_init_banksize(void);
+
 /*
  * get_ref_clk
  *
arch/arm/mach-mvebu/include/mach/soc.h +0 -0
index 3b9618852c..b9312e37dc 100644

arch/arm/mach-mvebu/include/mach/soc.h line 217

Quoted 6 lines
arch/arm/mach-mvebu/include/mach/soc.h +3 -0
@@ -212,4 +212,8 @@
 #define CONFIG_SYS_TCLK		250000000	/* 250MHz */
 #endif
 
+#ifndef __ASSEMBLY__
+void soc_print_device_info(void);
+int soc_early_init_f(void);

These two functions are not available on existing mvebu platforms, so I think functions should not be declared in global mvebu soc.h file.

Quoted 5 lines
arch/arm/mach-mvebu/include/mach/soc.h +1 -0
+#endif /* __ASSEMBLY__ */
 #endif /* _MVEBU_SOC_H */
Signature · 1 line
2.37.3
#13 lore raw

Re: [PATCH v2 5/6] arm: mvebu: Support for 98DX25xx/98DX35xx SoC

Quoted 51 lines · Pali Rohár
Quoted 32 lines · On Tuesday 20 September 2022 20:31:52 Chris Packham wrote:

Add support for the Allecat5/Alleycat5X SoC. These are L3 switches with an integrated CPU (referred to as the CnM block in Marvell's documentation). These have dual ARMv8.2 CPUs (Cortex-A55). This support has been ported from Marvell's SDK which is based on a much older version of U-Boot.

---

(no changes since v1)

 arch/arm/dts/ac5-98dx25xx.dtsi           | 292 +++++++++++++++++++++++
 arch/arm/dts/ac5-98dx35xx.dtsi           |  17 ++
 arch/arm/mach-mvebu/Kconfig              |   5 +
 arch/arm/mach-mvebu/Makefile             |   1 +
 arch/arm/mach-mvebu/alleycat5/Makefile   |   9 +
 arch/arm/mach-mvebu/alleycat5/clock.c    |  49 ++++
 arch/arm/mach-mvebu/alleycat5/cpu.c      | 129 ++++++++++
 arch/arm/mach-mvebu/alleycat5/soc.c      | 229 ++++++++++++++++++
 arch/arm/mach-mvebu/arm64-common.c       |  15 ++
 arch/arm/mach-mvebu/include/mach/clock.h |  11 +
 arch/arm/mach-mvebu/include/mach/cpu.h   |   4 +
 arch/arm/mach-mvebu/include/mach/soc.h   |   4 +
 12 files changed, 765 insertions(+)
 create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi
 create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile
 create mode 100644 arch/arm/mach-mvebu/alleycat5/clock.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c
 create mode 100644 arch/arm/mach-mvebu/include/mach/clock.h

...

arch/arm/mach-mvebu/Kconfig config ARMADA_8K · line 55

Quoted 12 lines
arch/arm/mach-mvebu/Kconfig +4 -0
index a81b8e2b0d..400a308985 100644
@@ -49,6 +49,11 @@ config ARMADA_8K
      bool
      select ARM64
 
+config ALLEYCAT_5
+     bool
+     select ARM64
+     select HAVE_MVEBU_EFUSE

Hello! You are not adding any efuse implementation for AC5 platform, so selecting this symbol seems to be wrong.

Quoted 3 lines

Or are you reusing A3720 or A38x OTP implementation for AC5? This is not clear from the patch.

The original code did have some EFUSE stuff in it but I've dropped most of it out. I think this can go.

Quoted 32 lines
Quoted 4 lines
arch/arm/mach-mvebu/Kconfig +1 -0
+
 # Armada PLL frequency (used for NAND clock generation)
 config SYS_MVEBU_PLL_CLOCK
      int

...

Quoted 27 lines
arch/arm/mach-mvebu/arm64-common.c +5 -0
index 238edbe6ba..c9b6f16c63 100644
@@ -53,6 +53,8 @@ __weak int dram_init_banksize(void)
              return a8k_dram_init_banksize();
      else if (CONFIG_IS_ENABLED(ARMADA_3700))
              return a3700_dram_init_banksize();
+     else if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+             return alleycat5_dram_init_banksize();
      else
              return fdtdec_setup_memory_banksize();
 }
@@ -68,6 +70,9 @@ __weak int dram_init(void)
      if (CONFIG_IS_ENABLED(ARMADA_3700))
              return a3700_dram_init();
 
+     if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+             return alleycat5_dram_init();
+
      if (fdtdec_setup_mem_size_base() != 0)
              return -EINVAL;
 
@@ -100,6 +105,16 @@ int arch_early_init_r(void)
                      break;
      }
 
Quoted 14 lines

arch/arm/mach-mvebu/arm64-common.c int arch_early_init_r(void) · line 116

Quoted 9 lines
arch/arm/mach-mvebu/arm64-common.c +9 -0
+     i = 0;
+     while (1) {
+             /* Call the pinctrl code via the PINCTRL uclass driver */
+             ret = uclass_get_device(UCLASS_PINCTRL, i++, &dev);
+
+             /* We're done, once no further CP110 device is found */
+             if (ret)
+                     break;
+     }

This code is unconditionally called for all 64-bit mvebu platforms, not only for new AC5. So if this is some fix, it should be in separate commit. If not then it should be marked AC5 specific and explained why.

Yeah I can't see why it's needed. The pinctrl device still gets probed without it so I suspect it's just old cruft left over from a time that wasn't the case.

Quoted 16 lines
Quoted 16 lines
arch/arm/mach-mvebu/arm64-common.c +1 -0
+
      /* Cause the SATA device to do its early init */
      uclass_first_device(UCLASS_AHCI, &dev);
 
arch/arm/mach-mvebu/include/mach/clock.h new file +6 -0
new file mode 100644
index 0000000000..93d965ad5a
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#ifndef _MVEBU_CLOCK_H_
Quoted 9 lines

arch/arm/mach-mvebu/include/mach/clock.h line 9

Quoted 3 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +3 -0
+#define _MVEBU_CLOCK_H_
+
+void soc_print_clock_info(void);

I'm not sure if this function needs to be exported. You are using it only in AC5 cpu.c file, in function print_cpuinfo(). So probably you can move soc_print_clock_info() into that file and then global mvebu clock.h would not be needed at all.

I'd need to fold all of the stuff in alleycat5/clock.c into alleycat5/cpu.c but it should be doable. Alternatively I could keep it separate but have a local .h file for this (and soc.h) to avoid polluting the mvebu generic files.

Quoted 25 lines
Quoted 25 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +2 -0
+
+#endif /* _MVEBU_CLOCK_H_ */
arch/arm/mach-mvebu/include/mach/cpu.h +4 -0
index b127fce865..c17c2440f1 100644
@@ -174,6 +174,10 @@ int a3700_dram_init_banksize(void);
 /* A3700 PCIe regions fixer for device tree */
 int a3700_fdt_fix_pcie_regions(void *blob);
 
+/* Alleycat5 dram functions */
+int alleycat5_dram_init(void);
+int alleycat5_dram_init_banksize(void);
+
 /*
  * get_ref_clk
  *
arch/arm/mach-mvebu/include/mach/soc.h +0 -0
index 3b9618852c..b9312e37dc 100644
@@ -212,4 +212,8 @@
 #define CONFIG_SYS_TCLK              250000000       /* 250MHz */
 #endif
 
Quoted 7 lines

arch/arm/mach-mvebu/include/mach/soc.h line 217

Quoted 3 lines
arch/arm/mach-mvebu/include/mach/soc.h +3 -0
+#ifndef __ASSEMBLY__
+void soc_print_device_info(void);
+int soc_early_init_f(void);

These two functions are not available on existing mvebu platforms, so I think functions should not be declared in global mvebu soc.h file.

This one is a bit weird. There is a weak version defined in the board.c (same for the octeontx2_cn913x, possibly copied from similar vendor code). But the actual implementation that we need is in arch/arm/mach-mvebu/alleycat5/soc.c so my attempt to put a definition in soc.h was to make this less mysterious but I forgot to remove the weak definition.

The strong implementation is the thing that triggers the init for the mvebu_sar driver from the previous patch. So I think I need to unpick the SAR driver and figure out how to do it "properly" (addressing the issues you've pointed out). What I intend to do is send a v3 series without addressing this specific concern and then try and figure out how much (or how little) of the SAR code I really need.

Quoted 5 lines
Quoted 5 lines
arch/arm/mach-mvebu/include/mach/soc.h +1 -1
+#endif /* __ASSEMBLY__ */
 #endif /* _MVEBU_SOC_H */
--

2.37.3

#14 lore raw

Re: [PATCH v2 5/6] arm: mvebu: Support for 98DX25xx/98DX35xx SoC

Quoted 52 lines · On Wednesday 21 September 2022 15:54:52 Chris Packham wrote:
Quoted 51 lines · Pali Rohár
Quoted 32 lines · On Tuesday 20 September 2022 20:31:52 Chris Packham wrote:

Add support for the Allecat5/Alleycat5X SoC. These are L3 switches with an integrated CPU (referred to as the CnM block in Marvell's documentation). These have dual ARMv8.2 CPUs (Cortex-A55). This support has been ported from Marvell's SDK which is based on a much older version of U-Boot.

---

(no changes since v1)

 arch/arm/dts/ac5-98dx25xx.dtsi           | 292 +++++++++++++++++++++++
 arch/arm/dts/ac5-98dx35xx.dtsi           |  17 ++
 arch/arm/mach-mvebu/Kconfig              |   5 +
 arch/arm/mach-mvebu/Makefile             |   1 +
 arch/arm/mach-mvebu/alleycat5/Makefile   |   9 +
 arch/arm/mach-mvebu/alleycat5/clock.c    |  49 ++++
 arch/arm/mach-mvebu/alleycat5/cpu.c      | 129 ++++++++++
 arch/arm/mach-mvebu/alleycat5/soc.c      | 229 ++++++++++++++++++
 arch/arm/mach-mvebu/arm64-common.c       |  15 ++
 arch/arm/mach-mvebu/include/mach/clock.h |  11 +
 arch/arm/mach-mvebu/include/mach/cpu.h   |   4 +
 arch/arm/mach-mvebu/include/mach/soc.h   |   4 +
 12 files changed, 765 insertions(+)
 create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi
 create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile
 create mode 100644 arch/arm/mach-mvebu/alleycat5/clock.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c
 create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c
 create mode 100644 arch/arm/mach-mvebu/include/mach/clock.h

...

arch/arm/mach-mvebu/Kconfig config ARMADA_8K · line 55

Quoted 12 lines
arch/arm/mach-mvebu/Kconfig +4 -0
index a81b8e2b0d..400a308985 100644
@@ -49,6 +49,11 @@ config ARMADA_8K
      bool
      select ARM64
 
+config ALLEYCAT_5
+     bool
+     select ARM64
+     select HAVE_MVEBU_EFUSE

Hello! You are not adding any efuse implementation for AC5 platform, so selecting this symbol seems to be wrong.

Quoted 6 lines
Quoted 3 lines

Or are you reusing A3720 or A38x OTP implementation for AC5? This is not clear from the patch.

The original code did have some EFUSE stuff in it but I've dropped most of it out. I think this can go.

Ok! I know that there is Marvell **e**fuse API and U-Boot fuse API (without leading e). For A3720 Marvell U-Boot has only **e**fuse command and I have already ported it to U-Boot fuse and it is in mainline.

So I think that same is for AC5 and if you need it, you would have to port it to u-boot fuse API.

Quoted 47 lines
Quoted 32 lines
Quoted 4 lines
arch/arm/mach-mvebu/Kconfig +1 -0
+
 # Armada PLL frequency (used for NAND clock generation)
 config SYS_MVEBU_PLL_CLOCK
      int

...

Quoted 27 lines
arch/arm/mach-mvebu/arm64-common.c +5 -0
index 238edbe6ba..c9b6f16c63 100644
@@ -53,6 +53,8 @@ __weak int dram_init_banksize(void)
              return a8k_dram_init_banksize();
      else if (CONFIG_IS_ENABLED(ARMADA_3700))
              return a3700_dram_init_banksize();
+     else if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+             return alleycat5_dram_init_banksize();
      else
              return fdtdec_setup_memory_banksize();
 }
@@ -68,6 +70,9 @@ __weak int dram_init(void)
      if (CONFIG_IS_ENABLED(ARMADA_3700))
              return a3700_dram_init();
 
+     if (CONFIG_IS_ENABLED(ALLEYCAT_5))
+             return alleycat5_dram_init();
+
      if (fdtdec_setup_mem_size_base() != 0)
              return -EINVAL;
 
@@ -100,6 +105,16 @@ int arch_early_init_r(void)
                      break;
      }
 
Quoted 14 lines

arch/arm/mach-mvebu/arm64-common.c int arch_early_init_r(void) · line 116

Quoted 9 lines
arch/arm/mach-mvebu/arm64-common.c +9 -0
+     i = 0;
+     while (1) {
+             /* Call the pinctrl code via the PINCTRL uclass driver */
+             ret = uclass_get_device(UCLASS_PINCTRL, i++, &dev);
+
+             /* We're done, once no further CP110 device is found */
+             if (ret)
+                     break;
+     }

This code is unconditionally called for all 64-bit mvebu platforms, not only for new AC5. So if this is some fix, it should be in separate commit. If not then it should be marked AC5 specific and explained why.

Quoted 3 lines

Yeah I can't see why it's needed. The pinctrl device still gets probed without it so I suspect it's just old cruft left over from a time that wasn't the case.

Maybe because of this fix?
https://lore.kernel.org/u-boot/[email protected]/

Quoted 64 lines
Quoted 16 lines
Quoted 16 lines
arch/arm/mach-mvebu/arm64-common.c +1 -0
+
      /* Cause the SATA device to do its early init */
      uclass_first_device(UCLASS_AHCI, &dev);
 
arch/arm/mach-mvebu/include/mach/clock.h new file +6 -0
new file mode 100644
index 0000000000..93d965ad5a
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ */
+
+#ifndef _MVEBU_CLOCK_H_
Quoted 9 lines

arch/arm/mach-mvebu/include/mach/clock.h line 9

Quoted 3 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +3 -0
+#define _MVEBU_CLOCK_H_
+
+void soc_print_clock_info(void);

I'm not sure if this function needs to be exported. You are using it only in AC5 cpu.c file, in function print_cpuinfo(). So probably you can move soc_print_clock_info() into that file and then global mvebu clock.h would not be needed at all.

I'd need to fold all of the stuff in alleycat5/clock.c into alleycat5/cpu.c but it should be doable. Alternatively I could keep it separate but have a local .h file for this (and soc.h) to avoid polluting the mvebu generic files.

Quoted 25 lines
Quoted 25 lines
arch/arm/mach-mvebu/include/mach/clock.h new file +2 -0
+
+#endif /* _MVEBU_CLOCK_H_ */
arch/arm/mach-mvebu/include/mach/cpu.h +4 -0
index b127fce865..c17c2440f1 100644
@@ -174,6 +174,10 @@ int a3700_dram_init_banksize(void);
 /* A3700 PCIe regions fixer for device tree */
 int a3700_fdt_fix_pcie_regions(void *blob);
 
+/* Alleycat5 dram functions */
+int alleycat5_dram_init(void);
+int alleycat5_dram_init_banksize(void);
+
 /*
  * get_ref_clk
  *
arch/arm/mach-mvebu/include/mach/soc.h +0 -0
index 3b9618852c..b9312e37dc 100644
@@ -212,4 +212,8 @@
 #define CONFIG_SYS_TCLK              250000000       /* 250MHz */
 #endif
 
Quoted 7 lines

arch/arm/mach-mvebu/include/mach/soc.h line 217

Quoted 3 lines
arch/arm/mach-mvebu/include/mach/soc.h +3 -0
+#ifndef __ASSEMBLY__
+void soc_print_device_info(void);
+int soc_early_init_f(void);

These two functions are not available on existing mvebu platforms, so I think functions should not be declared in global mvebu soc.h file.

Quoted 6 lines

This one is a bit weird. There is a weak version defined in the board.c (same for the octeontx2_cn913x, possibly copied from similar vendor code). But the actual implementation that we need is in arch/arm/mach-mvebu/alleycat5/soc.c so my attempt to put a definition in soc.h was to make this less mysterious but I forgot to remove the weak definition.

Yea, A70x0/A80x0/CN913x U-Boot code is not cleaned yet, contains lot of unsystematic parts and its DTS is not compatible with Linux... So I'm not surprised and even you already wrote that original code is based on older u-boot version.

Quoted 12 lines

The strong implementation is the thing that triggers the init for the mvebu_sar driver from the previous patch. So I think I need to unpick the SAR driver and figure out how to do it "properly" (addressing the issues you've pointed out). What I intend to do is send a v3 series without addressing this specific concern and then try and figure out how much (or how little) of the SAR code I really need.

Quoted 5 lines
Quoted 5 lines
arch/arm/mach-mvebu/include/mach/soc.h +1 -1
+#endif /* __ASSEMBLY__ */
 #endif /* _MVEBU_SOC_H */
--

2.37.3

#15 lore raw

PATCH v2 6/6 arm: mvebu: Add RD-AC5X board

In reply to Chris Packham

The RD-AC5X-32G16HVG6HLG-A0 development board main components and features include:
* Main 12V/54V power supply
* 270 Gbps throughput packet processor on the main board
* DDR4:
* SR1: 2GB DDR4 2400MT/S(1GB x 2 pcs ) with ECC(1GB x 1 pcs)
* SR2: 4GB DDR4 2400MT/S(2GB x 2 pcs ) with ECC(2GB x 1 pcs)
* PCB co-layout with 4GB device to support 8GB (Dual CS) requirement
* 16GB eMMC (Samsung KLMAG1JETD-B041006)
* 16MB SPI NOR(GD25Q127C)
* 32 x 1000 Base-T interfaces
* 16 x 2500 Base-T interfaces
* SR1: 88E2540*4
* SR2: 88E2580*1+88E2540*2
* Six (6) x 25G Base-R SFP28 interfaces
* One (1) x RJ-45 console connector, interfacing to the on board UART
* One (1) x USB Type-A connector, interfacing to the USB 2.0 port (0)
* One (1) x USB Type-mini B connector, interfacing to the USB 2.0 port (1)
* One (1) x RJ-45 1G Base-T Management port, interfacing to the host port (shared with PCIe) Connected to 88E1512 Gigabit Ethernet Phy
* One (1) x Oculink port, interfacing to the PCIe port for external CPU connection
* POE 802.3AT support on Port 1 ~ Port 32, 802.3BT support on Port 33 ~ Port 48 (Microsemi PD69208T4, PD69208M or TI TPS2388,TPS23881 solution)
* POE total power budget 780W
* LED interfaces per network port/POE
* LED interfaces (common) showing system status
* PTP TC mode Supported (Reserved M.2 connector to support BC mode)

---

Changes in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitions

 arch/arm/dts/Makefile                      |   3 +-
 arch/arm/dts/ac5-98dx35xx-rd.dts           | 140 +++++++++++++++++++++
 arch/arm/mach-mvebu/Kconfig                |   9 +-
 board/Marvell/mvebu_alleycat-5/MAINTAINERS |   6 +
 board/Marvell/mvebu_alleycat-5/Makefile    |   3 +
 board/Marvell/mvebu_alleycat-5/board.c     |  35 ++++++
 configs/mvebu_ac5_rd_defconfig             |  88 +++++++++++++
 include/configs/mvebu_alleycat-5.h         |  71 +++++++++++
 8 files changed, 353 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts
 create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS
 create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile
 create mode 100644 board/Marvell/mvebu_alleycat-5/board.c
 create mode 100644 configs/mvebu_ac5_rd_defconfig
 create mode 100644 include/configs/mvebu_alleycat-5.h
arch/arm/dts/Makefile +2 -1
index 7330121dba..a334596ada 100644
@@ -274,7 +274,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	cn9132-db-A.dtb				\
 	cn9132-db-B.dtb				\
 	cn9130-crb-A.dtb			\
-	cn9130-crb-B.dtb
+	cn9130-crb-B.dtb			\
+	ac5-98dx35xx-rd.dtb
 endif
 
 dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
arch/arm/dts/ac5-98dx35xx-rd.dts new file +140 -0

140 lines not on this page · raw message

arch/arm/mach-mvebu/Kconfig +8 -1
index 400a308985..d27c45d58f 100644
@@ -98,7 +98,7 @@ config CUSTOMER_BOARD_SUPPORT
 	bool
 
 choice
-	prompt "Armada XP/375/38x/3700/7K/8K board select"
+	prompt "Armada XP/375/38x/3700/7K/8K/Alleycat-5 board select"
 	optional
 
 config TARGET_CLEARFOG
@@ -150,6 +150,10 @@ config TARGET_MVEBU_ARMADA_8K
 	select BOARD_LATE_INIT
 	imply SCSI
 
+config TARGET_MVEBU_ALLEYCAT5
+	bool "Support AlleyCat 5 platforms"
+	select ALLEYCAT_5
+
 config TARGET_OCTEONTX2_CN913x
 	bool "Support CN913x platforms"
 	select ARMADA_8K
@@ -258,6 +262,7 @@ config SYS_BOARD
 	default "x530" if TARGET_X530
 	default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
 	default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
+	default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_CONFIG_NAME
 	default "clearfog" if TARGET_CLEARFOG
@@ -278,6 +283,7 @@ config SYS_CONFIG_NAME
 	default "x530" if TARGET_X530
 	default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
 	default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
+	default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_VENDOR
 	default "Marvell" if TARGET_DB_MV784MP_GP
@@ -297,6 +303,7 @@ config SYS_VENDOR
 	default "gdsys" if TARGET_CONTROLCENTERDC
 	default "alliedtelesis" if TARGET_X530
 	default "mikrotik" if TARGET_CRS3XX_98DX3236
+	default "Marvell" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_SOC
 	default "mvebu"
board/Marvell/mvebu_alleycat-5/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..480c07c5f0
@@ -0,0 +1,6 @@
+RD-AC5X BOARD
+M:	Chris Packham <[email protected]>
+S:	Maintained
+F:	board/Marvell/mvebu_alleycat-5/
+F:	include/configs/mvebu_alleycat-5.h
+F:	configs/mvebu_ac5_rd_defconfig
board/Marvell/mvebu_alleycat-5/Makefile new file +3 -0
new file mode 100644
index 0000000000..29254b4d64
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier:	GPL-2.0+
+
+obj-y	:= board.o
board/Marvell/mvebu_alleycat-5/board.c new file +35 -0
new file mode 100644
index 0000000000..3303d3c2c9
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+__weak int soc_early_init_f(void)
+{
+	return 0;
+}
+
+int board_early_init_f(void)
+{
+	soc_early_init_f();
+
+	return 0;
+}
+
+int board_early_init_r(void)
+{
+	return 0;
+}
+
+int board_init(void)
+{
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+	return 0;
+}
+
+int board_late_init(void)
+{
+	return 0;
+}
configs/mvebu_ac5_rd_defconfig new file +88 -0

88 lines not on this page · raw message

include/configs/mvebu_alleycat-5.h new file +71 -0

71 lines not on this page · raw message

Signature · 1 line
2.37.3
#16 lore raw

Re: [PATCH v2 6/6] arm: mvebu: Add RD-AC5X board

Quoted 441 lines · On Tuesday 20 September 2022 20:31:53 Chris Packham wrote:

The RD-AC5X-32G16HVG6HLG-A0 development board main components and features include:
* Main 12V/54V power supply
* 270 Gbps throughput packet processor on the main board
* DDR4:
* SR1: 2GB DDR4 2400MT/S(1GB x 2 pcs ) with ECC(1GB x 1 pcs)
* SR2: 4GB DDR4 2400MT/S(2GB x 2 pcs ) with ECC(2GB x 1 pcs)
* PCB co-layout with 4GB device to support 8GB (Dual CS) requirement
* 16GB eMMC (Samsung KLMAG1JETD-B041006)
* 16MB SPI NOR(GD25Q127C)
* 32 x 1000 Base-T interfaces
* 16 x 2500 Base-T interfaces
* SR1: 88E2540*4
* SR2: 88E2580*1+88E2540*2
* Six (6) x 25G Base-R SFP28 interfaces
* One (1) x RJ-45 console connector, interfacing to the on board UART
* One (1) x USB Type-A connector, interfacing to the USB 2.0 port (0)
* One (1) x USB Type-mini B connector, interfacing to the USB 2.0 port (1)
* One (1) x RJ-45 1G Base-T Management port, interfacing to the host port (shared with PCIe) Connected to 88E1512 Gigabit Ethernet Phy
* One (1) x Oculink port, interfacing to the PCIe port for external CPU connection
* POE 802.3AT support on Port 1 ~ Port 32, 802.3BT support on Port 33 ~ Port 48 (Microsemi PD69208T4, PD69208M or TI TPS2388,TPS23881 solution)
* POE total power budget 780W
* LED interfaces per network port/POE
* LED interfaces (common) showing system status
* PTP TC mode Supported (Reserved M.2 connector to support BC mode)

---

Changes in v2:
- Use distro boot by default
- remove unnecessary SPI-NOR partitions

 arch/arm/dts/Makefile                      |   3 +-
 arch/arm/dts/ac5-98dx35xx-rd.dts           | 140 +++++++++++++++++++++
 arch/arm/mach-mvebu/Kconfig                |   9 +-
 board/Marvell/mvebu_alleycat-5/MAINTAINERS |   6 +
 board/Marvell/mvebu_alleycat-5/Makefile    |   3 +
 board/Marvell/mvebu_alleycat-5/board.c     |  35 ++++++
 configs/mvebu_ac5_rd_defconfig             |  88 +++++++++++++
 include/configs/mvebu_alleycat-5.h         |  71 +++++++++++
 8 files changed, 353 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts
 create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS
 create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile
 create mode 100644 board/Marvell/mvebu_alleycat-5/board.c
 create mode 100644 configs/mvebu_ac5_rd_defconfig
 create mode 100644 include/configs/mvebu_alleycat-5.h
arch/arm/dts/Makefile +2 -1
index 7330121dba..a334596ada 100644
@@ -274,7 +274,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
 	cn9132-db-A.dtb				\
 	cn9132-db-B.dtb				\
 	cn9130-crb-A.dtb			\
-	cn9130-crb-B.dtb
+	cn9130-crb-B.dtb			\
+	ac5-98dx35xx-rd.dtb
 endif
 
 dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb
arch/arm/dts/ac5-98dx35xx-rd.dts new file +140 -0
new file mode 100644
index 0000000000..3b747e722e
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For RD-AC5X.
+ *
+ * Copyright (C) 2021 Marvell
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+/*
+ * Device Tree file for Marvell Alleycat 5X development board
+ * This board file supports the B configuration of the board
+ */
+
+/dts-v1/;
+
+#include "ac5-98dx35xx.dtsi"
+
+/ {
+	model = "Marvell RD-AC5X Board";
+	compatible = "marvell,rd-ac5x", "marvell,ac5x", "marvell,ac5";
+
+	aliases {
+		serial0 = &uart0;
+		spiflash0 = &spiflash0;
+		gpio0 = &gpio0;
+		gpio1 = &gpio1;
+		ethernet0 = &eth0;
+		ethernet1 = &eth1;
+		spi0 = &spi0;
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		usb0 = &usb0;
+		usb1 = &usb1;
+		pinctrl0 = &pinctrl0;
+		sar-reg0 = "/config-space/sar-reg";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x2 0x00000000 0x0 0x40000000>;
+	};
+
+	usb1phy: usb-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	config-space {
+		sar-reg {
+			reg = <0x944F8204 0x1>;
+		};
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&mdio {
+	phy0: ethernet-phy@0 {
+	      reg = <0>;
+	};
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&eth0 {
+	status = "okay";
+	phy-handle = <&phy0>;
+};
+
+/* USB0 is a host USB */
+&usb0 {
+	status = "okay";
+};
+
+/* USB1 is a peripheral USB */
+&usb1 {
+	status = "okay";
+	phys = <&usb1phy>;
+	phy-names = "usb-phy";
+	dr_mode = "peripheral";
+};
+
+&spi0 {
+	status = "okay";
+
+	spiflash0: flash@0 {
+		compatible = "jedec,spi-nor";
+		spi-max-frequency = <50000000>;
+		spi-tx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
+		spi-rx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
+		reg = <0>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+	};
+};
+
+&pinctrl0 {
+	/*
+	 * MPP Bus:     MPP#     mode#
+	 * eMMC          [0-11]   0x1
+	 * SPI[0]        [12-17]  0x1
+	 * TSEN_INT      [18]     0x1
+	 * DEV_INIT      [19]     0x1
+	 * SPI[1]        [20-23]  0x3
+	 * UART[1]       [24-25]  0x3
+	 * I2C[0]        [26-27]  0x1
+	 * XSMI[0]       [28-29]  0x1 // SCH use SMI[0], reversed due to CPSS problem
+	 * SMI[1]        [30-31]  0x2 // SCH use XSMI[1], reversed due to CPSS problem
+	 * UART[0]       [32-33]  0x1
+	 * OOB_SMI       [34-35]  0x1
+	 * PTP_CLK0_OUT  [36]     0x1
+	 * PTP_PULSE_OUT [37]     0x1
+	 * RCVR_CLK_OUT  [38]     0x1
+	 * GPIO(in/out)  [39]     0x0
+	 * GPIO(in/out)  [40]     0x0
+	 * PTP_REF_CLK   [41]     0x1
+	 * PTP_CLK0      [42]     0x1
+	 * LED0_CLK      [43]     0x1
+	 * LED0_STB      [44]     0x1
+	 * LED0_DATA     [45]     0x1
+	 */
+	/*	     0    1    2    3    4    5    6    7    8    9 */
+	pin-func = < 1    1    1    1    1    1    1    1    1    1
+		     1    1    1    1    1    1    1    1    1    1
+		     3    3    3    3    3    3    1    1    1    1
+		     2    2    1    1    1    1    1    1    1    0
+		     0    1    1    1    1    1    >;
+};
arch/arm/mach-mvebu/Kconfig +8 -1
index 400a308985..d27c45d58f 100644
@@ -98,7 +98,7 @@ config CUSTOMER_BOARD_SUPPORT
 	bool
 
 choice
-	prompt "Armada XP/375/38x/3700/7K/8K board select"
+	prompt "Armada XP/375/38x/3700/7K/8K/Alleycat-5 board select"
 	optional
 
 config TARGET_CLEARFOG
@@ -150,6 +150,10 @@ config TARGET_MVEBU_ARMADA_8K
 	select BOARD_LATE_INIT
 	imply SCSI
 
+config TARGET_MVEBU_ALLEYCAT5
+	bool "Support AlleyCat 5 platforms"
+	select ALLEYCAT_5
+
 config TARGET_OCTEONTX2_CN913x
 	bool "Support CN913x platforms"
 	select ARMADA_8K
@@ -258,6 +262,7 @@ config SYS_BOARD
 	default "x530" if TARGET_X530
 	default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
 	default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
+	default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_CONFIG_NAME
 	default "clearfog" if TARGET_CLEARFOG
@@ -278,6 +283,7 @@ config SYS_CONFIG_NAME
 	default "x530" if TARGET_X530
 	default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG
 	default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236
+	default "mvebu_alleycat-5" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_VENDOR
 	default "Marvell" if TARGET_DB_MV784MP_GP
@@ -297,6 +303,7 @@ config SYS_VENDOR
 	default "gdsys" if TARGET_CONTROLCENTERDC
 	default "alliedtelesis" if TARGET_X530
 	default "mikrotik" if TARGET_CRS3XX_98DX3236
+	default "Marvell" if TARGET_MVEBU_ALLEYCAT5
 
 config SYS_SOC
 	default "mvebu"
board/Marvell/mvebu_alleycat-5/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..480c07c5f0
@@ -0,0 +1,6 @@
+RD-AC5X BOARD
+M:	Chris Packham <[email protected]>
+S:	Maintained
+F:	board/Marvell/mvebu_alleycat-5/
+F:	include/configs/mvebu_alleycat-5.h
+F:	configs/mvebu_ac5_rd_defconfig
board/Marvell/mvebu_alleycat-5/Makefile new file +3 -0
new file mode 100644
index 0000000000..29254b4d64
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier:	GPL-2.0+
+
+obj-y	:= board.o
board/Marvell/mvebu_alleycat-5/board.c new file +35 -0
new file mode 100644
index 0000000000..3303d3c2c9
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <common.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+__weak int soc_early_init_f(void)
+{
+	return 0;
+}
+
+int board_early_init_f(void)
+{
+	soc_early_init_f();
+
+	return 0;
+}
+
+int board_early_init_r(void)
+{
+	return 0;
+}
+
+int board_init(void)
+{
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+	return 0;
+}
+
+int board_late_init(void)
+{
+	return 0;
+}
configs/mvebu_ac5_rd_defconfig new file +88 -0
new file mode 100644
index 0000000000..b87d337e26
@@ -0,0 +1,88 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_SYS_TEXT_BASE=0x200000000
+CONFIG_SYS_MALLOC_LEN=0x900000
+CONFIG_TARGET_MVEBU_ALLEYCAT5=y
+CONFIG_ENV_SIZE=0x10000
+CONFIG_ENV_OFFSET=0x400000
+CONFIG_ENV_SECT_SIZE=0x10000
+CONFIG_DM_GPIO=y
+CONFIG_DEBUG_UART_BASE=0x7f012000
+CONFIG_DEBUG_UART_CLOCK=325000000
+CONFIG_SYS_LOAD_ADDR=0x202000000
+CONFIG_DEBUG_UART=y
+CONFIG_SYS_MEMTEST_START=0x200800000
+CONFIG_SYS_MEMTEST_END=0x200ffffff
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x200FF0000
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_FIT=y
+CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_ARCH_EARLY_INIT_R=y
+CONFIG_ARCH_MISC_INIT=y
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
+CONFIG_CMD_MEMTEST=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_MVEBU_BUBT=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_UBI=y
+CONFIG_MAC_PARTITION=y
+CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_CLK=y
+CONFIG_CLK_MVEBU=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_MVTWSI=y
+CONFIG_MISC=y
+CONFIG_MVEBU_SAR=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_MTD=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_GIGE=y
+CONFIG_E1000=y
+CONFIG_MVNETA=y
+CONFIG_MVMDIO=y
+CONFIG_PCI=y
+CONFIG_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_ARMADA_8K=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_RTC=y
+CONFIG_DM_SCSI=y
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_SYS_NS16550=y
+CONFIG_MVEBU_A3700_SPI=y
+CONFIG_DM_THERMAL=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
include/configs/mvebu_alleycat-5.h new file +21 -0
new file mode 100644
index 0000000000..a1a76ba4e1
@@ -0,0 +1,71 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2018 Marvell International Ltd
+ */
+
+#ifndef _CONFIG_MVEBU_ALLEYCAY_5_H
+#define _CONFIG_MVEBU_ALLEYCAY_5_H
+
+#include <asm/arch/soc.h>
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_DISPLAY_BOARDINFO_LATE
+
+/* additions for new ARM relocation support */
+#define CONFIG_SYS_SDRAM_BASE   0x200000000
+
+/* auto boot */
+#define CONFIG_PREBOOT
+

include/configs/mvebu_alleycat-5.h line 31

Quoted 10 lines
include/configs/mvebu_alleycat-5.h new file +10 -0
+#define CONFIG_BAUDRATE         115200
+#define CONFIG_SYS_BAUDRATE_TABLE   { 9600, 19200, 38400, 57600, \
+				      115200, 230400, 460800, 921600 }
+
+/* Default Env vars */
+#define CONFIG_IPADDR           0.0.0.0 /* In order to cause an error */
+#define CONFIG_SERVERIP         0.0.0.0 /* In order to cause an error */
+#define CONFIG_NETMASK          255.255.255.0
+#define CONFIG_GATEWAYIP        0.0.0.0
+#define CONFIG_ETHPRIME         "eth0"

Hello! This was already migrated to Kconfig.

include/configs/mvebu_alleycat-5.h line 36

Quoted 5 lines
include/configs/mvebu_alleycat-5.h new file +5 -0
+#define CONFIG_ROOTPATH                 "/srv/nfs/" /* Default Dir for NFS */
+#define CONFIG_ENV_OVERWRITE        /* ethaddr can be reprogrammed */
+
+#define BOOT_TARGET_DEVICES(func) \
+	func(UBIFS, ubifs, 0, UBI, boot) \

This is for sure wrong. You have not defined any MTD partition with label UBI. So it would not work.

include/configs/mvebu_alleycat-5.h line 49

Quoted 13 lines
include/configs/mvebu_alleycat-5.h new file +13 -0
+	func(MMC, mmc, 0) \
+	func(USB, usb, 0) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS   \
+	BOOTENV \
+	"kernel_addr_r=0x202000000\0" \
+	"fdt_addr_r=0x201000000\0"    \
+	"ramdisk_addr_r=0x206000000\0"    \
+	"fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+	"netdev=eth0\0"         \

You should set CONFIG_ETHPRIME in Kconfig. $netdev is already ignored by U-Boot.

And if you have only one eth controller then setting CONFIG_ETHPRIME is probably not needed at all.

include/configs/mvebu_alleycat-5.h line 51

Quoted 2 lines
include/configs/mvebu_alleycat-5.h new file +2 -0
+	"ethaddr=00:51:82:11:22:00\0"   \
+	"eth1addr=00:51:82:11:22:01\0"  \

Hardcoding static fixed MAC addresses into ENV looks also bad.

Quoted 23 lines
include/configs/mvebu_alleycat-5.h new file +20 -0
+	"console=console=ttyS0,115200 earlycon=uart8250,mmio32,0xf0512000\0"\
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_SYS_TCLK     325000000
+
+/* tbd #define CONFIG_BOARD_EARLY_INIT_R */
+
+#define CONFIG_SYS_MAX_NAND_DEVICE  1
+#define CONFIG_SYS_NAND_MAX_CHIPS   1
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
+
+#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
+
+/* MTD support */
+#define CONFIG_MTD_DEVICE
+
+#endif /* _CONFIG_MVEBU_ALLEYCAY_5_H */
Signature · 1 line
2.37.3