* [PATCH] ARM: i.MX8MQ: Add code to report HDMI/eDP firmware version
@ 2019-02-12 2:36 Andrey Smirnov
2019-02-12 9:42 ` Lucas Stach
0 siblings, 1 reply; 3+ messages in thread
From: Andrey Smirnov @ 2019-02-12 2:36 UTC (permalink / raw)
To: barebox; +Cc: Andrey Smirnov
Port code found in cdn_dp_load_firmware() in Linux kernel to check if
HDMI firmware is running and, if so, report its version.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/mach-imx/imx8mq.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/arch/arm/mach-imx/imx8mq.c b/arch/arm/mach-imx/imx8mq.c
index 4d00da5f0..18822333c 100644
--- a/arch/arm/mach-imx/imx8mq.c
+++ b/arch/arm/mach-imx/imx8mq.c
@@ -21,6 +21,7 @@
#include <mach/imx8mq.h>
#include <mach/reset-reason.h>
+#include <linux/iopoll.h>
#include <linux/arm-smccc.h>
#define FSL_SIP_BUILDINFO 0xC2000003
@@ -81,3 +82,39 @@ int imx8mq_init(void)
return 0;
}
+
+#define KEEP_ALIVE 0x18
+#define VER_L 0x1c
+#define VER_H 0x20
+#define VER_LIB_L_ADDR 0x24
+#define VER_LIB_H_ADDR 0x28
+#define FW_ALIVE_TIMEOUT_US 100000
+
+static int imx8mq_report_hdmi_firmware(void)
+{
+ void __iomem *hdmi = IOMEM(MX8MQ_HDMI_CTRL_BASE_ADDR);
+ u16 ver_lib, ver;
+ u32 reg;
+ int ret;
+
+ /* check the keep alive register to make sure fw working */
+ ret = readl_poll_timeout(hdmi + KEEP_ALIVE,
+ reg, reg, FW_ALIVE_TIMEOUT_US);
+ if (ret < 0) {
+ pr_info("HDMI firmware is not running\n");
+ return 0;
+ }
+
+ ver = readl(hdmi + VER_H) & 0xff;
+ ver <<= 8;
+ ver |= readl(hdmi + VER_L) & 0xff;
+
+ ver_lib = readl(hdmi + VER_LIB_H_ADDR) & 0xff;
+ ver_lib <<= 8;
+ ver_lib |= readl(hdmi + VER_LIB_L_ADDR) & 0xff;
+
+ pr_info("HDMI firmware ver: %d ver_lib: %d\n", ver, ver_lib);
+
+ return 0;
+}
+console_initcall(imx8mq_report_hdmi_firmware);
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: i.MX8MQ: Add code to report HDMI/eDP firmware version
2019-02-12 2:36 [PATCH] ARM: i.MX8MQ: Add code to report HDMI/eDP firmware version Andrey Smirnov
@ 2019-02-12 9:42 ` Lucas Stach
2019-02-12 19:08 ` Andrey Smirnov
0 siblings, 1 reply; 3+ messages in thread
From: Lucas Stach @ 2019-02-12 9:42 UTC (permalink / raw)
To: Andrey Smirnov, barebox
Am Montag, den 11.02.2019, 18:36 -0800 schrieb Andrey Smirnov:
> Port code found in cdn_dp_load_firmware() in Linux kernel to check if
> HDMI firmware is running and, if so, report its version.
>
> > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> arch/arm/mach-imx/imx8mq.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/arch/arm/mach-imx/imx8mq.c b/arch/arm/mach-imx/imx8mq.c
> index 4d00da5f0..18822333c 100644
> --- a/arch/arm/mach-imx/imx8mq.c
> +++ b/arch/arm/mach-imx/imx8mq.c
> @@ -21,6 +21,7 @@
> #include <mach/imx8mq.h>
> #include <mach/reset-reason.h>
>
> +#include <linux/iopoll.h>
> #include <linux/arm-smccc.h>
>
> > #define FSL_SIP_BUILDINFO 0xC2000003
> @@ -81,3 +82,39 @@ int imx8mq_init(void)
>
> > return 0;
> }
> +
> > +#define KEEP_ALIVE 0x18
> > +#define VER_L 0x1c
> > +#define VER_H 0x20
> > +#define VER_LIB_L_ADDR 0x24
> > +#define VER_LIB_H_ADDR 0x28
> > +#define FW_ALIVE_TIMEOUT_US 100000
> +
> +static int imx8mq_report_hdmi_firmware(void)
> +{
> > + void __iomem *hdmi = IOMEM(MX8MQ_HDMI_CTRL_BASE_ADDR);
> > + u16 ver_lib, ver;
> > + u32 reg;
> > + int ret;
> +
This is missing a check to bail out if we aren't running on a i.MX8MQ.
> + /* check the keep alive register to make sure fw working */
> > + ret = readl_poll_timeout(hdmi + KEEP_ALIVE,
> > + reg, reg, FW_ALIVE_TIMEOUT_US);
> > + if (ret < 0) {
> > + pr_info("HDMI firmware is not running\n");
> > + return 0;
> > + }
> +
> > + ver = readl(hdmi + VER_H) & 0xff;
> > + ver <<= 8;
> > + ver |= readl(hdmi + VER_L) & 0xff;
> +
> > + ver_lib = readl(hdmi + VER_LIB_H_ADDR) & 0xff;
> > + ver_lib <<= 8;
> > + ver_lib |= readl(hdmi + VER_LIB_L_ADDR) & 0xff;
> +
> + pr_info("HDMI firmware ver: %d ver_lib: %d\n", ver, ver_lib);
Maybe "HDMI TX" or "HDP" here, as this should equally apply to eDP
firmware, right?
Regards,
Lucas
> +
> > + return 0;
> +}
> +console_initcall(imx8mq_report_hdmi_firmware);
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ARM: i.MX8MQ: Add code to report HDMI/eDP firmware version
2019-02-12 9:42 ` Lucas Stach
@ 2019-02-12 19:08 ` Andrey Smirnov
0 siblings, 0 replies; 3+ messages in thread
From: Andrey Smirnov @ 2019-02-12 19:08 UTC (permalink / raw)
To: Lucas Stach; +Cc: Barebox List
On Tue, Feb 12, 2019 at 1:42 AM Lucas Stach <l.stach@pengutronix.de> wrote:
>
> Am Montag, den 11.02.2019, 18:36 -0800 schrieb Andrey Smirnov:
> > Port code found in cdn_dp_load_firmware() in Linux kernel to check if
> > HDMI firmware is running and, if so, report its version.
> >
> > > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> > ---
> > arch/arm/mach-imx/imx8mq.c | 37 +++++++++++++++++++++++++++++++++++++
> > 1 file changed, 37 insertions(+)
> >
> > diff --git a/arch/arm/mach-imx/imx8mq.c b/arch/arm/mach-imx/imx8mq.c
> > index 4d00da5f0..18822333c 100644
> > --- a/arch/arm/mach-imx/imx8mq.c
> > +++ b/arch/arm/mach-imx/imx8mq.c
> > @@ -21,6 +21,7 @@
> > #include <mach/imx8mq.h>
> > #include <mach/reset-reason.h>
> >
> > +#include <linux/iopoll.h>
> > #include <linux/arm-smccc.h>
> >
> > > #define FSL_SIP_BUILDINFO 0xC2000003
> > @@ -81,3 +82,39 @@ int imx8mq_init(void)
> >
> > > return 0;
> > }
> > +
> > > +#define KEEP_ALIVE 0x18
> > > +#define VER_L 0x1c
> > > +#define VER_H 0x20
> > > +#define VER_LIB_L_ADDR 0x24
> > > +#define VER_LIB_H_ADDR 0x28
> > > +#define FW_ALIVE_TIMEOUT_US 100000
> > +
> > +static int imx8mq_report_hdmi_firmware(void)
> > +{
> > > + void __iomem *hdmi = IOMEM(MX8MQ_HDMI_CTRL_BASE_ADDR);
> > > + u16 ver_lib, ver;
> > > + u32 reg;
> > > + int ret;
> > +
>
> This is missing a check to bail out if we aren't running on a i.MX8MQ.
>
Ugh, missed this one. Thanks for noticing!
> > + /* check the keep alive register to make sure fw working */
> > > + ret = readl_poll_timeout(hdmi + KEEP_ALIVE,
> > > + reg, reg, FW_ALIVE_TIMEOUT_US);
> > > + if (ret < 0) {
> > > + pr_info("HDMI firmware is not running\n");
> > > + return 0;
> > > + }
> > +
> > > + ver = readl(hdmi + VER_H) & 0xff;
> > > + ver <<= 8;
> > > + ver |= readl(hdmi + VER_L) & 0xff;
> > +
> > > + ver_lib = readl(hdmi + VER_LIB_H_ADDR) & 0xff;
> > > + ver_lib <<= 8;
> > > + ver_lib |= readl(hdmi + VER_LIB_L_ADDR) & 0xff;
> > +
> > + pr_info("HDMI firmware ver: %d ver_lib: %d\n", ver, ver_lib);
>
> Maybe "HDMI TX" or "HDP" here, as this should equally apply to eDP
> firmware, right?
>
Yeah, it should work for both. Will change to "HDP" in v2.
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-12 19:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-12 2:36 [PATCH] ARM: i.MX8MQ: Add code to report HDMI/eDP firmware version Andrey Smirnov
2019-02-12 9:42 ` Lucas Stach
2019-02-12 19:08 ` Andrey Smirnov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox