March 2008 - U-Boot

[U-Boot-Users] [PATCH] Add CFG_RTC_DS1337_NOOSC to turn off OSC output
by Joakim Tjernlund 26 Mar '08

26 Mar '08

The default settings for RTC DS1337 keeps the OSC output, 32,768 Hz, on. This add CFG_RTC_DS1337_NOOSC to turn it off. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund(a)transmode.se> --- I don't want the square wave as it drains the battery needlessly so I made it configurable. README | 1 + drivers/rtc/ds1337.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README b/README index 491397a..9a55d35 100644 --- a/README +++ b/README @@ -670,6 +670,7 @@ The following options need to be configured: CONFIG_RTC_DS1338 - use Maxim, Inc. DS1338 RTC CONFIG_RTC_DS164x - use Dallas DS164x RTC CONFIG_RTC_MAX6900 - use Maxim, Inc. MAX6900 RTC + CFG_RTC_DS1337_NOOSC - Turn off the OSC output for DS1337 Note that if the RTC uses I2C, then the I2C interface must also be configured. See I2C Support, below. diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c index c636ac5..56268e9 100644 --- a/drivers/rtc/ds1337.c +++ b/drivers/rtc/ds1337.c @@ -154,11 +154,18 @@ void rtc_set (struct rtc_time *tmp) * SQW/INTB* pin and program it for 32,768 Hz output. Note that * according to the datasheet, turning on the square wave output * increases the current drain on the backup battery from about - * 600 nA to 2uA. + * 600 nA to 2uA. Define CFG_RTC_DS1337_NOOSC if you wish to turn + * off the OSC output. */ +#ifdef CFG_RTC_DS1337_NOOSC + #define RTC_DS1337_RESET_VAL \ + (RTC_CTL_BIT_INTCN | RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2) +#else + #define RTC_DS1337_RESET_VAL (RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2) +#endif void rtc_reset (void) { - rtc_write (RTC_CTL_REG_ADDR, RTC_CTL_BIT_RS1 | RTC_CTL_BIT_RS2); + rtc_write (RTC_CTL_REG_ADDR, RTC_DS1337_RESET_VAL); } -- 1.5.4.3

2 1

[U-Boot-Users] Pull request: u-boot-testing new-image
by Bartlomiej Sieka 26 Mar '08

26 Mar '08

Dear Wolfgang, Support for the new uImage format is available in the git repository at: git://www.denx.de/git/u-boot-testing.git new-image The branch contains all patches related to the new uImage development that have been posted to the list. Regards, Bartlomiej

3 5

[U-Boot-Users] [PATCH] 85xx: Add cpu_mp_lmb_reserve helper to reserve boot page
by Kumar Gala 26 Mar '08

26 Mar '08

Provide a board_lmb_reserve helper function to ensure we reserve the page of memory we are using for the boot page translation code. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/mpc85xx/mp.c | 14 ++++++++++++++ cpu/mpc85xx/mp.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index d3727b0..7b10fba 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -23,6 +23,7 @@ #include <common.h> #include <asm/processor.h> #include <ioports.h> +#include <lmb.h> #include <asm/io.h> #include "mp.h" @@ -177,6 +178,19 @@ static void pq3_mp_up(unsigned long bootpg) out_be32(&gur->devdisr, devdisr); } +void cpu_mp_lmb_reserve(struct lmb *lmb) +{ + u32 bootpg; + + /* if we have 4G or more of memory, put the boot page at 4Gb-4k */ + if ((u64)gd->ram_size > 0xfffff000) + bootpg = 0xfffff000; + else + bootpg = gd->ram_size - 4096; + + lmb_reserve(lmb, bootpg, 4096); +} + void setup_mp(void) { extern ulong __secondary_start_page; diff --git a/cpu/mpc85xx/mp.h b/cpu/mpc85xx/mp.h index b762ee2..4329286 100644 --- a/cpu/mpc85xx/mp.h +++ b/cpu/mpc85xx/mp.h @@ -4,6 +4,7 @@ ulong get_spin_addr(void); void setup_mp(void); u32 get_my_id(void); +void cpu_mp_lmb_reserve(struct lmb *lmb); #define BOOT_ENTRY_ADDR_UPPER 0 #define BOOT_ENTRY_ADDR_LOWER 1 -- 1.5.4.1

1 0

[U-Boot-Users] Booting vxworks image from U-boot
by Zvika Vered 26 Mar '08

26 Mar '08

Hello, Is it possible to boot a vxworks ELF image using 'bootvx' ? I downloaded a vxworks 6.3 ELF image using 'tftpboot' and launched 'vxboot'. U-boot crashed. The vxworks ELF image is OK. When I download it using JTAG after reset it works. What is the best way to boot vxworks ELF image from U-boot 1.3.2 prompt ? Thanks, Zvika Vered IAI \ ELTA

