Patchwork [U-Boot,v2] at91sam9x5ek: Pass serial and revision tags to Linux

login
register
mail settings
Submitter Julius Hemanth P
Date May 3, 2013, 10:54 a.m.
Message ID <CAFHsove+2GfS39EpnjMjae8tYbmANXn1MLDe5sLcOSDsT2qJ8g@mail.gmail.com>
Download mbox | patch
Permalink /patch/241270/
State Changes Requested
Delegated to: Andreas BieƟmann
Headers show

Comments

Julius Hemanth P - May 3, 2013, 10:54 a.m.
This code is small snippet from patch
ftp://ftp.linux4sam.org/pub/uboot/u-boot-v2010.06/u-boot-5series_1.0.patch

Bug:-
 For board at91sam9x5ek, U-boot doesn't pass serial and revision tags
to Linux kernel, hence kernel fails to identify correct revision and assumes
as rev-A, resulting in failing to detect NAND device.

This patch enables u-boot to pass serial and revision tags to Linux
kernel, which helps Linux to detect NAND device.

Signed-off-by: Julius Hemanth <juliushemanth@gmail.com>
---
Changes for v2:
        - access GPBR using c structure
        - removed tailing 1 for #define
        - s/Miscelaneous/Miscellaneous
        - s/initialisations/initializations

 board/atmel/at91sam9x5ek/at91sam9x5ek.c |   33 ++++++++++++++++++++++++++++++-
 include/configs/at91sam9x5ek.h          |    5 ++++
 2 files changed, 37 insertions(+), 1 deletions(-)

--
1.7.0.4
Bo Shen - May 9, 2013, 3:18 a.m.
Hi Julius,

On 5/3/2013 18:54, Julius Hemanth P wrote:
> This code is small snippet from patch
> ftp://ftp.linux4sam.org/pub/uboot/u-boot-v2010.06/u-boot-5series_1.0.patch
>
> Bug:-

I think this should not report bug, it should for compatible with old 
kernel (only for Linux 2.6.39 released on www.at91.com/linux4sam).

>   For board at91sam9x5ek, U-boot doesn't pass serial and revision tags
> to Linux kernel, hence kernel fails to identify correct revision and assumes
> as rev-A, resulting in failing to detect NAND device.
>
> This patch enables u-boot to pass serial and revision tags to Linux
> kernel, which helps Linux to detect NAND device.
>
> Signed-off-by: Julius Hemanth <juliushemanth@gmail.com>
> ---
> Changes for v2:
>          - access GPBR using c structure
>          - removed tailing 1 for #define
>          - s/Miscelaneous/Miscellaneous
>          - s/initialisations/initializations
>
>   board/atmel/at91sam9x5ek/at91sam9x5ek.c |   33 ++++++++++++++++++++++++++++++-
>   include/configs/at91sam9x5ek.h          |    5 ++++
>   2 files changed, 37 insertions(+), 1 deletions(-)

This patch can not be applied based on u-boot master branch or else on 
u-boot-atmel master branch.

Please re-generate this patch based on u-boot master branch or 
u-boot-atmel master branch.

> diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> index 8773e6f..c05bdb7 100644
> --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
> @@ -27,6 +27,7 @@
>   #include <asm/arch/at91_common.h>
>   #include <asm/arch/at91_pmc.h>
>   #include <asm/arch/at91_rstc.h>
> +#include <asm/arch/at91_gpbr.h>
>   #include <asm/arch/gpio.h>
>   #include <asm/arch/clk.h>
>   #include <lcd.h>
> @@ -48,8 +49,34 @@ DECLARE_GLOBAL_DATA_PTR;
>
>   /* ------------------------------------------------------------------------- */
>   /*
> - * Miscelaneous platform dependent initialisations
> + * Miscellaneous platform dependent initializations
>    */
> +
> +#ifdef CONFIG_LOAD_ONE_WIRE_INFO
> +static u32 system_rev;
> +static u32 system_serial_low;
> +
> +u32 get_board_rev(void)
> +{
> +       return system_rev;
> +}
> +
> +void get_board_serial(struct tag_serialnr *serialnr)
> +{
> +       serialnr->high = 0; /* Not used */
> +       serialnr->low = system_serial_low;
> +}
> +
> +void load_1wire_info(void)
> +{
> +       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
> +
> +       /* serial is in GPBR #2 and revision is in GPBR #3 */
> +       system_serial_low = readl(gpbr->reg[2]);
> +       system_rev = readl(gpbr->reg[3]);
> +}

This is wrong which will cause u-boot hang up. It should be:

system_serial_low = readl(&gpbr->reg[2]);
system_rev = readl(&gpbr->reg[3]);

Best Regards,
Bo Shen
Julius Hemanth P - May 9, 2013, 7:02 a.m.
Thanks Bo, will send updated patch with all corrections.

Regards,
Julius Hemanth P
On May 9, 2013 8:49 AM, "Bo Shen" <voice.shen@atmel.com> wrote:

