December 2018 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: LoadImage: always allocate new pages
by Heinrich Schuchardt 28 Dec '18

28 Dec '18

If we want to properly unload images in Exit() the memory should always be allocated in the same way. As we allocate memory when reading from file we should do the same when the original image is in memory. Further patches will be needed: - use LoadImage() in bootefi and bootmgr - implement correct unloading of images in Exit() Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_loader.h | 2 +- lib/efi_loader/efi_bootmgr.c | 2 +- lib/efi_loader/efi_boottime.c | 56 ++++++++++++++++++++++++----------- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index d4412d30bf..3525b65f49 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -391,7 +391,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, struct efi_loaded_image_obj **handle_ptr, struct efi_loaded_image **info_ptr); efi_status_t efi_load_image_from_path(struct efi_device_path *file_path, - void **buffer); + void **buffer, efi_uintn_t *size); /* Print information about all loaded images */ void efi_print_image_infos(void *pc); diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index a095df3f54..196116b547 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -150,7 +150,7 @@ static void *try_load_entry(uint16_t n, struct efi_device_path **device_path, debug("%s: trying to load \"%ls\" from %pD\n", __func__, lo.label, lo.file_path); - ret = efi_load_image_from_path(lo.file_path, &image); + ret = efi_load_image_from_path(lo.file_path, &image, &size); if (ret != EFI_SUCCESS) goto error; diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index de746a2d48..37f0f0e338 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1578,17 +1578,19 @@ failure: /** * efi_load_image_from_path() - load an image using a file path - * @file_path: the path of the image to load - * @buffer: buffer containing the loaded image + * @file_path: the path of the image to load + * @buffer: buffer containing the loaded image + * @size: size of the loaded image * * Return: status code */ efi_status_t efi_load_image_from_path(struct efi_device_path *file_path, - void **buffer) + void **buffer, efi_uintn_t *size) { struct efi_file_info *info = NULL; struct efi_file_handle *f; static efi_status_t ret; + u64 addr; efi_uintn_t bs; f = efi_file_from_path(file_path); @@ -1606,22 +1608,21 @@ efi_status_t efi_load_image_from_path(struct efi_device_path *file_path, if (ret != EFI_SUCCESS) goto error; - ret = efi_allocate_pool(EFI_LOADER_DATA, info->file_size, buffer); - if (ret) + ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, + EFI_RUNTIME_SERVICES_CODE, + efi_size_in_pages(), &addr); + if (ret != EFI_SUCCESS) { + ret = EFI_OUT_OF_RESOURCES; goto error; + } + *buffer = (void *)(uintptr_t)addr; bs = info->file_size; EFI_CALL(ret = f->read(f, &bs, *buffer)); error: - free(info); EFI_CALL(f->close(f)); - if (ret != EFI_SUCCESS) { - efi_free_pool(*buffer); - *buffer = NULL; - } - return ret; } @@ -1648,6 +1649,7 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, efi_uintn_t source_size, efi_handle_t *image_handle) { + struct efi_device_path *dp, *fp; struct efi_loaded_image *info = NULL; struct efi_loaded_image_obj **image_obj = (struct efi_loaded_image_obj **)image_handle; @@ -1667,9 +1669,10 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, } if (!source_buffer) { - struct efi_device_path *dp, *fp; - - ret = efi_load_image_from_path(file_path, &source_buffer); + ret = efi_load_image_from_path(file_path, &source_buffer, + &source_size); + if (ret == EFI_OUT_OF_RESOURCES) + goto error; if (ret != EFI_SUCCESS) goto failure; /* @@ -1677,26 +1680,43 @@ static efi_status_t EFIAPI efi_load_image(bool boot_policy, * file parts: */ efi_dp_split_file_path(file_path, &dp, &fp); - ret = efi_setup_loaded_image(dp, fp, image_obj, &info); - if (ret != EFI_SUCCESS) - goto failure; } else { /* In this case, file_path is the "device" path, i.e. * something like a HARDWARE_DEVICE:MEMORY_MAPPED */ - ret = efi_setup_loaded_image(file_path, NULL, image_obj, &info); + u64 addr; + void *dest_buffer; + + ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, + EFI_RUNTIME_SERVICES_CODE, + efi_size_in_pages(source_size), &addr); if (ret != EFI_SUCCESS) goto error; + dest_buffer = (void *)(uintptr_t)addr; + memcpy(dest_buffer, source_buffer, source_size); + source_buffer = dest_buffer; + + dp = file_path; + fp = NULL; } + ret = efi_setup_loaded_image(dp, fp, image_obj, &info); + if (ret != EFI_SUCCESS) + goto failure; (*image_obj)->entry = efi_load_pe(*image_obj, source_buffer, info); if (!(*image_obj)->entry) { ret = EFI_UNSUPPORTED; goto failure; } + /* Update the type of the allocated memory */ + efi_add_memory_map((uintptr_t)source_buffer, + efi_size_in_pages(source_size), + info->image_code_type, false); info->system_table = &systab; info->parent_handle = parent_image; return EFI_EXIT(EFI_SUCCESS); failure: + efi_free_pages((uintptr_t)source_buffer, + efi_size_in_pages(source_size)); efi_delete_handle(*image_handle); *image_handle = NULL; free(info); -- 2.19.2

