All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] media: rkvdec: Add required padding
@ 2022-10-27  8:02 ` Andrzej Pietrasiewicz
  0 siblings, 0 replies; 4+ messages in thread
From: Andrzej Pietrasiewicz @ 2022-10-27  8:02 UTC (permalink / raw)
  To: linux-media
  Cc: linux-rockchip, linux-staging, Mauro Carvalho Chehab,
	Ezequiel Garcia, Greg Kroah-Hartman, Andrzej Pietrasiewicz,
	kernel

The addresses of two elements of the segmap[][] member are passed to the
hardware which expects 128-bit aligned addresses. However, without this
patch offsetof(struct rkvdec_vp9_priv_tbl, segmap[0]) is an odd number
(2421) but the hardware just ignores the 5 least significant bits of the
address. As a result, the hardware writes the segmentation map to incorrect
locations.

Inserting 11 bytes of padding corrects this situation by making the said
addresses divisible by 16 (i.e. aligned on a 128-bit boundary).

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
 drivers/staging/media/rkvdec/rkvdec-vp9.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c
index d8c1c0db15c7..cfae99b40ccb 100644
--- a/drivers/staging/media/rkvdec/rkvdec-vp9.c
+++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c
@@ -84,6 +84,8 @@ struct rkvdec_vp9_probs {
 		struct rkvdec_vp9_inter_frame_probs inter;
 		struct rkvdec_vp9_intra_only_frame_probs intra_only;
 	};
+	/* 128 bit alignment */
+	u8 padding1[11];
 };
 
 /* Data structure describing auxiliary buffer format. */
@@ -1006,6 +1008,7 @@ static int rkvdec_vp9_start(struct rkvdec_ctx *ctx)
 
 	ctx->priv = vp9_ctx;
 
+	BUILD_BUG_ON(sizeof(priv_tbl->probs) % 16); /* ensure probs size is 128-bit aligned */
 	priv_tbl = dma_alloc_coherent(rkvdec->dev, sizeof(*priv_tbl),
 				      &vp9_ctx->priv_tbl.dma, GFP_KERNEL);
 	if (!priv_tbl) {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] media: rkvdec: Add required padding
@ 2022-10-27  8:02 ` Andrzej Pietrasiewicz
  0 siblings, 0 replies; 4+ messages in thread
From: Andrzej Pietrasiewicz @ 2022-10-27  8:02 UTC (permalink / raw)
  To: linux-media
  Cc: linux-rockchip, linux-staging, Mauro Carvalho Chehab,
	Ezequiel Garcia, Greg Kroah-Hartman, Andrzej Pietrasiewicz,
	kernel

The addresses of two elements of the segmap[][] member are passed to the
hardware which expects 128-bit aligned addresses. However, without this
patch offsetof(struct rkvdec_vp9_priv_tbl, segmap[0]) is an odd number
(2421) but the hardware just ignores the 5 least significant bits of the
address. As a result, the hardware writes the segmentation map to incorrect
locations.

Inserting 11 bytes of padding corrects this situation by making the said
addresses divisible by 16 (i.e. aligned on a 128-bit boundary).

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
 drivers/staging/media/rkvdec/rkvdec-vp9.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c
index d8c1c0db15c7..cfae99b40ccb 100644
--- a/drivers/staging/media/rkvdec/rkvdec-vp9.c
+++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c
@@ -84,6 +84,8 @@ struct rkvdec_vp9_probs {
 		struct rkvdec_vp9_inter_frame_probs inter;
 		struct rkvdec_vp9_intra_only_frame_probs intra_only;
 	};
+	/* 128 bit alignment */
+	u8 padding1[11];
 };
 
 /* Data structure describing auxiliary buffer format. */
@@ -1006,6 +1008,7 @@ static int rkvdec_vp9_start(struct rkvdec_ctx *ctx)
 
 	ctx->priv = vp9_ctx;
 
+	BUILD_BUG_ON(sizeof(priv_tbl->probs) % 16); /* ensure probs size is 128-bit aligned */
 	priv_tbl = dma_alloc_coherent(rkvdec->dev, sizeof(*priv_tbl),
 				      &vp9_ctx->priv_tbl.dma, GFP_KERNEL);
 	if (!priv_tbl) {
-- 
2.25.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] media: rkvdec: Add required padding
  2022-10-27  8:02 ` Andrzej Pietrasiewicz
@ 2022-10-27 13:31   ` Nicolas Dufresne
  -1 siblings, 0 replies; 4+ messages in thread
From: Nicolas Dufresne @ 2022-10-27 13:31 UTC (permalink / raw)
  To: Andrzej Pietrasiewicz, linux-media
  Cc: linux-rockchip, linux-staging, Mauro Carvalho Chehab,
	Ezequiel Garcia, Greg Kroah-Hartman, kernel

