April 2022 - U-Boot

[PATCH 0/2] U-Boot ENV in EXT4 support for Expressobin (revised)
by Rogier Stam 11 May '22

11 May '22

Hi Per comments of Stefan I have split the patch in two: - one for env file changes - one for espressobin related changes Let me know if any other changes are needed. Regards Rogier Rogier Stam (2): Fix Espressobin build for configs where ENV is not in SPI Add SCSI scan for ENV in EXT4 or FAT arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) -- 2.7.4

3 8

[PATCH] Makefile: update warning about CONFIG_OF_EMBED
by Ralph Siemsen 11 May '22

11 May '22

Update the diagnostic message with revised location of document, which changed in 3e9fddfc4f1 ("doc: Move devicetree control doc to rST") Signed-off-by: Ralph Siemsen <ralph.siemsen(a)linaro.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccc87c3a5cd..486a9b9ca23 100644 --- a/Makefile +++ b/Makefile @@ -1113,7 +1113,7 @@ ifeq ($(CONFIG_OF_EMBED)$(CONFIG_EFI_APP),y) @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" @echo >&2 "be used for debugging purposes. Please use" @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." - @echo >&2 "See doc/README.fdt-control for more info." + @echo >&2 "See doc/develop/devicetree/control.rst for more info." @echo >&2 "====================================================" endif ifneq ($(CONFIG_SPL_FIT_GENERATOR),) -- 2.25.1

2 1

[PATCH V2 0/4] MXS nand fixes in SPL
by Michael Trimarchi 11 May '22

11 May '22

Those patches come after some testing of failing in factory on some unit. We found out that the bootrom imx loader was not able to handling badblock. This can be a limit of the implementation right now in imx8mn. Anyway not all the imx platform has the support of this loader. I found some problems on the implementation so I have fixed it up according the experience of Sitara. I tested only using a Fit Image as a flash container. This version add in the series the fix of cmd_nandbcb and the fix of spl_nand load. I can imagine that a lot of boards and users are affected. I have started to backport this changes in some older uboot and adapt it Michael Trimarchi (4): nand: raw: mxs_nand: Fix specific hook registration mtd: nand: mxs_nand_spl: Fix bad block skipping arm: mach-imx: cmd_nandbcb fix bad block handling spl: spl_nand: Fix bad block handling in fitImage arch/arm/mach-imx/cmd_nandbcb.c | 21 +++---- common/spl/spl_nand.c | 5 +- drivers/mtd/nand/raw/mxs_nand.c | 32 +++++----- drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++------------- 4 files changed, 73 insertions(+), 75 deletions(-) -- 2.25.1

5 19

[PATCH v2] misc: Fix always compiling MISC even for SPL/TPL
by Sean Anderson 10 May '22

10 May '22

We should only build support for misc if the appropriate SPL/TPL symbol is defined. To ease the transition, make SPL/TPL_MISC default to MISC. This is necessary because many drivers don't specify their dependencies properly. These defaults can be removed once all drivers depend on the appropriate config. Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL") Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- Changes in v2: - Make SPL/TPL_MISC default to MISC drivers/misc/Kconfig | 2 ++ drivers/misc/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 10fd601278..21b334d43d 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -16,6 +16,7 @@ config MISC config SPL_MISC bool "Enable Driver Model for Misc drivers in SPL" depends on SPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A @@ -25,6 +26,7 @@ config SPL_MISC config TPL_MISC bool "Enable Driver Model for Misc drivers in TPL" depends on TPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 6150d01e88..7a6047f64f 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o -- 2.35.1.1320.gc452695387.dirty

2 1

[PATCH] soc: xilinx: zynqmp: fix out of bounds array access
by Michal Simek 10 May '22

10 May '22

The call to xilinx_pm_request requires an array of a larger size. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- The same change was done for versal by https://lore.kernel.org/r/20220416181530.2311155-1-jorge@foundries.io --- drivers/soc/soc_xilinx_zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/soc_xilinx_zynqmp.c b/drivers/soc/soc_xilinx_zynqmp.c index 7d33ce2163d8..a71115b17ccd 100644 --- a/drivers/soc/soc_xilinx_zynqmp.c +++ b/drivers/soc/soc_xilinx_zynqmp.c @@ -49,7 +49,7 @@ static const struct soc_ops soc_xilinx_zynqmp_ops = { static int soc_xilinx_zynqmp_probe(struct udevice *dev) { struct soc_xilinx_zynqmp_priv *priv = dev_get_priv(dev); - u32 ret_payload[4]; + u32 ret_payload[PAYLOAD_ARG_CNT]; int ret; priv->family = zynqmp_family; -- 2.35.1

2 1

[PATCH] usb: xhci-dwc3: Support role switch default role
by Mark Kettenis 10 May '22

10 May '22

When the device tree indicates support for role switching through the "usb-role-switch" property, take the "role-switch-default-mode" property into account when deciding which role to put the controller into. This makes USB devices work on Apple M1 systems where the device tree may include a "dr_mode" property that is set to "otg", but where we need to put the controller into "host" mode to see devices connected to the type-C ports. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- drivers/usb/common/common.c | 16 ++++++++++++++++ drivers/usb/host/xhci-dwc3.c | 6 ++++++ include/linux/usb/otg.h | 10 ++++++++++ 3 files changed, 32 insertions(+) diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index ee0c064f1f..cff86a51ae 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -40,6 +40,22 @@ enum usb_dr_mode usb_get_dr_mode(ofnode node) return USB_DR_MODE_UNKNOWN; } +enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node) +{ + const char *dr_mode; + int i; + + dr_mode = ofnode_read_string(node, "role-switch-default-mode"); + if (!dr_mode) + return USB_DR_MODE_UNKNOWN; + + for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++) + if (!strcmp(dr_mode, usb_dr_modes[i])) + return i; + + return USB_DR_MODE_UNKNOWN; +} + static const char *const speed_names[] = { [USB_SPEED_UNKNOWN] = "UNKNOWN", [USB_SPEED_LOW] = "low-speed", diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index bec0d98081..1dbd65dfaa 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -209,6 +209,12 @@ static int xhci_dwc3_probe(struct udevice *dev) writel(reg, &dwc3_reg->g_usb2phycfg[0]); dr_mode = usb_get_dr_mode(dev_ofnode(dev)); + if (dr_mode == USB_DR_MODE_OTG && + dev_read_bool(dev, "usb-role-switch")) { + dr_mode = usb_get_role_switch_default_mode(dev_ofnode(dev)); + if (dr_mode == USB_DR_MODE_UNKNOWN) + dr_mode = USB_DR_MODE_OTG; + } if (dr_mode == USB_DR_MODE_UNKNOWN) /* by default set dual role mode to HOST */ dr_mode = USB_DR_MODE_HOST; diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index c19b916be9..5d0dac950e 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -27,6 +27,16 @@ enum usb_dr_mode { */ enum usb_dr_mode usb_get_dr_mode(ofnode node); +/** + * usb_get_dr_mode() - Get dual role mode for given device + * @node: ofnode of the given device + * + * The function gets phy interface string from property + * 'role-switch-defaulr-mode', and returns the correspondig enum + * usb_dr_mode + */ +enum usb_dr_mode usb_get_role_switch_default_mode(ofnode node); + /** * usb_get_maximum_speed() - Get maximum speed for given device * @node: ofnode of the given device -- 2.35.1

2 1

[PATCH] phy: stm32-usbphyc: stm32-usbphyc: Add DT phy tuning support
by Patrice Chotard 10 May '22

10 May '22

Add support of phy-tuning properties for sm32-usbphyc's phy tuning aligned with v5.15 kernel bindings. Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- drivers/phy/phy-stm32-usbphyc.c | 167 ++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c index 9c1dcfae52..d7f7c37f91 100644 --- a/drivers/phy/phy-stm32-usbphyc.c +++ b/drivers/phy/phy-stm32-usbphyc.c @@ -17,6 +17,8 @@ #include <usb.h> #include <asm/io.h> #include <dm/device_compat.h> +#include <dm/of_access.h> +#include <linux/bitfield.h> #include <linux/bitops.h> #include <linux/delay.h> #include <power/regulator.h> @@ -24,6 +26,7 @@ /* USBPHYC registers */ #define STM32_USBPHYC_PLL 0x0 #define STM32_USBPHYC_MISC 0x8 +#define STM32_USBPHYC_TUNE(X) (0x10C + ((X) * 0x100)) /* STM32_USBPHYC_PLL bit fields */ #define PLLNDIV GENMASK(6, 0) @@ -40,6 +43,26 @@ /* STM32_USBPHYC_MISC bit fields */ #define SWITHOST BIT(0) +/* STM32_USBPHYC_TUNE bit fields */ +#define INCURREN BIT(0) +#define INCURRINT BIT(1) +#define LFSCAPEN BIT(2) +#define HSDRVSLEW BIT(3) +#define HSDRVDCCUR BIT(4) +#define HSDRVDCLEV BIT(5) +#define HSDRVCURINCR BIT(6) +#define FSDRVRFADJ BIT(7) +#define HSDRVRFRED BIT(8) +#define HSDRVCHKITRM GENMASK(12, 9) +#define HSDRVCHKZTRM GENMASK(14, 13) +#define OTPCOMP GENMASK(19, 15) +#define SQLCHCTL GENMASK(21, 20) +#define HDRXGNEQEN BIT(22) +#define HSRXOFF GENMASK(24, 23) +#define HSFALLPREEM BIT(25) +#define SHTCCTCTLPROT BIT(26) +#define STAGSEL BIT(27) + #define MAX_PHYS 2 /* max 100 us for PLL lock and 100 us for PHY init */ @@ -49,6 +72,62 @@ #define PLL_INFF_MIN_RATE 19200000 /* in Hz */ #define PLL_INFF_MAX_RATE 38400000 /* in Hz */ +enum boosting_vals { + BOOST_1000_UA = 1000, + BOOST_2000_UA = 2000, +}; + +enum dc_level_vals { + DC_MINUS_5_TO_7_MV, + DC_PLUS_5_TO_7_MV, + DC_PLUS_10_TO_14_MV, + DC_MAX, +}; + +enum current_trim { + CUR_NOMINAL, + CUR_PLUS_1_56_PCT, + CUR_PLUS_3_12_PCT, + CUR_PLUS_4_68_PCT, + CUR_PLUS_6_24_PCT, + CUR_PLUS_7_8_PCT, + CUR_PLUS_9_36_PCT, + CUR_PLUS_10_92_PCT, + CUR_PLUS_12_48_PCT, + CUR_PLUS_14_04_PCT, + CUR_PLUS_15_6_PCT, + CUR_PLUS_17_16_PCT, + CUR_PLUS_19_01_PCT, + CUR_PLUS_20_58_PCT, + CUR_PLUS_22_16_PCT, + CUR_PLUS_23_73_PCT, + CUR_MAX, +}; + +enum impedance_trim { + IMP_NOMINAL, + IMP_MINUS_2_OHMS, + IMP_MINUS_4_OMHS, + IMP_MINUS_6_OHMS, + IMP_MAX, +}; + +enum squelch_level { + SQLCH_NOMINAL, + SQLCH_PLUS_7_MV, + SQLCH_MINUS_5_MV, + SQLCH_PLUS_14_MV, + SQLCH_MAX, +}; + +enum rx_offset { + NO_RX_OFFSET, + RX_OFFSET_PLUS_5_MV, + RX_OFFSET_PLUS_10_MV, + RX_OFFSET_MINUS_5_MV, + RX_OFFSET_MAX, +}; + struct pll_params { u8 ndiv; u16 frac; @@ -327,6 +406,90 @@ static int stm32_usbphyc_of_xlate(struct phy *phy, return 0; } +static void stm32_usbphyc_tuning(struct udevice *dev, ofnode node, u32 index) +{ + struct stm32_usbphyc *usbphyc = dev_get_priv(dev); + u32 reg = STM32_USBPHYC_TUNE(index); + u32 otpcomp, val, tune = 0; + int ret; + + /* Backup OTP compensation code */ + otpcomp = FIELD_GET(OTPCOMP, readl(usbphyc->base + reg)); + + ret = ofnode_read_u32(node, "st,current-boost-microamp", &val); + if (!ret && (val == BOOST_1000_UA || val == BOOST_2000_UA)) { + val = (val == BOOST_2000_UA) ? 1 : 0; + tune |= INCURREN | FIELD_PREP(INCURRINT, val); + } else if (ret != -EINVAL) { + dev_warn(dev, "phy%d: invalid st,current-boost-microamp value\n", index); + } + + if (!ofnode_read_bool(node, "st,no-lsfs-fb-cap")) + tune |= LFSCAPEN; + + if (ofnode_read_bool(node, "st,decrease-hs-slew-rate")) + tune |= HSDRVSLEW; + + ret = ofnode_read_u32(node, "st,tune-hs-dc-level", &val); + if (!ret && val < DC_MAX) { + if (val == DC_MINUS_5_TO_7_MV) { + tune |= HSDRVDCCUR; + } else { + val = (val == DC_PLUS_10_TO_14_MV) ? 1 : 0; + tune |= HSDRVCURINCR | FIELD_PREP(HSDRVDCLEV, val); + } + } else if (ret != -EINVAL) { + dev_warn(dev, "phy%d: invalid st,tune-hs-dc-level value\n", index); + } + + if (ofnode_read_bool(node, "st,enable-fs-rftime-tuning")) + tune |= FSDRVRFADJ; + + if (ofnode_read_bool(node, "st,enable-hs-rftime-reduction")) + tune |= HSDRVRFRED; + + ret = ofnode_read_u32(node, "st,trim-hs-current", &val); + if (!ret && val < CUR_MAX) + tune |= FIELD_PREP(HSDRVCHKITRM, val); + else if (ret != -EINVAL) + dev_warn(dev, "phy%d: invalid st,trim-hs-current value\n", index); + + ret = ofnode_read_u32(node, "st,trim-hs-impedance", &val); + if (!ret && val < IMP_MAX) + tune |= FIELD_PREP(HSDRVCHKZTRM, val); + else if (ret != -EINVAL) + dev_warn(dev, "phy%d: invalid trim-hs-impedance value\n", index); + + ret = ofnode_read_u32(node, "st,tune-squelch-level", &val); + if (!ret && val < SQLCH_MAX) + tune |= FIELD_PREP(SQLCHCTL, val); + else if (ret != -EINVAL) + dev_warn(dev, "phy%d: invalid st,tune-squelch-level value\n", index); + + if (ofnode_read_bool(node, "st,enable-hs-rx-gain-eq")) + tune |= HDRXGNEQEN; + + ret = ofnode_read_u32(node, "st,tune-hs-rx-offset", &val); + if (!ret && val < RX_OFFSET_MAX) + tune |= FIELD_PREP(HSRXOFF, val); + else if (ret != -EINVAL) + dev_warn(dev, "phy%d: invalid st,tune-hs-rx-offset value\n", index); + + if (ofnode_read_bool(node, "st,no-hs-ftime-ctrl")) + tune |= HSFALLPREEM; + + if (!ofnode_read_bool(node, "st,no-lsfs-sc")) + tune |= SHTCCTCTLPROT; + + if (ofnode_read_bool(node, "st,enable-hs-tx-staggering")) + tune |= STAGSEL; + + /* Restore OTP compensation code */ + tune |= FIELD_PREP(OTPCOMP, otpcomp); + + writel(tune, usbphyc->base + reg); +} + static const struct phy_ops stm32_usbphyc_phy_ops = { .init = stm32_usbphyc_phy_init, .exit = stm32_usbphyc_phy_exit, @@ -389,6 +552,10 @@ static int stm32_usbphyc_probe(struct udevice *dev) phy_id, ofnode_get_name(node)); return -ENOENT; } + + /* Configure phy tuning */ + stm32_usbphyc_tuning(dev, node, phy_id); + usbphyc_phy = usbphyc->phys + phy_id; usbphyc_phy->init = false; usbphyc_phy->powered = false; -- 2.17.1

3 4

[PATCH] efi_loader: fix a problem in loading an image from a short-path
by AKASHI Takahiro 10 May '22

10 May '22

Booting from a short-form device path which starts with the first element being a File Path Media Device Path failed because it doesn't contain any valid device with simple file system protocol and efi_dp_find_obj() in efi_load_image_from_path() will return NULL. For instance, /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/Scsi(0,0)/\helloworld.efi -> shortened version: /\helloworld.efi With this patch applied, all the media devices with simple file system protocol are enumerated and the boot manager attempts to boot temporarily generated device paths one-by-one. This new implementation is still a bit incompatible with the UEFI specification in terms of: * not creating real boot options * not distinguishing removable media and fix media (See section 3.1.3 "Boot Options".) But it still gives us a closer and better solution than the current. Fixes: commit 9cdf470274ff ("efi_loader: support booting via short-form device-path") Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- include/efi_loader.h | 3 ++ lib/efi_loader/efi_boottime.c | 87 +++++++++++++++++++++++++++++++---- lib/efi_loader/efi_file.c | 35 ++++++++++---- 3 files changed, 107 insertions(+), 18 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index ba79a9afb404..9730c1375a55 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -661,6 +661,9 @@ void efi_signal_event(struct efi_event *event); struct efi_simple_file_system_protocol *efi_simple_file_system( struct blk_desc *desc, int part, struct efi_device_path *dp); +/* open file from simple file system */ +struct efi_file_handle *efi_file_from_fs(struct efi_simple_file_system_protocol *v, + struct efi_device_path *fp); /* open file from device-path: */ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp); diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 5bcb8253edba..39b0e8f7ade0 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1868,19 +1868,21 @@ out: } /** - * efi_load_image_from_file() - load an image from file system + * __efi_load_image_from_file() - load an image from file system * * Read a file into a buffer allocated as EFI_BOOT_SERVICES_DATA. It is the * callers obligation to update the memory type as needed. * + * @v: simple file system * @file_path: the path of the image to load * @buffer: buffer containing the loaded image * @size: size of the loaded image * Return: status code */ static -efi_status_t efi_load_image_from_file(struct efi_device_path *file_path, - void **buffer, efi_uintn_t *size) +efi_status_t __efi_load_image_from_file(struct efi_simple_file_system_protocol *v, + struct efi_device_path *file_path, + void **buffer, efi_uintn_t *size) { struct efi_file_handle *f; efi_status_t ret; @@ -1888,7 +1890,11 @@ efi_status_t efi_load_image_from_file(struct efi_device_path *file_path, efi_uintn_t bs; /* Open file */ - f = efi_file_from_path(file_path); + if (v) + f = efi_file_from_fs(v, file_path); + else + /* file_path should have a device path */ + f = efi_file_from_path(file_path); if (!f) return EFI_NOT_FOUND; @@ -1921,6 +1927,64 @@ error: return ret; } +/** + * efi_load_image_from_file() - load an image from file system + * + * Read a file into a buffer allocated as EFI_BOOT_SERVICES_DATA. It is the + * callers obligation to update the memory type as needed. + * + * @file_path: the path of the image to load + * @buffer: buffer containing the loaded image + * @size: size of the loaded image + * Return: status code + */ +static +efi_status_t efi_load_image_from_file(struct efi_device_path *file_path, + void **buffer, efi_uintn_t *size) +{ + efi_uintn_t no_handles; + efi_handle_t *handles; + struct efi_handler *handler; + struct efi_simple_file_system_protocol *fs; + int i; + efi_status_t ret; + + /* if a file_path contains a device path */ + if (!EFI_DP_TYPE(file_path, MEDIA_DEVICE, FILE_PATH)) + return __efi_load_image_from_file(NULL, file_path, buffer, size); + + /* no explicit device specified */ + ret = EFI_CALL(efi_locate_handle_buffer( + BY_PROTOCOL, + &efi_simple_file_system_protocol_guid, + NULL, + &no_handles, + &handles)); + if (ret != EFI_SUCCESS) + return ret; + if (!no_handles) + return EFI_NOT_FOUND; + + for (i = 0; i < no_handles; i++) { + ret = efi_search_protocol(handles[i], + &efi_simple_file_system_protocol_guid, + &handler); + if (ret != EFI_SUCCESS) + /* unlikely */ + continue; + + fs = handler->protocol_interface; + if (!fs) + continue; + + ret = __efi_load_image_from_file(fs, file_path, buffer, size); + if (ret == EFI_SUCCESS) + return ret; + } + + return EFI_NOT_FOUND; +} + /** * efi_load_image_from_path() - load an image using a file path * @@ -1940,7 +2004,7 @@ efi_status_t efi_load_image_from_path(bool boot_policy, { efi_handle_t device; efi_status_t ret; - struct efi_device_path *dp, *rem; + struct efi_device_path *rem; struct efi_load_file_protocol *load_file_protocol = NULL; efi_uintn_t buffer_size; uint64_t addr, pages; @@ -1950,12 +2014,15 @@ efi_status_t efi_load_image_from_path(bool boot_policy, *buffer = NULL; *size = 0; - dp = file_path; - device = efi_dp_find_obj(dp, NULL, &rem); - ret = efi_search_protocol(device, &efi_simple_file_system_protocol_guid, - NULL); + /* try first for simple file system protocols */ + ret = efi_load_image_from_file(file_path, buffer, size); if (ret == EFI_SUCCESS) - return efi_load_image_from_file(file_path, buffer, size); + return ret; + + /* TODO: does this really make sense? */ + device = efi_dp_find_obj(file_path, NULL, &rem); + if (!device) + return EFI_NOT_FOUND; ret = efi_search_protocol(device, &efi_guid_load_file_protocol, NULL); if (ret == EFI_SUCCESS) { diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 7a7077e6d032..2d6a432b168b 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1083,16 +1083,16 @@ static const struct efi_file_handle efi_file_handle_protocol = { /** * efi_file_from_path() - open file via device path * - * @fp: device path + * @v: simple file system + * @fp: file path * Return: EFI_FILE_PROTOCOL for the file or NULL */ -struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) +struct efi_file_handle *efi_file_from_fs(struct efi_simple_file_system_protocol *v, + struct efi_device_path *fp) { - struct efi_simple_file_system_protocol *v; struct efi_file_handle *f; efi_status_t ret; - v = efi_fs_from_path(fp); if (!v) return NULL; @@ -1100,10 +1100,6 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) if (ret != EFI_SUCCESS) return NULL; - /* Skip over device-path nodes before the file path. */ - while (fp && !EFI_DP_TYPE(fp, MEDIA_DEVICE, FILE_PATH)) - fp = efi_dp_next(fp); - /* * Step through the nodes of the directory path until the actual file * node is reached which is the final node in the device path. @@ -1138,6 +1134,29 @@ struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) return f; } +/** + * efi_file_from_path() - open file via device path + * + * @fp: device path + * Return: EFI_FILE_PROTOCOL for the file or NULL + */ +struct efi_file_handle *efi_file_from_path(struct efi_device_path *fp) +{ + struct efi_simple_file_system_protocol *v; + + v = efi_fs_from_path(fp); + if (!v) + return NULL; + + /* Skip over device-path nodes before the file path. */ + while (fp && !EFI_DP_TYPE(fp, MEDIA_DEVICE, FILE_PATH)) + fp = efi_dp_next(fp); + if (!fp) + return NULL; + + return efi_file_from_fs(v, fp); +} + static efi_status_t EFIAPI efi_open_volume(struct efi_simple_file_system_protocol *this, struct efi_file_handle **root) -- 2.33.0

2 2

[PATCH] i2c: ihs: intel: Fix typo in comments (actual)
by Michal Simek 10 May '22

10 May '22

s/actucal/actual/g Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/i2c/ihs_i2c.c | 2 +- drivers/i2c/intel_i2c.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c index ecca90628e79..d715714638ff 100644 --- a/drivers/i2c/ihs_i2c.c +++ b/drivers/i2c/ihs_i2c.c @@ -195,7 +195,7 @@ static int ihs_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) memset(&dummy, 0, sizeof(struct i2c_msg)); /* We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported\n", __func__); diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index 52f7a528efe8..88674d87e8bb 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -213,7 +213,7 @@ static int intel_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) /* * We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported", __func__); -- 2.35.1

2 2

[PATCH] doc: Add device-tree-bindings for atsha204 and atsha204a
by Pali Rohár 10 May '22

10 May '22

Document trivial bindings for atsha204 and atsha204a. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- doc/device-tree-bindings/misc/atsha204.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/device-tree-bindings/misc/atsha204.txt diff --git a/doc/device-tree-bindings/misc/atsha204.txt b/doc/device-tree-bindings/misc/atsha204.txt new file mode 100644 index 000000000000..3adc12112f50 --- /dev/null +++ b/doc/device-tree-bindings/misc/atsha204.txt @@ -0,0 +1,4 @@ +Atmel ATSHA204 and ATSHA204A i2c h/w symmetric crypto module + +Required properties: +- compatible : should be "atmel,atsha204" or "atmel,atsha204a" -- 2.20.1

2 2