1 0

Re: [U-Boot] U-Boot 2018.09 imx6ull mass storage issue
by Lukasz Majewski 28 Dec '18

28 Dec '18

Hi Michał, > Hi Lukasz, > > On 27.12.2018 00:17, Lukasz Majewski wrote: > > Hi Michał, > > > >> Hello, > >> > >> I try to load some images from USB flash drive. When issuing/usb > >> start/with the flash drive on to the first USB I get some following > >> information: > >> > >> U-Boot 2018.09-36904-gae57ffc-dirty (Dec 18 2018 - 23:00:37 > >> +0100) > >> > >> CPU: Freescale i.MX6ULL rev1.1 792 MHz (running at 396 MHz) > >> CPU: Industrial temperature grade (-40C to 105C) at 49C > >> Reset cause: POR > >> Model: SomLabs i.MX6 ULL Visionsom > >> Board: SomLabs visionsom 6ull > >> DRAM: 512 MiB > >> NAND: 512 MiB > >> Loading Environment from NAND... *** Warning - bad CRC, using > >> default environmet > >> > >> Video: 800x480x24 > >> In: serial > >> Out: serial > >> Err: serial > >> Net: FEC0 [PRIME] > >> Warning: FEC0 (eth0) using random MAC address - > >> 46:79:2e:d4:3f:03 > >> > >> Somlabs iMX6ULL # usb start > >> starting USB... > >> USB0: USB EHCI 1.00 > >> USB1: USB EHCI 1.00 > >> scanning bus 0 for devices... 1 USB Device(s) found > >> scanning bus 1 for devices... EHCI timed out on TD - > >> token=0x80008d80 > >> > >> USB device not accepting new address (error=22) > >> 1 USB Device(s) found > >> scanning usb for storage devices... 0 Storage Device(s) found > >> Somlabs iMX6ULL # > >> > >> I'm trying to find the solution on different forums but without > >> success. Hardware is OK because on U-Boot from 2017.03 it works > >> well.Hi Here is a list what I'm trying > >> > >> 1. setenv usb_pgood_delay 10000 > >> 2. Changed max_xfer_blk to 32768, 65535 etc. > >> 3. Adding extra lines into usb_storage.c > >> > >> int gave_extra_time = 0; > >> > >> ... > >> > >> if ((srb->sense_buf[2] == 0x02) && > >> (srb->sense_buf[12] == 0x3a)) > >> return -1; > >> > >> ... > >> > >> /* If the status is "Not Ready - becoming ready", give it > >> * more time. Linux issues a spinup command (once) and gives > >> * it 100 seconds. */ > >> if (srb->sense_buf[2] == 0x02 && srb->sense_buf[12] == 0x04 && > >> gave_extra_time == 0) > >> gave_extra_time = retries = 1000; /* Allow 10 seconds. */ > >> ... > >> > >> mdelay(100); > >> } while (retries--); > >> > >> The problem is with disappearing power supply on USB. > > Maybe you need to check if DTS description of some regulator is > > missing? > > > > From 2017 till now a lot of subsystems have been converted to > > driver model. > > After Your answer me, I checked how are configured enable pins for > the USB > > / pinctrl_usb_otg1: usbotg1grp {// > // fsl,pins = <// > // MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x10b0// > // >;// > // };// > / / > // pinctrl_usb_otg2: usbotg2grp {// > // fsl,pins = <// > // MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x10b0// > // >;// > // };/ > > / reg_usb_otg1_vbus: regulator@2 {// > // compatible = "regulator-fixed";// > // reg = <2>;// > // pinctrl-names = "default";// > // pinctrl-0 = <&pinctrl_usb_otg1>;// > // regulator-name = "usb_otg1_vbus";// > // regulator-min-microvolt = <5000000>;// > // regulator-max-microvolt = <5000000>;// > // gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>;// > // enable-active-high;// > // };// > // > // reg_usb_otg2_vbus: regulator@3 {// > // compatible = "regulator-fixed";// > // reg = <3>;// > // pinctrl-names = "default";// > // pinctrl-0 = <&pinctrl_usb_otg2>;// > // regulator-name = "usb_otg2_vbus";// > // regulator-min-microvolt = <5000000>;// > // regulator-max-microvolt = <5000000>;// > // gpio = <&gpio2 8 GPIO_ACTIVE_HIGH>;// > // enable-active-high;// > // };/ The description seems correct. One thing though - how the VBUS enable/regulator pins are connected? Are those inverted (with some discrete element) on the schematic? > > /&usbotg1 {// > // vbus-supply = <&reg_usb_otg1_vbus>;// > // dr_mode = "host";// > // status = "okay";// > //};// > // > //&usbotg2 {// > // vbus-supply = <&reg_usb_otg2_vbus>;// > // dr_mode = "host";// > // status = "okay";// > //};// > // > //&usbphy1 {// > // tx-d-cal = <0x5>;// > //};// > // > //&usbphy2 {// > // tx-d-cal = <0x5>;// > //};/ > > In meantime I make a hardware measurements and I have a strangle > results. > > For Uboot 2017.03 after issue *usb start* I have a still 3.3V on > > EN1 and EN2 even not connecting anything on USB. This is somewhat strange - as normally (for pre device model u-boot) the voltage shall be enabled in board_usb_init(). > In my u-boot after > boot I have a 3V3 on EN1 and EN2 but when issue *usb start *voltage > drop on both to 0V. This is wrong - as I would expect the opposite behaviour. The voltage shall be applied when one connects the device and run 'usb start'. >When I not connect anything to the USB ports I > have > > /Somlabs iMX6ULL # usb start // > //starting USB... // > //USB0: USB EHCI 1.00 // > //USB1: USB EHCI 1.00 // > //scanning bus 0 for devices... 1 USB Device(s) found // > //scanning bus 1 for devices... 1 USB Device(s) found // ^^^ - this is the internal USB hub (2.0) > // scanning usb for storage devices... 0 Storage Device(s) > found / > > when connect to the USB mass storage device I get > > /Somlabs iMX6ULL # usb start // > //starting USB... // > //USB0: USB EHCI 1.00 // > //USB1: USB EHCI 1.00 // > //scanning bus 0 for devices... 1 USB Device(s) found // > //scanning bus 1 for devices... EHCI timed out on TD - > token=0x80008d80 // //// > // USB device not accepting new address (error=22) // > //1 USB Device(s) found // > // scanning usb for storage devices... 0 Storage Device(s) > found / > > It means that the USB try to do something but for unknown reason > generate a timeout. Without VBUS applied, the timeout is somewhat expected. > How can I debug the problem? I would start with re-checking the schematic and measure if VBUS on the USB connector (not EN1, EN2) changes from 0V to 5V when you issue 'usb start'. > How should look the > professional approach to investigate the problem in my case? You may try to enable debugging (#define DEBUG) in the ehci code for imx6 (ehci-mx6.c). If this doesn't help - then you need to perform bisecting (with git bisect) between working u-boot and the new one (git bisect). > > One message curious me the most "/USB device not accepting new > address (error=22)/" what means not accepting and why? Maybe I have > different problem than power supply?/ Lets first check the _real_ value of VBUS on the output USB connector. > / > > Thanks > > Regards > > Michal > > > > >> The flash drive > >> blinks shortly and disabled at all then. Nothing helps so far. On > >> U-Boot 2017.03 when I issue/usb//start/, the flash drive blinks 2 > >> times and LED in it start beam constantly. Of course, all USB flash > >> drive operations working well. > >> > >> U-Boot is available at GitHub - SoMLabs/somlabs-uboot-imx > >> <https://community.nxp.com/external-link.jspa?url=https%3A%2F%2Fgithub.com%2…> - > >> branch 2018.09 if someone wants to check parameters (draft version) > >> > >> > >> > >> I added some parameters related with usb and mass storage > >> > >> > >> form defconfig > >> > >> > >> CONFIG_CMD_USB=y > >> CONFIG_USB=y > >> CONFIG_DM_USB=y > >> CONFIG_USB_EHCI_HCD=y > >> CONFIG_MXC_USB_OTG_HACTIVE=y > >> CONFIG_CMD_USB_MASS_STORAGE=y > >> CONFIG_USB_STORAGE=y > >> CONFIG_USB_GADGET=y > >> CONFIG_USB_GADGET_MANUFACTURER="SomLabs" > >> CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 > >> CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 > >> CONFIG_CI_UDC=y > >> CONFIG_USB_GADGET_DOWNLOAD=y > >> > >> form dts > >> > >> regulators { > >> compatible = "simple-bus"; > >> #address-cells = <1>; > >> #size-cells = <0>; > >> > >> reg_usb_otg1_vbus: regulator@2 { > >> compatible = "regulator-fixed"; > >> reg = <2>; > >> pinctrl-names = "default"; > >> pinctrl-0 = <&pinctrl_usb_otg1>; > >> regulator-name = "usb_otg1_vbus"; > >> regulator-min-microvolt = <5000000>; > >> regulator-max-microvolt = <5000000>; > >> gpio = <&gpio2 8 GPIO_ACTIVE_HIGH>; > >> enable-active-high; > >> }; > >> > >> reg_usb_otg2_vbus: regulator@3 { > >> compatible = "regulator-fixed"; > >> reg = <3>; > >> pinctrl-names = "default"; > >> pinctrl-0 = <&pinctrl_usb_otg2>; > >> regulator-name = "usb_otg2_vbus"; > >> regulator-min-microvolt = <5000000>; > >> regulator-max-microvolt = <5000000>; > >> gpio = <&gpio2 12 GPIO_ACTIVE_HIGH>; > >> enable-active-high; > >> }; > >> > >> }; > >> > >> pinctrl_usb_otg1: usbotg1grp { > >> fsl,pins = < > >> MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x10b0 > >> >; > >> }; > >> > >> pinctrl_usb_otg2: usbotg2grp { > >> fsl,pins = < > >> MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x10b0 > >> >; > >> }; > >> > >> &usbotg1 { > >> vbus-supply = <&reg_usb_otg1_vbus>; > >> dr_mode = "host"; > >> status = "okay"; > >> }; > >> > >> &usbotg2 { > >> vbus-supply = <&reg_usb_otg2_vbus>; > >> dr_mode = "host"; > >> status = "okay"; > >> }; > >> > >> My board is SomLabs Visionsom option with NAND 512Mb. > >> > >> > >> Thanks in advanced > >> > >> Best Regards > >> > >> Michal > >> > >> _______________________________________________ > >> U-Boot mailing list > >> U-Boot(a)lists.denx.de > >> https://lists.denx.de/listinfo/u-boot > > > > > > > > Best regards, > > > > Lukasz Majewski > > > > -- > > > > DENX Software Engineering GmbH, Managing Director: Wolfgang > > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, > > Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: > > lukma(a)denx.de > Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma(a)denx.de

