Skip to contentSkip to conversation

ram: rk3399: Drop debug stride in driver

PATCH In review Jagan Teki 2 participants 6 messages Jul 13, 2020 – Jul 18, 2020 Arm Rockchip

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/3 ram: rk3399: Drop debug stride in driver

stride debug is already present in sdram_common.c via RAM_ROCKCHIP_DEBUG.

So, drop the redundant debug stride code in rk3399 driver.

---
 drivers/ram/rockchip/sdram_rk3399.c | 25 -------------------------
 1 file changed, 25 deletions(-)
drivers/ram/rockchip/sdram_rk3399.c +0 -25
index 60a1ab8b51..d2f3fde236 100644
@@ -2875,31 +2875,6 @@ static unsigned char calculate_stride(struct rk3399_sdram_params *params)
 		if (stride == (-1))
 			goto error;
 	}
-	switch (stride) {
-	case 0xc:
-		printf("128B stride\n");
-		break;
-	case 5:
-	case 9:
-	case 0xd:
-	case 0x11:
-	case 0x19:
-		printf("256B stride\n");
-		break;
-	case 0xa:
-	case 0xe:
-	case 0x12:
-		printf("512B stride\n");
-		break;
-	case 0xf:
-		printf("4K stride\n");
-		break;
-	case 0x1f:
-		printf("32MB + 256B stride\n");
-		break;
-	default:
-		printf("no stride\n");
-	}
 
 	sdram_print_stride(stride);
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/3 ram: rk3399: Mark existing prints via RAM_ROCKCHIP_DEBUG

Right now all these debug statements are printing on the console to make sure proper dram initialization happens.

Mark them into RAM_ROCKCHIP_DEBUG would be more meaningful and work like before since the RAM_ROCKCHIP_DEBUG is by default yet.

No functionality changes.

---
 drivers/ram/rockchip/sdram_rk3399.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/ram/rockchip/sdram_rk3399.c +8 -4
index d2f3fde236..670925420d 100644
@@ -2551,8 +2551,10 @@ static int lpddr4_set_rate(struct dram_info *dram,
 		lpddr4_set_ctl(dram, params, ctl_fn,
 			       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq);
 
-		printf("%s: change freq to %d mhz %d, %d\n", __func__,
-		       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq, ctl_fn, phy_fn);
+		if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG))
+			printf("%s: change freq to %d mhz %d, %d\n", __func__,
+			       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq,
+			       ctl_fn, phy_fn);
 	}
 
 	return 0;
@@ -2966,8 +2968,10 @@ static int sdram_init(struct dram_info *dram,
 			params->base.num_channels++;
 		}
 
-		printf("Channel ");
-		printf(channel ? "1: " : "0: ");
+		if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG)) {
+			printf("Channel ");
+			printf(channel ? "1: " : "0: ");
+		}
 
 		if (channel == 0)
 			set_ddr_stride(dram->pmusgrf, 0x17);
Signature · 1 line
2.25.1
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] ram: rk3399: Mark existing prints via RAM_ROCKCHIP_DEBUG

Quoted 10 lines · Jagan Teki

Right now all these debug statements are printing on the console to make sure proper dram initialization happens.

Mark them into RAM_ROCKCHIP_DEBUG would be more meaningful and work like before since the RAM_ROCKCHIP_DEBUG is by default yet.

No functionality changes.

Thanks,
- Kever

Quoted 34 lines
---
  drivers/ram/rockchip/sdram_rk3399.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
drivers/ram/rockchip/sdram_rk3399.c +8 -4
index d2f3fde236..670925420d 100644
@@ -2551,8 +2551,10 @@ static int lpddr4_set_rate(struct dram_info *dram,
  		lpddr4_set_ctl(dram, params, ctl_fn,
  			       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq);
 
-		printf("%s: change freq to %d mhz %d, %d\n", __func__,
-		       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq, ctl_fn, phy_fn);
+		if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG))
+			printf("%s: change freq to %d mhz %d, %d\n", __func__,
+			       dfs_cfgs_lpddr4[ctl_fn].base.ddr_freq,
+			       ctl_fn, phy_fn);
  	}
 
  	return 0;
