History log of /src/sys/dev/pci/if_ale.c |
Revision | | Date | Author | Comments |
1.44 |
| 29-Jun-2024 |
riastradh | if_stats(9): Add ifp argument to if_stat..._ref.
This will enable us to pass the ifp through to a dtrace probe inside.
No functional change intended in this change, but this is an API change visible to modules so it shouldn't be pulled up.
PR kern/58377
|
1.43 |
| 22-Aug-2022 |
thorpej | ale_encap(): Fix error logic in previous change for when the defrag works, but DMA mapping fails to use DMA resource shortage.
|
1.42 |
| 22-Aug-2022 |
thorpej | ale_start(): Replace "IFQ_DEQUEUE() -> IF_PREPEND() on failure" with "IFQ_POLL() -> IFQ_DEQUEUE() on success (or fatal error)".
|
1.41 |
| 22-Aug-2022 |
thorpej | ale_encap(): Use m_defrag(), not m_pullup(), to compact an mbuf chain if it has too many DMA segments. Let the caller handle dispose of the packet on fatal errors.
|
1.40 |
| 01-Mar-2020 |
thorpej | It doesn't make any sense to pass ETHER_ALIGN as the alignment constraint to bus_dmamem_alloc(). Use PAGE_SIZE instead.
|
1.39 |
| 04-Feb-2020 |
thorpej | Use ifmedia_fini().
|
1.38 |
| 30-Jan-2020 |
thorpej | Adopt <net/if_stats.h>.
|
1.37 |
| 01-Dec-2019 |
msaitoh | branches: 1.37.2; Use unsigned to avoid undefined behavoir. Found by kUBSan.
|
1.36 |
| 21-Nov-2019 |
msaitoh | Remove accidentally committed debug code. Sorry.
|
1.35 |
| 21-Nov-2019 |
msaitoh | Fix a bug that IFF_ALLMULTI is almost always set.
OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt.
|
1.34 |
| 30-Oct-2019 |
msaitoh | if_percpuq(9) automatically increments if_ipackets, so don't add number of RX frames from device's statistics counter to if_ipackets to avoid double count.
|
1.33 |
| 09-Jul-2019 |
msaitoh | branches: 1.33.2; Don't automatically set ec_capenable's ETHERCAP_VLAN_HWTAGGING bit in vlan_config() to make it user-controllable. Instead, set the bit in xxx_attach().
|
1.32 |
| 28-May-2019 |
msaitoh | Add missing ETHER_LOCK().
|
1.31 |
| 28-May-2019 |
msaitoh | Use ETHER_LOCK()/ETHER_UNLOCK() for all ethernet drivers to protect ec_multi*.
|
1.30 |
| 23-May-2019 |
msaitoh | Whitespace fix (mainly tabify).
|
1.29 |
| 23-May-2019 |
msaitoh | No functional change: - Simplify MII structure initialization and reference. - u_int*_t -> uint*_t. - KNF
|
1.28 |
| 05-Mar-2019 |
msaitoh | Centralize ETHER_ALIGN into net/if_ether.h. Note that this commit also changes if_upgt.c's ETHER_ALIGN from 0 to 2.
|
1.27 |
| 22-Jan-2019 |
msaitoh | Change MII PHY read/write API from:
int (*mii_readreg_t)(device_t, int, int); void (*mii_writereg_t)(device_t, int, int, int); to:
int (*mii_readreg_t)(device_t, int, int, uint16_t *); int (*mii_writereg_t)(device_t, int, int, uint16_t);
Now we can test if a read/write operation failed or not by the return value.
In 802.3 spec says that the PHY shall not respond to read/write transaction to the unimplemented register(22.2.4.3). Detecting timeout can be used to check whether a register is implemented or not (if the register conforms to the spec). ukphy(4) can be used this for MII_MMDACR and MII_MMDAADR.
Note that I noticed that the following code do infinite loop in the read/wirte function. If it accesses unimplemented PHY register, it will hang. It should be fixed:
arm/at91/at91emac.c arm/ep93xx/epe.c arm/omap/omapl1x_emac.c mips/ralink/ralink_eth.c arch/powerpc/booke/dev/pq3etsec.c(read) dev/cadence/if_cemac.c <- hkenken dev/ic/lan9118.c
Tested with the following device:
axe+ukphy axe+rgephy axen+rgephy (tested by Andrius V) wm+atphy wm+ukphy wm+igphy wm+ihphy wm+makphy sk+makphy sk+brgphy sk+gentbi msk+makphy sip+icsphy sip+ukphy re+rgephy bge+brgphy bnx+brgphy gsip+gphyter rtk+rlphy fxp+inphy (tested by Andrius V) tlp+acphy ex+exphy epic+qsphy vge+ciphy (tested by Andrius V) vr+ukphy (tested by Andrius V) vte+ukphy (tested by Andrius V)
Not tested (MAC): arm:at91emac arm:cemac arm:epe arm:geminigmac arm:enet arm:cpsw arm:emac(omac) arm:emac(sunxi) arm:npe evbppc:temac macppc:bm macppc:gm mips:aumac mips:ae mips:cnmac mips:reth mips:sbmac playstation2:smap powerpc:tsec powerpc:emac(ibm4xx) sgimips:mec sparc:be sf ne(ax88190, dl10019) awge ep gem hme smsh mtd sm age alc ale bce cas et jme lii nfe pcn ste stge tl xi aue mue smsc udav url
Not tested (PHY): amhphy bmtphy dmphy etphy glxtphy ikphy iophy lxtphy nsphyter pnaphy rdcphy sqphy tlphy tqphy urlphy
|
1.26 |
| 09-Dec-2018 |
jdolecek | use pci_intr_establish_xname() everywhere
|
1.25 |
| 15-Nov-2018 |
maxv | Remove the 'copy' argument from m_devget(), unused. While here rename off0->off.
|
1.24 |
| 26-Jun-2018 |
msaitoh | branches: 1.24.2; Implement the BPF direction filter (BIOC[GS]DIRECTION). It provides backward compatibility with BIOC[GS]SEESENT ioctl. The userland interface is the same as FreeBSD.
This change also fixes a bug that the direction is misunderstand on some environment by passing the direction to bpf_mtap*() instead of checking m->m_pkthdr.rcvif.
|
1.23 |
| 26-Sep-2017 |
knakahara | branches: 1.23.2; VLAN ID uses pkthdr instead of mtag now. Contributed by s-yamaguchi@IIJ.
I just commit by proxy. Reviewed by joerg@n.o and christos@n.o, thanks. See http://mail-index.netbsd.org/tech-net/2017/09/26/msg006459.html
XXX need pullup to -8 branch
|
1.22 |
| 23-May-2017 |
ozaki-r | branches: 1.22.2; Apply deferred if_start to more drivers
And annotate some XXX_start as it runs in softint to clarify that it doesn't need deferred if_start.
|
1.21 |
| 15-Dec-2016 |
ozaki-r | Move bpf_mtap and if_ipackets++ on Rx of each driver to percpuq if_input
The benefits of the change are: - We can reduce codes - We can provide the same behavior between drivers - Where/When if_ipackets is counted up - Note that some drivers still update packet statistics in their own way (periodical update) - Moved bpf_mtap run in softint - This makes it easy to MP-ify bpf
Proposed on tech-kern and tech-net
|
1.20 |
| 09-Feb-2016 |
ozaki-r | branches: 1.20.2; Introduce softint-based if_input
This change intends to run the whole network stack in softint context (or normal LWP), not hardware interrupt context. Note that the work is still incomplete by this change; to that end, we also have to softint-ify if_link_state_change (and bpf) which can still run in hardware interrupt.
This change softint-ifies at ifp->if_input that is called from each device driver (and ieee80211_input) to ensure Layer 2 runs in softint (e.g., ether_input and bridge_input). To this end, we provide a framework (called percpuq) that utlizes softint(9) and percpu ifqueues. With this patch, rxintr of most drivers just queues received packets and schedules a softint, and the softint dequeues packets and does rest packet processing.
To minimize changes to each driver, percpuq is allocated in struct ifnet for now and that is initialized by default (in if_attach). We probably have to move percpuq to softc of each driver, but it's future work. At this point, only wm(4) has percpuq in its softc as a reference implementation.
Additional information including performance numbers can be found in the thread at tech-kern@ and tech-net@: http://mail-index.netbsd.org/tech-kern/2016/01/14/msg019997.html
Acknowledgment: riastradh@ greatly helped this work. Thank you very much!
|
1.19 |
| 26-Jan-2016 |
christos | PR/50693: David Binderman: Fix constant pasto.
|
1.18 |
| 13-Apr-2015 |
riastradh | Convert sys/dev to use <sys/rndsource.h>.
|
1.17 |
| 29-Mar-2014 |
christos | branches: 1.17.6; make pci_intr_string and eisa_intr_string take a buffer and a length instead of relying in local static storage.
|
1.16 |
| 21-Feb-2014 |
christos | PR/48606: Lloyd Parkes: Drivers not using ifp->if_input but using ether_input directly.
|
1.15 |
| 30-Mar-2013 |
christos | branches: 1.15.4; remove trailing whitespace
|
1.14 |
| 22-Jul-2012 |
matt | branches: 1.14.2; Fix mii_statchg to take a 'struct ifnet *' instead of device_t. This fixes problem with a common MDIO bus used for multiple interfaces. Some drivers converted to CFATTACL_DECL_NEW.
|
1.13 |
| 22-Jan-2011 |
cegger | branches: 1.13.4; Fixes from PR kern/44395 Masanori Kanaoka: - Fix register address in ale_phy_reset(). from linux - Fix mask value in ale_stop_mac(). - Fix multicast handling. from openbsd - Fix phy reset handling.
|
1.12 |
| 20-Jul-2010 |
cegger | branches: 1.12.2; 1.12.4; PR kern/38871: Fix VLAN
|
1.11 |
| 05-Apr-2010 |
joerg | branches: 1.11.2; Push the bpf_ops usage back into bpf.h. Push the common ifp->if_bpf check into the inline functions as well the fourth argument for bpf_attach.
|
1.10 |
| 19-Jan-2010 |
pooka | branches: 1.10.2; 1.10.4; Redefine bpf linkage through an always present op vector, i.e. #if NBPFILTER is no longer required in the client. This change doesn't yet add support for loading bpf as a module, since drivers can register before bpf is attached. However, callers of bpf can now be modularized.
Dynamically loadable bpf could probably be done fairly easily with coordination from the stub driver and the real driver by registering attachments in the stub before the real driver is loaded and doing a handoff. ... and I'm not going to ponder the depths of unload here.
Tested with i386/MONOLITHIC, modified MONOLITHIC without bpf and rump.
|
1.9 |
| 08-Oct-2009 |
cegger | Use m_pullup to handle defragmentation. Reinject mbuf into TX queue when it couldn't be loaded.
diff for age(4) reviewed/discussed with plunky@ several weeks ago.
|
1.8 |
| 05-Sep-2009 |
tsutsui | Invert logic around nested pmf(9) registrations for readability.
|
1.7 |
| 18-Aug-2009 |
cegger | fix multicast.
|
1.6 |
| 18-Aug-2009 |
cegger | don't read/write 1000baseT specific MII registers on 10/100M only device. from OpenBSD.
|
1.5 |
| 05-Aug-2009 |
cegger | support flow control. from OpenBSD. tested by Kevin Lahey
|
1.4 |
| 28-Jul-2009 |
cegger | print chipset name. From OpenBSD.
|
1.3 |
| 28-Apr-2009 |
cegger | branches: 1.3.2; 1.3.4; 1.3.6; on detach, deregister from pmf
|
1.2 |
| 25-Apr-2009 |
tsutsui | branches: 1.2.2; Add RCS Id.
|
1.1 |
| 20-Apr-2009 |
cegger | Add ale(4), a driver for Attansic/Atheros L1E gigabit ethernet device. Ported by me from OpenBSD, improvements from Kevin Lahey, successfully tested by Kevin Lahey and Stephen Borrill.
|
1.2.2.2 |
| 28-Apr-2009 |
skrll | Sync with HEAD.
|
1.2.2.1 |
| 25-Apr-2009 |
skrll | file if_ale.c was added on branch nick-hppapmap on 2009-04-28 07:35:56 +0000
|
1.3.6.2 |
| 13-May-2009 |
jym | Sync with HEAD.
Commit is split, to avoid a "too many arguments" protocol error.
|
1.3.6.1 |
| 28-Apr-2009 |
jym | file if_ale.c was added on branch jym-xensuspend on 2009-05-13 17:20:24 +0000
|
1.3.4.6 |
| 11-Aug-2010 |
yamt | sync with head.
|
1.3.4.5 |
| 11-Mar-2010 |
yamt | sync with head
|
1.3.4.4 |
| 16-Sep-2009 |
yamt | sync with head
|
1.3.4.3 |
| 19-Aug-2009 |
yamt | sync with head.
|
1.3.4.2 |
| 04-May-2009 |
yamt | sync with head.
|
1.3.4.1 |
| 28-Apr-2009 |
yamt | file if_ale.c was added on branch yamt-nfs-mp on 2009-05-04 08:12:55 +0000
|
1.3.2.4 |
| 08-Nov-2009 |
snj | Pull up following revision(s) (requested by cegger in ticket #1124): sys/dev/pci/if_age.c: revision 1.34 sys/dev/pci/if_ale.c: revision 1.9 Use m_pullup to handle defragmentation. Reinject mbuf into TX queue when it couldn't be loaded. diff for age(4) reviewed/discussed with plunky@ several weeks ago.
|
1.3.2.3 |
| 10-Sep-2009 |
snj | Pull up following revision(s) (requested by sborrill in ticket #941): sys/dev/pci/if_ale.c: revision 1.4 sys/dev/pci/if_ale.c: revision 1.5 sys/dev/pci/if_ale.c: revision 1.6 sys/dev/pci/if_ale.c: revision 1.7 print chipset name. From OpenBSD. support flow control. from OpenBSD. tested by Kevin Lahey don't read/write 1000baseT specific MII registers on 10/100M only device. from OpenBSD. fix multicast.
|
1.3.2.2 |
| 03-May-2009 |
snj | Pull up following revision(s) (requested by cegger in ticket #735): sys/dev/pci/if_age.c: revisions 1.1-1.28 sys/dev/pci/if_agereg.h: revisions 1.1-1.2 sys/dev/pci/if_ale.c: revisions 1.1-1.3 sys/dev/pci/if_alereg.h: revisions 1.1-1.2 sys/dev/pci/files.pci: revisions 1.310-1.313 sys/dev/mii/atphy.c: revisions 1.1-1.5 sys/dev/mii/files.mii: revision 1.42 share/man/man4/age.4: revisions 1.1-1.3 share/man/man4/ale.4: revisions 1.1-1.2 share/man/man4/atphy.4: revisions 1.1-1.2 share/man/man4/Makefile: revisions 1.486, 1.489 distrib/sets/lists/man/mi: revisions 1.1118, 1.1132 sys/arch/i386/conf/GENERIC: revisions 1.928, 1.933 sys/arch/i386/conf/XEN2_DOM0: revisions 1.57, 1.60 sys/arch/amd64/conf/GENERIC: revisions 1.239, 1.241 sys/arch/amd64/conf/XEN3_DOM0: revisions 1.38, 1.42 Add the age(4) and ale(4) drivers for Attansic L1 and Atheros AR8121/AR8113/AR8114 devices respectively.
|
1.3.2.1 |
| 28-Apr-2009 |
snj | file if_ale.c was added on branch netbsd-5 on 2009-05-03 23:45:47 +0000
|
1.10.4.2 |
| 05-Mar-2011 |
rmind | sync with head
|
1.10.4.1 |
| 30-May-2010 |
rmind | sync with head
|
1.10.2.2 |
| 17-Aug-2010 |
uebayasi | Sync with HEAD.
|
1.10.2.1 |
| 30-Apr-2010 |
uebayasi | Sync with HEAD.
|
1.11.2.2 |
| 21-Apr-2010 |
matt | sync to netbsd-5
|
1.11.2.1 |
| 05-Apr-2010 |
matt | file if_ale.c was added on branch matt-nb5-mips64 on 2010-04-21 00:27:40 +0000
|
1.12.4.1 |
| 08-Feb-2011 |
bouyer | Sync with HEAD
|
1.12.2.1 |
| 06-Jun-2011 |
jruoho | Sync with HEAD.
|
1.13.4.2 |
| 22-May-2014 |
yamt | sync with head.
for a reference, the tree before this commit was tagged as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments")
|
1.13.4.1 |
| 30-Oct-2012 |
yamt | sync with head
|
1.14.2.3 |
| 03-Dec-2017 |
jdolecek | update from HEAD
|
1.14.2.2 |
| 20-Aug-2014 |
tls | Rebase to HEAD as of a few days ago.
|
1.14.2.1 |
| 23-Jun-2013 |
tls | resync from head
|
1.15.4.1 |
| 18-May-2014 |
rmind | sync with head
|
1.17.6.4 |
| 28-Aug-2017 |
skrll | Sync with HEAD
|
1.17.6.3 |
| 05-Feb-2017 |
skrll | Sync with HEAD
|
1.17.6.2 |
| 19-Mar-2016 |
skrll | Sync with HEAD
|
1.17.6.1 |
| 06-Jun-2015 |
skrll | Sync with HEAD
|
1.20.2.1 |
| 07-Jan-2017 |
pgoyette | Sync with HEAD. (Note that most of these changes are simply $NetBSD$ tag issues.)
|
1.22.2.3 |
| 05-Dec-2019 |
bouyer | Pull up following revision(s) (requested by msaitoh in ticket #1464): sys/dev/pci/if_alc.c 1.44 via patch sys/dev/pci/if_ale.c 1.35-1.36 via patch sys/dev/pci/if_cas.c 1.36 via patch - Fix a bug that IFF_ALLMULTI is almost always set. - Whitespace fixes.
|
1.22.2.2 |
| 06-Nov-2019 |
martin | Pull up following revision(s) (requested by msaitoh in ticket #1427):
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.39 sys/dev/pcmcia/if_xi.c: revision 1.91 sys/dev/ic/aic6915.c: revision 1.40 sys/dev/pci/if_tl.c: revision 1.117 sys/arch/arm/gemini/gemini_gmac.c: revision 1.18 sys/dev/ic/elinkxl.c: revision 1.133 sys/dev/pci/if_ste.c: revision 1.57 sys/dev/pci/if_alc.c: revision 1.43 sys/dev/pci/if_stge.c: revision 1.72 sys/dev/pci/if_ale.c: revision 1.34 sys/dev/pci/if_age.c: revision 1.62 sys/dev/pci/if_txp.c: revision 1.60 sys/dev/ic/i82557.c: revision 1.156 sys/dev/pci/if_vte.c: revision 1.27 sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.47 sys/arch/arm/gemini/if_gpn.c: revision 1.13
if_percpuq(9) and ether_input() automatically increment if_ipackets, so don't add number of RX frames from device's statistics counter to if_ipackets to avoid double count.
|
1.22.2.1 |
| 24-Oct-2017 |
snj | Pull up following revision(s) (requested by knakahara in ticket #302): sys/arch/powerpc/booke/dev/pq3etsec.c: 1.30-1.31 sys/arch/x86/pci/if_vmx.c: 1.20 sys/dev/ic/i82557.c: 1.148 sys/dev/ic/rtl8169.c: 1.152 sys/dev/pci/cxgb/cxgb_sge.c: 1.5 sys/dev/pci/if_age.c: 1.51 sys/dev/pci/if_alc.c: 1.25 sys/dev/pci/if_ale.c: 1.23 sys/dev/pci/if_bge.c: 1.311 sys/dev/pci/if_bge.c: 1.312 sys/dev/pci/if_bnx.c: 1.62 sys/dev/pci/if_jme.c: 1.32 sys/dev/pci/if_nfe.c: 1.64 sys/dev/pci/if_sip.c: 1.167 sys/dev/pci/if_stge.c: 1.63-1.64 sys/dev/pci/if_ti.c: 1.102 sys/dev/pci/if_txp.c: 1.48 sys/dev/pci/if_vge.c: 1.61 sys/dev/pci/if_wm.c: 1.538 sys/dev/pci/ixgbe/ix_txrx.c: 1.29 via patch sys/net/agr/if_agrether_hash.c: 1.4 sys/net/if_ether.h: 1.67-1.68 sys/net/if_ethersubr.c: 1.244 sys/net/if_vlan.c: 1.100 sys/net80211/ieee80211_input.c: 1.89 sys/net80211/ieee80211_output.c: 1.59 sys/sys/mbuf.h: 1.171 VLAN ID uses pkthdr instead of mtag now. Contributed by s-yamaguchi@IIJ. I just commit by proxy. Reviewed by joerg@n.o and christos@n.o, thanks. See http://mail-index.netbsd.org/tech-net/2017/09/26/msg006459.html -- only get vtag when we have vtag like the other drivers. -- - only get the vtag if we have it like the other drivers - mask the hardware vlan tag -- - add a constant for the vlan mask. - enforce that we have a tag before we get it. only get vtag when we have vtag like the other drivers. like if_bge.c:1.312 and if_stge.c:1.64. fixed by s-yamaguchi@IIJ, thanks.
|
1.23.2.4 |
| 26-Jan-2019 |
pgoyette | Sync with HEAD
|
1.23.2.3 |
| 26-Dec-2018 |
pgoyette | Sync with HEAD, resolve a few conflicts
|
1.23.2.2 |
| 26-Nov-2018 |
pgoyette | Sync with HEAD, resolve a couple of conflicts
|
1.23.2.1 |
| 28-Jul-2018 |
pgoyette | Sync with HEAD
|
1.24.2.2 |
| 13-Apr-2020 |
martin | Mostly merge changes from HEAD upto 20200411
|
1.24.2.1 |
| 10-Jun-2019 |
christos | Sync with HEAD
|
1.33.2.3 |
| 31-Jan-2020 |
martin | Pull up following revision(s) (requested by msaitoh in ticket #671):
sys/dev/pci/if_bce.c: revision 1.53 sys/dev/pci/pccbbreg.h: revision 1.16 sys/dev/ic/rt2860.c: revision 1.34 sys/dev/pci/if_alc.c: revision 1.45 sys/dev/pci/if_mcx.c: revision 1.5 sys/dev/pci/if_pcn.c: revision 1.72 sys/dev/pci/if_ale.c: revision 1.37 sys/dev/pci/if_age.c: revision 1.65 sys/dev/ieee1394/fwohcireg.h: revision 1.20 sys/dev/ieee1394/fwohci.c: revision 1.143 sys/dev/ieee1394/firewire.c: revision 1.49 sys/dev/ic/am79900reg.h: revision 1.10
Use unsigned to avoid undefined behavior. Found by kUBSan.
|
1.33.2.2 |
| 26-Nov-2019 |
martin | Pull up following revision(s) (requested by msaitoh in ticket #483):
sys/dev/pci/if_cas.c: revision 1.36 sys/dev/pci/if_alc.c: revision 1.44 sys/dev/pci/if_ale.c: revision 1.35 sys/dev/pci/if_ale.c: revision 1.36 sys/dev/pci/if_age.c: revision 1.64
Fix a bug that IFF_ALLMULTI is almost always set. OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt.
Remove accidentally committed debug code. Sorry.
|
1.33.2.1 |
| 06-Nov-2019 |
martin | Pull up following revision(s) (requested by msaitoh in ticket #403):
sys/arch/arm/broadcom/bcm53xx_eth.c: revision 1.39 sys/dev/pcmcia/if_xi.c: revision 1.91 sys/dev/ic/aic6915.c: revision 1.40 sys/dev/pci/if_tl.c: revision 1.117 sys/arch/arm/gemini/gemini_gmac.c: revision 1.18 sys/dev/ic/elinkxl.c: revision 1.133 sys/dev/pci/if_ste.c: revision 1.57 sys/dev/pci/if_alc.c: revision 1.43 sys/dev/pci/if_stge.c: revision 1.72 sys/dev/pci/if_ale.c: revision 1.34 sys/dev/pci/if_age.c: revision 1.62 sys/dev/pci/if_txp.c: revision 1.60 sys/dev/ic/i82557.c: revision 1.156 sys/dev/pci/if_vte.c: revision 1.27 sys/arch/powerpc/booke/dev/pq3etsec.c: revision 1.47 sys/arch/arm/gemini/if_gpn.c: revision 1.13
if_percpuq(9) and ether_input() automatically increment if_ipackets, so don't add number of RX frames from device's statistics counter to if_ipackets to avoid double count.
|
1.37.2.1 |
| 29-Feb-2020 |
ad | Sync with head.
|