Merge tag '2020-01-20-ti-2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git] / board / ti / j721e / evm.c
index 51b121ce05f31319364c98f0fd5a64dc6e8cfa98..aa2240b8523b9c8498ff74a07dfe39ff287e40f5 100644 (file)
@@ -9,10 +9,21 @@
 
 #include <common.h>
 #include <init.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/hardware.h>
+#include <asm/gpio.h>
 #include <asm/io.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 
+#include "../common/board_detect.h"
+
+#define board_is_j721e_som()   (board_ti_k3_is("J721EX-PM1-SOM") || \
+                                board_ti_k3_is("J721EX-PM2-SOM"))
+
+/* Max number of MAC addresses that are parsed/processed per daughter card */
+#define DAUGHTER_CARD_NO_OF_MAC_ADDR   8
+
 DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
@@ -81,3 +92,256 @@ int ft_board_setup(void *blob, bd_t *bd)
        return ret;
 }
 #endif
+
+int do_board_detect(void)
+{
+       int ret;
+
+       ret = ti_i2c_eeprom_am6_get_base(CONFIG_EEPROM_BUS_ADDRESS,
+                                        CONFIG_EEPROM_CHIP_ADDRESS);
+       if (ret)
+               pr_err("Reading on-board EEPROM at 0x%02x failed %d\n",
+                      CONFIG_EEPROM_CHIP_ADDRESS, ret);
+
+       return ret;
+}
+
+int checkboard(void)
+{
+       struct ti_am6_eeprom *ep = TI_AM6_EEPROM_DATA;
+
+       if (do_board_detect())
+               /* EEPROM not populated */
+               printf("Board: %s rev %s\n", "J721EX-PM1-SOM", "E2");
+       else
+               printf("Board: %s rev %s\n", ep->name, ep->version);
+
+       return 0;
+}
+
+static void setup_board_eeprom_env(void)
+{
+       char *name = "j721e";
+
+       if (do_board_detect())
+               goto invalid_eeprom;
+
+       if (board_is_j721e_som())
+               name = "j721e";
+       else
+               printf("Unidentified board claims %s in eeprom header\n",
+                      board_ti_get_name());
+
+invalid_eeprom:
+       set_board_info_env_am6(name);
+}
+
+static void setup_serial(void)
+{
+       struct ti_am6_eeprom *ep = TI_AM6_EEPROM_DATA;
+       unsigned long board_serial;
+       char *endp;
+       char serial_string[17] = { 0 };
+
+       if (env_get("serial#"))
+               return;
+
+       board_serial = simple_strtoul(ep->serial, &endp, 16);
+       if (*endp != '\0') {
+               pr_err("Error: Can't set serial# to %s\n", ep->serial);
+               return;
+       }
+
+       snprintf(serial_string, sizeof(serial_string), "%016lx", board_serial);
+       env_set("serial#", serial_string);
+}
+
+/*
+ * Declaration of daughtercards to probe. Note that when adding more
+ * cards they should be grouped by the 'i2c_addr' field to allow for a
+ * more efficient probing process.
+ */
+static const struct {
+       u8 i2c_addr;            /* I2C address of card EEPROM */
+       char *card_name;        /* EEPROM-programmed card name */
+       char *dtbo_name;        /* Device tree overlay to apply */
+       u8 eth_offset;          /* ethXaddr MAC address index offset */
+} ext_cards[] = {
+       {
+               0x51,
+               "J7X-BASE-CPB",
+               "",             /* No dtbo for this board */
+               0,
+       },
+       {
+               0x52,
+               "J7X-INFOTAN-EXP",
+               "",             /* No dtbo for this board */
+               0,
+       },
+       {
+               0x52,
+               "J7X-GESI-EXP",
+               "",             /* No dtbo for this board */
+               5,              /* Start populating from eth5addr */
+       },
+       {
+               0x54,
+               "J7X-VSC8514-ETH",
+               "",             /* No dtbo for this board */
+               1,              /* Start populating from eth1addr */
+       },
+};
+
+static bool daughter_card_detect_flags[ARRAY_SIZE(ext_cards)];
+
+const char *board_fit_get_additionnal_images(int index, const char *type)
+{
+       int i, j;
+
+       if (strcmp(type, FIT_FDT_PROP))
+               return NULL;
+
+       j = 0;
+       for (i = 0; i < ARRAY_SIZE(ext_cards); i++) {
+               if (daughter_card_detect_flags[i]) {
+                       if (j == index) {
+                               /*
+                                * Return dtbo name only if populated,
+                                * otherwise stop parsing here.
+                                */
+                               if (strlen(ext_cards[i].dtbo_name))
+                                       return ext_cards[i].dtbo_name;
+                               else
+                                       return NULL;
+                       };
+
+                       j++;
+               }
+       }
+
+       return NULL;
+}
+
+static int probe_daughtercards(void)
+{
+       char mac_addr[DAUGHTER_CARD_NO_OF_MAC_ADDR][TI_EEPROM_HDR_ETH_ALEN];
+       bool eeprom_read_success;
+       struct ti_am6_eeprom ep;
+       u8 previous_i2c_addr;
+       u8 mac_addr_cnt;
+       int i;
+       int ret;
+
+       /* Mark previous I2C address variable as not populated */
+       previous_i2c_addr = 0xff;
+
+       /* No EEPROM data was read yet */
+       eeprom_read_success = false;
+
+       /* Iterate through list of daughtercards */
+       for (i = 0; i < ARRAY_SIZE(ext_cards); i++) {
+               /* Obtain card-specific I2C address */
+               u8 i2c_addr = ext_cards[i].i2c_addr;
+
+               /* Read card EEPROM if not already read previously */
+               if (i2c_addr != previous_i2c_addr) {
+                       /* Store I2C address so we can avoid reading twice */
+                       previous_i2c_addr = i2c_addr;
+
+                       /* Get and parse the daughter card EEPROM record */
+                       ret = ti_i2c_eeprom_am6_get(CONFIG_EEPROM_BUS_ADDRESS,
+                                                   i2c_addr,
+                                                   &ep,
+                                                   (char **)mac_addr,
+                                                   DAUGHTER_CARD_NO_OF_MAC_ADDR,
+                                                   &mac_addr_cnt);
+                       if (ret) {
+                               debug("%s: No daughtercard EEPROM at 0x%02x found %d\n",
+                                     __func__, i2c_addr, ret);
+                               eeprom_read_success = false;
+                               /* Skip to the next daughtercard to probe */
+                               continue;
+                       }
+
+                       /* EEPROM read successful, okay to further process. */
+                       eeprom_read_success = true;
+               }
+
+               /* Only continue processing if EEPROM data was read */
+               if (!eeprom_read_success)
+                       continue;
+
+               /* Only process the parsed data if we found a match */
+               if (strncmp(ep.name, ext_cards[i].card_name, sizeof(ep.name)))
+                       continue;
+
+               printf("Detected: %s rev %s\n", ep.name, ep.version);
+               daughter_card_detect_flags[i] = true;
+
+#ifndef CONFIG_SPL_BUILD
+               int j;
+               /*
+                * Populate any MAC addresses from daughtercard into the U-Boot
+                * environment, starting with a card-specific offset so we can
+                * have multiple ext_cards contribute to the MAC pool in a well-
+                * defined manner.
+                */
+               for (j = 0; j < mac_addr_cnt; j++) {
+                       if (!is_valid_ethaddr((u8 *)mac_addr[j]))
+                               continue;
+
+                       eth_env_set_enetaddr_by_index("eth",
+                                                     ext_cards[i].eth_offset + j,
+                                                     (uchar *)mac_addr[j]);
+               }
+#endif
+       }
+#ifndef CONFIG_SPL_BUILD
+       char name_overlays[1024] = { 0 };
+
+       for (i = 0; i < ARRAY_SIZE(ext_cards); i++) {
+               if (!daughter_card_detect_flags[i])
+                       continue;
+
+               /* Skip if no overlays are to be added */
+               if (!strlen(ext_cards[i].dtbo_name))
+                       continue;
+
+               /*
+                * Make sure we are not running out of buffer space by checking
+                * if we can fit the new overlay, a trailing space to be used
+                * as a separator, plus the terminating zero.
+                */
+               if (strlen(name_overlays) + strlen(ext_cards[i].dtbo_name) + 2 >
+                   sizeof(name_overlays))
+                       return -ENOMEM;
+
+               /* Append to our list of overlays */
+               strcat(name_overlays, ext_cards[i].dtbo_name);
+               strcat(name_overlays, " ");
+       }
+
+       /* Apply device tree overlay(s) to the U-Boot environment, if any */
+       if (strlen(name_overlays))
+               return env_set("name_overlays", name_overlays);
+#endif
+
+       return 0;
+}
+
+int board_late_init(void)
+{
+       setup_board_eeprom_env();
+       setup_serial();
+
+       /* Check for and probe any plugged-in daughtercards */
+       probe_daughtercards();
+
+       return 0;
+}
+
+void spl_board_init(void)
+{
+       probe_daughtercards();
+}