arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board

[platform/kernel/u-boot.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 4f4b34b..82c4cc9 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -180,7 +180,7 @@ IPaddr_t    NetNtpServerIP;
 int            NetTimeOffset;
 #endif
 
-uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN];
+static uchar PktBuf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN];
 
 /* Receive packet */
 uchar *NetRxPackets[PKTBUFSRX];
@@ -256,6 +256,7 @@ static void NetInitLoop(void)
 #endif
                env_changed_id = env_id;
        }
+       memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
 
        return;
 }
@@ -310,19 +311,21 @@ int NetLoop(enum proto_t protocol)
        NetRestarted = 0;
        NetDevExists = 0;
        NetTryCount = 1;
+       debug_cond(DEBUG_INT_STATE, "--- NetLoop Entry\n");
 
        bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start");
        net_init();
-       eth_halt();
-       eth_set_current();
-       if (eth_init(bd) < 0) {
+       if (eth_is_on_demand_init() || protocol != NETCONS) {
                eth_halt();
-               return -1;
-       }
+               eth_set_current();
+               if (eth_init(bd) < 0) {
+                       eth_halt();
+                       return -1;
+               }
+       } else
+               eth_init_state_only(bd);
 
 restart:
-       memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
-
        net_set_state(NETLOOP_CONTINUE);
 
        /*
@@ -330,6 +333,7 @@ restart:
         *      here on, this code is a state machine driven by received
         *      packets and timer events.
         */
+       debug_cond(DEBUG_INT_STATE, "--- NetLoop Init\n");
        NetInitLoop();
 
        switch (net_check_prereq(protocol)) {
@@ -459,7 +463,13 @@ restart:
 
                        net_cleanup_loop();
                        eth_halt();
+                       /* Invalidate the last protocol */
+                       eth_set_last_protocol(BOOTP);
+
                        puts("\nAbort\n");
+                       /* include a debug print as well incase the debug
+                          messages are directed to stderr */
+                       debug_cond(DEBUG_INT_STATE, "--- NetLoop Abort!\n");
                        goto done;
                }
 
@@ -487,6 +497,7 @@ restart:
                        }
 #endif /* CONFIG_SYS_FAULT_ECHO_LINK_DOWN, ... */
 #endif /* CONFIG_MII, ... */
+                       debug_cond(DEBUG_INT_STATE, "--- NetLoop timeout\n");
                        x = timeHandler;
                        timeHandler = (thand_f *)0;
                        (*x)();
@@ -512,12 +523,22 @@ restart:
                                sprintf(buf, "%lX", (unsigned long)load_addr);
                                setenv("fileaddr", buf);
                        }
-                       eth_halt();
+                       if (protocol != NETCONS)
+                               eth_halt();
+                       else
+                               eth_halt_state_only();
+
+                       eth_set_last_protocol(protocol);
+
                        ret = NetBootFileXferSize;
+                       debug_cond(DEBUG_INT_STATE, "--- NetLoop Success!\n");
                        goto done;
 
                case NETLOOP_FAIL:
                        net_cleanup_loop();
+                       /* Invalidate the last protocol */
+                       eth_set_last_protocol(BOOTP);
+                       debug_cond(DEBUG_INT_STATE, "--- NetLoop Fail!\n");
                        goto done;
 
                case NETLOOP_CONTINUE:
@@ -605,6 +626,7 @@ rxhand_f *net_get_udp_handler(void)
 
 void net_set_udp_handler(rxhand_f *f)
 {
+       debug_cond(DEBUG_INT_STATE, "--- NetLoop UDP handler set (%p)\n", f);
        if (f == NULL)
                udp_packet_handler = dummy_handler;
        else
@@ -618,6 +640,7 @@ rxhand_f *net_get_arp_handler(void)
 
 void net_set_arp_handler(rxhand_f *f)
 {
+       debug_cond(DEBUG_INT_STATE, "--- NetLoop ARP handler set (%p)\n", f);
        if (f == NULL)
                arp_packet_handler = dummy_handler;
        else
@@ -635,11 +658,15 @@ void
 NetSetTimeout(ulong iv, thand_f *f)
 {
        if (iv == 0) {
+               debug_cond(DEBUG_INT_STATE,
+                       "--- NetLoop timeout handler cancelled\n");
                timeHandler = (thand_f *)0;
        } else {
+               debug_cond(DEBUG_INT_STATE,
+                       "--- NetLoop timeout handler set (%p)\n", f);
                timeHandler = f;
                timeStart = get_timer(0);
-               timeDelta = iv;
+               timeDelta = iv * CONFIG_SYS_HZ / 1000;
        }
 }
 
@@ -672,7 +699,7 @@ int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport,
 
        /* if MAC address was not discovered yet, do an ARP request */
        if (memcmp(ether, NetEtherNullAddr, 6) == 0) {
-               debug("sending ARP for %pI4\n", &dest);
+               debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &dest);
 
                /* save the ip and eth addr for the packet to send after arp */
                NetArpWaitPacketIP = dest;
@@ -687,7 +714,8 @@ int NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport,
                ArpRequest();
                return 1;       /* waiting */
        } else {
-               debug("sending UDP to %pI4/%pM\n", &dest, ether);
+               debug_cond(DEBUG_DEV_PKT, "sending UDP to %pI4/%pM\n",
+                       &dest, ether);
                NetSendPacket(NetTxPacket, pkt_hdr_size + payload_len);
                return 0;       /* transmitted */
        }
@@ -910,7 +938,7 @@ NetReceive(uchar *inpkt, int len)
 #endif
        ushort cti = 0, vlanid = VLAN_NONE, myvlanid, mynvlanid;
 
-       debug("packet received\n");
+       debug_cond(DEBUG_NET_PKT, "packet received\n");
 
        NetRxPacket = inpkt;
        NetRxPacketLen = len;
@@ -941,8 +969,6 @@ NetReceive(uchar *inpkt, int len)
 
        eth_proto = ntohs(et->et_protlen);
 
-       debug("packet received\n");
-
        if (eth_proto < 1514) {
                struct e802_hdr *et802 = (struct e802_hdr *)et;
                /*
@@ -962,7 +988,7 @@ NetReceive(uchar *inpkt, int len)
                struct vlan_ethernet_hdr *vet =
                        (struct vlan_ethernet_hdr *)et;
 
-               debug("VLAN packet received\n");
+               debug_cond(DEBUG_NET_PKT, "VLAN packet received\n");
 
                /* too small packet? */
                if (len < VLAN_ETHER_HDR_SIZE)
@@ -984,7 +1010,7 @@ NetReceive(uchar *inpkt, int len)
                len -= VLAN_ETHER_HDR_SIZE;
        }
 
-       debug("Receive from protocol 0x%x\n", eth_proto);
+       debug_cond(DEBUG_NET_PKT, "Receive from protocol 0x%x\n", eth_proto);
 
 #if defined(CONFIG_CMD_CDP)
        if (iscdp) {
@@ -1013,7 +1039,7 @@ NetReceive(uchar *inpkt, int len)
                break;
 #endif
        case PROT_IP:
-               debug("Got IP\n");
+               debug_cond(DEBUG_NET_PKT, "Got IP\n");
                /* Before we start poking the header, make sure it is there */
                if (len < IP_UDP_HDR_SIZE) {
                        debug("len bad %d < %lu\n", len,
@@ -1022,11 +1048,12 @@ NetReceive(uchar *inpkt, int len)
                }
                /* Check the packet length */
                if (len < ntohs(ip->ip_len)) {
-                       printf("len bad %d < %d\n", len, ntohs(ip->ip_len));
+                       debug("len bad %d < %d\n", len, ntohs(ip->ip_len));
                        return;
                }
                len = ntohs(ip->ip_len);
-               debug("len=%d, v=%02x\n", len, ip->ip_hl_v & 0xff);
+               debug_cond(DEBUG_NET_PKT, "len=%d, v=%02x\n",
+                       len, ip->ip_hl_v & 0xff);
 
                /* Can't deal with anything except IPv4 */
                if ((ip->ip_hl_v & 0xf0) != 0x40)
@@ -1036,7 +1063,7 @@ NetReceive(uchar *inpkt, int len)
                        return;
                /* Check the Checksum of the header */
                if (!NetCksumOk((uchar *)ip, IP_HDR_SIZE / 2)) {
-                       puts("checksum bad\n");
+                       debug("checksum bad\n");
                        return;
                }
                /* If it is not for us, ignore it */
@@ -1085,6 +1112,10 @@ NetReceive(uchar *inpkt, int len)
                        return;
                }
 
+               debug_cond(DEBUG_DEV_PKT,
+                       "received UDP (to=%pI4, from=%pI4, len=%d)\n",
+                       &dst_ip, &src_ip, len);
+
 #ifdef CONFIG_UDP_CHECKSUM
                if (ip->udp_xsum != 0) {
                        ulong   xsum;
@@ -1130,6 +1161,7 @@ NetReceive(uchar *inpkt, int len)
 
 #ifdef CONFIG_NETCONSOLE
                nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
+                                       src_ip,
                                        ntohs(ip->udp_dst),
                                        ntohs(ip->udp_src),
                                        ntohs(ip->udp_len) - UDP_HDR_SIZE);