June 2019 - U-Boot

[U-Boot] [GIT PULL] Pull request: u-boot-imx u -boot-imx-20190628
by Stefano Babic 29 Jun '19

29 Jun '19

Hi Tom, please pull some fixes for i.MX, thanks ! Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/551532048 The following changes since commit 77f6e2dd0551d8a825bab391a1bd6b838874bcd4: Merge tag 'efi-2019-07-rc5-2' of git://git.denx.de/u-boot-efi (2019-06-15 13:03:00 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-imx.git u-boot-imx-20190628 for you to fetch changes up to 0ac662da35e48b859b5d43e0c86f233f25730ee5: apalis_imx6: increase phy autoneg timeout (2019-06-28 00:08:42 +0200) ---------------------------------------------------------------- Fixes for 2019.07 - menlo board - allow SDB on Sabre - HAB for mx6sl - apalis board ---------------------------------------------------------------- Breno Matheus Lima (1): mx6sl: hab: Fix pu_irom_mmu_enabled address Fabio Estevam (1): pico-imx7d: README: Adjust the binary name after DM conversion Frieder Schrempf (1): usb: gadget: f_sdp: Allow SPL to load and boot FIT via SDP Igor Opaniuk (2): apalis_imx6: fix set_emmcargs wrapper apalis_imx6: increase phy autoneg timeout Marek Vasut (5): ARM: dts: imx: imx53: Synchronize iMX53 DT with Linux ARM: dts: imx: m53menlo: Import M53Menlo DT from Linux ARM: imx: m53menlo: Enable DM GPIO ARM: imx: m53menlo: Convert MMC, USB and block to DM ARM: imx: m53menlo: Convert to DM VIDEO Pierre-Jean Texier (1): pico-imx7d: remove unused 'script' variable arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx53-m53.dtsi | 132 +++++++++++++++++ arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 42 ++++++ arch/arm/dts/imx53-m53menlo.dts | 312 ++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx53.dtsi | 745 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- arch/arm/mach-imx/hab.c | 2 +- board/menlo/m53menlo/m53menlo.c | 118 +++++++-------- board/technexion/pico-imx7d/README | 12 +- common/spl/spl_sdp.c | 12 +- configs/m53menlo_defconfig | 23 ++- drivers/usb/gadget/f_sdp.c | 53 ++++++- include/configs/apalis_imx6.h | 5 +- include/configs/m53menlo.h | 4 +- include/configs/pico-imx7d.h | 1 - include/sdp.h | 9 +- 15 files changed, 1221 insertions(+), 252 deletions(-) create mode 100644 arch/arm/dts/imx53-m53.dtsi create mode 100644 arch/arm/dts/imx53-m53menlo-u-boot.dtsi create mode 100644 arch/arm/dts/imx53-m53menlo.dts -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

3 3

[U-Boot] [PULL] u-boot-stm32 for v2019.07 (round 7)
by Patrice CHOTARD 29 Jun '19

29 Jun '19

Hi Tom The following changes since commit 5eea874b5e989e62519824ad140aa086432d01ee: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2019-06-22 12:09:33 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-stm tags/u-boot-stm32-20190628 for you to fetch changes up to 36cb793b35333e9a281445313de6db1ca4a6ab3a: mach-stm32: Fix MPU region size dedicated to SDRAM for STM32F4 (2019-06-28 09:45:27 +0200) ---------------------------------------------------------------- STM32 MCU fixes/cleanup: _ Fix SPL console for STM32F769 Discovery _ Fix Memory Protection Unit size for STM32F4 series _ Cleanup DT for STM32F746 Discovery ---------------------------------------------------------------- Patrice Chotard (3): ARM: dts: stm32: Add u-boot, dm-pre-reloc for usart1_pins_a for stm32f769-disco ARM: dts: stm32: Remove useless u-boot, dm-pre-reloc in stm32f746-disco-u-boot.dtsi mach-stm32: Fix MPU region size dedicated to SDRAM for STM32F4 arch/arm/dts/stm32f746-disco-u-boot.dtsi | 6 ------ arch/arm/dts/stm32f769-disco-u-boot.dtsi | 10 ++++++++++ arch/arm/mach-stm32/soc.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) Thanks

2 1

[U-Boot] CACHE: Misaligned operation for rpi_3_32b_defconfig
by Elliot Cooper 28 Jun '19

28 Jun '19

Hi Guys, I have just built a u-boot.bin for rpi_3_32b_defconfig using all the defaults. I then used this on the new Raspbian Buster image that was released a few days ago i.e. 2019-06-20-raspbian-buster-lite.zip. This same u-boot.bin works fine on the old Raspbian Stretch version ( 2019-04-08-raspbian-stretch.zip). Booting the RPI with Raspbian Buser gives the following error: U-Boot 2019.07-rc4-00287-g5eea874b5e-dirty (Jun 27 2019 - 22:00:42 +0000) DRAM: 948 MiB RPI 3 Model B (0xa02082) MMC: mmc@7e202000: 0, sdhci@7e300000: 1 Loading Environment from FAT... *** Warning - bad CRC, using default environment mbox: Header response code invalid bcm2835: Could not configure display In: serial Out: vidconsole Err: vidconsole Net: CACHE: Misaligned operation at range [3b3da9e8, 3b3daa00] CACHE: Misaligned operation at range [3b3da9e8, 3b3daa00] CACHE: Misaligned operation at range [3b3da9e8, 3b3daa00] Any help would be greatly appreciated! Thanks for your time. Elliot

1 1

[U-Boot] [PATCH 1/1] imx6: wandboard: allow booting from MMC 2
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

One of the SD-CARD slots on the Wandboard Quad B1 is MMC 2. Enable it as a boot device. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/configs/wandboard.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 2e6262f0f4..bdcd5e9db3 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -110,6 +110,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ func(SATA, sata, 0) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ -- 2.20.1

3 4

[U-Boot] [PATCH 1/6] ARM: uniphier: fix build error for CONFIG_DEBUG_LL=y
by Masahiro Yamada 28 Jun '19

28 Jun '19

Commit e27d6c7d328c ("ARM: uniphier: simplify SoC ID get function") accidentally removed the macros needed to compile debug_ll.S Revive them. Fixes: e27d6c7d328c ("ARM: uniphier: simplify SoC ID get function") Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/arm32/debug_ll.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S b/arch/arm/mach-uniphier/arm32/debug_ll.S index 9fe3eaadf1..c68522f9c5 100644 --- a/arch/arm/mach-uniphier/arm32/debug_ll.S +++ b/arch/arm/mach-uniphier/arm32/debug_ll.S @@ -16,6 +16,8 @@ #include CONFIG_DEBUG_LL_INCLUDE #endif +#define SG_REVISION_TYPE_SHIFT 16 +#define SG_REVISION_TYPE_MASK (0xff << SG_REVISION_TYPE_SHIFT) #define BAUDRATE 115200 #define DIV_ROUND(x, d) (((x) + ((d) / 2)) / (d)) -- 2.17.1

1 5

[U-Boot] Watchdog DM - ENOMEM error identified - need suggestions
by Suniel Mahesh 28 Jun '19

28 Jun '19

Hi, I converted watchdog driver(omap3_wdt) on TI AM33XX platform to Driver Model. I am getting the following error when tested on BeagleBone Black: U-Boot 2019.07-rc4-00179-g77f6e2d-dirty (Jun 27 2019 - 15:11:15 +0530) CPU : AM335X-GP rev 2.1 Model: TI AM335x BeagleBone Black DRAM: 512 MiB WDT: Started with servicing (60s timeout) Error binding driver 'omap_timer': -12 (repeats ....) The error happens when the code is at initr_watchdog() (common/board_r.c) during initialization. Sequence is: initr_dm => initr_watchdog => board_init => set_cpu_clk_info => efi_memory_init => stdio_init_tables => initr_serial After few tests, found out that when initr_watchdog() is moved ahead and placed after initr_serial(), the error disappears and the board responds. New sequence is: initr_dm => board_init => set_cpu_clk_info => efi_memory_init => stdio_init_tables => initr_serial => initr_watchdog Couldn't find an explanation for such behaviour ? Is it ok to move initr_watchdog() ahead and after initr_serial() in board_r.c ? pointers please. The watchdog DM driver has successfully got binded (checked the debug log). Thanks -- Suniel Mahesh Embedded Linux, Kernel & U-Boot engineer https://github.com/sunielmahesh www.tuxtrons.com https://github.com/techveda Hyderabad, India

