瀏覽代碼

kernel: Move an upstreamed patch under backports

This CFI patch was accepted upstream for 5.13. Move it away from under
ath79 and place under backports to be removed in due time.

Signed-off-by: Mauri Sandberg <[email protected]>
Mauri Sandberg 4 年之前
父節點
當前提交
4b14b42abf

+ 7 - 4
target/linux/ath79/patches-5.10/471-mtd-cfi_cmdset_0002-AMD-chip-0x2201-write-words.patch → target/linux/generic/backport-5.10/408-v5.13-mtd-cfi_cmdset_0002-Disable-buffered-writes-for-AMD.patch

@@ -1,7 +1,8 @@
-From f1f811410af297c848e9ec17eaa280d190fdce10 Mon Sep 17 00:00:00 2001
+From 7e4404113686868858a34210c28ae122e967aa64 Mon Sep 17 00:00:00 2001
 From: Mauri Sandberg <[email protected]>
 From: Mauri Sandberg <[email protected]>
-Date: Tue, 23 Feb 2021 18:09:31 +0200
-Subject: [PATCH] mtd: cfi_cmdset_0002: AMD chip 0x2201 - write words
+Date: Tue, 9 Mar 2021 19:48:59 +0200
+Subject: [PATCH] mtd: cfi_cmdset_0002: Disable buffered writes for AMD chip
+ 0x2201
 
 
 Buffer writes do not work with AMD chip 0x2201. The chip in question
 Buffer writes do not work with AMD chip 0x2201. The chip in question
 is a AMD/Spansion/Cypress Semiconductor S29GL256N and datasheet [1]
 is a AMD/Spansion/Cypress Semiconductor S29GL256N and datasheet [1]
@@ -32,6 +33,8 @@ Tested on a Buffalo wzr-hp-g300nh running kernel 5.10.16.
 or  https://datasheetspdf.com/pdf-file/565708/SPANSION/S29GL256N/1
 or  https://datasheetspdf.com/pdf-file/565708/SPANSION/S29GL256N/1
 
 
 Signed-off-by: Mauri Sandberg <[email protected]>
 Signed-off-by: Mauri Sandberg <[email protected]>
+Signed-off-by: Vignesh Raghavendra <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
 ---
 ---
  drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++
  drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++
  1 file changed, 4 insertions(+)
  1 file changed, 4 insertions(+)
@@ -43,7 +46,7 @@ Signed-off-by: Mauri Sandberg <[email protected]>
  	struct map_info *map = mtd->priv;
  	struct map_info *map = mtd->priv;
  	struct cfi_private *cfi = map->fldrv_priv;
  	struct cfi_private *cfi = map->fldrv_priv;
 +
 +
-+	if ((cfi->mfr == CFI_MFR_AMD) && (cfi->id == 0x2201))
++	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x2201)
 +		return;
 +		return;
 +
 +
  	if (cfi->cfiq->BufWriteTimeoutTyp) {
  	if (cfi->cfiq->BufWriteTimeoutTyp) {

+ 7 - 4
target/linux/ath79/patches-5.4/471-mtd-cfi_cmdset_0002-AMD-chip-0x2201-write-words.patch → target/linux/generic/backport-5.4/408-v5.13-mtd-cfi_cmdset_0002-Disable-buffered-writes-for-AMD.patch

@@ -1,7 +1,8 @@
-From f1f811410af297c848e9ec17eaa280d190fdce10 Mon Sep 17 00:00:00 2001
+From 7e4404113686868858a34210c28ae122e967aa64 Mon Sep 17 00:00:00 2001
 From: Mauri Sandberg <[email protected]>
 From: Mauri Sandberg <[email protected]>
-Date: Tue, 23 Feb 2021 18:09:31 +0200
-Subject: [PATCH] mtd: cfi_cmdset_0002: AMD chip 0x2201 - write words
+Date: Tue, 9 Mar 2021 19:48:59 +0200
+Subject: [PATCH] mtd: cfi_cmdset_0002: Disable buffered writes for AMD chip
+ 0x2201
 
 
 Buffer writes do not work with AMD chip 0x2201. The chip in question
 Buffer writes do not work with AMD chip 0x2201. The chip in question
 is a AMD/Spansion/Cypress Semiconductor S29GL256N and datasheet [1]
 is a AMD/Spansion/Cypress Semiconductor S29GL256N and datasheet [1]
@@ -32,6 +33,8 @@ Tested on a Buffalo wzr-hp-g300nh running kernel 5.10.16.
 or  https://datasheetspdf.com/pdf-file/565708/SPANSION/S29GL256N/1
 or  https://datasheetspdf.com/pdf-file/565708/SPANSION/S29GL256N/1
 
 
 Signed-off-by: Mauri Sandberg <[email protected]>
 Signed-off-by: Mauri Sandberg <[email protected]>
+Signed-off-by: Vignesh Raghavendra <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
 ---
 ---
  drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++
  drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++
  1 file changed, 4 insertions(+)
  1 file changed, 4 insertions(+)
@@ -43,7 +46,7 @@ Signed-off-by: Mauri Sandberg <[email protected]>
  	struct map_info *map = mtd->priv;
  	struct map_info *map = mtd->priv;
  	struct cfi_private *cfi = map->fldrv_priv;
  	struct cfi_private *cfi = map->fldrv_priv;
 +
 +
-+	if ((cfi->mfr == CFI_MFR_AMD) && (cfi->id == 0x2201))
++	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x2201)
 +		return;
 +		return;
 +
 +
  	if (cfi->cfiq->BufWriteTimeoutTyp) {
  	if (cfi->cfiq->BufWriteTimeoutTyp) {

+ 1 - 1
target/linux/generic/pending-5.10/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -909,7 +909,7 @@ static int get_chip(struct map_info *map
+@@ -913,7 +913,7 @@ static int get_chip(struct map_info *map
  		return 0;
  		return 0;
  
  
  	case FL_ERASING:
  	case FL_ERASING:

+ 1 - 1
target/linux/generic/pending-5.10/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch

@@ -7,7 +7,7 @@ Signed-off-by: George Kashperko <[email protected]>
  1 file changed, 1 insertion(+)
  1 file changed, 1 insertion(+)
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -2053,6 +2053,7 @@ static int __xipram do_write_buffer(stru
+@@ -2057,6 +2057,7 @@ static int __xipram do_write_buffer(stru
  
  
  	/* Write Buffer Load */
  	/* Write Buffer Load */
  	map_write(map, CMD(0x25), cmd_adr);
  	map_write(map, CMD(0x25), cmd_adr);

+ 1 - 1
target/linux/generic/pending-5.4/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -909,7 +909,7 @@ static int get_chip(struct map_info *map
+@@ -913,7 +913,7 @@ static int get_chip(struct map_info *map
  		return 0;
  		return 0;
  
  
  	case FL_ERASING:
  	case FL_ERASING:

+ 1 - 1
target/linux/generic/pending-5.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch

@@ -7,7 +7,7 @@ Signed-off-by: George Kashperko <[email protected]>
  1 file changed, 1 insertion(+)
  1 file changed, 1 insertion(+)
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -2054,6 +2054,7 @@ static int __xipram do_write_buffer(stru
+@@ -2058,6 +2058,7 @@ static int __xipram do_write_buffer(stru
  
  
  	/* Write Buffer Load */
  	/* Write Buffer Load */
  	map_write(map, CMD(0x25), cmd_adr);
  	map_write(map, CMD(0x25), cmd_adr);