From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 11 Aug 2021 20:32:57 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mDt29-0006Oc-CV for lore@lore.pengutronix.de; Wed, 11 Aug 2021 20:32:57 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mDt25-0004hA-Gq for lore@pengutronix.de; Wed, 11 Aug 2021 20:32:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Nt85EfXMPWonkGJflqTUiiVIF0hIvjqCfLYI0y6j66g=; b=iuPWg3cgtKQHhjV12IV9Mdn8Xw Y1m6KdHA3fEj9o6PUOLqjKp254PGzcTKKxsW4KVe1pKHJRQO9E+Tj8tLV00+IxMou0lIg5qpol+H6 u1HR7AhIaI5RCrxA0xK75NLzLg1tzyJ4dF7WWTNumiXrD/TtVoF5NuM+ZGn/4qNQutqB+sjwHPkRr RCSTEPuIENd5s7/sRlfmZbkttRMQbbg2f4HEVNpfvKVz6JfK3HUoWTjHiIQXvVpXQvhwPOHeWkvZU rRqjtqvvD1eznhTGX3cALKeaGlsh7rayeaL9hWpyjQgMLJIDD0M8JQxzQnPqjmxLSxcAunHtyeysO OWWdIThQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDt0L-007t3A-13; Wed, 11 Aug 2021 18:31:05 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDt0D-007t2R-Gv for barebox@lists.infradead.org; Wed, 11 Aug 2021 18:31:01 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mDt0B-0004To-EB; Wed, 11 Aug 2021 20:30:55 +0200 To: Marco Felsch , barebox@lists.infradead.org References: <20210811173624.28061-1-m.felsch@pengutronix.de> From: Ahmad Fatoum Message-ID: <241f3046-fdaf-ccd9-bc43-8c6879da75d8@pengutronix.de> Date: Wed, 11 Aug 2021 20:30:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210811173624.28061-1-m.felsch@pengutronix.de> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210811_113057_623922_FAD7E8AD X-CRM114-Status: GOOD ( 34.97 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] ARM: i.MX6: boot: detect USB serial downloader more reliable X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On 11.08.21 19:36, Marco Felsch wrote: > The problem with the BootROM is that the SCR registers are not set s/SCR/SRC/ ? > accordingly in case of a failed primary boot. E.g. if the device is > configured to boot from an eMMC and the eMMC is empty or image is > corrupt, the BootROM goes into 'recovery boot mode' (reference manual > Figure 8-1) and the last possible recovery option is the serial > downloader. In such case the SRC registers still indicate that the > device was booted from an eMMC instead of serial-download. > > This commit ports the U-Boot commit [1] with slightly adaptions suggested > by Ahmad to Barebox. Also we need to reorder the imx6_init() else we > reset the otg-controller to early. > > [1] https://source.denx.de/u-boot/u-boot/-/commit/e203dcf23e9eabc2e4f3d0b079457cd1516f2081 > > Signed-off-by: Marco Felsch > --- > arch/arm/mach-imx/boot.c | 27 +++++++++++++++++++++++++++ > arch/arm/mach-imx/imx6.c | 4 ++-- > include/soc/fsl/fsl_udc.h | 11 +++++++++++ > 3 files changed, 40 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c > index 2b66bbf71e..fcb3c10064 100644 > --- a/arch/arm/mach-imx/boot.c > +++ b/arch/arm/mach-imx/boot.c > @@ -8,6 +8,7 @@ > #include > > #include > +#include > #include > #include > #include > @@ -23,6 +24,7 @@ > #include > #include > > +#include > > static void > imx_boot_save_loc(void (*get_boot_source)(enum bootsource *, int *)) > @@ -397,6 +399,11 @@ static u32 imx6_get_src_boot_mode(void __iomem *src_base) > return readl(src_base + IMX6_SRC_SBMR1); > } > > +static inline bool imx6_usboh3_clk_active(void) > +{ > + return (readl(MXC_CCM_CCGR6) & 0x3) == 0x3; > +} > + > void imx6_get_boot_source(enum bootsource *src, int *instance) > { > void __iomem *src_base = IOMEM(MX6_SRC_BASE_ADDR); > @@ -410,6 +417,26 @@ void imx6_get_boot_source(enum bootsource *src, int *instance) > > bootsrc = imx53_bootsource_internal(bootmode); > > + /* > + * imx6_bootsource_serial() can't detect cases where the boot ROM > + * decided to use the serial downloader as a fall back (primary > + * boot source failed). > + * > + * Infer that the boot ROM used the USB serial downloader by > + * checking whether both the UDC and the clock enabling access > + * to its MMIO region are currently active... > + * This assumes: > + * - On fresh boots, PBL doesn't itself start a stopped UDC > + * - In barebox proper, boot source is saved before the UDC driver > + * may enable the UDC > + */ > + > + if (imx6_usboh3_clk_active() && > + is_chipidea_udc_running(IOMEM(MX6_OTG_BASE_ADDR))) { > + *src = BOOTSOURCE_SERIAL; > + return; > + } > + > if (imx6_bootsource_serial(sbmr2) || > imx6_bootsource_serial_forced(bootsrc)) { > *src = BOOTSOURCE_SERIAL; > diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c > index 9ccb391384..fa4cb093c3 100644 > --- a/arch/arm/mach-imx/imx6.c > +++ b/arch/arm/mach-imx/imx6.c > @@ -205,10 +205,10 @@ int imx6_init(void) > void __iomem *src = IOMEM(MX6_SRC_BASE_ADDR); > u64 mx6_uid; > > - imx6_init_lowlevel(); > - > imx6_boot_save_loc(); > > + imx6_init_lowlevel(); A comment inside imx6_init_lowlevel hinting at the dependency w.r.t imx6_boot_save_loc would be nice. Apart from these nitpicks: Reviewed-by: Ahmad Fatoum > + > mx6_silicon_revision = imx6_cpu_revision(); > mx6_uid = imx6_uid(); > > diff --git a/include/soc/fsl/fsl_udc.h b/include/soc/fsl/fsl_udc.h > index b983f714c5..0b409a9f6b 100644 > --- a/include/soc/fsl/fsl_udc.h > +++ b/include/soc/fsl/fsl_udc.h > @@ -1,6 +1,9 @@ > #ifndef __FSL_UDC_H > #define __FSL_UDC_H > > +#include > +#include > + > /* USB DR device mode registers (Little Endian) */ > struct usb_dr_device { > /* Capability register */ > @@ -380,4 +383,12 @@ int imx_barebox_start_usb(void __iomem *dr, void *dest); > int imx8mm_barebox_load_usb(void *dest); > int imx8mm_barebox_start_usb(void *dest); > > +static inline bool is_chipidea_udc_running(void __iomem *dr) > +{ > + struct usb_dr_device __iomem *dr_regs = dr; > + > + return (readl(&dr_regs->usbmode) & USB_MODE_CTRL_MODE_DEVICE) > + && (readl(&dr_regs->usbcmd) & USB_CMD_RUN_STOP); > +} > + > #endif /* __FSL_UDC_H */ > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox