From 1c9c02bb22684f6949d2e7ddc0a3ff364fd5a6fc Mon Sep 17 00:00:00 2001

From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>

Date: Mon, 27 Apr 2020 14:50:37 -0500

Subject: [PATCH] mtd: lpddr: Fix bad logic in print_drs_error

Git-commit: 1c9c02bb22684f6949d2e7ddc0a3ff364fd5a6fc

Patch-mainline: v5.10-rc1

References: git-fixes

Update logic for broken test. Use a more common logging style.

It appears the logic in this function is broken for the

consecutive tests of

        if (prog_status & 0x3)

                ...

        else if (prog_status & 0x2)

                ...

        else (prog_status & 0x1)

                ...

Likely the first test should be

        if ((prog_status & 0x3) == 0x3)

Found by inspection of include files using printk.

Fixes: eb3db27507f7 ("[MTD] LPDDR PFOW definition")

Cc: stable@vger.kernel.org

Reported-by: Joe Perches <joe@perches.com>

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

Link: https://lore.kernel.org/linux-mtd/3fb0e29f5b601db8be2938a01d974b00c8788501.1588016644.git.gustavo@embeddedor.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 include/linux/mtd/pfow.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/mtd/pfow.h b/include/linux/mtd/pfow.h

index 6166e7c60869..b8da6f8e854b 100644

--- a/include/linux/mtd/pfow.h

+++ b/include/linux/mtd/pfow.h

@@ -128,7 +128,7 @@ static inline void print_drs_error(unsigned dsr)

 	if (!(dsr & DSR_AVAILABLE))

 		printk(KERN_NOTICE"DSR.15: (0) Device not Available\n");

-	if (prog_status & 0x03)

+	if ((prog_status & 0x03) == 0x03)

 		printk(KERN_NOTICE"DSR.9,8: (11) Attempt to program invalid "

 						"half with 41h command\n");

 	else if (prog_status & 0x02)

-- 

2.16.4