Skip to contentSkip to conversation

qcom-scm: Include <linux/err.h> header

PATCH In review Fabio Estevam 7 participants 16 messages Dec 26, 2018 – Jan 14, 2019 Arm Qualcomm mailing list

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qcom-scm: Include <linux/err.h> header

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Include the <linux/err.h> header file to fix this problem.

Fixes e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
---
 include/linux/qcom_scm.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/qcom_scm.h +1 -0
index 06996ad4f2bc..ce5a476fd733 100644
@@ -13,6 +13,7 @@
 #ifndef __QCOM_SCM_H
 #define __QCOM_SCM_H
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>
 
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Fabio Estevam

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Include the <linux/err.h> header file to fix this problem.

Andy, please pick up for inclusion in -rc

Fabio, please use get_maintainers, so your patches hits the appropriate mailing lists (linux-arm-msm@ in this case)

Regards,
Bjorn

Quoted 22 lines
Fixes e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
---
 include/linux/qcom_scm.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/qcom_scm.h +1 -0
index 06996ad4f2bc..ce5a476fd733 100644
@@ -13,6 +13,7 @@
 #ifndef __QCOM_SCM_H
 #define __QCOM_SCM_H
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>
 
Signature · 1 line
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw

FYI, I already had a patch fixing this error (it is in linux-next: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/include/linux/qcom_scm.h). This one is probably better though.

Quoted 39 lines · Bjorn Andersson
Quoted 11 lines · Fabio Estevam

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Include the <linux/err.h> header file to fix this problem.

Andy, please pick up for inclusion in -rc

Fabio, please use get_maintainers, so your patches hits the appropriate mailing lists (linux-arm-msm@ in this case)

Regards,
Bjorn

Quoted 15 lines
Fixes e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
---
  include/linux/qcom_scm.h | 1 +
  1 file changed, 1 insertion(+)
include/linux/qcom_scm.h +0 -0
index 06996ad4f2bc..ce5a476fd733 100644
@@ -13,6 +13,7 @@
  #ifndef __QCOM_SCM_H
  #define __QCOM_SCM_H
 
Quoted 7 lines
Quoted 7 lines
include/linux/qcom_scm.h +1 -0
+#include <linux/err.h>
  #include <linux/types.h>
  #include <linux/cpumask.h>
 
Signature · 1 line
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw
Quoted 3 lines · Jonathan marek

FYI, I already had a patch fixing this error (it is in linux-next: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/include/linux/qcom_scm.h).
This one is probably better though.

I thought I had seen this before, but I was unable to find your patch when searching my inbox.

That patch has been sent to and picked up by arm-soc for v4.21, so we're good.

Thanks,
Bjorn

Quoted 32 lines · Bjorn Andersson
Quoted 31 lines · Fabio Estevam
Quoted 5 lines

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

Quoted 7 lines

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Include the <linux/err.h> header file to fix this problem.

Andy, please pick up for inclusion in -rc

Fabio, please use get_maintainers, so your patches hits the appropriate mailing lists (linux-arm-msm@ in this case)

Regards,
Bjorn

Quoted 7 lines
Fixes e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")
---
  include/linux/qcom_scm.h | 1 +
  1 file changed, 1 insertion(+)
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
include/linux/qcom_scm.h +0 -0
index 06996ad4f2bc..ce5a476fd733 100644
@@ -13,6 +13,7 @@
Quoted 8 lines
Quoted 8 lines
include/linux/qcom_scm.h +1 -0
  #ifndef __QCOM_SCM_H
  #define __QCOM_SCM_H
+#include <linux/err.h>
  #include <linux/types.h>
  #include <linux/cpumask.h>
Signature · 1 line
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
In reply to Bjorn Andersson

Hi Bjorn,

Quoted 12 lines · Bjorn Andersson
Quoted 9 lines · Fabio Estevam

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Quoted 6 lines
Quoted 2 lines

Include the <linux/err.h> header file to fix this problem.

Andy, please pick up for inclusion in -rc

Yes, it would be really nice if we could get this fix into 4.20-rc1 so that imx_v6_v7_defconfig could be built.

Quoted 2 lines

Fabio, please use get_maintainers, so your patches hits the appropriate mailing lists (linux-arm-msm@ in this case)

