CVS log for src/sys/dev/mii/rlphy.c

Up to [cvs.NetBSD.org] / src / sys / dev / mii

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Mostly merge changes from HEAD upto 20200411

Merge changes from current as of 20200406

Define and implement a locking protocol for the ifmedia / mii layers:
- MP-safe drivers provide a mutex to ifmedia that is used to serialize
  access to media-related structures / hardware regsiters.  Converted
  drivers use the new ifmedia_init_with_lock() function for this.  The
  new name is provided to ease the transition.
- Un-converted drivers continue to call ifmedia_init(), which will supply
  a compatibility lock to be used instead.  Several media-related entry
  points must be aware of this compatibility lock, and are able to acquire
  it recursively a limited number of times, if needed.  This is a SPIN
  mutex with priority IPL_NET.
- This same lock is used to serialize access to PHY registers and other
  MII-related data structures.

The PHY drivers are modified to acquire and release the lock, as needed,
and assert the lock is held as a diagnostic aid.

The "usbnet" framework has had an overhaul of its internal locking
protocols to fit in with the media / mii changes, and the drivers adapted.

USB wifi drivers have been changed to provide their own adaptive mutex
to the ifmedia later via a new ieee80211_media_init_with_lock() function.
This is required because the USB drivers need an adaptive mutex.

Besised "usbnet", a few other drivers are converted: vmx, wm, ixgbe / ixv.

mcx also now calls ifmedia_init_with_lock() because it needs to also use
an adaptive mutex.  The mcx driver still needs to be fully converted to
NET_MPSAFE.

- Simplify sc->mii_anegticks setting. Same as FreeBSD.

   Don't set the default value not in the attach function. Instead, set the
  default value (MII_ANEGTICKS) first in the beginning of the
  mii_phy_add_media(). The function already has the code to change the value to
  MII_ANEGTICKS_GIGE if it's gigabit capable.

- Remove extra pmf_device_register() call. It's done in mii_phy_add_media().

Pull up following revision(s) (requested by msaitoh in ticket #473):

	sys/dev/mii/rlphy.c: revision 1.37
	sys/dev/mii/miidevs: revision 1.155
	sys/dev/mii/miidevs: revision 1.156
	sys/dev/mii/miidevs: revision 1.157
	sys/dev/mii/miidevs: revision 1.159
	sys/dev/mii/miidevs: revision 1.160

 Add Teranetics, Aquantia and Renesas.

 Use uppercase for vendor name.

 Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3)
- ICPLUS -> xxICPLUS
- Print model name if it's ICPLUS IP101 to avoid "Realtek internal PHY".

Fix typo. from vezhlys
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202

Pull up the following revisions, requested by msaitoh in ticket #1457:

	sys/dev/mii/miidevs			1.155-1.157, 1.159-1.160
	sys/dev/mii/rlphy.c			1.37 via patch

- miidevs update:
 - Add Teranetics, Aquantia and Renesas.
 - Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3).
 - Fix typo. from vezhlys.
 - Rename JMICRON 0x0021 from JMC250 to JMP211
 - Rename JMICRON 0x0022 from JMC260 to JMP202
- rlphy(4): Print model name if it's ICPLUS IP101 to avoid printing
  "Realtek internal PHY".

- ICPLUS -> xxICPLUS
- Print model name if it's ICPLUS IP101 to avoid "Realtek internal PHY".

Sync with HEAD

 KNF. No functional change.

 Use static.

use a macro to tidy up the phydesc array initialization, from FreeBSD

Support RTL8152. Tested on ure(4) (RTL8152).

Sync with HEAD

 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

Synch with HEAD

 Fix a bug that rlphy might ignore the link partner's advertised speed.

update from HEAD

Sync with HEAD

KNF. Remove extra spaces. No functional change.

