On 21.08.2018 12:22, Marek Behún wrote:

If PCIe Mox module is connected we want to have PCIe node enabled in U-Boot's device tree.

Signed-off-by: Marek Behun marek.behun@nic.cz

arch/arm/dts/armada-3720-turris-mox.dts | 7 +++ board/CZ.NIC/turris_mox/turris_mox.c | 82 +++++++++++++++++++++++++++++++++ configs/turris_mox_defconfig | 1 + 3 files changed, 90 insertions(+)

diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index bef100afce..a817f20920 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -130,3 +130,10 @@ vbus-supply = <&reg_usb3_vbus>; status = "okay"; };

+&pcie0 {

• pinctrl-names = "default";
• pinctrl-0 = <&pcie_pins>;
• reset-gpio = <&gpiosb 3 GPIO_ACTIVE_HIGH>;
• status = "disabled";

+}; diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index b6a0ca4626..c4622a49c2 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -4,17 +4,99 @@ */

#include <common.h> +#include <asm/io.h> #include <dm.h> #include <clk.h> #include <spi.h> #include <linux/string.h> +#include <linux/libfdt.h> +#include <fdt_support.h>

#ifdef CONFIG_WDT_ARMADA_37XX #include <wdt.h> #endif

+#define MAX_MOX_MODULES 10

+#define MOX_MODULE_SFP 0x1 +#define MOX_MODULE_PCI 0x2 +#define MOX_MODULE_TOPAZ 0x3 +#define MOX_MODULE_PERIDOT 0x4 +#define MOX_MODULE_USB3 0x5 +#define MOX_MODULE_PASSPCI 0x6

+#define ARMADA_37XX_NB_GPIO_SEL 0xd0013830 +#define ARMADA_37XX_SPI_CTRL 0xd0010600 +#define ARMADA_37XX_SPI_CFG 0xd0010604 +#define ARMADA_37XX_SPI_DOUT 0xd0010608 +#define ARMADA_37XX_SPI_DIN 0xd001060c

+#define PCIE_PATH "/soc/pcie@d0070000"

• DECLARE_GLOBAL_DATA_PTR;

+#if defined(CONFIG_OF_BOARD_FIXUP) +int board_fix_fdt(void *blob) +{

• u8 topology[MAX_MOX_MODULES];
• int i, size, node;
• bool enable;
• /*

• * SPI driver is not loaded in driver model yet, but we have to find out
  

• * if pcie should be enabled in U-Boot's device tree. Therefore we have
  

• * to read SPI by reading/writing SPI registers directly
  

• */
  

• writel(0x563fa, ARMADA_37XX_NB_GPIO_SEL);
• writel(0x10df, ARMADA_37XX_SPI_CFG);
• writel(0x2005b, ARMADA_37XX_SPI_CTRL);
• while (!(readl(ARMADA_37XX_SPI_CTRL) & 0x2))

• udelay(1);
  

• for (i = 0; i < MAX_MOX_MODULES; ++i) {

• writel(0x0, ARMADA_37XX_SPI_DOUT);
  

• while (!(readl(ARMADA_37XX_SPI_CTRL) & 0x2))
  

• 	udelay(1);
  

• topology[i] = readl(ARMADA_37XX_SPI_DIN) & 0xff;
  

• if (topology[i] == 0xff)
  

• 	break;
  

• topology[i] &= 0xf;
  

• }
• size = i;
• writel(0x5b, ARMADA_37XX_SPI_CTRL);
• if (size > 1 && (topology[1] == MOX_MODULE_PCI ||

• 	 topology[1] == MOX_MODULE_USB3 ||
  

• 	 topology[1] == MOX_MODULE_PASSPCI))
  

• enable = true;
  

• else

• enable = false;
  

• node = fdt_path_offset(blob, PCIE_PATH);
• if (node < 0) {

• printf("Cannot find PCIe node in U-Boot's device tree!\n");
  

• return 0;
  

• }
• if (fdt_setprop_string(blob, node, "status",

• 	       enable ? "okay" : "disabled") < 0) {
  

• printf("Cannot %s PCIe in U-Boot's device tree!\n",
  

•        enable ? "enable" : "disable");
  

• return 0;
  

• }
• return 0;

+} +#endif

• #ifdef CONFIG_WDT_ARMADA_37XX static struct udevice *watchdog_dev;

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index de9aedc764..47ab914ce9 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_EARLY_INIT_R=y +CONFIG_OF_BOARD_FIXUP=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y

