video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
Subsystems (2)
PATCH 1/1 video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
Boards can skip display interface init using board_video_skip(). If display interface was not initialized (e.g. no ipuv3 framebuffer registered or IPU clock disabled), booting Linux stops due to the crash in IPU shutdown function, when accessing IPU registers. Check IPU clock and skip shutdown if clock is not enabled.
--- drivers/video/mxc_ipuv3_fb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/video/mxc_ipuv3_fb.c +12 -1
@@ -13,6 +13,7 @@#include <common.h> #include <linux/errno.h> +#include <asm/arch/crm_regs.h> #include <asm/global_data.h> #include <linux/string.h> #include <linux/list.h>
@@ -568,8 +569,18 @@ err0:void ipuv3_fb_shutdown (void ) { -int i; +struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ;struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT ; +u32 reg; +int i; + +/* +* Check if IPU clock was enabled before. Won't access +* IPU registers if clock is not enabled. +*/ + reg =readl (&mxc_ccm->CCGR3); +if ((reg &MXC_CCM_CCGR3_IPU1_IPU_MASK ) ==0 ) +return ;for (i =0 ; i <ARRAY_SIZE (mxcfb_info); i++) {struct fb_info *fbi = mxcfb_info[i];
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH 1/1 video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
Hi Anatolij,
Quoted 5 lines · Anatolij Gustschin
void
ipuv3_fb_shutdown(void)
{drivers/video/mxc_ipuv3_fb.c +1
-1-int i; +struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ;struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT ;
drivers/video/mxc_ipuv3_fb.c err0: · line 583
Quoted 10 lines
drivers/video/mxc_ipuv3_fb.c +10
-0+u32 reg; +int i; + +/* +* Check if IPU clock was enabled before. Won't access +* IPU registers if clock is not enabled. +*/ + reg =readl (&mxc_ccm->CCGR3); +if ((reg &MXC_CCM_CCGR3_IPU1_IPU_MASK ) ==0 ) +return ;
Maybe you could also check whether IPU2 has been enabled?
PATCH 1/1 video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
Hi Fabio,
On Mon, 28 Aug 2017 13:22:19 -0300
Fabio Estevam festevam at gmail.com wrote:
...
Quoted 9 lines
drivers/video/mxc_ipuv3_fb.c err0: · line 583
Quoted 7 lines
drivers/video/mxc_ipuv3_fb.c +7
-0+/* +* Check if IPU clock was enabled before. Won't access +* IPU registers if clock is not enabled. +*/ + reg =readl (&mxc_ccm->CCGR3); +if ((reg &MXC_CCM_CCGR3_IPU1_IPU_MASK ) ==0 ) +return ;Maybe you could also check whether IPU2 has been enabled?
currently IPU2 is not used, the driver never enables it. I checked it when preparing this patch.
Thanks,
Anatolij
PATCH 1/1 video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
In reply to Anatolij GustschinHi Anatolji,
Quoted 31 lines · Anatolij Gustschin
Boards can skip display interface init using
board_video_skip(). If display interface was not initialized (e.g. no ipuv3 framebuffer registered or IPU clock disabled), booting Linux stops due to the crash in IPU shutdown function, when accessing IPU registers. Check IPU clock and skip shutdown if clock is not enabled.Signed-off-by Anatolij Gustschin <[email protected]>--- drivers/video/mxc_ipuv3_fb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/video/mxc_ipuv3_fb.c +3
-1@@ -13,6 +13,7 @@#include <common.h> #include <linux/errno.h> +#include <asm/arch/crm_regs.h> #include <asm/global_data.h> #include <linux/string.h> #include <linux/list.h> @@ -568,8 +569,18 @@ err0:void ipuv3_fb_shutdown (void ) { -int i; +struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ;struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT ; +u32 reg;
drivers/video/mxc_ipuv3_fb.c err0: · line 584
Quoted 10 lines
drivers/video/mxc_ipuv3_fb.c +9
-0+int i; + +/* +* Check if IPU clock was enabled before. Won't access +* IPU registers if clock is not enabled. +*/ + reg =readl (&mxc_ccm->CCGR3); +if ((reg &MXC_CCM_CCGR3_IPU1_IPU_MASK ) ==0 ) +return ;
It looks to me quite weak to simply check if clock is gated. On some board clock is gated even if IPU is not active. Do you have a way reading inside IPU itself ? Then we can better decide if it was really acrive. For example, checking if ipu_enable_channel() was called (and DMA registers are set).
Best regards,
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/1 video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before
Hi Stefano,
On Mon, 28 Aug 2017 18:54:39 +0200
Stefano Babic sbabic at denx.de wrote:
...
Quoted 6 lines
Quoted 6 lines
drivers/video/mxc_ipuv3_fb.c +6
-0+/* +* Check if IPU clock was enabled before. Won't access +* IPU registers if clock is not enabled. +*/ + reg =readl (&mxc_ccm->CCGR3); +if ((reg &MXC_CCM_CCGR3_IPU1_IPU_MASK ) ==0 )
Quoted 8 lines
drivers/video/mxc_ipuv3_fb.c err0: · line 583
Quoted 2 lines
drivers/video/mxc_ipuv3_fb.c +1
-0+return ;It looks to me quite weak to simply check if clock is gated. On some board clock is gated even if IPU is not active. Do you have a way reading inside IPU itself ? Then we can better decide if it was really acrive. For example, checking if
ipu_enable_channel()was called (and DMA registers are set).
we cannot access IPU registers when IPU clock is disabled (register access will hang the CPU).
Thanks,
Anatolij