July 2009 - U-Boot

[U-Boot] [PATCH] ppc4xx: Fixed compilation warning in 4xx_enet.c
by Alessio Centazzo 21 Jul '09

21 Jul '09

This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the CONFIG_440SPE from the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change. Signed-off-by: Alessio Centazzo acpatin(a)yahoo.com --- drivers/net/4xx_enet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 587605d..c020048 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -870,7 +870,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) defined(CONFIG_405EX) u32 opbfreq; sys_info_t sysinfo; -#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ +#if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX) @@ -1119,7 +1119,6 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) #if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX) -- 1.6.0.4

3 4

[U-Boot] [PATCH] DHCP regression on 2009-06
by Michael Zaidman 21 Jul '09

21 Jul '09

Fixed the DHCP/BOOTP/RARP regression introduced in u-boot-2009.06 by initializing our IP addr to 0 in order to accept any IP addr assigned to us by the DHCP/BOOTP/RARP server. Ack-by: Robin Getz <rgetz(a)blackfin.uclinux.org> Signed-off-by: Michael Zaidman <michael.zaidman(a)gmail.com> --- net/net.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/net.c b/net/net.c index 5637cf5..9bd3208 100644 --- a/net/net.c +++ b/net/net.c @@ -388,17 +388,20 @@ restart: #if defined(CONFIG_CMD_DHCP) case DHCP: BootpTry = 0; + NetOurIP = 0; DhcpRequest(); /* Basically same as BOOTP */ break; #endif case BOOTP: BootpTry = 0; + NetOurIP = 0; BootpRequest (); break; case RARP: RarpTry = 0; + NetOurIP = 0; RarpRequest (); break; #if defined(CONFIG_CMD_PING) -- 1.6.0.4

3 2

[U-Boot] [PATCH 0/4]: arm: Kirkwood: Various egiga fixes
by Simon Kagstrom 21 Jul '09

21 Jul '09

Hi again! This is a refreshed version of the http://lists.denx.de/pipermail/u-boot/2009-July/055370.html patch series. I've added one more patch to fix an issue with the MAC address under Linux. The patches are now: 1. (new) Set MAC address during egiga registration (so that Linux gets it even if the network interface has not been initialized under U-boot). 2. Correct the optimization bug in kgwbe_send. This patch now uses IO accessor functions instead of volatile (and also corrects recv). 3. Check the error summary bit during send (as before but based on the above patches) 4. Allow sending data which is not 8-byte aligned (as before but based on the above patches) // Simon

6 21

[U-Boot] [PATCH] MIIPHYBB: Return 0xFFFF if the PHY is not asserting TA.
by Richard Retanubun 21 Jul '09

21 Jul '09

