| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CANiDSCsMVR7gqzwrhPCWb7dQcezWbcHxkPNLZJrW=TWaAn+kXA@mail.gmail.com>
Date: Tue, 27 Feb 2024 12:35:08 +0100
From: Ricardo Ribalda <ribalda@...omium.org>
To: Hans Verkuil <hverkuil@...all.nl>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>, Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>, Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>, Mike Isely <isely@...ox.com>,
Tiffany Lin <tiffany.lin@...iatek.com>, Andrew-CT Chen <andrew-ct.chen@...iatek.com>,
Yunfei Dong <yunfei.dong@...iatek.com>, Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Bjorn Andersson <andersson@...nel.org>, Mathieu Poirier <mathieu.poirier@...aro.org>,
Arnd Bergmann <arnd@...db.de>, Sebastian Fricke <sebastian.fricke@...labora.com>,
linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
llvm@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, linux-remoteproc@...r.kernel.org
Subject: Re: [PATCH v2 3/3] media: mediatek: vcodedc: Fix Wcast-function-type-strict
warnings
Hi Hans
On Tue, 27 Feb 2024 at 12:17, Hans Verkuil <hverkuil@...all.nl> wrote:
>
> Ricardo,
>
> First of all, note the typo in theo subject line: vcodedc -> vcodec.
>
> There is also a similar (but not identical!) patch from Arnd:
>
> https://patchwork.linuxtv.org/project/linux-media/patch/20240224121059.1806691-1-arnd@kernel.org/
>
> That patch and yours share the change to common/mtk_vcodec_fw_vpu.c but otherwise
> they are different, which is a bit odd.
>
> Can you take a look at Arnd's patch and see if you need to incorporate his changes
> into your patch?
We went separate paths :), I tried to make everything const (and
therefore the remoteproc changes) and he removed the const.
His patch looks good to me. Shall I resend the series without this
patch or you can ignore 3/3 and take 1 and 2?
Thanks!
>
> Regards,
>
> Hans
>
> On 26/02/2024 18:32, Ricardo Ribalda wrote:
> > Building with LLVM=1 throws the following warning:
> > drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c:38:32: warning: cast from 'mtk_vcodec_ipi_handler' (aka 'void (*)(void *, unsigned int, void *)') to 'ipi_handler_t' (aka 'void (*)(const void *, unsigned int, void *)') converts to incompatible function type [-Wcast-function-type-strict]
> >
> > Constify the types to avoid the warning.
> >
> > Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
> > ---
> > drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c | 12 ++++++------
> > .../media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h | 2 +-
> > .../platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c | 10 +---------
> > drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 2 +-
> > drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c | 2 +-
> > drivers/remoteproc/mtk_scp.c | 4 ++--
> > include/linux/remoteproc/mtk_scp.h | 2 +-
> > include/linux/rpmsg/mtk_rpmsg.h | 2 +-
> > 8 files changed, 14 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c
> > index 49fc2e9d45dd5..c4f1c49b9d52a 100644
> > --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c
> > +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-vpu.c
> > @@ -77,10 +77,10 @@ void mdp_vpu_shared_mem_free(struct mdp_vpu_dev *vpu)
> > dma_free_wc(dev, vpu->config_size, vpu->config, vpu->config_addr);
> > }
> >
> > -static void mdp_vpu_ipi_handle_init_ack(void *data, unsigned int len,
> > +static void mdp_vpu_ipi_handle_init_ack(const void *data, unsigned int len,
> > void *priv)
> > {
> > - struct mdp_ipi_init_msg *msg = (struct mdp_ipi_init_msg *)data;
> > + const struct mdp_ipi_init_msg *msg = data;
> > struct mdp_vpu_dev *vpu =
> > (struct mdp_vpu_dev *)(unsigned long)msg->drv_data;
> >
> > @@ -91,10 +91,10 @@ static void mdp_vpu_ipi_handle_init_ack(void *data, unsigned int len,
> > complete(&vpu->ipi_acked);
> > }
> >
> > -static void mdp_vpu_ipi_handle_deinit_ack(void *data, unsigned int len,
> > +static void mdp_vpu_ipi_handle_deinit_ack(const void *data, unsigned int len,
> > void *priv)
> > {
> > - struct mdp_ipi_deinit_msg *msg = (struct mdp_ipi_deinit_msg *)data;
> > + const struct mdp_ipi_deinit_msg *msg = data;
> > struct mdp_vpu_dev *vpu =
> > (struct mdp_vpu_dev *)(unsigned long)msg->drv_data;
> >
> > @@ -102,10 +102,10 @@ static void mdp_vpu_ipi_handle_deinit_ack(void *data, unsigned int len,
> > complete(&vpu->ipi_acked);
> > }
> >
> > -static void mdp_vpu_ipi_handle_frame_ack(void *data, unsigned int len,
> > +static void mdp_vpu_ipi_handle_frame_ack(const void *data, unsigned int len,
> > void *priv)
> > {
> > - struct img_sw_addr *addr = (struct img_sw_addr *)data;
> > + const struct img_sw_addr *addr = data;
> > struct img_ipi_frameparam *param =
> > (struct img_ipi_frameparam *)(unsigned long)addr->va;
> > struct mdp_vpu_dev *vpu =
> > diff --git a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h
> > index 300363a40158c..2561b99c95871 100644
> > --- a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h
> > +++ b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw.h
> > @@ -23,7 +23,7 @@ enum mtk_vcodec_fw_use {
> >
> > struct mtk_vcodec_fw;
> >
> > -typedef void (*mtk_vcodec_ipi_handler) (void *data,
> > +typedef void (*mtk_vcodec_ipi_handler) (const void *data,
> > unsigned int len, void *priv);
> >
> > struct mtk_vcodec_fw *mtk_vcodec_fw_select(void *priv, enum mtk_vcodec_fw_type type,
> > diff --git a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c
> > index 9f6e4b59455da..4c34344dc7dcb 100644
> > --- a/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c
> > +++ b/drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c
> > @@ -29,15 +29,7 @@ static int mtk_vcodec_vpu_set_ipi_register(struct mtk_vcodec_fw *fw, int id,
> > mtk_vcodec_ipi_handler handler,
> > const char *name, void *priv)
> > {
> > - /*
> > - * The handler we receive takes a void * as its first argument. We
> > - * cannot change this because it needs to be passed down to the rproc
> > - * subsystem when SCP is used. VPU takes a const argument, which is
> > - * more constrained, so the conversion below is safe.
> > - */
> > - ipi_handler_t handler_const = (ipi_handler_t)handler;
> > -
> > - return vpu_ipi_register(fw->pdev, id, handler_const, name, priv);
> > + return vpu_ipi_register(fw->pdev, id, handler, name, priv);
> > }
> >
> > static int mtk_vcodec_vpu_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf,
> > diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_ifc b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
> > index 82e57ae983d55..a840dd2a48d0e 100644
> > --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
> > +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
> > @@ -97,7 +97,7 @@ static bool vpu_dec_check_ap_inst(struct mtk_vcodec_dec_dev *dec_dev, struct vde
> > * This function runs in interrupt context and it means there's an IPI MSG
> > * from VPU.
> > */
> > -static void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv)
> > +static void vpu_dec_ipi_handler(const void *data, unsigned int len, void *priv)
> > {
> > struct mtk_vcodec_dec_dev *dec_dev;
> > const struct vdec_vpu_ipi_ack *msg = data;
> > diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_ifc b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
> > index 84ad1cc6ad171..ea0c4a281d1a1 100644
> > --- a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
> > +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
> > @@ -57,7 +57,7 @@ static bool vpu_enc_check_ap_inst(struct mtk_vcodec_enc_dev *enc_dev, struct ven
> > return ret;
> > }
> >
> > -static void vpu_enc_ipi_handler(void *data, unsigned int len, void *priv)
> > +static void vpu_enc_ipi_handler(const void *data, unsigned int len, void *priv)
> > {
> > struct mtk_vcodec_enc_dev *enc_dev;
> > const struct venc_vpu_ipi_msg_common *msg = data;
> > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> > index a35409eda0cf2..b508136b416a8 100644
> > --- a/drivers/remoteproc/mtk_scp.c
> > +++ b/drivers/remoteproc/mtk_scp.c
> > @@ -78,10 +78,10 @@ static void scp_wdt_handler(struct mtk_scp *scp, u32 scp_to_host)
> > rproc_report_crash(scp_node->rproc, RPROC_WATCHDOG);
> > }
> >
> > -static void scp_init_ipi_handler(void *data, unsigned int len, void *priv)
> > +static void scp_init_ipi_handler(const void *data, unsigned int len, void *priv)
> > {
> > struct mtk_scp *scp = priv;
> > - struct scp_run *run = data;
> > + const struct scp_run *run = data;
> >
> > scp->run.signaled = run->signaled;
> > strscpy(scp->run.fw_ver, run->fw_ver, SCP_FW_VER_LEN);
> > diff --git a/include/linux/remoteproc/mtk_scp.h b/include/linux/remoteproc/mtk_scp.h
> > index 7c2b7cc9fe6c1..84e579940b8e5 100644
> > --- a/include/linux/remoteproc/mtk_scp.h
> > +++ b/include/linux/remoteproc/mtk_scp.h
> > @@ -8,7 +8,7 @@
> >
> > #include <linux/platform_device.h>
> >
> > -typedef void (*scp_ipi_handler_t) (void *data,
> > +typedef void (*scp_ipi_handler_t) (const void *data,
> > unsigned int len,
> > void *priv);
> > struct mtk_scp;
> > diff --git a/include/linux/rpmsg/mtk_rpmsg.h b/include/linux/rpmsg/mtk_rpmsg.h
> > index 363b60178040b..9d67507471fba 100644
> > --- a/include/linux/rpmsg/mtk_rpmsg.h
> > +++ b/include/linux/rpmsg/mtk_rpmsg.h
> > @@ -9,7 +9,7 @@
> > #include <linux/platform_device.h>
> > #include <linux/remoteproc.h>
> >
> > -typedef void (*ipi_handler_t)(void *data, unsigned int len, void *priv);
> > +typedef void (*ipi_handler_t)(const void *data, unsigned int len, void *priv);
> >
> > /*
> > * struct mtk_rpmsg_info - IPI functions tied to the rpmsg device.
> >
>
--
Ricardo Ribalda
Powered by blists - more mailing lists