February 2021 - U-Boot

[PATCH] board: sl28: add DSA support for variant 2
by Michael Walle 25 Feb '21

25 Feb '21

Now that u-boot gained DSA support, and it is already enabled for the kontron_sl28 board, add the last missing piece and enable the corresponding devices it in the device tree. Signed-off-by: Michael Walle <michael(a)walle.cc> --- .../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts index 1ea1265bcf..39280cd1c7 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts @@ -15,6 +15,12 @@ / { model = "Kontron SMARC-sAL28 (TSN-on-module)"; compatible = "kontron,sl28-var2", "kontron,sl28", "fsl,ls1028a"; + + aliases { + eth0 = &mscc_felix_port0; + eth1 = &mscc_felix_port1; + eth2 = &enetc2; + }; }; &enetc0 { @@ -22,4 +28,44 @@ /delete-property/ phy-handle; }; +&enetc2 { + status = "okay"; +}; + +&mscc_felix { + status = "okay"; +}; + +&mscc_felix_port0 { + label = "gbe0"; + phy-handle = <&phy0>; + phy-mode = "sgmii"; + status = "okay"; +}; + +&mscc_felix_port1 { + label = "gbe1"; + phy-handle = <&phy1>; + phy-mode = "sgmii"; + status = "okay"; +}; + +&mscc_felix_port4 { + ethernet = <&enetc2>; + status = "okay"; +}; + /delete-node/ &phy0; +&mdio0 { + phy0: ethernet-phy@5 { + reg = <0x5>; + eee-broken-1000t; + eee-broken-100tx; + }; + + phy1: ethernet-phy@4 { + reg = <0x4>; + eee-broken-1000t; + eee-broken-100tx; + }; +}; -- 2.20.1

2 6

[PATCH] tools: Remove #include <version.h>
by Pali Rohár 25 Feb '21

25 Feb '21

Header file version.h includes also autogenerated file timestamp.h which is recompiled on every time when SOURCE_DATE_EPOCH change. Tools do not use build time therefore they do not have to include timestamp.h file. This change prevents recompiling tools every time when SOURCE_DATE_EPOCH changes. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- tools/dumpimage.c | 2 +- tools/mkenvimage.c | 2 +- tools/mkimage.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/dumpimage.c b/tools/dumpimage.c index e5481435a7..54c2517c9e 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -7,7 +7,7 @@ #include "dumpimage.h" #include <image.h> -#include <version.h> +#include "generated/version_autogenerated.h" static void usage(void); diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index b05f83415f..6482ca6ee9 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -23,7 +23,7 @@ #include "compiler.h" #include <u-boot/crc.h> -#include <version.h> +#include "generated/version_autogenerated.h" #define CRC_SIZE sizeof(uint32_t) diff --git a/tools/mkimage.c b/tools/mkimage.c index 68d5206cb4..d5e274c504 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -11,7 +11,7 @@ #include "mkimage.h" #include "imximage.h" #include <image.h> -#include <version.h> +#include "generated/version_autogenerated.h" static void copy_file(int, const char *, int); -- 2.20.1

3 6

[PATCH u-boot-dm + u-boot-spi v2 0/7] Support SPI NORs and OF partitions in `mtd list`
by Marek Behún 25 Feb '21

25 Feb '21

Hello, this is v2 of patchset that adds support for U-Boot to parse MTD partitions from device-tree, and also improves support for SPI NOR access via the `mtd` command. Since mtd subsystem is unmaintained, who shall apply the mtd patches? I put an u-boot-spi tag into the subject prefix, but am not sure if this is correct. Changes since v1: - added tests of ofnode_get_addr_size_index() and ofnode_get_addr_size_index_notrans() as requested by Simon - the last patch now probes SPI NORs in both versions of mtd_probe_devices(), that is when MTDPARTS is enabled or disabled Marek Marek Behún (7): dm: core: add test for ofnode_get_addr_size_index() dm: core: add non-translating version of ofnode_get_addr_size_index() mtd: add support for parsing partitions defined in OF mtd: spi-nor: allow registering multiple MTDs when DM is enabled mtd: spi-nor: fill-in mtd->dev member mtd: remove mtd_probe function mtd: probe SPI NOR devices in mtd_probe_devices() drivers/core/ofnode.c | 19 ++++- drivers/mtd/mtd-uclass.c | 15 ---- drivers/mtd/mtd_uboot.c | 129 ++++++++++++++++++++------------- drivers/mtd/mtdpart.c | 60 +++++++++++++++ drivers/mtd/spi/sf_internal.h | 4 +- drivers/mtd/spi/sf_mtd.c | 19 ++++- drivers/mtd/spi/sf_probe.c | 6 +- drivers/mtd/spi/spi-nor-core.c | 1 + drivers/mtd/spi/spi-nor-tiny.c | 1 + include/dm/ofnode.h | 17 +++++ include/linux/mtd/mtd.h | 9 +++ include/mtd.h | 1 - test/dm/ofnode.c | 29 ++++++++ 13 files changed, 236 insertions(+), 74 deletions(-) -- 2.26.2

