Skip to contentSkip to conversation

mtd: spi-nor: aspeed: fix support for multiple CS on the ast2600

PATCH New Cédric Le Goater 1 participant 4 messages Sep 30, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover mtd: spi-nor: aspeed: fix support for multiple CS on the ast2600

Hello,

The ast2600 driver does not set correctly the segment register values when multiple CS are available. This blocks accesses to the CS0 and Linux fails to boot. The series fixes this issue.

Tested on the IBM Tacoma board.

Thanks,

C.

Cédric Le Goater (3):
mtd: spi-nor: aspeed: fix training of multiple CS on the AST2600
mtd: spi-nor: aspeed: Disable zero size segments on the AST2600
ARM: dts: aspeed: tacoma: Re-enable CS1

 drivers/mtd/spi-nor/aspeed-smc.c            | 17 +++++++++++------
 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/3 mtd: spi-nor: aspeed: fix training of multiple CS on the AST2600

Each CE has its own read timing compensation register.

Fixes c62871befcdb ("mtd: spi-nor: aspeed: add support for AST2600 training")
---
 drivers/mtd/spi-nor/aspeed-smc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/mtd/spi-nor/aspeed-smc.c +5 -4
index e9bc89755912..ad9e04fdb8ad 100644
@@ -1114,12 +1114,13 @@ static int aspeed_smc_optimize_read(struct aspeed_smc_chip *chip,
 
 #define TIMING_DELAY_DI         BIT(3)
 #define TIMING_DELAY_HCYCLE_MAX     5
+#define TIMING_REG_AST2600(chip)					\
+	((chip)->controller->regs + (chip)->controller->info->timing +	\
+	 (chip)->cs * 4)
 
 static int aspeed_smc_calibrate_reads_ast2600(struct aspeed_smc_chip *chip, u32 hdiv,
 					      const u8 *golden_buf, u8 *test_buf)
 {
-	struct aspeed_smc_controller *controller = chip->controller;
-	const struct aspeed_smc_info *info = controller->info;
 	int hcycle;
 	u32 shift = (hdiv - 2) << 3;
 	u32 mask = ~(0xfu << shift);
@@ -1133,7 +1134,7 @@ static int aspeed_smc_calibrate_reads_ast2600(struct aspeed_smc_chip *chip, u32
 		fread_timing_val |= hcycle << shift;
 
 		/* no DI input delay first  */
-		writel(fread_timing_val, controller->regs + info->timing);
+		writel(fread_timing_val, TIMING_REG_AST2600(chip));
 		pass = aspeed_smc_check_reads(chip, golden_buf, test_buf);
 		dev_dbg(chip->nor.dev,
 			"  * [%08x] %d HCLK delay, DI delay none : %s",
@@ -1149,7 +1150,7 @@ static int aspeed_smc_calibrate_reads_ast2600(struct aspeed_smc_chip *chip, u32
 			fread_timing_val &= ~(0xf << (4 + shift));
 			fread_timing_val |= delay_ns << (4 + shift);
 
-			writel(fread_timing_val, controller->regs + info->timing);
+			writel(fread_timing_val, TIMING_REG_AST2600(chip));
 			pass = aspeed_smc_check_reads(chip, golden_buf, test_buf);
 			dev_dbg(chip->nor.dev,
 				"  * [%08x] %d HCLK delay, DI delay %d.%dns : %s",
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 mtd: spi-nor: aspeed: Disable zero size segments on the AST2600

In reply to Cédric Le Goater

A disabled segment for a CS should have a zero value in its segment register. The driver was generating an incorrect value which overlapped with segment CS0. Accesses to the flash were blocked and Linux hung.

Fixes 3635b880313a ("mtd: spi-nor: aspeed: add initial support for ast2600")
---
 drivers/mtd/spi-nor/aspeed-smc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/aspeed-smc.c +6 -2
index ad9e04fdb8ad..ff367c70001d 100644
@@ -347,8 +347,12 @@ static u32 aspeed_smc_segment_end_ast2600(
 static u32 aspeed_smc_segment_reg_ast2600(
 	struct aspeed_smc_controller *controller, u32 start, u32 end)
 {
-    return ((start & AST2600_SEG_ADDR_MASK) >> 16) |
-	    ((end - 1) & AST2600_SEG_ADDR_MASK);
+	/* disable zero size segments */
+	if (start == end)
+		return 0;
+
+	return ((start & AST2600_SEG_ADDR_MASK) >> 16) |
+		((end - 1) & AST2600_SEG_ADDR_MASK);
 }
 
 /*
Signature · 1 line
2.21.0
#3 lore raw

PATCH 3/3 ARM: dts: aspeed: tacoma: Re-enable CS1

In reply to Cédric Le Goater
---
 arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +1 -1
index 942eb974cca2..a923fffbb5a4 100644
@@ -35,7 +35,7 @@
 	};
 
 	flash@1 {
-		status = "disabled";
+		status = "okay";
 		m25p,fast-read;
 		label = "alt-bmc";
 		spi-max-frequency = <50000000>;
Signature · 1 line
2.21.0