* [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032
@ 2020-05-26 10:08 Oleksij Rempel
2020-05-26 13:32 ` Andrew Lunn
2020-05-26 17:12 ` Florian Fainelli
0 siblings, 2 replies; 3+ messages in thread
From: Oleksij Rempel @ 2020-05-26 10:08 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, Heiner Kallweit
Cc: Oleksij Rempel, David S. Miller, kernel, linux-kernel, netdev,
Russell King
Add support for Atheros 100Bast-T PHYs. The only difference seems to be
the ability to test 2 pares instead of 4 and the lack of 1000Bast-T
specific register.
Only ATH9331 was tested with this patch.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/phy/at803x.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index acd51b29a476b..4b9dd43b5b5bf 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -920,10 +920,16 @@ static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair)
static int at803x_cable_test_get_status(struct phy_device *phydev,
bool *finished)
{
- unsigned long pair_mask = 0xf;
+ unsigned long pair_mask;
int retries = 20;
int pair, ret;
+ if (phydev->phy_id == ATH9331_PHY_ID ||
+ phydev->phy_id == ATH8032_PHY_ID)
+ pair_mask = 0x3;
+ else
+ pair_mask = 0xf;
+
*finished = false;
/* According to the datasheet the CDT can be performed when
@@ -958,7 +964,9 @@ static int at803x_cable_test_start(struct phy_device *phydev)
*/
phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA);
- phy_write(phydev, MII_CTRL1000, 0);
+ if (phydev->phy_id != ATH9331_PHY_ID &&
+ phydev->phy_id != ATH8032_PHY_ID)
+ phy_write(phydev, MII_CTRL1000, 0);
/* we do all the (time consuming) work later */
return 0;
@@ -1032,6 +1040,7 @@ static struct phy_driver at803x_driver[] = {
.name = "Qualcomm Atheros AR8032",
.probe = at803x_probe,
.remove = at803x_remove,
+ .flags = PHY_POLL_CABLE_TEST,
.config_init = at803x_config_init,
.link_change_notify = at803x_link_change_notify,
.set_wol = at803x_set_wol,
@@ -1041,15 +1050,20 @@ static struct phy_driver at803x_driver[] = {
/* PHY_BASIC_FEATURES */
.ack_interrupt = at803x_ack_interrupt,
.config_intr = at803x_config_intr,
+ .cable_test_start = at803x_cable_test_start,
+ .cable_test_get_status = at803x_cable_test_get_status,
}, {
/* ATHEROS AR9331 */
PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
.name = "Qualcomm Atheros AR9331 built-in PHY",
.suspend = at803x_suspend,
.resume = at803x_resume,
+ .flags = PHY_POLL_CABLE_TEST,
/* PHY_BASIC_FEATURES */
.ack_interrupt = &at803x_ack_interrupt,
.config_intr = &at803x_config_intr,
+ .cable_test_start = at803x_cable_test_start,
+ .cable_test_get_status = at803x_cable_test_get_status,
} };
module_phy_driver(at803x_driver);
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032
2020-05-26 10:08 [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032 Oleksij Rempel
@ 2020-05-26 13:32 ` Andrew Lunn
2020-05-26 17:12 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Lunn @ 2020-05-26 13:32 UTC (permalink / raw)
To: Oleksij Rempel
Cc: Florian Fainelli, Heiner Kallweit, David S. Miller, kernel,
linux-kernel, netdev, Russell King
On Tue, May 26, 2020 at 12:08:23PM +0200, Oleksij Rempel wrote:
> Add support for Atheros 100Bast-T PHYs. The only difference seems to be
> the ability to test 2 pares instead of 4 and the lack of 1000Bast-T
> specific register.
s/Bast-T/Base-T/g
s/pares/pairs/
Otherwise this looks good.
Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032
2020-05-26 10:08 [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032 Oleksij Rempel
2020-05-26 13:32 ` Andrew Lunn
@ 2020-05-26 17:12 ` Florian Fainelli
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2020-05-26 17:12 UTC (permalink / raw)
To: Oleksij Rempel, Andrew Lunn, Heiner Kallweit
Cc: David S. Miller, kernel, linux-kernel, netdev, Russell King
On 5/26/2020 3:08 AM, Oleksij Rempel wrote:
> Add support for Atheros 100Bast-T PHYs. The only difference seems to be
> the ability to test 2 pares instead of 4 and the lack of 1000Bast-T
> specific register.
>
> Only ATH9331 was tested with this patch.
>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
If you fix the typos reported by Andrew:
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
thanks!
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-26 17:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 10:08 [PATCH net-next v1] net: phy: at803x: add cable diagnostics support for ATH9331 and ATH8032 Oleksij Rempel
2020-05-26 13:32 ` Andrew Lunn
2020-05-26 17:12 ` Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.