5 20

[PATCH 1/3] x86: Fix member check in intel_gnvs
by Simon Glass 25 Feb '21

25 Feb '21

When CONFIG_CHROMEOS is not enabled this currently does not build. Fix it. Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/x86/include/asm/intel_gnvs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/intel_gnvs.h b/arch/x86/include/asm/intel_gnvs.h index 69a20812e5e..fc743dc9285 100644 --- a/arch/x86/include/asm/intel_gnvs.h +++ b/arch/x86/include/asm/intel_gnvs.h @@ -107,6 +107,10 @@ struct __packed acpi_global_nvs { u8 unused2[0x1000 - 0x100]; /* Pad out to 4096 bytes */ #endif }; +#ifdef CONFIG_CHROMEOS check_member(acpi_global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET); +#else +check_member(acpi_global_nvs, unused2, GNVS_CHROMEOS_ACPI_OFFSET); +#endif #endif /* _INTEL_GNVS_H_ */ -- 2.30.0.617.g56c4b15f3c-goog

2 8

[PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h
by Siew Chin Lim 25 Feb '21

25 Feb '21

Commit "common: Drop asm/global_data.h from common header" added asm/global_data.h into secure.h. However, secure.h will be included by psci.S. Adding asm/global_data.h has caused compilation failure in pcsi.S. Add "ifndef __ASSEMBLY__" in asm/global_data.h. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim(a)intel.com> --- arch/arm/include/asm/global_data.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 5a935d34e2..fba655f3b9 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -7,6 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#ifndef __ASSEMBLY__ + #include <asm/types.h> #include <linux/types.h> @@ -125,4 +127,6 @@ static inline void set_gd(volatile gd_t *gd_ptr) #endif } +#endif /* __ASSEMBLY__ */ + #endif /* __ASM_GBL_DATA_H */ -- 2.13.0

3 2

[PATCH 1/1] net: cortina_ni: buffer overrun
by Heinrich Schuchardt 25 Feb '21

25 Feb '21

When copying to a u32 field we should use sizeof(u32) and not sizeof(*u32) in memcpy. On 64bit systems like cortina_presidio-asic-emmc_defconfig using sizeof(*u32) leads to a buffer overrun. Fixes: febe13b438b3 ("net: cortina_ni: Add eth support for Cortina Access CAxxxx SoCs") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/net/cortina_ni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/cortina_ni.c b/drivers/net/cortina_ni.c index ee424d95bc..ef6ecd88b0 100644 --- a/drivers/net/cortina_ni.c +++ b/drivers/net/cortina_ni.c @@ -713,7 +713,7 @@ static int cortina_eth_recv(struct udevice *dev, int flags, uchar **packetp) priv->rx_xram_end_adr); memcpy(&packet_status, rx_xram_ptr, - sizeof(rx_xram_ptr)); + sizeof(*rx_xram_ptr)); if (packet_status.valid == 0) { debug("%s: Invalid Packet !!, ", __func__); debug("next_link=%d\n", next_link); -- 2.30.0

3 2

[PATCH 1/1] mtd: rawnand: cortina_nand: missing initialization
by Heinrich Schuchardt 25 Feb '21

25 Feb '21

ca_do_bch_correction() takes a random value from the stack and starts counting bitflips from this value. Initialize the counter. This passed unnoticed as the value is finally ignored in the call hierarchy. Fixes: 161df94b3c43 ("mtd: rawnand: cortina_nand: Add Cortina CAxxxx SoC support") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/mtd/nand/raw/cortina_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/cortina_nand.c b/drivers/mtd/nand/raw/cortina_nand.c index 12bd1ded83..81fa8788a4 100644 --- a/drivers/mtd/nand/raw/cortina_nand.c +++ b/drivers/mtd/nand/raw/cortina_nand.c @@ -546,7 +546,7 @@ static int ca_do_bch_correction(struct nand_chip *chip, struct nand_drv *info = (struct nand_drv *)nand_get_controller_data(chip); unsigned int reg_v, err_loc0, err_loc1; - int k, max_bitflips; + int k, max_bitflips = 0; for (k = 0; k < (err_num + 1) / 2; k++) { reg_v = readl(&info->reg->flash_nf_bch_error_loc01 + k); -- 2.30.0

2 1

[PATCH 1/1] dm: ddr: socfpga: don't assign values that are not used
by Heinrich Schuchardt 25 Feb '21

25 Feb '21

The values of left_edge[0] and right_edge[0] are overwritten before they are used. Remove the superfluous assignments. Fixes: 285b3cb939a8 ("dm: ddr: socfpga: fix gen5 ddr driver to not use bss") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/ddr/altera/sequencer.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 2dbde49a9c..6b9b2e9094 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -3202,13 +3202,6 @@ rw_mgr_mem_calibrate_writes_center(struct socfpga_sdrseq *seq, /* Centre DM */ debug_cond(DLEVEL >= 2, "%s:%d write_center: DM\n", __func__, __LINE__); - /* - * Set the left and right edge of each bit to an illegal value. - * Use (seq->iocfg->io_out1_delay_max + 1) as an illegal value. - */ - left_edge[0] = seq->iocfg->io_out1_delay_max + 1; - right_edge[0] = seq->iocfg->io_out1_delay_max + 1; - /* Search for the/part of the window with DM shift. */ search_window(seq, 1, rank_bgn, write_group, &bgn_curr, &end_curr, &bgn_best, &end_best, &win_best, 0); -- 2.30.0

3 2

[PATCH] lib: sha512: include "compiler.h"
by Siew Chin Lim 25 Feb '21

25 Feb '21

Include "compiler.h" in sha512.c. This is needed by 'cpu_to_be64' macro that used in 'sha512_base_do_finalize' function. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim(a)intel.com> --- lib/sha512.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/sha512.c b/lib/sha512.c index f1e2acf0fb..35f31e3dc5 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -16,6 +16,7 @@ #else #include <string.h> #endif /* USE_HOSTCC */ +#include <compiler.h> #include <watchdog.h> #include <u-boot/sha512.h> -- 2.13.0

3 2

[PATCH] rng: iProc rng200: Rename ..._platdata variables to just ..._plat
by Peter Robinson 25 Feb '21

25 Feb '21

In 8a8d24bd Simon dropped data from all the various _platdata calls but it seems this wasn't caught for the RNG200 driver from when it was posted to merged. This fixes that issue. Fixes: 537f0018 (rng: Add iProc RNG200 driver) Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- drivers/rng/iproc_rng200.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c index f71f285f53..1126bbd797 100644 --- a/drivers/rng/iproc_rng200.c +++ b/drivers/rng/iproc_rng200.c @@ -33,11 +33,11 @@ #define RNG_FIFO_COUNT_OFFSET 0x24 #define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK 0x000000FF -struct iproc_rng200_platdata { +struct iproc_rng200_plat { fdt_addr_t base; }; -static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable) +static void iproc_rng200_enable(struct iproc_rng200_plat *pdata, bool enable) { fdt_addr_t rng_base = pdata->base; u32 val; @@ -52,7 +52,7 @@ static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable writel(val, rng_base + RNG_CTRL_OFFSET); } -static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata) +static void iproc_rng200_restart(struct iproc_rng200_plat *pdata) { fdt_addr_t rng_base = pdata->base; u32 val; @@ -84,7 +84,7 @@ static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata) static int iproc_rng200_read(struct udevice *dev, void *data, size_t len) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); char *buf = (char *)data; u32 num_remaining = len; u32 status; @@ -136,7 +136,7 @@ static int iproc_rng200_read(struct udevice *dev, void *data, size_t len) static int iproc_rng200_probe(struct udevice *dev) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); iproc_rng200_enable(priv, true); @@ -145,16 +145,16 @@ static int iproc_rng200_probe(struct udevice *dev) static int iproc_rng200_remove(struct udevice *dev) { - struct iproc_rng200_platdata *priv = dev_get_plat(dev); + struct iproc_rng200_plat *priv = dev_get_plat(dev); iproc_rng200_enable(priv, false); return 0; } -static int iproc_rng200_ofdata_to_platdata(struct udevice *dev) +static int iproc_rng200_of_to_plat(struct udevice *dev) { - struct iproc_rng200_platdata *pdata = dev_get_plat(dev); + struct iproc_rng200_plat *pdata = dev_get_plat(dev); pdata->base = dev_read_addr(dev); if (!pdata->base) @@ -180,6 +180,6 @@ U_BOOT_DRIVER(iproc_rng200_rng) = { .ops = &iproc_rng200_ops, .probe = iproc_rng200_probe, .remove = iproc_rng200_remove, - .plat_auto = sizeof(struct iproc_rng200_platdata), - .of_to_plat = iproc_rng200_ofdata_to_platdata, + .priv_auto = sizeof(struct iproc_rng200_plat), + .of_to_plat = iproc_rng200_of_to_plat, }; -- 2.29.2

4 5