2023-10-04 19:04:57

by Bartosz Golaszewski

[permalink] [raw]
Subject: [PATCH] firmware: qcom: qseecom: add missing include guards

From: Bartosz Golaszewski <[email protected]>

The qseecom header does not contain ifdef guards against multiple
inclusion. Add them.

Fixes: 00b1248606ba ("firmware: qcom_scm: Add support for Qualcomm Secure Execution Environment SCM interface")
Signed-off-by: Bartosz Golaszewski <[email protected]>
---
include/linux/firmware/qcom/qcom_qseecom.h | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/firmware/qcom/qcom_qseecom.h
index b531547e1dc9..5c28298a98be 100644
--- a/include/linux/firmware/qcom/qcom_qseecom.h
+++ b/include/linux/firmware/qcom/qcom_qseecom.h
@@ -5,6 +5,10 @@
*
* Copyright (C) 2023 Maximilian Luz <[email protected]>
*/
+
+#ifndef __QCOM_QSEECOM_H
+#define __QCOM_QSEECOM_H
+
#include <linux/auxiliary_bus.h>
#include <linux/types.h>

@@ -44,3 +48,5 @@ static inline int qcom_qseecom_app_send(struct qseecom_client *client, void *req
{
return qcom_scm_qseecom_app_send(client->app_id, req, req_size, rsp, rsp_size);
}
+
+#endif /* __QCOM_QSEECOM_H */
--
2.39.2


2023-10-04 19:13:24

by Maximilian Luz

[permalink] [raw]
Subject: Re: [PATCH] firmware: qcom: qseecom: add missing include guards

On 10/4/23 20:57, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> The qseecom header does not contain ifdef guards against multiple
> inclusion. Add them.
>
> Fixes: 00b1248606ba ("firmware: qcom_scm: Add support for Qualcomm Secure Execution Environment SCM interface")
> Signed-off-by: Bartosz Golaszewski <[email protected]>

Oh, thanks for spotting and fixing that.

Reviewed-by: Maximilian Luz <[email protected]>

PS: I haven't forgotten about your SHM Bridge patches. Testing those is
now next up on my kernel TODO list. Unfortunately, it might take a
couple more days until I can get around to do it properly.

> ---
> include/linux/firmware/qcom/qcom_qseecom.h | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/firmware/qcom/qcom_qseecom.h
> index b531547e1dc9..5c28298a98be 100644
> --- a/include/linux/firmware/qcom/qcom_qseecom.h
> +++ b/include/linux/firmware/qcom/qcom_qseecom.h
> @@ -5,6 +5,10 @@
> *
> * Copyright (C) 2023 Maximilian Luz <[email protected]>
> */
> +
> +#ifndef __QCOM_QSEECOM_H
> +#define __QCOM_QSEECOM_H
> +
> #include <linux/auxiliary_bus.h>
> #include <linux/types.h>
>
> @@ -44,3 +48,5 @@ static inline int qcom_qseecom_app_send(struct qseecom_client *client, void *req
> {
> return qcom_scm_qseecom_app_send(client->app_id, req, req_size, rsp, rsp_size);
> }
> +
> +#endif /* __QCOM_QSEECOM_H */

2023-10-05 16:19:04

by Bartosz Golaszewski

[permalink] [raw]
Subject: Re: [PATCH] firmware: qcom: qseecom: add missing include guards

On Wed, Oct 4, 2023 at 9:10 PM Maximilian Luz <[email protected]> wrote:
>
> On 10/4/23 20:57, Bartosz Golaszewski wrote:
> > From: Bartosz Golaszewski <[email protected]>
> >
> > The qseecom header does not contain ifdef guards against multiple
> > inclusion. Add them.
> >
> > Fixes: 00b1248606ba ("firmware: qcom_scm: Add support for Qualcomm Secure Execution Environment SCM interface")
> > Signed-off-by: Bartosz Golaszewski <[email protected]>
>
> Oh, thanks for spotting and fixing that.
>
> Reviewed-by: Maximilian Luz <[email protected]>
>
> PS: I haven't forgotten about your SHM Bridge patches. Testing those is
> now next up on my kernel TODO list. Unfortunately, it might take a
> couple more days until I can get around to do it properly.

Thanks, you may as well wait for v3 as it'll be reworked significantly
again due to some new information I got.

Bart

>
> > ---
> > include/linux/firmware/qcom/qcom_qseecom.h | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/include/linux/firmware/qcom/qcom_qseecom.h b/include/linux/firmware/qcom/qcom_qseecom.h
> > index b531547e1dc9..5c28298a98be 100644
> > --- a/include/linux/firmware/qcom/qcom_qseecom.h
> > +++ b/include/linux/firmware/qcom/qcom_qseecom.h
> > @@ -5,6 +5,10 @@
> > *
> > * Copyright (C) 2023 Maximilian Luz <[email protected]>
> > */
> > +
> > +#ifndef __QCOM_QSEECOM_H
> > +#define __QCOM_QSEECOM_H
> > +
> > #include <linux/auxiliary_bus.h>
> > #include <linux/types.h>
> >
> > @@ -44,3 +48,5 @@ static inline int qcom_qseecom_app_send(struct qseecom_client *client, void *req
> > {
> > return qcom_scm_qseecom_app_send(client->app_id, req, req_size, rsp, rsp_size);
> > }
> > +
> > +#endif /* __QCOM_QSEECOM_H */

2023-10-16 18:22:11

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] firmware: qcom: qseecom: add missing include guards


On Wed, 04 Oct 2023 20:57:32 +0200, Bartosz Golaszewski wrote:
> The qseecom header does not contain ifdef guards against multiple
> inclusion. Add them.
>
>

Applied, thanks!

[1/1] firmware: qcom: qseecom: add missing include guards
commit: ada1682d60ac6017037305166d02eb0cd5ee50fa

Best regards,
--
Bjorn Andersson <[email protected]>