August 2020 - U-Boot

[PATCH 00/16] common: Drop remaining includes in common.h
by Simon Glass 09 Sep '20

09 Sep '20

2 34

[PATCH U-BOOT v3 00/30] PLEASE TEST fs: btrfs: Re-implement btrfs support using code from btrfs-progs
by Marek Behún 08 Sep '20

08 Sep '20

Hello, this is a cleaned up version of Qu's patches that reimplements U-Boot's btrfs driver with code from btrfs-progs. I have tested this series, found and corrected one bug (failure when accesing files via symlinks), and it looks it is working now, but I would like more people to do some testing. There are a lot of checkpatch warnings and errors left, I shall fix this in the future. Marek Changes since v2: - fixed btrfs_lookup_path() in patch 19 to correctly handle symlinks - commit messages were updated some - for example they used the word "crossport" in 3 formats: "crossport", "cross-port" and "cross port", this was changed to "crossport" - corrected some typos - some English sentences were a bit weirdly written - fixed 2 compiler warnings (one use of maybe uninitialized variable and one printf specifier warning) - indentation in some places was wrong (usage of 8 spaces instead of a tab, for example) - added my Reviewed-by - the last patch, adding btrfs mailing list to MAINTAINRES, also adds Qu as designated reviewer, so that people add him to Cc when they send patches Changes since v1: - Implement btrfs_list_subvols() In v1 it's completely removed thus would cause problem if btrfsolume command is compiled in. - Rebased to latest master Only minor conflicts due to header changes. - Allow next_legnth() to return value > BTRFS_NAME_LEN Below is Qu's explanation, from cover letter of v2: The current btrfs code in U-boot is using a creative way to read on-disk data. It's pretty simple, involving the least amount of code, but pretty different from btrfs-progs nor kernel, making it pretty hard to sync code between different projects. This big patchset will rework the btrfs support, to use code mostly from btrfs-progs, thus all existing btrfs developers will feel at home. During the rework, the following new features are added: - More hash algorithm support SHA256 and XXHASH support are added. BLAKE2 needs more backport, will happen in a separate patchset. - The ability to read degraded RAID1 Although we still only support one device btrfs, the new code base can choose from different copies already. As long as new device scan interface is provided, multi-device support is pretty simple. - More correct handling of compressed extents with offset For compressed extent with offset, we should read the whole compressed extent, decompress them, then copy the referred part. There are some more features incoming, with the new code base it would be much easier to implement: - Data checksum support The check would happen in read_extent_data(), btrfs-progs has the needed facility to locate data csum. - BLAKE2 support Need BLAKE2 library cross ported. For btrfs it's just several lines of modification. - Multi-device support along wit degraded RAID support We only need an interface to scan one device without opening it. The infrastructure is already provided in this patchset. These new features would be submitted after the patchset get merged, since the patchset is already large, I don't want to make it more scary. Although this patchset look horribly large, most of them are code copy from btrfs-progs. E.g extent-cache.[ch], rbtree-utils.[ch], btrfs_btree.h. And ctree.h has over 1000 lines copied just for various accessors. While for disk-io.[ch] and volumes-io.[ch], they have some small modifications to adapt the interface of U-boot. E.g. btrfs_device::fd is replace with blkdev_desc and disk_partition_t. The new code for U-boot are related to the following functions: - btrfs_readlink() - btrfs_lookup_path() - btrfs_read_extent_inline() - btrfs_read_extent_reg() - lookup_data_extent() - btrfs_file_read() - btrfs_list_subvols() Qu Wenruo (30): fs: btrfs: Sync btrfs_btree.h from kernel fs: btrfs: Add more checksum algorithms fs: btrfs: Crossport btrfs_read_dev_super() from btrfs-progs fs: btrfs: Crossport rbtree-utils from btrfs-progs fs: btrfs: Crossport extent-cache.[ch] from btrfs-progs fs: btrfs: Crossport extent-io.[ch] from btrfs-progs fs: btrfs: Crossport structure accessor into ctree.h fs: btrfs: Crossport volumes.[ch] from btrfs-progs fs: btrfs: Crossport read_tree_block() from btrfs-progs fs: btrfs: Rename struct btrfs_path to struct __btrfs_path fs: btrfs: Rename btrfs_root to __btrfs_root fs: btrfs: Crossport struct btrfs_root to ctree.h fs: btrfs: Crossport btrfs_search_slot() from btrfs-progs fs: btrfs: Crossport btrfs_read_sys_array() and btrfs_read_chunk_tree() fs: btrfs: Crossport open_ctree_fs_info() from btrfs-progs fs: btrfs: Rename path resolve related functions to avoid name conflicts fs: btrfs: Use btrfs_readlink() to implement __btrfs_readlink() fs: btrfs: inode: Allow next_length() to return value > BTRFS_NAME_LEN fs: btrfs: Implement btrfs_lookup_path() fs: btrfs: Use btrfs_iter_dir() to replace btrfs_readdir() fs: btrfs: Use btrfs_lookup_path() to implement btrfs_exists() and btrfs_size() fs: btrfs: Rename btrfs_file_read() and its callees to avoid name conflicts fs: btrfs: Introduce btrfs_read_extent_inline() and btrfs_read_extent_reg() fs: btrfs: Introduce lookup_data_extent() for later use fs: btrfs: Implement btrfs_file_read() fs: btrfs: Introduce function to resolve path in one subvolume fs: btrfs: Introduce function to resolve the path of one subvolume fs: btrfs: Imeplement btrfs_list_subvols() using new infrastructure fs: btrfs: Cleanup the old implementation MAINTAINERS: Add btrfs mailing list and myself as reviewer MAINTAINERS | 2 + fs/btrfs/Makefile | 5 +- fs/btrfs/btrfs.c | 319 +++--- fs/btrfs/btrfs.h | 67 +- fs/btrfs/btrfs_tree.h | 766 -------------- fs/btrfs/chunk-map.c | 178 ---- fs/btrfs/common/rbtree-utils.c | 83 ++ fs/btrfs/common/rbtree-utils.h | 53 + fs/btrfs/compat.h | 88 ++ fs/btrfs/compression.c | 2 +- fs/btrfs/crypto/hash.c | 55 + fs/btrfs/crypto/hash.h | 17 + fs/btrfs/ctree.c | 859 ++++++++++++---- fs/btrfs/ctree.h | 1453 ++++++++++++++++++++++----- fs/btrfs/dir-item.c | 192 ++-- fs/btrfs/disk-io.c | 1062 ++++++++++++++++++++ fs/btrfs/disk-io.h | 50 + fs/btrfs/extent-cache.c | 318 ++++++ fs/btrfs/extent-cache.h | 104 ++ fs/btrfs/extent-io.c | 847 ++++++++++++++-- fs/btrfs/extent-io.h | 164 +++ fs/btrfs/hash.c | 38 - fs/btrfs/inode.c | 884 +++++++++++----- fs/btrfs/kernel-shared/btrfs_tree.h | 1333 ++++++++++++++++++++++++ fs/btrfs/root-tree.c | 47 + fs/btrfs/root.c | 92 -- fs/btrfs/subvolume.c | 310 ++++-- fs/btrfs/super.c | 257 ----- fs/btrfs/volumes.c | 1173 +++++++++++++++++++++ fs/btrfs/volumes.h | 204 ++++ 30 files changed, 8531 insertions(+), 2491 deletions(-) delete mode 100644 fs/btrfs/btrfs_tree.h delete mode 100644 fs/btrfs/chunk-map.c create mode 100644 fs/btrfs/common/rbtree-utils.c create mode 100644 fs/btrfs/common/rbtree-utils.h create mode 100644 fs/btrfs/compat.h create mode 100644 fs/btrfs/crypto/hash.c create mode 100644 fs/btrfs/crypto/hash.h create mode 100644 fs/btrfs/disk-io.c create mode 100644 fs/btrfs/disk-io.h create mode 100644 fs/btrfs/extent-cache.c create mode 100644 fs/btrfs/extent-cache.h create mode 100644 fs/btrfs/extent-io.h delete mode 100644 fs/btrfs/hash.c create mode 100644 fs/btrfs/kernel-shared/btrfs_tree.h create mode 100644 fs/btrfs/root-tree.c delete mode 100644 fs/btrfs/root.c delete mode 100644 fs/btrfs/super.c create mode 100644 fs/btrfs/volumes.c create mode 100644 fs/btrfs/volumes.h -- 2.26.2

