riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/stm32: Fix/cleanup periph_eth

Browse Source 
The methods to read from / write to MII registers had an address argument to
allow specifying the PHY to communicate with. However, only a single PHY is
available on all boards supported and the driver is not able to operate with
multiple PHYs anyway - thus, drop this parameter for ease of use.

This fixes a bug in the _get_link_status() function, which used hard coded the
address 0; which might not be correct for all boards.
This commit is contained in:
Marian Buschsieweke 2020-10-09 10:43:50 +02:00
parent a83927d031
commit 0e43c927b1
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cpu/stm32/periph/eth.c
View File

@ -107,7 +107,6 @@ static uint8_t _link_state = LINK_STATE_DOWN;
/** /**
* @brief Read or write a MII register * @brief Read or write a MII register
* *
* @param[in] addr Which of the 32 possible PHY devices to access
* @param[in] reg MII register to access * @param[in] reg MII register to access
* @param[in] value Value to write (ignored when @p write is `false`) * @param[in] value Value to write (ignored when @p write is `false`)
* @param[in] write Whether to write (`true`) or read (`false`) to/from the * @param[in] write Whether to write (`true`) or read (`false`) to/from the
@ -116,16 +115,16 @@ static uint8_t _link_state = LINK_STATE_DOWN;
* @return The value of the MII register accessed. (This should be equal to * @return The value of the MII register accessed. (This should be equal to
* @p value, if @p write was `true`.) * @p value, if @p write was `true`.)
*/ */
static uint16_t _mii_reg_transfer(unsigned addr, unsigned reg, uint16_t value, static uint16_t _mii_reg_transfer(unsigned reg, uint16_t value, bool write)
bool write)
{ {
unsigned tmp; unsigned tmp;
const uint16_t phy_addr = eth_config.phy_addr;
while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {} while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {}
DEBUG("[stm32_eth] rw_phy %x (%x): %x\n", addr, reg, value); DEBUG("[stm32_eth] rw_phy %x (%x): %x\n", (unsigned)phy_addr, reg, value);
tmp = CLOCK_RANGE | ETH_MACMIIAR_MB tmp = CLOCK_RANGE | ETH_MACMIIAR_MB
| (((addr & 0x1f) << 11) | ((reg & 0x1f) << 6)); | (((phy_addr & 0x1f) << 11) | ((reg & 0x1f) << 6));
if (write) { if (write) {
tmp |= ETH_MACMIIAR_MW; tmp |= ETH_MACMIIAR_MW;
@ -139,19 +138,19 @@ static uint16_t _mii_reg_transfer(unsigned addr, unsigned reg, uint16_t value,
return ETH->MACMIIDR; return ETH->MACMIIDR;
} }
static inline int16_t _mii_reg_read(uint16_t addr, uint8_t reg) static inline int16_t _mii_reg_read(uint8_t reg)
{ {
return _mii_reg_transfer(addr, reg, 0, false); return _mii_reg_transfer(reg, 0, false);
} }
static inline void _mii_reg_write(uint16_t addr, uint8_t reg, uint16_t value) static inline void _mii_reg_write(uint8_t reg, uint16_t value)
{ {
_mii_reg_transfer(addr, reg, value, true); _mii_reg_transfer(reg, value, true);
} }
static inline bool _get_link_status(void) static inline bool _get_link_status(void)
{ {
return (_mii_reg_read(0, PHY_BSMR) & BSMR_LINK_STATUS); return (_mii_reg_read(PHY_BSMR) & BSMR_LINK_STATUS);
} }
static void stm32_eth_get_addr(char *out) static void stm32_eth_get_addr(char *out)
@ -306,7 +305,7 @@ static int stm32_eth_init(netdev_t *netdev)
/* configure the PHY (standard for all PHY's) */ /* configure the PHY (standard for all PHY's) */
/* if there's no PHY, this has no effect */ /* if there's no PHY, this has no effect */
_mii_reg_write(eth_config.phy_addr, PHY_BMCR, BMCR_RESET); _mii_reg_write(PHY_BMCR, BMCR_RESET);
/* speed from conf */ /* speed from conf */
ETH->MACCR |= (ETH_MACCR_ROD | ETH_MACCR_IPCO | ETH_MACCR_APCS | ETH->MACCR |= (ETH_MACCR_ROD | ETH_MACCR_IPCO | ETH_MACCR_APCS |
@ -352,7 +351,7 @@ static int stm32_eth_init(netdev_t *netdev)
/* configure speed, do it at the end so the PHY had time to /* configure speed, do it at the end so the PHY had time to
* reset */ * reset */
_mii_reg_write(eth_config.phy_addr, PHY_BMCR, eth_config.speed); _mii_reg_write(PHY_BMCR, eth_config.speed);
return 0; return 0;
} }