Le jeudi 27 octobre 2022 à 10:02 +0200, Andrzej Pietrasiewicz a écrit :
> The addresses of two elements of the segmap[][] member are passed to the
> hardware which expects 128-bit aligned addresses. However, without this
> patch offsetof(struct rkvdec_vp9_priv_tbl, segmap[0]) is an odd number
> (2421) but the hardware just ignores the 5 least significant bits of the
> address. As a result, the hardware writes the segmentation map to incorrect
> locations.
> 
> Inserting 11 bytes of padding corrects this situation by making the said
> addresses divisible by 16 (i.e. aligned on a 128-bit boundary).
> 
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

For backport purposes, perhaps add ?

Fixes: f25709c4ff15 ("media: rkvdec: Add the VP9 backend")	

> ---
>  drivers/staging/media/rkvdec/rkvdec-vp9.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c
> index d8c1c0db15c7..cfae99b40ccb 100644
> --- a/drivers/staging/media/rkvdec/rkvdec-vp9.c
> +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c
> @@ -84,6 +84,8 @@ struct rkvdec_vp9_probs {
>  		struct rkvdec_vp9_inter_frame_probs inter;
>  		struct rkvdec_vp9_intra_only_frame_probs intra_only;
>  	};
> +	/* 128 bit alignment */
> +	u8 padding1[11];
>  };
>  
>  /* Data structure describing auxiliary buffer format. */
> @@ -1006,6 +1008,7 @@ static int rkvdec_vp9_start(struct rkvdec_ctx *ctx)
>  
>  	ctx->priv = vp9_ctx;
>  
> +	BUILD_BUG_ON(sizeof(priv_tbl->probs) % 16); /* ensure probs size is 128-bit aligned */
>  	priv_tbl = dma_alloc_coherent(rkvdec->dev, sizeof(*priv_tbl),
>  				      &vp9_ctx->priv_tbl.dma, GFP_KERNEL);
>  	if (!priv_tbl) {


^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] media: rkvdec: Add required padding
@ 2022-10-27 13:31   ` Nicolas Dufresne
  0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Dufresne @ 2022-10-27 13:31 UTC (permalink / raw)
  To: Andrzej Pietrasiewicz, linux-media
  Cc: linux-rockchip, linux-staging, Mauro Carvalho Chehab,
	Ezequiel Garcia, Greg Kroah-Hartman, kernel

Le jeudi 27 octobre 2022 à 10:02 +0200, Andrzej Pietrasiewicz a écrit :
> The addresses of two elements of the segmap[][] member are passed to the
> hardware which expects 128-bit aligned addresses. However, without this
> patch offsetof(struct rkvdec_vp9_priv_tbl, segmap[0]) is an odd number
> (2421) but the hardware just ignores the 5 least significant bits of the
> address. As a result, the hardware writes the segmentation map to incorrect
> locations.
> 
> Inserting 11 bytes of padding corrects this situation by making the said
> addresses divisible by 16 (i.e. aligned on a 128-bit boundary).
> 
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>

Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>

For backport purposes, perhaps add ?

Fixes: f25709c4ff15 ("media: rkvdec: Add the VP9 backend")	

> ---
>  drivers/staging/media/rkvdec/rkvdec-vp9.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/staging/media/rkvdec/rkvdec-vp9.c
> index d8c1c0db15c7..cfae99b40ccb 100644
> --- a/drivers/staging/media/rkvdec/rkvdec-vp9.c
> +++ b/drivers/staging/media/rkvdec/rkvdec-vp9.c
> @@ -84,6 +84,8 @@ struct rkvdec_vp9_probs {
>  		struct rkvdec_vp9_inter_frame_probs inter;
>  		struct rkvdec_vp9_intra_only_frame_probs intra_only;
>  	};
> +	/* 128 bit alignment */
> +	u8 padding1[11];
>  };
>  
>  /* Data structure describing auxiliary buffer format. */
> @@ -1006,6 +1008,7 @@ static int rkvdec_vp9_start(struct rkvdec_ctx *ctx)
>  
>  	ctx->priv = vp9_ctx;
>  
> +	BUILD_BUG_ON(sizeof(priv_tbl->probs) % 16); /* ensure probs size is 128-bit aligned */
>  	priv_tbl = dma_alloc_coherent(rkvdec->dev, sizeof(*priv_tbl),
>  				      &vp9_ctx->priv_tbl.dma, GFP_KERNEL);
>  	if (!priv_tbl) {


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-27 13:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-27  8:02 [PATCH] media: rkvdec: Add required padding Andrzej Pietrasiewicz
2022-10-27  8:02 ` Andrzej Pietrasiewicz
2022-10-27 13:31 ` Nicolas Dufresne
2022-10-27 13:31   ` Nicolas Dufresne

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.