May 2018 - U-Boot

[U-Boot] [PATCH 0/4] ahci mvebu driver updates
by make＠marvell.com 25 May '18

25 May '18

From: Ken Ma <make(a)marvell.com> These patches move ahci mvebu driver to drivers/ata directory with bug fixing and scsi supporting. David Sniatkiwicz (1): ata: ahci_mvebu: a8040 a0: remove bad port register offsets workarounds Ken Ma (3): ata: mvebu: move mvebu sata driver to drivers/ata directory ata: ahci_mvebu: add scsi support arm64: mvebu: defconfig: enable CONFIG_AHCI_MVEBU arch/arm/mach-mvebu/Makefile | 1 - arch/arm/mach-mvebu/sata.c | 54 ------------------------- configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + drivers/ata/Kconfig | 9 +++++ drivers/ata/Makefile | 1 + drivers/ata/ahci_mvebu.c | 61 +++++++++++++++++++++++++++++ 9 files changed, 75 insertions(+), 55 deletions(-) delete mode 100644 arch/arm/mach-mvebu/sata.c create mode 100644 drivers/ata/ahci_mvebu.c -- 1.9.1

3 12

[U-Boot] [PATCH v2 0/4] ahci mvebu driver updates
by make＠marvell.com 25 May '18

25 May '18

From: Ken Ma <make(a)marvell.com> These patches move ahci mvebu driver to drivers/ata directory with bug fixing and scsi supporting. Changes in v2: - Add MAINTAINERS updating David Sniatkiwicz (1): ata: ahci_mvebu: a8040 a0: remove bad port register offsets workarounds Ken Ma (3): ata: mvebu: move mvebu sata driver to drivers/ata directory ata: ahci_mvebu: add scsi support arm64: mvebu: defconfig: enable CONFIG_AHCI_MVEBU MAINTAINERS | 1 + arch/arm/mach-mvebu/Makefile | 1 - configs/mvebu_db-88f3720_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + drivers/ata/Kconfig | 9 ++++++++ drivers/ata/Makefile | 1 + .../mach-mvebu/sata.c => drivers/ata/ahci_mvebu.c | 25 ++++++++++++++-------- 9 files changed, 31 insertions(+), 10 deletions(-) rename arch/arm/mach-mvebu/sata.c => drivers/ata/ahci_mvebu.c (63%) -- 1.9.1

3 9

[U-Boot] Please pull ARC changes
by Alexey Brodkin 25 May '18

25 May '18

Hi Tom, The following changes since commit 8a9dc16e4d07d29fff08b7caca36f0865065f7f7: spl: Add full fitImage support (2018-05-23 22:06:42 -0400) are available in the Git repository at: git://git.denx.de/u-boot-arc.git tags/arc-uart-updates-for-2018.07-rc1 for you to fetch changes up to 0556b569e52caf3ab519c340435236e4940cc1cd: ARC: Enable debug UART on nSIM boards (2018-05-24 15:59:17 +0300) ---------------------------------------------------------------- Add support for DEBUG_UART on ARC devboards This required us to do 2 things: 1) Insert a call to debug_uart_init() in early boot code 2) Convert serial_arc to Kconfig Once both items above are done we just patched defconfigs. ---------------------------------------------------------------- Alexey Brodkin (3): serial: Convert ARC_SERIAL to Kconfig serial/serial_arc: Implement debug serial ARC: Enable debug UART on nSIM boards Eugeniy Paltsev (2): ARC: init debug uart in early common arc code ARC: enable debug uart for HSDK and AXS10x boards arch/arc/lib/start.S | 5 +++++ configs/axs101_defconfig | 5 +++++ configs/axs103_defconfig | 5 +++++ configs/hsdk_defconfig | 5 +++++ configs/nsim_700_defconfig | 5 +++++ configs/nsim_700be_defconfig | 5 +++++ configs/nsim_hs38_defconfig | 5 +++++ configs/nsim_hs38be_defconfig | 5 +++++ drivers/serial/Kconfig | 16 ++++++++++++++++ drivers/serial/serial_arc.c | 26 ++++++++++++++++++++++++++ include/configs/nsim.h | 10 ---------- scripts/config_whitelist.txt | 1 - 12 files changed, 82 insertions(+), 11 deletions(-) -Alexey

2 1

[U-Boot] [PULL] rpi patch queue 2018-05-24
by Alexander Graf 25 May '18

25 May '18

Hi Tom, This is my current patch queue for rpi. Please pull. Alex The following changes since commit dca268a8f987730978e1a23adfd0ac82db341a10: .travis.yml: Further optimizations (2018-05-22 22:08:57 -0400) are available in the git repository at: git://github.com/agraf/u-boot.git tags/signed-rpi-next for you to fetch changes up to 385cbe298a6ddcab2d6cc21fb6a549152572957b: rpi: Change load addresses to make more room for the kernel & DTB (2018-05-24 10:20:53 +0200) ---------------------------------------------------------------- Patch queue for rpi - 2018-05-24 Some minor fixes for the Raspberry Pi: - Fix SD writes on new sdhost controller - Sanitize default load addresses, allowing for better payload placement ---------------------------------------------------------------- Alexander Graf (2): rpi: Adjust fdt_addr_r to a sane address mmc: Unirqify bcm2835_sdhost and fix writes Tuomas Tynkkynen (1): rpi: Change load addresses to make more room for the kernel & DTB drivers/mmc/bcm2835_sdhost.c | 265 ++++++++----------------------------------- include/configs/rpi.h | 61 ++++++---- 2 files changed, 83 insertions(+), 243 deletions(-)

2 1

[U-Boot] usb: Fail to get descriptor for USB 2.0 device
by DATACOM - Paulo.Zaneti 25 May '18

25 May '18

Hi, When trying to migrate a board from u-boot version 2016.09 to version 2018.03, I found a problem with a USB 2.0 device which used to work on version 2016.09. In u-boot version 2016.09 the device appears like this: 2: Mass Storage, USB Revision 2.0 - SanDisk Cruzer Blade 200443243002FB509E64 - Class: (from Interface) Mass Storage - PacketSize: 64 Configurations: 1 - Vendor: 0x0781 Product 0x5567 Version 1.38 Configuration: 1 - Interfaces: 1 Bus Powered 200mA Interface: 0 - Alternate Setting 0, Endpoints: 2 - Class Mass Storage, Transp. SCSI, Bulk only - Endpoint 1 In Bulk MaxPacket 512 - Endpoint 2 Out Bulk MaxPacket 512 But in version 2018.03 I just can't start usb. It fails with following error: => usb start starting USB... USB0: USB EHCI 1.00 scanning bus 0 for devices... EHCI timed out on TD - token=0x80008c80 unable to get device descriptor (error=-1) 1 USB Device(s) found USB1: USB EHCI 1.00 scanning bus 1 for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found I did a "git bisect" and found that this problem is related to the following commit: c008faa usb: Only get 64 bytes device descriptor for full speed devices I am not an expert on USB, so I would like to ask for help on this issue. In u-boot v2018.03, file common/usb.c, line 973, shouldn't the comparison be like this: if (do_read && dev->speed >= USB_SPEED_FULL) { or, at list: if (do_read && (dev->speed == USB_SPEED_FULL || dev->speed == USB_SPEED_HIGH)) { I would submit a patch for this, but I lack on USB knowledge for explaining the patch.

3 11

[U-Boot] [PATCH] rpi: Adjust fdt_addr_r to a sane address
by Alexander Graf 24 May '18

24 May '18

Back in the old days, 0x100 was used as the address to pass the device tree from firmware into the kernel. This has since changed to a more dynamic location, so using 0x100 actually breaks more things than it helps with. Let's move the device tree default location for distro boot to a more sane place that gives us enough head room in low memory. Reported-by: Tuomas Tynkkynen <tuomas(a)tuxera.com> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- include/configs/rpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 325e52a019..fcf7e0976b 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -124,7 +124,7 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "fdt_high=ffffffff\0" \ "initrd_high=ffffffff\0" \ - "fdt_addr_r=0x00000100\0" \ + "fdt_addr_r=0x01f00000\0" \ "pxefile_addr_r=0x00100000\0" \ "kernel_addr_r=0x01000000\0" \ "scriptaddr=0x02000000\0" \ -- 2.12.3

2 10

[U-Boot] [PATCH] rockchip: xhci: remove DTS parsing for PHY (which is unused)
by Philipp Tomsich 24 May '18

24 May '18

The xhci wrapper-driver for Rockchip searches the DTS to find its child node compatbile with 'rockchip,rk3399-usb3-phy' to retrieve the base-address of the PHY. However, this is currently broken (and always has been), returning NULL. However, the (wrongly) retrieved base-address is never used. We thus remove this code for now. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/usb/host/xhci-rockchip.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c index 060a6c4..f19bea3 100644 --- a/drivers/usb/host/xhci-rockchip.c +++ b/drivers/usb/host/xhci-rockchip.c @@ -17,7 +17,6 @@ struct rockchip_xhci_platdata { fdt_addr_t hcd_base; - fdt_addr_t phy_base; struct udevice *vbus_supply; }; @@ -35,7 +34,6 @@ struct rockchip_xhci { static int xhci_usb_ofdata_to_platdata(struct udevice *dev) { struct rockchip_xhci_platdata *plat = dev_get_platdata(dev); - struct udevice *child; int ret = 0; /* @@ -47,20 +45,6 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev) return -ENXIO; } - /* Get the base address for usbphy from the device node */ - for (device_find_first_child(dev, &child); child; - device_find_next_child(&child)) { - if (!device_is_compatible(child, "rockchip,rk3399-usb3-phy")) - continue; - plat->phy_base = devfdt_get_addr(child); - break; - } - - if (plat->phy_base == FDT_ADDR_T_NONE) { - pr_err("Can't get the usbphy register address\n"); - return -ENXIO; - } - /* Vbus regulator */ ret = device_get_supply_regulator(dev, "vbus-supply", &plat->vbus_supply); -- 2.1.4

2 1

[U-Boot] [PATCH 1/3] mvebu: pinctrl: sync compatible string with Linux 4.17-rc4
by xswang＠marvell.com 24 May '18

24 May '18

From: Evan Wang <xswang(a)marvell.com> Signed-off-by: Evan Wang <xswang(a)marvell.com> --- arch/arm/dts/armada-ap806.dtsi | 2 +- arch/arm/dts/armada-cp110-master.dtsi | 4 ++-- arch/arm/dts/armada-cp110-slave.dtsi | 2 +- .../pinctrl/marvell,mvebu-pinctrl.txt | 16 ++++++++-------- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi index e0d3016..ebdee51 100644 --- a/arch/arm/dts/armada-ap806.dtsi +++ b/arch/arm/dts/armada-ap806.dtsi @@ -141,7 +141,7 @@ }; ap_pinctl: ap-pinctl@6F4000 { - compatible = "marvell,armada-ap806-pinctrl"; + compatible = "marvell,ap806-pinctrl"; bank-name ="apn-806"; reg = <0x6F4000 0x10>; pin-count = <20>; diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi index 8c336f2..551d00d 100644 --- a/arch/arm/dts/armada-cp110-master.dtsi +++ b/arch/arm/dts/armada-cp110-master.dtsi @@ -120,8 +120,8 @@ cpm_pinctl: cpm-pinctl@440000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl"; + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl"; bank-name ="cp0-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi index 0cdb3d3..2ea9004 100644 --- a/arch/arm/dts/armada-cp110-slave.dtsi +++ b/arch/arm/dts/armada-cp110-slave.dtsi @@ -120,7 +120,7 @@ cps_pinctl: cps-pinctl@440000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a80x0-cp1-pinctrl"; + "marvell,armada-8k-cps-pinctrl"; bank-name ="cp1-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt index 5f86c0a..1fc1bc6 100644 --- a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt +++ b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt @@ -6,10 +6,10 @@ mpp pins or group of pins and a mpp function common to all pins. Required properties for the pinctrl driver: - compatible: "marvell,mvebu-pinctrl", - "marvell,armada-ap806-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl", - "marvell,a80x0-cp1-pinctrl" + "marvell,ap806-pinctrl", + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl", + "marvell,armada-8k-cps-pinctrl" - bank-name: A string defining the pinc controller bank name - reg: A pair of values defining the pin controller base address and the address space @@ -31,7 +31,7 @@ Example: config-space { pinctl: pinctl@6F4000 { compatible = "marvell,mvebu-pinctrl", - "marvell,armada-ap806-pinctrl"; + "marvell,ap806-pinctrl"; bank-name ="apn-806"; reg = <0x6F4000 0x10>; pin-count = <20>; @@ -52,8 +52,8 @@ Example: config-space { cpm_pinctl: pinctl@44000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a70x0-pinctrl", - "marvell,a80x0-cp0-pinctrl"; + "marvell,armada-7k-pinctrl", + "marvell,armada-8k-cpm-pinctrl"; bank-name ="cp0-110"; reg = <0x440000 0x20>; pin-count = <63>; @@ -89,7 +89,7 @@ Example: config-space { cps_pinctl: pinctl@44000 { compatible = "marvell,mvebu-pinctrl", - "marvell,a80x0-cp1-pinctrl"; + "marvell,armada-8k-cps-pinctrl"; bank-name ="cp1-110"; reg = <0x440000 0x20>; pin-count = <63>; diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c index ec19583..556bf78 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c @@ -162,10 +162,10 @@ static struct pinctrl_ops mvebu_pinctrl_ops = { static const struct udevice_id mvebu_pinctrl_ids[] = { { .compatible = "marvell,mvebu-pinctrl" }, - { .compatible = "marvell,armada-ap806-pinctrl" }, - { .compatible = "marvell,a70x0-pinctrl" }, - { .compatible = "marvell,a80x0-cp0-pinctrl" }, - { .compatible = "marvell,a80x0-cp1-pinctrl" }, + { .compatible = "marvell,ap806-pinctrl" }, + { .compatible = "marvell,armada-7k-pinctrl" }, + { .compatible = "marvell,armada-8k-cpm-pinctrl" }, + { .compatible = "marvell,armada-8k-cps-pinctrl" }, { } }; -- 1.9.1

2 5

[U-Boot] [PATCH v6 00/18] Add fastboot UDP support
by Alex Kiernan 24 May '18

24 May '18

This series merges the fastboot UDP support from AOSP into mainline U-Boot. Changes in UDP behaviour from the AOSP code, so it follows the existing USB behaviour: - 'boot' now follows the USB code and does 'bootm CONFIG_FASTBOOT_BUF_ADDR'. I've added 'fastboot_bootcmd' which if set overrides the boot command and allows the existing UDP behaviour to be preserved. - 'continue' in UDP now exits the fastboot server rather than executing 'run bootcmd' - 'reboot-bootloader' no longer writes 'reboot-bootloader' to CONFIG_FASTBOOT_BUF_ADDR as its marker for the subsequent boot. The code which is in AOSP common/android_bootloader.c expects this marker, but we have prior art in the USB code using the weak function fastboot_set_reboot_flag - 'getvar' in the UDP path now supports fetching 'fastboot.' prefixed variables (inherited from the USB path), these override the defaults I've pushed both USB and UDP into a single consolidated protocol layer now I've tested it on a BeagleBone Green. Green Travis build: https://travis-ci.org/akiernan/u-boot/builds/381854592 Changes in v6: - accomodate master change and switch dependency on imx6dl_mamoj from FASTBOOT to USB_FUNCTION_FASTBOOT - delete redundant FASTBOOT_FLASH_NAND_DEV symbol - add docbook comments - add docbook comments - rename fastboot_download_data() to fastboot_data_download(), rename fastboot_get_bytes_remaining() to fastboot_data_remaining() - split fastboot_data_complete() out from fastboot_data_download() so we can call it at the end of the transfer phase for USB - merged from RFC USB fastboot series - when entering the DATA phase ensure we actually install the correct handler - on completion of DATA call new fastboot_data_complete() - previous changes: - remove redundant version.h - use new fastboot_get_bytes_remaining() function - new Changes in v5: - don't depend on UDP_FUNCTION_FASTBOOT until it exists - squash in subsequent patch which updates defconfigs so we don't leave users of CONFIG_FASTBOOT without it enabled - fix build in drivers/fastboot when we have CONFIG_FASTBOOT without flash or erase and we've not yet added fb_common.c to the build - fix docbook formatting - new - new - rename CONFIG_FASTBOOT_FLASH_FILLBUF_SIZE to CONFIG_IMAGE_SPARSE_FILLBUF_SIZE and migrate it to Kconfig. - make fastboot_bytes_received/expected static and add function fastboot_get_bytes_remaining() - move fastboot_buf_addr/fastboot_buf_size/fastboot_progress_callback into fastboot-internal.h - delete redundant fb_ prefixes from statics - new Changes in v4: - add docbook comments - leave strcmp_l1() in USB fastboot as we don't need it in UDP path - add docbook comments - new - guard fb_getvar/fb_command with UDP_FUNCTION_FASTBOOT in Makefile - add docbook comments - remove parameter from fastboot_boot() since we always want fastboot_buf_addr (and if we're using fastboot_bootcmd then it's ignored) - split oem format into new patch Changes in v3: - move imply ANDROID_BOOT_IMAGE, CMD_FASTBOOT to FASTBOOT from USB_FUNCTION_FASTBOOT - add depend on USB_FUNCTION_FASTBOOT to FASTBOOT_USB_DEV - leave images-sparse.c in common to acommodate 2f83f21 - refactor for changes in master - Merge subsequent patch for formatting response strings into this one - allow NULL to fastboot_okay() when there's no message to send - guard FASTBOOT_GPT_NAME/FASTBOOT_MBR_NAME with EFI/DOS_PARTITION - new - new - new - new - new - new - use FASTBOOT as our guard in Kconfig not a list of USB || UDP - correct mis-translation from AOSP introduced when cleaning up for checkpatch - we should write when buffer is not NULL, rather than erasing, and erase when buffer is NULL - use CMD_RET_USAGE from do_fastboot - remove do_fastboot_udp from cmd/net.c and rewrite using net_loop() - rename timed_send_info to fastboot_send_info, rename fastboot_send_info to fastboot_udp_send_info - replace FASTBOOT_HEADER_SIZE with sizeof(struct fastboot_header) - move start time into timed_send_info() rather than passing it in - make calls to fastboot_udp_send_info a runtime dependency, not a compile time one - set ${filesize} to size of downloaded image - add progress meter from USB path during download - add support for 'oem format' command from the USB path - rename 'fastbootcmd' to 'fastboot_bootcmd' to make clear that this is the fastboot boot command - make getvar implementation table driven - add fastboot_buf_addr, fastboot_buf_size to override buffer address and size - return correct filesystem type in getvar partition-type on MMC - process "fastboot." prefixed env variables in getvar first so you can override the normal values (this also lets you set a fs type for NAND devices) - squash subsequent patches which change this code into this one: - If the fastboot flash/erase commands are disabled, remove that support so we still build correctly. - Add NAND support to fastboot UDP flash/erase commands - If we don't have a partition name passed, report it as not found. - Change the behaviour of the fastboot net code such that "reboot-bootloader" is no longer written to CONFIG_FASTBOOT_BUF_ADDR for use as a marker on reboot (the AOSP code in common/android-bootloader.c uses this marker - this code could be reinstated there if that gets merged). - Merge USB and UDP boot code. The USB implementation stays the same, but UDP no longer passes an fdt. We introduce a new environment variable 'fastboot_bootcmd' which if set overrides the hardcoded boot command, setting this then allows the UDP implementation to remain the same. If after running 'fastboot_bootcmd' the board has not booted, control is returned to U-Boot and the fastboot process ends. - Separate the fastboot protocol handling from the fastboot UDP code in preparation for reusing it in the USB code. Changes in v2: - ensure fastboot syntax is backward compatible - 'fastboot 0' means 'fastboot usb 0' Alex Kiernan (18): fastboot: Move fastboot to drivers/fastboot fastboot: Refactor fastboot_okay/fail to take response fastboot: Extract fastboot_okay/fail to fb_common.c fastboot: Correct dependencies in FASTBOOT_FLASH fastboot: Add missing newlines fastboot: Remove FIXME for CONFIG_FASTBOOT_...NAME fastboot: Fix parameter types in _fb_nand_write fastboot: Rename fb_set_reboot_flag to fastboot_set_reboot_flag fastboot: Extract common definitions from USB fastboot fastboot: Rename public fb_ functions to fastboot_ ti: fastboot: Move weak overrides to board files fs: Add fs_get_type_name to return current filesystem name fastboot: Migrate FASTBOOT_FLASH_NAND_TRIMFFS to Kconfig mmc: Separate "mmc swrite" from fastboot net: fastboot: Merge AOSP UDP fastboot fastboot: Add support for 'oem format' command usb: fastboot: Convert USB f_fastboot to shared fastboot fastboot: Update fastboot documentation arch/arm/Kconfig | 2 - arch/arm/mach-omap2/boot-common.c | 10 - arch/arm/mach-omap2/utils.c | 4 +- arch/arm/mach-rockchip/rk3128-board.c | 4 +- arch/arm/mach-rockchip/rk322x-board.c | 4 +- board/amazon/kc1/kc1.c | 2 +- board/lg/sniper/sniper.c | 2 +- board/ti/am57xx/board.c | 10 + board/ti/common/Kconfig | 1 - board/ti/dra7xx/evm.c | 10 + cmd/Kconfig | 22 +- cmd/fastboot.c | 91 ++++- cmd/mmc.c | 14 +- common/Makefile | 14 - configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_evm_nor_defconfig | 2 +- configs/am335x_evm_norboot_defconfig | 2 +- configs/am335x_evm_spiboot_defconfig | 2 +- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- configs/bcm23550_w1d_defconfig | 2 +- configs/bcm28155_ap_defconfig | 2 +- configs/birdland_bav335a_defconfig | 2 +- configs/birdland_bav335b_defconfig | 2 +- configs/cgtqmx6eval_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 2 +- configs/kc1_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/omap3_beagle_defconfig | 2 +- configs/omap3_evm_defconfig | 2 +- configs/omap3_logic_defconfig | 2 +- configs/sniper_defconfig | 2 +- configs/stih410-b2260_defconfig | 2 +- .../xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 2 +- .../xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revA_defconfig | 2 +- configs/xilinx_zynqmp_zcu102_revB_defconfig | 2 +- configs/xilinx_zynqmp_zcu106_revA_defconfig | 2 +- doc/README.android-fastboot | 240 +++++++----- drivers/Kconfig | 2 + drivers/Makefile | 1 + {cmd => drivers}/fastboot/Kconfig | 63 ++-- drivers/fastboot/Makefile | 7 + drivers/fastboot/fb_command.c | 335 +++++++++++++++++ drivers/fastboot/fb_common.c | 169 +++++++++ drivers/fastboot/fb_getvar.c | 230 ++++++++++++ {common => drivers/fastboot}/fb_mmc.c | 216 +++++++---- {common => drivers/fastboot}/fb_nand.c | 69 +++- drivers/usb/gadget/f_fastboot.c | 347 ++---------------- fs/fs.c | 13 + include/fastboot-internal.h | 36 ++ include/fastboot.h | 137 ++++++- include/fb_mmc.h | 35 +- include/fb_nand.h | 37 +- include/fs.h | 10 + include/image-sparse.h | 4 +- include/net.h | 2 +- include/net/fastboot.h | 21 ++ lib/Kconfig | 11 + lib/Makefile | 1 + {common => lib}/image-sparse.c | 38 +- net/Makefile | 1 + net/fastboot.c | 317 ++++++++++++++++ net/net.c | 7 + scripts/config_whitelist.txt | 2 - 78 files changed, 1988 insertions(+), 627 deletions(-) rename {cmd => drivers}/fastboot/Kconfig (78%) create mode 100644 drivers/fastboot/Makefile create mode 100644 drivers/fastboot/fb_command.c create mode 100644 drivers/fastboot/fb_common.c create mode 100644 drivers/fastboot/fb_getvar.c rename {common => drivers/fastboot}/fb_mmc.c (62%) rename {common => drivers/fastboot}/fb_nand.c (71%) create mode 100644 include/fastboot-internal.h create mode 100644 include/net/fastboot.h rename {common => lib}/image-sparse.c (88%) create mode 100644 net/fastboot.c -- 2.17.0

3 25

[U-Boot] [PATCH v4] efi_loader: fix off-by-one bug in efi_get_variable
by Ivan Gorinov 24 May '18

24 May '18

efi_get_variable() always stores an extra zero byte after the output data. When the returned data size matches the output buffer size, the extra zero byte is stored past the end of the output buffer. Signed-off-by: Ivan Gorinov <ivan.gorinov(a)intel.com> --- lib/efi_loader/efi_variable.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 6c177da..9e7d3e6 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -50,7 +50,7 @@ (strlen("efi_xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxx_") + \ (MAX_VAR_NAME * MAX_UTF8_PER_UTF16)) -static int hex(unsigned char ch) +static int hex(int ch) { if (ch >= 'a' && ch <= 'f') return ch-'a'+10; @@ -61,44 +61,32 @@ static int hex(unsigned char ch) return -1; } -static const char *hex2mem(u8 *mem, const char *hexstr, int count) +static int hex2mem(u8 *mem, const char *hexstr, int size) { - memset(mem, 0, count/2); + int nibble; + int i; - do { - int nibble; - - *mem = 0; - - if (!count || !*hexstr) + for (i = 0; i < size; i++) { + if (*hexstr == '\0') break; nibble = hex(*hexstr); if (nibble < 0) - break; + return -1; *mem = nibble; - count--; hexstr++; - if (!count || !*hexstr) - break; - nibble = hex(*hexstr); if (nibble < 0) - break; + return -1; *mem = (*mem << 4) | nibble; - count--; hexstr++; mem++; + } - } while (1); - - if (*hexstr) - return hexstr; - - return NULL; + return i; } static char *mem2hex(char *hexstr, const u8 *mem, int count) @@ -210,8 +198,12 @@ efi_status_t EFIAPI efi_get_variable(s16 *variable_name, if ((s = prefix(val, "(blob)"))) { unsigned len = strlen(s); + /* number of hexadecimal digits must be even */ + if (len & 1) + return EFI_EXIT(EFI_DEVICE_ERROR); + /* two characters per byte: */ - len = DIV_ROUND_UP(len, 2); + len /= 2; *data_size = len; if (in_size < len) @@ -220,7 +212,7 @@ efi_status_t EFIAPI efi_get_variable(s16 *variable_name, if (!data) return EFI_EXIT(EFI_INVALID_PARAMETER); - if (hex2mem(data, s, len * 2)) + if (hex2mem(data, s, len) != len) return EFI_EXIT(EFI_DEVICE_ERROR); debug("%s: got value: \"%s\"\n", __func__, s); -- 2.7.4

3 2