LinuxLists.cc - [PATCH] memory: omap-gpmc: Fix build error without CONFIG

2020-08-18 12:55:20

Subject: [PATCH] memory: omap-gpmc: Fix build error without CONFIG_OF

If CONFIG_OF is n, gcc fails:

drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'

Add helper function to fix this.

Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/memory/omap-gpmc.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index ce0e7e2d7cff..332bb4580817 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1176,6 +1176,7 @@ struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs)
}
EXPORT_SYMBOL_GPL(gpmc_omap_get_nand_ops);

+#ifdef CONFIG_OF
static void gpmc_omap_onenand_calc_sync_timings(struct gpmc_timings *t,
struct gpmc_settings *s,
int freq, int latency)
@@ -1280,6 +1281,14 @@ int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq,

return gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);
}
+#else
+int gpmc_omap_onenand_set_timings(struct device *dev, int cs, int freq,
+ int latency,
+ struct gpmc_onenand_info *info)
+{
+ return -EINVAL;
+}
+#endif
EXPORT_SYMBOL_GPL(gpmc_omap_onenand_set_timings);

int gpmc_get_client_irq(unsigned int irq_config)
--
2.17.1

2020-08-18 13:03:45

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH] memory: omap-gpmc: Fix build error without CONFIG_OF

On Tue, Aug 18, 2020 at 08:53:38PM +0800, YueHaibing wrote:
> If CONFIG_OF is n, gcc fails:
>
> drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
> omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'
>
> Add helper function to fix this.
>
> Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/memory/omap-gpmc.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index ce0e7e2d7cff..332bb4580817 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -1176,6 +1176,7 @@ struct gpmc_nand_ops *gpmc_omap_get_nand_ops(struct gpmc_nand_regs *reg, int cs)
> }
> EXPORT_SYMBOL_GPL(gpmc_omap_get_nand_ops);
>
> +#ifdef CONFIG_OF

Hi,

Instead add empty stub for gpmc_read_settings_dt() in existing #ifdef
section - around line 2314. Less ifdefs and actually seems to me
appropriate place to group !OF stubs.

Best regards,
Krzysztof

2020-08-26 13:01:31

by Yue Haibing

[permalink] [raw]

Subject: [PATCH v2] memory: omap-gpmc: Fix build error without CONFIG_OF

2020-08-27 09:28:50

by Roger Quadros

[permalink] [raw]

Subject: Re: [PATCH v2] memory: omap-gpmc: Fix build error without CONFIG_OF

Hi,

On 26/08/2020 15:59, YueHaibing wrote:
> If CONFIG_OF is n, gcc fails:
>
> drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
> omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'
>
> Add gpmc_read_settings_dt() helper function to fix this.
>
> Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> v2: add gpmc_read_settings_dt() stub
> ---
> drivers/memory/omap-gpmc.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index cd9e80748591..02c0c694ecaf 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -2310,6 +2310,9 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
> }
> }
> #else
> +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
> +{

I will suggest to set gpmc_settings data structure to zero here so that
the caller doesn't proceed with random/invalid settings.

> +}
> static int gpmc_probe_dt(struct platform_device *pdev)
> {
> return 0;
>

cheers,
-roger
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2020-08-27 12:55:41

by Yue Haibing

[permalink] [raw]

Subject: [PATCH v3] memory: omap-gpmc: Fix build error without CONFIG_OF

If CONFIG_OF is n, gcc fails:

drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'

Add gpmc_read_settings_dt() helper function, which zero the gpmc_settings
so the caller doesn't proceed with random/invalid settings.

Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
Signed-off-by: YueHaibing <[email protected]>
---
v3: zero gpmc_settings
v2: add gpmc_read_settings_dt() stub
---
drivers/memory/omap-gpmc.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index cd9e80748591..e026b4cd3612 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
}
}
#else
+void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
+{
+ memset(p, 0, sizeof(struct gpmc_settings));
+}
static int gpmc_probe_dt(struct platform_device *pdev)
{
return 0;
--
2.17.1

2020-08-27 14:56:28

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH v3] memory: omap-gpmc: Fix build error without CONFIG_OF

On Thu, Aug 27, 2020 at 08:53:16PM +0800, YueHaibing wrote:
> If CONFIG_OF is n, gcc fails:
>
> drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
> omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'
>
> Add gpmc_read_settings_dt() helper function, which zero the gpmc_settings
> so the caller doesn't proceed with random/invalid settings.
>
> Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> v3: zero gpmc_settings
> v2: add gpmc_read_settings_dt() stub
> ---
> drivers/memory/omap-gpmc.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index cd9e80748591..e026b4cd3612 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
> }
> }
> #else
> +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
> +{
> + memset(p, 0, sizeof(struct gpmc_settings));

sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix
it while applying.

If there is resend, please fix it as well.

Best regards,
Krzysztof

2020-08-27 16:39:17

by Roger Quadros

[permalink] [raw]

Subject: Re: [PATCH v3] memory: omap-gpmc: Fix build error without CONFIG_OF

On 27/08/2020 16:21, Krzysztof Kozlowski wrote:
> On Thu, Aug 27, 2020 at 08:53:16PM +0800, YueHaibing wrote:
>> If CONFIG_OF is n, gcc fails:
>>
>> drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
>> omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'
>>
>> Add gpmc_read_settings_dt() helper function, which zero the gpmc_settings
>> so the caller doesn't proceed with random/invalid settings.
>>
>> Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
>> Signed-off-by: YueHaibing <[email protected]>
>> ---
>> v3: zero gpmc_settings
>> v2: add gpmc_read_settings_dt() stub
>> ---
>> drivers/memory/omap-gpmc.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
>> index cd9e80748591..e026b4cd3612 100644
>> --- a/drivers/memory/omap-gpmc.c
>> +++ b/drivers/memory/omap-gpmc.c
>> @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
>> }
>> }
>> #else
>> +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
>> +{
>> + memset(p, 0, sizeof(struct gpmc_settings));
>
> sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix
> it while applying.
>
> If there is resend, please fix it as well.

With the sizeof(*p) change.

Acked-by: Roger Quadros <[email protected]>

cheers,
-roger
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2020-08-27 19:34:27

by Krzysztof Kozlowski

[permalink] [raw]

Subject: Re: [PATCH v3] memory: omap-gpmc: Fix build error without CONFIG_OF

On Thu, Aug 27, 2020 at 07:37:18PM +0300, Roger Quadros wrote:
>
>
> On 27/08/2020 16:21, Krzysztof Kozlowski wrote:
> > On Thu, Aug 27, 2020 at 08:53:16PM +0800, YueHaibing wrote:
> > > If CONFIG_OF is n, gcc fails:
> > >
> > > drivers/memory/omap-gpmc.o: In function `gpmc_omap_onenand_set_timings':
> > > omap-gpmc.c:(.text+0x2a88): undefined reference to `gpmc_read_settings_dt'
> > >
> > > Add gpmc_read_settings_dt() helper function, which zero the gpmc_settings
> > > so the caller doesn't proceed with random/invalid settings.
> > >
> > > Fixes: a758f50f10cf ("mtd: onenand: omap2: Configure driver from DT")
> > > Signed-off-by: YueHaibing <[email protected]>
> > > ---
> > > v3: zero gpmc_settings
> > > v2: add gpmc_read_settings_dt() stub
> > > ---
> > > drivers/memory/omap-gpmc.c | 4 ++++
> > > 1 file changed, 4 insertions(+)
> > >
> > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> > > index cd9e80748591..e026b4cd3612 100644
> > > --- a/drivers/memory/omap-gpmc.c
> > > +++ b/drivers/memory/omap-gpmc.c
> > > @@ -2310,6 +2310,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
> > > }
> > > }
> > > #else
> > > +void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p)
> > > +{
> > > + memset(p, 0, sizeof(struct gpmc_settings));
> >
> > sizeof(*p) but if patch is otherwise ok (got review/ack) then I can fix
> > it while applying.
> >
> > If there is resend, please fix it as well.
>
> With the sizeof(*p) change.
>
> Acked-by: Roger Quadros <[email protected]>

Thanks, applied.

Best regards,
Krzysztof