November 2015 - U-Boot

[U-Boot] [PATCH] net: gem: Build warning fixes for 64-bit
by Michal Simek 29 Dec '15

29 Dec '15

Cast pointers to unsigned long instead of a sized 32-bit type to avoid pointer to integer cast size mismatch warnings. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/net/zynq_gem.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 045954a7b059..ee2c6b1f4579 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -347,13 +347,13 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis) for (i = 0; i < RX_BUF; i++) { priv->rx_bd[i].status = 0xF0000000; priv->rx_bd[i].addr = - ((u32)(priv->rxbuffers) + + ((unsigned long)(priv->rxbuffers) + (i * PKTSIZE_ALIGN)); } /* WRAP bit to last BD */ priv->rx_bd[--i].addr |= ZYNQ_GEM_RXBUF_WRAP_MASK; /* Write RxBDs to IP */ - writel((u32)priv->rx_bd, &regs->rxqbase); + writel((unsigned long)priv->rx_bd, &regs->rxqbase); /* Setup for DMA Configuration register */ writel(ZYNQ_GEM_DMACR_INIT, &regs->dmacr); @@ -378,8 +378,8 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis) flush_dcache_range((ulong)&dummy_rx_bd, (ulong)&dummy_rx_bd + sizeof(dummy_rx_bd)); - writel((u32)dummy_tx_bd, &regs->transmit_q1_ptr); - writel((u32)dummy_rx_bd, &regs->receive_q1_ptr); + writel((unsigned long)dummy_tx_bd, &regs->transmit_q1_ptr); + writel((unsigned long)dummy_rx_bd, &regs->receive_q1_ptr); priv->init++; } @@ -458,7 +458,7 @@ static inline int wait_for_bit(const char *func, u32 *reg, const u32 mask, static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) { - u32 addr, size; + unsigned long addr, size; struct zynq_gem_priv *priv = dev->priv; struct zynq_gem_regs *regs = (struct zynq_gem_regs *)dev->iobase; struct emac_bd *current_bd = &priv->tx_bd[1]; @@ -466,7 +466,7 @@ static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) /* Setup Tx BD */ memset(priv->tx_bd, 0, sizeof(struct emac_bd)); - priv->tx_bd->addr = (u32)ptr; + priv->tx_bd->addr = (unsigned long)ptr; priv->tx_bd->status = (len & ZYNQ_GEM_TXBUF_FRMLEN_MASK) | ZYNQ_GEM_TXBUF_LAST_MASK; /* Dummy descriptor to mark it as the last in descriptor chain */ @@ -476,14 +476,14 @@ static int zynq_gem_send(struct eth_device *dev, void *ptr, int len) ZYNQ_GEM_TXBUF_USED_MASK; /* setup BD */ - writel((u32)priv->tx_bd, &regs->txqbase); + writel((unsigned long)priv->tx_bd, &regs->txqbase); - addr = (u32) ptr; + addr = (unsigned long)ptr; addr &= ~(ARCH_DMA_MINALIGN - 1); size = roundup(len, ARCH_DMA_MINALIGN); flush_dcache_range(addr, addr + size); - addr = (u32)priv->rxbuffers; + addr = (unsigned long)priv->rxbuffers; addr &= ~(ARCH_DMA_MINALIGN - 1); size = roundup((RX_BUF * PKTSIZE_ALIGN), ARCH_DMA_MINALIGN); flush_dcache_range(addr, addr + size); @@ -519,7 +519,7 @@ static int zynq_gem_recv(struct eth_device *dev) frame_len = current_bd->status & ZYNQ_GEM_RXBUF_LEN_MASK; if (frame_len) { - u32 addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; + unsigned long addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; addr &= ~(ARCH_DMA_MINALIGN - 1); net_process_received_packet((u8 *)addr, frame_len); @@ -601,7 +601,8 @@ int zynq_gem_initialize(bd_t *bis, phys_addr_t base_addr, /* Initialize the bd spaces for tx and rx bd's */ priv->tx_bd = (struct emac_bd *)bd_space; - priv->rx_bd = (struct emac_bd *)((u32)bd_space + BD_SEPRN_SPACE); + priv->rx_bd = (struct emac_bd *)((unsigned long)bd_space + + BD_SEPRN_SPACE); priv->phyaddr = phy_addr; priv->emio = emio; -- 2.5.0

2 3

[U-Boot] [PATCH V2 00/12] Series to move headers to a consistent include location
by Nishanth Menon 28 Dec '15

28 Dec '15

Hi, This series is hopefully to setup the stage for consolidation of board/vendor/common include header organization in u-boot. Discussion thread: https://patchwork.ozlabs.org/patch/540280/ https://patchwork.ozlabs.org/patch/541068/ https://patchwork.ozlabs.org/patch/542424/ In short, we: a) Dont want to have symlinks for include headers b) Want to be able to reference headers in reuse by doing #include <board-common/xyz.h> So, we follow the "option #6" discussed in the last of the threads above. Only the first patch in this series was pasted and discussed previously. The remaining 11 in the series is natural cleanups as a result. The series is Based on: master ade766acfb27 Merge branch 'next' of git://git.denx.de/u-boot-blackfin Script 1: identifying the board/vendors impacted: #!/bin/bash for common in `git grep "../common" board|grep "#include"|cut -d ':' -f1|cut -d '/' -f1,2|sort -u` do cfiles=`git grep "../common" $common|grep "#include"|cut -d '"' -f2|sort -u|grep c$` headers=`git grep "../common" $common|grep "#include"|cut -d '"' -f2|sort -u|grep h$` if [ -z "$headers" ]; then continue; fi echo $common : $headers : $cfiles done Output: board/BuR : ../common/bur_common.h : board/compulab : ../common/common.h ../common/eeprom.h : board/freescale : ../common/cadmus.h ../common/dcu_sii9022a.h ../common/diu_ch7301.h ../common/eeprom.h ../common/fman.h ../common/idt8t49n222a_serdes_clk.h ../common/ngpixis.h ../common/pfuze.h ../common/pixis.h ../common/pq-mds-pib.h ../common/qixis.h ../common/sgmii_riser.h ../common/sleep.h ../common/via.h ../common/vid.h ../common/vsc3316_3308.h ../common/zm7300.h : board/gdsys : ../common/dp501.h ../common/mclink.h ../common/osd.h ../common/phy.h : board/keymile : ../common/common.h : board/LaCie : ../common/common.h ../common/cpld-gpio-bus.h : board/mpl : ../common/common_util.h ../common/isa.h : board/seco : ../common/mx6.h : board/siemens : ../common/factoryset.h : ../common/board.c board/varisys : ../common/eeprom.h : board/xes : ../common/fsl_8xxx_misc.h : Script2: this is used to move the headers to relevant locations: #!/bin/bash vendor=$1 common=$vendor/common cfiles=`git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$` headers=`git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$` mkdir -p $common/include/board-common set -x for header in $headers do echo "processing $header in $common" hbase=`basename $header` git mv $common/$hbase $common/include/board-common sed -i -e "s/\"..\/common\/$hbase\"/<board-common\/$hbase>/g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"/<board-common\/$hbase>/g" $vendor/common/*.[chS] done Build tested with the following with at least the ARM platforms: MAKEALL -v compulab -v BuR -v LaCie -v seco -v siemens NOTE: I know this series impacts a lot of platforms.. other than patch #1, they are probably nice to have.. but upto you guys if you'd like it or not.. it will be good to standardize things a bit here. I am *NOT* trying to fix the following code: $ git grep "\.\./common" board/*/*/*.[chS]|sort -u board/amcc/bamboo/flash.c:#include "../common/flash.c" board/amcc/bubinga/flash.c:#include "../common/flash.c" board/amcc/luan/flash.c:#include "../common/flash.c" board/amcc/walnut/flash.c:#include "../common/flash.c" board/esd/cpci2dp/flash.c:#include "../common/flash.c" board/esd/cpci405/cpci405.c:#include "../common/fpga.c" board/esd/cpci405/flash.c:#include "../common/flash.c" board/esd/plu405/flash.c:#include "../common/flash.c" board/esd/plu405/plu405.c:#include "../common/fpga.c" board/esd/vom405/flash.c:#include "../common/flash.c" board/siemens/draco/board.c:#include "../common/board.c" board/siemens/pxm2/board.c:#include "../common/board.c" board/siemens/rut/board.c:#include "../common/board.c" Nishanth Menon (12): Makefile: Include vendor common library in include search path board: BuR: Move common headers to board-common directory board: compulab: Move common headers to board-common directory board: freescale: Move common headers to board-common directory board: gdsys: Move common headers to board-common directory board: keymile: Move common headers to board-common directory board: LaCie: Move common headers to board-common directory board: mpl: Move common headers to board-common directory board: seco: Move common headers to board-common directory board: siemens: Move common headers to board-common directory board: varisys: Move common headers to board-common directory board: xes: Move common headers to board-common directory Makefile | 3 +++ board/BuR/common/common.c | 2 +- board/BuR/common/{ => include/board-common}/bur_common.h | 0 board/BuR/kwb/board.c | 2 +- board/BuR/tseries/board.c | 2 +- board/LaCie/common/cpld-gpio-bus.c | 2 +- board/LaCie/common/{ => include/board-common}/common.h | 0 board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h | 0 board/LaCie/edminiv2/edminiv2.c | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 4 ++-- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/compulab/cm_fx6/cm_fx6.c | 4 ++-- board/compulab/cm_t335/cm_t335.c | 2 +- board/compulab/cm_t35/cm_t35.c | 4 ++-- board/compulab/cm_t3517/cm_t3517.c | 4 ++-- board/compulab/cm_t54/cm_t54.c | 2 +- board/compulab/common/common.c | 4 ++-- board/compulab/common/eeprom.c | 2 +- board/compulab/common/{ => include/board-common}/common.h | 0 board/compulab/common/{ => include/board-common}/eeprom.h | 0 board/compulab/common/omap3_smc911x.c | 2 +- board/freescale/b4860qds/b4860qds.c | 8 ++++---- board/freescale/b4860qds/eth_b4860qds.c | 6 +++--- board/freescale/b4860qds/spl.c | 2 +- board/freescale/bsc9132qds/bsc9132qds.c | 2 +- board/freescale/common/arm_sleep.c | 2 +- board/freescale/common/cds_pci_ft.c | 2 +- board/freescale/common/ics307_clk.c | 6 +++--- board/freescale/common/idt8t49n222a_serdes_clk.c | 2 +- board/freescale/common/{ => include/board-common}/cadmus.h | 0 board/freescale/common/{ => include/board-common}/dcu_sii9022a.h | 0 board/freescale/common/{ => include/board-common}/diu_ch7301.h | 0 board/freescale/common/{ => include/board-common}/eeprom.h | 0 board/freescale/common/{ => include/board-common}/fman.h | 0 .../common/{ => include/board-common}/idt8t49n222a_serdes_clk.h | 0 board/freescale/common/{ => include/board-common}/ngpixis.h | 0 board/freescale/common/{ => include/board-common}/pfuze.h | 0 board/freescale/common/{ => include/board-common}/pixis.h | 0 board/freescale/common/{ => include/board-common}/pq-mds-pib.h | 0 board/freescale/common/{ => include/board-common}/qixis.h | 0 board/freescale/common/{ => include/board-common}/sgmii_riser.h | 0 board/freescale/common/{ => include/board-common}/sleep.h | 0 board/freescale/common/{ => include/board-common}/via.h | 0 board/freescale/common/{ => include/board-common}/vid.h | 0 board/freescale/common/{ => include/board-common}/vsc3316_3308.h | 0 board/freescale/common/{ => include/board-common}/zm7300.h | 0 board/freescale/common/mpc85xx_sleep.c | 2 +- board/freescale/common/ngpixis.c | 2 +- board/freescale/common/pq-mds-pib.c | 2 +- board/freescale/common/qixis.c | 2 +- board/freescale/common/sys_eeprom.c | 2 +- board/freescale/common/vid.c | 2 +- board/freescale/common/vsc3316_3308.c | 2 +- board/freescale/common/zm7300.c | 2 +- board/freescale/corenet_ds/corenet_ds.c | 2 +- board/freescale/corenet_ds/eth_hydra.c | 4 ++-- board/freescale/corenet_ds/eth_p4080.c | 4 ++-- board/freescale/corenet_ds/eth_superhydra.c | 4 ++-- board/freescale/ls1021aqds/dcu.c | 2 +- board/freescale/ls1021aqds/eth.c | 4 ++-- board/freescale/ls1021aqds/ls1021aqds.c | 4 ++-- board/freescale/ls1021atwr/dcu.c | 2 +- board/freescale/ls1021atwr/ls1021atwr.c | 2 +- board/freescale/ls1043ardb/eth.c | 2 +- board/freescale/ls2085aqds/eth.c | 2 +- board/freescale/ls2085aqds/ls2085aqds.c | 2 +- board/freescale/ls2085ardb/ls2085ardb.c | 2 +- board/freescale/mpc832xemds/mpc832xemds.c | 2 +- board/freescale/mpc832xemds/pci.c | 2 +- board/freescale/mpc837xemds/mpc837xemds.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/mpc8541cds/mpc8541cds.c | 6 +++--- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 6 +++--- board/freescale/mpc8555cds/mpc8555cds.c | 6 +++--- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 2 +- board/freescale/mx6sabresd/mx6sabresd.c | 2 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- board/freescale/p1022ds/diu.c | 2 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1022ds/spl.c | 2 +- board/freescale/p2041rdb/eth.c | 2 +- board/freescale/t102xqds/eth_t102xqds.c | 4 ++-- board/freescale/t102xqds/spl.c | 2 +- board/freescale/t102xqds/t102xqds.c | 4 ++-- board/freescale/t102xrdb/eth_t102xrdb.c | 2 +- board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/freescale/t1040qds/diu.c | 4 ++-- board/freescale/t1040qds/eth.c | 4 ++-- board/freescale/t1040qds/t1040qds.c | 4 ++-- board/freescale/t104xrdb/diu.c | 2 +- board/freescale/t104xrdb/eth.c | 2 +- board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t208xqds/eth_t208xqds.c | 4 ++-- board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xqds/t208xqds.c | 6 +++--- board/freescale/t208xrdb/t208xrdb.c | 2 +- board/freescale/t4qds/eth.c | 4 ++-- board/freescale/t4qds/spl.c | 2 +- board/freescale/t4qds/t4240qds.c | 4 ++-- board/freescale/t4rdb/eth.c | 2 +- board/gdsys/405ep/dlvision-10g.c | 2 +- board/gdsys/405ep/iocon.c | 6 +++--- board/gdsys/common/{ => include/board-common}/dp501.h | 0 board/gdsys/common/{ => include/board-common}/mclink.h | 0 board/gdsys/common/{ => include/board-common}/osd.h | 0 board/gdsys/common/{ => include/board-common}/phy.h | 0 board/gdsys/common/osd.c | 2 +- board/gdsys/mpc8308/hrcon.c | 6 +++--- board/gdsys/p1022/controlcenterd.c | 2 +- board/keymile/common/common.c | 2 +- board/keymile/common/{ => include/board-common}/common.h | 0 board/keymile/common/ivm.c | 2 +- board/keymile/km82xx/km82xx.c | 2 +- board/keymile/km83xx/km83xx.c | 2 +- board/keymile/km83xx/km83xx_i2c.c | 2 +- board/keymile/km_arm/km_arm.c | 2 +- board/keymile/kmp204x/kmp204x.c | 2 +- board/keymile/kmp204x/qrio.c | 2 +- board/mpl/common/common_util.c | 2 +- board/mpl/common/{ => include/board-common}/common_util.h | 0 board/mpl/common/{ => include/board-common}/isa.h | 0 board/mpl/common/isa.c | 2 +- board/mpl/common/kbd.c | 2 +- board/mpl/common/pci.c | 2 +- board/mpl/mip405/cmd_mip405.c | 2 +- board/mpl/mip405/mip405.c | 2 +- board/mpl/pip405/cmd_pip405.c | 2 +- board/mpl/pip405/pip405.c | 4 ++-- board/mpl/vcma9/cmd_vcma9.c | 2 +- board/mpl/vcma9/vcma9.c | 2 +- board/seco/common/{ => include/board-common}/mx6.h | 0 board/seco/mx6quq7/mx6quq7.c | 2 +- board/siemens/common/board.c | 2 +- board/siemens/common/factoryset.c | 2 +- board/siemens/common/{ => include/board-common}/factoryset.h | 0 board/siemens/draco/board.c | 2 +- board/siemens/pxm2/board.c | 2 +- board/siemens/rut/board.c | 2 +- board/varisys/common/{ => include/board-common}/eeprom.h | 0 board/varisys/common/sys_eeprom.c | 2 +- board/varisys/cyrus/cyrus.c | 2 +- board/xes/common/board.c | 2 +- board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h | 0 board/xes/xpedite517x/xpedite517x.c | 2 +- 153 files changed, 160 insertions(+), 157 deletions(-) rename board/BuR/common/{ => include/board-common}/bur_common.h (100%) rename board/LaCie/common/{ => include/board-common}/common.h (100%) rename board/LaCie/common/{ => include/board-common}/cpld-gpio-bus.h (100%) rename board/compulab/common/{ => include/board-common}/common.h (100%) rename board/compulab/common/{ => include/board-common}/eeprom.h (100%) rename board/freescale/common/{ => include/board-common}/cadmus.h (100%) rename board/freescale/common/{ => include/board-common}/dcu_sii9022a.h (100%) rename board/freescale/common/{ => include/board-common}/diu_ch7301.h (100%) rename board/freescale/common/{ => include/board-common}/eeprom.h (100%) rename board/freescale/common/{ => include/board-common}/fman.h (100%) rename board/freescale/common/{ => include/board-common}/idt8t49n222a_serdes_clk.h (100%) rename board/freescale/common/{ => include/board-common}/ngpixis.h (100%) rename board/freescale/common/{ => include/board-common}/pfuze.h (100%) rename board/freescale/common/{ => include/board-common}/pixis.h (100%) rename board/freescale/common/{ => include/board-common}/pq-mds-pib.h (100%) rename board/freescale/common/{ => include/board-common}/qixis.h (100%) rename board/freescale/common/{ => include/board-common}/sgmii_riser.h (100%) rename board/freescale/common/{ => include/board-common}/sleep.h (100%) rename board/freescale/common/{ => include/board-common}/via.h (100%) rename board/freescale/common/{ => include/board-common}/vid.h (100%) rename board/freescale/common/{ => include/board-common}/vsc3316_3308.h (100%) rename board/freescale/common/{ => include/board-common}/zm7300.h (100%) rename board/gdsys/common/{ => include/board-common}/dp501.h (100%) rename board/gdsys/common/{ => include/board-common}/mclink.h (100%) rename board/gdsys/common/{ => include/board-common}/osd.h (100%) rename board/gdsys/common/{ => include/board-common}/phy.h (100%) rename board/keymile/common/{ => include/board-common}/common.h (100%) rename board/mpl/common/{ => include/board-common}/common_util.h (100%) rename board/mpl/common/{ => include/board-common}/isa.h (100%) rename board/seco/common/{ => include/board-common}/mx6.h (100%) rename board/siemens/common/{ => include/board-common}/factoryset.h (100%) rename board/varisys/common/{ => include/board-common}/eeprom.h (100%) rename board/xes/common/{ => include/board-common}/fsl_8xxx_misc.h (100%) -- 2.6.2.402.g2635c2b

11 34

[U-Boot] [PATCH] include: net: Simplify the usage of __always_inline
by Fabio Estevam 22 Dec '15

22 Dec '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> Since commit de4d2e9e7ce0f9 (" bitops: Add fls_long and __ffs64") <linux/compiler.h> is included in include/linux/bitops.h, which allows us to marking a function as 'always_inline' in a simpler format. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/net.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/net.h b/include/net.h index ebed29a..ac44d61 100644 --- a/include/net.h +++ b/include/net.h @@ -181,8 +181,7 @@ int eth_unregister(struct eth_device *dev);/* Remove network device */ extern struct eth_device *eth_current; -static inline __attribute__((always_inline)) -struct eth_device *eth_get_dev(void) +static __always_inline struct eth_device *eth_get_dev(void) { return eth_current; } @@ -200,14 +199,14 @@ static inline unsigned char *eth_get_ethaddr(void) /* Used only when NetConsole is enabled */ int eth_is_active(struct eth_device *dev); /* Test device for active state */ /* Set active state */ -static inline __attribute__((always_inline)) int eth_init_state_only(void) +static __always_inline int eth_init_state_only(void) { eth_get_dev()->state = ETH_STATE_ACTIVE; return 0; } /* Set passive state */ -static inline __attribute__((always_inline)) void eth_halt_state_only(void) +static __always_inline void eth_halt_state_only(void) { eth_get_dev()->state = ETH_STATE_PASSIVE; } @@ -657,7 +656,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len); #endif -static inline __attribute__((always_inline)) int eth_is_on_demand_init(void) +static __always_inline int eth_is_on_demand_init(void) { #ifdef CONFIG_NETCONSOLE extern enum proto_t net_loop_last_protocol; -- 1.9.1

2 2

[U-Boot] [PATCH 1/3] net: e1000: Remove dead codes wrapped by #if 0
by Bin Meng 22 Dec '15

22 Dec '15

Remove those dead codes wrapped by #if 0 and #endif. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- drivers/net/e1000.c | 75 +---------------------------------------------------- drivers/net/e1000.h | 31 ---------------------- 2 files changed, 1 insertion(+), 105 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 2ba03ed..508ebfb 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -551,43 +551,6 @@ static int32_t e1000_init_eeprom_params(struct e1000_hw *hw) eeprom->use_eerd = true; eeprom->use_eewr = false; break; - - /* ich8lan does not support currently. if needed, please - * add corresponding code and functions. - */ -#if 0 - case e1000_ich8lan: - { - int32_t i = 0; - - eeprom->type = e1000_eeprom_ich8; - eeprom->use_eerd = false; - eeprom->use_eewr = false; - eeprom->word_size = E1000_SHADOW_RAM_WORDS; - uint32_t flash_size = E1000_READ_ICH_FLASH_REG(hw, - ICH_FLASH_GFPREG); - /* Zero the shadow RAM structure. But don't load it from NVM - * so as to save time for driver init */ - if (hw->eeprom_shadow_ram != NULL) { - for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) { - hw->eeprom_shadow_ram[i].modified = false; - hw->eeprom_shadow_ram[i].eeprom_word = 0xFFFF; - } - } - - hw->flash_base_addr = (flash_size & ICH_GFPREG_BASE_MASK) * - ICH_FLASH_SECTOR_SIZE; - - hw->flash_bank_size = ((flash_size >> 16) - & ICH_GFPREG_BASE_MASK) + 1; - hw->flash_bank_size -= (flash_size & ICH_GFPREG_BASE_MASK); - - hw->flash_bank_size *= ICH_FLASH_SECTOR_SIZE; - - hw->flash_bank_size /= 2 * sizeof(uint16_t); - break; - } -#endif default: break; } @@ -838,14 +801,6 @@ e1000_read_eeprom(struct e1000_hw *hw, uint16_t offset, if (eeprom->use_eerd == true) return e1000_read_eeprom_eerd(hw, offset, words, data); - /* ich8lan does not support currently. if needed, please - * add corresponding code and functions. - */ -#if 0 - /* ICH EEPROM access is done via the ICH flash controller */ - if (eeprom->type == e1000_eeprom_ich8) - return e1000_read_eeprom_ich8(hw, offset, words, data); -#endif /* Set up the SPI or Microwire EEPROM for bit-bang reading. We have * acquired the EEPROM at this point, so any returns should relase it */ if (eeprom->type == e1000_eeprom_spi) { @@ -1732,17 +1687,7 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6]) * occuring when accessing our register space */ E1000_WRITE_FLUSH(hw); } -#if 0 - /* Set the PCI priority bit correctly in the CTRL register. This - * determines if the adapter gives priority to receives, or if it - * gives equal priority to transmits and receives. Valid only on - * 82542 and 82543 silicon. - */ - if (hw->dma_fairness && hw->mac_type <= e1000_82543) { - ctrl = E1000_READ_REG(hw, CTRL); - E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PRIOR); - } -#endif + switch (hw->mac_type) { case e1000_82545_rev_3: case e1000_82546_rev_3: @@ -1842,20 +1787,6 @@ e1000_init_hw(struct e1000_hw *hw, unsigned char enetaddr[6]) break; } -#if 0 - /* Clear all of the statistics registers (clear on read). It is - * important that we do this after we have tried to establish link - * because the symbol error count will increment wildly if there - * is no link. - */ - e1000_clear_hw_cntrs(hw); - - /* ICH8 No-snoop bits are opposite polarity. - * Set to snoop by default after reset. */ - if (hw->mac_type == e1000_ich8lan) - e1000_set_pci_ex_no_snoop(hw, PCI_EX_82566_SNOOP_ALL); -#endif - if (hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER || hw->device_id == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3) { ctrl_ext = E1000_READ_REG(hw, CTRL_EXT); @@ -5230,10 +5161,6 @@ _e1000_disable(struct e1000_hw *hw) E1000_WRITE_REG(hw, RDH, 0); E1000_WRITE_REG(hw, RDT, 0); - /* put the card in its initial state */ -#if 0 - E1000_WRITE_REG(hw, CTRL, E1000_CTRL_RST); -#endif mdelay(10); } diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index c851922..e46edcd 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1093,11 +1093,6 @@ struct e1000_hw { e1000_media_type media_type; e1000_fc_type fc; e1000_bus_type bus_type; -#if 0 - e1000_bus_speed bus_speed; - e1000_bus_width bus_width; - uint32_t io_base; -#endif uint32_t asf_firmware_present; #ifndef CONFIG_E1000_NO_NVM uint32_t eeprom_semaphore_present; @@ -1116,29 +1111,11 @@ struct e1000_hw { uint32_t original_fc; uint32_t txcw; uint32_t autoneg_failed; -#if 0 - uint32_t max_frame_size; - uint32_t min_frame_size; - uint32_t mc_filter_type; - uint32_t num_mc_addrs; - uint32_t collision_delta; - uint32_t tx_packet_delta; - uint32_t ledctl_default; - uint32_t ledctl_mode1; - uint32_t ledctl_mode2; -#endif uint16_t autoneg_advertised; uint16_t pci_cmd_word; uint16_t fc_high_water; uint16_t fc_low_water; uint16_t fc_pause_time; -#if 0 - uint16_t current_ifs_val; - uint16_t ifs_min_val; - uint16_t ifs_max_val; - uint16_t ifs_step_size; - uint16_t ifs_ratio; -#endif uint16_t device_id; uint16_t vendor_id; uint16_t subsystem_id; @@ -1149,9 +1126,6 @@ struct e1000_hw { uint8_t forced_speed_duplex; uint8_t wait_autoneg_complete; uint8_t dma_fairness; -#if 0 - uint8_t perm_mac_addr[NODE_ADDRESS_SIZE]; -#endif bool disable_polarity_correction; bool speed_downgraded; bool get_link_status; @@ -1162,11 +1136,6 @@ struct e1000_hw { bool report_tx_early; bool phy_reset_disable; bool initialize_hw_bits_disable; -#if 0 - bool adaptive_ifs; - bool ifs_params_forced; - bool in_ifs_mode; -#endif e1000_smart_speed smart_speed; e1000_dsp_config dsp_config_state; }; -- 1.8.2.1

2 8

[U-Boot] [PATCH v3 1/2] fdt: Deprecate "usbethaddr" usage in fdt_fixup_ethernet()
by Bin Meng 22 Dec '15

22 Dec '15

In fdt_fixup_ethernet() only "usbethaddr" is handled to fix up the first usb ethernet port MAC address. Other additional usb ethernet ports are ignored as there is no logic to handle "usbeth%daddr". It is suggested we should use "ethaddr" for all ethernet devices. Hence deprecate "usbethaddr" usage in fdt_fixup_ethernet(). This actually reverts commit b1f49ab8c7bad60426b30c134ae065ef77d2dfc1 "ARM: fdt support: Add usbethaddr as an acceptable MAC". Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> On OMAP4 Panda (+ v4.3 kernel) Tested-by: Tom Rini <trini(a)konsulko.com> --- Changes in v3: - Update commit message to include full commit id and subject. Changes in v2: - New patch to deprecate "usbethaddr" usage in fdt_fixup_ethernet() common/fdt_support.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index a7ff2df..ec72b86 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -490,18 +490,8 @@ void fdt_fixup_ethernet(void *fdt) if (node < 0) return; - if (!getenv("ethaddr")) { - if (getenv("usbethaddr")) { - strcpy(mac, "usbethaddr"); - } else { - debug("No ethernet MAC Address defined\n"); - return; - } - } else { - strcpy(mac, "ethaddr"); - } - i = 0; + strcpy(mac, "ethaddr"); while ((tmp = getenv(mac)) != NULL) { sprintf(enet, "ethernet%d", i); path = fdt_getprop(fdt, node, enet, NULL); -- 1.8.2.1

2 6

[U-Boot] [PATCH] arm: novena: Fix EEPROM i2c configuration
by Marek Vasut 22 Dec '15

22 Dec '15

On Novena, the DRAM SPD is connected to i2c1 while the Utility EEPROM is connected to i2c3. Now that the EEPROM handling in U-Boot is fixed, also fix this bit on Novena. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Sean Cross <xobs(a)kosagi.com> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/novena.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/novena.h b/include/configs/novena.h index d88389a..718989f 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -108,11 +108,12 @@ #define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_SPD_BUS_NUM 0 /* I2C EEPROM */ #ifdef CONFIG_CMD_EEPROM #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_SPD_BUS_NUM 2 +#define CONFIG_SYS_I2C_EEPROM_BUS 2 #endif /* MMC Configs */ -- 2.1.4

1 1

[U-Boot] [PATCH] spi: sf: add support for throughput mesurement of sf read/write
by Mugunthan V N 21 Dec '15

21 Dec '15

This patch adds time measurement and throughput calculation for sf read/write commands. The output of sf read changes from ---8<--- SF: 4096 bytes @ 0x0 Read: OK --->8--- to ---8<--- SF: 4096 bytes @ 0x0 Read: OK in 6 ms (666 KiB/s) --->8--- Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> --- common/cmd_sf.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/common/cmd_sf.c b/common/cmd_sf.c index ac7f5df..8687f3a 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -15,6 +15,7 @@ #include <spi_flash.h> #include <jffs2/jffs2.h> #include <linux/mtd/mtd.h> +#include <linux/math64.h> #include <asm/io.h> #include <dm/device-internal.h> @@ -266,6 +267,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) int ret = 1; int dev = 0; loff_t offset, len, maxsize; + unsigned long time; if (argc < 3) return -1; @@ -298,17 +300,27 @@ static int do_spi_flash_read_write(int argc, char * const argv[]) int read; read = strncmp(argv[0], "read", 4) == 0; + + time = get_timer(0); if (read) ret = spi_flash_read(flash, offset, len, buf); else ret = spi_flash_write(flash, offset, len, buf); + time = get_timer(time); printf("SF: %zu bytes @ %#x %s: ", (size_t)len, (u32)offset, read ? "Read" : "Written"); - if (ret) + if (ret) { printf("ERROR %d\n", ret); - else - printf("OK\n"); + } else { + printf("OK in %lu ms", time); + if (time > 0) { + puts(" ("); + print_size(div_u64(len, time) * 1000, "/s"); + puts(")"); + } + puts("\n"); + } } unmap_physmem(buf, len); -- 2.6.2.280.g74301d6

3 8

[U-Boot] [PATCH v3 00/16] device model bring-up of ti-qspi on dra72, dra74 and am437x-sk evm
by Mugunthan V N 20 Dec '15

20 Dec '15

This patch series enables ti_qspi to adopt driver model. This has been tested on dra72, dra74 and am437x-sk evms (logs [1]). Also pushed a branch for testing [2] [1]: http://pastebin.ubuntu.com/13341771/ [2]: git://git.ti.com/~mugunthanvnm/ti-u-boot/mugunth-ti-u-boot.git qspi-v3 Changes from v2->v3: * removed usage of spi_slave structure in driver model and introduced required variables in qspi priv itself. * Used fdt_addr_cells() and fdt_size_cells() instead of hard-coding size of each address-size pair. * Changed qspi dts entries to be same as in kernel qspi dts patch for avoiding future conflicts. * Fixed some typos and added more info in commits. * Added error check on chip select passed from framework. * Removed un-used define QSPI_RD_DUAL. Changes from Initial version: * Split "prepare driver for DM conversion" for easier review * added memory map mode to the driver * Fixed the cosmetic reviews from Simon * Modified the dev_get_addr_index to adopt OF_TRANSULATE as well and also removed code duplicate. * Added compatibles for spi flashed found in DRA7xx and AM437x SK Mugunthan V N (16): drivers: spi: ti_qspi: do not hard code chip select for memory map configuration drivers: spi:ti_qspi: change ti_qspi_slave to ti_qspi_priv for driver model conversion drivers: spi: ti_qspi: prepare driver for DM conversion dm: core: Add a new api to get indexed device address spi: Add support for dual and quad mode dra7xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl dts: dra7: add spi alias for qspi drivers: spi: ti_qspi: convert driver to adopt device driver model arm: dts: dra7: add qspi register maps for memory map and control module drivers: mtd: spi: sf_probe: add compatible for spansion spi flash drivers: mtd: spi: sf_probe: add compatible for Macronix spi flash defconfig: dra72_evm: enable spi driver model defconfig: dra74_evm: enable spi driver model am43xx_evm: qspi: do not define DM_SPI and DM_SPI_FLASH for spl arm: dts: am4372: add qspi register maps for memory map defconfig: am437x_sk_evm: enable spi driver model arch/arm/dts/am4372.dtsi | 5 +- arch/arm/dts/dra7.dtsi | 8 +- configs/am437x_sk_evm_defconfig | 3 + configs/dra72_evm_defconfig | 2 + configs/dra74_evm_defconfig | 2 + drivers/core/device.c | 31 ++- drivers/mtd/spi/sf_probe.c | 2 + drivers/spi/spi-uclass.c | 33 +++ drivers/spi/ti_qspi.c | 519 ++++++++++++++++++++++++++++------------ include/configs/am43xx_evm.h | 2 + include/configs/dra7xx_evm.h | 5 + include/dm/device.h | 11 + include/spi.h | 4 + 13 files changed, 467 insertions(+), 160 deletions(-) -- 2.6.2.280.g74301d6

3 38

[U-Boot] [PATCH v3] dm: Add timeline and guide for porting serial drivers
by Simon Glass 20 Dec '15

20 Dec '15

Add a README with a brief guide to porting serial drivers over to use driver model. Add a timeline also. All serial drivers should be converted by the end of January 2016. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- To avoid anyone missing out on this, I have added to Cc the all U-Boot maintainers using this: (for f in $(find . -name MAINTAINERS); do grep ^M: $f; done) | \ awk '{$1=""; print "Series-cc:" $0}' |sort | uniq This is about 229 email address, of which 217 seem to be different people. Changes in v3: - Fix the date to avoid time machine issues Changes in v2: - Copy the patch to all maintainers - Move the timeline back to January doc/driver-model/serial-howto.txt | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 doc/driver-model/serial-howto.txt diff --git a/doc/driver-model/serial-howto.txt b/doc/driver-model/serial-howto.txt new file mode 100644 index 0000000..60483a4 --- /dev/null +++ b/doc/driver-model/serial-howto.txt @@ -0,0 +1,58 @@ +How to port a serial driver to driver model +=========================================== + +About 16 of 33 serial drivers have been converted as at September 2015. It +is time for maintainers to start converting over the remaining serial drivers: + + altera_jtag_uart.c + altera_uart.c + arm_dcc.c + lpc32xx_hsuart.c + mcfuart.c + mxs_auart.c + opencores_yanu.c + serial_bfin.c + serial_imx.c + serial_lpuart.c + serial_max3100.c + serial_pxa.c + serial_s3c24x0.c + serial_sa1100.c + serial_stm32.c + serial_xuartlite.c + usbtty.c + +You should complete this by the end of January 2016. + +Here is a suggested approach for converting your serial driver over to driver +model. Please feel free to update this file with your ideas and suggestions. + +- #ifdef out all your own serial driver code (#ifndef CONFIG_DM_SERIAL) +- Define CONFIG_DM_SERIAL for your board, vendor or architecture +- If the board does not already use driver model, you need CONFIG_DM also +- Your board should then build, but will not boot since there will be no serial + driver +- Add the U_BOOT_DRIVER piece at the end (e.g. copy serial_s5p.c for example) +- Add a private struct for the driver data - avoid using static variables +- Implement each of the driver methods, perhaps by calling your old methods +- You may need to adjust the function parameters so that the old and new + implementations can share most of the existing code +- If you convert all existing users of the driver, remove the pre-driver-model + code + +In terms of patches a conversion series typically has these patches: +- clean up / prepare the driver for conversion +- add driver model code +- convert at least one existing board to use driver model serial +- (if no boards remain that don't use driver model) remove the old code + +This may be a good time to move your board to use device tree also. Mostly +this involves these steps: + +- define CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE +- add your device tree files to arch/<arch>/dts +- update the Makefile there +- Add stdout-path to your /chosen device tree node if it is not already there +- build and get u-boot-dtb.bin so you can test it +- Your drivers can now use device tree +- For device tree in SPL, define CONFIG_SPL_OF_CONTROL -- 2.6.0.rc2.230.g3dd15c0

3 6

[U-Boot] [PATCH] ARM: UniPhier: add initrd_high and fdt_high environments
by Masahiro Yamada 18 Dec '15

18 Dec '15

With FIT boot, U-boot puts a device tree and an initramdisk at the tail of the memory. Some UniPhier boards have a large amount of memory. For those boards, a device tree and an initramdisk are located out of reach of the Linux kernel causing a kernel panic if CONFIG_VMSPLIT_3G is defined in the kernel side. Add initrd_high and fdt_high to prevent them from going too high. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- include/configs/uniphier.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index d4688c5..dea340f 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -236,6 +236,8 @@ "netdev=eth0\0" \ "image_offset=0x00080000\0" \ "image_size=0x00f00000\0" \ + "initrd_high=0xa0000000\0" \ + "fdt_high=0xa0000000\0" \ "verify=n\0" \ "nandupdate=nand erase 0 0x100000 &&" \ "tftpboot u-boot-spl.bin &&" \ -- 1.9.1

2 2