Applied to u-boot-marvell/master

Thanks, Stefan

Hi Marek,

On 19.09.18 14:22, Stefan Roese wrote:

On 17.08.2018 12:58, Marek Behún wrote:

...

Restructure the board initialization source. Remove the module_topology environment variable since it won't be needed.

Signed-off-by: Marek Behun marek.behun@nic.cz

board/CZ.NIC/turris_mox/turris_mox.c | 153 ++++++++++++++++++++++++----------- 1 file changed, 106 insertions(+), 47 deletions(-)

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 42f55b7915..4a3e78c5d6 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -33,6 +33,12 @@

#define PCIE_PATH "/soc/pcie@d0070000"

+typedef enum {

• MOX_UNKNOWN,
• MOX_EMMC,
• MOX_SD

+} mox_version_t;

• DECLARE_GLOBAL_DATA_PTR;

  #if defined(CONFIG_OF_BOARD_FIXUP)

@@ -133,17 +139,15 @@ int board_init(void) return 0; }

-int last_stage_init(void) +static int mox_do_spi(u8 *in, u8 *out, size_t size) { struct spi_slave *slave; struct udevice *dev;

• u8 din[10], dout[10];
• int ret, i;
• size_t len = 0;
• char module_topology[128];

• int ret;

• ret = spi_get_bus_and_cs(0, 1, 20000000, SPI_CPHA, "spi_generic_drv",

• 		 "mox-modules@1", &dev, &slave);
  

• ret = spi_get_bus_and_cs(0, 1, 1000000, SPI_CPHA | SPI_CPOL,

• 		 "spi_generic_drv", "moxtet@1", &dev,
  

• 		 &slave);
  

  if (ret) goto fail;

@@ -151,57 +155,112 @@ int last_stage_init(void) if (ret) goto fail_free;

• memset(din, 0, 10);
• memset(dout, 0, 10);

• ret = spi_xfer(slave, size * 8, out, in, SPI_XFER_ONCE);
• spi_release_bus(slave);

+fail_free:

• spi_free_slave(slave);

+fail:

• return ret;

+}

• ret = spi_xfer(slave, 80, dout, din, SPI_XFER_ONCE);

+static int mox_get_topology(const u8 **ptopology, int *psize,

• 	    mox_version_t *pversion)
  

+{

• static mox_version_t mox_version;
• static u8 topology[MAX_MOX_MODULES - 1];
• static int size;
• u8 din[MAX_MOX_MODULES], dout[MAX_MOX_MODULES];
• int ret, i;
• if (size) {

• if (ptopology)
  

• 	*ptopology = topology;
  

• if (psize)
  

• 	*psize = size;
  

• if (pversion)
  

• 	*pversion = mox_version;
  

• return 0;
  

• }
• memset(din, 0, MAX_MOX_MODULES);
• memset(dout, 0, MAX_MOX_MODULES);
• ret = mox_do_spi(din, dout, MAX_MOX_MODULES); if (ret)

• goto fail_release;
  

• return ret;
  

• switch (din[0]) {
• case 0x00:

• mox_version = MOX_EMMC;
  

• break;
  

• case 0x10:

• mox_version = MOX_SD;
  

• break;
  

• case 0xff:

• mox_version = MOX_UNKNOWN;
  

• break;
  

• default:

• return -ENODEV;
  

• }
• for (i = 1; i < MAX_MOX_MODULES && din[i] != 0xff; ++i)

• topology[i - 1] = din[i] & 0xf;
  

• size = i - 1;
• if (ptopology)

• *ptopology = topology;
  

• if (psize)

• *psize = size;
  

• if (pversion)

• *pversion = mox_version;
  

• return 0;

+}

• if (din[0] != 0x00 && din[0] != 0xff)

• goto fail_release;
  

