drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()
Subsystems (3)
PATCH v2 1/2 drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()
The return value of sp_tx_rst_aux() is not propagated, which means both compiler warnings and potential errors not being handled.
---
Changes since v1:
- Instead of discarding the error, propagate it until it is handled properly
drivers/gpu/drm/bridge/analogix/anx7625.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +8 -4
@@ -720,7 +720,7 @@ static int edid_read(struct anx7625_data *ctx, ret =sp_tx_aux_rd (ctx,0xf1 );if (ret) { -sp_tx_rst_aux (ctx); + ret =sp_tx_rst_aux (ctx);DRM_DEV_DEBUG_DRIVER (dev,"edid read fail, reset!\n" ); }else { ret = anx7625_reg_block_read(ctx, ctx->i2c.rx_p0_client,
@@ -735,7 +735,7 @@ static int edid_read(struct anx7625_data *ctx,if (cnt >EDID_TRY_CNT )return -EIO ; -return 0 ; +return ret; } static int segments_edid_read(struct anx7625_data *ctx,
@@ -785,7 +785,7 @@ static int segments_edid_read(struct anx7625_data *ctx,if (cnt >EDID_TRY_CNT )return -EIO ; -return 0 ; +return ret; } static int sp_tx_edid_read(struct anx7625_data *ctx,
@@ -887,7 +887,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx, }/* Reset aux channel */ -sp_tx_rst_aux (ctx); + ret =sp_tx_rst_aux (ctx); +if (ret <0 ) { +DRM_DEV_ERROR (dev,"Failed to reset aux channel!\n" ); +return ret; + }return (blocks_num +1 ); }
Signature · 1 line
2.30.2
PATCH v2 2/2 drm/bridge: anx7625: Propagate errors from sp_tx_edid_read()
During the sp_tx_edid_read() call the return value of sp_tx_edid_read() is ignored, which could cause potential errors to go unhandled.
All errors which are returned by sp_tx_edid_read() are handled in anx7625_get_edid().
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +10 -4
@@ -845,8 +845,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,if (g_edid_break ==1 )break ; -segments_edid_read (ctx, count /2 , - pblock_buf, offset); + ret =segments_edid_read (ctx, count /2 , + pblock_buf, offset); +if (ret <0 ) +return ret; +memcpy (&pedid_blocks_buf[edid_pos], pblock_buf,MAX_DPCD_BUFFER_SIZE );
@@ -863,8 +866,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,if (g_edid_break ==1 )break ; -segments_edid_read (ctx, count /2 , - pblock_buf, offset); + ret =segments_edid_read (ctx, count /2 , + pblock_buf, offset); +if (ret <0 ) +return ret; +memcpy (&pedid_blocks_buf[edid_pos], pblock_buf,MAX_DPCD_BUFFER_SIZE );
Signature · 1 line
2.30.2
Re: [PATCH v2 2/2] drm/bridge: anx7625: Propagate errors from sp_tx_edid_read()
Hi Robert,
Quoted 16 lines · Robert Foss
During the
sp_tx_edid_read()call the return value ofsp_tx_edid_read()is ignored, which could cause potential errors to go unhandled.All errors which are returned by
sp_tx_edid_read()are handled inanx7625_get_edid().Signed-off-by Robert Foss <[email protected]>--- drivers/gpu/drm/bridge/analogix/anx7625.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/analogix/anx7625.c +0
-0
drivers/gpu/drm/bridge/analogix/anx7625.c static int sp_tx_edid_read(struct anx7625_data *ctx, · line 852
Quoted 10 lines
drivers/gpu/drm/bridge/analogix/anx7625.c +5
-2@@ -845,8 +845,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,if (g_edid_break ==1 )break ; -segments_edid_read (ctx, count /2 , - pblock_buf, offset); + ret =segments_edid_read (ctx, count /2 , + pblock_buf, offset); +if (ret <0 ) +return ret; +
This could be just "if (ret)".
Same goes for the next case.
With or without this simplification:
I assume you will apply the patches.
Sam
Quoted 19 lines
drivers/gpu/drm/bridge/analogix/anx7625.c +5
-2memcpy (&pedid_blocks_buf[edid_pos], pblock_buf,MAX_DPCD_BUFFER_SIZE );@@ -863,8 +866,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,if (g_edid_break ==1 )break ; -segments_edid_read (ctx, count /2 , - pblock_buf, offset); + ret =segments_edid_read (ctx, count /2 , + pblock_buf, offset); +if (ret <0 ) +return ret; +memcpy (&pedid_blocks_buf[edid_pos], pblock_buf,MAX_DPCD_BUFFER_SIZE );Signature · 1 line
2.30.2
Robert Foss
AppliedRe: [PATCH v2 2/2] drm/bridge: anx7625: Propagate errors from sp_tx_edid_read()
Thanks Sam!
Quoted 34 lines · Sam Ravnborg
Hi Robert,
Quoted 16 lines · Robert Foss
During the
sp_tx_edid_read()call the return value ofsp_tx_edid_read()is ignored, which could cause potential errors to go unhandled.All errors which are returned by
sp_tx_edid_read()are handled inanx7625_get_edid().Signed-off-by Robert Foss <[email protected]>--- drivers/gpu/drm/bridge/analogix/anx7625.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/analogix/anx7625.c +0
-0drivers/gpu/drm/bridge/analogix/anx7625.c static int sp_tx_edid_read(struct anx7625_data *ctx, · line 852
Quoted 10 lines
drivers/gpu/drm/bridge/analogix/anx7625.c +5
-2@@ -845,8 +845,11 @@ static int sp_tx_edid_read(struct anx7625_data *ctx,if (g_edid_break ==1 )break ; -segments_edid_read (ctx, count /2 , - pblock_buf, offset); + ret =segments_edid_read (ctx, count /2 , + pblock_buf, offset); +if (ret <0 ) +return ret; +This could be just "if (ret)".
Same goes for the next case.
Quoted 4 lines
With or without this simplification:
Reviewed-by Sam Ravnborg <[email protected]>I assume you will apply the patches.
Applied to drm-misc-next
Hi Robert,
Quoted 7 lines · Robert Foss
The return value of
sp_tx_rst_aux()is not propagated, which means both compiler warnings and potential errors not being handled.Fixes 8bdfc5dae4e3 ("drm/bridge: anx7625: Add anx7625 MIPI DSI/DPI to DP")Reported-by kernel test robot <[email protected]>Signed-off-by Robert Foss <[email protected]>