From ae1c8bfd89c3c6c2f4809c58f3e8dc43bd16a45d Mon Sep 17 00:00:00 2001 From: Antony Pavlov Date: Sun, 24 May 2015 21:57:48 +0300 Subject: [PATCH] net: fix ag934x.c and ag7240.c formatting This patch makes evident that ag934x.c is based on ag7240.c and the changes are not very significant so we can decrease code duplication in the future by joing the files. Signed-off-by: Antony Pavlov --- u-boot/cpu/mips/ar7240/ag7240.c | 111 +++++---- u-boot/cpu/mips/ar7240/ag934x.c | 421 ++++++++++++++++---------------- 2 files changed, 278 insertions(+), 254 deletions(-) diff --git a/u-boot/cpu/mips/ar7240/ag7240.c b/u-boot/cpu/mips/ar7240/ag7240.c index 6885025..f8cd936 100644 --- a/u-boot/cpu/mips/ar7240/ag7240.c +++ b/u-boot/cpu/mips/ar7240/ag7240.c @@ -18,14 +18,12 @@ #define _10BASET 10 #endif -#define ag7240_unit2mac(_unit) ag7240_macs[(_unit)] -#define ag7240_name2mac(name) strcmp(name,"eth0") ? ag7240_unit2mac(1) : ag7240_unit2mac(0) +#define ag7240_unit2mac(_unit) ag7240_macs[(_unit)] +#define ag7240_name2mac(name) strcmp(name,"eth0") ? ag7240_unit2mac(1) : ag7240_unit2mac(0) #define CHECK_BIT(var,pos) ((var) & (1<<(pos))) uint16_t ag7240_miiphy_read(char *devname, uint32_t phaddr, uint8_t reg); - void ag7240_miiphy_write(char *devname, uint32_t phaddr, uint8_t reg, uint16_t data); - ag7240_mac_t *ag7240_macs[CFG_AG7240_NMACS]; extern void ar933x_sys_frequency(u32 *cpu_freq, u32 *ddr_freq, u32 *ahb_freq); @@ -40,10 +38,11 @@ extern void athr_reg_init(void); //#define AG7240_DEBUG -static int ag7240_send(struct eth_device *dev, volatile void *packet, int length) { +static int ag7240_send(struct eth_device *dev, volatile void *packet, int length) +{ int i; - ag7240_mac_t *mac = (ag7240_mac_t *) dev->priv; + ag7240_mac_t *mac = (ag7240_mac_t *)dev->priv; ag7240_desc_t *f = mac->fifo_tx[mac->next_tx]; @@ -52,14 +51,15 @@ static int ag7240_send(struct eth_device *dev, volatile void *packet, int length f->pkt_start_addr = virt_to_phys(packet); ag7240_tx_give_to_dma(f); - flush_cache((u32) packet, length); + flush_cache((u32)packet, length); ag7240_reg_wr(mac, AG7240_DMA_TX_DESC, virt_to_phys(f)); ag7240_reg_wr(mac, AG7240_DMA_TX_CTRL, AG7240_TXE); for (i = 0; i < MAX_WAIT; i++) { udelay(10); - if (!ag7240_tx_owned_by_dma(f)) + if (!ag7240_tx_owned_by_dma(f)) { break; + } } if (i == MAX_WAIT) { @@ -73,19 +73,19 @@ static int ag7240_send(struct eth_device *dev, volatile void *packet, int length mac->next_tx = 0; } - return (0); + return 0; } -static int ag7240_recv(struct eth_device *dev) { +static int ag7240_recv(struct eth_device *dev) +{ int length; ag7240_desc_t *f; ag7240_mac_t *mac; - mac = (ag7240_mac_t *) dev->priv; + mac = (ag7240_mac_t *)dev->priv; for (;;) { f = mac->fifo_rx[mac->next_rx]; - if (ag7240_rx_owned_by_dma(f)) { break; } @@ -93,7 +93,7 @@ static int ag7240_recv(struct eth_device *dev) { length = f->pkt_size; NetReceive(NetRxPackets[mac->next_rx], length - 4); - flush_cache((u32) NetRxPackets[mac->next_rx], PKTSIZE_ALIGN); + flush_cache((u32)NetRxPackets[mac->next_rx], PKTSIZE_ALIGN); ag7240_rx_give_to_dma(f); @@ -107,13 +107,14 @@ static int ag7240_recv(struct eth_device *dev) { ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 1); } - return (0); + return 0; } /* * Called in ag7240_hw_start() function - * */ -void ag7240_mii_setup(ag7240_mac_t *mac) { + */ +void ag7240_mii_setup(ag7240_mac_t *mac) +{ u32 mgmt_cfg_val; u32 cpu_freq, ddr_freq, ahb_freq; u32 check_cnt; @@ -187,8 +188,8 @@ void ag7240_mii_setup(ag7240_mac_t *mac) { default: mgmt_cfg_val = 0x7; } - if ((is_ar7241() || is_ar7242())) { + if ((is_ar7241() || is_ar7242())) { /* External MII mode */ if (mac->mac_unit == 0 && is_ar7242()) { mgmt_cfg_val = 0x6; @@ -196,12 +197,12 @@ void ag7240_mii_setup(ag7240_mac_t *mac) { ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); } + /* Virian */ mgmt_cfg_val = 0x4; ag7240_reg_wr(ag7240_macs[1], AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(ag7240_macs[1], AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); printf("Virian MDC CFG Value ==> %x\n", mgmt_cfg_val); - } else if (is_ar933x()) { //GE0 receives Rx/Tx clock, and use S26 phy ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_MII_GE0_SLAVE); @@ -224,6 +225,7 @@ void ag7240_mii_setup(ag7240_mac_t *mac) { } else { /* Python 1.0 & 1.1 */ if (mac->mac_unit == 0) { check_cnt = 0; + while (check_cnt++ < 10) { ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); @@ -233,17 +235,17 @@ void ag7240_mii_setup(ag7240_mac_t *mac) { } #endif } + if (check_cnt == 11) { printf("%s: MDC check failed\n", __func__); } } } - } } -static void ag7240_hw_start(ag7240_mac_t *mac) { - +static void ag7240_hw_start(ag7240_mac_t *mac) +{ if (mac->mac_unit) { ag7240_reg_wr(mac, AG7240_MAC_CFG1, (AG7240_MAC_CFG1_RX_EN | AG7240_MAC_CFG1_TX_EN)); ag7240_reg_rmw_set(mac, AG7240_MAC_CFG2, (AG7240_MAC_CFG2_PAD_CRC_EN | AG7240_MAC_CFG2_LEN_CHECK | AG7240_MAC_CFG2_IF_1000)); @@ -266,18 +268,18 @@ static void ag7240_hw_start(ag7240_mac_t *mac) { * frames now,the PC first will tx a ARP request packet, it's a broadcast packet. */ ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_5, 0x66b82); - /* + /* * Setting Drop CRC Errors, Pause Frames, Length Error frames * and Multi/Broad cast frames. */ //ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_5, 0x7eccf); - ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_3, 0x1f00140); //printf("cfg1:\t%#x\ncfg2:\t%#x\n", ag7240_reg_rd(mac, AG7240_MAC_CFG1), ag7240_reg_rd(mac, AG7240_MAC_CFG2)); } -static int ag7240_check_link(ag7240_mac_t *mac) { +static int ag7240_check_link(ag7240_mac_t *mac) +{ int link = 0, duplex = 0, speed = 0; char *s; @@ -290,7 +292,7 @@ static int ag7240_check_link(ag7240_mac_t *mac) { mac->link = link; if (!mac->link) { - if((s != NULL) && (strcmp(s, "nc") != 0)){ + if ((s != NULL) && (strcmp(s, "nc") != 0)){ printf("Link down: %s\n", mac->dev->name); } return 0; @@ -307,7 +309,7 @@ static int ag7240_check_link(ag7240_mac_t *mac) { if (is_wasp() && (mac->mac_unit == 0)) { ar7240_reg_wr(AR7242_ETH_XMII_CONFIG,0x0e000000); } -#else +#else if (is_wasp() && (mac->mac_unit == 0)) { ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x06000000); } @@ -318,7 +320,8 @@ static int ag7240_check_link(ag7240_mac_t *mac) { ag7240_set_mac_if(mac, 0); ag7240_set_mac_speed(mac, 1); ag7240_reg_rmw_clear(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); - if ((is_ar7242() || is_wasp()) && (mac->mac_unit == 0)){ + + if ((is_ar7242() || is_wasp()) && (mac->mac_unit == 0)) { ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x0101); } break; @@ -339,7 +342,7 @@ static int ag7240_check_link(ag7240_mac_t *mac) { return 0; } - if (mac->link && (duplex == mac->duplex) && (speed == mac->speed)){ + if (mac->link && (duplex == mac->duplex) && (speed == mac->speed)) { return 1; } @@ -358,13 +361,13 @@ static int ag7240_check_link(ag7240_mac_t *mac) { /* * For every command we re-setup the ring and start with clean h/w rx state */ -static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd) { - +static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd) +{ int i; ag7240_desc_t *fr; ag7240_mac_t *mac = (ag7240_mac_t*)dev->priv; - if (!ag7240_check_link(mac)){ + if (!ag7240_check_link(mac)) { return 0; } @@ -373,7 +376,7 @@ static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd) { for (i = 0; i < NO_OF_RX_FIFOS; i++) { fr = mac->fifo_rx[i]; fr->pkt_start_addr = virt_to_phys(NetRxPackets[i]); - flush_cache((u32) NetRxPackets[i], PKTSIZE_ALIGN); + flush_cache((u32)NetRxPackets[i], PKTSIZE_ALIGN); ag7240_rx_give_to_dma(fr); } @@ -387,10 +390,10 @@ static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd) { } return 1; - } -static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo) { +static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo) +{ int i; u32 size; uchar *p = NULL; @@ -403,38 +406,43 @@ static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo) { return -1; } - p = (uchar *) (((u32) p + CFG_CACHELINE_SIZE - 1) & ~(CFG_CACHELINE_SIZE - 1)); + p = (uchar *)(((u32)p + CFG_CACHELINE_SIZE - 1) & ~(CFG_CACHELINE_SIZE - 1)); p = UNCACHED_SDRAM(p); - for (i = 0; i < ndesc; i++) - fifo[i] = (ag7240_desc_t *) p + i; + for (i = 0; i < ndesc; i++) { + fifo[i] = (ag7240_desc_t *)p + i; + } return 0; } -static int ag7240_setup_fifos(ag7240_mac_t *mac) { +static int ag7240_setup_fifos(ag7240_mac_t *mac) +{ int i; - if (ag7240_alloc_fifo(NO_OF_TX_FIFOS, mac->fifo_tx)) + if (ag7240_alloc_fifo(NO_OF_TX_FIFOS, mac->fifo_tx)) { return 1; + } for (i = 0; i < NO_OF_TX_FIFOS; i++) { mac->fifo_tx[i]->next_desc = (i == NO_OF_TX_FIFOS - 1) ? virt_to_phys(mac->fifo_tx[0]) : virt_to_phys(mac->fifo_tx[i + 1]); ag7240_tx_own(mac->fifo_tx[i]); } - if (ag7240_alloc_fifo(NO_OF_RX_FIFOS, mac->fifo_rx)) + if (ag7240_alloc_fifo(NO_OF_RX_FIFOS, mac->fifo_rx)) { return 1; + } for (i = 0; i < NO_OF_RX_FIFOS; i++) { mac->fifo_rx[i]->next_desc = (i == NO_OF_RX_FIFOS - 1) ? virt_to_phys(mac->fifo_rx[0]) : virt_to_phys(mac->fifo_rx[i + 1]); } - return (1); + return 1; } -static void ag7240_halt(struct eth_device *dev) { - ag7240_mac_t *mac = (ag7240_mac_t *) dev->priv; +static void ag7240_halt(struct eth_device *dev) +{ + ag7240_mac_t *mac = (ag7240_mac_t *)dev->priv; ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 0); while (ag7240_reg_rd(mac, AG7240_DMA_RX_CTRL)) ; @@ -443,7 +451,8 @@ static void ag7240_halt(struct eth_device *dev) { /* * Get MAC address stored in flash */ -static void ag7240_get_ethaddr(struct eth_device *dev) { +static void ag7240_get_ethaddr(struct eth_device *dev) +{ unsigned char *mac = dev->enetaddr; #ifdef OFFSET_MAC_ADDRESS unsigned char buffer[6]; @@ -486,7 +495,8 @@ static void ag7240_get_ethaddr(struct eth_device *dev) { #endif } -int ag7240_enet_initialize(bd_t * bis) { +int ag7240_enet_initialize(bd_t * bis) +{ struct eth_device *dev[CFG_AG7240_NMACS]; u32 mask, mac_h, mac_l; int i; @@ -542,7 +552,7 @@ int ag7240_enet_initialize(bd_t * bis) { dev[i]->halt = ag7240_halt; dev[i]->send = ag7240_send; dev[i]->recv = ag7240_recv; - dev[i]->priv = (void *) ag7240_macs[i]; + dev[i]->priv = (void *)ag7240_macs[i]; } for (i = 0; i < CFG_AG7240_NMACS; i++) { @@ -558,7 +568,7 @@ int ag7240_enet_initialize(bd_t * bis) { if (!i) { mask = (AR7240_RESET_GE0_MAC | AR7240_RESET_GE0_PHY | AR7240_RESET_GE1_MAC | AR7240_RESET_GE1_PHY); - if (is_ar7241() || is_ar7242() || is_wasp()){ + if (is_ar7241() || is_ar7242() || is_wasp()) { mask = mask | AR7240_RESET_GE0_MDIO | AR7240_RESET_GE1_MDIO; } @@ -600,7 +610,6 @@ int ag7240_enet_initialize(bd_t * bis) { /* if using header for register configuration, we have to */ /* configure s26 register after frame transmission is enabled */ - if (ag7240_macs[i]->mac_unit == 0) { /* WAN Phy */ #ifdef CONFIG_AR7242_S16_PHY if (is_ar7242() || is_wasp()) { @@ -658,7 +667,8 @@ int ag7240_enet_initialize(bd_t * bis) { } /* Modified by lsz for reduceing CMD_MII, but ag7240 need this 090306 */ -uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg) { +uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg) +{ ag7240_mac_t *mac = ag7240_name2mac(devname); uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg, val; volatile int rddata; @@ -694,7 +704,8 @@ uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg) { return val; } -void ag7240_miiphy_write(char *devname, uint32_t phy_addr, uint8_t reg, uint16_t data) { +void ag7240_miiphy_write(char *devname, uint32_t phy_addr, uint8_t reg, uint16_t data) +{ ag7240_mac_t *mac = ag7240_name2mac(devname); uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg; volatile int rddata; diff --git a/u-boot/cpu/mips/ar7240/ag934x.c b/u-boot/cpu/mips/ar7240/ag934x.c index 5a6fccf..327bea9 100644 --- a/u-boot/cpu/mips/ar7240/ag934x.c +++ b/u-boot/cpu/mips/ar7240/ag934x.c @@ -10,18 +10,18 @@ #include "ag934x.h" #include "ag934x_phy.h" -#define _1000BASET 1000 -#define _100BASET 100 -#define _10BASET 10 +#define _1000BASET 1000 +#define _100BASET 100 +#define _10BASET 10 -#define ag7240_unit2mac(_unit) ag7240_macs[(_unit)] -#define ag7240_name2mac(name) strcmp(name,"eth0") ? ag7240_unit2mac(1) : ag7240_unit2mac(0) +#define ag7240_unit2mac(_unit) ag7240_macs[(_unit)] +#define ag7240_name2mac(name) strcmp(name,"eth0") ? ag7240_unit2mac(1) : ag7240_unit2mac(0) #define CHECK_BIT(var,pos) ((var) & (1<<(pos))) -uint16_t ag7240_miiphy_read(char *devname, uint32_t phaddr, uint8_t reg); -void ag7240_miiphy_write(char *devname, uint32_t phaddr, uint8_t reg, uint16_t data); -ag7240_mac_t *ag7240_macs[CFG_AG7240_NMACS]; -extern void ar7240_sys_frequency(u32 *cpu_freq, u32 *ddr_freq, u32 *ahb_freq); +uint16_t ag7240_miiphy_read(char *devname, uint32_t phaddr, uint8_t reg); +void ag7240_miiphy_write(char *devname, uint32_t phaddr, uint8_t reg, uint16_t data); +ag7240_mac_t *ag7240_macs[CFG_AG7240_NMACS]; +extern void ar7240_sys_frequency(u32 *cpu_freq, u32 *ddr_freq, u32 *ahb_freq); #ifdef CFG_ATHRS26_PHY extern void athrs26_reg_init(void); @@ -46,8 +46,8 @@ extern void athr_reg_init(void); extern void athr_vir_reg_init(void); #endif - -static int ag7240_send(struct eth_device *dev, volatile void *packet, int length){ +static int ag7240_send(struct eth_device *dev, volatile void *packet, int length) +{ int i; ag7240_mac_t *mac = (ag7240_mac_t *)dev->priv; @@ -63,9 +63,9 @@ static int ag7240_send(struct eth_device *dev, volatile void *packet, int length ag7240_reg_wr(mac, AG7240_DMA_TX_DESC, virt_to_phys(f)); ag7240_reg_wr(mac, AG7240_DMA_TX_CTRL, AG7240_TXE); - for(i = 0; i < MAX_WAIT; i++){ + for (i = 0; i < MAX_WAIT; i++) { udelay(10); - if(!ag7240_tx_owned_by_dma(f)){ + if (!ag7240_tx_owned_by_dma(f)) { break; } } @@ -73,54 +73,57 @@ static int ag7240_send(struct eth_device *dev, volatile void *packet, int length f->pkt_start_addr = 0; f->pkt_size = 0; - if(++mac->next_tx >= NO_OF_TX_FIFOS){ + if (++mac->next_tx >= NO_OF_TX_FIFOS) { mac->next_tx = 0; } - return(0); + return 0; } -static int ag7240_recv(struct eth_device *dev){ +static int ag7240_recv(struct eth_device *dev) +{ int length; ag7240_desc_t *f; ag7240_mac_t *mac; mac = (ag7240_mac_t *)dev->priv; - for(;;){ + for (;;) { f = mac->fifo_rx[mac->next_rx]; - if(ag7240_rx_owned_by_dma(f)){ + if (ag7240_rx_owned_by_dma(f)) { break; } length = f->pkt_size; - NetReceive(NetRxPackets[mac->next_rx] , length - 4); - flush_cache((u32)NetRxPackets[mac->next_rx] , PKTSIZE_ALIGN); + NetReceive(NetRxPackets[mac->next_rx], length - 4); + flush_cache((u32)NetRxPackets[mac->next_rx], PKTSIZE_ALIGN); ag7240_rx_give_to_dma(f); - if(++mac->next_rx >= NO_OF_RX_FIFOS) + if (++mac->next_rx >= NO_OF_RX_FIFOS) { mac->next_rx = 0; } + } - if(!(ag7240_reg_rd(mac, AG7240_DMA_RX_CTRL))){ - ag7240_reg_wr(mac, AG7240_DMA_RX_DESC, virt_to_phys(f)); - ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 1); - } + if (!(ag7240_reg_rd(mac, AG7240_DMA_RX_CTRL))) { + ag7240_reg_wr(mac, AG7240_DMA_RX_DESC, virt_to_phys(f)); + ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 1); + } - return(0); + return 0; } /* * Called in ag7240_hw_start() function */ -void ag7240_mii_setup(ag7240_mac_t *mac){ +void ag7240_mii_setup(ag7240_mac_t *mac) +{ u32 mgmt_cfg_val; - u32 cpu_freq,ddr_freq,ahb_freq; + u32 cpu_freq, ddr_freq, ahb_freq; u32 check_cnt; - if((ar7240_reg_rd(WASP_BOOTSTRAP_REG) & WASP_REF_CLK_25) == 0){ + if ((ar7240_reg_rd(WASP_BOOTSTRAP_REG) & WASP_REF_CLK_25) == 0) { #ifndef CFG_DUAL_PHY_SUPPORT ar7240_reg_wr(AR934X_SWITCH_CLOCK_SPARE, 0x271); #endif @@ -129,14 +132,14 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ } #if defined(CONFIG_AR7242_S16_PHY) || defined(CFG_ATHRS17_PHY) - if(is_wasp() && mac->mac_unit == 0){ + if (is_wasp() && mac->mac_unit == 0) { #ifdef CONFIG_AR7242_S16_PHY //printf("WASP ----> S16 PHY *\n"); #else //printf("WASP ----> S17 PHY *\n"); #endif mgmt_cfg_val = 4; - + if(mac->mac_unit == 0){ ar7240_reg_wr(AG7240_ETH_CFG, AG7240_ETH_CFG_RGMII_GE0); } @@ -151,7 +154,7 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ #endif #ifdef CFG_ATHRS27_PHY - if(is_wasp()){ + if (is_wasp()) { //printf("WASP ----> S27 PHY \n"); mgmt_cfg_val = 2; ag7240_reg_wr(ag7240_macs[1], AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); @@ -161,11 +164,11 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ #endif #ifdef CONFIG_F2E_PHY - if(is_wasp()){ + if (is_wasp()) { //printf("WASP ----> F2 PHY *\n"); mgmt_cfg_val = 6; ar7240_reg_wr(AG7240_ETH_CFG, (AG7240_ETH_CFG_RMII_MASTER_MODE | AG7240_ETH_CFG_RMII_GE0 | AG7240_ETH_CFG_RMII_HISPD_GE0)); - + ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); @@ -174,7 +177,7 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ #endif #if defined(CONFIG_F1E_PHY) || defined(CONFIG_VIR_PHY) - if(is_wasp()){ + if (is_wasp()) { #ifdef CONFIG_VIR_PHY //printf("WASP ----> VIR PHY *\n"); #else @@ -193,85 +196,83 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ } #endif - if((ar7240_reg_rd(AR7240_REV_ID) & AR7240_REV_ID_MASK) == AR7240_REV_1_2){ + if ((ar7240_reg_rd(AR7240_REV_ID) & AR7240_REV_ID_MASK) == AR7240_REV_1_2) { mgmt_cfg_val = 0x2; - - if(mac->mac_unit == 0){ + if (mac->mac_unit == 0) { ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); } } else { ar7240_sys_frequency(&cpu_freq, &ddr_freq, &ahb_freq); - + // TODO: ?? - switch(ahb_freq/1000000){ - case 150: - mgmt_cfg_val = 0x7; - break; - case 175: - mgmt_cfg_val = 0x5; - break; - case 200: - mgmt_cfg_val = 0x4; - break; - case 210: - mgmt_cfg_val = 0x9; - break; - case 220: - mgmt_cfg_val = 0x9; - break; - default: - mgmt_cfg_val = 0x7; + switch (ahb_freq / 1000000) { + case 150: + mgmt_cfg_val = 0x7; + break; + case 175: + mgmt_cfg_val = 0x5; + break; + case 200: + mgmt_cfg_val = 0x4; + break; + case 210: + mgmt_cfg_val = 0x9; + break; + case 220: + mgmt_cfg_val = 0x9; + break; + default: + mgmt_cfg_val = 0x7; } - - if((is_ar7241() || is_ar7242())){ + + if ((is_ar7241() || is_ar7242())) { /* External MII mode */ - if(mac->mac_unit == 0 && is_ar7242()){ + if (mac->mac_unit == 0 && is_ar7242()) { mgmt_cfg_val = 0x6; ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_RGMII_GE0); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); } - + /* Virian */ mgmt_cfg_val = 0x4; ag7240_reg_wr(ag7240_macs[1], AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(ag7240_macs[1], AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); //printf("Virian MDC CFG Value ==> %x\n",mgmt_cfg_val); - } else if(is_ar933x()){ + } else if (is_ar933x()) { //GE0 receives Rx/Tx clock, and use S26 phy ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_MII_GE0_SLAVE); mgmt_cfg_val = 0xF; - - if(mac->mac_unit == 1){ + if (mac->mac_unit == 1) { check_cnt = 0; - while(check_cnt++ < 10){ + while (check_cnt++ < 10) { ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); #ifdef CFG_ATHRS26_PHY - if(athrs26_mdc_check() == 0){ + if (athrs26_mdc_check() == 0) { break; } #endif } - + //if(check_cnt == 11) //printf("%s: MDC check failed\n", __func__); } } else { /* Python 1.0 & 1.1 */ - if(mac->mac_unit == 0){ + if (mac->mac_unit == 0) { check_cnt = 0; - - while(check_cnt++ < 10){ + + while (check_cnt++ < 10) { ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val | (1 << 31)); ag7240_reg_wr(mac, AG7240_MAC_MII_MGMT_CFG, mgmt_cfg_val); #ifdef CFG_ATHRS26_PHY - if(athrs26_mdc_check() == 0){ + if (athrs26_mdc_check() == 0) { break; } #endif } - + //if(check_cnt == 11) //printf("%s: MDC check failed\n", __func__); } @@ -279,16 +280,16 @@ void ag7240_mii_setup(ag7240_mac_t *mac){ } } -static void ag7240_hw_start(ag7240_mac_t *mac){ - - if(mac->mac_unit){ +static void ag7240_hw_start(ag7240_mac_t *mac) +{ + if (mac->mac_unit) { ag7240_reg_wr(mac, AG7240_MAC_CFG1, (AG7240_MAC_CFG1_RX_EN | AG7240_MAC_CFG1_TX_EN)); ag7240_reg_rmw_set(mac, AG7240_MAC_CFG2, (AG7240_MAC_CFG2_PAD_CRC_EN | AG7240_MAC_CFG2_LEN_CHECK | AG7240_MAC_CFG2_IF_1000)); } else { ag7240_reg_wr(mac, AG7240_MAC_CFG1, (AG7240_MAC_CFG1_RX_EN | AG7240_MAC_CFG1_TX_EN)); ag7240_reg_rmw_set(mac, AG7240_MAC_CFG2, (AG7240_MAC_CFG2_PAD_CRC_EN | AG7240_MAC_CFG2_LEN_CHECK | AG7240_MAC_CFG2_IF_10_100)); } - + ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_0, 0x1f00); ag7240_mii_setup(mac); @@ -303,17 +304,18 @@ static void ag7240_hw_start(ag7240_mac_t *mac){ * frames now,the PC first will tx a ARP request packet, it's a broadcast packet. */ ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_5, 0x66b82); - /* - * Setting Drop CRC Errors, Pause Frames,Length Error frames - * and Multi/Broad cast frames. - */ + /* + * Setting Drop CRC Errors, Pause Frames, Length Error frames + * and Multi/Broad cast frames. + */ //ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_5, 0x7eccf); ag7240_reg_wr(mac, AG7240_MAC_FIFO_CFG_3, 0x1f00140); //printf(": cfg1 %#x cfg2 %#x\n", ag7240_reg_rd(mac, AG7240_MAC_CFG1), ag7240_reg_rd(mac, AG7240_MAC_CFG2)); } -static int ag7240_check_link(ag7240_mac_t *mac){ +static int ag7240_check_link(ag7240_mac_t *mac) +{ int link = 0, duplex = 0, speed = 0; char *s; @@ -325,84 +327,84 @@ static int ag7240_check_link(ag7240_mac_t *mac){ mac->link = link; - if(!mac->link){ - if((s != NULL) && (strcmp(s, "nc") != 0)){ + if (!mac->link) { + if ((s != NULL) && (strcmp(s, "nc") != 0)){ printf("Link down: %s\n", mac->dev->name); } - return(0); + return 0; } - switch(speed){ - case _1000BASET: - ag7240_set_mac_if(mac, 1); - ag7240_reg_rmw_set(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); - - if(is_ar7242() && (mac->mac_unit == 0)){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x1c000000); - } + switch (speed) { + case _1000BASET: + ag7240_set_mac_if(mac, 1); + ag7240_reg_rmw_set(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); + + if(is_ar7242() && (mac->mac_unit == 0)){ + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x1c000000); + } #ifdef CONFIG_F1E_PHY - if(is_wasp() && (mac->mac_unit == 0)){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x0e000000); - } + if(is_wasp() && (mac->mac_unit == 0)){ + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x0e000000); + } #elif CONFIG_VIR_PHY - if(is_wasp() && (mac->mac_unit == 0)){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x82000000); - ar7240_reg_wr(AG7240_ETH_CFG, 0x000c0001); - } -#else - if(is_wasp() && (mac->mac_unit == 0) && !is_f2e()){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x06000000); - } + if(is_wasp() && (mac->mac_unit == 0)){ + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x82000000); + ar7240_reg_wr(AG7240_ETH_CFG, 0x000c0001); + } +#else + if (is_wasp() && (mac->mac_unit == 0) && !is_f2e()){ + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x06000000); + } #endif - if(is_wasp() && mac->mac_unit == 0 && is_f1e() ){ - ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_RXD_DELAY); - ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_RDV_DELAY); - } - break; + if(is_wasp() && mac->mac_unit == 0 && is_f1e() ){ + ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_RXD_DELAY); + ar7240_reg_rmw_set(AG7240_ETH_CFG, AG7240_ETH_CFG_RDV_DELAY); + } + break; - case _100BASET: - ag7240_set_mac_if(mac, 0); - ag7240_set_mac_speed(mac, 1); - ag7240_reg_rmw_clear(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); - - if((is_ar7242() || is_wasp()) && (mac->mac_unit == 0) && !is_f2e()){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x0101); - } + case _100BASET: + ag7240_set_mac_if(mac, 0); + ag7240_set_mac_speed(mac, 1); + ag7240_reg_rmw_clear(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); - if(is_wasp() && mac->mac_unit == 0 && is_f1e()){ - ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RXD_DELAY); - ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RDV_DELAY); - } - break; + if ((is_ar7242() || is_wasp()) && (mac->mac_unit == 0) && !is_f2e()) { + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG, 0x0101); + } - case _10BASET: - ag7240_set_mac_if(mac, 0); - ag7240_set_mac_speed(mac, 0); - ag7240_reg_rmw_clear(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); + if (is_wasp() && mac->mac_unit == 0 && is_f1e()) { + ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RXD_DELAY); + ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RDV_DELAY); + } + break; - if((is_ar7242() || is_wasp()) && (mac->mac_unit == 0) && !is_f2e()){ - ar7240_reg_wr(AR7242_ETH_XMII_CONFIG,0x1616); - } + case _10BASET: + ag7240_set_mac_if(mac, 0); + ag7240_set_mac_speed(mac, 0); + ag7240_reg_rmw_clear(mac, AG7240_MAC_FIFO_CFG_5, (1 << 19)); - if(is_wasp() && mac->mac_unit == 0 && is_f1e()){ - ar7240_reg_rmw_clear(AG7240_ETH_CFG,AG7240_ETH_CFG_RXD_DELAY); - ar7240_reg_rmw_clear(AG7240_ETH_CFG,AG7240_ETH_CFG_RDV_DELAY); - } - - if(is_f2e()){ - ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RMII_HISPD_GE0); - } - break; + if ((is_ar7242() || is_wasp()) && (mac->mac_unit == 0) && !is_f2e()) { + ar7240_reg_wr(AR7242_ETH_XMII_CONFIG,0x1616); + } + + if (is_wasp() && mac->mac_unit == 0 && is_f1e()){ + ar7240_reg_rmw_clear(AG7240_ETH_CFG,AG7240_ETH_CFG_RXD_DELAY); + ar7240_reg_rmw_clear(AG7240_ETH_CFG,AG7240_ETH_CFG_RDV_DELAY); + } + + if (is_f2e()) { + ar7240_reg_rmw_clear(AG7240_ETH_CFG, AG7240_ETH_CFG_RMII_HISPD_GE0); + } + break; default: - if((s != NULL) && (strcmp(s, "nc") != 0)){ + if ((s != NULL) && (strcmp(s, "nc") != 0)) { printf("## Error: invalid speed detected\n"); } - return(0); + return 0; } - if(mac->link && (duplex == mac->duplex) && (speed == mac->speed)){ - return(1); + if (mac->link && (duplex == mac->duplex) && (speed == mac->speed)) { + return 1; } mac->duplex = duplex; @@ -414,24 +416,25 @@ static int ag7240_check_link(ag7240_mac_t *mac){ ag7240_set_mac_duplex(mac, duplex); - return(1); + return 1; } /* * For every command we re-setup the ring and start with clean h/w rx state */ -static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd){ +static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd) +{ int i; ag7240_desc_t *fr; ag7240_mac_t *mac = (ag7240_mac_t*)dev->priv; - if(!ag7240_check_link(mac)){ - return(0); + if (!ag7240_check_link(mac)) { + return 0; } mac->next_rx = 0; - - for(i = 0; i < NO_OF_RX_FIFOS; i++){ + + for (i = 0; i < NO_OF_RX_FIFOS; i++) { fr = mac->fifo_rx[i]; fr->pkt_start_addr = virt_to_phys(NetRxPackets[i]); flush_cache((u32)NetRxPackets[i], PKTSIZE_ALIGN); @@ -440,12 +443,13 @@ static int ag7240_clean_rx(struct eth_device *dev, bd_t * bd){ ag7240_reg_wr(mac, AG7240_DMA_RX_DESC, virt_to_phys(mac->fifo_rx[0])); ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, AG7240_RXE); /* rx start */ - + udelay(1000 * 1000); - return(1); + return 1; } -static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo){ +static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo) +{ int i; u32 size; uchar *p = NULL; @@ -453,54 +457,58 @@ static int ag7240_alloc_fifo(int ndesc, ag7240_desc_t ** fifo){ size = sizeof(ag7240_desc_t) * ndesc; size += CFG_CACHELINE_SIZE - 1; - if((p = malloc(size)) == NULL){ + if ((p = malloc(size)) == NULL) { printf("## Error: cant allocate fifos\n"); - return(-1); + return -1; } - p = (uchar *)(((u32)p + CFG_CACHELINE_SIZE - 1) & ~(CFG_CACHELINE_SIZE - 1)); + p = (uchar *)(((u32)p + CFG_CACHELINE_SIZE - 1) & ~(CFG_CACHELINE_SIZE - 1)); p = UNCACHED_SDRAM(p); - for(i = 0; i < ndesc; i++){ + for (i = 0; i < ndesc; i++) { fifo[i] = (ag7240_desc_t *)p + i; } - return(0); + return 0; } -static int ag7240_setup_fifos(ag7240_mac_t *mac){ +static int ag7240_setup_fifos(ag7240_mac_t *mac) +{ int i; - if(ag7240_alloc_fifo(NO_OF_TX_FIFOS, mac->fifo_tx)){ - return(1); + if (ag7240_alloc_fifo(NO_OF_TX_FIFOS, mac->fifo_tx)) { + return 1; } - for(i = 0; i < NO_OF_TX_FIFOS; i++){ + for (i = 0; i < NO_OF_TX_FIFOS; i++) { mac->fifo_tx[i]->next_desc = (i == NO_OF_TX_FIFOS - 1) ? virt_to_phys(mac->fifo_tx[0]) : virt_to_phys(mac->fifo_tx[i + 1]); ag7240_tx_own(mac->fifo_tx[i]); } - if(ag7240_alloc_fifo(NO_OF_RX_FIFOS, mac->fifo_rx)){ - return(1); + if (ag7240_alloc_fifo(NO_OF_RX_FIFOS, mac->fifo_rx)) { + return 1; } - for(i = 0; i < NO_OF_RX_FIFOS; i++){ + for (i = 0; i < NO_OF_RX_FIFOS; i++) { mac->fifo_rx[i]->next_desc = (i == NO_OF_RX_FIFOS - 1) ? virt_to_phys(mac->fifo_rx[0]) : virt_to_phys(mac->fifo_rx[i + 1]); } - return(1); + return 1; } -static void ag7240_halt(struct eth_device *dev){ - ag7240_mac_t *mac = (ag7240_mac_t *)dev->priv; - ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 0); - while(ag7240_reg_rd(mac, AG7240_DMA_RX_CTRL)); +static void ag7240_halt(struct eth_device *dev) +{ + ag7240_mac_t *mac = (ag7240_mac_t *)dev->priv; + ag7240_reg_wr(mac, AG7240_DMA_RX_CTRL, 0); + while (ag7240_reg_rd(mac, AG7240_DMA_RX_CTRL)) + ; } /* * Get MAC address stored in flash */ -static void ag7240_get_ethaddr(struct eth_device *dev){ +static void ag7240_get_ethaddr(struct eth_device *dev) +{ unsigned char *mac = dev->enetaddr; #ifdef OFFSET_MAC_ADDRESS unsigned char buffer[6]; @@ -543,7 +551,8 @@ static void ag7240_get_ethaddr(struct eth_device *dev){ #endif } -int ag7240_enet_initialize(bd_t * bis){ +int ag7240_enet_initialize(bd_t * bis) +{ struct eth_device *dev[CFG_AG7240_NMACS]; u32 mask, mac_h, mac_l; int i; @@ -559,15 +568,15 @@ int ag7240_enet_initialize(bd_t * bis){ ar7240_reg_wr(AR7240_GPIO_BASE + 0x28 , ar7240_reg_rd(AR7240_GPIO_BASE + 0x28) | (0xF8)); */ - for(i = 0;i < CFG_AG7240_NMACS;i++){ - if((dev[i] = (struct eth_device *)malloc(sizeof(struct eth_device))) == NULL){ + for (i = 0;i < CFG_AG7240_NMACS;i++) { + if ((dev[i] = (struct eth_device *)malloc(sizeof(struct eth_device))) == NULL) { //puts("malloc failed\n"); - return(0); + return 0; } - if((ag7240_macs[i] = (ag7240_mac_t *)malloc(sizeof(ag7240_mac_t))) == NULL){ + if ((ag7240_macs[i] = (ag7240_mac_t *)malloc(sizeof(ag7240_mac_t))) == NULL) { //puts("malloc failed\n"); - return(0); + return 0; } memset(ag7240_macs[i], 0, sizeof(ag7240_macs[i])); @@ -577,7 +586,7 @@ int ag7240_enet_initialize(bd_t * bis){ ag7240_get_ethaddr(dev[i]); ag7240_macs[i]->mac_unit = i; - ag7240_macs[i]->mac_base = i ? AR7240_GE1_BASE : AR7240_GE0_BASE ; + ag7240_macs[i]->mac_base = i ? AR7240_GE1_BASE : AR7240_GE0_BASE; ag7240_macs[i]->dev = dev[i]; dev[i]->iobase = 0; @@ -587,20 +596,21 @@ int ag7240_enet_initialize(bd_t * bis){ dev[i]->recv = ag7240_recv; dev[i]->priv = (void *)ag7240_macs[i]; } - - for(i = 0;i < CFG_AG7240_NMACS;i++){ + + for (i = 0; i < CFG_AG7240_NMACS; i++) { + eth_register(dev[i]); - + #if(CONFIG_COMMANDS & CFG_CMD_MII) miiphy_register(dev[i]->name, ag7240_miiphy_read, ag7240_miiphy_write); #endif ag7240_reg_rmw_set(ag7240_macs[i], AG7240_MAC_CFG1, AG7240_MAC_CFG1_SOFT_RST | AG7240_MAC_CFG1_RX_RST | AG7240_MAC_CFG1_TX_RST); - if(!i){ + if (!i) { mask = (AR7240_RESET_GE0_MAC | AR7240_RESET_GE0_PHY | AR7240_RESET_GE1_MAC | AR7240_RESET_GE1_PHY); - if(is_ar7241() || is_ar7242() || is_wasp()){ + if (is_ar7241() || is_ar7242() || is_wasp()) { mask = mask | AR7240_RESET_GE0_MDIO | AR7240_RESET_GE1_MDIO; } @@ -616,6 +626,7 @@ int ag7240_enet_initialize(bd_t * bis){ } ag7240_hw_start(ag7240_macs[i]); + ag7240_setup_fifos(ag7240_macs[i]); udelay(100 * 1000); @@ -631,9 +642,9 @@ int ag7240_enet_initialize(bd_t * bis){ /* if using header for register configuration, we have to */ /* configure s26 register after frame transmission is enabled */ - if(ag7240_macs[i]->mac_unit == 0){ /* WAN Phy */ + if (ag7240_macs[i]->mac_unit == 0) { /* WAN Phy */ #ifdef CONFIG_AR7242_S16_PHY - if(is_ar7242() || is_wasp()){ + if (is_ar7242() || is_wasp()) { athrs16_reg_init(); } else #endif @@ -682,23 +693,24 @@ int ag7240_enet_initialize(bd_t * bis){ //printf("%s up\n",dev[i]->name); } - return(1); + return 1; } -uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg){ - ag7240_mac_t *mac = ag7240_name2mac(devname); - uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg, val; - volatile int rddata; - uint16_t ii = 0xFFFF; +uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg) +{ + ag7240_mac_t *mac = ag7240_name2mac(devname); + uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg, val; + volatile int rddata; + uint16_t ii = 0xFFFF; /* - * Check for previous transactions are complete. Added to avoid - * race condition while running at higher frequencies. - */ + * Check for previous transactions are complete. Added to avoid + * race condition while running at higher frequencies. + */ do { udelay(5); rddata = ag7240_reg_rd(mac, AG7240_MII_MGMT_IND) & 0x1; - } while(rddata && --ii); + } while (rddata && --ii); //if(ii == 0) //printf("ERROR:%s:%d transaction failed\n",__func__,__LINE__); @@ -710,7 +722,7 @@ uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg){ do { udelay(5); rddata = ag7240_reg_rd(mac, AG7240_MII_MGMT_IND) & 0x1; - } while(rddata && --ii); + } while (rddata && --ii); //if(ii==0) //printf("Error!!! Leave ag7240_miiphy_read without polling correct status!\n"); @@ -718,23 +730,24 @@ uint16_t ag7240_miiphy_read(char *devname, uint32_t phy_addr, uint8_t reg){ val = ag7240_reg_rd(mac, AG7240_MII_MGMT_STATUS); ag7240_reg_wr(mac, AG7240_MII_MGMT_CMD, 0x0); - return(val); + return val; } -void ag7240_miiphy_write(char *devname, uint32_t phy_addr, uint8_t reg, uint16_t data){ - ag7240_mac_t *mac = ag7240_name2mac(devname); - uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg; - volatile int rddata; - uint16_t ii = 0xFFFF; +void ag7240_miiphy_write(char *devname, uint32_t phy_addr, uint8_t reg, uint16_t data) +{ + ag7240_mac_t *mac = ag7240_name2mac(devname); + uint16_t addr = (phy_addr << AG7240_ADDR_SHIFT) | reg; + volatile int rddata; + uint16_t ii = 0xFFFF; /* - * Check for previous transactions are complete. Added to avoid - * race condition while running at higher frequencies. - */ + * Check for previous transactions are complete. Added to avoid + * race condition while running at higher frequencies. + */ do { udelay(5); rddata = ag7240_reg_rd(mac, AG7240_MII_MGMT_IND) & 0x1; - } while(rddata && --ii); + } while (rddata && --ii); //if(ii == 0) //printf("ERROR:%s:%d transaction failed\n",__func__,__LINE__); @@ -744,6 +757,6 @@ void ag7240_miiphy_write(char *devname, uint32_t phy_addr, uint8_t reg, uint16_t do { rddata = ag7240_reg_rd(mac, AG7240_MII_MGMT_IND) & 0x1; - } while(rddata && --ii); + } while (rddata && --ii); } -- 2.25.1