December 2015 - U-Boot

[U-Boot] [PATCH 0/5] MIPS updates
by Daniel Schwierzeck 12 Jan '16

12 Jan '16

Daniel Schwierzeck (5): MIPS: fix annotation of _start and relocate_code MIPS: create .text sub-sections for assembler functions MIPS: do not build position-independent executables for SPL MIPS: add initial infrastructure for device-tree files Kconfig: create symbolic link on MIPS arch/Kconfig | 2 ++ arch/mips/config.mk | 18 ++++++++++++++---- arch/mips/cpu/start.S | 12 +++++------- arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++++++++++++++++ arch/mips/dts/skeleton.dtsi | 23 +++++++++++++++++++++++ arch/mips/include/asm/asm.h | 10 +++++++++- 7 files changed, 70 insertions(+), 12 deletions(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 100644 arch/mips/dts/skeleton.dtsi -- 2.5.0

2 10

[U-Boot] Fix wrap around bug in MBR sector counts
by Stefan Monnier 12 Jan '16

12 Jan '16

I just bumped into a problem where U-Boot refused to boot from my disk's second partition because the sector number is "negative". More specifically, my disk drive is 2TB, which means that the number of 512B blocks fits into an unsigned 32bit int but not into a signed 32bit int. U-boot's "scsi part" displays the size (in blocks) correctly, but the size of the first partition (which is around 1.8TB) is printed as a negative number, and so is the start sector of the second partition. This was tested on a BananaPi using v2015-07.

1 2

[U-Boot] [PATCH] fdt: fix address cell count checking in fdt_translate_address()
by Przemyslaw Marczak 12 Jan '16

12 Jan '16

Commit: dm: core: Enable optional use of fdt_translate_address() Enables use of this function as default, but after this it's not possible to get dev address for the case in which: '#size-cells == 0' This causes errors when getting address for some GPIOs, for which the '#size-cells' is set to 0. Example error: '__of_translate_address: Bad cell count for gpx0' Allowing for that case by modifying the macro 'OF_CHECK_COUNTS', (called from )__of_translate_address(), fixes the issue. Now, this macro doesn't check, that '#size-cells' is greater than 0. This is possible from the specification point of view, but I'm not sure that it doesn't introduce a regression for other configs. Please test and share the results. Tested-on: Odroid U3, Odroid X2, Odroid XU3, Sandbox. Signed-off-by: Przemyslaw Marczak <p.marczak(a)samsung.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Lukasz Majewski <l.majewski(a)samsung.com> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> --- common/fdt_support.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index f86365e..5f808cc 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -946,8 +946,7 @@ void fdt_del_node_and_alias(void *blob, const char *alias) /* Max address size we deal with */ #define OF_MAX_ADDR_CELLS 4 #define OF_BAD_ADDR ((u64)-1) -#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ - (ns) > 0) +#define OF_CHECK_COUNTS(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) /* Debug utility */ #ifdef DEBUG @@ -1115,7 +1114,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Cound address cells & copy address locally */ bus->count_cells(blob, parent, &na, &ns); - if (!OF_CHECK_COUNTS(na, ns)) { + if (!OF_CHECK_COUNTS(na)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); goto bail; @@ -1142,7 +1141,7 @@ static u64 __of_translate_address(void *blob, int node_offset, const fdt32_t *in /* Get new parent bus and counts */ pbus = &of_busses[0]; pbus->count_cells(blob, parent, &pna, &pns); - if (!OF_CHECK_COUNTS(pna, pns)) { + if (!OF_CHECK_COUNTS(pna)) { printf("%s: Bad cell count for %s\n", __FUNCTION__, fdt_get_name(blob, node_offset, NULL)); break; -- 1.9.1

5 13

[U-Boot] [PATCH] net: phy: genphy: Allow overwriting features
by Alexey Brodkin 11 Jan '16

11 Jan '16

From: Sascha Hauer <s.hauer(a)pengutronix.de> of_set_phy_supported allows overwiting hardware capabilities of a phy with values from the devicetree. This does not work with the genphy driver though because the genphys config_init function will overwrite all values adjusted by of_set_phy_supported. Fix this by initialising the genphy features in the phy_driver struct and in config_init just limit the features to the ones the hardware can actually support. The resulting features are a subset of the devicetree specified features and the hardware features. This is a copy of the patch from Linux kernel, see http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c… Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/phy/phy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 084276f..ec9be6b 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -380,8 +380,6 @@ int genphy_config(struct phy_device *phydev) int val; u32 features; - /* For now, I'll claim that the generic driver supports - * all possible port types */ features = (SUPPORTED_TP | SUPPORTED_MII | SUPPORTED_AUI | SUPPORTED_FIBRE | SUPPORTED_BNC); @@ -420,8 +418,8 @@ int genphy_config(struct phy_device *phydev) features |= SUPPORTED_1000baseX_Half; } - phydev->supported = features; - phydev->advertising = features; + phydev->supported &= features; + phydev->advertising &= features; genphy_config_aneg(phydev); @@ -445,7 +443,9 @@ static struct phy_driver genphy_driver = { .uid = 0xffffffff, .mask = 0xffffffff, .name = "Generic PHY", - .features = 0, + .features = PHY_GBIT_FEATURES | SUPPORTED_MII | + SUPPORTED_AUI | SUPPORTED_FIBRE | + SUPPORTED_BNC, .config = genphy_config, .startup = genphy_startup, .shutdown = genphy_shutdown, -- 2.4.3

2 5

[U-Boot] curious if XTRN_DECLARE_GLOBAL_DATA_PTR is still of value
by Robert P. J. Day 11 Jan '16

11 Jan '16

perusing the code related to the global data ptr and noticed in common/board_f.c: /* * Pointer to initial global data area * * Here we initialize it if needed. */ #ifdef XTRN_DECLARE_GLOBAL_DATA_PTR #undef XTRN_DECLARE_GLOBAL_DATA_PTR #define XTRN_DECLARE_GLOBAL_DATA_PTR /* empty = allocate here */ DECLARE_GLOBAL_DATA_PTR = (gd_t *) (CONFIG_SYS_INIT_GD_ADDR); #else DECLARE_GLOBAL_DATA_PTR; #endif i was curious to see if anything took advantage of that and the only other place in the code that referred to that was in arch/powerpc/include/asm/global_data.h: #if 1 #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2") #else /* We could use plain global data, but the resulting code is bigger */ #define XTRN_DECLARE_GLOBAL_DATA_PTR extern #define DECLARE_GLOBAL_DATA_PTR XTRN_DECLARE_GLOBAL_DATA_PTR \ gd_t *gd #endif and given the "#if 1", it's pretty clear powerpc doesn't care about that, and that file common/board_f.c is the only place i can see in the entire code base that refers to CONFIG_SYS_INIT_GD_ADDR. so are people still taking advantage of this in some way? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH v3 00/10] sf: Add flash_ids inside Core
by Jagan Teki 11 Jan '16

11 Jan '16

This series handle flash_ids stuff inside spi_flash core. Changes for v3: - Updated SNOR_F_SST_WRITE at sf_probe.c - two patches, wrt sanbox newly added Changes for v2: - Remove SECT_4K flag for s25fl128s Jagan Teki (10): sf: Add spi_flash_ids local to core sf: Rename SST_WR to SST_WRITE sf: Remove SPI_NOR_DUAL|QUAD_READ sf: Use sf_params in sandbox sf: Remove SECT_32K sf: Add SECT_4K_PMC sf: Use CONFIG_SPI_FLASH_USE_4K_SECTORS sf: Fix few naming convention for read modes sf: sandbox: Move spi_flash_params_table sf: Drop sf_params.c drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/sandbox.c | 155 +++++++++++++++ drivers/mtd/spi/sf_internal.h | 29 +-- drivers/mtd/spi/sf_params.c | 146 -------------- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi_flash.c | 446 +++++++++++++++++++++++++++++++++++------- include/linux/err.h | 5 + 7 files changed, 538 insertions(+), 247 deletions(-) delete mode 100644 drivers/mtd/spi/sf_params.c -- 1.9.1

3 13

[U-Boot] sf: About sandbox flash driver
by Jagan Teki 11 Jan '16

11 Jan '16

Hi Simon, Few question wrt sandbox flash driver - drivers/mtd/spi/sandbox.c 1) Does this driver used for creating flash emulation environment? or something else? 2) Can't it use spi_flash.c core for all spi flash operations, how different is this? Please let me know your inputs. thanks! -- Jagan.