+int last_stage_init(void) +{

• int ret, i;

• const u8 *topology;

• int module_count;

• mox_version_t version;

• ret = mox_get_topology(&topology, &module_count, &version);

• if (ret) {

• printf("Cannot read module topology!\n");
  

• return 0;
  

• }

• printf("Found Turris Mox %s version\n", version == MOX_SD ? "SD" :

• 				version == MOX_EMMC ? "eMMC" :
  

• 				"unknown");
  

  printf("Module Topology:\n");

• for (i = 1; i < 10 && din[i] != 0xff; ++i) {

• u8 mid = din[i] & 0xf;
  

• size_t mlen;
  

• const char *mname = "";
  

• switch (mid) {
  

• case 0x1:
  

• 	mname = "sfp-";
  

• 	printf("% 4i: SFP Module\n", i);
  

• for (i = 0; i < module_count; ++i) {

• switch (topology[i]) {
  

• case MOX_MODULE_SFP:
  

• 	printf("% 4i: SFP Module\n", i + 1);
  

• 	break;
  

• case MOX_MODULE_PCI:
  

• 	printf("% 4i: Mini-PCIe Module\n", i + 1);
  

• 	break;
  

• case MOX_MODULE_TOPAZ:
  

• 	printf("% 4i: Topaz Switch Module (4-port)\n", i + 1);
  	break;
  

• case 0x2:
  

• 	mname = "pci-";
  

• 	printf("% 4i: Mini-PCIe Module\n", i);
  

• case MOX_MODULE_PERIDOT:
  

• 	printf("% 4i: Peridot Switch Module (8-port)\n", i + 1);
  	break;
  

• case 0x3:
  

• 	mname = "topaz-";
  

• 	printf("% 4i: Topaz Switch Module\n", i);
  

• case MOX_MODULE_USB3:
  

• 	printf("% 4i: USB 3.0 Module (4 ports)\n", i + 1);
  

• 	break;
  

• case MOX_MODULE_PASSPCI:
  

• 	printf("% 4i: Passthrough Mini-PCIe Module\n", i + 1);
  	break;
  default:
  

• 	printf("% 4i: unknown (ID %i)\n", i, mid);
  

• }
  

• mlen = strlen(mname);
  

• if (len + mlen < sizeof(module_topology)) {
  

• 	strcpy(module_topology + len, mname);
  

• 	len += mlen;
  

• 	printf("% 4i: unknown (ID %i)\n", i + 1, topology[i]);
  }
  

  }

• printf("\n");

• module_topology[len > 0 ? len - 1 : 0] = '\0';

• env_set("module_topology", module_topology);

• printf("\n");

-fail_release:

• spi_release_bus(slave);

-fail_free:

• spi_free_slave(slave);

-fail:

• if (ret)

• printf("Cannot read module topology!\n");
  

• return ret;

• return 0; }

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Any updates on this? Please rebase the still missing patches from this series on top of latest mainline.

Thanks, Stefan

On 17.08.2018 12:58, Marek Behún wrote:

When SFP module is connected directly to CPU module we want the SGMII lane speed at 1.25 Gbps.

Signed-off-by: Marek Behun marek.behun@nic.cz

board/CZ.NIC/turris_mox/turris_mox.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 4a3e78c5d6..224179434b 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -8,6 +8,7 @@ #include <dm.h> #include <clk.h> #include <spi.h> +#include <mvebu/comphy.h> #include <linux/string.h> #include <linux/libfdt.h> #include <fdt_support.h> @@ -218,6 +219,38 @@ static int mox_get_topology(const u8 **ptopology, int *psize, return 0; }

+int comphy_update_map(struct comphy_map *serdes_map, int count) +{

• int ret, i, size, sfpindex = -1, swindex = -1;
• const u8 *topology;
• ret = mox_get_topology(&topology, &size, NULL);
• if (ret)

• return ret;
  

• for (i = 0; i < size; ++i) {

• if (topology[i] == MOX_MODULE_SFP && sfpindex == -1)
  

• 	sfpindex = i;
  

• else if ((topology[i] == MOX_MODULE_TOPAZ ||
  

• 	  topology[i] == MOX_MODULE_PERIDOT) &&
  

• 	 swindex == -1)
  

• 	swindex = i;
  

• }
• if (sfpindex >= 0 && swindex >= 0) {

• if (sfpindex < swindex)
  

• 	serdes_map[0].speed = PHY_SPEED_1_25G;
  

• else
  

• 	serdes_map[0].speed = PHY_SPEED_3_125G;
  

• } else if (sfpindex >= 0) {

• serdes_map[0].speed = PHY_SPEED_1_25G;
  

• } else if (swindex >= 0) {

• serdes_map[0].speed = PHY_SPEED_3_125G;
  

• }
• return 0;

+}

• int last_stage_init(void) { int ret, i;

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks, Stefan

On 17.08.2018 12:58, Marek Behún wrote:

Check if Mox modules are connected in supported mode, then configure the MDIO addresses of switch modules.

Signed-off-by: Marek Behun marek.behun@nic.cz

arch/arm/dts/armada-3720-turris-mox.dts | 11 ++ board/CZ.NIC/turris_mox/turris_mox.c | 235 +++++++++++++++++++++++++++++++- 2 files changed, 245 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index a817f20920..05904387d2 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -114,6 +114,17 @@ spi-max-frequency = <20000000>; m25p,fast-read; };

• moxtet@1 {

• #address-cells = <1>;
  

• #size-cells = <0>;
  

• compatible = "cznic,moxtet";
  

• reg = <1>;
  

• devrst-gpio = <&gpiosb 2 GPIO_ACTIVE_LOW>;
  

• spi-max-frequency = <1000000>;
  

• spi-cpol;
  

• spi-cpha;
  

• }; };

  &uart0 {

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 224179434b..21a3e63864 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -4,11 +4,13 @@ */

#include <common.h> +#include <asm/gpio.h> #include <asm/io.h> #include <dm.h> #include <clk.h> #include <spi.h> #include <mvebu/comphy.h> +#include <miiphy.h> #include <linux/string.h> #include <linux/libfdt.h> #include <fdt_support.h> @@ -251,12 +253,131 @@ int comphy_update_map(struct comphy_map *serdes_map, int count) return 0; }

+#define SW_SMI_CMD_R(d, r) (0x9800 | (((d) & 0x1f) << 5) | ((r) & 0x1f)) +#define SW_SMI_CMD_W(d, r) (0x9400 | (((d) & 0x1f) << 5) | ((r) & 0x1f))

+static int sw_multi_read(struct mii_dev *bus, int sw, int dev, int reg) +{

• bus->write(bus, sw, 0, 0, SW_SMI_CMD_R(dev, reg));
• mdelay(5);
• return bus->read(bus, sw, 0, 1);

+}

+static void sw_multi_write(struct mii_dev *bus, int sw, int dev, int reg,

• 	   u16 val)
  

+{

• bus->write(bus, sw, 0, 1, val);
• bus->write(bus, sw, 0, 0, SW_SMI_CMD_W(dev, reg));
• mdelay(5);

+}

+static int sw_scratch_read(struct mii_dev *bus, int sw, int reg) +{

• sw_multi_write(bus, sw, 0x1c, 0x1a, (reg & 0x7f) << 8);
• return sw_multi_read(bus, sw, 0x1c, 0x1a) & 0xff;

+}

+static void sw_led_write(struct mii_dev *bus, int sw, int port, int reg,

• 	 u16 val)
  

+{

• sw_multi_write(bus, sw, port, 0x16, 0x8000 | ((reg & 7) << 12)

• 			    | (val & 0x7ff));
  

+}

+static void sw_blink_leds(struct mii_dev *bus, int peridot, int topaz) +{

• int i, p;
• struct {

• int port;
  

• u16 val;
  

• int wait;
  

• } regs[] = {

• { 2, 0xef, 1 }, { 2, 0xfe, 1 }, { 2, 0x33, 0 },
  

• { 4, 0xef, 1 }, { 4, 0xfe, 1 }, { 4, 0x33, 0 },
  

• { 3, 0xfe, 1 }, { 3, 0xef, 1 }, { 3, 0x33, 0 },
  

• { 1, 0xfe, 1 }, { 1, 0xef, 1 }, { 1, 0x33, 0 }
  

• };
• for (i = 0; i < 12; ++i) {

• for (p = 0; p < peridot; ++p) {
  

• 	sw_led_write(bus, 0x10 + p, regs[i].port, 0,
  

• 		     regs[i].val);
  

• 	sw_led_write(bus, 0x10 + p, regs[i].port + 4, 0,
  

• 		     regs[i].val);
  

• }
  

• if (topaz) {
  

• 	sw_led_write(bus, 0x2, 0x10 + regs[i].port, 0,
  

• 		     regs[i].val);
  

• }
  

• if (regs[i].wait)
  

• 	mdelay(75);
  

• }

+}

+static void check_switch_address(struct mii_dev *bus, int addr) +{

• if (sw_scratch_read(bus, addr, 0x70) >> 3 != addr)

• printf("Check of switch MDIO address failed for 0x%02x\n",
  

•        addr);
  

+}

+static int sfp, pci, topaz, peridot, usb, passpci; +static int sfp_pos, peridot_pos[3]; +static int module_count;

+static int configure_peridots(void) +{

• int node, i, ret;
• struct gpio_desc gpio = {};
• u8 dout[MAX_MOX_MODULES];
• node = fdt_node_offset_by_compatible(gd->fdt_blob, 0, "cznic,moxtet");
• if (node < 0) {

• printf("Cannot find Moxtet bus device node!\n");
  

• return -1;
  

• }
• gpio_request_by_name_nodev(offset_to_ofnode(node), "devrst-gpio", 0,

• 		   &gpio, GPIOD_IS_OUT);
  

• if (!dm_gpio_is_valid(&gpio)) {

• printf("Cannot find reset GPIO for Moxtet bus!\n");
  

• return -1;
  

• }
• memset(dout, 0, MAX_MOX_MODULES);
• /* set addresses of Peridot modules */
• for (i = 0; i < peridot; ++i)

• dout[module_count - peridot_pos[i]] = (~i) & 3;
  

• /*

• * if there is a SFP module connected to the last Peridot module, set
  

• * the P10_SMODE to 1 for the Peridot module
  

• */
  

• if (sfp)

• dout[module_count - peridot_pos[i - 1]] |= 1 << 3;
  

• dm_gpio_set_value(&gpio, 1);
• mdelay(10);
• ret = mox_do_spi(NULL, dout, module_count + 1);
• mdelay(10);
• dm_gpio_set_value(&gpio, 0);
• mdelay(50);
• return ret;

+}

• int last_stage_init(void) { int ret, i; const u8 *topology;

• int module_count; mox_version_t version;

• struct mii_dev *bus;

  ret = mox_get_topology(&topology, &module_count, &version); if (ret) {

@@ -293,6 +414,118 @@ int last_stage_init(void) } }

• /* now check if modules are connected in supported mode */

• for (i = 0; i < module_count; ++i) {

• switch (topology[i]) {
  

• case MOX_MODULE_SFP:
  

• 	if (sfp) {
  

• 		printf("Error: Only one SFP module is "
  

• 		       "supported!\n");
  

• 	} else if (topaz) {
  

• 		printf("Error: SFP module cannot be connected "
  

• 		       "after Topaz Switch module!\n");
  

• 	} else {
  

• 		sfp_pos = i;
  

• 		++sfp;
  

• 	}
  

• 	break;
  

• case MOX_MODULE_PCI:
  

• 	if (pci) {
  

• 		printf("Error: Only one Mini-PCIe module is "
  

• 		       "supported!\n");
  

• 	} else if (usb) {
  

• 		printf("Error: Mini-PCIe module cannot come "
  

• 		       "after USB 3.0 module!\n");
  

• 	} else if (i && (i != 1 || !passpci)) {
  

• 		printf("Error: Mini-PCIe module should be the "
  

• 		       "first connected module or come right "
  

• 		       "after Passthrough Mini-PCIe module!\n");
  

• 	} else {
  

• 		++pci;
  

• 	}
  

• 	break;
  

• case MOX_MODULE_TOPAZ:
  

• 	if (topaz) {
  

• 		printf("Error: Only one Topaz module is "
  

• 		       "supported!\n");
  

• 	} else if (peridot >= 3) {
  

• 		printf("Error: At most two Peridot modules "
  

• 		       "can come before Topaz module!\n");
  

• 	} else {
  

• 		++topaz;
  

• 	}
  

• 	break;
  

• case MOX_MODULE_PERIDOT:
  

• 	if (sfp || topaz) {
  

• 		printf("Error: Peridot module must come before "
  

• 		       "SFP or Topaz module!\n");
  

• 	} else if (peridot >= 3) {
  

• 		printf("Error: At most three Peridot modules "
  

• 		       "are supported!\n");
  

• 	} else {
  

• 		peridot_pos[peridot] = i;
  

• 		++peridot;
  

• 	}
  

• 	break;
  

• case MOX_MODULE_USB3:
  

• 	if (pci) {
  

• 		printf("Error: USB 3.0 module cannot come "
  

• 		       "after Mini-PCIe module!\n");
  

• 	} else if (usb) {
  

• 		printf("Error: Only one USB 3.0 module is "
  

• 		       "supported!\n");
  

• 	} else if (i && (i != 1 || !passpci)) {
  

• 		printf("Error: USB 3.0 module should be the "
  

• 		       "first connected module or come right "
  

• 		       "after Passthrough Mini-PCIe module!\n");
  

• 	} else {
  

• 		++usb;
  

• 	}
  

• 	break;
  

• case MOX_MODULE_PASSPCI:
  

• 	if (passpci) {
  

• 		printf("Error: Only one Passthrough Mini-PCIe "
  

• 		       "module is supported!\n");
  

• 	} else if (i != 0) {
  

• 		printf("Error: Passthrough Mini-PCIe module "
  

• 		       "should be the first connected "
  

• 		       "module!\n");
  

• 	} else {
  

• 		++passpci;
  

• 	}
  

• }
  

• }

• /* now configure modules */

• if (peridot > 0) {

• if (configure_peridots() < 0) {
  

• 	printf("Cannot configure Peridot modules!\n");
  

• 	peridot = 0;
  

• }
  

• }

• if (peridot || topaz) {

• /*
  

•  * now check if the addresses are set by reading Scratch & Misc
  

•  * register 0x70 of Peridot (and potentially Topaz) modules
  

•  */
  

• bus = miiphy_get_dev_by_name("neta@30000");
  

• if (!bus) {
  

• 	printf("Cannot get MDIO bus device!\n");
  

• } else {
  

• 	for (i = 0; i < peridot; ++i)
  

• 		check_switch_address(bus, 0x10 + i);
  

• 	if (topaz)
  

• 		check_switch_address(bus, 0x2);
  

• 	sw_blink_leds(bus, peridot, topaz);
  

• }
  

• }

• printf("\n");

  return 0;

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks, Stefan

On 17.08.2018 12:58, Marek Behún wrote:

Patch Linux's device tree according to which Mox modules are connected. Linux's device tree is supposed to have some nodes already preprogrammed. If user wants to use different device tree, they should disable CONFIG_OF_BOARD_SETUP in U-Boot's config, so that the boot command does not fail.

Signed-off-by: Marek Behun marek.behun@nic.cz

board/CZ.NIC/turris_mox/turris_mox.c | 222 +++++++++++++++++++++++++++++++++++ configs/turris_mox_defconfig | 1 + 2 files changed, 223 insertions(+)

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 21a3e63864..3361579d7c 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -3,6 +3,7 @@

• Copyright (C) 2018 Marek Behun marek.behun@nic.cz

*/

+#include <stdarg.h> #include <common.h> #include <asm/gpio.h> #include <asm/io.h> @@ -34,7 +35,11 @@ #define ARMADA_37XX_SPI_DOUT 0xd0010608 #define ARMADA_37XX_SPI_DIN 0xd001060c

+#define ETH1_PATH "/soc/internal-regs@d0000000/ethernet@40000" +#define MDIO_PATH "/soc/internal-regs@d0000000/mdio@32004" +#define MOXTET_SFP_PATH "/soc/internal-regs@d0000000/spi@10600/moxtet@1/moxtet-sfp@0" #define PCIE_PATH "/soc/pcie@d0070000" +#define SFP_PATH "/sfp"

typedef enum { MOX_UNKNOWN, @@ -530,3 +535,220 @@ int last_stage_init(void)

return 0; }

+#if defined(CONFIG_OF_BOARD_SETUP)

+static int vnode_by_path(void *blob, const char *fmt, va_list ap) +{

• char path[128];
• vsprintf(path, fmt, ap);
• return fdt_path_offset(blob, path);

+}

+static int node_by_path(void *blob, const char *fmt, ...) +{

• va_list ap;
• int res;
• va_start(ap, fmt);
• res = vnode_by_path(blob, fmt, ap);
• va_end(ap);
• return res;

+}

+static int phandle_by_path(void *blob, const char *fmt, ...) +{

• va_list ap;
• int node, phandle, res;
• va_start(ap, fmt);
• node = vnode_by_path(blob, fmt, ap);
• va_end(ap);
• if (node < 0)

• return node;
  

• phandle = fdt_get_phandle(blob, node);
• if (phandle > 0)

• return phandle;
  

• phandle = fdt_get_max_phandle(blob);
• if (phandle < 0)

• return phandle;
  

• phandle += 1;
• res = fdt_setprop_u32(blob, node, "linux,phandle", phandle);
• if (res < 0)

• return res;
  

• res = fdt_setprop_u32(blob, node, "phandle", phandle);
• if (res < 0)

• return res;
  

• return phandle;

+}

+static int enable_by_path(void *blob, const char *fmt, ...) +{

• va_list ap;
• int node;
• va_start(ap, fmt);
• node = vnode_by_path(blob, fmt, ap);
• va_end(ap);
• if (node < 0)

• return node;
  

• return fdt_setprop_string(blob, node, "status", "okay");

+}

+static bool is_topaz(int id) +{

• return topaz && id == peridot + topaz - 1;

+}

+static int switch_addr(int id) +{

• return is_topaz(id) ? 0x2 : 0x10 + id;

+}

+static int setup_switch(void *blob, int id) +{

• int res, addr, i, node, phandle;
• addr = switch_addr(id);
• /* first enable the switch by setting status = "okay" */
• res = enable_by_path(blob, MDIO_PATH "/switch%i@%x", id, addr);
• if (res < 0)

• return res;
  

• /*

• * now if there are more switches or a SFP module coming after,
  

• * enable corresponding ports
  

• */
  

• if (id < peridot + topaz - 1)

• res = enable_by_path(blob,
  

• 		     MDIO_PATH "/switch%i@%x/ports/port@a",
  

• 		     id, addr);
  

• else if (id == peridot - 1 && !topaz && sfp)

• res = enable_by_path(blob,
  

• 		     MDIO_PATH "/switch%i@%x/ports/port-sfp@a",
  

• 		     id, addr);
  

• else

• res = 0;
  

• if (res < 0)

• return res;
  

• if (id >= peridot + topaz - 1)

• return 0;
  

• /* finally change link property if needed */
• node = node_by_path(blob, MDIO_PATH "/switch%i@%x/ports/port@a", id,

• 	    addr);
  

• if (node < 0)

• return node;
  

• for (i = id + 1; i < peridot + topaz; ++i) {

• phandle = phandle_by_path(blob,
  

• 			  MDIO_PATH "/switch%i@%x/ports/port@%x",
  

• 			  i, switch_addr(i),
  

• 			  is_topaz(i) ? 5 : 9);
  

• if (phandle < 0)
  

• 	return phandle;
  

• if (i == id + 1)
  

• 	res = fdt_setprop_u32(blob, node, "link", phandle);
  

• else
  

• 	res = fdt_appendprop_u32(blob, node, "link", phandle);
  

• if (res < 0)
  

• 	return res;
  

• }
• return 0;

+}

+int ft_board_setup(void *blob, bd_t *bd) +{

• int node, phandle, res;
• if (pci || usb) {

• node = fdt_path_offset(blob, PCIE_PATH);
  

• if (node < 0)
  

• 	return node;
  

• res = fdt_setprop_string(blob, node, "status", "okay");
  

• if (res < 0)
  

• 	return res;
  

• }
• if (peridot || topaz) {

• int i;
  

• res = enable_by_path(blob, ETH1_PATH);
  

• if (res < 0)
  

• 	return res;
  

• for (i = 0; i < peridot + topaz; ++i) {
  

• 	res = setup_switch(blob, i);
  

• 	if (res < 0)
  

• 		return res;
  

• }
  

• }
• if (sfp) {

• res = enable_by_path(blob, SFP_PATH);
  

• if (res < 0)
  

• 	return res;
  

• if (!peridot) {
  

• 	phandle = phandle_by_path(blob, SFP_PATH);
  

• 	if (phandle < 0)
  

• 		return res;
  

• 	node = node_by_path(blob, ETH1_PATH);
  

• 	if (node < 0)
  

• 		return node;
  

• 	res = fdt_setprop_u32(blob, node, "sfp", phandle);
  

• 	if (res < 0)
  

• 		return res;
  

• 	res = fdt_setprop_string(blob, node, "phy-mode",
  

• 				 "sgmii");
  

• 	if (res < 0)
  

• 		return res;
  

• }
  

• res = enable_by_path(blob, MOXTET_SFP_PATH);
  

• if (res < 0)
  

• 	return res;
  

• if (sfp_pos) {
  

• 	char newname[16];
  

• 	/* moxtet-sfp is on non-zero position, change default */
  

• 	node = node_by_path(blob, MOXTET_SFP_PATH);
  

• 	if (node < 0)
  

• 		return node;
  

• 	res = fdt_setprop_u32(blob, node, "reg", sfp_pos);
  

• 	if (res < 0)
  

• 		return res;
  

• 	sprintf(newname, "moxtet-sfp@%x", sfp_pos);
  

• 	res = fdt_set_name(blob, node, newname);
  

• 	if (res < 0)
  

• 		return res;
  

• }
  

• }
• return 0;

+}

+#endif diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index 1dd6826dbc..fb4192df56 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -14,6 +14,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_ARCH_EARLY_INIT_R=y CONFIG_OF_BOARD_FIXUP=y +CONFIG_OF_BOARD_SETUP=y CONFIG_CMD_CLK=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks, Stefan

On 17.08.2018 12:59, Marek Behún wrote:

This can be used to detect whether the button is pressed or light LEDs.

Signed-off-by: Marek Behun marek.behun@nic.cz

configs/turris_mox_defconfig | 1 + 1 file changed, 1 insertion(+)

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index fb4192df56..cc28a1fe95 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_EARLY_INIT_R=y CONFIG_OF_BOARD_FIXUP=y CONFIG_OF_BOARD_SETUP=y CONFIG_CMD_CLK=y +CONFIG_CMD_GPIO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks, Stefan

On 17.08.2018 12:59, Marek Behún wrote:

Remove smi_pins definition since it is already in armada-37xx.dtsi. Add assigned-clocks definitions to spi0.

Signed-off-by: Marek Behun marek.behun@nic.cz

arch/arm/dts/armada-3720-turris-mox.dts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index 05904387d2..9c96dd39a9 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -94,17 +94,13 @@ }; };

