[U-Boot] [PATCH v2 1/2] imx: add macro to detect whether USB PHY is active
From: Stefan Agner stefan.agner@toradex.com
This macro allows to detect whether the USB PHY is active. This is helpful to detect if the boot ROM has previously started the USB serial downloader.
The idea is taken from the mfgtool support in the NXP U-Boot: http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/commit/?h=imx_v2016....
Signed-off-by: Stefan Agner stefan.agner@toradex.com Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com Tested-by: Fabio Estevam fabio.estevam@nxp.com ---
Changes in v2: - Move macro to sys_proto.h - Renamed from is_boot_from_usb() to is_usbphy_active() - Use defines for register offset and field - Remove tab after define - Remove comment since the actual "magic" is happening and documented at usage side
arch/arm/include/asm/arch-mx6/sys_proto.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index 14f5d948c9..9d4b1d6768 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -6,3 +6,10 @@ */
#include <asm/mach-imx/sys_proto.h> + +#define USBPHY_PWD 0x00000000 + +#define USBPHY_PWD_RXPWDRX (1 << 20) /* receiver block power down */ + +#define is_usbphy_active(void) (!(readl(USB_PHY0_BASE_ADDR + USBPHY_PWD) & \ + USBPHY_PWD_RXPWDRX))
From: Stefan Agner stefan.agner@toradex.com
The current mechanism using SCR/GPR registers work well when the serial downloader boot mode has been selected explicitly (either via boot mode pins or using bmode command). However, in case the system entered boot ROM due to unbootable primary boot devices (e.g. empty eMMC), the SPL fails to detect that it has been downloaded through serial loader and tries to continue booting from eMMC: Trying to boot from MMC1 mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ###
The only known way to reliably detect USB serial downloader is by checking the USB PHY receiver block power state...
Signed-off-by: Stefan Agner stefan.agner@toradex.com Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com Tested-by: Fabio Estevam fabio.estevam@nxp.com ---
Changes in v2: - Add comment that we infer boot ROM behavior from USB PHY state
arch/arm/mach-imx/spl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 258578ac25..f3fec81de7 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -31,6 +31,18 @@ u32 spl_boot_device(void) if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */ return BOOT_DEVICE_BOARD;
+ /* + * The above method does not detect that the boot ROM used + * serial downloader in case the boot ROM descided 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 the USB PHY is currently active... This + * assumes that SPL did not (yet) initialized the USB PHY... + */ + if (is_usbphy_active()) + return BOOT_DEVICE_BOARD; + /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { /* EIM: See 8.5.1, Table 8-9 */
Hi Stefan,
On 09/08/2017 04:35 PM, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
The current mechanism using SCR/GPR registers work well when the serial downloader boot mode has been selected explicitly (either via boot mode pins or using bmode command). However, in case the system entered boot ROM due to unbootable primary boot devices (e.g. empty eMMC), the SPL fails to detect that it has been downloaded through serial loader and tries to continue booting from eMMC: Trying to boot from MMC1 mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ###
The only known way to reliably detect USB serial downloader is by checking the USB PHY receiver block power state...
Signed-off-by: Stefan Agner stefan.agner@toradex.com Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com Tested-by: Fabio Estevam fabio.estevam@nxp.com
Changes in v2:
Add comment that we infer boot ROM behavior from USB PHY state
arch/arm/mach-imx/spl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 258578ac25..f3fec81de7 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -31,6 +31,18 @@ u32 spl_boot_device(void) if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */ return BOOT_DEVICE_BOARD;
- /*
* The above method does not detect that the boot ROM used* serial downloader in case the boot ROM descided to use the* serial downloader as a fall back (primary boot source failed).*
Nit: should be "did not initialize" instead of "initialized".
Otherwise, this is a nice comment that describes the situation.
* Infer that the boot ROM used the USB serial downloader by* checking whether the USB PHY is currently active... This* assumes that SPL did not (yet) initialized the USB PHY...*/- if (is_usbphy_active())
return BOOT_DEVICE_BOARD;- /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { /* EIM: See 8.5.1, Table 8-9 */
On 2017-09-08 16:41, Eric Nelson wrote:
Hi Stefan,
On 09/08/2017 04:35 PM, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
The current mechanism using SCR/GPR registers work well when the serial downloader boot mode has been selected explicitly (either via boot mode pins or using bmode command). However, in case the system entered boot ROM due to unbootable primary boot devices (e.g. empty eMMC), the SPL fails to detect that it has been downloaded through serial loader and tries to continue booting from eMMC: Trying to boot from MMC1 mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ###
The only known way to reliably detect USB serial downloader is by checking the USB PHY receiver block power state...
Signed-off-by: Stefan Agner stefan.agner@toradex.com Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com Tested-by: Fabio Estevam fabio.estevam@nxp.com
Changes in v2:
Add comment that we infer boot ROM behavior from USB PHY state
arch/arm/mach-imx/spl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 258578ac25..f3fec81de7 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -31,6 +31,18 @@ u32 spl_boot_device(void) if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */ return BOOT_DEVICE_BOARD;
- /*
* The above method does not detect that the boot ROM used* serial downloader in case the boot ROM descided to use the* serial downloader as a fall back (primary boot source failed).*Nit: should be "did not initialize" instead of "initialized".
Sorry, don't get that. Below I write "did not (yet) initialized"...
-- Stefan
Otherwise, this is a nice comment that describes the situation.
* Infer that the boot ROM used the USB serial downloader by* checking whether the USB PHY is currently active... This* assumes that SPL did not (yet) initialized the USB PHY...*/- if (is_usbphy_active())
return BOOT_DEVICE_BOARD;- /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { /* EIM: See 8.5.1, Table 8-9 */
Hi Stefan,
On 09/08/2017 05:16 PM, Stefan Agner wrote:
On 2017-09-08 16:41, Eric Nelson wrote:
On 09/08/2017 04:35 PM, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
<snip>
Nit: should be "did not initialize" instead of "initialized".
Sorry, don't get that. Below I write "did not (yet) initialized"...
The proper English usage here is "did not (yet) initialize".
You don't need the past tense after "did not".
On Fri, Sep 8, 2017 at 8:35 PM, Stefan Agner stefan@agner.ch wrote:
/** The above method does not detect that the boot ROM used* serial downloader in case the boot ROM descided to use the
Typo: decided
Hi Stefan,
On 09/08/2017 05:35 PM, Fabio Estevam wrote:
On Fri, Sep 8, 2017 at 8:35 PM, Stefan Agner stefan@agner.ch wrote:
/** The above method does not detect that the boot ROM used* serial downloader in case the boot ROM descided to use theTypo: decided
You know you're on the right track when the only comments about your patch are about naming, spelling and grammar ;)
On 2017-09-08 17:41, Eric Nelson wrote:
Hi Stefan,
On 09/08/2017 05:35 PM, Fabio Estevam wrote:
On Fri, Sep 8, 2017 at 8:35 PM, Stefan Agner stefan@agner.ch wrote:
/** The above method does not detect that the boot ROM used* serial downloader in case the boot ROM descided to use theTypo: decided
You know you're on the right track when the only comments about your patch are about naming, spelling and grammar ;)
Hehe, ok cool.
Yeah my parser was searching for a logical issue wrt initialize... :-)
-- Stefan
Hi Stefan,
On 09/08/2017 04:35 PM, Stefan Agner wrote:
From: Stefan Agner stefan.agner@toradex.com
This macro allows to detect whether the USB PHY is active. This is helpful to detect if the boot ROM has previously started the USB serial downloader.
The idea is taken from the mfgtool support in the NXP U-Boot: http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/commit/?h=imx_v2016....
Signed-off-by: Stefan Agner stefan.agner@toradex.com Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com Tested-by: Fabio Estevam fabio.estevam@nxp.com
Changes in v2:
Move macro to sys_proto.h
Renamed from is_boot_from_usb() to is_usbphy_active()
Use defines for register offset and field
Remove tab after define
Remove comment since the actual "magic" is happening and documented at usage side
arch/arm/include/asm/arch-mx6/sys_proto.h | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index 14f5d948c9..9d4b1d6768 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -6,3 +6,10 @@ */
#include <asm/mach-imx/sys_proto.h>
+#define USBPHY_PWD 0x00000000
+#define USBPHY_PWD_RXPWDRX (1 << 20) /* receiver block power down */
At least MX6 and MX7 have USB Host PHY as well as USB OTG.
How about is_otgphy_active() instead?
+#define is_usbphy_active(void) (!(readl(USB_PHY0_BASE_ADDR + USBPHY_PWD) & \
USBPHY_PWD_RXPWDRX))
participants (3)
-
Eric Nelson -
Fabio Estevam -
Stefan Agner