2 3

[U-Boot] [PATCH] net: phy: ensure Gigabit features are masked off if requested
by Alexey Brodkin 11 Jan '16

11 Jan '16

From: Florian Fainelli <f.fainelli(a)gmail.com> When a Gigabit PHY device is connected to a 10/100Mbits capable Ethernet MAC, the driver will restrict the phydev->supported modes to mask off Gigabit. If the Gigabit PHY comes out of reset with the Gigabit features set by default in MII_CTRL1000, it will keep advertising these feature, so by the time we call genphy_config_advert(), the condition on phydev->supported having the Gigabit features on is false, and we do not update MII_CTRL1000 with updated values, and we keep advertising Gigabit features, eventually configuring the PHY for Gigabit whilst the Ethernet MAC does not support that. This patches fixes the problem by ensuring that the Gigabit feature bits are always cleared in MII_CTRL1000, if the PHY happens to be a Gigabit PHY, and then, if Gigabit features are supported, setting those and updating MII_CTRL1000 accordingly. This is a copy of patch from Linux kernel, see http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5… Signed-off-by: Florian Fainelli <f.fainelli(a)gmail.com> Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/phy/phy.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 51b5746..084276f 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -38,11 +38,10 @@ DECLARE_GLOBAL_DATA_PTR; static int genphy_config_advert(struct phy_device *phydev) { u32 advertise; - int oldadv, adv; + int oldadv, adv, bmsr; int err, changed = 0; - /* Only allow advertising what - * this PHY supports */ + /* Only allow advertising what this PHY supports */ phydev->advertising &= phydev->supported; advertise = phydev->advertising; @@ -79,29 +78,39 @@ static int genphy_config_advert(struct phy_device *phydev) changed = 1; } + bmsr = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR); + if (bmsr < 0) + return bmsr; + + /* Per 802.3-2008, Section 22.2.4.2.16 Extended status all + * 1000Mbits/sec capable PHYs shall have the BMSR_ESTATEN bit set to a + * logical 1. + */ + if (!(bmsr & BMSR_ESTATEN)) + return changed; + /* Configure gigabit if it's supported */ - if (phydev->supported & (SUPPORTED_1000baseT_Half | - SUPPORTED_1000baseT_Full)) { - oldadv = adv = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000); + oldadv = adv = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000); + + if (adv < 0) + return adv; - if (adv < 0) - return adv; + adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF); - adv &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF); + if (phydev->supported & (SUPPORTED_1000baseT_Half | + SUPPORTED_1000baseT_Full)) { if (advertise & SUPPORTED_1000baseT_Half) adv |= ADVERTISE_1000HALF; if (advertise & SUPPORTED_1000baseT_Full) adv |= ADVERTISE_1000FULL; + } - if (adv != oldadv) { - err = phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, - adv); + if (adv != oldadv) + changed = 1; - if (err < 0) - return err; - changed = 1; - } - } + err = phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, adv); + if (err < 0) + return err; return changed; } -- 2.4.3

1 1

[U-Boot] [PATCH] net: phy: breakdown PHY_*_FEATURES defines
by Alexey Brodkin 11 Jan '16

11 Jan '16

From: Florian Fainelli <f.fainelli(a)gmail.com> Breakdown the PHY_*_FEATURES into per speed defines such that we can easily re-use them individually. This is a copy of patch from Linux kernel, see http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=e… Signed-off-by: Florian Fainelli <f.fainelli(a)gmail.com> Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com>i Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- include/phy.h | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/include/phy.h b/include/phy.h index 66cf61b..b793e90 100644 --- a/include/phy.h +++ b/include/phy.h @@ -17,18 +17,26 @@ #define PHY_MAX_ADDR 32 -#define PHY_BASIC_FEATURES (SUPPORTED_10baseT_Half | \ - SUPPORTED_10baseT_Full | \ - SUPPORTED_100baseT_Half | \ - SUPPORTED_100baseT_Full | \ - SUPPORTED_Autoneg | \ +#define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \ SUPPORTED_TP | \ SUPPORTED_MII) -#define PHY_GBIT_FEATURES (PHY_BASIC_FEATURES | \ - SUPPORTED_1000baseT_Half | \ +#define PHY_10BT_FEATURES (SUPPORTED_10baseT_Half | \ + SUPPORTED_10baseT_Full) + +#define PHY_100BT_FEATURES (SUPPORTED_100baseT_Half | \ + SUPPORTED_100baseT_Full) + +#define PHY_1000BT_FEATURES (SUPPORTED_1000baseT_Half | \ SUPPORTED_1000baseT_Full) +#define PHY_BASIC_FEATURES (PHY_10BT_FEATURES | \ + PHY_100BT_FEATURES | \ + PHY_DEFAULT_FEATURES) + +#define PHY_GBIT_FEATURES (PHY_BASIC_FEATURES | \ + PHY_1000BT_FEATURES) + #define PHY_10G_FEATURES (PHY_GBIT_FEATURES | \ SUPPORTED_10000baseT_Full) -- 2.4.3

1 1

[U-Boot] [PATCH] net/designware: do explicit port selection for 1Gb mode
by Alexey Brodkin 11 Jan '16

11 Jan '16

Current implementation only sets "port select" bit for non-1Gb mode. That works fine if GMAC has just exited reset state but we may as well change connection mode in runtime. Then we'll need to reprogram GMAC for that new mode of operation and if previous mode was 10 or 100 Mb and new one is 1 Gb we'll need to reset port mode bit. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Sonic Zhang <sonic.zhang(a)analog.com> cc: Simon Glass <sjg(a)chromium.org> --- drivers/net/designware.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index a6c39c3..58c6d36 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -200,6 +200,8 @@ static void dw_adjust_link(struct eth_mac_regs *mac_p, if (phydev->speed != 1000) conf |= MII_PORTSELECT; + else + conf &= ~MII_PORTSELECT; if (phydev->speed == 100) conf |= FES_100; -- 2.4.3

2 2