February 2020 - U-Boot

Re: [PATCH 1/9] dma-mapping: fix the prototype of dma_map_single()
by Rick Chen 06 Feb '20

06 Feb '20

> From: Masahiro Yamada [mailto:yamada.masahiro@socionext.com] > Sent: Tuesday, February 04, 2020 7:09 PM > To: u-boot(a)lists.denx.de > Cc: Masahiro Yamada; Bin Meng; Rick Jian-Zhi Chen(陳建志); Simon Glass > Subject: [PATCH 1/9] dma-mapping: fix the prototype of dma_map_single() > > Make dma_map_single() return the dma address, and remove the pointless volatile. > > Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Reviewed-by: Rick Chen <rick(a)andestech.com> > --- > > arch/arm/include/asm/dma-mapping.h | 5 +++-- > arch/nds32/include/asm/dma-mapping.h | 5 +++-- arch/riscv/include/asm/dma-mapping.h | 5 +++-- > arch/x86/include/asm/dma-mapping.h | 5 +++-- > 4 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index d20703739fad..d0895a209666 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -11,6 +11,7 @@ > #include <asm/cache.h> > #include <cpu_func.h> > #include <linux/dma-direction.h> > +#include <linux/types.h> > #include <malloc.h> > > #define dma_mapping_error(x, y) 0 > @@ -26,8 +27,8 @@ static inline void dma_free_coherent(void *addr) > free(addr); > } > > -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, > - enum dma_data_direction dir) > +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > + enum dma_data_direction dir) > { > unsigned long addr = (unsigned long)vaddr; > > diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h > index c8876ceadda6..9387dec34768 100644 > --- a/arch/nds32/include/asm/dma-mapping.h > +++ b/arch/nds32/include/asm/dma-mapping.h > @@ -10,6 +10,7 @@ > #include <asm/cache.h> > #include <cpu_func.h> > #include <linux/dma-direction.h> > +#include <linux/types.h> > #include <malloc.h> > > static void *dma_alloc_coherent(size_t len, unsigned long *handle) @@ -18,8 +19,8 @@ static void *dma_alloc_coherent(size_t len, unsigned long *handle) > return (void *)*handle; > } > > -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, > - enum dma_data_direction dir) > +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > + enum dma_data_direction dir) > { > unsigned long addr = (unsigned long)vaddr; > > diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h > index 6cc39469590a..eac56f8fbdfa 100644 > --- a/arch/riscv/include/asm/dma-mapping.h > +++ b/arch/riscv/include/asm/dma-mapping.h > @@ -10,6 +10,7 @@ > #define __ASM_RISCV_DMA_MAPPING_H > > #include <common.h> > +#include <linux/types.h> > #include <asm/cache.h> > #include <cpu_func.h> > #include <linux/dma-direction.h> > @@ -28,8 +29,8 @@ static inline void dma_free_coherent(void *addr) > free(addr); > } > > -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, > - enum dma_data_direction dir) > +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > + enum dma_data_direction dir) > { > unsigned long addr = (unsigned long)vaddr; > > diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h > index 900b99b8a69a..7e205e3313ac 100644 > --- a/arch/x86/include/asm/dma-mapping.h > +++ b/arch/x86/include/asm/dma-mapping.h > @@ -11,6 +11,7 @@ > #include <asm/cache.h> > #include <cpu_func.h> > #include <linux/dma-direction.h> > +#include <linux/types.h> > #include <malloc.h> > > #define dma_mapping_error(x, y) 0 > @@ -26,8 +27,8 @@ static inline void dma_free_coherent(void *addr) > free(addr); > } > > -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, > - enum dma_data_direction dir) > +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > + enum dma_data_direction dir) > { > unsigned long addr = (unsigned long)vaddr; > > -- > 2.17.1 >

1 0

Re: [PATCH 2/9] dma-mapping: fix the prototype of dma_unmap_single()
by Rick Chen 06 Feb '20

06 Feb '20

