diff options
| author | David S. Miller <davem@davemloft.net> | 2024-06-23 10:06:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-06-23 10:06:58 +0100 |
| commit | 4ae2c67840a0a3c88cd71fc3013f958d60f7e50c (patch) | |
| tree | 19519e3b3014daf32dbe22c7bca3019e7b9eae3d /drivers/net/phy/micrel.c | |
| parent | 42354e3c3150cf886457f3354af0acefc56b53a2 (diff) | |
| parent | bf1bff11e497a01b0cc6cb2afcff734340ae95f8 (diff) | |
| download | linux-4ae2c67840a0a3c88cd71fc3013f958d60f7e50c.tar.gz linux-4ae2c67840a0a3c88cd71fc3013f958d60f7e50c.tar.bz2 linux-4ae2c67840a0a3c88cd71fc3013f958d60f7e50c.zip | |
Merge branch 'phy-microchip-ksz-9897-errata'
Enguerrand de Ribaucourt says:
====================
Handle new Microchip KSZ 9897 Errata
These patches implement some suggested workarounds from the Microchip KSZ 9897
Errata [1].
[1] https://ww1.microchip.com/downloads/aemDocuments/documents/UNG/ProductDocuments/Errata/KSZ9897R-Errata-DS80000758.pdf
---
v7:
- use dev_crit_once instead of dev_crit_ratelimited
- add a comment to help users understand the consequences of half-duplex errors
v6: https://lore.kernel.org/netdev/20240614094642.122464-1-enguerrand.de-ribaucourt@savoirfairelinux.com/
- remove KSZ9897 phy_id workaround (was a configuration issue)
- use macros for checking link down in monitoring function
- check if VLAN is enabled before monitoring resources
v5: https://lore.kernel.org/all/20240604092304.314636-1-enguerrand.de-ribaucourt@savoirfairelinux.com/
- use macros for bitfields
- rewrap comments
- check ksz_pread* return values
- fix spelling mistakes
- remove KSZ9477 suspend/resume deletion patch
v4: https://lore.kernel.org/all/20240531142430.678198-1-enguerrand.de-ribaucourt@savoirfairelinux.com/
- Rebase on net/main
- Add Fixes: tags to the patches
- reverse x-mas tree order
- use pseudo phy_id instead of match_phy_device
v3: https://lore.kernel.org/all/20240530102436.226189-1-enguerrand.de-ribaucourt@savoirfairelinux.com/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 5aada7cf3da7..ebafedde0ab7 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -5607,6 +5607,7 @@ static struct mdio_device_id __maybe_unused micrel_tbl[] = { { PHY_ID_KSZ8081, MICREL_PHY_ID_MASK }, { PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK }, { PHY_ID_KSZ886X, MICREL_PHY_ID_MASK }, + { PHY_ID_KSZ9477, MICREL_PHY_ID_MASK }, { PHY_ID_LAN8814, MICREL_PHY_ID_MASK }, { PHY_ID_LAN8804, MICREL_PHY_ID_MASK }, { PHY_ID_LAN8841, MICREL_PHY_ID_MASK }, |