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

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

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

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

	sys/dev/mii/ciphy.c: revision 1.42
	sys/dev/mii/brgphy.c: revision 1.91
	sys/dev/mii/mii_physubr.c: revision 1.102
	sys/dev/mii/ipgphy.c: revision 1.11
	sys/dev/mii/tlphy.c: revision 1.72
	sys/dev/mii/jmphy.c: revision 1.5
	sys/dev/mii/urlphy.c: revision 1.40
	sys/dev/mii/atphy.c: revision 1.31

Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1.

Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1.

 Don't do full initialization for autonego when just restarting autonego
because it's not required.

 This change reduce extra initialization which include PHY_RESET() which
caused long delay(max 500ms).

- Remove the waitfor argument from mii_phy_auto().
- Whitespace fix.

Mostly merge changes from HEAD upto 20200411

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 #378):

	sys/dev/mii/ciphy.c: revision 1.36

Call mii_phy_flowstatus() to show the flow setting.

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

	sys/dev/mii/ciphy.c			1.34-1.37 via patch
	sys/dev/mii/miidevs			1.158

- Indicate master mode if the negotiated result say so.
- Call mii_phy_flowstatus() to show the flow setting.
- Match a lot of Cicada and Vitesse devices correctly.
- Add support for VSC8221, VSC8234 and VSC8641.
- KNF

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

	sys/dev/mii/miidevs: revision 1.158
	sys/dev/mii/ciphy.c: revision 1.37

- All of Cicada and Vitesse devices' OUI are not bit-reversed, so use "xx".
- Rename CS82xx -> CIS82xx
- Add Vitesse VSC8224, VSC8234, VSC8641 and VSC8501.
- Match a lot of Cicada and Vitesse devices correctly. This change also fixes
  a bug that ciphy_fixup() didn't work.
- Match VSC8221, VSC8234 and VSC8641.

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

	sys/dev/mii/ciphy.c: revision 1.35
	sys/dev/mii/rgephy.c: revision 1.56
	sys/dev/mii/rgephy.c: revision 1.57

Make new rgephy_linkup() function and share it like FreeBSD.
No functional change intended.

- Indicate master mode if the negotiated result say so.
- KNF

- Match a lot of Cicada and Vitesse devices correctly. This change also fixes
  a bug that ciphy_fixup() didn't work.
- Match VSC8221, VSC8234 and VSC8641.

 Call mii_phy_flowstatus() to show the flow setting.

- Indicat master mode if the negotiated result say so.
- KNF

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

	sys/dev/mii/ciphy.c				1.27-1.28, 1.30, 1.32
							via patch
	sys/dev/mii/ciphyreg.h				1.6

- The register bit definitions from register 0 to 15 in ciphyreg.h
  conform to the 802.3 spec, so remove them and use mii.h's definition.
  No functional change.
- Add CS8204, CS8244 VSC8211 and VSC8601 support from {Free,Open}BSD.
- KNF.

Sync with HEAD

Pull up the following, via patch, requested by msaitoh in ticket #1263:

	sys/dev/mii/brgphy.c				1.84
	sys/dev/mii/ciphy.c				1.33 via patch
	sys/dev/mii/rgephy.c				1.53
	sys/arch/arm/imx/if_enet.c			1.18
	sys/arch/mips/adm5120/dev/if_admsw.c		1.19-1.20
	sys/dev/pci/if_bge.c				1.329
	sys/dev/pci/if_bnx.c				1.81
	sys/dev/pci/if_et.c				1.21
	sys/dev/pci/if_lii.c				1.22
	sys/dev/pci/if_msk.c				1.87
	sys/dev/pci/if_nfe.c				1.68
	sys/dev/pci/if_sk.c				1.95
	sys/dev/pci/if_ti.c				1.107
	sys/dev/pci/if_txp.c				1.52
	sys/dev/pci/if_vge.c				1.69
	sys/dev/usb/if_axen.c				1.38
	sys/dev/usb/if_aue.c				1.149

Fix a bug that the duplex of manual media setting may be wrong
when the IFM_GMASK bit other than IFM_[FH]DX is set.

 KNF. No functional change.

 Fix a bug that the duplex of manual media setting may be wrong
when the IFM_GMASK bit other than IFM_[FH]DX is set. Same as a part of
FreeBSD r217413.

 KNF. No functional change.

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

