sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-31 15:25:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

[mii] Separate concepts of MII interface and MII device

Browse Source 
We currently have no generic concept of a PHY address, since all
existing implementations simply hardcode the PHY address within the
MII access methods.

A bit-bashing MII interface will need to be provided with an explicit
PHY address in order to generate the correct waveform.  Allow for this
by separating out the concept of a MII device (i.e. a specific PHY
address attached to a particular MII interface).

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2018-04-19 12:38:55 +01:00
parent 285e3e5287
commit 6804a8c89b
10 changed files with 118 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/net/velocity.c
View File

@@ -100,13 +100,15 @@ static int velocity_autopoll_start ( struct velocity_nic *vlc ) {
/**
* Read from MII register
*
* @v mii MII interface
* @v mdio MII interface
* @v phy PHY address
* @v reg Register address
* @ret value Data read, or negative error
*/
static int velocity_mii_read ( struct mii_interface *mii, unsigned int reg ) {
static int velocity_mii_read ( struct mii_interface *mdio,
unsigned int phy __unused, unsigned int reg ) {
struct velocity_nic *vlc =
container_of ( mii, struct velocity_nic, mii );
container_of ( mdio, struct velocity_nic, mdio );
int timeout = VELOCITY_TIMEOUT_US;
int result;
@@ -140,15 +142,17 @@ static int velocity_mii_read ( struct mii_interface *mii, unsigned int reg ) {
/**
* Write to MII register
*
* @v mii MII interface
* @v mdio MII interface
* @v phy PHY address
* @v reg Register address
* @v data Data to write
* @ret rc Return status code
*/
static int velocity_mii_write ( struct mii_interface *mii, unsigned int reg,
static int velocity_mii_write ( struct mii_interface *mdio,
unsigned int phy __unused, unsigned int reg,
unsigned int data) {
struct velocity_nic *vlc =
container_of ( mii, struct velocity_nic, mii );
container_of ( mdio, struct velocity_nic, mdio );
int timeout = VELOCITY_TIMEOUT_US;
DBGC2 ( vlc, "VELOCITY %p MII write reg %d data 0x%04x\n",
@@ -747,7 +751,8 @@ static int velocity_probe ( struct pci_device *pci ) {
netdev->hw_addr[5] = readb ( vlc->regs + VELOCITY_MAC5 );
/* Initialise and reset MII interface */
mii_init ( &vlc->mii, &velocity_mii_operations );
mdio_init ( &vlc->mdio, &velocity_mii_operations );
mii_init ( &vlc->mii, &vlc->mdio, 0 );
if ( ( rc = mii_reset ( &vlc->mii ) ) != 0 ) {
DBGC ( vlc, "VELOCITY %p could not reset MII: %s\n",
vlc, strerror ( rc ) );