1 0

[U-Boot] [v2] arm64: lx2160ardb: enable DM support for sata
by Peng Ma 28 Dec '18

28 Dec '18

Enable related configs to support sata DM feature. Signed-off-by: Peng Ma <peng.ma(a)nxp.com> --- Changed for v2: - used moveconfig.py -s -d to sync lx2160ardb_tfa_SECURE_BOOT_defconfig configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 72 ++++++++------------ 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig index b7e3967ad9..fc92959080 100644 --- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -1,16 +1,19 @@ CONFIG_ARM=y CONFIG_TARGET_LX2160ARDB=y CONFIG_SYS_TEXT_BASE=0x82000000 -CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_SYS_MALLOC_F_LEN=0x6000 CONFIG_SECURE_BOOT=y +CONFIG_EMC2305=y +CONFIG_SYS_FSPI_AHB_INIT=y +CONFIG_FSPI_AHB_EN_4BYTE=y +CONFIG_TFABOOT=y CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb" +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_AHCI=y CONFIG_NR_DRAM_BANKS=3 -CONFIG_DM=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_TFABOOT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0,115200 root=/dev/ram0 earlycon=pl011,mmio32,0x21c0000 ramdisk_size=0x2000000 default_hugepagesz=1024m hugepagesz=1024m hugepages=2 pci=pcie_bus_perf" # CONFIG_USE_BOOTCOMMAND is not set @@ -24,63 +27,42 @@ CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_MP=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_NOWHERE=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb" CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_DM_SERIAL=y -CONFIG_SERIAL_PROBE_ALL=y -CONFIG_CONS_INDEX=0 -CONFIG_FSL_CAAM=y +CONFIG_DM=y +CONFIG_SATA_CEVA=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y -CONFIG_SPI=y -CONFIG_DM_SPI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_MICRON=y -CONFIG_SPI_FLASH_USE_4K_SECTORS=n CONFIG_SPI_FLASH_SPANSION=y -CONFIG_NXP_FSPI=y -CONFIG_FSPI_AHB_EN_4BYTE=y -CONFIG_SYS_FSPI_AHB_INIT=y +CONFIG_SPI_FLASH_STMICRO=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHYLIB=y -CONFIG_NETDEVICES=y +CONFIG_PHYLIB_10G=y +CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_ATHEROS=y +CONFIG_PHY_CORTINA=y +CONFIG_PHY_INPHI=y +CONFIG_INPHI_25G=y CONFIG_PHY_GIGE=y -CONFIG_CMD_NET=y -CONFIG_CMD_PING=y -CONFIG_CMD_PXE=y -CONFIG_CMD_MII=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_FAT=y -CONFIG_CMD_EXT2=y +CONFIG_E1000=y CONFIG_PCI=y CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_LX=y -CONFIG_E1000=y -CONFIG_NET=y -CONFIG_DM_MMC=y -CONFIG_DM_MMC_OPS=n -CONFIG_BLK=n +CONFIG_DM_SCSI=y +CONFIG_DM_SERIAL=y +CONFIG_SERIAL_PROBE_ALL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_NXP_FSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y -CONFIG_EFI_LOADER_BOUNCE_BUFFER=y -CONFIG_SCSI_AHCI=y -CONFIG_SCSI=y -# CONFIG_SYS_FSL_DDR_PHY is not set -CONFIG_SYS_GEN2_DDR_PHY=y -CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x6000 -CONFIG_PHYLIB_10G=y -CONFIG_PHY_AQUANTIA=y -CONFIG_PHY_CORTINA=y -CONFIG_PHY_ATHEROS=y -CONFIG_PHY_INPHI=y -CONFIG_INPHI_25G=y -CONFIG_HUSH_PARSER=y -CONFIG_EMC2305=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_EFI_LOADER_BOUNCE_BUFFER=y -- 2.17.1

1 0

[U-Boot] [PATCH] rockchip: sdram-common: fix size for 4GB in 32bit SoC
by Kever Yang 28 Dec '18

28 Dec '18

System will get size '0' in 32bit system if the size is 4GB for the address is 32bit only, return the max space available instead of actual DDR size in rockchip_sdram_size(). Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/sdram_common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-rockchip/sdram_common.c b/arch/arm/mach-rockchip/sdram_common.c index 650d53e4d9..297859c390 100644 --- a/arch/arm/mach-rockchip/sdram_common.c +++ b/arch/arm/mach-rockchip/sdram_common.c @@ -48,6 +48,13 @@ size_t rockchip_sdram_size(phys_addr_t reg) rank, col, bk, cs0_row, bw, row_3_4); } + /* + * There is always a blob of space reserved for peripheral device near + * 4GB, this can avoid system get 0byte for 4GB ran in 32bit system. + */ + if (size_mb > (SDRAM_MAX_SIZE >> 20)) + size_mb = (SDRAM_MAX_SIZE >> 20); + return (size_t)size_mb << 20; } -- 2.20.1

2 2

[U-Boot] [PULL 2019.01] efi patch queue 2018-12-27
by Alexander Graf 28 Dec '18

28 Dec '18

Hi Tom, This is my current patch queue for efi against v2019.01. Please pull. Alex The following changes since commit 1f2e948d6d53f77a2ddb2dde3531b0d5bc2815ad: Prepare v2019.01-rc2 (2018-12-17 20:25:24 -0500) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-efi-2019.01 for you to fetch changes up to 5c38e05ed8ce468585b3f4aceb4ebf37b904d3f1: efi_loader: Make RTS relocation more robust (2018-12-23 04:02:20 +0100) ---------------------------------------------------------------- Patch queue for efi v2019.01 - 2018-12-27 Three tiny last minute bug fixes: - Fix RTS relocation - Avoid read after free - Fix RTS data positioning (affects BBB) ---------------------------------------------------------------- Alexander Graf (1): efi_loader: Make RTS relocation more robust Heinrich Schuchardt (2): efi_selftest: block device: avoid read after free lib: crc32: mark static variable as __efi_runtime_data lib/crc32.c | 3 ++- lib/efi_loader/efi_runtime.c | 34 +++++++++++++++++++++++++--- lib/efi_selftest/efi_selftest_block_device.c | 10 ++++---- 3 files changed, 38 insertions(+), 9 deletions(-)

