sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-04-16 03:00:10 +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
src/drivers/net/realtek.c
+15 -8
View File
@@ -242,12 +242,15 @@ static int realtek_init_eeprom ( struct net_device *netdev ) {
/**
* 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 realtek_mii_read ( struct mii_interface *mii, unsigned int reg ) {
struct realtek_nic *rtl = container_of ( mii, struct realtek_nic, mii );
static int realtek_mii_read ( struct mii_interface *mdio,
unsigned int phy __unused, unsigned int reg ) {
struct realtek_nic *rtl =
container_of ( mdio, struct realtek_nic, mdio );
unsigned int i;
uint32_t value;
@@ -279,14 +282,17 @@ static int realtek_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 realtek_mii_write ( struct mii_interface *mii, unsigned int reg,
unsigned int data) {
struct realtek_nic *rtl = container_of ( mii, struct realtek_nic, mii );
static int realtek_mii_write ( struct mii_interface *mdio,
unsigned int phy __unused, unsigned int reg,
unsigned int data ) {
struct realtek_nic *rtl =
container_of ( mdio, struct realtek_nic, mdio );
unsigned int i;
/* Fail if PHYAR register is not present */
@@ -1158,7 +1164,8 @@ static int realtek_probe ( struct pci_device *pci ) {
}
/* Initialise and reset MII interface */
mii_init ( &rtl->mii, &realtek_mii_operations );
mdio_init ( &rtl->mdio, &realtek_mii_operations );
mii_init ( &rtl->mii, &rtl->mdio, 0 );
if ( ( rc = realtek_phy_reset ( rtl ) ) != 0 )
goto err_phy_reset;