> Hi Julius,
>
> On 5/3/2013 18:54, Julius Hemanth P wrote:
>
>> This code is small snippet from patch
>> ftp://ftp.linux4sam.org/pub/**uboot/u-boot-v2010.06/u-boot-**
>> 5series_1.0.patch<ftp://ftp.linux4sam.org/pub/uboot/u-boot-v2010.06/u-boot-5series_1.0.patch>
>>
>> Bug:-
>>
>
> I think this should not report bug, it should for compatible with old
> kernel (only for Linux 2.6.39 released on www.at91.com/linux4sam).
>
>    For board at91sam9x5ek, U-boot doesn't pass serial and revision tags
>> to Linux kernel, hence kernel fails to identify correct revision and
>> assumes
>> as rev-A, resulting in failing to detect NAND device.
>>
>> This patch enables u-boot to pass serial and revision tags to Linux
>> kernel, which helps Linux to detect NAND device.
>>
>> Signed-off-by: Julius Hemanth <juliushemanth@gmail.com>
>> ---
>> Changes for v2:
>>          - access GPBR using c structure
>>          - removed tailing 1 for #define
>>          - s/Miscelaneous/Miscellaneous
>>          - s/initialisations/**initializations
>>
>>   board/atmel/at91sam9x5ek/**at91sam9x5ek.c |   33
>> ++++++++++++++++++++++++++++++**-
>>   include/configs/at91sam9x5ek.h          |    5 ++++
>>   2 files changed, 37 insertions(+), 1 deletions(-)
>>
>
> This patch can not be applied based on u-boot master branch or else on
> u-boot-atmel master branch.
>
> Please re-generate this patch based on u-boot master branch or
> u-boot-atmel master branch.
>
>  diff --git a/board/atmel/at91sam9x5ek/**at91sam9x5ek.c
>> b/board/atmel/at91sam9x5ek/**at91sam9x5ek.c
>> index 8773e6f..c05bdb7 100644
>> --- a/board/atmel/at91sam9x5ek/**at91sam9x5ek.c
>> +++ b/board/atmel/at91sam9x5ek/**at91sam9x5ek.c
>> @@ -27,6 +27,7 @@
>>   #include <asm/arch/at91_common.h>
>>   #include <asm/arch/at91_pmc.h>
>>   #include <asm/arch/at91_rstc.h>
>> +#include <asm/arch/at91_gpbr.h>
>>   #include <asm/arch/gpio.h>
>>   #include <asm/arch/clk.h>
>>   #include <lcd.h>
>> @@ -48,8 +49,34 @@ DECLARE_GLOBAL_DATA_PTR;
>>
>>   /* ------------------------------**------------------------------**-------------
>> */
>>   /*
>> - * Miscelaneous platform dependent initialisations
>> + * Miscellaneous platform dependent initializations
>>    */
>> +
>> +#ifdef CONFIG_LOAD_ONE_WIRE_INFO
>> +static u32 system_rev;
>> +static u32 system_serial_low;
>> +
>> +u32 get_board_rev(void)
>> +{
>> +       return system_rev;
>> +}
>> +
>> +void get_board_serial(struct tag_serialnr *serialnr)
>> +{
>> +       serialnr->high = 0; /* Not used */
>> +       serialnr->low = system_serial_low;
>> +}
>> +
>> +void load_1wire_info(void)
>> +{
>> +       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
>> +
>> +       /* serial is in GPBR #2 and revision is in GPBR #3 */
>> +       system_serial_low = readl(gpbr->reg[2]);
>> +       system_rev = readl(gpbr->reg[3]);
>> +}
>>
>
> This is wrong which will cause u-boot hang up. It should be:
>
> system_serial_low = readl(&gpbr->reg[2]);
> system_rev = readl(&gpbr->reg[3]);
>
> Best Regards,
> Bo Shen
>

Patch

diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index 8773e6f..c05bdb7 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -27,6 +27,7 @@ 
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
+#include <asm/arch/at91_gpbr.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
@@ -48,8 +49,34 @@  DECLARE_GLOBAL_DATA_PTR;

 /* ------------------------------------------------------------------------- */
 /*
- * Miscelaneous platform dependent initialisations
+ * Miscellaneous platform dependent initializations
  */
+
+#ifdef CONFIG_LOAD_ONE_WIRE_INFO
+static u32 system_rev;
+static u32 system_serial_low;
+
+u32 get_board_rev(void)
+{
+       return system_rev;
+}
+
+void get_board_serial(struct tag_serialnr *serialnr)
+{
+       serialnr->high = 0; /* Not used */
+       serialnr->low = system_serial_low;
+}
+
+void load_1wire_info(void)
+{
+       at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR;
+
+       /* serial is in GPBR #2 and revision is in GPBR #3 */
+       system_serial_low = readl(gpbr->reg[2]);
+       system_rev = readl(gpbr->reg[3]);
+}
+#endif
+
 #ifdef CONFIG_CMD_NAND
 static void at91sam9x5ek_nand_hw_init(void)
 {
@@ -282,6 +309,10 @@  int board_init(void)
        /* adress of boot parameters */
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

+#ifdef CONFIG_LOAD_ONE_WIRE_INFO
+       load_1wire_info();
+#endif
+
 #ifdef CONFIG_CMD_NAND
        at91sam9x5ek_nand_hw_init();
 #endif
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index ee6e3fc..995e43b 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -38,6 +38,11 @@ 
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
+
+#define CONFIG_LOAD_ONE_WIRE_INFO
+#define CONFIG_REVISION_TAG
+#define CONFIG_SERIAL_TAG
+
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_DISPLAY_CPUINFO