1 1

[U-Boot] [PATCH 00/37] binman: Add CBFS support
by Simon Glass 28 Jun '19

28 Jun '19

CBFS (Coreboot Filesystem) is a simple ROM-based filesystem used for locating data needed during booting. It has particular features for x86 such as defining a boot block at the top of the ROM image. At run-time, boot loaders can locate files in the ROM by searching for a header and magic strings in the ROM. It is common to have multiple, separate CBFSs in the ROM. Binman provides its own way of locating data, typically with a device tree built into the image, or linker symbols when space is short. But it is useful to be able to create images containing CBFSs with binman, since it allows all image structure to defined in one place, rather than spread out over multiple cbfstool invocations, etc. The approach taken here is to directly create the CBFS in binman rather than calling out to cbfstool. The latter is quite slow for multiple invocations and the tool itself has no tests. Also included is ifwitool lifted from coreboot, which is needed to package images for Intel apollo lake SoCs. This seems easier than implementing this functionality in binman. Tests are provided for new binman functionality, although ifwitool has no tests and is tested only by invocation from binman. This series does not support all CBFS features, just raw binaries and Elf files (called 'stages' in CBFS). Simon Glass (37): x86: Add ifwitool for Intel Integrated Firmware Image cbfs: Add an enum and comment for the magic number cbfs: Rename checksum to attributes_offset tools: Drop duplicate raise_on_error argument binman: Fix comment in bsection.GetEntries() binman: Correct two typos in function names in ftest binman: Add coverage tools info for Python 3 patman: Add a way to set the search path for tools binman: Add a --toolpath option to set the tool search path binman: Add missing comments to bsection binman: Add missing comments toentry binman: Tidy up help for --indir binman: Use a better error for missing Intel descriptor binman: Detect skipped tests binman: Add a function to create a sample ELF file binman: Add a function to decode an ELF file binman: Ensure that coverage has access to site packages binman: Assume Intel descriptor is at the start of the image binman: Don't assume there is an ME region binman: Update entry.SetOffsetSize to be optional binman: Allow text directly in the node patman: Add functions to compress and decompress data binman: Use the tools.Decompress method binman: Drop unnecessary debug handling binman: Use tools compression function for blob handling binman: Correct comment in u_boot_spl_elf binman: Support ELF files for TPL binman: Fix up the _DoTestFile() function -u argument binman: Allow verbosity control when running tests binman: Allow preserving test directories binman: Pass the toolpath to tests patman: Add a function to write ifwitool binman: Add a utility library for coreboot CBFS binman: Add support for CBFS entries binman: Add support for Intel IFWI entries binman: Pad empty areas of the CBFS with files binman: Add support for fixed-offset files in CBFS .travis.yml | 2 +- fs/cbfs/cbfs.c | 4 +- include/cbfs.h | 16 +- test/run | 9 +- tools/Makefile | 3 + tools/binman/README | 25 +- tools/binman/README.entries | 204 +- tools/binman/binman.py | 52 +- tools/binman/bsection.py | 42 +- tools/binman/cbfs_util.py | 861 ++++++ tools/binman/cbfs_util_test.py | 577 ++++ tools/binman/cmdline.py | 8 +- tools/binman/control.py | 3 + tools/binman/elf.py | 174 ++ tools/binman/elf_test.py | 41 + tools/binman/entry.py | 38 +- tools/binman/etype/blob.py | 16 +- tools/binman/etype/cbfs.py | 205 ++ tools/binman/etype/intel_descriptor.py | 16 +- tools/binman/etype/intel_ifwi.py | 100 + tools/binman/etype/intel_me.py | 2 + tools/binman/etype/text.py | 23 +- tools/binman/etype/u_boot_spl_elf.py | 2 +- tools/binman/etype/u_boot_tpl_elf.py | 24 + tools/binman/ftest.py | 247 +- tools/binman/test/066_text.dts | 5 + tools/binman/test/096_elf.dts | 2 + tools/binman/test/102_cbfs_raw.dts | 20 + tools/binman/test/103_cbfs_raw_ppc.dts | 21 + tools/binman/test/104_cbfs_stage.dts | 19 + tools/binman/test/105_cbfs_raw_compress.dts | 26 + tools/binman/test/106_cbfs_bad_arch.dts | 15 + tools/binman/test/107_cbfs_no_size.dts | 13 + tools/binman/test/108_cbfs_no_contents.dts | 17 + tools/binman/test/109_cbfs_bad_compress.dts | 18 + tools/binman/test/110_cbfs_name.dts | 24 + tools/binman/test/111_x86-rom-ifwi.dts | 29 + tools/binman/test/112_x86-rom-ifwi-nodesc.dts | 28 + tools/binman/test/113_x86-rom-ifwi-nodata.dts | 29 + tools/binman/test/114_cbfs_offset.dts | 26 + tools/binman/test/fitimage.bin.gz | Bin 0 -> 8418 bytes tools/binman/test/ifwi.bin.gz | Bin 0 -> 1884 bytes tools/ifwitool.c | 2314 +++++++++++++++++ tools/patman/command.py | 4 +- tools/patman/tools.py | 141 +- 45 files changed, 5366 insertions(+), 79 deletions(-) create mode 100644 tools/binman/cbfs_util.py create mode 100755 tools/binman/cbfs_util_test.py create mode 100644 tools/binman/etype/cbfs.py create mode 100644 tools/binman/etype/intel_ifwi.py create mode 100644 tools/binman/etype/u_boot_tpl_elf.py create mode 100644 tools/binman/test/102_cbfs_raw.dts create mode 100644 tools/binman/test/103_cbfs_raw_ppc.dts create mode 100644 tools/binman/test/104_cbfs_stage.dts create mode 100644 tools/binman/test/105_cbfs_raw_compress.dts create mode 100644 tools/binman/test/106_cbfs_bad_arch.dts create mode 100644 tools/binman/test/107_cbfs_no_size.dts create mode 100644 tools/binman/test/108_cbfs_no_contents.dts create mode 100644 tools/binman/test/109_cbfs_bad_compress.dts create mode 100644 tools/binman/test/110_cbfs_name.dts create mode 100644 tools/binman/test/111_x86-rom-ifwi.dts create mode 100644 tools/binman/test/112_x86-rom-ifwi-nodesc.dts create mode 100644 tools/binman/test/113_x86-rom-ifwi-nodata.dts create mode 100644 tools/binman/test/114_cbfs_offset.dts create mode 100644 tools/binman/test/fitimage.bin.gz create mode 100644 tools/binman/test/ifwi.bin.gz create mode 100644 tools/ifwitool.c -- 2.22.0.410.gd8fdbe21b5-goog