2 1

[U-Boot] A20-olinuxino-micro hangs in U-boot if powered from MINI-USB only.
by Nikolai Zhubr 27 Dec '18

27 Dec '18

Hi all, I'm observing that the said A20-onlinuxino-micro board hangs in U-boot in probing USB2 (see example below) in case it is powered by connecting its mini-usb connector to a computer. The problem does not happen if 12V power connector is also empoyed. (Note: the example attached below is for RC1, but RC2 is no different) I can't say if such problem was also present in previous version of u-boot or not. Thank you, Regards, Nikolai U-Boot 2019.01-rc1 (Dec 13 2018 - 15:11:11 +0300) Allwinner Technology CPU: Allwinner A20 (SUN7I) Model: Olimex A20-Olinuxino Micro I2C: ready DRAM: 1 GiB MMC: SUNXI SD/MMC: 0, SUNXI SD/MMC: 1 Loading Environment from FAT... MMC: no card present In: serial Out: serial Err: serial Net: eth0: ethernet@1c50000 starting USB... USB0: USB EHCI 1.00 USB1: USB OHCI 1.0 USB2:

3 6

[U-Boot] Nokia N900: MTDPARTS_DEFAULT was removed in 43ede0bc (Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT)
by Pali Rohár 27 Dec '18

27 Dec '18

