diff mbox series

[v6,3/3] mtd: cfi_cmdset_0002: Rename chip_ready variables and add ID definition

Message ID 20220322234952.25520-1-ikegami.t@gmail.com
State New
Delegated to: Vignesh R
Headers show
Series None | expand

Commit Message

Tokunori Ikegami March 22, 2022, 11:49 p.m. UTC
The definition is for the S29GL064N model number 01, 02, V1 and V2.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Comments

Miquel Raynal March 23, 2022, 8:02 a.m. UTC | #1
Hi Tokunori,

ikegami.t@gmail.com wrote on Wed, 23 Mar 2022 08:49:52 +0900:

> The definition is for the S29GL064N model number 01, 02, V1 and V2.

Please keep resending the entire series.

> 
> Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Cc: Richard Weinberger <richard@nod.at>
> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> Cc: linux-mtd@lists.infradead.org

You don't need all these Cc there, just add them when sending
everything with git-format-patch. I believe you can use these fields
just for "extra" people which are not notably expected.

> ---
>  drivers/mtd/chips/cfi_cmdset_0002.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
> index 59334530dd46..67453f59c69c 100644
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> @@ -48,6 +48,7 @@
>  #define SST49LF040B		0x0050
>  #define SST49LF008A		0x005a
>  #define AT49BV6416		0x00d6
> +#define S29GL064N_MN12		0x0c01
>  
>  /*
>   * Status Register bit description. Used by flash devices that don't
> @@ -445,7 +446,7 @@ static void fixup_quirks(struct mtd_info *mtd)
>  	struct map_info *map = mtd->priv;
>  	struct cfi_private *cfi = map->fldrv_priv;
>  
> -	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x0c01)
> +	if (cfi->mfr == CFI_MFR_AMD && cfi->id == S29GL064N_MN12)
>  		cfi->quirks |= CFI_QUIRK_DQ_TRUE_DATA;
>  }
>  
> @@ -475,7 +476,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
>  	{ CFI_MFR_AMD, 0x0056, fixup_use_secsi },
>  	{ CFI_MFR_AMD, 0x005C, fixup_use_secsi },
>  	{ CFI_MFR_AMD, 0x005F, fixup_use_secsi },
> -	{ CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors },
> +	{ CFI_MFR_AMD, S29GL064N_MN12, fixup_s29gl064n_sectors },
>  	{ CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
>  	{ CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
>  	{ CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
> @@ -833,7 +834,7 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
>  			       unsigned long addr, map_word *expected)
>  {
>  	struct cfi_private *cfi = map->fldrv_priv;
> -	map_word d, t;
> +	map_word oldd, curd;

All the changes here and below have nothing to do with this commit. You
can rename variables if you wish, but that is a separate commit.

>  	int ret;
>  
>  	if (cfi_use_status_reg(cfi)) {
> @@ -844,20 +845,20 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
>  		 */
>  		cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
>  				 cfi->device_type, NULL);
> -		t = map_read(map, addr);
> +		curd = map_read(map, addr);
>  
> -		return map_word_andequal(map, t, ready, ready);
> +		return map_word_andequal(map, curd, ready, ready);
>  	}
>  
> -	d = map_read(map, addr);
> -	t = map_read(map, addr);
> +	oldd = map_read(map, addr);
> +	curd = map_read(map, addr);
>  
> -	ret = map_word_equal(map, d, t);
> +	ret = map_word_equal(map, oldd, curd);
>  
>  	if (!ret || !expected)
>  		return ret;
>  
> -	return map_word_equal(map, t, *expected);
> +	return map_word_equal(map, curd, *expected);
>  }
>  
>  static int __xipram chip_good(struct map_info *map, struct flchip *chip,


Thanks,
Miquèl
Tokunori Ikegami March 23, 2022, 4:46 p.m. UTC | #2
Hi Miquel-san,

On 2022/03/23 17:02, Miquel Raynal wrote:
> Hi Tokunori,
>
> ikegami.t@gmail.com wrote on Wed, 23 Mar 2022 08:49:52 +0900:
>
>> The definition is for the S29GL064N model number 01, 02, V1 and V2.
> Please keep resending the entire series.
I see. (In the past it was mentioned as not necessary to send all 
patches if a patch fixed of series.)
>
>> Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
>> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
>> Cc: Richard Weinberger <richard@nod.at>
>> Cc: Vignesh Raghavendra <vigneshr@ti.com>
>> Cc: linux-mtd@lists.infradead.org
> You don't need all these Cc there, just add them when sending
> everything with git-format-patch. I believe you can use these fields
> just for "extra" people which are not notably expected.

Will do as so. By the way it was commented on the version 1 patch by 
Vignesh-san as below so added CC maintainers by version 2 patch.
  > Please CC maintainers from
  >
  > ./scripts/get_maintainer.pl -f drivers/mtd/chips/cfi_cmdset_0002.c
  >
  > Else, patch would not get attention in time.

>
>> ---
>>   drivers/mtd/chips/cfi_cmdset_0002.c | 19 ++++++++++---------
>>   1 file changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
>> index 59334530dd46..67453f59c69c 100644
>> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
>> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
>> @@ -48,6 +48,7 @@
>>   #define SST49LF040B		0x0050
>>   #define SST49LF008A		0x005a
>>   #define AT49BV6416		0x00d6
>> +#define S29GL064N_MN12		0x0c01
>>   
>>   /*
>>    * Status Register bit description. Used by flash devices that don't
>> @@ -445,7 +446,7 @@ static void fixup_quirks(struct mtd_info *mtd)
>>   	struct map_info *map = mtd->priv;
>>   	struct cfi_private *cfi = map->fldrv_priv;
>>   
>> -	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x0c01)
>> +	if (cfi->mfr == CFI_MFR_AMD && cfi->id == S29GL064N_MN12)
>>   		cfi->quirks |= CFI_QUIRK_DQ_TRUE_DATA;
>>   }
>>   
>> @@ -475,7 +476,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
>>   	{ CFI_MFR_AMD, 0x0056, fixup_use_secsi },
>>   	{ CFI_MFR_AMD, 0x005C, fixup_use_secsi },
>>   	{ CFI_MFR_AMD, 0x005F, fixup_use_secsi },
>> -	{ CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors },
>> +	{ CFI_MFR_AMD, S29GL064N_MN12, fixup_s29gl064n_sectors },
>>   	{ CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
>>   	{ CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
>>   	{ CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
>> @@ -833,7 +834,7 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
>>   			       unsigned long addr, map_word *expected)
>>   {
>>   	struct cfi_private *cfi = map->fldrv_priv;
>> -	map_word d, t;
>> +	map_word oldd, curd;
> All the changes here and below have nothing to do with this commit. You
> can rename variables if you wish, but that is a separate commit.
Okay. (I thought the version 6 3/3 patch followed the comment below.)
  > A lot of the diff is just a rename. I am not against a rename if you
  > feel it's better, but in this order:
  > 1: prepare the fix
  > 2: fix

  > 3: rename/define id's, whatever

Regards,
Ikegami

>
>>   	int ret;
>>   
>>   	if (cfi_use_status_reg(cfi)) {
>> @@ -844,20 +845,20 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
>>   		 */
>>   		cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
>>   				 cfi->device_type, NULL);
>> -		t = map_read(map, addr);
>> +		curd = map_read(map, addr);
>>   
>> -		return map_word_andequal(map, t, ready, ready);
>> +		return map_word_andequal(map, curd, ready, ready);
>>   	}
>>   
>> -	d = map_read(map, addr);
>> -	t = map_read(map, addr);
>> +	oldd = map_read(map, addr);
>> +	curd = map_read(map, addr);
>>   
>> -	ret = map_word_equal(map, d, t);
>> +	ret = map_word_equal(map, oldd, curd);
>>   
>>   	if (!ret || !expected)
>>   		return ret;
>>   
>> -	return map_word_equal(map, t, *expected);
>> +	return map_word_equal(map, curd, *expected);
>>   }
>>   
>>   static int __xipram chip_good(struct map_info *map, struct flchip *chip,
>
> Thanks,
> Miquèl
Miquel Raynal March 23, 2022, 4:53 p.m. UTC | #3
Hi Tokunori,

ikegami.t@gmail.com wrote on Thu, 24 Mar 2022 01:46:00 +0900:

> Hi Miquel-san,
> 
> On 2022/03/23 17:02, Miquel Raynal wrote:
> > Hi Tokunori,
> >
> > ikegami.t@gmail.com wrote on Wed, 23 Mar 2022 08:49:52 +0900:
> >  
> >> The definition is for the S29GL064N model number 01, 02, V1 and V2.  
> > Please keep resending the entire series.  
> I see. (In the past it was mentioned as not necessary to send all patches if a patch fixed of series.)

Generally speaking, while you have not been notified that a patch got
applied, it's best to resend it as part of your series.

> >  
> >> Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
> >> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> >> Cc: Richard Weinberger <richard@nod.at>
> >> Cc: Vignesh Raghavendra <vigneshr@ti.com>
> >> Cc: linux-mtd@lists.infradead.org  
> > You don't need all these Cc there, just add them when sending
> > everything with git-format-patch. I believe you can use these fields
> > just for "extra" people which are not notably expected.  
> 
> Will do as so. By the way it was commented on the version 1 patch by Vignesh-san as below so added CC maintainers by version 2 patch.
>   > Please CC maintainers from
>   >
>   > ./scripts/get_maintainer.pl -f drivers/mtd/chips/cfi_cmdset_0002.c
>   >
>   > Else, patch would not get attention in time.  

And Vignesh is right. You should Cc the maintainers, but you can do
that by using git-send-email --cc foo --cc bar. Adding Cc: lines with
all the maintainers in the patch does not really help and just grows
the commit log for no reason.



Thanks,
Miquèl
Tokunori Ikegami March 23, 2022, 5:18 p.m. UTC | #4
Hi Miquel-san,

On 2022/03/24 1:53, Miquel Raynal wrote:
> Hi Tokunori,
>
> ikegami.t@gmail.com wrote on Thu, 24 Mar 2022 01:46:00 +0900:
>
>> Hi Miquel-san,
>>
>> On 2022/03/23 17:02, Miquel Raynal wrote:
>>> Hi Tokunori,
>>>
>>> ikegami.t@gmail.com wrote on Wed, 23 Mar 2022 08:49:52 +0900:
>>>   
>>>> The definition is for the S29GL064N model number 01, 02, V1 and V2.
>>> Please keep resending the entire series.
>> I see. (In the past it was mentioned as not necessary to send all patches if a patch fixed of series.)
> Generally speaking, while you have not been notified that a patch got
> applied, it's best to resend it as part of your series.
Thanks for your advice. I see and understood as it seems that it was 
okay if I resent as the version 5 3/3 patch but not version 6 3/3 patch.
>
>>>   
>>>> Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
>>>> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
>>>> Cc: Richard Weinberger <richard@nod.at>
>>>> Cc: Vignesh Raghavendra <vigneshr@ti.com>
>>>> Cc: linux-mtd@lists.infradead.org
>>> You don't need all these Cc there, just add them when sending
>>> everything with git-format-patch. I believe you can use these fields
>>> just for "extra" people which are not notably expected.
>> Will do as so. By the way it was commented on the version 1 patch by Vignesh-san as below so added CC maintainers by version 2 patch.
>>    > Please CC maintainers from
>>    >
>>    > ./scripts/get_maintainer.pl -f drivers/mtd/chips/cfi_cmdset_0002.c
>>    >
>>    > Else, patch would not get attention in time.
> And Vignesh is right. You should Cc the maintainers, but you can do
> that by using git-send-email --cc foo --cc bar. Adding Cc: lines with
> all the maintainers in the patch does not really help and just grows
> the commit log for no reason.

Yes agreed with this.

Regards,
Ikegami

>
>
>
> Thanks,
> Miquèl
diff mbox series

Patch

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 59334530dd46..67453f59c69c 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -48,6 +48,7 @@ 
 #define SST49LF040B		0x0050
 #define SST49LF008A		0x005a
 #define AT49BV6416		0x00d6
+#define S29GL064N_MN12		0x0c01
 
 /*
  * Status Register bit description. Used by flash devices that don't
@@ -445,7 +446,7 @@  static void fixup_quirks(struct mtd_info *mtd)
 	struct map_info *map = mtd->priv;
 	struct cfi_private *cfi = map->fldrv_priv;
 
-	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x0c01)
+	if (cfi->mfr == CFI_MFR_AMD && cfi->id == S29GL064N_MN12)
 		cfi->quirks |= CFI_QUIRK_DQ_TRUE_DATA;
 }
 
@@ -475,7 +476,7 @@  static struct cfi_fixup cfi_fixup_table[] = {
 	{ CFI_MFR_AMD, 0x0056, fixup_use_secsi },
 	{ CFI_MFR_AMD, 0x005C, fixup_use_secsi },
 	{ CFI_MFR_AMD, 0x005F, fixup_use_secsi },
-	{ CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors },
+	{ CFI_MFR_AMD, S29GL064N_MN12, fixup_s29gl064n_sectors },
 	{ CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
 	{ CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
 	{ CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
@@ -833,7 +834,7 @@  static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
 			       unsigned long addr, map_word *expected)
 {
 	struct cfi_private *cfi = map->fldrv_priv;
-	map_word d, t;
+	map_word oldd, curd;
 	int ret;
 
 	if (cfi_use_status_reg(cfi)) {
@@ -844,20 +845,20 @@  static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
 		 */
 		cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
 				 cfi->device_type, NULL);
-		t = map_read(map, addr);
+		curd = map_read(map, addr);
 
-		return map_word_andequal(map, t, ready, ready);
+		return map_word_andequal(map, curd, ready, ready);
 	}
 
-	d = map_read(map, addr);
-	t = map_read(map, addr);
+	oldd = map_read(map, addr);
+	curd = map_read(map, addr);
 
-	ret = map_word_equal(map, d, t);
+	ret = map_word_equal(map, oldd, curd);
 
 	if (!ret || !expected)
 		return ret;
 
-	return map_word_equal(map, t, *expected);
+	return map_word_equal(map, curd, *expected);
 }
 
 static int __xipram chip_good(struct map_info *map, struct flchip *chip,