1 37

[U-Boot] [PATCH 1/1] trace: trace buffer may exceed 2GiB
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

Correct the debug output for the trace buffer size to accommodate trace buffers exceeding 2GiB. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 0fc938dc87..4760d728f3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -442,8 +442,8 @@ static int reserve_trace(void) #ifdef CONFIG_TRACE gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); - debug("Reserving %dk for trace data at: %08lx\n", - CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); + debug("Reserving %luk for trace data at: %08lx\n", + (unsigned long)CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); #endif return 0; -- 2.20.1

2 2

[U-Boot] [PATCH 1/1] trace: do not limit trace buffer to 2GiB
by Heinrich Schuchardt 28 Jun '19

28 Jun '19

There is no good reason to limit the trace buffer to 2GiB on a 64bit system. Adjust the types of the relevant parameters. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/trace.c | 10 ++++------ include/trace.h | 6 +++--- lib/trace.c | 14 +++++++------- tools/proftool.c | 4 ++-- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/cmd/trace.c b/cmd/trace.c index 26bf0960d4..7d328f88be 100644 --- a/cmd/trace.c +++ b/cmd/trace.c @@ -30,8 +30,7 @@ static int get_args(int argc, char * const argv[], char **buff, static int create_func_list(int argc, char * const argv[]) { - size_t buff_size, avail, buff_ptr, used; - unsigned int needed; + size_t buff_size, avail, buff_ptr, needed, used; char *buff; int err; @@ -41,7 +40,7 @@ static int create_func_list(int argc, char * const argv[]) avail = buff_size - buff_ptr; err = trace_list_functions(buff + buff_ptr, avail, &needed); if (err) - printf("Error: truncated (%#x bytes needed)\n", needed); + printf("Error: truncated (%#zx bytes needed)\n", needed); used = min(avail, (size_t)needed); printf("Function trace dumped to %08lx, size %#zx\n", (ulong)map_to_sysmem(buff + buff_ptr), used); @@ -54,8 +53,7 @@ static int create_func_list(int argc, char * const argv[]) static int create_call_list(int argc, char * const argv[]) { - size_t buff_size, avail, buff_ptr, used; - unsigned int needed; + size_t buff_size, avail, buff_ptr, needed, used; char *buff; int err; @@ -65,7 +63,7 @@ static int create_call_list(int argc, char * const argv[]) avail = buff_size - buff_ptr; err = trace_list_calls(buff + buff_ptr, avail, &needed); if (err) - printf("Error: truncated (%#x bytes needed)\n", needed); + printf("Error: truncated (%#zx bytes needed)\n", needed); used = min(avail, (size_t)needed); printf("Call list dumped to %08lx, size %#zx\n", (ulong)map_to_sysmem(buff + buff_ptr), used); diff --git a/include/trace.h b/include/trace.h index 99f34f72bc..606dba9768 100644 --- a/include/trace.h +++ b/include/trace.h @@ -39,7 +39,7 @@ struct trace_output_func { /* A header at the start of the trace output buffer */ struct trace_output_hdr { enum trace_chunk_type type; /* Record type */ - uint32_t rec_count; /* Number of records */ + size_t rec_count; /* Number of records */ }; /* Print statistics about traced function calls */ @@ -57,7 +57,7 @@ void trace_print_stats(void); * @param needed Returns number of bytes used / needed * @return 0 if ok, -1 on error (buffer exhausted) */ -int trace_list_functions(void *buff, int buff_size, unsigned *needed); +int trace_list_functions(void *buff, size_t buff_size, size_t *needed); /* Flags for ftrace_record */ enum ftrace_flags { @@ -77,7 +77,7 @@ struct trace_call { uint32_t flags; /* Flags and timestamp */ }; -int trace_list_calls(void *buff, int buff_size, unsigned int *needed); +int trace_list_calls(void *buff, size_t buff_size, size_t *needed); /** * Turn function tracing on and off diff --git a/lib/trace.c b/lib/trace.c index 04780f59d3..f2402b9359 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -190,12 +190,12 @@ void __attribute__((no_instrument_function)) __cyg_profile_func_exit( * greater than buff_size if we ran out of space. * @return 0 if ok, -1 if space was exhausted */ -int trace_list_functions(void *buff, int buff_size, unsigned int *needed) +int trace_list_functions(void *buff, size_t buff_size, size_t *needed) { struct trace_output_hdr *output_hdr = NULL; void *end, *ptr = buff; - int func; - int upto; + size_t func; + size_t upto; end = buff ? buff + buff_size : NULL; @@ -206,7 +206,7 @@ int trace_list_functions(void *buff, int buff_size, unsigned int *needed) /* Add information about each function */ for (func = upto = 0; func < hdr->func_count; func++) { - int calls = hdr->call_accum[func]; + size_t calls = hdr->call_accum[func]; if (!calls) continue; @@ -235,12 +235,12 @@ int trace_list_functions(void *buff, int buff_size, unsigned int *needed) return 0; } -int trace_list_calls(void *buff, int buff_size, unsigned *needed) +int trace_list_calls(void *buff, size_t buff_size, size_t *needed) { struct trace_output_hdr *output_hdr = NULL; void *end, *ptr = buff; - int rec, upto; - int count; + size_t rec, upto; + size_t count; end = buff ? buff + buff_size : NULL; diff --git a/tools/proftool.c b/tools/proftool.c index c1803fa78a..fecb9d6e99 100644 --- a/tools/proftool.c +++ b/tools/proftool.c @@ -205,12 +205,12 @@ static struct func_info *find_caller_by_offset(uint32_t offset) return low >= 0 ? &func_list[low] : NULL; } -static int read_calls(FILE *fin, int count) +static int read_calls(FILE *fin, size_t count) { struct trace_call *call_data; int i; - notice("call count: %d\n", count); + notice("call count: %zu\n", count); call_list = (struct trace_call *)calloc(count, sizeof(*call_data)); if (!call_list) { error("Cannot allocate call_list\n"); -- 2.20.1

2 6

[U-Boot] [PATCH 1/2] drivers: pci: add map_bar support for Enhanced Allocation
by Alex Marginean 28 Jun '19

28 Jun '19

Makes dm_pci_map_bar function available for integrated PCI devices that support Enhanced Allocation instead of original PCI BAR mechanism. Signed-off-by: Alex Marginean <alexm.osslist(a)gmail.com> --- drivers/pci/pci-uclass.c | 47 ++++++++++++++++++++++++++++++++++++++++ include/pci.h | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index cf1e7617ae..3204f156c3 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1341,11 +1341,58 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr, return bus_addr; } +static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags) +{ + int ea_off, ea_cnt, i, entry_size = 0; + int bar_id = bar - PCI_BASE_ADDRESS_0; + u32 ea_entry; + u64 addr; + + /* handle PCI functions that use Enhanced Allocation */ + ea_off = dm_pci_find_capability(dev, PCI_CAP_ID_EA); + + if (!ea_off) + return 0; + + /* EA capability structure header */ + dm_pci_read_config32(dev, ea_off, &ea_entry); + ea_cnt = (ea_entry >> 16) & 0x3f; + ea_off += 4; + + for (i = 0; i < ea_cnt; i++, ea_off += entry_size) { + /* Entry header */ + dm_pci_read_config32(dev, ea_off, &ea_entry); + entry_size = (ea_entry & 0x7) * 4; + + if (((ea_entry >> 4) & 0xf) != bar_id) + continue; + + /* Base address, 1st DW */ + dm_pci_read_config32(dev, ea_off + 4, &ea_entry); + addr = ea_entry & ~0x3; + if (ea_entry & 0x2) { + dm_pci_read_config32(dev, ea_off + 12, &ea_entry); + addr |= (u64)ea_entry << 32; + } + + /* size ignored for now */ + return map_physmem(addr, flags, 0); + } + return 0; +} + void *dm_pci_map_bar(struct udevice *dev, int bar, int flags) { pci_addr_t pci_bus_addr; u32 bar_response; + /* + * if the function supports Enhanced Allocation use that instead of + * BARs + */ + if (dm_pci_find_capability(dev, PCI_CAP_ID_EA)) + return dm_pci_map_ea_bar(dev, bar, flags); + /* read BAR address */ dm_pci_read_config32(dev, bar, &bar_response); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); diff --git a/include/pci.h b/include/pci.h index 508f7bca81..e1528bb257 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1314,7 +1314,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, * @dev: Device to check * @bar: Bar number to read (numbered from 0) * @flags: Flags for the region type (PCI_REGION_...) - * @return: pointer to the virtual address to use + * @return: pointer to the virtual address to use or 0 on error */ void *dm_pci_map_bar(struct udevice *dev, int bar, int flags); -- 2.17.1

4 25