> From: Masahiro Yamada [mailto:yamada.masahiro@socionext.com] > Sent: Tuesday, February 04, 2020 7:09 PM > To: u-boot(a)lists.denx.de > Cc: Masahiro Yamada; Bin Meng; Joe Hershberger; Lukasz Majewski; Marek Vasut; Peng Fan; Rick Jian-Zhi Chen(陳建志); Simon Glass > Subject: [PATCH 2/9] dma-mapping: fix the prototype of dma_unmap_single() > > dma_unmap_single() takes the dma address, not virtual address. > > Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Acked-by: Rick Chen <rick(a)andestech.com> > --- > > arch/arm/include/asm/dma-mapping.h | 4 +--- > arch/nds32/include/asm/dma-mapping.h | 4 +--- arch/riscv/include/asm/dma-mapping.h | 4 +--- > arch/x86/include/asm/dma-mapping.h | 4 +--- > drivers/mmc/tmio-common.c | 2 +- > drivers/mtd/nand/raw/denali.c | 2 +- > drivers/net/macb.c | 2 +- > drivers/usb/dwc3/core.c | 6 +++--- > drivers/usb/gadget/udc/udc-core.c | 2 +- > 9 files changed, 11 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index d0895a209666..efdbed7280dd 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -42,11 +42,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > return addr; > } > > -static inline void dma_unmap_single(volatile void *vaddr, size_t len, > +static inline void dma_unmap_single(dma_addr_t addr, size_t len, > enum dma_data_direction dir) > { > - unsigned long addr = (unsigned long)vaddr; > - > len = ALIGN(len, ARCH_DMA_MINALIGN); > > if (dir != DMA_TO_DEVICE) > diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h > index 9387dec34768..784f489db54e 100644 > --- a/arch/nds32/include/asm/dma-mapping.h > +++ b/arch/nds32/include/asm/dma-mapping.h > @@ -34,11 +34,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > return addr; > } > > -static inline void dma_unmap_single(volatile void *vaddr, size_t len, > +static inline void dma_unmap_single(dma_addr_t addr, size_t len, > enum dma_data_direction dir) > { > - unsigned long addr = (unsigned long)vaddr; > - > len = ALIGN(len, ARCH_DMA_MINALIGN); > > if (dir != DMA_TO_DEVICE) > diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h > index eac56f8fbdfa..1ac4a4fed58d 100644 > --- a/arch/riscv/include/asm/dma-mapping.h > +++ b/arch/riscv/include/asm/dma-mapping.h > @@ -44,11 +44,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > return addr; > } > > -static inline void dma_unmap_single(volatile void *vaddr, size_t len, > +static inline void dma_unmap_single(dma_addr_t addr, size_t len, > enum dma_data_direction dir) > { > - unsigned long addr = (unsigned long)vaddr; > - > len = ALIGN(len, ARCH_DMA_MINALIGN); > > if (dir != DMA_TO_DEVICE) > diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h > index 7e205e3313ac..37704da5dd4f 100644 > --- a/arch/x86/include/asm/dma-mapping.h > +++ b/arch/x86/include/asm/dma-mapping.h > @@ -42,11 +42,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len, > return addr; > } > > -static inline void dma_unmap_single(volatile void *vaddr, size_t len, > +static inline void dma_unmap_single(dma_addr_t addr, size_t len, > enum dma_data_direction dir) > { > - unsigned long addr = (unsigned long)vaddr; > - > len = ALIGN(len, ARCH_DMA_MINALIGN); > > if (dir != DMA_TO_DEVICE) > diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 5a8506dcb6bd..e5d9d64b9684 100644 > --- a/drivers/mmc/tmio-common.c > +++ b/drivers/mmc/tmio-common.c > @@ -352,7 +352,7 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) > if (poll_flag == TMIO_SD_DMA_INFO1_END_RD) > udelay(1); > > - dma_unmap_single(buf, len, dir); > + dma_unmap_single(dma_addr, len, dir); > > return ret; > } > diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index 8537c609fb62..8dfffad63b60 100644 > --- a/drivers/mtd/nand/raw/denali.c > +++ b/drivers/mtd/nand/raw/denali.c > @@ -577,7 +577,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, > > iowrite32(0, denali->reg + DMA_ENABLE); > > - dma_unmap_single(buf, size, dir); > + dma_unmap_single(dma_addr, size, dir); > > if (irq_status & INTR__ERASED_PAGE) > memset(buf, 0xff, size); > diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 0d4929bec131..7a2b1abeeb03 100644 > --- a/drivers/net/macb.c > +++ b/drivers/net/macb.c > @@ -342,7 +342,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, > udelay(1); > } > > - dma_unmap_single(packet, length, DMA_TO_DEVICE); > + dma_unmap_single(paddr, length, DMA_TO_DEVICE); > > if (i <= MACB_TX_TIMEOUT) { > if (ctrl & MACB_BIT(TX_UNDERRUN)) > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 77c555e76924..c5907534692e 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -285,8 +285,8 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc) > return 0; > > err1: > - dma_unmap_single((void *)(uintptr_t)dwc->scratch_addr, dwc->nr_scratch * > - DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); > + dma_unmap_single(scratch_addr, dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE, > + DMA_BIDIRECTIONAL); > > err0: > return ret; > @@ -300,7 +300,7 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc) > if (!dwc->nr_scratch) > return; > > - dma_unmap_single((void *)(uintptr_t)dwc->scratch_addr, dwc->nr_scratch * > + dma_unmap_single(dwc->scratch_addr, dwc->nr_scratch * > DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL); > kfree(dwc->scratchbuf); > } > diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c > index 8d1d90e3e39f..8437d9079bef 100644 > --- a/drivers/usb/gadget/udc/udc-core.c > +++ b/drivers/usb/gadget/udc/udc-core.c > @@ -65,7 +65,7 @@ void usb_gadget_unmap_request(struct usb_gadget *gadget, > if (req->length == 0) > return; > > - dma_unmap_single((void *)(uintptr_t)req->dma, req->length, > + dma_unmap_single(req->dma, req->length, > is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE); } EXPORT_SYMBOL_GPL(usb_gadget_unmap_request); > -- > 2.17.1

1 0

[PATCH 1/1] pci: definition of pci_addr_t and pci_size_t
by Heinrich Schuchardt 05 Feb '20

05 Feb '20

Currently the size of pci_addr_t and pci_size_t depends on CONFIG_SYS_PCI_64BIT. For qemu_arm64_defconfig with 4 GiB RAM this leads to an error pci_hose_phys_to_bus: invalid physical address which is due to the truncation of the bus address in _dm_pci_phys_to_bus. Defining CONFIG_SYS_PCI_64BIT is not a solution as this results in an error PCI: Failed autoconfig bar 10 So let's use unsigned long for pci_addr_t and pci_size_t. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/pci.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/pci.h b/include/pci.h index 8c761d8da3..d8bce8ab80 100644 --- a/include/pci.h +++ b/include/pci.h @@ -484,13 +484,8 @@ #include <dm/pci.h> -#ifdef CONFIG_SYS_PCI_64BIT -typedef u64 pci_addr_t; -typedef u64 pci_size_t; -#else -typedef u32 pci_addr_t; -typedef u32 pci_size_t; -#endif +typedef unsigned long pci_addr_t; +typedef unsigned long pci_size_t; struct pci_region { pci_addr_t bus_start; /* Start on the bus */ -- 2.24.1

2 3

pull request of u-boot-fsl-qoriq for v2020.04-rc2
by Priyanka Jain 05 Feb '20

05 Feb '20

Dear Tom, Please find my pull-request for u-boot-fsl-qoriq/master https://travis-ci.org/p-priyanka-jain/u-boot/builds/645892188 Summary Bug fixes on ls1012a, ls1021a, ls1028ardb platforms Integrate fspi for ls1028a , add DM-I2C support, update secure boot header offset priyankajain -------------------------- The following changes since commit 31a790bee939e227dfc7e6a6a323b2b13180707f: Merge branch 'master' of git://git.denx.de/u-boot-usb (2020-02-02 15:26:53 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to d9618e980430f3f7b84dfd5bb3004285ed47e5ba: board: ls1012ardb: do not use imply CONFIG_ (2020-02-04 16:20:25 +0530) ---------------------------------------------------------------- Alison Wang (1): configs: ls1021a: Reserve low memory for CMA Biwen Li (6): rtc: pcf8563: Add driver model support armv8: fsl-layerscape: spl: fix build error when DM_I2C is enabled i2c: mxc_i2c: add DM_FLAG_PRE_RELOC flag Kconfigs: layerscape: use a convenient default value for SYS_MALLOC_F_LEN dm: arm64: ls1012a: add i2c DM support dm: arm: ls1021a: add i2c DM support Heinrich Schuchardt (1): board: ls1012ardb: do not use imply CONFIG_ Kuldeep Singh (4): configs: ls1012ardb: Enable CONFIG_SYS_RELOC_GD_ENV_ADDR arm: dts: ls1028a: Add FSPI node properties arm: dts: lx2160a: Add FSPI node properties configs: ls1028a: Enable FSPI support Meenakshi Aggarwal (1): board: fsl: lx2160a: Add support to reset to eMMC Michael Walle (2): arm: ls1028a: use the new flexspi driver arm: dts: ls1028a: fix interrupt properties Priyanka Singh (5): armv8: ls1046a: Updates secure boot headers offset armv8: ls1012ardb: Updates secure boot headers offset armv8: lx2160a: Updates secure boot headers offset armv8: ls1088a: Updates secure boot headers offset armv8: ls2088a: Updates secure boot headers offset Kconfig | 4 +- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 + arch/arm/dts/fsl-ls1028a-qds.dts | 16 +++ arch/arm/dts/fsl-ls1028a-rdb.dts | 15 +++ arch/arm/dts/fsl-ls1028a.dtsi | 67 ++++++---- arch/arm/dts/fsl-lx2160a-rdb.dts | 24 +++- arch/arm/dts/fsl-lx2160a.dtsi | 15 +++ arch/arm/include/asm/gpio.h | 1 + board/freescale/common/dcu_sii9022a.c | 96 +++++++++++++ board/freescale/common/diu_ch7301.c | 81 +++++++++++ board/freescale/common/qixis.c | 4 + board/freescale/ls1012aqds/ls1012aqds.c | 20 ++- board/freescale/ls1012ardb/Kconfig | 4 +- board/freescale/ls1012ardb/eth.c | 35 +++++ board/freescale/ls1012ardb/ls1012ardb.c | 148 +++++++++++++++++---- board/freescale/ls1021aqds/dcu.c | 46 ++++++- board/freescale/ls1021aqds/ls1021aqds.c | 21 ++- board/freescale/ls1021atwr/ls1021atwr.c | 27 +++- board/freescale/lx2160a/lx2160a.c | 2 + configs/ls1012a2g5rdb_qspi_defconfig | 3 + configs/ls1012a2g5rdb_tfa_defconfig | 3 +

2 1

[GIT PULL] Raspberry Pi updates for v2020.04
by Matthias Brugger 05 Feb '20

05 Feb '20

Hi Tom, Please take into account the following commits for RPi boards. It includes support for DFU on RPi4 as well as network support on that board. You can find the CI output here: https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi/pipelines/2065 and here https://travis-ci.org/mbgg/u-boot/builds/645395557 Regarding the DFU series [0] I didn't took the first two patches as I understand that you wanted to see a test for the FAT bug fixed. Regards, Matthias [0] https://patchwork.ozlabs.org/user/todo/uboot/?series=145985 --- The following changes since commit b00c3c995bf2293e32cd2be3cb4be7eb39c4ac26: Prepare v2020.04-rc1 (2020-01-28 16:59:30 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi.git tags/rpi-next-2020.04 for you to fetch changes up to 095c6eba9d02688e7a1c3cd2093f826d05fe961f: rpi4: Enable GENET Ethernet controller (2020-01-29 18:30:33 +0100) ---------------------------------------------------------------- - DFU support file operations lager then the default max size - add dfu support to dwc2 for bcm2835 - enable DFU for RPi4 - Fix RPi4 memory map to include the genet device - add driver for the genet ethernet device - enable network support in RPi4 config ---------------------------------------------------------------- Amit Singh Tomar (3): net: Add support for Broadcom GENETv5 Ethernet controller rpi4: Update memory map to accommodate scb devices rpi4: Enable GENET Ethernet controller Marek Szyprowski (4): dfu: mmc: rearrange the code dfu: mmc: remove file size limit for io operations usb: dwc2_udc_otg: add bcm2835 SoC (Raspberry Pi4) support config: enable DFU over USB on Raspberry Pi4 boards arch/arm/mach-bcm283x/init.c | 6 +- configs/rpi_4_32b_defconfig | 14 + configs/rpi_4_defconfig | 14 + configs/rpi_arm64_defconfig | 1 + drivers/dfu/dfu_mmc.c | 93 ++-- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/bcmgenet.c | 729 +++++++++++++++++++++++++++++ drivers/usb/gadget/dwc2_udc_otg.c | 2 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 12 +- include/configs/rpi.h | 20 + 11 files changed, 854 insertions(+), 45 deletions(-) create mode 100644 drivers/net/bcmgenet.c

2 1

[PATCH 0/5] x86: Improve support for chain-loading U-Boot
by Simon Glass 05 Feb '20

05 Feb '20

This little series adds a few checks into the code to allow better operation when booting a build from a previous-state loader such as coreboot. At present we have a 'coreboot' target, but sometimes it is useful to boot a bare-metal target, such as coral, from coreboot. That allows comparison of operation between the bare metal version doing all the init itself and relying on coreboot for some init. Simon Glass (5): x86: fsp: Allow skipping init code when chain loading x86: apl: Skip init code when chain loading x86: cpu: Skip init code when chain loading dm: Avoid initing built-in devices when chain loading pci: Avoid auto-config when chain loading arch/x86/cpu/apollolake/fsp_s.c | 2 ++ arch/x86/cpu/cpu.c | 4 +++- arch/x86/cpu/i386/interrupt.c | 3 +++ arch/x86/lib/fsp/fsp_dram.c | 8 ++++++++ arch/x86/lib/fsp/fsp_graphics.c | 3 +++ arch/x86/lib/fsp2/fsp_dram.c | 10 ++++++++++ arch/x86/lib/fsp2/fsp_init.c | 2 +- arch/x86/lib/init_helpers.c | 3 +++ common/board_r.c | 3 +++ drivers/pci/pci-uclass.c | 4 ++-- 10 files changed, 38 insertions(+), 4 deletions(-) -- 2.24.1.735.g03f4e72817-goog

3 22

[PATCH v2] cmd: Add command to dump drivers and compatible strings
by Sean Anderson 05 Feb '20

05 Feb '20

This adds a subcommand to dm to dump out what drivers are installed, and their compatible strings. I have found this useful in ensuring that I have the correct drivers compiled, and that I have put in the correct compatible strings. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- Changes for v2: - Check if entry->of_match is NULL before accessing it cmd/dm.c | 12 +++++++++++- drivers/core/dump.c | 20 ++++++++++++++++++++ include/dm/util.h | 3 +++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/cmd/dm.c b/cmd/dm.c index 7b271db0bb..7a90685f8b 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -40,10 +40,19 @@ static int do_dm_dump_devres(cmd_tbl_t *cmdtp, int flag, int argc, return 0; } +static int do_dm_dump_drivers(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + dm_dump_drivers(); + + return 0; +} + static cmd_tbl_t test_commands[] = { U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""), U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""), U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""), + U_BOOT_CMD_MKENT(drivers, 1, 1, do_dm_dump_drivers, "", ""), }; static __maybe_unused void dm_reloc(void) @@ -84,5 +93,6 @@ U_BOOT_CMD( "Driver model low level access", "tree Dump driver model tree ('*' = activated)\n" "dm uclass Dump list of instances for each uclass\n" - "dm devres Dump list of device resources for each device" + "dm devres Dump list of device resources for each device\n" + "dm drivers Dump list of drivers and their compatible strings" ); diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 4704049aee..b5046398d4 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -96,3 +96,23 @@ void dm_dump_uclass(void) puts("\n"); } } + +void dm_dump_drivers(void) +{ + struct driver *d = ll_entry_start(struct driver, driver); + const int n_ents = ll_entry_count(struct driver, driver); + struct driver *entry; + const struct udevice_id *match; + + puts("Driver Compatible\n"); + puts("--------------------------------\n"); + for (entry = d; entry < d + n_ents; entry++) { + for (match = entry->of_match; + match && match->compatible; match++) + printf("%-20.20s %s\n", + match == entry->of_match ? entry->name : "", + match->compatible); + if (match == entry->of_match) + printf("%-20.20s\n", entry->name); + } +} diff --git a/include/dm/util.h b/include/dm/util.h index 348c2ace3c..0ccb3fbadf 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -39,6 +39,9 @@ static inline void dm_dump_devres(void) } #endif +/* Dump out a list of drivers */ +void dm_dump_drivers(void); + /** * Check if an of node should be or was bound before relocation. * -- 2.25.0

3 2

[PATCH v2 1/2] menu: Add a function to set the default by matching the item data
by Schrempf Frieder 05 Feb '20

05 Feb '20

From: Frieder Schrempf <frieder.schrempf(a)kontron.de> In order to make it possible to auto select a default entry by matching the data of the menu entries by an external matching function, we add some helpers and expose the menu_set_default_by_item_data_match() function. Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- Changes in v2: * Keep the menu structs private and instead only expose one additional function, that sets the default by calling an external matching function on each entry. * Change the title and commit message to reflect the changes. --- common/menu.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/menu.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/common/menu.c b/common/menu.c index 7b66d199a9..3833b8a237 100644 --- a/common/menu.c +++ b/common/menu.c @@ -160,6 +160,46 @@ static inline struct menu_item *menu_item_by_key(struct menu *m, return menu_items_iter(m, menu_item_key_match, item_key); } +/* + * Find the first matching item, if any exists by calling a matching function + * on the items data field. + */ +static inline struct menu_item *menu_item_by_matching_fn(struct menu *m, + int match(void *, void *), void * extra) +{ + struct list_head *pos, *n; + struct menu_item *item; + int ret; + + list_for_each_safe(pos, n, &m->items) { + item = list_entry(pos, struct menu_item, list); + if (item->key) { + ret = match(item->data, extra); + if (ret == 1) + return item; + } + } + + return NULL; +} + +/* + * Select the menus default entry based on matching the data field of the menu + * items by calling a matching function. + */ +int menu_set_default_by_item_data_match(struct menu *m, + int match(void *, void *), void *extra, char **key) +{ + struct menu_item *item = menu_item_by_matching_fn(m, match, extra); + + if (!item) + return -ENOENT; + + *key = item->key; + m->default_item = item; + return 0; +} + /* * Set *choice to point to the default item's data, if any default item was * set, and returns 1. If no default item was set, returns -ENOENT. diff --git a/include/menu.h b/include/menu.h index 2d227c20bd..0a8b41a905 100644 --- a/include/menu.h +++ b/include/menu.h @@ -18,6 +18,9 @@ int menu_item_add(struct menu *m, char *item_key, void *item_data); int menu_destroy(struct menu *m); void menu_display_statusline(struct menu *m); int menu_default_choice(struct menu *m, void **choice); +int menu_set_default_by_item_data_match(struct menu *m, + int match(void *, void *), void *extra, + char **key); /** * menu_show() Show a boot menu -- 2.17.1

2 3

[PATCH] image: fdt: check "status" of "/reserved-memory" subnodes
by Thirupathaiah Annapureddy 05 Feb '20

05 Feb '20

boot_fdt_add_mem_rsv_regions() scans the subnodes of "/reserved-memory" and adds them to reserved lmb regions. Currently this scanning does not take into "status" property. Even if the subnode is disabled, it gets added to the reserved lmb regions. This patch checks the "status" property before adding it to reserved lmb regions. Signed-off-by: Thirupathaiah Annapureddy <thiruan(a)linux.microsoft.com> --- common/image-fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 48388488d9..cf13d655c0 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -122,7 +122,7 @@ void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob) /* check if this subnode has a reg property */ ret = fdt_get_resource(fdt_blob, subnode, "reg", 0, &res); - if (!ret) { + if (!ret && fdtdec_get_is_enabled(fdt_blob, subnode)) { addr = res.start; size = res.end - res.start + 1; boot_fdt_reserve_region(lmb, addr, size); -- 2.24.1

3 4

[PATCH V3 1/2] tpm: add a helper to iterate on all tpm devices
by Philippe Reynes 05 Feb '20

05 Feb '20

This add a helper for_each_tpm_device that run through all the tpm (1.x and 2.0) devices. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- include/tpm-common.h | 3 +++ 1 file changed, 3 insertions(+) Changelog: v3: - use the helper uclass_foreach_dev_probe v2: - new patch, add an helper for tpm device (idea from Miquel) diff --git a/include/tpm-common.h b/include/tpm-common.h index f9c2ca2..702cd6e 100644 --- a/include/tpm-common.h +++ b/include/tpm-common.h @@ -293,4 +293,7 @@ static inline cmd_tbl_t *get_tpm2_commands(unsigned int *size) */ enum tpm_version tpm_get_version(struct udevice *dev); +/* Iterate on all TPM devices */ +#define for_each_tpm_device(dev) uclass_foreach_dev_probe(UCLASS_TPM, (dev)) + #endif /* __TPM_COMMON_H */ -- 2.7.4

3 5