6 41

[PATCH] ARM: at91: common: guard ATMEL_PIT code by ifdef
by Eugen Hristev 08 Sep '20

08 Sep '20

Atmel PIT timer is not available for next products that have another timer hardware block. To be able to use the common at91 code, guard the code that uses PIT by ifdefs. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- arch/arm/mach-at91/armv7/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index a8f4356ce9..8b7355042b 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -29,6 +29,7 @@ int arch_cpu_init(void) void arch_preboot_os(void) { +#if (IS_ENABLED(CONFIG_ATMEL_PIT_TIMER)) ulong cpiv; at91_pit_t *pit = (at91_pit_t *)ATMEL_BASE_PIT; @@ -40,6 +41,7 @@ void arch_preboot_os(void) * without waiting for wrapping back to 0 */ writel(cpiv + 0x1000, &pit->mr); +#endif } #if defined(CONFIG_DISPLAY_CPUINFO) -- 2.25.1

2 1

[PATCH] board: atmel: common: introduce at91_set_eth1addr for second interface
by Eugen Hristev 08 Sep '20

08 Sep '20

We already have a function to retrieve the mac address from one EEPROM. For boards with a second Ethernet interface, however, we would require another EEPROM with a second unique MAC address. Introduce at91_set_eth1addr which will look for a second EEPROM and set the 'eth1addr' variable with the obtained MAC address. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/common/mac_eeprom.c | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index 01e00c508a..f7b411cf7d 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -40,6 +40,7 @@ void configure_ddrcfg_input_buffers(bool open); #endif int at91_set_ethaddr(int offset); +int at91_set_eth1addr(int offset); void at91_spi_nor_set_ethaddr(void); int at91_video_show_board_info(void); diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index 050aa51ee1..0f038beee6 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -35,3 +35,36 @@ int at91_set_ethaddr(int offset) return 0; } + +/* this function will set eth1addr from a second eeprom, if available */ +int at91_set_eth1addr(int offset) +{ + const int ETH_ADDR_LEN = 6; + unsigned char ethaddr[ETH_ADDR_LEN]; + /* configure eth1addr for second interface */ + const char *ETHADDR_NAME = "eth1addr"; + struct udevice *dev; + int ret; + + if (env_get(ETHADDR_NAME)) + return 0; + + /* first eeprom is retrieved, this is for the first interface */ + ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev); + if (ret) + return ret; + + /* attempt to obtain a second eeprom device */ + ret = uclass_next_device(&dev); + if (ret) + return ret; + + ret = i2c_eeprom_read(dev, offset, ethaddr, 6); + if (ret) + return ret; + + if (is_valid_ethaddr(ethaddr)) + eth_env_set_enetaddr(ETHADDR_NAME, ethaddr); + + return 0; +} -- 2.25.1

2 1

[PATCH v1] arm: socfpga: soc64: Disable CONFIG_PSCI_RESET
by Chee Hong Ang 08 Sep '20

08 Sep '20

Don't invoke 'SYSTEM_RESET' PSCI function because PSCI function calls are not supported by u-boot running in EL3. Signed-off-by: Chee Hong Ang <chee.hong.ang(a)intel.com> --- configs/socfpga_agilex_defconfig | 1 + configs/socfpga_stratix10_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/socfpga_agilex_defconfig b/configs/socfpga_agilex_defconfig index a08f66e248..feaab00249 100644 --- a/configs/socfpga_agilex_defconfig +++ b/configs/socfpga_agilex_defconfig @@ -12,6 +12,7 @@ CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" +# CONFIG_PSCI_RESET is not set CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig index 04e354f59e..e7c7550112 100644 --- a/configs/socfpga_stratix10_defconfig +++ b/configs/socfpga_stratix10_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_FS_FAT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" CONFIG_OPTIMIZE_INLINING=y CONFIG_SPL_OPTIMIZE_INLINING=y +# CONFIG_PSCI_RESET is not set CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" -- 2.19.0

2 1

Please pull u-boot-marvell/remove-config-nr-dram-banks-v9-2020-08-26
by Stefan Roese 07 Sep '20

07 Sep '20

Hi Tom, I've prepared a branch for you to pull the "Remove CONFIG_NR_DRAM_BANKS option and bi_memstart/memsize from bd_info" patchset, if you care to pull from it. I've rebased it on top of latest TOT, which was necessary because of a merge conflict in pci-uclass.c. I think it's ready to go upstream now. Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=46&view=results Thanks, Stefan The following changes since commit 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell (2020-08-25 13:38:29 -0400) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-marvell.git remove-config-nr-dram-banks-v9-2020-08-26 for you to fetch changes up to bac9da46c57511e574aa7e763e17fdd6f55db5bb: asm-generic/u-boot.h: Remove bi_memstart & bi_memsize from bd_info (2020-08-26 09:20:05 +0200) ---------------------------------------------------------------- Stefan Roese (10): CONFIG_NR_DRAM_BANKS: Remove unreferenced code as its always defined image: Use gd->ram_base/_size in env_get_bootm_size() board_f: Add default values for bi_dram[] in dram_init_banksize() global: Move from bi_memstart/memsize -> gd->ram_base/ram_size xtensa: Remove arch_setup_bdinfo() xtensa: Remove local no-op dram_init_banksize() video: cfb_console.c: Use bi_dram[] values on all platforms powerpc: Remove bi_memstart & bi_memsize assignments in spl.c cmd: bdinfo: Remove print of superseeded bi_memstart / bi_memsize values asm-generic/u-boot.h: Remove bi_memstart & bi_memsize from bd_info api/api_platform-mips.c | 3 +-- api/api_platform-powerpc.c | 2 +- arch/mips/lib/boot.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/traps.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 4 ++-- arch/powerpc/cpu/mpc85xx/traps.c | 2 +- arch/powerpc/cpu/mpc86xx/fdt.c | 4 +++- arch/powerpc/cpu/mpc86xx/traps.c | 2 +- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/lib/bootm.c | 4 ++-- arch/x86/cpu/broadwell/cpu_from_spl.c | 2 -- arch/xtensa/lib/Makefile | 2 +- arch/xtensa/lib/bdinfo.c | 22 ---------------------- arch/xtensa/lib/bootm.c | 5 ++--- board/Arcturus/ucp1020/spl.c | 2 -- board/cadence/xtfpga/xtfpga.c | 5 ----- board/freescale/p1010rdb/spl.c | 2 -- board/freescale/p1_p2_rdb_pc/spl.c | 2 -- board/freescale/t102xrdb/spl.c | 2 -- board/freescale/t104xrdb/spl.c | 2 -- board/freescale/t208xqds/spl.c | 2 -- board/freescale/t208xrdb/spl.c | 2 -- board/freescale/t4rdb/spl.c | 2 -- board/xilinx/zynqmp/zynqmp.c | 2 -- cmd/bdinfo.c | 10 ---------- cmd/bedbug.c | 2 +- common/board_f.c | 12 +----------- common/image.c | 10 ++-------- common/init/handoff.c | 33 +++++++++++++-------------------- drivers/pci/pci-uclass.c | 3 ++- drivers/video/cfb_console.c | 8 +------- include/asm-generic/u-boot.h | 4 ---- include/handoff.h | 2 -- lib/fdtdec.c | 5 ----- lib/lmb.c | 9 ++------- 37 files changed, 41 insertions(+), 142 deletions(-) delete mode 100644 arch/xtensa/lib/bdinfo.c

3 6

[RFC 0/4] drivers: footprint reduction proposal
by Walter Lozano 07 Sep '20

07 Sep '20

Based on several reports and discussions it is clear that U-Boot's footprint is always a concern, and any kind of reduction is an improvement. This series is a proposal to help reducing the footprint by parsing information provided in DT and drivers in different ways and adding additional intelligence to dtoc. The current version implements the basic functionality in dtoc but this is no fully integrated, however it will allow us to discuss this approach. Firstly, based on the compatible strings found in drivers, include only DT nodes which are supported by any driver present in U-Boot. Secondly, generate struct udevice_id entries only for nodes present in DT, which will allow to avoid including additional data. These are the first steps for further improvements as proposed in the specific patches in this series. This work is based on the work of Simon Glass present in [1] which adds support to dtoc for parsing compatible strings. [1] https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/tree/dtoc-working Walter Lozano (4): dtoc: add POC for dtb shrink dtoc: add initial support for deleting DTB nodes dtoc: add support for generate stuct udevice_id mmc: fsl_esdhc_imx: make use of dtoc to generate struct udevice_id drivers/mmc/fsl_esdhc_imx.c | 58 ++++++++++++++------ tools/dtoc/dtb_platdata.py | 102 ++++++++++++++++++++++++++++++++++-- tools/dtoc/fdt.py | 3 ++ 3 files changed, 143 insertions(+), 20 deletions(-) -- 2.20.1

4 27

[PATCH v4 0/2] use dt and UCLASS_IRQ/SYSCON to get gic details
by Rayagonda Kokatanur 07 Sep '20

07 Sep '20

Use device tree and driver class (UCLASS_IRQ and UCLASS_SYSCON) to get gic details like GICD, GICR base address, max number of redistributors and git lpi address. Changes from v3: -Address review comments from Simon, Correct the data type of variables Changes from v2: -Address review comments from Tom Rini, Fix build errors messages. Changes from v1: -Address review comments from Tom Rini, Fix build warning messages. Rayagonda Kokatanur (2): arch: arm: use dt and UCLASS_IRQ to get gic details arch: arm: use dt and UCLASS_SYSCON to get gic lpi details arch/arm/Kconfig | 2 + arch/arm/cpu/armv8/fsl-layerscape/soc.c | 28 +---- arch/arm/include/asm/gic-v3.h | 4 +- arch/arm/lib/gic-v3-its.c | 136 +++++++++++++++++++++--- 4 files changed, 127 insertions(+), 43 deletions(-) -- 2.17.1

3 6

[PATCH v6 0/2] Basic Kontron SMARC-sAL28 board support
by Michael Walle 07 Sep '20

07 Sep '20

Add basic board support for the Kontron SMARC-sAL28 board. Please note, that this board doesn't support TF-a (yet). Therefore, the u-boot SPL is the first code which is run and it has to set up the RAM. changes since v5: - moved CONFIG_ENV_OVERWRITE to defconfig. Thanks Kuldeep! changes since v4: - dropped "armv8: ls1028a: move FSL_LAYERSCAPE to kconfig" as it is already upstream - new patch "board: sl28: add board specific nvm command" - use binman - sync device trees with linux - use "<devicetree>-u-boot.dtsi" style - rebase to lastest master changes since v3: - rebase to latest master - use CONFIG_PCI_INIT_R - set fdtfile in default environment changes since v2: - add variant 4 support. Since the atheros PHY dt bindings were merged into master, we can now use them - add environment section in include/configs/kontron_sl28.h - add cover letter changes since v1: - fix watchdog device tree reference Michael Walle (2): board: kontron: add sl28 support board: sl28: add board specific nvm command arch/arm/Kconfig | 11 + arch/arm/dts/Makefile | 3 + .../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 135 +++++++++++++ .../fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi | 2 + .../arm/dts/fsl-ls1028a-kontron-sl28-var3.dts | 15 ++ .../fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi | 2 + .../arm/dts/fsl-ls1028a-kontron-sl28-var4.dts | 48 +++++ arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 189 ++++++++++++++++++ board/kontron/sl28/Kconfig | 18 ++ board/kontron/sl28/MAINTAINERS | 6 + board/kontron/sl28/Makefile | 8 + board/kontron/sl28/README | 142 +++++++++++++ board/kontron/sl28/cmds.c | 178 +++++++++++++++++ board/kontron/sl28/common.c | 10 + board/kontron/sl28/ddr.c | 98 +++++++++ board/kontron/sl28/sl28.c | 70 +++++++ board/kontron/sl28/spl.c | 32 +++ configs/kontron_sl28_defconfig | 107 ++++++++++ include/configs/kontron_sl28.h | 122 +++++++++++ 19 files changed, 1196 insertions(+) create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts create mode 100644 arch/arm/dts/fsl-ls1028a-kontron-sl28.dts create mode 100644 board/kontron/sl28/Kconfig create mode 100644 board/kontron/sl28/MAINTAINERS create mode 100644 board/kontron/sl28/Makefile create mode 100644 board/kontron/sl28/README create mode 100644 board/kontron/sl28/cmds.c create mode 100644 board/kontron/sl28/common.c create mode 100644 board/kontron/sl28/ddr.c create mode 100644 board/kontron/sl28/sl28.c create mode 100644 board/kontron/sl28/spl.c create mode 100644 configs/kontron_sl28_defconfig create mode 100644 include/configs/kontron_sl28.h -- 2.20.1

2 4

[PATCH RESEND v2 01/11] usb: xhci: add a member hci_version in xhci_ctrl struct
by Chunfeng Yun 07 Sep '20

07 Sep '20

Add a member to save xHCI version, it's used some times. Signed-off-by: Chunfeng Yun <chunfeng.yun(a)mediatek.com> --- v2: no changes --- drivers/usb/host/xhci-ring.c | 4 ++-- drivers/usb/host/xhci.c | 1 + include/usb/xhci.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 092ed6e..79bfc34 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -682,7 +682,7 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe, field |= TRB_ISP; /* Set the TRB length, TD size, and interrupter fields. */ - if (HC_VERSION(xhci_readl(&ctrl->hccr->cr_capbase)) < 0x100) + if (ctrl->hci_version < 0x100) remainder = xhci_td_remainder(length - running_total); else remainder = xhci_v1_0_td_remainder(running_total, @@ -830,7 +830,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, field |= 0x1; /* xHCI 1.0 6.4.1.2.1: Transfer Type field */ - if (HC_VERSION(xhci_readl(&ctrl->hccr->cr_capbase)) >= 0x100) { + if (ctrl->hci_version >= 0x100) { if (length > 0) { if (req->requesttype & USB_DIR_IN) field |= (TRB_DATA_IN << TRB_TX_TYPE_SHIFT); diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 126dabc..4be1411 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1283,6 +1283,7 @@ static int xhci_lowlevel_init(struct xhci_ctrl *ctrl) reg = HC_VERSION(xhci_readl(&hccr->cr_capbase)); printf("USB XHCI %x.%02x\n", reg >> 8, reg & 0xff); + ctrl->hci_version = reg; return 0; } diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 7d34103..a3e5914 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -1227,6 +1227,7 @@ struct xhci_ctrl { struct xhci_scratchpad *scratchpad; struct xhci_virt_device *devs[MAX_HC_SLOTS]; int rootdev; + u16 hci_version; }; unsigned long trb_addr(struct xhci_segment *seg, union xhci_trb *trb); -- 1.9.1

4 21