Pull up following revision(s) (requested by msaitoh in ticket #1189):
	sys/dev/pci/if_wm.c: revision 1.270
	sys/dev/mii/inphy.c: revision 1.53
	sys/dev/mii/glxtphy.c: revision 1.24
	sys/dev/mii/tlphy.c: revision 1.62
	sys/dev/mii/iophy.c: revision 1.37
	sys/dev/mii/brgphy.c: revision 1.70
	sys/dev/mii/ihphy.c: revision 1.8
	sys/dev/mii/bmtphy.c: revision 1.31
	sys/dev/mii/urlphy.c: revision 1.30
	sys/dev/mii/makphy.c: revision 1.40
	sys/dev/mii/qsphy.c: revision 1.48
	sys/dev/mii/igphy.c: revision 1.23
	sys/dev/mii/nsphy.c: revision 1.58
	sys/dev/mii/mvphy.c: revision 1.10
	sys/dev/pci/if_txp.c: revision 1.41
	sys/dev/mii/nsphy.c: revision 1.59
	sys/dev/mii/rlphy.c: revision 1.28
	sys/dev/mii/icsphy.c: revision 1.49
	sys/dev/mii/rlphy.c: revision 1.29
	sys/dev/mii/lxtphy.c: revision 1.49
	sys/dev/mii/ciphyreg.h: revision 1.5
	sys/dev/mii/nsphyter.c: revision 1.38
	sys/dev/mii/sqphy.c: revision 1.50
	sys/dev/mii/gentbi.c: revision 1.26
	sys/dev/mii/gentbi.c: revision 1.27
	sys/dev/mii/tqphy.c: revision 1.39
	sys/dev/mii/ikphy.c: revision 1.10
	sys/dev/mii/dmphy.c: revision 1.35
	sys/dev/mii/amhphy.c: revision 1.20
	sys/dev/mii/acphy.c: revision 1.24
	sys/dev/mii/ciphy.c: revision 1.25
	sys/dev/mii/brgphyreg.h: revision 1.8
	sys/dev/mii/ukphy_subr.c: revision 1.12
	sys/dev/ic/rtl80x9.c: revision 1.16
	sys/arch/mips/adm5120/dev/if_admsw.c: revision 1.12
	sys/dev/pci/if_kse.c: revision 1.28
	sys/dev/mii/ukphy_subr.c: revision 1.13
	sys/dev/mii/mii.h: revision 1.18
	sys/dev/mii/gphyter.c: revision 1.29
No functional change:
- Fix typo.
- Remove trailing white spaces.
- Capitalize comments.
- Tabify.
- KNF.
 IFM_FDX and IFM_HDX use different bit, so set IFM_HDX bit if it's not full
duplex. For many drivers, it recognize half duplex if IFM_FDX isn't set,
but not for others. Same as {Free|Open}BSD.

Rebase to HEAD as of a few days ago.

Rebase.

 IFM_FDX and IFM_HDX use different bit, so set IFM_HDX bit if it's not full
duplex. For many drivers, it recognize half duplex if IFM_FDX isn't set,
but not for others. Same as {Free|Open}BSD.

No functional change:
- Fix typo.
- Remove trailing white spaces.
- Capitalize comments.
- Tabify.
- KNF.

Sync with HEAD.

sync with head

Sync with HEAD

Match only first instance of rlphy, following suite from Free/OpenBSD.

should fix PR kern/42950, variant of patch from "js" on irc

rlphy fails to work without autonegotiation.

Reason is that ifm_data does not store BMCR data but a media index
that gets poked into the BMCR register.

Setting the BMCR and ANAR registers is correctly handled by the
generic function mii_phy_setmedia.

sync to netbsd-5

Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.

sync with head.

Pull up following revision(s) (requested by cegger in ticket #474):
	sys/dev/mii/inphy.c: revision 1.51
	sys/dev/mii/iophy.c: revision 1.35
	sys/dev/mii/nsphy.c: revision 1.56
	sys/dev/mii/rlphy.c: revision 1.25
	sys/dev/mii/ukphy_subr.c: revision 1.11
	sys/dev/pci/if_txp.c: revision 1.28
fix media priorities:
IEEE 802.3 Annex 28B.3 specifies the following relative
priorities of the technologies supported by
802.3 Selector Field value:
1000BASE-T full duplex
1000BASE-T
100BASE-T2 full duplex
100BASE-TX full duplex
100BASE-T2
100BASE-T4
100BASE-TX
10BASE-T full duplex
10BAST-T
Our drivers give 100BASE-T4 a higher priority than
100BASE-TX full duplex.
Fix this. This patch is based on changes in FreeBSD and OpenBSD.
Patch presented on tech-kern and tech-net:
http://mail-index.netbsd.org/tech-kern/2009/02/15/msg004397.html
http://mail-index.netbsd.org/tech-net/2009/02/15/msg001064.html
got no comments, no objections.

Sync with HEAD.

fix media priorities:

IEEE 802.3 Annex 28B.3 specifies the following relative
priorities of the technologies supported by
802.3 Selector Field value:

1000BASE-T full duplex
1000BASE-T
100BASE-T2 full duplex
100BASE-TX full duplex
100BASE-T2
100BASE-T4
100BASE-TX
10BASE-T full duplex
10BAST-T

Our drivers give 100BASE-T4 a higher priority than
100BASE-TX full duplex.
Fix this. This patch is based on changes in FreeBSD and OpenBSD.

Patch presented on tech-kern and tech-net:
http://mail-index.netbsd.org/tech-kern/2009/02/15/msg004397.html
http://mail-index.netbsd.org/tech-net/2009/02/15/msg001064.html

got no comments, no objections.

Sync with HEAD.

Sync with HEAD.

Use mii_anar(). No functional change.

Update haad-dm branch to haad-dm-base2.

Reduce code duplication: most PHY drivers call mii_phy_add_media()
when they attach to the device tree, so call pmf_device_register(9)
once there instead of once in more than twenty drivers.

Sync with netbsd-4.

Sync with HEAD.

sync with head.

sync with head.

device_t/softc split for all mii(4) devices, and other related
cosmetic changes.

use aprint_*_dev and device_xname

Pull up revisions 1.14-1.15 (requested by tsutsui in ticket #1111).

Prepare sc_rtl8201l flag in softc and use it in rlphy_status() so that
we don't have to check device names of device_parent(). From FreeBSD.

Fix wrong softc size (missed in the previous).

Pull up following revision(s) (requested by tsutsui in ticket #1098):
	sys/dev/mii/rlphy.c: revision 1.13
Prepare rlphy_reset() and set BMCR_AUTOEN in it.
This makes autonegotiation on rlphy(4) at re(4)
on landisk (8139C+) select 100baseTX full-duplex
at boot time (before first ifconfig) properly,
and there is no bad side effect on rlphy(4) at nfe(4).
This may also fix PR kern/34109.

Sync with HEAD.

sync with head

sync with HEAD

Sync with HEAD

Remove the device_is_active() check from each individual PHY's
service routine.  Add a wrapper for PHY_SERVICE(), called phy_service(),
and check device_is_active() there.  Make the mii_*() routines call
the PHY service routines thorugh phy_service() instead of PHY_SERVICE().

In mii_phy_resume(), restore a PHY's state after resetting it by
sending a MII_MEDIACHG command.  This change makes bnx(4) resume
more reliably and more quickly; it should help other NICs to resume,
too, if they attach PHYs through MII.

Sync with HEAD.

Sync with head.

sync with head.

Merge jmcneill-pm branch.

Rename pnp(9) -> pmf(9), as requested by many.

Register MII PHY drives with the PM framework. Nothing to do on suspend,
just reset the PHY on resume.

Sync with HEAD.

sync with head.

Sync with HEAD

sync with HEAD

Sync with HEAD.

Add missing aprint_naive("\n"); in rlphyattach.

sync with head.

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Sync with HEAD.

Sync with head.

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

sync with head.

Correct indent.

sync with head.

Sync with head.

Sync with head.

sync with head.

Fix wrong softc size (missed in the previous).

Sync with head.

Pullup to -current

sync with head.

Prepare sc_rtl8201l flag in softc and use it in rlphy_status() so that
we don't have to check device names of device_parent(). From FreeBSD.

Prepare rlphy_reset() and set BMCR_AUTOEN in it.
This makes autonegotiation on rlphy(4) at re(4)
on landisk (8139C+) select 100baseTX full-duplex
at boot time (before first ifconfig) properly,
and there is no bad side effect on rlphy(4) at nfe(4).

This may also fix PR kern/34109.

Pull up following revision(s) (requested by tsutsui in ticket #1673):
	distrib/sets/lists/man/mi		1.844, 1.871
	share/man/man4/Makefile			1.372, 1.379 via patch
	share/man/man4/re.4			1.8, 1.9, 1.11, 1.12
	share/man/man4/rgephy.4			1.1
	share/man/man4/rlphy.4			1.1, 1.2
	sys/arch/amd64/conf/GENERIC		1.79, 1.89
	sys/arch/amd64/conf/INSTALL		1.45, 1.49
	sys/arch/i386/conf/GENERIC		1.717, 1.747
	sys/arch/i386/conf/GENERIC_LAPTOP	1.164
	sys/arch/i386/conf/INSTALL		1.277, 1.283
	sys/arch/i386/conf/INSTALL_LAPTOP	1.96, 1.98
	sys/arch/i386/conf/XEN2_DOM0		1.22 via patch
	sys/arch/macppc/conf/GENERIC		1.220, 1.246
	sys/arch/macppc/conf/INSTALL		1.96, 1.100
	sys/dev/cardbus/if_re_cardbus.c		1.10
	sys/dev/cardbus/if_rtk_cardbus.c 	1.29-1.31
	sys/dev/ic/rtl8169.c			1.14, 1.20, 1.24, 1.25, 1.28-1.61, 1.63, 1.64-1.81 via patch
	sys/dev/ic/rtl81x9.c			1.52, 1.54-1.63, 1.65, 1.67-1.70
	sys/dev/ic/rtl81x9reg.h			1.15-1.26
	sys/dev/ic/rtl81x9var.h			1.19, 1.21-1.37
	sys/dev/mii/files.mii			1.38
	sys/dev/mii/miidevs			1.62, 1.64
	sys/dev/mii/rgephy.c			1.10, 1.13-1.16
	sys/dev/mii/rlphy.c			1.1, 1.6, 1.7, 1.11 via patch
	sys/dev/pci/if_re_pci.c			1.13, 1.15-1.17, 1.19-1.23
	sys/dev/pci/if_rtk_pci.c		1.25, 1.28, 1.29, 1.31
	sys/dev/pci/pcidevs			1.851, 1.852

on re(4):
- improve stability (I believe ;-)
- add a workaround for hardware ip4csum-tx bug
- support newer chips (8169SB/SC, PCIe based 8168 etc.)
- fix 8139C+ support
- enable hardware VLAN
- misc bus_dma(9) fix (which makes re(4) work on mips ports)

on rtk(4):
- fix kern/31348
- fix possible panic on dreamcast

sync with head.

sync with head.

Sync with head.

file rlphy.c was added on branch netbsd-3 on 2007-03-03 23:30:25 +0000

__unused removal on arguments; approved by core.

Make rlphy also match if parent MII is re(4) for RTL8139C+ case.
Tested by Brian A. Seklecki.

sync with head

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

sync with head

sync with head.

Sync with head.

sync with head.

sync with head.

Merge 2006-03-31 NetBSD-current into the "peter-altq" branch.

file rlphy.c was added on branch yamt-lazymbuf on 2006-06-21 15:04:46 +0000

Use device_private().

Merge 2006-03-28 NetBSD-current into the "peter-altq" branch.

Use device_parent().

add an rlphy clone from IC Plus.  from openbsd.

sync with head.

fix match for RealTek 8201L.

sync with head.

Reduce previous (!is(...) != 0) to (!is(...)).

Use device_is_a() more.

Use device_is_a().

Use device_is_active() rather than testing dv_flags for DVF_ACTIVE
directly.

sync with head.

file rlphy.c was added on branch yamt-uio_vmspace on 2006-01-15 10:02:48 +0000

Add rlphy(4) (Realtek 8139/8201L PHY) from OpenBSD.