@@ -2966,8 +2968,10 @@ static int sdram_init(struct dram_info *dram,
  			params->base.num_channels++;
  		}
 
-		printf("Channel ");
-		printf(channel ? "1: " : "0: ");
+		if (IS_ENABLED(CONFIG_RAM_ROCKCHIP_DEBUG)) {
+			printf("Channel ");
+			printf(channel ? "1: " : "0: ");
+		}
 
  		if (channel == 0)
  			set_ddr_stride(dram->pmusgrf, 0x17);
author
#3 lore raw

PATCH 3/3 roc-rk3399-pc: Disable RAM_ROCKCHIP_DEBUG

In reply to Jagan Teki

Disable ram rockchip debug driver for roc-rk3399-pc boards since we have verified ram in many instances with respective U-Boot versions.

---
 configs/roc-pc-mezzanine-rk3399_defconfig | 1 +
 configs/roc-pc-rk3399_defconfig           | 1 +
 2 files changed, 2 insertions(+)
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
index f15dddc684..c87a8568fc 100644
@@ -53,6 +53,7 @@ CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
configs/roc-pc-rk3399_defconfig +1 -0
index 9ffde7f960..601f5c6ae1 100644
@@ -50,6 +50,7 @@ CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
Signature · 1 line
2.25.1
Reviewed-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] roc-rk3399-pc: Disable RAM_ROCKCHIP_DEBUG

Quoted 5 lines · Jagan Teki

Disable ram rockchip debug driver for roc-rk3399-pc boards since we have verified ram in many instances with respective U-Boot versions.

Thanks,
- Kever

Quoted 29 lines
---
  configs/roc-pc-mezzanine-rk3399_defconfig | 1 +
  configs/roc-pc-rk3399_defconfig           | 1 +
  2 files changed, 2 insertions(+)
configs/roc-pc-mezzanine-rk3399_defconfig +1 -0
index f15dddc684..c87a8568fc 100644
@@ -53,6 +53,7 @@ CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
  CONFIG_RAM_RK3399_LPDDR4=y
  CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
configs/roc-pc-rk3399_defconfig +1 -0
index 9ffde7f960..601f5c6ae1 100644
@@ -50,6 +50,7 @@ CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+# CONFIG_RAM_ROCKCHIP_DEBUG is not set
  CONFIG_RAM_RK3399_LPDDR4=y
  CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
Reviewed-by on v1 1/3
#5 lore raw
In reply to Jagan Teki
Quoted 6 lines · Jagan Teki

stride debug is already present in sdram_common.c via RAM_ROCKCHIP_DEBUG.

So, drop the redundant debug stride code in rk3399 driver.

Thanks,
- Kever

Quoted 40 lines
---
  drivers/ram/rockchip/sdram_rk3399.c | 25 -------------------------
  1 file changed, 25 deletions(-)
drivers/ram/rockchip/sdram_rk3399.c +0 -25
index 60a1ab8b51..d2f3fde236 100644
@@ -2875,31 +2875,6 @@ static unsigned char calculate_stride(struct rk3399_sdram_params *params)
  		if (stride == (-1))
  			goto error;
  	}
-	switch (stride) {
-	case 0xc:
-		printf("128B stride\n");
-		break;
-	case 5:
-	case 9:
-	case 0xd:
-	case 0x11:
-	case 0x19:
-		printf("256B stride\n");
-		break;
-	case 0xa:
-	case 0xe:
-	case 0x12:
-		printf("512B stride\n");
-		break;
-	case 0xf:
-		printf("4K stride\n");
-		break;
-	case 0x1f:
-		printf("32MB + 256B stride\n");
-		break;
-	default:
-		printf("no stride\n");
-	}
 
  	sdram_print_stride(stride);