Skip to contentSkip to conversation

ddr:altera:soc64: Integer fix overflow that caused DDR size mismatched

PATCH Superseded [email protected] 2 participants 5 messages May 10, 2022 – Jun 16, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ddr:altera:soc64: Integer fix overflow that caused DDR size mismatched

From: Dinesh Maniyam <[email protected]>

Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.

---
 drivers/ddr/altera/sdram_soc64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ddr/altera/sdram_soc64.c +2 -1
index d6baac2410..1f479c514d 100644
@@ -239,7 +239,8 @@ phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat)
 {
 	u32 dramaddrw = hmc_readl(plat, DRAMADDRW);
 
-	phys_size_t size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
+	phys_size_t size = (phys_size_t)1 <<
+			(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) +

--
2.26.2

#1 lore raw

PATCH v2 1/1 ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

From: Dinesh Maniyam <[email protected]>

Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.

---

v1->v2
- Add space in title

---
 drivers/ddr/altera/sdram_soc64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ddr/altera/sdram_soc64.c +2 -1
index d6baac2410..1f479c514d 100644
@@ -239,7 +239,8 @@ phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat)
 {
 	u32 dramaddrw = hmc_readl(plat, DRAMADDRW);
 
-	phys_size_t size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
+	phys_size_t size = (phys_size_t)1 <<
+			(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) +

--
2.26.2

#2 lore raw

RE: [PATCH v2] ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

Quoted 47 lines

-----Original Message-----
From: Maniyam, Dinesh <[email protected]>
Sent: Friday, 13 May 2022 3:05 pm
To: [email protected]
Cc: Lim, Elly Siew Chin <[email protected]>; Chee, Tien Fong <[email protected]>; Hea, Kok Kiang <[email protected]>; Gan, Yau Wai <[email protected]>; Kho, Sin Hui <[email protected]>; Lokanathan, Raaj <[email protected]>; Maniyam, Dinesh <[email protected]>
Subject: [PATCH v2] ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

From: Dinesh Maniyam <[email protected]>

Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.

---

v1->v2
- Add space in title

---
 drivers/ddr/altera/sdram_soc64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ddr/altera/sdram_soc64.c +0 -1
index d6baac2410..1f479c514d 100644
@@ -239,7 +239,8 @@ phys_size_t sdram_calculate_size(struct
 altera_sdram_plat *plat)  {
 	u32 dramaddrw = hmc_readl(plat, DRAMADDRW);
 
-	phys_size_t size = 1 <<

(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +

drivers/ddr/altera/sdram_soc64.c +2 -0
+	phys_size_t size = (phys_size_t)1 <<
+			(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +

DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) +

drivers/ddr/altera/sdram_soc64.c +2 -1
 			 DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw)
+
 			 DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw)
+
--
Quoted 1 line

2.26.2

I will re-submit a new version of this patch to update the copyright and alignment

Regards,
Dinesh

#3 lore raw

PATCH v3 1/1 ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

In reply to [email protected]

From: Dinesh Maniyam <[email protected]>

Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.

---

v3->v2
- copyright year updated and alignment updated.

v2->v1
- add space in title

---
 drivers/ddr/altera/sdram_soc64.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ddr/altera/sdram_soc64.c +3 -2
index d6baac2410..9b1710c135 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2016-2021 Intel Corporation <www.intel.com>
+ * Copyright (C) 2016-2022 Intel Corporation <www.intel.com>
  *
  */
 
@@ -239,7 +239,8 @@ phys_size_t sdram_calculate_size(struct altera_sdram_plat *plat)
 {
 	u32 dramaddrw = hmc_readl(plat, DRAMADDRW);
 
-	phys_size_t size = 1 << (DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
+	phys_size_t size = (phys_size_t)1 <<
+			(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw) +
 			 DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) +
Signature · 1 line
2.25.1
Reviewed-by on v3 1/1
#4 lore raw

RE: [PATCH v3] ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

Quoted 57 lines

-----Original Message-----
From: Maniyam, Dinesh <[email protected]>
Sent: Wednesday, 1 June, 2022 6:49 PM
To: [email protected]
Cc: Vasut, Marek <[email protected]>; Simon Goldschmidt <[email protected]>; Lim, Elly Siew Chin <[email protected]>; Chee, Tien Fong <[email protected]>; Hea, Kok Kiang <[email protected]>; Gan, Yau Wai <[email protected]>; Kho, Sin Hui <[email protected]>; Lokanathan, Raaj <[email protected]>; Maniyam, Dinesh <[email protected]>
Subject: [PATCH v3] ddr: altera: soc64: Integer fix overflow that caused DDR size mismatched

From: Dinesh Maniyam <[email protected]>

Convert the constant integer to 'phys_size_t' to avoid overflow when calculating the SDRAM size.

---

v3->v2
- copyright year updated and alignment updated.

v2->v1
- add space in title

---
 drivers/ddr/altera/sdram_soc64.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ddr/altera/sdram_soc64.c +1 -2
index d6baac2410..9b1710c135 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2016-2021 Intel Corporation <www.intel.com>
+ * Copyright (C) 2016-2022 Intel Corporation <www.intel.com>
  *
  */
 
@@ -239,7 +239,8 @@ phys_size_t sdram_calculate_size(struct
 altera_sdram_plat *plat)  {
 	u32 dramaddrw = hmc_readl(plat, DRAMADDRW);
 
-	phys_size_t size = 1 <<

(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw) +

drivers/ddr/altera/sdram_soc64.c +3 -0
+	phys_size_t size = (phys_size_t)1 <<
+			(DRAMADDRW_CFG_CS_ADDR_WIDTH(dramaddrw)
+
Quoted 7 lines

DRAMADDRW_CFG_BANK_GRP_ADDR_WIDTH(dramaddrw) +

DRAMADDRW_CFG_BANK_ADDR_WIDTH(dramaddrw) +

DRAMADDRW_CFG_ROW_ADDR_WIDTH(dramaddrw) +
--
2.25.1

Regards
Tien Fong