diff mbox series

mtd: spi-nor-core: Invert logic to reflect sst26 flash unlocked

Message ID 20221122051833.13306-1-ashok.reddy.soma@amd.com
State Changes Requested
Delegated to: Michal Simek
Headers show
Series mtd: spi-nor-core: Invert logic to reflect sst26 flash unlocked | expand

Commit Message

Ashok Reddy Soma Nov. 22, 2022, 5:18 a.m. UTC 
From: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>

flash_is_locked is changed to flash_is_unlocked with commit 513c6071ce73
("mtd: spi: Convert is_locked callback to is_unlocked"). sst26_is_locked()
is also changed to sst26_is_unlocked() but the logic remained same.
Invert the logic for the flash lock/unlock to work properly.

Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
---

 drivers/mtd/spi/spi-nor-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dhruva Gole Nov. 22, 2022, 5:25 a.m. UTC | #1 
These changes make sense to me,

On 22/11/22 10:48, Ashok Reddy Soma wrote:
> From: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> 
> flash_is_locked is changed to flash_is_unlocked with commit 513c6071ce73
> ("mtd: spi: Convert is_locked callback to is_unlocked"). sst26_is_locked()
> is also changed to sst26_is_unlocked() but the logic remained same.
> Invert the logic for the flash lock/unlock to work properly.
> 
> Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
> ---
Reviewed-by: Dhruva Gole <d-gole@ti.com>

> 
>   drivers/mtd/spi/spi-nor-core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
> index 78de3c5281..1ea8363d9f 100644
> --- a/drivers/mtd/spi/spi-nor-core.c
> +++ b/drivers/mtd/spi/spi-nor-core.c
> @@ -1600,7 +1600,7 @@ static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len)
>   	ofs -= ofs & (SZ_64K - 1);
>   	len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len;
>   
> -	return sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
> +	return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
>   }
>   
>   static int sst_write_byteprogram(struct spi_nor *nor, loff_t to, size_t len,
Jan Kiszka Nov. 22, 2022, 6:34 a.m. UTC | #2 
On 22.11.22 06:18, Ashok Reddy Soma wrote:
> From: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> 
> flash_is_locked is changed to flash_is_unlocked with commit 513c6071ce73
> ("mtd: spi: Convert is_locked callback to is_unlocked"). sst26_is_locked()
> is also changed to sst26_is_unlocked() but the logic remained same.
> Invert the logic for the flash lock/unlock to work properly.
> 
> Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
> ---
> 
>  drivers/mtd/spi/spi-nor-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
> index 78de3c5281..1ea8363d9f 100644
> --- a/drivers/mtd/spi/spi-nor-core.c
> +++ b/drivers/mtd/spi/spi-nor-core.c
> @@ -1600,7 +1600,7 @@ static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len)
>  	ofs -= ofs & (SZ_64K - 1);
>  	len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len;
>  
> -	return sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
> +	return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
>  }
>  
>  static int sst_write_byteprogram(struct spi_nor *nor, loff_t to, size_t len,

Indeed...

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>

Hope you were also able to test this on real HW (which I wasn't).

Thanks,
Jan
Ashok Reddy Soma Nov. 22, 2022, 6:55 a.m. UTC | #3 
Hi Jan,

> -----Original Message-----
> From: Jan Kiszka <jan.kiszka@siemens.com>
> Sent: Tuesday, November 22, 2022 12:05 PM
> To: Soma, Ashok Reddy <ashok.reddy.soma@amd.com>; u-
> boot@lists.denx.de
> Cc: jagan@amarulasolutions.com; vigneshr@ti.com; Simek, Michal
> <michal.simek@amd.com>; git@xilinx.com; git (AMD-Xilinx)
> <git@amd.com>; Algapally, Santosh Sagar
> <SantoshSagar.Algapally@amd.com>
> Subject: Re: [PATCH] mtd: spi-nor-core: Invert logic to reflect sst26 flash
> unlocked
> 
> On 22.11.22 06:18, Ashok Reddy Soma wrote:
> > From: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> >
> > flash_is_locked is changed to flash_is_unlocked with commit
> > 513c6071ce73
> > ("mtd: spi: Convert is_locked callback to is_unlocked").
> > sst26_is_locked() is also changed to sst26_is_unlocked() but the logic
> remained same.
> > Invert the logic for the flash lock/unlock to work properly.
> >
> > Signed-off-by: Algapally Santosh Sagar
> > <santoshsagar.algapally@amd.com>
> > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
> > ---
> >
> >  drivers/mtd/spi/spi-nor-core.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/mtd/spi/spi-nor-core.c
> > b/drivers/mtd/spi/spi-nor-core.c index 78de3c5281..1ea8363d9f 100644
> > --- a/drivers/mtd/spi/spi-nor-core.c
> > +++ b/drivers/mtd/spi/spi-nor-core.c
> > @@ -1600,7 +1600,7 @@ static int sst26_is_unlocked(struct spi_nor *nor,
> loff_t ofs, uint64_t len)
> >  	ofs -= ofs & (SZ_64K - 1);
> >  	len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len;
> >
> > -	return sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
> > +	return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
> >  }
> >
> >  static int sst_write_byteprogram(struct spi_nor *nor, loff_t to,
> > size_t len,
> 
> Indeed...
> 
> Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Hope you were also able to test this on real HW (which I wasn't).

Thanks for the review. Yes, we tested on ZynqMP platform.

Thanks,
Ashok
> 
> Thanks,
> Jan
> 
> --
> Siemens AG, Technology
> Competence Center Embedded Linux
Michal Simek Dec. 5, 2022, 9:02 a.m. UTC | #4 
út 22. 11. 2022 v 6:19 odesílatel Ashok Reddy Soma
<ashok.reddy.soma@amd.com> napsal:
>
> From: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
>
> flash_is_locked is changed to flash_is_unlocked with commit 513c6071ce73
> ("mtd: spi: Convert is_locked callback to is_unlocked"). sst26_is_locked()
> is also changed to sst26_is_unlocked() but the logic remained same.
> Invert the logic for the flash lock/unlock to work properly.
>
> Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally@amd.com>
> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
> ---
>
>  drivers/mtd/spi/spi-nor-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
> index 78de3c5281..1ea8363d9f 100644
> --- a/drivers/mtd/spi/spi-nor-core.c
> +++ b/drivers/mtd/spi/spi-nor-core.c
> @@ -1600,7 +1600,7 @@ static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len)
>         ofs -= ofs & (SZ_64K - 1);
>         len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len;
>
> -       return sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
> +       return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
>  }
>
>  static int sst_write_byteprogram(struct spi_nor *nor, loff_t to, size_t len,
> --
> 2.17.1
>

Applied.
M
diff mbox series

Patch

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 78de3c5281..1ea8363d9f 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -1600,7 +1600,7 @@  static int sst26_is_unlocked(struct spi_nor *nor, loff_t ofs, uint64_t len)
 	ofs -= ofs & (SZ_64K - 1);
 	len = len & (SZ_64K - 1) ? (len & ~(SZ_64K - 1)) + SZ_64K : len;
 
-	return sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
+	return !sst26_lock_ctl(nor, ofs, len, SST26_CTL_CHECK);
 }
 
 static int sst_write_byteprogram(struct spi_nor *nor, loff_t to, size_t len,