-&pinctrl_sb {

• smi_pins: smi-pins {

• groups = "smi";
  

• function = "smi";
  

• };

-};

• &spi0 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&spi_cs1_pins>;

• assigned-clocks = <&nb_periph_clk 7>;

• assigned-clock-parents = <&tbg 1>;

• assigned-clock-rates = <20000000>;

  spi-flash@0 { #address-cells = <1>;

Applied to u-boot-marvell/master

Thanks, Stefan

On 17.08.2018 12:59, Marek Behún wrote:

Add configuration variables to differentiate between the 512 MB and 1 GB versions of Turris Mox and change the RAM size in U-Boot's device tree accordingly.

Signed-off-by: Marek Behun marek.behun@nic.cz

MAINTAINERS | 7 +++++++ arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 15 +++++++++++++++ configs/turris_mox_defconfig | 1 + 4 files changed, 39 insertions(+) create mode 100644 arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi

diff --git a/MAINTAINERS b/MAINTAINERS index 1893090b8f..1a55d80c13 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -360,6 +360,13 @@ S: Maintained T: git git://git.denx.de/u-boot-coldfire.git F: arch/m68k/

+CZ.NIC TURRIS +M: Marek Behun marek.behun@nic.cz +S: Maintained +F: arch/arm/dts/armada-3720-turris-mox.dts +F: arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi +F: board/CZ.NIC/

• DFU M: Lukasz Majewski lukma@denx.de S: Maintained

diff --git a/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi b/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi new file mode 100644 index 0000000000..122f5c8ae1 --- /dev/null +++ b/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ or X11 +/*

• • 2018 by Marek Behun marek.behun@nic.cz
• */

+#include <config.h>

+/ {

• memory {

+#ifdef CONFIG_TARGET_TURRIS_MOX_1GB

• reg = <0x00000000 0x00000000 0x00000000 0x40000000>;
  

+#else

• reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
  

+#endif

• };

+}; diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index d1f71338ac..3e88b3757b 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -198,6 +198,21 @@ config MVEBU_SPL_BOOT_DEVICE_UART

endchoice

+if TARGET_TURRIS_MOX

+choice

• prompt "Turris Mox RAM size"

+config TARGET_TURRIS_MOX_512MB

• bool "512 MB"

+config TARGET_TURRIS_MOX_1GB

• bool "1 GB"

+endchoice

+endif

• config MVEBU_EFUSE bool "Enable eFuse support" default n

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig index cc28a1fe95..2bcbdd8133 100644 --- a/configs/turris_mox_defconfig +++ b/configs/turris_mox_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TURRIS_MOX=y +CONFIG_TARGET_TURRIS_MOX_512MB=y CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=25804800 CONFIG_DEFAULT_DEVICE_TREE="armada-3720-turris-mox"

This patch does not apply currently. I'm skipping it from this series for now. I'm currently pushing my Marvell branch upstream and would like to get the first batch of patches accepted. After Tom has pulled these patches, please rebase on top of this new master.

Thanks, Stefan