2018-11-22 14:05:46

by Jonathan Marek

Subject: [PATCH] firmware: qcom: scm: fix compilation error when disabled

This fixes the case when CONFIG_QCOM_SCM is not enabled, and linux/errno.h
has not been included previously.

Signed-off-by: Jonathan Marek <[email protected]>
---
drm/msm includes qcom_scm.h, but can be used with non-qcom hw (IMX5)

include/linux/qcom_scm.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 06996ad4f2bc..1637385bcc17 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
#else
+
+#include <linux/errno.h>
+
static inline
int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
{
--
2.17.1

2018-12-05 17:38:52

by Bjorn Andersson

Subject: Re: [PATCH] firmware: qcom: scm: fix compilation error when disabled

+ linux-arm-msm

On Wed 21 Nov 18:32 PST 2018, Jonathan Marek wrote:

> This fixes the case when CONFIG_QCOM_SCM is not enabled, and linux/errno.h
> has not been included previously.
>
> Signed-off-by: Jonathan Marek <[email protected]>

Reviewed-by: Bjorn Andersson <[email protected]>

Regards,
Bjorn

> ---
> drm/msm includes qcom_scm.h, but can be used with non-qcom hw (IMX5)
>
> include/linux/qcom_scm.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
> index 06996ad4f2bc..1637385bcc17 100644
> --- a/include/linux/qcom_scm.h
> +++ b/include/linux/qcom_scm.h
> @@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
> extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
> extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
> #else
> +
> +#include <linux/errno.h>
> +
> static inline
> int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
> {
> --
> 2.17.1
>

2018-12-05 22:45:31

by Andy Gross

Subject: Re: [PATCH] firmware: qcom: scm: fix compilation error when disabled

On Wed, Dec 05, 2018 at 09:37:21AM -0800, Bjorn Andersson wrote:
> + linux-arm-msm
>
> On Wed 21 Nov 18:32 PST 2018, Jonathan Marek wrote:
>
> > This fixes the case when CONFIG_QCOM_SCM is not enabled, and linux/errno.h
> > has not been included previously.
> >
> > Signed-off-by: Jonathan Marek <[email protected]>
>
> Reviewed-by: Bjorn Andersson <[email protected]>


Got it queued.

Andy