2 1

[U-Boot-Users] [PATCH v2] 85xx: Update multicore boot mechanism to ePAPR v0.81 spec
by Kumar Gala 26 Mar '08

26 Mar '08

The following changes are needed to be inline with ePAPR v0.81: * r4, r5 and now always set to 0 on boot release * r7 is used to pass the size of the initial map area (IMA) * EPAPR_MAGIC value changed for book-e processors * changes in the spin table layout * spin table supports a 64-bit physical release address Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- Fix how we were setting r7/size info. common/cmd_mp.c | 15 ++---- cpu/mpc85xx/fdt.c | 2 +- cpu/mpc85xx/mp.c | 44 ++++++++++-------- cpu/mpc85xx/mp.h | 11 ++++ cpu/mpc85xx/release.S | 122 +++++++++++++++++++++++++++++++------------------ include/common.h | 2 +- 6 files changed, 122 insertions(+), 74 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index d96e6a3..26a57c5 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -26,7 +26,7 @@ int cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - unsigned long cpuid, val = 0; + unsigned long cpuid; if (argc < 3) { printf ("Usage:\n%s\n", cmdtp->usage); @@ -59,9 +59,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } - val = simple_strtoul(argv[3], NULL, 16); - - if (cpu_release(cpuid, val, argc - 4, argv + 4)) { + if (cpu_release(cpuid, argc - 3, argv + 3)) { printf ("Usage:\n%s\n", cmdtp->usage); return 1; } @@ -71,17 +69,16 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifdef CONFIG_PPC #define CPU_ARCH_HELP \ - " [args] : <pir> <r3> <r4> <r6> <r7>\n" \ + " [args] : <pir> <r3> <r6>\n" \ " pir - processor id (if writeable)\n" \ " r3 - value for gpr 3\n" \ - " r4 - value for gpr 4\n" \ " r6 - value for gpr 6\n" \ - " r7 - value for gpr 7\n" \ "\n" \ " Use '-' for any arg if you want the default value.\n" \ - " Default for r3, r4, r7 is 0, r6 is 0x65504150\n" \ + " Default for r3 is <num> and r6 is 0\n" \ "\n" \ - " When cpu <num> is released r5 = 0 per the ePAPR spec.\n" + " When cpu <num> is released r4 and r5 = 0.\n" \ + " r7 will contain the size of the initial mapped area\n" #endif U_BOOT_CMD( diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c index 43df1c7..bde6d1e 100644 --- a/cpu/mpc85xx/fdt.c +++ b/cpu/mpc85xx/fdt.c @@ -52,7 +52,7 @@ void ft_fixup_cpu(void *blob, u64 memory_limit) if (*reg == id) { fdt_setprop_string(blob, off, "status", "okay"); } else { - u32 val = *reg * 24 + spin_tbl_addr; + u32 val = *reg * SIZE_BOOT_ENTRY + spin_tbl_addr; val = cpu_to_fdt32(val); fdt_setprop_string(blob, off, "status", "disabled"); diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index aa91cea..d3727b0 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -28,14 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define BOOT_ENTRY_ADDR 0 -#define BOOT_ENTRY_PIR 1 -#define BOOT_ENTRY_R3 2 -#define BOOT_ENTRY_R4 3 -#define BOOT_ENTRY_R6 4 -#define BOOT_ENTRY_R7 5 -#define NUM_BOOT_ENTRY 6 - u32 get_my_id() { return mfspr(SPRN_PIR); @@ -63,40 +55,54 @@ int cpu_status(int nr) printf("Running on cpu %d\n", id); printf("\n"); printf("table @ 0x%08x:\n", table); - printf(" addr - 0x%08x\n", table[BOOT_ENTRY_ADDR]); + printf(" addr - 0x%08x\n", table[BOOT_ENTRY_ADDR_LOWER]); printf(" pir - 0x%08x\n", table[BOOT_ENTRY_PIR]); - printf(" r3 - 0x%08x\n", table[BOOT_ENTRY_R3]); - printf(" r4 - 0x%08x\n", table[BOOT_ENTRY_R4]); - printf(" r6 - 0x%08x\n", table[BOOT_ENTRY_R6]); - printf(" r7 - 0x%08x\n", table[BOOT_ENTRY_R7]); + printf(" r3 - 0x%08x\n", table[BOOT_ENTRY_R3_LOWER]); + printf(" r6 - 0x%08x\n", table[BOOT_ENTRY_R6_LOWER]); } return 0; } -int cpu_release(int nr, unsigned long boot_addr, int argc, char *argv[]) +static u8 boot_entry_map[4] = { + 0, + BOOT_ENTRY_PIR, + BOOT_ENTRY_R3_LOWER, + BOOT_ENTRY_R6_LOWER, +}; + +int cpu_release(int nr, int argc, char *argv[]) { u32 i, val, *table = (u32 *)get_spin_addr() + nr * NUM_BOOT_ENTRY; + u64 boot_addr; if (nr == get_my_id()) { printf("Invalid to release the boot core.\n\n"); return 1; } - if (argc != 5) { + if (argc != 4) { printf("Invalid number of arguments to release.\n\n"); return 1; } - /* handle pir, r3, r4, r6, r7 */ - for (i = 0; i < 5; i++) { +#ifdef CFG_64BIT_STRTOUL + boot_addr = simple_strtoull(argv[0], NULL, 16); +#else + boot_addr = simple_strtoul(argv[0], NULL, 16); +#endif + + /* handle pir, r3, r6 */ + for (i = 1; i < 4; i++) { if (argv[i][0] != '-') { + u8 entry = boot_entry_map[i]; val = simple_strtoul(argv[i], NULL, 16); - table[i+BOOT_ENTRY_PIR] = val; + table[entry] = val; } } - table[BOOT_ENTRY_ADDR] = boot_addr; + table[BOOT_ENTRY_ADDR_UPPER] = (u32)(boot_addr >> 32); + table[BOOT_ENTRY_ADDR_LOWER] = (u32)(boot_addr & 0xffffffff); return 0; } diff --git a/cpu/mpc85xx/mp.h b/cpu/mpc85xx/mp.h index d9fbb82..b762ee2 100644 --- a/cpu/mpc85xx/mp.h +++ b/cpu/mpc85xx/mp.h @@ -5,4 +5,15 @@ ulong get_spin_addr(void); void setup_mp(void); u32 get_my_id(void); +#define BOOT_ENTRY_ADDR_UPPER 0 +#define BOOT_ENTRY_ADDR_LOWER 1 +#define BOOT_ENTRY_R3_UPPER 2 +#define BOOT_ENTRY_R3_LOWER 3 +#define BOOT_ENTRY_RESV 4 +#define BOOT_ENTRY_PIR 5 +#define BOOT_ENTRY_R6_UPPER 6 +#define BOOT_ENTRY_R6_LOWER 7 +#define NUM_BOOT_ENTRY 8 +#define SIZE_BOOT_ENTRY (NUM_BOOT_ENTRY * sizeof(u32)) + #endif diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S index fe1775c..3b7366f 100644 --- a/cpu/mpc85xx/release.S +++ b/cpu/mpc85xx/release.S @@ -57,61 +57,91 @@ __secondary_start_page: lis r3,toreset(__spin_table)@h ori r3,r3,toreset(__spin_table)@l - /* r9 has the base address for the entry */ + /* r10 has the base address for the entry */ mfspr r0,SPRN_PIR mr r4,r0 - slwi r8,r4,4 - slwi r9,r4,3 - add r8,r8,r9 - add r9,r3,r8 - -#define EPAPR_MAGIC (0x65504150) -#define ENTRY_ADDR 0 -#define ENTRY_PIR 4 -#define ENTRY_R3 8 -#define ENTRY_R4 12 -#define ENTRY_R6 16 -#define ENTRY_R7 20 + slwi r8,r4,5 + add r10,r3,r8 + +#define EPAPR_MAGIC (0x45504150) +#define ENTRY_ADDR_UPPER 0 +#define ENTRY_ADDR_LOWER 4 +#define ENTRY_R3_UPPER 8 +#define ENTRY_R3_LOWER 12 +#define ENTRY_RESV 16 +#define ENTRY_PIR 20 +#define ENTRY_R6_UPPER 24 +#define ENTRY_R6_LOWER 28 +#define ENTRY_SIZE 32 /* setup the entry */ - li r4,0 + li r3,0 li r8,1 - lis r6,EPAPR_MAGIC@h - ori r6,r6,EPAPR_MAGIC@l - stw r0,ENTRY_PIR(r9) - stw r8,ENTRY_ADDR(r9) - stw r4,ENTRY_R3(r9) - stw r4,ENTRY_R4(r9) - stw r6,ENTRY_R6(r9) - stw r4,ENTRY_R7(r9) + stw r0,ENTRY_PIR(r10) + stw r3,ENTRY_ADDR_UPPER(r10) + stw r8,ENTRY_ADDR_LOWER(r10) + stw r3,ENTRY_R3_UPPER(r10) + stw r4,ENTRY_R3_LOWER(r10) + stw r3,ENTRY_R6_UPPER(r10) + stw r3,ENTRY_R6_LOWER(r10) + + /* setup mapping for AS = 1, and jump there */ + lis r11,(MAS0_TLBSEL(1)|MAS0_ESEL(1))@h + mtspr SPRN_MAS0,r11 + lis r11,(MAS1_VALID|MAS1_IPROT)@h + ori r11,r11,(MAS1_TS|MAS1_TSIZE(BOOKE_PAGESZ_4K))@l + mtspr SPRN_MAS1,r11 + lis r11,(0xfffff000|MAS2_I)@h + ori r11,r11,(0xfffff000|MAS2_I)@l + mtspr SPRN_MAS2,r11 + lis r11,(0xfffff000|MAS3_SX|MAS3_SW|MAS3_SR)@h + ori r11,r11,(0xfffff000|MAS3_SX|MAS3_SW|MAS3_SR)@l + mtspr SPRN_MAS3,r11 + tlbwe + + bl 1f +1: mflr r11 + addi r11,r11,28 + mfmsr r13 + ori r12,r13,MSR_IS|MSR_DS@l + + mtspr SPRN_SRR0,r11 + mtspr SPRN_SRR1,r12 + rfi /* spin waiting for addr */ -1: lwz r4,ENTRY_ADDR(r9) +2: + lwz r4,ENTRY_ADDR_LOWER(r10) andi. r11,r4,1 - bne 1b + bne 2b + + /* get the upper bits of the addr */ + lwz r11,ENTRY_ADDR_UPPER(r10) /* setup branch addr */ - mtctr r4 + mtspr SPRN_SRR0,r4 /* mark the entry as released */ li r8,3 - stw r8,ENTRY_ADDR(r9) + stw r8,ENTRY_ADDR_LOWER(r10) /* mask by ~64M to setup our tlb we will jump to */ - rlwinm r8,r4,0,0,5 + rlwinm r12,r4,0,0,5 - /* setup r3, r5, r6, r7 */ - lwz r3,ENTRY_R3(r9) - lwz r4,ENTRY_R4(r9) + /* setup r3, r4, r5, r6, r7, r8, r9 */ + lwz r3,ENTRY_R3_LOWER(r10) + li r4,0 li r5,0 - lwz r6,ENTRY_R6(r9) - lwz r7,ENTRY_R7(r9) + lwz r6,ENTRY_R6_LOWER(r10) + lis r7,(64*1024*1024)@h + li r8,0 + li r9,0 /* load up the pir */ - lwz r0,ENTRY_PIR(r9) + lwz r0,ENTRY_PIR(r10) mtspr SPRN_PIR,r0 mfspr r0,SPRN_PIR - stw r0,ENTRY_PIR(r9) + stw r0,ENTRY_PIR(r10) /* * Coming here, we know the cpu has one TLB mapping in TLB1[0] @@ -119,26 +149,30 @@ __secondary_start_page: * second mapping that maps addr 1:1 for 64M, and then we jump to * addr */ - lis r9,(MAS0_TLBSEL(1)|MAS0_ESEL(1))@h - mtspr SPRN_MAS0,r9 - lis r9,(MAS1_VALID|MAS1_IPROT)@h - ori r9,r9,(MAS1_TSIZE(BOOKE_PAGESZ_64M))@l - mtspr SPRN_MAS1,r9 + lis r10,(MAS0_TLBSEL(1)|MAS0_ESEL(0))@h + mtspr SPRN_MAS0,r10 + lis r10,(MAS1_VALID|MAS1_IPROT)@h + ori r10,r10,(MAS1_TSIZE(BOOKE_PAGESZ_64M))@l + mtspr SPRN_MAS1,r10 /* WIMGE = 0b00000 for now */ - mtspr SPRN_MAS2,r8 - ori r8,r8,(MAS3_SX|MAS3_SW|MAS3_SR) - mtspr SPRN_MAS3,r8 + mtspr SPRN_MAS2,r12 + ori r12,r12,(MAS3_SX|MAS3_SW|MAS3_SR) + mtspr SPRN_MAS3,r12 +#ifdef CONFIG_ENABLE_36BIT_PHYS + mtspr SPRN_MAS7,r11 +#endif tlbwe /* Now we have another mapping for this page, so we jump to that * mapping */ - bctr + mtspr SPRN_SRR1,r13 + rfi .align 3 .globl __spin_table __spin_table: - .space CONFIG_NR_CPUS*24 + .space CONFIG_NR_CPUS*ENTRY_SIZE /* Fill in the empty space. The actual reset vector is * the last word of the page */ diff --git a/include/common.h b/include/common.h index a61609c..cfa5a06 100644 --- a/include/common.h +++ b/include/common.h @@ -674,7 +674,7 @@ void inline show_boot_progress (int val); #ifdef CONFIG_MP int cpu_status(int nr); int cpu_reset(int nr); -int cpu_release(int nr, unsigned long boot_addr, int argc, char *argv[]); +int cpu_release(int nr, int argc, char *argv[]); #endif #endif /* __COMMON_H_ */ -- 1.5.4.1

1 0

[U-Boot-Users] Xilinx Spartan3 serial slave CRC error - bitswapping remove cause problems
by Tales Toledo 26 Mar '08

26 Mar '08

Hi, as mentioned in an previous e-mail (### previous console printfs ###) I had a problem with Spartan3 serial slave when loading bitstream. I am using 1.3.0 version with Matthias improved supported patch for FPGA applied. After some tests I rollback the bitstream swapping to a previous version and voila .... everything is working now. I think that remove bitswapping at fpga_loadbitstream is not a good idea based on my tests for Spartan3. Any comments about some experience with Spartan3? ####### new console printfs ############# => tftp 100000 fpganew.bit Using FEC ETHERNET device TFTP from server 192.168.1.100; our IP address is 192.168.1.1 Filename 'fpganew.bit'. Load address: 0x100000 Loading: ######### done Bytes transferred = 131034 (1ffda hex) => fpga loadb 0 100000 ${filesize} do_fpga: fpga_data = 0x100000 do_fpga: device = 0 design filename = "fpganew.ncd" part number = "3s200tq144" date = "2008/ 3/25" time = "16:37:58" bytes in bitstream = 130952 fpga_get_desc: found fpga descriptor #0 @ 0x01ffad04 Spartan3_load: Launching Slave Serial Load Spartan3_ss_load: start with interface functions @ 0x01ff8c08 Spartan3_ss_load: Function Table: ptr: 0x01bb6a90 struct: 0x01ff8c08 pgm: 0x01fec034 init: 0x01fec0b4 clk: 0x01fec19c wr: 0x01fec1cc done: 0x01fec124 Loading FPGA Device 0... fpga_pre_fn:111: FPGA pre-configuration fpga_pgm_fn:122: FPGA PROGRAM asserted fpga_init_fn:145: INIT check... low fpga_pgm_fn:122: FPGA PROGRAM deasserted fpga_init_fn:145: INIT check... high ........................................ Done. => ####### previous console prints ########### => tftp 100000 fpganew.bit Using FEC ETHERNET device TFTP from server 192.168.1.100; our IP address is 192.168.1.1 Filename 'fpganew.bit'. Load address: 0x100000 Loading: ######### done Bytes transferred = 131034 (1ffda hex) => fpga loadb 0 100000 ${filesize} do_fpga: fpga_data = 0x100000 do_fpga: device = 0 design filename = "fpga_top.ncd" part number = "3s200tq144" date = "2008/ 3/25" time = "16:37:58" bytes in bitstream = 130952 fpga_get_desc: found fpga descriptor #0 @ 0x01ffad04 Spartan3_load: Launching Slave Serial Load Spartan3_ss_load: start with interface functions @ 0x01ff8c00 Spartan3_ss_load: Function Table: ptr: 0x01bb6a90 struct: 0x01ff8c00 pgm: 0x01febf80 init: 0x01fec000 clk: 0x01fec0e8 wr: 0x01fec118 done: 0x01fec070 Loading FPGA Device 0... fpga_pre_fn:111: FPGA pre-configuration fpga_pgm_fn:122: FPGA PROGRAM asserted fpga_init_fn:145: INIT check... low fpga_pgm_fn:122: FPGA PROGRAM deasserted fpga_init_fn:145: INIT check... high ........................................fpga_init_fn:145: INIT check... high fpga_init_fn:145: INIT check... low ** CRC error during FPGA load. bytecount=130938, bsize=130952

2 1

[U-Boot-Users] The ultimate weapon of courtship
by Jeris Lord 26 Mar '08

26 Mar '08

My girlfriend just cannot get enough and I am happy to help http://www.Torbuillone.com/ The truth about orgasms

1 0

[U-Boot-Users] [PATCH v3 0/10] SATA framework and Freescale SATA controller support patch set
by Dave Liu 26 Mar '08

26 Mar '08

Dear Wolfgang, According to your suggestion, I respined the patcheset. please apply it. Thanks, Dave The following changes since commit 18e69a35efbb078403db0c0063986470dad7d082: Anton Vorontsov (1): 83xx/fdt_support: let user specifiy FSL USB Dual-Role controller role are available in the git repository at: git://git.ap.freescale.net/scm/u-boot.git develop Dave Liu (10): ata: merge the ata_piix driver ata: add the support for SATA framework ata: make the ata_piix driver using new SATA framework ata: add the libata support ata: add the fis struct for SATA ata: enable the sata init on bootup ata: add the readme for SATA command line mpc83xx: initialize serdes for MPC837xEMDS boards drivers: Add the support for Freescale SATA controller mpc83xx: enable the SATA interface on mpc837xemds board board/freescale/mpc837xemds/mpc837xemds.c | 33 + common/Makefile | 2 +- common/cmd_sata.c | 768 +++ +-------------------- disk/part.c | 14 + disk/part_dos.c | 2 + disk/part_iso.c | 2 + disk/part_mac.c | 1 + doc/README.sata | 69 +++ drivers/block/Makefile | 2 + drivers/block/ata_piix.c | 585 ++++++++++++++++++- drivers/block/fsl_sata.c | 921 ++++++++++++++++++++++ +++++++ drivers/block/fsl_sata.h | 374 ++++++++++++ drivers/block/libata.c | 158 +++++ include/configs/MPC837XEMDS.h | 28 + include/configs/sc520_cdp.h | 27 +- include/fis.h | 156 +++++ include/libata.h | 207 +++++++ include/part.h | 3 + include/sata.h | 20 +- lib_ppc/board.c | 8 + 20 files changed, 2686 insertions(+), 694 deletions(-) create mode 100644 doc/README.sata create mode 100644 drivers/block/fsl_sata.c create mode 100644 drivers/block/fsl_sata.h create mode 100644 drivers/block/libata.c create mode 100644 include/fis.h create mode 100644 include/libata.h

2 4

[U-Boot-Users] [PATCH v3 2/10] ata: add the support for SATA framework
by Dave Liu 26 Mar '08

26 Mar '08

- add the SATA framework - add the SATA command line Signed-off-by: Dave Liu <daveliu(a)freescale.com> --- common/Makefile | 1 + common/cmd_sata.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++ disk/part.c | 14 ++++ disk/part_dos.c | 2 + disk/part_iso.c | 2 + disk/part_mac.c | 1 + include/part.h | 3 + 7 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 common/cmd_sata.c diff --git a/common/Makefile b/common/Makefile index eda5113..f701509 100644 --- a/common/Makefile +++ b/common/Makefile @@ -86,6 +86,7 @@ COBJS-y += cmd_pcmcia.o COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o +COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o diff --git a/common/cmd_sata.c b/common/cmd_sata.c new file mode 100644 index 0000000..9c6605a --- /dev/null +++ b/common/cmd_sata.c @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2000-2005, DENX Software Engineering + * Wolfgang Denk <wd(a)denx.de> + * Copyright (C) Procsys. All rights reserved. + * Mushtaq Khan <mushtaq_k(a)procsys.com> + * <mushtaqk_921(a)yahoo.co.in> + * Copyright (C) 2008 Freescale Semiconductor, Inc. + * Dave Liu <daveliu(a)freescale.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <command.h> +#include <part.h> + +extern int sata_low_level_read(int dev, u32 blknr, u32 blkcnt, void *buffer); +extern int sata_low_level_write(int dev, u32 blknr, u32 blkcnt, void *buffer); +extern int sata_low_level_init(int dev); +extern int sata_low_level_scan(int dev); + +int curr_device = -1; +block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE]; + +static ulong sata_read(int dev, ulong blknr, ulong blkcnt, void *buffer) +{ + return sata_low_level_read(dev, blknr, blkcnt, buffer); +} + +static ulong sata_write(int dev, ulong blknr, ulong blkcnt, const void *buffer) +{ + return sata_low_level_write(dev, blknr, blkcnt, (void *)buffer); +} + +int sata_init(void) +{ + int rc; + int i; + + for (i = 0; i < CFG_SATA_MAX_DEVICE; i++) { + memset(&sata_dev_desc[i], 0, sizeof(struct block_dev_desc)); + sata_dev_desc[i].if_type = IF_TYPE_SATA; + sata_dev_desc[i].dev = i; + sata_dev_desc[i].part_type = PART_TYPE_UNKNOWN; + sata_dev_desc[i].type = DEV_TYPE_HARDDISK; + sata_dev_desc[i].lba = 0; + sata_dev_desc[i].blksz = 512; + sata_dev_desc[i].block_read = sata_read; + sata_dev_desc[i].block_write = sata_write; + + rc = sata_low_level_init(i); + rc = sata_low_level_scan(i); + if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0)) + init_part(&sata_dev_desc[i]); + } + curr_device = 0; + return rc; +} + +block_dev_desc_t *sata_get_dev(int dev) +{ + return (dev < CFG_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL; +} + +int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int rc = 0; + + switch (argc) { + case 0: + case 1: + printf("Usage:\n%s\n", cmdtp->usage); + return 1; + case 2: + if (strncmp(argv[1],"inf", 3) == 0) { + int i; + putc('\n'); + for (i = 0; i < CFG_SATA_MAX_DEVICE; ++i) { + if (sata_dev_desc[i].type == DEV_TYPE_UNKNOWN) + continue; + printf ("SATA device %d: ", i); + dev_print(&sata_dev_desc[i]); + } + return 0; + } else if (strncmp(argv[1],"dev", 3) == 0) { + if ((curr_device < 0) || (curr_device >= CFG_SATA_MAX_DEVICE)) { + puts("\nno SATA devices available\n"); + return 1; + } + printf("\nSATA device %d: ", curr_device); + dev_print(&sata_dev_desc[curr_device]); + return 0; + } else if (strncmp(argv[1],"part",4) == 0) { + int dev, ok; + + for (ok = 0, dev = 0; dev < CFG_SATA_MAX_DEVICE; ++dev) { + if (sata_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) { + ++ok; + if (dev) + putc ('\n'); + print_part(&sata_dev_desc[dev]); + } + } + if (!ok) { + puts("\nno SATA devices available\n"); + rc ++; + } + return rc; + } + printf("Usage:\n%s\n", cmdtp->usage); + return 1; + case 3: + if (strncmp(argv[1], "dev", 3) == 0) { + int dev = (int)simple_strtoul(argv[2], NULL, 10); + + printf("\nSATA device %d: ", dev); + if (dev >= CFG_SATA_MAX_DEVICE) { + puts ("unknown device\n"); + return 1; + } + dev_print(&sata_dev_desc[dev]); + + if (sata_dev_desc[dev].type == DEV_TYPE_UNKNOWN) + return 1; + + curr_device = dev; + + puts("... is now current device\n"); + + return 0; + } else if (strncmp(argv[1], "part", 4) == 0) { + int dev = (int)simple_strtoul(argv[2], NULL, 10); + + if (sata_dev_desc[dev].part_type != PART_TYPE_UNKNOWN) { + print_part(&sata_dev_desc[dev]); + } else { + printf("\nSATA device %d not available\n", dev); + rc = 1; + } + return rc; + } + printf ("Usage:\n%s\n", cmdtp->usage); + return 1; + + default: /* at least 4 args */ + if (strcmp(argv[1], "read") == 0) { + ulong addr = simple_strtoul(argv[2], NULL, 16); + ulong cnt = simple_strtoul(argv[4], NULL, 16); + ulong n; + lbaint_t blk = simple_strtoul(argv[3], NULL, 16); + + printf("\nSATA read: device %d block # %ld, count %ld ... ", + curr_device, blk, cnt); + + n = sata_read(curr_device, blk, cnt, (u32 *)addr); + + /* flush cache after read */ + flush_cache(addr, cnt * sata_dev_desc[curr_device].blksz); + + printf("%ld blocks read: %s\n", + n, (n==cnt) ? "OK" : "ERROR"); + return (n == cnt) ? 0 : 1; + } else if (strcmp(argv[1], "write") == 0) { + ulong addr = simple_strtoul(argv[2], NULL, 16); + ulong cnt = simple_strtoul(argv[4], NULL, 16); + ulong n; + + lbaint_t blk = simple_strtoul(argv[3], NULL, 16); + + printf("\nSATA write: device %d block # %ld, count %ld ... ", + curr_device, blk, cnt); + + n = sata_write(curr_device, blk, cnt, (u32 *)addr); + + printf("%ld blocks written: %s\n", + n, (n == cnt) ? "OK" : "ERROR"); + return (n == cnt) ? 0 : 1; + } else { + printf("Usage:\n%s\n", cmdtp->usage); + rc = 1; + } + + return rc; + } +} + +U_BOOT_CMD( + sata, 5, 1, do_sata, + "sata - SATA sub system\n", + "sata info - show available SATA devices\n" + "sata device [dev] - show or set current device\n" + "sata part [dev] - print partition table\n" + "sata read addr blk# cnt\n" + "sata write addr blk# cnt\n"); + diff --git a/disk/part.c b/disk/part.c index 56b9427..3c71208 100644 --- a/disk/part.c +++ b/disk/part.c @@ -35,6 +35,7 @@ #endif #if (defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ @@ -49,6 +50,9 @@ static const struct block_drvr block_drvr[] = { #if defined(CONFIG_CMD_IDE) { .name = "ide", .get_dev = ide_get_dev, }, #endif +#if defined(CONFIG_CMD_SATA) + {.name = "sata", .get_dev = sata_get_dev, }, +#endif #if defined(CONFIG_CMD_SCSI) { .name = "scsi", .get_dev = scsi_get_dev, }, #endif @@ -87,6 +91,7 @@ block_dev_desc_t *get_dev(char* ifname, int dev) #endif #if (defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ @@ -116,6 +121,12 @@ void dev_print (block_dev_desc_t *dev_desc) dev_desc->vendor, dev_desc->revision, dev_desc->product); + } + if (dev_desc->if_type==IF_TYPE_SATA) { + printf ("Model: %s Firm: %s Ser#: %s\n", + dev_desc->vendor, + dev_desc->revision, + dev_desc->product); } else { printf ("Vendor: %s Prod.: %s Rev: %s\n", dev_desc->vendor, @@ -177,6 +188,7 @@ void dev_print (block_dev_desc_t *dev_desc) #endif #if (defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ @@ -271,6 +283,8 @@ static void print_part_header (const char *type, block_dev_desc_t * dev_desc) switch (dev_desc->if_type) { case IF_TYPE_IDE: puts ("IDE"); break; + case IF_TYPE_SATA: puts ("SATA"); + break; case IF_TYPE_SCSI: puts ("SCSI"); break; case IF_TYPE_ATAPI: puts ("ATAPI"); diff --git a/disk/part_dos.c b/disk/part_dos.c index 4707f80..4d778ec 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -36,6 +36,7 @@ #include "part_dos.h" #if (defined(CONFIG_CMD_IDE) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_SCSI) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ @@ -194,6 +195,7 @@ static int get_partition_info_extended (block_dev_desc_t *dev_desc, int ext_part info->size = le32_to_int (pt->size4); switch(dev_desc->if_type) { case IF_TYPE_IDE: + case IF_TYPE_SATA: case IF_TYPE_ATAPI: sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num); break; diff --git a/disk/part_iso.c b/disk/part_iso.c index 06dd75e..4894630 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -27,6 +27,7 @@ #if (defined(CONFIG_CMD_IDE) || \ defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_ISO_PARTITION) @@ -157,6 +158,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_ sprintf ((char *)info->type, "U-Boot"); switch(dev_desc->if_type) { case IF_TYPE_IDE: + case IF_TYPE_SATA: case IF_TYPE_ATAPI: sprintf ((char *)info->name, "hd%c%d\n", 'a' + dev_desc->dev, part_num); break; diff --git a/disk/part_mac.c b/disk/part_mac.c index d303a73..1922fe5 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -36,6 +36,7 @@ #if (defined(CONFIG_CMD_IDE) || \ defined(CONFIG_CMD_SCSI) || \ + defined(CONFIG_CMD_SATA) || \ defined(CONFIG_CMD_USB) || \ defined(CONFIG_MMC) || \ defined(CONFIG_SYSTEMACE) ) && defined(CONFIG_MAC_PARTITION) diff --git a/include/part.h b/include/part.h index 8407aa0..cb1b758 100644 --- a/include/part.h +++ b/include/part.h @@ -49,6 +49,7 @@ typedef struct block_dev_desc { unsigned long start, lbaint_t blkcnt, const void *buffer); + void *priv; /* driver private struct pointer */ }block_dev_desc_t; /* Interface types: */ @@ -60,6 +61,7 @@ typedef struct block_dev_desc { #define IF_TYPE_DOC 5 #define IF_TYPE_MMC 6 #define IF_TYPE_SD 7 +#define IF_TYPE_SATA 8 /* Part types */ #define PART_TYPE_UNKNOWN 0x00 @@ -92,6 +94,7 @@ typedef struct disk_partition { /* Misc _get_dev functions */ block_dev_desc_t* get_dev(char* ifname, int dev); block_dev_desc_t* ide_get_dev(int dev); +block_dev_desc_t* sata_get_dev(int dev); block_dev_desc_t* scsi_get_dev(int dev); block_dev_desc_t* usb_stor_get_dev(int dev); block_dev_desc_t* mmc_get_dev(int dev); -- 1.5.4.rc4

2 1

[U-Boot-Users] cache related query for MIPS
by Chetan Nanda 26 Mar '08

26 Mar '08

Hi All, I am using u-boot for booting Nucleus on our MIPS 4KC processor. In u-boot code, when we give 'bootelf' command, it load all sections one by one and then do flus_cache for that section. (though flush_cache() function is empty). And in the last before jumping to start location it disable the caches using dcache_disable(). My question here is why cache is tried to flushed and disabled before jumping into start location? And what if new OS do not touches the cache configuration at all? thanks, Chetan Nanda

2 1