* [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set()
@ 2012-07-05 14:28 Gerlando Falauto
2012-07-05 14:28 ` [U-Boot] [PATCH 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Gerlando Falauto @ 2012-07-05 14:28 UTC (permalink / raw)
To: u-boot
Some boards might be equipped with different SDRAM configurations.
When that is the case, CPU CS Window Size Register (CS[0]n Size) should
be set to the biggest value through board.cfg file; then its value
can be fixed at runtime according to the detected SDRAM size.
Therefore, implement kw_sdram_bs_set(), to be called for instance within
board_early_init_f().
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>
---
arch/arm/cpu/arm926ejs/kirkwood/dram.c | 23 +++++++++++++++++++++++
arch/arm/include/asm/arch-kirkwood/cpu.h | 2 ++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 181b3e7..d938578 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
@@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
#define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x * 0x08))
#define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x * 0x08))
+
+#define KW_REG_CPUCS_WIN_ENABLE (1 << 0)
+#define KW_REG_CPUCS_WIN_WR_PROTECT (1 << 1)
+#define KW_REG_CPUCS_WIN_WIN0_CS(x) (((x) & 0x3) << 2)
+#define KW_REG_CPUCS_WIN_SIZE(x) (((x) & 0xff) << 24)
+
/*
* kw_sdram_bar - reads SDRAM Base Address Register
*/
@@ -62,6 +68,23 @@ u32 kw_sdram_bs(enum memory_bank bank)
return result;
}
+/*
+ * kw_sdram_bs_set - writes SDRAM Bank size
+ */
+void kw_sdram_bs_set(enum memory_bank bank, u32 size)
+{
+ /* Read current register value */
+ u32 reg = readl(KW_REG_CPUCS_WIN_SZ(bank));
+
+ /* Clear window size */
+ reg &= ~KW_REG_CPUCS_WIN_SIZE(0xFF);
+
+ /* Set new window size */
+ reg |= KW_REG_CPUCS_WIN_SIZE((size - 1) >> 24);
+
+ writel(reg, KW_REG_CPUCS_WIN_SZ(bank));
+}
+
#ifndef CONFIG_SYS_BOARD_DRAM_INIT
int dram_init(void)
{
diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h
index d28c51a..807154e 100644
--- a/arch/arm/include/asm/arch-kirkwood/cpu.h
+++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
@@ -159,6 +159,8 @@ void reset_cpu(unsigned long ignored);
unsigned char get_random_hex(void);
unsigned int kw_sdram_bar(enum memory_bank bank);
unsigned int kw_sdram_bs(enum memory_bank bank);
+void kw_sdram_bs_set(enum memory_bank bank, u32 size);
+
int kw_config_adr_windows(void);
void kw_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val,
unsigned int gpp0_oe, unsigned int gpp1_oe);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 2/2] km_arm: enable SDRAM window size fixup
2012-07-05 14:28 [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Gerlando Falauto
@ 2012-07-05 14:28 ` Gerlando Falauto
2012-07-05 15:38 ` [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Marek Vasut
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Gerlando Falauto @ 2012-07-05 14:28 UTC (permalink / raw)
To: u-boot
Size of the SDRAM chips might differ between any two (otherwise
identical) instances of the same board.
So change board_early_init_f() to use km_sdram_bs_set(), in order to
fixup the window size register at runtime, according to the detected
SDRAM size.
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>
---
board/keymile/km_arm/km_arm.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index cb3402b..d531c08 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -241,10 +241,22 @@ int misc_init_r(void)
return 0;
}
+static void dram_size_fixup(void)
+{
+ u32 size;
+
+ /* probe currently equipped RAM size */
+ size = get_ram_size((void *)kw_sdram_bar(0), kw_sdram_bs(0));
+
+ /* fixup SDRAM window size accordingly */
+ kw_sdram_bs_set(0, size);
+}
+
int board_early_init_f(void)
{
u32 tmp;
+ dram_size_fixup();
kirkwood_mpp_conf(kwmpp_config, NULL);
/*
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-05 14:28 [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Gerlando Falauto
2012-07-05 14:28 ` [U-Boot] [PATCH 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
@ 2012-07-05 15:38 ` Marek Vasut
2012-07-05 15:44 ` Gerlando Falauto
2012-07-06 11:50 ` [U-Boot] [PATCH v2 " Gerlando Falauto
2012-07-06 11:50 ` [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
3 siblings, 1 reply; 12+ messages in thread
From: Marek Vasut @ 2012-07-05 15:38 UTC (permalink / raw)
To: u-boot
Dear Gerlando Falauto,
> Some boards might be equipped with different SDRAM configurations.
> When that is the case, CPU CS Window Size Register (CS[0]n Size) should
> be set to the biggest value through board.cfg file; then its value
> can be fixed at runtime according to the detected SDRAM size.
>
> Therefore, implement kw_sdram_bs_set(), to be called for instance within
> board_early_init_f().
>
[..]
> +/*
> + * kw_sdram_bs_set - writes SDRAM Bank size
> + */
> +void kw_sdram_bs_set(enum memory_bank bank, u32 size)
The enum is declared somewhere, right ?
[...]
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-05 15:38 ` [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Marek Vasut
@ 2012-07-05 15:44 ` Gerlando Falauto
2012-07-05 15:51 ` Marek Vasut
0 siblings, 1 reply; 12+ messages in thread
From: Gerlando Falauto @ 2012-07-05 15:44 UTC (permalink / raw)
To: u-boot
On 07/05/2012 05:38 PM, Marek Vasut wrote:
> Dear Gerlando Falauto,
>
>> Some boards might be equipped with different SDRAM configurations.
>> When that is the case, CPU CS Window Size Register (CS[0]n Size) should
>> be set to the biggest value through board.cfg file; then its value
>> can be fixed at runtime according to the detected SDRAM size.
>>
>> Therefore, implement kw_sdram_bs_set(), to be called for instance within
>> board_early_init_f().
>>
> [..]
>
>> +/*
>> + * kw_sdram_bs_set - writes SDRAM Bank size
>> + */
>> +void kw_sdram_bs_set(enum memory_bank bank, u32 size)
>
> The enum is declared somewhere, right ?
Yes, in arch/arm/include/asm/arch-kirkwood/cpu.h.
It's the same enum also used by other functions {declared, defined}
within the same {header, source} file, like:
u32 kw_sdram_bs(enum memory_bank bank)
Best regards,
Gerlando
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-05 15:44 ` Gerlando Falauto
@ 2012-07-05 15:51 ` Marek Vasut
0 siblings, 0 replies; 12+ messages in thread
From: Marek Vasut @ 2012-07-05 15:51 UTC (permalink / raw)
To: u-boot
Dear Gerlando Falauto,
> On 07/05/2012 05:38 PM, Marek Vasut wrote:
> > Dear Gerlando Falauto,
> >
> >> Some boards might be equipped with different SDRAM configurations.
> >> When that is the case, CPU CS Window Size Register (CS[0]n Size) should
> >> be set to the biggest value through board.cfg file; then its value
> >> can be fixed at runtime according to the detected SDRAM size.
> >>
> >> Therefore, implement kw_sdram_bs_set(), to be called for instance within
> >> board_early_init_f().
> >
> > [..]
> >
> >> +/*
> >> + * kw_sdram_bs_set - writes SDRAM Bank size
> >> + */
> >> +void kw_sdram_bs_set(enum memory_bank bank, u32 size)
> >
> > The enum is declared somewhere, right ?
>
> Yes, in arch/arm/include/asm/arch-kirkwood/cpu.h.
>
> It's the same enum also used by other functions {declared, defined}
> within the same {header, source} file, like:
>
> u32 kw_sdram_bs(enum memory_bank bank)
Good, add my
Reviewed-by: Marek Vasut <marex@denx.de>
>
> Best regards,
> Gerlando
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-05 14:28 [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Gerlando Falauto
2012-07-05 14:28 ` [U-Boot] [PATCH 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
2012-07-05 15:38 ` [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Marek Vasut
@ 2012-07-06 11:50 ` Gerlando Falauto
2012-07-06 15:41 ` Marek Vasut
2012-07-20 6:15 ` Prafulla Wadaskar
2012-07-06 11:50 ` [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
3 siblings, 2 replies; 12+ messages in thread
From: Gerlando Falauto @ 2012-07-06 11:50 UTC (permalink / raw)
To: u-boot
Some boards might be equipped with different SDRAM configurations.
When that is the case, CPU CS Window Size Register (CS[0]n Size) should
be set to the biggest value through board.cfg file; then its value
can be fixed at runtime according to the detected SDRAM size.
Therefore, implement kw_sdram_bs_set(), to be called for instance within
board_early_init_f().
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>
---
changes for v2:
added Reviewed-by: Marek Vasut <marex@denx.de>
arch/arm/cpu/arm926ejs/kirkwood/dram.c | 23 +++++++++++++++++++++++
arch/arm/include/asm/arch-kirkwood/cpu.h | 2 ++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 181b3e7..d938578 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
@@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
#define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x * 0x08))
#define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x * 0x08))
+
+#define KW_REG_CPUCS_WIN_ENABLE (1 << 0)
+#define KW_REG_CPUCS_WIN_WR_PROTECT (1 << 1)
+#define KW_REG_CPUCS_WIN_WIN0_CS(x) (((x) & 0x3) << 2)
+#define KW_REG_CPUCS_WIN_SIZE(x) (((x) & 0xff) << 24)
+
/*
* kw_sdram_bar - reads SDRAM Base Address Register
*/
@@ -62,6 +68,23 @@ u32 kw_sdram_bs(enum memory_bank bank)
return result;
}
+/*
+ * kw_sdram_bs_set - writes SDRAM Bank size
+ */
+void kw_sdram_bs_set(enum memory_bank bank, u32 size)
+{
+ /* Read current register value */
+ u32 reg = readl(KW_REG_CPUCS_WIN_SZ(bank));
+
+ /* Clear window size */
+ reg &= ~KW_REG_CPUCS_WIN_SIZE(0xFF);
+
+ /* Set new window size */
+ reg |= KW_REG_CPUCS_WIN_SIZE((size - 1) >> 24);
+
+ writel(reg, KW_REG_CPUCS_WIN_SZ(bank));
+}
+
#ifndef CONFIG_SYS_BOARD_DRAM_INIT
int dram_init(void)
{
diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h
index d28c51a..807154e 100644
--- a/arch/arm/include/asm/arch-kirkwood/cpu.h
+++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
@@ -159,6 +159,8 @@ void reset_cpu(unsigned long ignored);
unsigned char get_random_hex(void);
unsigned int kw_sdram_bar(enum memory_bank bank);
unsigned int kw_sdram_bs(enum memory_bank bank);
+void kw_sdram_bs_set(enum memory_bank bank, u32 size);
+
int kw_config_adr_windows(void);
void kw_config_gpio(unsigned int gpp0_oe_val, unsigned int gpp1_oe_val,
unsigned int gpp0_oe, unsigned int gpp1_oe);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup
2012-07-05 14:28 [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Gerlando Falauto
` (2 preceding siblings ...)
2012-07-06 11:50 ` [U-Boot] [PATCH v2 " Gerlando Falauto
@ 2012-07-06 11:50 ` Gerlando Falauto
2012-07-20 6:30 ` Prafulla Wadaskar
3 siblings, 1 reply; 12+ messages in thread
From: Gerlando Falauto @ 2012-07-06 11:50 UTC (permalink / raw)
To: u-boot
Size of the SDRAM chips might differ between any two (otherwise
identical) instances of the same board.
So change board_early_init_f() to use km_sdram_bs_set(), in order to
fixup the window size register at runtime, according to the detected
SDRAM size.
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
Cc: Holger Brunck <holger.brunck@keymile.com>
---
changes for v2:
- rebase to current u-boot-marvell.git master branch
board/keymile/km_arm/km_arm.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 2b2ca39..24cf6c7 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -241,6 +241,17 @@ int misc_init_r(void)
return 0;
}
+static void dram_size_fixup(void)
+{
+ u32 size;
+
+ /* probe currently equipped RAM size */
+ size = get_ram_size((void *)kw_sdram_bar(0), kw_sdram_bs(0));
+
+ /* fixup SDRAM window size accordingly */
+ kw_sdram_bs_set(0, size);
+}
+
int board_early_init_f(void)
{
#if defined(CONFIG_SOFT_I2C)
@@ -251,6 +262,7 @@ int board_early_init_f(void)
writel(tmp & (~KM_KIRKWOOD_SOFT_I2C_GPIOS) , KW_GPIO0_BASE + 4);
#endif
+ dram_size_fixup();
kirkwood_mpp_conf(kwmpp_config, NULL);
return 0;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-06 11:50 ` [U-Boot] [PATCH v2 " Gerlando Falauto
@ 2012-07-06 15:41 ` Marek Vasut
2012-07-20 6:15 ` Prafulla Wadaskar
1 sibling, 0 replies; 12+ messages in thread
From: Marek Vasut @ 2012-07-06 15:41 UTC (permalink / raw)
To: u-boot
Dear Gerlando Falauto,
> Some boards might be equipped with different SDRAM configurations.
> When that is the case, CPU CS Window Size Register (CS[0]n Size) should
> be set to the biggest value through board.cfg file; then its value
> can be fixed at runtime according to the detected SDRAM size.
>
> Therefore, implement kw_sdram_bs_set(), to be called for instance within
> board_early_init_f().
>
> Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
> Reviewed-by: Marek Vasut <marex@denx.de>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> Cc: Holger Brunck <holger.brunck@keymile.com>
> ---
> changes for v2:
> added Reviewed-by: Marek Vasut <marex@denx.de>
[...]
You don't have to resend it, patchwork does this additions for us :)
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-06 11:50 ` [U-Boot] [PATCH v2 " Gerlando Falauto
2012-07-06 15:41 ` Marek Vasut
@ 2012-07-20 6:15 ` Prafulla Wadaskar
2012-07-20 11:40 ` Marek Vasut
1 sibling, 1 reply; 12+ messages in thread
From: Prafulla Wadaskar @ 2012-07-20 6:15 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Gerlando Falauto [mailto:gerlando.falauto at keymile.com]
> Sent: 06 July 2012 17:20
> To: u-boot at lists.denx.de
> Cc: Gerlando Falauto; Prafulla Wadaskar; Wolfgang Denk; Valentin
> Longchamp; Holger Brunck
> Subject: [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
>
> Some boards might be equipped with different SDRAM configurations.
> When that is the case, CPU CS Window Size Register (CS[0]n Size)
> should
> be set to the biggest value through board.cfg file; then its value
> can be fixed at runtime according to the detected SDRAM size.
>
> Therefore, implement kw_sdram_bs_set(), to be called for instance
> within
> board_early_init_f().
>
> Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
> Reviewed-by: Marek Vasut <marex@denx.de>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> Cc: Holger Brunck <holger.brunck@keymile.com>
> ---
> changes for v2:
> added Reviewed-by: Marek Vasut <marex@denx.de>
>
> arch/arm/cpu/arm926ejs/kirkwood/dram.c | 23
> +++++++++++++++++++++++
> arch/arm/include/asm/arch-kirkwood/cpu.h | 2 ++
> 2 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> index 181b3e7..d938578 100644
> --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> @@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
>
> #define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x *
> 0x08))
> #define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x *
> 0x08))
Hi Gerlando
I have a full ack for this patch.
But I would like to ask you-
Since dram.c is going through this change and macros are being used in stead of c-struct for DRAM register variables.
This is being one of the todo item pending from long time.
Would you like to convert macros to c-struct definition in this file?
> +
> +#define KW_REG_CPUCS_WIN_ENABLE (1 << 0)
> +#define KW_REG_CPUCS_WIN_WR_PROTECT (1 << 1)
> +#define KW_REG_CPUCS_WIN_WIN0_CS(x) (((x) & 0x3) << 2)
> +#define KW_REG_CPUCS_WIN_SIZE(x) (((x) & 0xff) << 24)
> +
> /*
> * kw_sdram_bar - reads SDRAM Base Address Register
> */
> @@ -62,6 +68,23 @@ u32 kw_sdram_bs(enum memory_bank bank)
> return result;
> }
>
> +/*
> + * kw_sdram_bs_set - writes SDRAM Bank size
> + */
> +void kw_sdram_bs_set(enum memory_bank bank, u32 size)
> +{
> + /* Read current register value */
> + u32 reg = readl(KW_REG_CPUCS_WIN_SZ(bank));
> +
> + /* Clear window size */
> + reg &= ~KW_REG_CPUCS_WIN_SIZE(0xFF);
> +
> + /* Set new window size */
> + reg |= KW_REG_CPUCS_WIN_SIZE((size - 1) >> 24);
> +
> + writel(reg, KW_REG_CPUCS_WIN_SZ(bank));
> +}
> +
> #ifndef CONFIG_SYS_BOARD_DRAM_INIT
> int dram_init(void)
> {
> diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h
> b/arch/arm/include/asm/arch-kirkwood/cpu.h
> index d28c51a..807154e 100644
> --- a/arch/arm/include/asm/arch-kirkwood/cpu.h
> +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
> @@ -159,6 +159,8 @@ void reset_cpu(unsigned long ignored);
> unsigned char get_random_hex(void);
> unsigned int kw_sdram_bar(enum memory_bank bank);
> unsigned int kw_sdram_bs(enum memory_bank bank);
> +void kw_sdram_bs_set(enum memory_bank bank, u32 size);
> +
Please remove this additional line
> int kw_config_adr_windows(void);
> void kw_config_gpio(unsigned int gpp0_oe_val, unsigned int
> gpp1_oe_val,
> unsigned int gpp0_oe, unsigned int gpp1_oe);
> --
Regards...
Prafulla . . .
> 1.7.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup
2012-07-06 11:50 ` [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
@ 2012-07-20 6:30 ` Prafulla Wadaskar
0 siblings, 0 replies; 12+ messages in thread
From: Prafulla Wadaskar @ 2012-07-20 6:30 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Gerlando Falauto
> Sent: 06 July 2012 17:20
> To: u-boot at lists.denx.de
> Cc: Valentin Longchamp; Holger Brunck; Gerlando Falauto
> Subject: [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size
> fixup
>
> Size of the SDRAM chips might differ between any two (otherwise
> identical) instances of the same board.
>
> So change board_early_init_f() to use km_sdram_bs_set(), in order to
> fixup the window size register at runtime, according to the detected
> SDRAM size.
>
> Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
> Cc: Valentin Longchamp <valentin.longchamp@keymile.com>
> Cc: Holger Brunck <holger.brunck@keymile.com>
> ---
> changes for v2:
> - rebase to current u-boot-marvell.git master branch
>
> board/keymile/km_arm/km_arm.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/board/keymile/km_arm/km_arm.c
> b/board/keymile/km_arm/km_arm.c
> index 2b2ca39..24cf6c7 100644
> --- a/board/keymile/km_arm/km_arm.c
> +++ b/board/keymile/km_arm/km_arm.c
> @@ -241,6 +241,17 @@ int misc_init_r(void)
> return 0;
> }
>
> +static void dram_size_fixup(void)
The name "fixup" doesn't sound good.
> +{
> + u32 size;
> +
> + /* probe currently equipped RAM size */
> + size = get_ram_size((void *)kw_sdram_bar(0), kw_sdram_bs(0));
> +
> + /* fixup SDRAM window size accordingly */
> + kw_sdram_bs_set(0, size);
> +}
> +
This is useful API for other boards too.
I would like to suggest to add this change in dram_init(), the window size can be corrected right after sdram size detection. And that will be applicable for all supported bank.
So may you please push in to dram.c?
Regards...
Prafulla . . .
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-20 6:15 ` Prafulla Wadaskar
@ 2012-07-20 11:40 ` Marek Vasut
2012-07-20 12:30 ` Holger Brunck
0 siblings, 1 reply; 12+ messages in thread
From: Marek Vasut @ 2012-07-20 11:40 UTC (permalink / raw)
To: u-boot
Dear Prafulla Wadaskar,
[...]
> > diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> > b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> > index 181b3e7..d938578 100644
> > --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> > +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
> > @@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
> >
> > #define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x *
> >
> > 0x08))
> >
> > #define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x *
> >
> > 0x08))
>
> Hi Gerlando
> I have a full ack for this patch.
> But I would like to ask you-
> Since dram.c is going through this change and macros are being used in
> stead of c-struct for DRAM register variables. This is being one of the
> todo item pending from long time.
>
> Would you like to convert macros to c-struct definition in this file?
Certainly, but let's get this applied first.
[...]
> > diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h
> > b/arch/arm/include/asm/arch-kirkwood/cpu.h
> > index d28c51a..807154e 100644
> > --- a/arch/arm/include/asm/arch-kirkwood/cpu.h
> > +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
> > @@ -159,6 +159,8 @@ void reset_cpu(unsigned long ignored);
> >
> > unsigned char get_random_hex(void);
> > unsigned int kw_sdram_bar(enum memory_bank bank);
> > unsigned int kw_sdram_bs(enum memory_bank bank);
> >
> > +void kw_sdram_bs_set(enum memory_bank bank, u32 size);
> > +
>
> Please remove this additional line
Well, maybe you can remove it in the application process since it's really one
small thing?
> > int kw_config_adr_windows(void);
> > void kw_config_gpio(unsigned int gpp0_oe_val, unsigned int
> >
> > gpp1_oe_val,
> >
> > unsigned int gpp0_oe, unsigned int gpp1_oe);
> >
> > --
>
> Regards...
> Prafulla . . .
>
> > 1.7.1
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 12+ messages in thread
* [U-Boot] [PATCH v2 1/2] kirkwood: implement kw_sdram_bs_set()
2012-07-20 11:40 ` Marek Vasut
@ 2012-07-20 12:30 ` Holger Brunck
0 siblings, 0 replies; 12+ messages in thread
From: Holger Brunck @ 2012-07-20 12:30 UTC (permalink / raw)
To: u-boot
Hi Marek, hi Prafulla,
On 07/20/2012 01:40 PM, Marek Vasut wrote:
> Dear Prafulla Wadaskar,
>
> [...]
>
>>> diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
>>> b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
>>> index 181b3e7..d938578 100644
>>> --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
>>> +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
>>> @@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
>>>
>>> #define KW_REG_CPUCS_WIN_BAR(x) (KW_REGISTER(0x1500) + (x *
>>>
>>> 0x08))
>>>
>>> #define KW_REG_CPUCS_WIN_SZ(x) (KW_REGISTER(0x1504) + (x *
>>>
>>> 0x08))
>>
>> Hi Gerlando
>> I have a full ack for this patch.
>> But I would like to ask you-
>> Since dram.c is going through this change and macros are being used in
>> stead of c-struct for DRAM register variables. This is being one of the
>> todo item pending from long time.
>>
>> Would you like to convert macros to c-struct definition in this file?
>
> Certainly, but let's get this applied first.
>
> [...]
>
I have done a v3 version of this patchserie with Prafullas inputs. Gerlando is
not in these days.
I'll send the updates soon... I have already tested them on km_kirkwood.
Regards
Holger
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-07-20 12:30 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-05 14:28 [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Gerlando Falauto
2012-07-05 14:28 ` [U-Boot] [PATCH 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
2012-07-05 15:38 ` [U-Boot] [PATCH 1/2] kirkwood: implement kw_sdram_bs_set() Marek Vasut
2012-07-05 15:44 ` Gerlando Falauto
2012-07-05 15:51 ` Marek Vasut
2012-07-06 11:50 ` [U-Boot] [PATCH v2 " Gerlando Falauto
2012-07-06 15:41 ` Marek Vasut
2012-07-20 6:15 ` Prafulla Wadaskar
2012-07-20 11:40 ` Marek Vasut
2012-07-20 12:30 ` Holger Brunck
2012-07-06 11:50 ` [U-Boot] [PATCH v2 2/2] km_arm: enable SDRAM window size fixup Gerlando Falauto
2012-07-20 6:30 ` Prafulla Wadaskar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.