mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 14:38:58 +00:00
Merge git://git.denx.de/u-boot-marvell
- Espressobin: Set default env values at runtime (Pali) - Espressobin: Set the maximum slave SPI speed to 40MHz (Pali) - theadorable: PCIe test code enhancement and early deemphasis enabling (Stefan) - pci_mvebu: Disable config access to PCI host bridge ports (Stefan) - mv_sdhci: parse device-tree entry (Baruch)
This commit is contained in:
Tom Rini
commit
e14d5762de
9 changed files with 205 additions and 71 deletions
|
|
@ -7,6 +7,7 @@
|
|||
#include <dm.h>
|
||||
#include <dm/device-internal.h>
|
||||
#include <env.h>
|
||||
#include <env_internal.h>
|
||||
#include <i2c.h>
|
||||
#include <init.h>
|
||||
#include <mmc.h>
|
||||
|
|
@ -85,13 +86,37 @@ int board_init(void)
|
|||
#ifdef CONFIG_BOARD_LATE_INIT
|
||||
int board_late_init(void)
|
||||
{
|
||||
char *ptr = (char *)&default_environment[0];
|
||||
struct udevice *dev;
|
||||
struct mmc *mmc_dev;
|
||||
bool ddr4, emmc;
|
||||
const char *mac;
|
||||
char eth[10];
|
||||
int i;
|
||||
|
||||
if (!of_machine_is_compatible("globalscale,espressobin"))
|
||||
return 0;
|
||||
|
||||
/* Find free buffer in default_environment[] for new variables */
|
||||
while (*ptr != '\0' && *(ptr+1) != '\0') ptr++;
|
||||
ptr += 2;
|
||||
|
||||
/*
|
||||
* Ensure that 'env default -a' does not erase permanent MAC addresses
|
||||
* stored in env variables: $ethaddr, $eth1addr, $eth2addr and $eth3addr
|
||||
*/
|
||||
|
||||
mac = env_get("ethaddr");
|
||||
if (mac && strlen(mac) <= 17)
|
||||
ptr += sprintf(ptr, "ethaddr=%s", mac) + 1;
|
||||
|
||||
for (i = 1; i <= 3; i++) {
|
||||
sprintf(eth, "eth%daddr", i);
|
||||
mac = env_get(eth);
|
||||
if (mac && strlen(mac) <= 17)
|
||||
ptr += sprintf(ptr, "%s=%s", eth, mac) + 1;
|
||||
}
|
||||
|
||||
/* If the memory controller has been configured for DDR4, we're running on v7 */
|
||||
ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
|
||||
& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
|
||||
|
|
@ -110,14 +135,19 @@ int board_late_init(void)
|
|||
if (env_get("fdtfile"))
|
||||
return 0;
|
||||
|
||||
/* Ensure that 'env default -a' set correct value to $fdtfile */
|
||||
if (ddr4 && emmc)
|
||||
env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
|
||||
strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin-v7-emmc.dtb");
|
||||
else if (ddr4)
|
||||
env_set("fdtfile", "marvell/armada-3720-espressobin-v7.dtb");
|
||||
strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin-v7.dtb");
|
||||
else if (emmc)
|
||||
env_set("fdtfile", "marvell/armada-3720-espressobin-emmc.dtb");
|
||||
strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin-emmc.dtb");
|
||||
else
|
||||
env_set("fdtfile", "marvell/armada-3720-espressobin.dtb");
|
||||
strcpy(ptr, "fdtfile=marvell/armada-3720-espressobin.dtb");
|
||||
|
||||
/* If $fdtfile was not set explicitly by user then set default value */
|
||||
if (!env_get("fdtfile"))
|
||||
env_set("fdtfile", ptr + sizeof("fdtfile="));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <console.h>
|
||||
#include <dm.h>
|
||||
#include <i2c.h>
|
||||
#include <init.h>
|
||||
#include <net.h>
|
||||
|
|
@ -147,6 +148,18 @@ u8 board_sat_r_get(u8 dev_num, u8 reg)
|
|||
return 0xe; /* PEX port 0 is PCIe Gen1, PEX port 1..3 PCIe Gen2 */
|
||||
}
|
||||
|
||||
#define PCIE_LNK_CTRL_STAT_2_OFF 0x0090
|
||||
#define PCIE_LNK_CTRL_STAT_2_DEEM_BIT BIT(6)
|
||||
|
||||
static void pcie_set_deemphasis(u32 base)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
reg = readl((void *)base + PCIE_LNK_CTRL_STAT_2_OFF);
|
||||
reg |= PCIE_LNK_CTRL_STAT_2_DEEM_BIT;
|
||||
writel(reg, (void *)base + PCIE_LNK_CTRL_STAT_2_OFF);
|
||||
}
|
||||
|
||||
int board_early_init_f(void)
|
||||
{
|
||||
/* Configure MPP */
|
||||
|
|
@ -168,6 +181,18 @@ int board_early_init_f(void)
|
|||
writel(THEADORABLE_GPP_OUT_VAL_HIGH, MVEBU_GPIO2_BASE + 0x00);
|
||||
writel(THEADORABLE_GPP_OUT_ENA_HIGH, MVEBU_GPIO2_BASE + 0x04);
|
||||
|
||||
/*
|
||||
* Set deephasis bit in the PCIe configuration of both PCIe ports
|
||||
* used on this board.
|
||||
*
|
||||
* This needs to be done very early, even before the SERDES setup
|
||||
* code is run. This way, the first link will already be established
|
||||
* with this setup. Testing has shown, that this results in a more
|
||||
* stable PCIe link with better signal quality.
|
||||
*/
|
||||
pcie_set_deemphasis(MVEBU_REG_PCIE_BASE); /* Port 0 */
|
||||
pcie_set_deemphasis(MVEBU_REG_PCIE_BASE + 0x2000); /* Port 2 */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -311,42 +336,107 @@ int board_late_init(void)
|
|||
#endif
|
||||
|
||||
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_PCI)
|
||||
int do_pcie_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
||||
static int pcie_get_link_speed_width(pci_dev_t bdf, int *speed, int *width)
|
||||
{
|
||||
pci_dev_t bdf;
|
||||
struct udevice *dev;
|
||||
u16 ven_id, dev_id;
|
||||
|
||||
if (argc != 3)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
ven_id = simple_strtoul(argv[1], NULL, 16);
|
||||
dev_id = simple_strtoul(argv[2], NULL, 16);
|
||||
|
||||
printf("Checking for PCIe device: VendorID 0x%04x, DeviceId 0x%04x\n",
|
||||
ven_id, dev_id);
|
||||
u16 lnksta;
|
||||
int ret;
|
||||
int pos;
|
||||
|
||||
/*
|
||||
* Check if the PCIe device is detected (somtimes its not available
|
||||
* Check if the PCIe device is detected (sometimes its not available
|
||||
* on the PCIe bus)
|
||||
*/
|
||||
bdf = pci_find_device(ven_id, dev_id, 0);
|
||||
if (bdf == -1) {
|
||||
/* PCIe device not found! */
|
||||
printf("Failed to find PCIe device\n");
|
||||
} else {
|
||||
/* PCIe device found! */
|
||||
printf("PCIe device found, resetting board...\n");
|
||||
ret = dm_pci_bus_find_bdf(bdf, &dev);
|
||||
if (ret)
|
||||
return -ENODEV;
|
||||
|
||||
/* default handling: SOFT reset */
|
||||
do_reset(NULL, 0, 0, NULL);
|
||||
}
|
||||
/* PCIe device found */
|
||||
dm_pci_read_config16(dev, PCI_VENDOR_ID, &ven_id);
|
||||
dm_pci_read_config16(dev, PCI_DEVICE_ID, &dev_id);
|
||||
printf("Detected PCIe device: VendorID 0x%04x DeviceId 0x%04x @ BDF %d.%d.%d\n",
|
||||
ven_id, dev_id, PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
|
||||
/* Now read EXP_LNKSTA register */
|
||||
pos = dm_pci_find_capability(dev, PCI_CAP_ID_EXP);
|
||||
dm_pci_read_config16(dev, pos + PCI_EXP_LNKSTA, &lnksta);
|
||||
*speed = lnksta & PCI_EXP_LNKSTA_CLS;
|
||||
*width = (lnksta & PCI_EXP_LNKSTA_NLW) >> PCI_EXP_LNKSTA_NLW_SHIFT;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* U-Boot cmd to test for the presence of the directly connected PCIe devices
|
||||
* the theadorable board. This cmd can be used by U-Boot scripts for automated
|
||||
* testing, if the PCIe setup is correct. Meaning, that all PCIe devices are
|
||||
* correctly detected and the link speed and width is corrent.
|
||||
*
|
||||
* Here a short script that may be used for an automated test. It results in
|
||||
* an endless reboot loop, if the PCIe devices are detected correctly. If at
|
||||
* any time a problem is detected (PCIe device not available or link is
|
||||
* incorrect), then booting will halt. So just use this "bootcmd" and let the
|
||||
* board run over a longer time (e.g. one night) and if the board still reboots
|
||||
* after this time, then everything is okay.
|
||||
*
|
||||
* bootcmd=echo bootcount=$bootcount; pcie ;if test $? -eq 0;
|
||||
* then echo PCIe status okay, resetting...; reset; else;
|
||||
* echo PCIe status NOT okay, hanging (bootcount=$bootcount); fi;
|
||||
*/
|
||||
int do_pcie_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
||||
{
|
||||
pci_dev_t bdf;
|
||||
int speed;
|
||||
int width;
|
||||
int ret;
|
||||
|
||||
if (argc != 1)
|
||||
return cmd_usage(cmdtp);
|
||||
|
||||
/*
|
||||
* Check if the PCIe device is detected (sometimes its not available
|
||||
* on the PCIe bus)
|
||||
*/
|
||||
|
||||
/* Check for PCIe device on PCIe port/bus 0 */
|
||||
bdf = PCI_BDF(0, 1, 0);
|
||||
ret = pcie_get_link_speed_width(bdf, &speed, &width);
|
||||
if (ret) {
|
||||
/* PCIe device not found! */
|
||||
printf("Failed to find PCIe device @ BDF %d.%d.%d\n",
|
||||
PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
printf("Established speed=%d width=%d\n", speed, width);
|
||||
if ((speed != 1 || width != 1)) {
|
||||
printf("Detected incorrect speed/width!!!\n");
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
/* Check for PCIe device on PCIe port/bus 1 */
|
||||
bdf = PCI_BDF(1, 1, 0);
|
||||
ret = pcie_get_link_speed_width(bdf, &speed, &width);
|
||||
if (ret) {
|
||||
/* PCIe device not found! */
|
||||
printf("Failed to find PCIe device @ BDF %d.%d.%d\n",
|
||||
PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
printf("Established speed=%d width=%d\n", speed, width);
|
||||
if ((speed != 2 || width != 4)) {
|
||||
printf("Detected incorrect speed/width!!!\n");
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
|
||||
U_BOOT_CMD(
|
||||
pcie, 3, 0, do_pcie_test,
|
||||
"Test for presence of a PCIe device",
|
||||
"<VendorID> <DeviceID>"
|
||||
pcie, 1, 0, do_pcie_test,
|
||||
"Test for presence of a PCIe devices with correct link",
|
||||
""
|
||||
);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -874,9 +874,9 @@ U_BOOT_CMD(
|
|||
bubt, 4, 0, do_bubt_cmd,
|
||||
"Burn a u-boot image to flash",
|
||||
"[file-name] [destination [source]]\n"
|
||||
"\t-file-name The image file name to burn. Default = flash-image.bin\n"
|
||||
"\t-destination Flash to burn to [spi, nand, mmc]. Default = active boot device\n"
|
||||
"\t-source The source to load image from [tftp, usb, mmc]. Default = tftp\n"
|
||||
"\t-file-name The image file name to burn. Default = " CONFIG_MVEBU_UBOOT_DFLT_NAME "\n"
|
||||
"\t-destination Flash to burn to [spi, nand, mmc]. Default = " DEFAULT_BUBT_DST "\n"
|
||||
"\t-source The source to load image from [tftp, usb, mmc]. Default = " DEFAULT_BUBT_SRC "\n"
|
||||
"Examples:\n"
|
||||
"\tbubt - Burn flash-image.bin from tftp to active boot device\n"
|
||||
"\tbubt flash-image-new.bin nand - Burn flash-image-new.bin from tftp to NAND flash\n"
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ CONFIG_MMC_SDHCI_SDMA=y
|
|||
CONFIG_MMC_SDHCI_XENON=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_SF_DEFAULT_MODE=0
|
||||
CONFIG_SF_DEFAULT_SPEED=40000000
|
||||
CONFIG_SPI_FLASH_GIGADEVICE=y
|
||||
CONFIG_SPI_FLASH_ISSI=y
|
||||
CONFIG_SPI_FLASH_MACRONIX=y
|
||||
|
|
|
|||
|
|
@ -118,6 +118,10 @@ static int mv_sdhci_probe(struct udevice *dev)
|
|||
host->mmc->dev = dev;
|
||||
host->mmc->priv = host;
|
||||
|
||||
ret = mmc_of_parse(dev, &plat->cfg);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -153,28 +153,21 @@ static int mvebu_pcie_read_config(const struct udevice *bus, pci_dev_t bdf,
|
|||
u32 reg;
|
||||
u32 data;
|
||||
|
||||
debug("PCIE CFG read: (b,d,f)=(%2d,%2d,%2d) ",
|
||||
PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
debug("PCIE CFG read: loc_bus=%d loc_dev=%d (b,d,f)=(%2d,%2d,%2d) ",
|
||||
local_bus, local_dev, PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
|
||||
/* Only allow one other device besides the local one on the local bus */
|
||||
if (PCI_BUS(bdf) == local_bus && PCI_DEV(bdf) != local_dev) {
|
||||
if (local_dev == 0 && PCI_DEV(bdf) != 1) {
|
||||
debug("- out of range\n");
|
||||
/*
|
||||
* If local dev is 0, the first other dev can
|
||||
* only be 1
|
||||
*/
|
||||
*valuep = pci_get_ff(size);
|
||||
return 0;
|
||||
} else if (local_dev != 0 && PCI_DEV(bdf) != 0) {
|
||||
debug("- out of range\n");
|
||||
/*
|
||||
* If local dev is not 0, the first other dev can
|
||||
* only be 0
|
||||
*/
|
||||
*valuep = pci_get_ff(size);
|
||||
return 0;
|
||||
}
|
||||
/* Don't access the local host controller via this API */
|
||||
if (PCI_BUS(bdf) == local_bus && PCI_DEV(bdf) == local_dev) {
|
||||
debug("- skipping host controller\n");
|
||||
*valuep = pci_get_ff(size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* If local dev is 0, the first other dev can only be 1 */
|
||||
if (PCI_BUS(bdf) == local_bus && local_dev == 0 && PCI_DEV(bdf) != 1) {
|
||||
debug("- out of range\n");
|
||||
*valuep = pci_get_ff(size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* write address */
|
||||
|
|
@ -196,25 +189,20 @@ static int mvebu_pcie_write_config(struct udevice *bus, pci_dev_t bdf,
|
|||
int local_dev = PCI_DEV(pcie->dev);
|
||||
u32 data;
|
||||
|
||||
debug("PCIE CFG write: (b,d,f)=(%2d,%2d,%2d) ",
|
||||
PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
debug("PCIE CFG write: loc_bus=%d loc_dev=%d (b,d,f)=(%2d,%2d,%2d) ",
|
||||
local_bus, local_dev, PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf));
|
||||
debug("(addr,val)=(0x%04x, 0x%08lx)\n", offset, value);
|
||||
|
||||
/* Only allow one other device besides the local one on the local bus */
|
||||
if (PCI_BUS(bdf) == local_bus && PCI_DEV(bdf) != local_dev) {
|
||||
if (local_dev == 0 && PCI_DEV(bdf) != 1) {
|
||||
/*
|
||||
* If local dev is 0, the first other dev can
|
||||
* only be 1
|
||||
*/
|
||||
return 0;
|
||||
} else if (local_dev != 0 && PCI_DEV(bdf) != 0) {
|
||||
/*
|
||||
* If local dev is not 0, the first other dev can
|
||||
* only be 0
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
/* Don't access the local host controller via this API */
|
||||
if (PCI_BUS(bdf) == local_bus && PCI_DEV(bdf) == local_dev) {
|
||||
debug("- skipping host controller\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* If local dev is 0, the first other dev can only be 1 */
|
||||
if (PCI_BUS(bdf) == local_bus && local_dev == 0 && PCI_DEV(bdf) != 1) {
|
||||
debug("- out of range\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
writel(PCIE_CONF_ADDR(bdf, offset), pcie->base + PCIE_CONF_ADDR_OFF);
|
||||
|
|
|
|||
|
|
@ -57,6 +57,11 @@
|
|||
*/
|
||||
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
|
||||
|
||||
/*
|
||||
* Environment
|
||||
*/
|
||||
#define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */
|
||||
|
||||
/*
|
||||
* Ethernet Driver configuration
|
||||
*/
|
||||
|
|
@ -87,6 +92,15 @@
|
|||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
/* filler for default values filled by board_early_init_f() */
|
||||
#define ENV_RW_FILLER \
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for ethaddr= */ \
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth1addr= */ \
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth2addr= */ \
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for eth3addr= */ \
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* for fdtfile= */ \
|
||||
""
|
||||
|
||||
/* fdt_addr and kernel_addr are needed for existing distribution boot scripts */
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"scriptaddr=0x6d00000\0" \
|
||||
|
|
@ -96,6 +110,7 @@
|
|||
"kernel_addr=0x7000000\0" \
|
||||
"kernel_addr_r=0x7000000\0" \
|
||||
"ramdisk_addr_r=0xa000000\0" \
|
||||
BOOTENV
|
||||
BOOTENV \
|
||||
ENV_RW_FILLER
|
||||
|
||||
#endif /* _CONFIG_MVEBU_ARMADA_37XX_H */
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
|
|||
{
|
||||
#elif defined(DEFAULT_ENV_INSTANCE_STATIC)
|
||||
static char default_environment[] = {
|
||||
#elif defined(DEFAULT_ENV_IS_RW)
|
||||
uchar default_environment[] = {
|
||||
#else
|
||||
const uchar default_environment[] = {
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -111,7 +111,11 @@ typedef struct environment_s {
|
|||
extern env_t embedded_environment;
|
||||
#endif /* ENV_IS_EMBEDDED */
|
||||
|
||||
#ifdef DEFAULT_ENV_IS_RW
|
||||
extern unsigned char default_environment[];
|
||||
#else
|
||||
extern const unsigned char default_environment[];
|
||||
#endif
|
||||
|
||||
#ifndef DO_DEPS_ONLY
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue