Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AF9AFC433F5 for ; Tue, 15 Mar 2022 09:55:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8F8C807DC; Tue, 15 Mar 2022 10:55:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1647338154; bh=AwiAZEMnXBgpp6ARfhO2LqWpTEUeS4Ixj0oOSNeeyKA=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=p14s41otaB67+e1WLz99EFMpBnRcmfwor3HFA8liRyd2/d9BUMWRl46fVn59KYLah PbX1xRw8/8b7Bwek8YuhldPW65UsF5KGMWzW6/DzAMAf6zKRXxf5bfd+e0wzmeDo9Q ITQe540c+DiOktxhYrDZ2/m3i3CKG3rCqLiCCFLpba9p2LwFIsvofPOXG+LqG6PItp npp1fWST1ptjxtKHaq26MJqt7WCz3RHPmZypOEMLhaRfDYMZlgfSrUOQs5M2DqyGku 4SGyfSdJXBV3g234P4QwkLn6I9XUCGzj8mLKzWFtnb0UNrjSueAQNgWRjzHfBnkJI4 HEKf5DZ/HGHbg== Received: from [127.0.0.1] (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 5ABA1803F5; Tue, 15 Mar 2022 10:55:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1647338151; bh=AwiAZEMnXBgpp6ARfhO2LqWpTEUeS4Ixj0oOSNeeyKA=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=vO8NKaZPg+lwD0R7aZWZicf5C9o44mRCIfbt3P1LqthZdjRRmXPE1A6WH+O3OBNV3 IgYFh5pPorK+0ImisBfVPiekK90OMf+VhedjhB7LYlQTS+7huh6jx/jt1RE7o9yN2i ziF54ZmVb29B1kQw2mnJYDHxIJitXK/OQn0TWVXru6cA2lwxxmTiIbQgnQr0+Ipf1p GIxxYlKhE91wOklxVXRxnZVMO6Svi4y7NBnyQjSyd+es6s9MWGt+9JbKPjhZOPqXf4 EGCqFDDPIh5aeco7ZF1CMx7vvUXJFyTRoFNFd6Z1nNDj3NKSGDequFod85ZxnVINQB oaee0hnwN49fQ== Message-ID: <6e2548c1-9e5b-6511-e910-59b25cd6004e@denx.de> Date: Tue, 15 Mar 2022 10:55:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [PATCH] ARM: dts: stm32: Add DFU support for DHCOM recovery Content-Language: en-US To: Patrice CHOTARD , u-boot@lists.denx.de Cc: Patrick Delaunay References: <20220314123554.23904-1-marex@denx.de> <47a70ab9-d6ae-8973-ae37-ae4aca336c7b@foss.st.com> <71066e7e-6196-df68-2e5c-b214b7352385@foss.st.com> <3751a8d4-9287-a0ad-ff19-8f4171849500@denx.de> <24eae79f-ebe5-1e62-f3fe-15468a876ce4@foss.st.com> From: Marek Vasut In-Reply-To: <24eae79f-ebe5-1e62-f3fe-15468a876ce4@foss.st.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On 3/15/22 10:52, Patrice CHOTARD wrote: > > > On 3/15/22 10:49, Marek Vasut wrote: >> On 3/15/22 10:02, Patrice CHOTARD wrote: >>> Hi Marek >>> >>> On 3/15/22 09:51, Marek Vasut wrote: >>>> On 3/15/22 09:19, Patrice CHOTARD wrote: >>>>> Hi Marek >>>>> >>>>> On 3/15/22 08:48, Patrice CHOTARD wrote: >>>>>> Hi Marek >>>>>> >>>>>> On 3/14/22 13:35, Marek Vasut wrote: >>>>>>> This patch configures U-Boot SPL for DHCOM SoM to permit DFU upload of >>>>>>> SPL and subsequent u-boot.itb for recovery or commissioning purposes. >>>>>>> >>>>>>> The DFU usage procedure is identical to STM32MP1 DHCOR SoM, see commit >>>>>>> 3919aa1722a ("ARM: dts: stm32: Add DFU support for DHCOR recovery") , >>>>>>> except for switching the SoM into DFU mode. By default, the DHCOM SoM >>>>>>> has no dedicated mechanism for setting BOOTn straps into UART/USB mode, >>>>>>> therefore to enter DFU mode, the SoC must fail to boot from boot media >>>>>>> which can be selected by the BOOTn strap override mechanism first and >>>>>>> then fall back to DFU mode. >>>>>>> >>>>>>> In case of a SoM with pre-populated BOOTn strap override button, power >>>>>>> the system off, remove microSD card (if applicable), hold down the BOOTn >>>>>>> strap override button located between eMMC and SoM edge connector, power >>>>>>> on the SoM. The SoC will fail to boot from SD card and fall back into >>>>>>> DFU mode. >>>>>>> >>>>>>> Signed-off-by: Marek Vasut >>>>>>> Cc: Patrice Chotard >>>>>>> Cc: Patrick Delaunay >>>>>>> --- >>>>>>>    arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 42 ++++++++++++++++++++++ >>>>>>>    configs/stm32mp15_dhcom_basic_defconfig    | 15 ++++++-- >>>>>>>    2 files changed, 54 insertions(+), 3 deletions(-) >>>>>>> >>>>>>> diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi >>>>>>> index f09f4290f62..d73967ac1b5 100644 >>>>>>> --- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi >>>>>>> +++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi >>>>>>> @@ -58,6 +58,7 @@ >>>>>>>      &i2c4 { >>>>>>>        u-boot,dm-pre-reloc; >>>>>>> +    u-boot,dm-spl; >>>>>>>          eeprom0: eeprom@50 { >>>>>>>        }; >>>>>>> @@ -98,6 +99,11 @@ >>>>>>>      &pmic { >>>>>>>        u-boot,dm-pre-reloc; >>>>>>> +    u-boot,dm-spl; >>>>>>> + >>>>>>> +    regulators { >>>>>>> +        u-boot,dm-spl; >>>>>>> +    }; >>>>>>>    }; >>>>>>>      &flash0 { >>>>>>> @@ -288,3 +294,39 @@ >>>>>>>            bias-pull-up; >>>>>>>        }; >>>>>>>    }; >>>>>>> + >>>>>>> +®11 { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +®18 { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usb33 { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usbotg_hs_pins_a { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usbotg_hs { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usbphyc { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usbphyc_port0 { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&usbphyc_port1 { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> + >>>>>>> +&vdd_usb { >>>>>>> +    u-boot,dm-spl; >>>>>>> +}; >>>>>>> diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig >>>>>>> index c422c47775e..438bba37dee 100644 >>>>>>> --- a/configs/stm32mp15_dhcom_basic_defconfig >>>>>>> +++ b/configs/stm32mp15_dhcom_basic_defconfig >>>>>>> @@ -18,6 +18,7 @@ CONFIG_DISTRO_DEFAULTS=y >>>>>>>    CONFIG_SYS_LOAD_ADDR=0xc2000000 >>>>>>>    CONFIG_FIT=y >>>>>>>    CONFIG_SPL_LOAD_FIT=y >>>>>>> +CONFIG_SPL_LOAD_FIT_ADDRESS=0xc1000000 >>>>>>>    CONFIG_SPL_FIT_SOURCE="board/dhelectronics/dh_stm32mp1/u-boot-dhcom.its" >>>>>>>    # CONFIG_USE_SPL_FIT_GENERATOR is not set >>>>>>>    CONFIG_BOOTDELAY=1 >>>>>>> @@ -27,12 +28,17 @@ CONFIG_BOARD_EARLY_INIT_F=y >>>>>>>    CONFIG_SPL_LEGACY_IMAGE_SUPPORT=y >>>>>>>    CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y >>>>>>>    CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=3 >>>>>>> +CONFIG_SPL_ENV_SUPPORT=y >>>>>>>    CONFIG_SPL_I2C=y >>>>>>>    CONFIG_SPL_MTD_SUPPORT=y >>>>>>>    CONFIG_SPL_DM_SPI_FLASH=y >>>>>>>    CONFIG_SPL_POWER=y >>>>>>> +CONFIG_SPL_RAM_SUPPORT=y >>>>>>> +CONFIG_SPL_RAM_DEVICE=y >>>>>>>    CONFIG_SPL_SPI_FLASH_MTD=y >>>>>>>    CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 >>>>>>> +CONFIG_SPL_USB_GADGET=y >>>>>>> +CONFIG_SPL_DFU=y >>>>>>>    CONFIG_SYS_PROMPT="STM32MP> " >>>>>>>    # CONFIG_CMD_ELF is not set >>>>>>>    # CONFIG_CMD_EXPORTENV is not set >>>>>>> @@ -71,6 +77,7 @@ CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended inter >>>>>>>    CONFIG_ENV_IS_IN_SPI_FLASH=y >>>>>>>    CONFIG_SYS_REDUNDAND_ENVIRONMENT=y >>>>>>>    CONFIG_SYS_RELOC_GD_ENV_ADDR=y >>>>>>> +CONFIG_SPL_ENV_IS_NOWHERE=y >>>>>>>    CONFIG_NET_RANDOM_ETHADDR=y >>>>>>>    CONFIG_IP_DEFRAG=y >>>>>>>    CONFIG_TFTP_BLOCKSIZE=1536 >>>>>>> @@ -79,8 +86,6 @@ CONFIG_SPL_BLOCK_CACHE=y >>>>>>>    CONFIG_DFU_MMC=y >>>>>>>    CONFIG_DFU_MTD=y >>>>>>>    CONFIG_DFU_RAM=y >>>>>>> -CONFIG_DFU_VIRT=y >>>>>>> -CONFIG_SET_DFU_ALT_INFO=y >>>>>>>    CONFIG_GPIO_HOG=y >>>>>>>    CONFIG_DM_HWSPINLOCK=y >>>>>>>    CONFIG_HWSPINLOCK_STM32=y >>>>>>> @@ -106,18 +111,20 @@ CONFIG_DM_ETH=y >>>>>>>    CONFIG_DWC_ETH_QOS=y >>>>>>>    CONFIG_KS8851_MLL=y >>>>>>>    CONFIG_PHY=y >>>>>>> +CONFIG_SPL_PHY=y >>>>>>>    CONFIG_PHY_STM32_USBPHYC=y >>>>>>>    CONFIG_PINCONF=y >>>>>>>    # CONFIG_SPL_PINCTRL_FULL is not set >>>>>>>    CONFIG_PINCTRL_STMFX=y >>>>>>>    CONFIG_DM_PMIC=y >>>>>>> -# CONFIG_SPL_PMIC_CHILDREN is not set >>>>>>>    CONFIG_PMIC_STPMIC1=y >>>>>>>    CONFIG_DM_REGULATOR=y >>>>>>> +CONFIG_SPL_DM_REGULATOR=y >>>>>>>    CONFIG_DM_REGULATOR_FIXED=y >>>>>>>    CONFIG_DM_REGULATOR_GPIO=y >>>>>>>    CONFIG_DM_REGULATOR_STM32_VREFBUF=y >>>>>>>    CONFIG_DM_REGULATOR_STPMIC1=y >>>>>>> +CONFIG_SPL_DM_REGULATOR_STPMIC1=y >>>>>>>    CONFIG_REMOTEPROC_STM32_COPRO=y >>>>>>>    CONFIG_DM_RTC=y >>>>>>>    CONFIG_RTC_STM32=y >>>>>>> @@ -129,8 +136,10 @@ CONFIG_STM32_SPI=y >>>>>>>    CONFIG_SYSRESET_SYSCON=y >>>>>>>    CONFIG_USB=y >>>>>>>    CONFIG_DM_USB_GADGET=y >>>>>>> +CONFIG_SPL_DM_USB_GADGET=y >>>>>>>    CONFIG_USB_EHCI_HCD=y >>>>>>>    CONFIG_USB_EHCI_GENERIC=y >>>>>>> +CONFIG_USB_DWC2=y >>>>>>>    CONFIG_USB_HOST_ETHER=y >>>>>>>    CONFIG_USB_ETHER_ASIX=y >>>>>>>    CONFIG_USB_GADGET=y >>>>>> >>>>>> >>>>>> Reviewed-by: Patrice Chotard >>>>>> >>>>>> Thanks >>>>>> Patrice >>>>> >>>>> Applied to u-boot-stm32 >>>> >>>> This is also for next release. >>> you mean for v2022.04 or v2022.07 ? >> >> If it was up to me, I would plan this patch for 2022.07 , since we are already in -rc4 . But since this is board specific, and board specific stuff can go in all the way until release, if you want to avoid having to do -next PR, then feel free to include it for v2022.04 , it's not like it wasn't tested. > > Yes that what i think also, patch's perimeter is limited to STM32MP SoC based board, > we have no doubt about test ;-) All right then.