Sorry, I copied the folks involved in the offending commit:
e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")

By the way, I just ran get_maintainers in this patch and linux-arm-msm is not listed.

Thanks
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

Hi Bjorn,

Quoted 2 lines · Fabio Estevam

By the way, I just ran get_maintainers in this patch and linux-arm-msm is not listed.

Would you like to me to submit a patch like this to fix this problem?

MAINTAINERS +1 -0
index 7a9804a891fd..e014de05b046 100644
@@ -4797,6 +4797,7 @@ L:        [email protected]
 T:     git git://people.freedesktop.org/~robclark/linux
 S:     Maintained
 F:     drivers/gpu/drm/msm/
+F:     include/linux/qcom_scm.h
 F:     include/uapi/drm/msm_drm.h
 F:     Documentation/devicetree/bindings/display/msm/

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#6 lore raw
Quoted 9 lines · Fabio Estevam

Hi Bjorn,

Quoted 2 lines · Fabio Estevam

By the way, I just ran get_maintainers in this patch and linux-arm-msm is not listed.

Would you like to me to submit a patch like this to fix this problem?

Just realized that include/linux/qcom_scm.h is used in several subsystems, so maybe a better location would be under ARM/QUALCOMM SUPPORT?

MAINTAINERS +1 -0
index 7a9804a891fd..77836b9a8ffd 100644
@@ -1950,6 +1950,7 @@ F:        drivers/tty/serial/msm_serial.c
 F:     drivers/*/pm8???-*
 F:     drivers/mfd/ssbi.c
 F:     drivers/firmware/qcom_scm*
+F:     include/linux/qcom_scm.h
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#8 lore raw
In reply to Fabio Estevam
Quoted 4 lines · Fabio Estevam

Hi Bjorn,

On Fri, Dec 28, 2018 at 5:31 PM Bjorn Andersson
<[email protected]> wrote:

[..]

Quoted 2 lines
Quoted 2 lines

Fabio, please use get_maintainers, so your patches hits the appropriate mailing lists (linux-arm-msm@ in this case)

[..]

Quoted 3 lines

By the way, I just ran get_maintainers in this patch and linux-arm-msm is not listed.

Sorry about that, I forgot that the header file is not covered by the MAINTAINERS file.

Your second patch looks good, but I'm hoping we can merge the upcoming v3 of Amit's patch right after the merge window. It fixes this and a lot of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Regards,
Bjorn
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#9 lore raw

Hi Bjorn,

Quoted 8 lines · Bjorn Andersson

Sorry about that, I forgot that the header file is not covered by the MAINTAINERS file.

Your second patch looks good, but I'm hoping we can merge the upcoming v3 of Amit's patch right after the merge window. It fixes this and a lot of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Amit's patch adds the following entry:

+F: include/linux/*/qcom*

but it does not catch include/linux/qcom_scm.h

It also needs

+F: include/linux/qcom*

in order to catch include/linux/qcom-geni-se.h and include/linux/qcom_scm.h

I can add that entry after Amit's patch gets applied.
_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#10 lore raw
Quoted 20 lines · Fabio Estevam

Hi Bjorn,

Quoted 8 lines · Bjorn Andersson

Sorry about that, I forgot that the header file is not covered by the MAINTAINERS file.

Your second patch looks good, but I'm hoping we can merge the upcoming v3 of Amit's patch right after the merge window. It fixes this and a lot of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Amit's patch adds the following entry:

+F: include/linux/*/qcom*

but it does not catch include/linux/qcom_scm.h

Quoted 7 lines

It also needs

+F: include/linux/qcom*

in order to catch include/linux/qcom-geni-se.h and include/linux/qcom_scm.h

I can add that entry after Amit's patch gets applied.

Or I can add it to Amit's. I'll ping him to make sure that's ok.

Thanks,

Andy
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#11 lore raw
Quoted 24 lines · Andy Gross
Quoted 22 lines · Fabio Estevam

Hi Bjorn,

Quoted 8 lines · Bjorn Andersson

Sorry about that, I forgot that the header file is not covered by the MAINTAINERS file.

Your second patch looks good, but I'm hoping we can merge the upcoming v3 of Amit's patch right after the merge window. It fixes this and a lot of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Amit's patch adds the following entry:

+F: include/linux/*/qcom*