Add CS8204, CS8244 VSC8211 and VSC8601 support from {Free,Open}BSD.

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

CIPHY_MII_BMCR -> MII_BMCR in #ifdef foo.

 The register bit definitions from register 0 to 15 in ciphyreg.h conform to
the 802.3 spec, so remove them and use mii.h's definition.
No functional change.

update from HEAD

Sync with HEAD

KNF. Remove extra spaces. No functional change.

Pull up following revision(s) (requested by msaitoh in ticket #1245):
	sys/dev/mii/rgephy.c: revision 1.30
	sys/dev/mii/brgphy.c: revision 1.64
	sys/dev/mii/atphy.c: revision 1.13
	sys/dev/mii/urlphy.c: revision 1.26
	sys/dev/mii/ciphy.c: revision 1.20
	sys/dev/mii/mii_physubr.c: revision 1.76
  Fix a bug that the auto negotiation timer isn't cleard as we expected.
To not to forget clearing the timer and to reduce the code duplication,
clear mii_ticks in *mii_phy_auto().

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.

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")

resync from head

Update link status quickly. This change is a part of mii_physubr.c rev.
1.77-1.78.

 Update link status quickly. This change is a part of FreeBSD's mii_physubr.c
r158649.

 ciphy is gigabit PHY, so use MII_ANEGTICKS_GIGE instead of MII_ANEGTICKS.

 atphy, ciphy, ihphy and rgephy are gigabit PHY, so not only check IFM_AUTO
for autonegotiation but also check IFM_1000_T, too.

 Fix a bug that the auto negotiation timer isn't cleard as we expected.
To not to forget clearing the timer and to reduce the code duplication,
clear mii_ticks in *mii_phy_auto().

sync with head

Sync with HEAD.

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

struct device * -> device_t, no functional changes intended.

struct cfdata * -> cfdata_t, no functional changes intended.

sync with head.

Sync with HEAD.

Change about 4500 of the K&R function definitions to ANSI ones.
There are still about 1600 left, but they have ',' or /* ... */
in the actual variable definitions - which my awk script doesn't handle.
There are also many that need () -> (void).
(The script does handle misordered arguments.)

Sync with HEAD.

Sync with HEAD.

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 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

sync with head

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.

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.

sync with head.

sync with head.

Include <sys/device.h> for struct device.

Sync with head.

- don't hardcode 5, 10 define and use MII_ANEGTICKS{,_GIGE}
- instead of != limit, use <= limit (conservative)

__unused removal on arguments; approved by core.

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.

integrate kauth.

Sync with head.

Pull up following revision(s) (requested by tron in ticket #1266):
	sys/dev/mii/ciphyreg.h: revision 1.4 via patch
	sys/dev/mii/ciphy.c: revision 1.5 via patch
from OpenBSD:
We need to special case ciphy to ask for RGMII interface at 2.5V for nfe.
This makes Cicada/Vitesse PHYs attached to nfe work.
Many thanks to Bill Paul for diagnosing the problem and suggesting a solution.

sync with head.

sync with head.

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

Use device_private().

sync with head.

from OpenBSD:
We need to special case ciphy to ask for RGMII interface at 2.5V for nfe.
This makes Cicada/Vitesse PHYs attached to nfe work.
Many thanks to Bill Paul for diagnosing the problem and suggesting a solution.

Sync with head.

Match all model numbers with both Cicada OUIs; this allows the proper PHY to
attach on my ZyXEL GN650-T.

sync with -current

Sync with HEAD.

sync with head.  xen and whitespace.  xen part is not finished.

file ciphy.c was added on branch kent-audio2 on 2005-04-29 11:29:04 +0000

file ciphy.c was added on branch yamt-km on 2005-03-19 08:34:59 +0000

Changes to match xxCICADA 8201B found in a VT6122.
Match at > 1 (10) to ensure we get ciphy instead of ukphy.
Use aprint(9) on attach.
Minor stylistic changes.
All from Tomokazu HARADA in PR kern/29705.

Sync with HEAD.

Hi Perry!

file ciphy.c was added on branch ktrace-lwp on 2005-03-04 16:44:57 +0000

nuke trailing whitespace

Add driver for 10/100/1000 copper PHY integrated on VIA Networking Technologies
VT6122 gigabit ethernet chips

From FreeBSD