Hello, it seems that MTD partition definitions for Nokia N900 were removed in commit 43ede0bca7fc1590b623832b743213b818257a27 (Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT). See diff: http://git.denx.de/?p=u-boot.git;a=blobdiff;f=include/configs/nokia_rx51.h;… Can you bring them back? Note that those PART*_* macros are used not only for constructing MTDPARTS_DEFAULT, but also for OMAP Nokia N900 atags, which are needed for booting Maemo 5. -- Pali Rohár pali.rohar(a)gmail.com

2 8

[U-Boot] Nokia N900: Broken comment after commit 278b90ce (configs: Migrate CONFIG_SYS_TEXT_BASE)
by Pali Rohár 27 Dec '18

27 Dec '18

Hi! Now I spotted that CONFIG_SYS_TEXT_BASE was moved/removed in commit 278b90ce786f73faf29aa522d5d101e1da006378 from include/configs/nokia_rx51.h file, but comment which described value for that macro is still on old place. See diff: http://git.denx.de/?p=u-boot.git;a=blobdiff;f=include/configs/nokia_rx51.h;… Tom, can you move also comment to place where is now CONFIG_SYS_TEXT_BASE value for Nokia N900? Anyway, now I tested in qemu n900 emulator U-Boot version from master git branch and it is still working and able to boot 2.6.28 Maemo kernel! -- Pali Rohár pali.rohar(a)gmail.com

2 7

[U-Boot] [PATCH 1/1] doc: README.commands: sub-commands
by Heinrich Schuchardt 27 Dec '18

27 Dec '18

Describe the implementation of sub-commands. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/README.commands | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/doc/README.commands b/doc/README.commands index 1d29c4d91d..05504092f7 100644 --- a/doc/README.commands +++ b/doc/README.commands @@ -28,6 +28,42 @@ comp: Pointer to the completion function. May be NULL. entering the command arguments to complete the entry. Command completion is only available if CONFIG_AUTO_COMPLETE is defined. +Sub-command definition +---------------------- + +Likewise an array of cmd_tbl_t holding sub-commands can be created using either +of the following macros: + +* U_BOOT_CMD_MKENT(name, maxargs, repeatable, command, "usage", "help") +* U_BOOT_CMD_MKENTCOMPLETE(name, maxargs, repeatable, command, "usage, "help", + comp) + +This table has to be evaluated in the command function of the main command, e.g. + + static cmd_tbl_t cmd_sub[] = { + U_BOOT_CMD_MKENT(foo, CONFIG_SYS_MAXARGS, 1, do_foo, "", ""), + U_BOOT_CMD_MKENT(bar, CONFIG_SYS_MAXARGS, 1, do_bar, "", ""), + }; + + static int do_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + { + cmd_tbl_t *cp; + + if (argc < 2) + return CMD_RET_USAGE; + + /* drop sub-command argument */ + argc--; + argv++; + + cp = find_cmd_tbl(argv[0], cmd_ut_sub, ARRAY_SIZE(cmd_sub)); + + if (cp) + return cp->cmd(cmdtp, flag, argc, argv); + + return CMD_RET_USAGE; + } + Command function ---------------- -- 2.19.2

3 2

[U-Boot] [PATCH] phy: Fix u-boot coruption when fixed-phy is used
by Michal Simek 27 Dec '18

27 Dec '18

When fixed-link phy is used subnode offset is used as phy address. This number is bigger then space allocated for bus structure (allocated via mdio_alloc). bus->phymap[] array has PHY_MAX_ADDR size (32). That's why writing bus->phymap[addr] where addr is < 0 or > PHY_MAX_ADDR is causing write to memory which can caused full U-Boot crash. The patch is checking if address is in correct range. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- search_for_existing_phy() is using this array but there is if check already that's why it shouldn't be a big deal. --- drivers/net/phy/phy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e837eb7688cc..cda4caa8034d 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -656,7 +656,8 @@ static struct phy_device *phy_device_create(struct mii_dev *bus, int addr, phy_probe(dev); - bus->phymap[addr] = dev; + if (addr >= 0 && addr < PHY_MAX_ADDR) + bus->phymap[addr] = dev; return dev; } -- 1.9.1

3 3