but it does not catch include/linux/qcom_scm.h

It also needs

Quoted 8 lines
Quoted 5 lines

+F: include/linux/qcom*

in order to catch include/linux/qcom-geni-se.h and include/linux/qcom_scm.h

I can add that entry after Amit's patch gets applied.

Or I can add it to Amit's. I'll ping him to make sure that's ok.

I'd forgotten about this patch! Just sent out v3 which is still missing "F: include/linux/qcom*".

Let me know if you want me to send out v4 with this added.

Regards,
Amit
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#12 lore raw

Perhaps I am confused but it appears that this patch has already landed upstream and got included in 5.0-rc2:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/qcom_scm.h?h=v5.0-rc2&id=2076607a20bd4dfba699185616cbbbce06d3fa59

Quoted 35 lines · Amit Kucheria
Quoted 24 lines · Andy Gross
Quoted 22 lines · Fabio Estevam

Hi Bjorn,

Quoted 8 lines · Bjorn Andersson

Sorry about that, I forgot that the header file is not covered by the MAINTAINERS file.

Your second patch looks good, but I'm hoping we can merge the upcoming v3 of Amit's patch right after the merge window. It fixes this and a lot of other pieces where we would like to include linux-arm-msm@:

https://lore.kernel.org/lkml/d153a86748f99526e7790bfc4ef8781a2016fd51.1545126964.git.amit.kucheria@linaro.org/

Amit's patch adds the following entry:

+F: include/linux/*/qcom*

but it does not catch include/linux/qcom_scm.h

It also needs

Quoted 8 lines
Quoted 5 lines

+F: include/linux/qcom*

in order to catch include/linux/qcom-geni-se.h and include/linux/qcom_scm.h

I can add that entry after Amit's patch gets applied.

Or I can add it to Amit's. I'll ping him to make sure that's ok.

Quoted 7 lines

I'd forgotten about this patch! Just sent out v3 which is still missing "F: include/linux/qcom*".

Let me know if you want me to send out v4 with this added.

Regards,
Amit

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#13 lore raw

Hi Chris,

Quoted 3 lines · Chris Healy

Perhaps I am confused but it appears that this patch has already landed upstream and got included in 5.0-rc2:

The patch that Amit is referring is the following entry in MAINTAINERS file:

+F: include/linux/qcom*

so that the proper lists can be put on Cc on future changes of this file.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#14 lore raw

There we go, I was definitely confused... Tnx

Quoted 5 lines · Fabio Estevam

Hi Chris,

Quoted 1 line · Chris Healy
Quoted 8 lines
Quoted 2 lines

Perhaps I am confused but it appears that this patch has already landed upstream and got included in 5.0-rc2:

The patch that Amit is referring is the following entry in MAINTAINERS file:

+F: include/linux/qcom*

so that the proper lists can be put on Cc on future changes of this file.

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Tested-by on v1 1/1
#15 lore raw
In reply to Fabio Estevam
Quoted 9 lines · Fabio Estevam

Since commit e6f6d63ed14c ("drm/msm: add headless gpu device for imx5") the DRM_MSM symbol can be selected by SOC_IMX5 causing the following error when building imx_v6_v7_defconfig:

In file included from ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:17:0:
../include/linux/qcom_scm.h: In function 'qcom_scm_set_cold_boot_addr':
../include/linux/qcom_scm.h:73:10: error: 'ENODEV' undeclared (first use in this function)
return -ENODEV;

Quoted 6 lines

Include the <linux/err.h> header file to fix this problem.

Fixes e6f6d63ed14c ("drm/msm: add headless gpu device for imx5")

Still broken upstream, and the commit window is about to close. Any chance to send this patch upstream anytime soon ?

Guenter

Quoted 16 lines
---
 include/linux/qcom_scm.h | 1 +
 1 file changed, 1 insertion(+)
include/linux/qcom_scm.h +1 -0
index 06996ad4f2bc..ce5a476fd733 100644
@@ -13,6 +13,7 @@
 #ifndef __QCOM_SCM_H
 #define __QCOM_SCM_H
 
+#include <linux/err.h>
 #include <linux/types.h>
 #include <linux/cpumask.h>