From d4c7dd98ac9a3f6fc4949079b84d7d811376cf3d Mon Sep 17 00:00:00 2001 From: Richard Retanubun <RichardRetanubun(a)RuggedCom.com> Date: Thu, 2 Jul 2009 13:12:03 -0400 Subject: [PATCH] MIIPHYBB: Return 0xFFFF if the PHY is not asserting TA. This patch sets the returned value to 0xFFFF if the PHY does not exist and does not assert Transfer Acknowledge. A NULL check for the value pointer is also added for buffer overflow protection. Without this patch 'mii info' will show 'phantom' devices because the value will be not be initialized and return with some random value. --- drivers/net/phy/miiphybb.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index e3c163a..b77c917 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -127,6 +127,11 @@ int bb_miiphy_read (char *devname, unsigned char addr, volatile ioport_t *iop = ioport_addr ((immap_t *) CONFIG_SYS_IMMR, MDIO_PORT); #endif + if (value == NULL) { + puts("NULL value pointer\n"); + return (-1); + } + miiphy_pre (1, addr, reg); /* tri-state our MDIO I/O pin so we can read */ @@ -145,6 +150,8 @@ int bb_miiphy_read (char *devname, unsigned char addr, MDC (1); MIIDELAY; } + /* There is no PHY, set value to 0xFFFF and return */ + *value = 0xFFFF; return (-1); } -- 1.6.2.4

2 1

[U-Boot] [PATCH v2] net: tsec - fix dereferencing type-punned pointer will break strict-aliasing rules warning
by Kim Phillips 21 Jul '09

21 Jul '09

fix this gcc 4.4 warning: tsec.c: In function 'tsec_init': tsec.c:200: warning: dereferencing type-punned pointer will break strict-aliasing rules Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- this is the endian-correct version drivers/net/tsec.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 63fc02e..5dc05e5 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -197,7 +197,10 @@ int tsec_init(struct eth_device *dev, bd_t * bd) for (i = 0; i < MAC_ADDR_LEN; i++) { tmpbuf[MAC_ADDR_LEN - 1 - i] = dev->enetaddr[i]; } - regs->macstnaddr1 = *((uint *) (tmpbuf)); + tempval = (tmpbuf[0] << 24) | (tmpbuf[1] << 16) | (tmpbuf[2] << 8) | + tmpbuf[3]; + + regs->macstnaddr1 = tempval; tempval = *((uint *) (tmpbuf + 4)); -- 1.6.3.3

2 1

[U-Boot] [PATCH] - add dns
by Robin Getz 21 Jul '09

21 Jul '09

On 04 Oct 2008 Pieter posted a dns implementation for U-Boot. http://www.mail-archive.com/u-boot-users@lists.sourceforge.net/msg10216.html > DNS can be enabled by setting CFG_CMD_DNS. After performing a query, the > serverip environment var is updated. > > Probably there are some cosmetic issues with the patch. Unfortunatly I do > not have the time to correct these. So if anybody else likes DNS support in > U-Boot and has the time, feel free to patch it in the main tree. Here it is again - slightly modified & smaller: - update to 2009-06 (Pieter's patch was for U-Boot 1.2.0) - run through checkpatch, and clean up style issues - remove packet from stack - cleaned up some comments - failure returns much faster (if server responds, don't wait for timeout) - use built in functions (memcpy) rather than byte copy. bfin> dhcp BOOTP broadcast 1 DHCP client bound to address 192.168.0.4 bfin> dns pool.ntp.org 69.36.241.112 bfin> sntp $(serverip) Date: 2009-07-17 Time: 19:16:51 bfin> dns www.google.com 64.233.161.147 bfin> ping $(serverip) Using Blackfin EMAC device host 64.233.161.147 is alive Signed-off-by: Robin Getz <rgetz(a)blackfin.uclinux.org> Signed-off-by: Pieter Voorthuijsen <pieter.voorthuijsen(a)prodrive.nl> common/cmd_net.c | 32 ++++ include/configs/bfin_adi_common.h | 7 include/net.h | 4 net/Makefile | 1 net/dns.c | 213 ++++++++++++++++++++++++++++ net/dns.h | 38 ++++ net/net.c | 20 ++ 7 files changed, 314 insertions(+), 1 deletion(-) --- Index: include/net.h =================================================================== --- include/net.h (revision 1968) +++ include/net.h (working copy) @@ -361,6 +361,10 @@ /* from net/net.c */ extern char BootFile[128]; /* Boot File name */ +#if defined(CONFIG_CMD_DNS) +extern char NetDNSResolve[255]; /* The host to resolve */ +#endif + #if defined(CONFIG_CMD_PING) extern IPaddr_t NetPingIP; /* the ip address to ping */ #endif Index: include/configs/bfin_adi_common.h =================================================================== --- include/configs/bfin_adi_common.h (revision 1968) +++ include/configs/bfin_adi_common.h (working copy) @@ -13,6 +13,13 @@ # if ADI_CMDS_NETWORK # define CONFIG_CMD_DHCP # define CONFIG_CMD_PING +# define CONFIG_BOOTP_DNS +# define CONFIG_BOOTP_DNS2 +# define CONFIG_CMD_DNS +# ifdef CONFIG_RTC_BFIN +# define CONFIG_CMD_SNTP +# define CONFIG_BOOTP_NTPSERVER +# endif # ifdef CONFIG_BFIN_MAC # define CONFIG_CMD_MII # endif Index: net/dns.c =================================================================== --- net/dns.c (revision 0) +++ net/dns.c (revision 0) @@ -0,0 +1,213 @@ +/* + * DNS support driver + * + * Copyright (c) 2008 Pieter Voorthuijsen <pieter.voorthuijsen(a)prodrive.nl> + * Copyright (c) 2009 Robin Getz <rgetz(a)blackfin.uclinux.org> + * + * This is a simple DNS implementation for U-Boot. It will use the first IP + * in the DNS response as NetServerIP. This can then be used for any other + * network related activities. + * + * The packet handling is partly based on TADNS, original copyrights + * follow below. + * + */ + +/* + * Copyright (c) 2004-2005 Sergey Lyubka <valenok(a)gmail.com> + * + * "THE BEER-WARE LICENSE" (Revision 42): + * Sergey Lyubka wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. + */ + +#include <common.h> +#include <command.h> +#include <net.h> + +#include "dns.h" + +char NetDNSResolve[255]; /* The host to resolve */ + +static int DnsOurPort; + +static void +DnsSend(void) +{ + struct header *header; + int n, name_len; + uchar *p, *pkt; + const char *s; + const char *name; + enum dns_query_type qtype = DNS_A_RECORD; + + name = NetDNSResolve; + pkt = p = (uchar *)(NetTxPacket + NetEthHdrSize() + IP_HDR_SIZE); + + /* Prepare DNS packet header */ + header = (struct header *) pkt; + header->tid = 1; + header->flags = htons(0x100); /* standard query */ + header->nqueries = htons(1); /* Just one query */ + header->nanswers = 0; + header->nauth = 0; + header->nother = 0; + + /* Encode DNS name */ + name_len = strlen(name); + p = (uchar *) &header->data; /* For encoding host name into packet */ + + do { + s = strchr(name, '.'); + if (!s) + s = name + name_len; + + n = s - name; /* Chunk length */ + *p++ = n; /* Copy length */ + memcpy(p, name, n); /* Copy chunk */ + p += n; + + if (*s == '.') + n++; + + name += n; + name_len -= n; + } while (*s != '\0'); + + *p++ = 0; /* Mark end of host name */ + *p++ = 0; /* Well, lets put this byte as well */ + *p++ = (unsigned char) qtype; /* Query Type */ + + *p++ = 0; + *p++ = 1; /* Class: inet, 0x0001 */ + + n = p - pkt; /* Total packet length */ + debug("Packet size %d\n", n); + + DnsOurPort = 10000 + (get_timer(0) % 4096); + + NetSendUDPPacket(NetServerEther, NetOurDNSIP, DNS_SERVICE_PORT, + DnsOurPort, n); + debug("DNS packet sent\n"); +} + +static void +DnsTimeout(void) +{ + puts("Timeout\n"); + NetState = NETLOOP_FAIL; +} + +static void +DnsHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len) +{ + struct header *header; + const unsigned char *p, *e, *s; + u16 type, i; + int found, stop, dlen; + char IPStr[255]; + IPaddr_t IPAddress; + short tmp; + + + debug("%s\n", __func__); + if (dest != DnsOurPort) + return; + + for (i = 0; i < len; i += 4) + debug("0x%p - 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n", + pkt+i, pkt[i], pkt[i+1], pkt[i+2], pkt[i+3]); + + /* We sent 1 query. We want to see more that 1 answer. */ + header = (struct header *) pkt; + if (ntohs(header->nqueries) != 1) + return; + + /* Received 0 answers */ + if (header->nanswers == 0) { + debug("DNS server returned no answers\n"); + puts("server can't find hostname\n"); + NetState = NETLOOP_SUCCESS; + return; + } + + /* Skip host name */ + s = &header->data[0]; + e = pkt + len; + for (p = s; p < e && *p != '\0'; p++) + continue; + + /* We sent query class 1, query type 1 */ + tmp = p[1] | (p[2] << 8); + if (&p[5] > e || ntohs(tmp) != DNS_A_RECORD) { + debug("Query was not A record\n"); + puts("server can't find IP number of hostname\n"); + NetState = NETLOOP_SUCCESS; + return; + } + + /* Go to the first answer section */ + p += 5; + + /* Loop through the answers, we want A type answer */ + for (found = stop = 0; !stop && &p[12] < e; ) { + + /* Skip possible name in CNAME answer */ + if (*p != 0xc0) { + while (*p && &p[12] < e) + p++; + p--; + } + debug("Name (Offset in header): %d\n", p[1]); + + tmp = p[2] | (p[3] << 8); + type = ntohs(tmp); + debug("type = %d\n", type); + if (type == DNS_CNAME_RECORD) { + /* CNAME answer. shift to the next section */ + debug("Found canonical name\n"); + tmp = p[10] | (p[11] << 8); + dlen = ntohs(tmp); + debug("dlen = %d\n", dlen); + p += 12 + dlen; + } else if (type == DNS_A_RECORD) { + debug("Found A-record\n"); + found = stop = 1; + } else { + debug("Unknown type\n"); + stop = 1; + } + } + + if (found && &p[12] < e) { + + tmp = p[10] | (p[11] << 8); + dlen = ntohs(tmp); + p += 12; + memcpy(&IPAddress, p, 4); + + if (p + dlen <= e) { + ip_to_string(IPAddress, IPStr); + NetServerIP = IPAddress; + setenv("serverip", IPStr); + printf("%s\n", IPStr); + } else + puts("server responded with invalid IP number\n"); + } + + NetState = NETLOOP_SUCCESS; +} + +void +DnsStart(void) +{ + debug("%s\n", __func__); + + NetSetTimeout(DNS_TIMEOUT, DnsTimeout); + NetSetHandler(DnsHandler); + memset(NetServerEther, 0, 6); + + DnsSend(); +} + Index: net/net.c =================================================================== --- net/net.c (revision 1968) +++ net/net.c (working copy) @@ -92,6 +92,9 @@ #if defined(CONFIG_CDP_VERSION) #include <timestamp.h> #endif +#if defined(CONFIG_CMD_DNS) +#include "dns.h" +#endif #if defined(CONFIG_CMD_NET) @@ -165,7 +168,6 @@ ushort NetOurNativeVLAN = 0xFFFF; /* ditto */ char BootFile[128]; /* Boot File name */ - #if defined(CONFIG_CMD_PING) IPaddr_t NetPingIP; /* the ip address to ping */ @@ -291,6 +293,9 @@ NetServerIP = getenv_IPaddr ("serverip"); NetOurNativeVLAN = getenv_VLAN("nvlan"); NetOurVLAN = getenv_VLAN("vlan"); +#if defined(CONFIG_CMD_DNS) + NetOurDNSIP = getenv_IPaddr("dnsip"); +#endif env_changed_id = env_id; } @@ -426,6 +432,11 @@ SntpStart(); break; #endif +#if defined(CONFIG_CMD_DNS) + case DNS: + DnsStart(); + break; +#endif default: break; } @@ -1518,6 +1529,14 @@ } goto common; #endif +#if defined(CONFIG_CMD_DNS) + case DNS: + if (NetOurDNSIP == 0) { + puts("*** ERROR: DNS server address not given\n"); + return 1; + } + goto common; +#endif #if defined(CONFIG_CMD_NFS) case NFS: #endif Index: net/dns.h =================================================================== --- net/dns.h (revision 0) +++ net/dns.h (revision 0) @@ -0,0 +1,39 @@ +/* + * (C) Masami Komiya <mkomiya(a)sonare.it> 2005 + * + * 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, or (at + * your option) any later version. + */ + +#ifndef __DNS_H__ +#define __DNS_H__ + +#define DNS_SERVICE_PORT 53 +#define DNS_MAX 1025 /* Maximum host name */ +#define DNS_TIMEOUT 10000UL + +/* http://en.wikipedia.org/wiki/List_of_DNS_record_types */ +enum dns_query_type { + DNS_A_RECORD = 0x01, + DNS_CNAME_RECORD = 0x05, + DNS_MX_RECORD = 0x0f }; + +/* + * DNS network packet + */ +struct header { + uint16_t tid; /* Transaction ID */ + uint16_t flags; /* Flags */ + uint16_t nqueries; /* Questions */ + uint16_t nanswers; /* Answers */ + uint16_t nauth; /* Authority PRs */ + uint16_t nother; /* Other PRs */ + unsigned char data[1]; /* Data, variable length */ +}; + +extern void DnsStart(void); /* Begin DNS */ + +#endif Index: net/Makefile =================================================================== --- net/Makefile (revision 1968) +++ net/Makefile (working copy) @@ -34,6 +34,7 @@ COBJS-y += eth.o COBJS-y += nfs.o COBJS-$(CONFIG_CMD_SNTP) += sntp.o +COBJS-$(CONFIG_CMD_DNS) += dns.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) Index: common/cmd_net.c =================================================================== --- common/cmd_net.c (revision 1968) +++ common/cmd_net.c (working copy) @@ -353,3 +353,35 @@ "[NTP server IP]\n" ); #endif + +#if defined(CONFIG_CMD_DNS) +int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + if (argc < 2) { + cmd_usage(cmdtp); + return -1; + } + + if (strlen(argv[1]) > sizeof(NetDNSResolve) - 1) { + puts("Name too long.\n"); + return -1; + } + + strcpy(NetDNSResolve, argv[1]); + + if (NetLoop(DNS) < 0) { + printf("dns lookup of %s failed, check setup\n", argv[1]); + return 1; + } + + return 0; +} + +U_BOOT_CMD( + dns, 2, 1, do_dns, + "lookup the IP of a hostname", + "[machine to lookup]\n" +); + +#endif /* CONFIG_CMD_DNS */ +

4 15

[U-Boot] [PATCH] ignore tags
by ratbert.chuang＠gmail.com 21 Jul '09

21 Jul '09

From: Po-Yu Chuang <ratbert(a)faraday-tech.com> Signed-off-by: Po-Yu Chuang <ratbert(a)faraday-tech.com> --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index e13fc96..8ccd42a 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ series cscope.* # tags files +/tags /ctags /etags -- 1.6.3.3

2 1

[U-Boot] [PATCH] fsl_sata: Fix compiler warnings shown by gcc-4.4
by Kumar Gala 20 Jul '09

20 Jul '09

From: galak <galak(a)ducky.am.freescale.net> Update fsl_sata to use common structures instead of casting back and forth between the fsl specific ones and the common ones (which are identical). fsl_sata.c: In function 'scan_sata': fsl_sata.c:550: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:549: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:548: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:545: note: initialized from here fsl_sata.c:592: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:590: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:588: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:586: warning: dereferencing pointer 'cfis' does break strict-aliasing rules fsl_sata.c:579: warning: dereferencing pointer 'cfis' does break strict-aliasing rules ... Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- drivers/block/fsl_sata.c | 54 ++++++++++++++++----------------------------- drivers/block/fsl_sata.h | 46 --------------------------------------- 2 files changed, 19 insertions(+), 81 deletions(-) diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c index 2009d1e..abcda6f 100644 --- a/drivers/block/fsl_sata.c +++ b/drivers/block/fsl_sata.c @@ -81,7 +81,7 @@ void dprint_buffer(unsigned char *buf, int len) printf("\n\r"); } -static void fsl_sata_dump_sfis(struct sfis *s) +static void fsl_sata_dump_sfis(struct sata_fis_d2h *s) { printf("Status FIS dump:\n\r"); printf("fis_type: %02x\n\r", s->fis_type); @@ -347,7 +347,7 @@ static void fsl_sata_dump_regs(fsl_sata_reg_t *reg) printf("SYSPR: %08x\n\r", in_be32(&reg->syspr)); } -static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct cfis *cfis, +static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis, int is_ncq, int tag, u8 *buffer, u32 len) { cmd_hdr_entry_t *cmd_hdr; @@ -483,7 +483,7 @@ static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct cfis *cfis, if (val32) { u32 der; - fsl_sata_dump_sfis((struct sfis *)cmd_desc->sfis); + fsl_sata_dump_sfis((struct sata_fis_d2h *)cmd_desc->sfis); printf("CE at device\n\r"); fsl_sata_dump_regs(reg); der = in_le32(&reg->der); @@ -498,13 +498,13 @@ static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct cfis *cfis, return len; } -static int fsl_ata_exec_reset_cmd(struct fsl_sata *sata, struct cfis *cfis, +static int fsl_ata_exec_reset_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis, int tag, u8 *buffer, u32 len) { return 0; } -static int fsl_sata_exec_cmd(struct fsl_sata *sata, struct cfis *cfis, +static int fsl_sata_exec_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis, enum cmd_type command_type, int tag, u8 *buffer, u32 len) { int rc; @@ -539,11 +539,9 @@ static int fsl_sata_exec_cmd(struct fsl_sata *sata, struct cfis *cfis, static void fsl_sata_identify(int dev, u16 *id) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; - cfis = (struct cfis *)&h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -566,12 +564,10 @@ static void fsl_sata_xfer_mode(int dev, u16 *id) static void fsl_sata_set_features(int dev) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; u8 udma_cap; - cfis = (struct cfis *)&h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -597,14 +593,12 @@ static void fsl_sata_set_features(int dev) static u32 fsl_sata_rw_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; u32 block; block = start; - cfis = (struct cfis *)&h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -624,12 +618,9 @@ static u32 fsl_sata_rw_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_wr void fsl_sata_flush_cache(int dev) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; - cfis = (struct cfis *)&h2d; - - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -641,14 +632,12 @@ void fsl_sata_flush_cache(int dev) static u32 fsl_sata_rw_cmd_ext(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; u64 block; block = (u64)start; - cfis = (struct cfis *)&h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -673,8 +662,7 @@ static u32 fsl_sata_rw_cmd_ext(int dev, u32 start, u32 blkcnt, u8 *buffer, int i u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; + struct sata_fis_h2d h2d, *cfis = &h2d; int ncq_channel; u64 block; @@ -684,9 +672,8 @@ u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write } block = (u64)start; - cfis = (struct cfis *)&h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ @@ -718,12 +705,9 @@ u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write void fsl_sata_flush_cache_ext(int dev) { fsl_sata_t *sata = (fsl_sata_t *)sata_dev_desc[dev].priv; - struct sata_fis_h2d h2d; - struct cfis *cfis; - - cfis = (struct cfis *)&h2d; + struct sata_fis_h2d h2d, *cfis = &h2d; - memset((void *)cfis, 0, sizeof(struct cfis)); + memset(cfis, 0, sizeof(struct sata_fis_h2d)); cfis->fis_type = SATA_FIS_TYPE_REGISTER_H2D; cfis->pm_port_c = 0x80; /* is command */ diff --git a/drivers/block/fsl_sata.h b/drivers/block/fsl_sata.h index 874c0dc..18e88fa 100644 --- a/drivers/block/fsl_sata.h +++ b/drivers/block/fsl_sata.h @@ -289,52 +289,6 @@ typedef struct cmd_desc { #define SATA_HC_CMD_DESC_ALIGN 4 /* -* CFIS - Command FIS, which is H2D register FIS, the struct defination -* of Non-Queued command is different than NCQ command. see them is sata2.h -*/ -typedef struct cfis { - u8 fis_type; - u8 pm_port_c; - u8 command; - u8 features; - u8 lba_low; - u8 lba_mid; - u8 lba_high; - u8 device; - u8 lba_low_exp; - u8 lba_mid_exp; - u8 lba_high_exp; - u8 features_exp; - u8 sector_count; - u8 sector_count_exp; - u8 res1; - u8 control; - u8 res2[4]; -} __attribute__ ((packed)) cfis_t; - -/* -* SFIS - Status FIS, which is D2H register FIS. -*/ -typedef struct sfis { - u8 fis_type; - u8 pm_port_i; - u8 status; - u8 error; - u8 lba_low; - u8 lba_mid; - u8 lba_high; - u8 device; - u8 lba_low_exp; - u8 lba_mid_exp; - u8 lba_high_exp; - u8 res1; - u8 sector_count; - u8 sector_count_exp; - u8 res2[2]; - u8 res3[4]; -} __attribute__ ((packed)) sfis_t; - -/* * SATA device driver info */ typedef struct fsl_sata_info { -- 1.6.0.6

2 1

[U-Boot] Please pull u-boot-i2c.git
by Heiko Schocher 20 Jul '09

20 Jul '09

Hello Wolfgang, The following changes since commit b86b85e2611d57d834795a92453431a1a340c3c9: Ilya Yanok (1): mmc: set bus width to 1 and clock to minimum early during initialization are available in the git repository at: git://git.denx.de/u-boot-i2c.git master Peter Tyser (1): Remove last remanants of unused CONFIG_I2C_CMD_TREE include/configs/P2020DS.h | 1 - include/configs/XPEDITE5170.h | 1 - include/configs/aria.h | 1 - include/configs/mecp5123.h | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] Please pull u-boot-ubi
by Stefan Roese 20 Jul '09

20 Jul '09

The following changes since commit b86b85e2611d57d834795a92453431a1a340c3c9: Ilya Yanok (1): mmc: set bus width to 1 and clock to minimum early during initialization are available in the git repository at: git://www.denx.de/git/u-boot-ubi.git master Andrzej Wolski (1): ubi: help message correction common/cmd_ubi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

2 1