arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

PATCH New Gerlando Falauto 3 participants 5 messages Jan 23, 2013

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Marvell Dove/MV78xx0/Orion SoC support

lore

Share & tools

lore

Gerlando Falauto

author

2013-01-23 13:50 UTC #0 lore raw

PATCH 1/1 arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.

refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n" which is not to be printed in case of variant_mask = 0 (unknown variant). This check should be performed using a logical AND (&&) as opposed to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1

Signed-off-by Gerlando Falauto <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Olof Johansson <[email protected]>

Cc Nicolas Pitre <[email protected]>

Cc Holger Brunck <[email protected]>

---
 arch/arm/plat-orion/mpp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/plat-orion/mpp.c +1 -1

index 3b1e17b..78ea76c 100644
@@ -48,7 +48,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
 					"number (%u)\n", num);
 			continue;
 		}
-		if (variant_mask & !(*mpp_list & variant_mask)) {
+		if (variant_mask && !(*mpp_list & variant_mask)) {
 			printk(KERN_WARNING
 			       "orion_mpp_conf: requested MPP%u config "
 			       "unavailable on this hardware\n", num);

Signature · 1 line

1.7.10.1

Andrew Lunn

maintainer

2013-01-23 14:08 UTC #1 lore raw

PATCH 1/1 arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

Quoted 35 lines · Gerlando Falauto

Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.
refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n" which is not to be printed in case of variant_mask = 0 (unknown variant). This check should be performed using a logical AND (&&) as opposed to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1
Signed-off-by Gerlando Falauto <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Holger Brunck <[email protected]>
---
 arch/arm/plat-orion/mpp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-orion/mpp.c +1 -1
index 3b1e17b..78ea76c 100644
@@ -48,7 +48,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
 					"number (%u)\n", num);
 			continue;
 		}
-		if (variant_mask & !(*mpp_list & variant_mask)) {
+		if (variant_mask && !(*mpp_list & variant_mask)) {
 			printk(KERN_WARNING
 			       "orion_mpp_conf: requested MPP%u config "
 			       "unavailable on this hardware\n", num);
Signature · 1 line
1.7.10.1

Acked-by Andrew Lunn <[email protected]>

Looks like it should only affect dove, but interesting, there are no users of dove_mpp_conf(), so we can probably throw away mach-dove/mpp.[ch].

Andrew

Jason Cooper

Applied

2013-01-23 14:25 UTC #2 lore raw

PATCH 1/1 arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

In reply to Gerlando Falauto

Quoted 10 lines · Gerlando Falauto

Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.
refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n" which is not to be printed in case of variant_mask = 0 (unknown variant). This check should be performed using a logical AND (&&) as opposed to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1

Quoted 8 lines

Signed-off-by Gerlando Falauto <[email protected]>
Cc Andrew Lunn <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Holger Brunck <[email protected]>
---
 arch/arm/plat-orion/mpp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to mvebu/fixes with some minor cleanup of the commit message

thx,

Jason.

Gerlando Falauto

author

2013-01-23 14:32 UTC #3 lore raw

PATCH 1/1 arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

Quoted 10 lines · Jason Cooper

Quoted 9 lines · Gerlando Falauto
Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.
refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n" which is not to be printed in case of variant_mask = 0 (unknown variant). This check should be performed using a logical AND (&&) as opposed to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1

Whooops, what I meant was "and message would NOT be printed"... sorry. :-( Shouldn't really matter anyway.

Thanks,
Gerlando

Jason Cooper

2013-01-23 14:38 UTC #4 lore raw

PATCH 1/1 arm: plat-orion: fix printing of "MPP config unavailable on this hardware"

Quoted 12 lines · Gerlando Falauto

Quoted 10 lines · Jason Cooper
Quoted 9 lines · Gerlando Falauto
Commit 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
ARM: dove: Consolidate mpp code with platform mpp.
refactored printing of the kernel warning
"orion_mpp_conf: requested MPP%u config unavailable on this hardware\n" which is not to be printed in case of variant_mask = 0 (unknown variant). This check should be performed using a logical AND (&&) as opposed to a bitwise AND (&).
Otherwise, test would fail (and message would be printed) if variant_mask != 1

Quoted 2 lines

Whooops, what I meant was "and message would NOT be printed"... sorry. :-( Shouldn't really matter anyway.

fixed in mvebu/fixes.

thx,

Jason.