Linux on ARM based TI OMAP SoCs
 help / color / mirror / Atom feed
* [PATCH] memory: omap-gpmc: fix wait pin validation
@ 2022-12-09 12:31 B. Niedermayr
  2022-12-12  7:16 ` Tony Lindgren
  2022-12-12  9:08 ` Roger Quadros
  0 siblings, 2 replies; 3+ messages in thread
From: B. Niedermayr @ 2022-12-09 12:31 UTC (permalink / raw)
  To: linux-next, Roger Quadros, Tony Lindgren, Krzysztof Kozlowski,
	Benedikt Niedermayr
  Cc: Rob Herring,
	open list:OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT,
	open list:MEMORY CONTROLLER DRIVERS

From: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>

This bug has been introduced after switching from -1 to UINT_MAX
for GPMC_WAITPIN_INVALID.

The bug leads to an error when the optional gpmc,wait-pin
dt-property is not used:

...
gpmc_cs_program_settings: invalid wait-pin (-1)
...

Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
Fixes: 8dd7e4af5853 ("memory: omap-gpmc: fix coverity issue "Control flow issues"")
Cc: Rob Herring <robh+dt@kernel.org>
---
 drivers/memory/omap-gpmc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 57d9f91fe89b..d78f73db37c8 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1918,7 +1918,8 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p)
 		}
 	}
 
-	if (p->wait_pin > gpmc_nr_waitpins) {
+	if (p->wait_pin != GPMC_WAITPIN_INVALID &&
+	    p->wait_pin > gpmc_nr_waitpins) {
 		pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin);
 		return -EINVAL;
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] memory: omap-gpmc: fix wait pin validation
  2022-12-09 12:31 [PATCH] memory: omap-gpmc: fix wait pin validation B. Niedermayr
@ 2022-12-12  7:16 ` Tony Lindgren
  2022-12-12  9:08 ` Roger Quadros
  1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2022-12-12  7:16 UTC (permalink / raw)
  To: B. Niedermayr
  Cc: linux-next, Roger Quadros, Krzysztof Kozlowski, Rob Herring,
	open list:OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT,
	open list:MEMORY CONTROLLER DRIVERS

* B. Niedermayr <benedikt.niedermayr@siemens.com> [221209 12:32]:
> From: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> 
> This bug has been introduced after switching from -1 to UINT_MAX
> for GPMC_WAITPIN_INVALID.
> 
> The bug leads to an error when the optional gpmc,wait-pin
> dt-property is not used:
> 
> ...
> gpmc_cs_program_settings: invalid wait-pin (-1)
> ...

This fixes the issue thanks:

Tested-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] memory: omap-gpmc: fix wait pin validation
  2022-12-09 12:31 [PATCH] memory: omap-gpmc: fix wait pin validation B. Niedermayr
  2022-12-12  7:16 ` Tony Lindgren
@ 2022-12-12  9:08 ` Roger Quadros
  1 sibling, 0 replies; 3+ messages in thread
From: Roger Quadros @ 2022-12-12  9:08 UTC (permalink / raw)
  To: B. Niedermayr, linux-next, Tony Lindgren, Krzysztof Kozlowski
  Cc: Rob Herring,
	open list:OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT,
	open list:MEMORY CONTROLLER DRIVERS



On 09/12/2022 14:31, B. Niedermayr wrote:
> From: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> 
> This bug has been introduced after switching from -1 to UINT_MAX
> for GPMC_WAITPIN_INVALID.
> 
> The bug leads to an error when the optional gpmc,wait-pin
> dt-property is not used:
> 
> ...
> gpmc_cs_program_settings: invalid wait-pin (-1)
> ...
> 
> Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
> Fixes: 8dd7e4af5853 ("memory: omap-gpmc: fix coverity issue "Control flow issues"")
> Cc: Rob Herring <robh+dt@kernel.org>

Acked-by: Roger Quadros <rogerq@kernel.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-12-12  9:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-09 12:31 [PATCH] memory: omap-gpmc: fix wait pin validation B. Niedermayr
2022-12-12  7:16 ` Tony Lindgren
2022-12-12  9:08 ` Roger Quadros

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox