From: Patrice CHOTARD Date: Wed, 23 Oct 2019 09:27:03 +0000 Subject: [U-Boot] [Uboot-stm32] [PATCH v3 15/15] stm32mp1: add support for virtual partition read In-Reply-To: <20191014072812.21843-16-patrick.delaunay@st.com> References: <20191014072812.21843-1-patrick.delaunay@st.com> <20191014072812.21843-16-patrick.delaunay@st.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Patrick see below On 10/14/19 9:28 AM, Patrick Delaunay wrote: > Add read for OTP and PMIC NVM with alternates > on virtual DFU device. > > Serie-cc: Boris Brezillon > Signed-off-by: Patrick Delaunay > --- > > Changes in v3: > - rebase on v2019.10 > - remove previous patch 16/16 pushed by error in v2 > http://patchwork.ozlabs.org/patch/1162076/ > > Changes in v2: > - Update after Lukasz Majewski comments > > board/st/stm32mp1/stm32mp1.c | 83 +++++++++++++++++++++++++++++ > configs/stm32mp15_basic_defconfig | 1 + > configs/stm32mp15_optee_defconfig | 1 + > configs/stm32mp15_trusted_defconfig | 1 + > 4 files changed, 86 insertions(+) > > diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c > index e4bdf05cd7..6045850c05 100644 > --- a/board/st/stm32mp1/stm32mp1.c > +++ b/board/st/stm32mp1/stm32mp1.c > @@ -975,9 +975,92 @@ void set_dfu_alt_info(char *interface, char *devstr) > if (!IS_ERR_OR_NULL(mtd)) > board_get_alt_info("spi-nand0", buf); > > +#ifdef CONFIG_DFU_VIRT > + strncat(buf, "&virt 0=OTP", DFU_ALT_BUF_LEN); > + > + if (IS_ENABLED(CONFIG_PMIC_STPMIC1)) > + strncat(buf, "&virt 1=PMIC", DFU_ALT_BUF_LEN); > +#endif > + > env_set("dfu_alt_info", buf); > puts("DFU alt info setting: done\n"); > } > + > +#if CONFIG_IS_ENABLED(DFU_VIRT) > +#include > +#include > + > +int dfu_otp_read(u64 offset, u8 *buffer, long *size) > +{ > + struct udevice *dev; > + int ret; > + > + ret = uclass_get_device_by_driver(UCLASS_MISC, > + DM_GET_DRIVER(stm32mp_bsec), > + &dev); > + if (ret) > + return ret; > + > + ret = misc_read(dev, offset + STM32_BSEC_OTP_OFFSET, buffer, *size); > + if (ret >= 0) { > + *size = ret; > + ret = 0; > + } > + > + return 0; "return ret;" instead ? > +} > + > +int dfu_pmic_read(u64 offset, u8 *buffer, long *size) > +{ > + int ret; > +#ifdef CONFIG_PMIC_STPMIC1 > + struct udevice *dev; > + > + ret = uclass_get_device_by_driver(UCLASS_MISC, > + DM_GET_DRIVER(stpmic1_nvm), > + &dev); > + if (ret) > + return ret; > + > + ret = misc_read(dev, 0xF8 + offset, buffer, *size); > + if (ret >= 0) { > + *size = ret; > + ret = 0; > + } > + if (ret == -EACCES) { > + *size = 0; > + ret = 0; > + } > +#else > + pr_err("PMIC update not supported"); > + ret = -EOPNOTSUPP; > +#endif > + > + return ret; > +} > + > +int dfu_read_medium_virt(struct dfu_entity *dfu, u64 offset, > + void *buf, long *len) > +{ > + switch (dfu->data.virt.dev_num) { > + case 0x0: > + return dfu_otp_read(offset, buf, len); > + case 0x1: > + return dfu_pmic_read(offset, buf, len); > + } > + *len = 0; insert a blank line > + return 0; > +} > + > +int __weak dfu_get_medium_size_virt(struct dfu_entity *dfu, u64 *size) > +{ > + *size = SZ_1K; > + > + return 0; > +} > + > +#endif > + > #endif > > static void board_copro_image_process(ulong fw_image, size_t fw_size) > diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig > index 699e687891..29e697ee67 100644 > --- a/configs/stm32mp15_basic_defconfig > +++ b/configs/stm32mp15_basic_defconfig > @@ -66,6 +66,7 @@ CONFIG_STM32_ADC=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_DFU_MTD=y > +CONFIG_DFU_VIRT=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig > index 387de0ad35..3b8a90de2d 100644 > --- a/configs/stm32mp15_optee_defconfig > +++ b/configs/stm32mp15_optee_defconfig > @@ -53,6 +53,7 @@ CONFIG_STM32_ADC=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_DFU_MTD=y > +CONFIG_DFU_VIRT=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000 > diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig > index 29c23c634d..bcbd8a5c4e 100644 > --- a/configs/stm32mp15_trusted_defconfig > +++ b/configs/stm32mp15_trusted_defconfig > @@ -52,6 +52,7 @@ CONFIG_STM32_ADC=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_DFU_MTD=y > +CONFIG_DFU_VIRT=y > CONFIG_USB_FUNCTION_FASTBOOT=y > CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 > CONFIG_FASTBOOT_BUF_SIZE=0x02000000