* [PATCH 2/4] net/phy: Add VSC8574 support
2013-11-15 22:58 [PATCH 1/4] net/phy: Add VSC8234 support Shruti Kanetkar
@ 2013-11-15 22:58 ` Shruti Kanetkar
2013-11-15 22:58 ` [PATCH 3/4] net/phy: Add VSC8662 support Shruti Kanetkar
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Shruti Kanetkar @ 2013-11-15 22:58 UTC (permalink / raw)
To: davem, netdev; +Cc: shaohui xie, Andy Fleming, Shruti Kanetkar
From: shaohui xie <Shaohui.Xie@freescale.com>
The VSC8574 is a quad-port Gigabit Ethernet transceiver with four SerDes
interfaces for quad-port dual media capability.
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Andy Fleming <afleming@gmail.com>
Signed-off-by: Shruti Kanetkar <Shruti@freescale.com>
---
drivers/net/phy/vitesse.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 59e3b58..31b3148 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -56,6 +56,7 @@
#define PHY_ID_VSC8234 0x000fc620
#define PHY_ID_VSC8244 0x000fc6c0
+#define PHY_ID_VSC8574 0x000704a0
#define PHY_ID_VSC8221 0x000fc550
#define PHY_ID_VSC8211 0x000fc4b0
@@ -120,7 +121,8 @@ static int vsc82xx_config_intr(struct phy_device *phydev)
if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
err = phy_write(phydev, MII_VSC8244_IMASK,
(phydev->drv->phy_id == PHY_ID_VSC8234 ||
- phydev->drv->phy_id == PHY_ID_VSC8244) ?
+ phydev->drv->phy_id == PHY_ID_VSC8244 ||
+ phydev->drv->phy_id == PHY_ID_VSC8574) ?
MII_VSC8244_IMASK_MASK :
MII_VSC8221_IMASK_MASK);
else {
@@ -178,6 +180,18 @@ static struct phy_driver vsc82xx_driver[] = {
.config_intr = &vsc82xx_config_intr,
.driver = { .owner = THIS_MODULE,},
}, {
+ .phy_id = PHY_ID_VSC8574,
+ .name = "Vitesse VSC8574",
+ .phy_id_mask = 0x000ffff0,
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_INTERRUPT,
+ .config_init = &vsc824x_config_init,
+ .config_aneg = &genphy_config_aneg,
+ .read_status = &genphy_read_status,
+ .ack_interrupt = &vsc824x_ack_interrupt,
+ .config_intr = &vsc82xx_config_intr,
+ .driver = { .owner = THIS_MODULE,},
+}, {
/* Vitesse 8221 */
.phy_id = PHY_ID_VSC8221,
.phy_id_mask = 0x000ffff0,
@@ -223,6 +237,7 @@ module_exit(vsc82xx_exit);
static struct mdio_device_id __maybe_unused vitesse_tbl[] = {
{ PHY_ID_VSC8234, 0x000ffff0 },
{ PHY_ID_VSC8244, 0x000fffc0 },
+ { PHY_ID_VSC8574, 0x000ffff0 },
{ PHY_ID_VSC8221, 0x000ffff0 },
{ PHY_ID_VSC8211, 0x000ffff0 },
{ }
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] net/phy: Add VSC8662 support
2013-11-15 22:58 [PATCH 1/4] net/phy: Add VSC8234 support Shruti Kanetkar
2013-11-15 22:58 ` [PATCH 2/4] net/phy: Add VSC8574 support Shruti Kanetkar
@ 2013-11-15 22:58 ` Shruti Kanetkar
2013-11-15 22:58 ` [PATCH 4/4] net/phy: Add the autocross feature for forced links on VSC82x4 Shruti Kanetkar
2013-11-16 1:58 ` [PATCH 1/4] net/phy: Add VSC8234 support David Miller
3 siblings, 0 replies; 8+ messages in thread
From: Shruti Kanetkar @ 2013-11-15 22:58 UTC (permalink / raw)
To: davem, netdev; +Cc: Sandeep Singh, Sandeep Singh, Andy Fleming, Shruti Kanetkar
From: Sandeep Singh <sandeep@freescale.com>
Vitesse VSC8662 is Dual Port 10/100/1000Base-T Phy
Its register set and features are similar to other Vitesse Phys.
Signed-off-by: Sandeep Singh <Sandeep@freescale.com>
Signed-off-by: Andy Fleming <afleming@gmail.com>
Signed-off-by: Shruti Kanetkar <Shruti@Freescale.com>
---
drivers/net/phy/vitesse.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 31b3148..40406bc 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -57,6 +57,7 @@
#define PHY_ID_VSC8234 0x000fc620
#define PHY_ID_VSC8244 0x000fc6c0
#define PHY_ID_VSC8574 0x000704a0
+#define PHY_ID_VSC8662 0x00070660
#define PHY_ID_VSC8221 0x000fc550
#define PHY_ID_VSC8211 0x000fc4b0
@@ -192,6 +193,18 @@ static struct phy_driver vsc82xx_driver[] = {
.config_intr = &vsc82xx_config_intr,
.driver = { .owner = THIS_MODULE,},
}, {
+ .phy_id = PHY_ID_VSC8662,
+ .name = "Vitesse VSC8662",
+ .phy_id_mask = 0x000ffff0,
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_INTERRUPT,
+ .config_init = &vsc824x_config_init,
+ .config_aneg = &genphy_config_aneg,
+ .read_status = &genphy_read_status,
+ .ack_interrupt = &vsc824x_ack_interrupt,
+ .config_intr = &vsc82xx_config_intr,
+ .driver = { .owner = THIS_MODULE,},
+}, {
/* Vitesse 8221 */
.phy_id = PHY_ID_VSC8221,
.phy_id_mask = 0x000ffff0,
@@ -238,6 +251,7 @@ static struct mdio_device_id __maybe_unused vitesse_tbl[] = {
{ PHY_ID_VSC8234, 0x000ffff0 },
{ PHY_ID_VSC8244, 0x000fffc0 },
{ PHY_ID_VSC8574, 0x000ffff0 },
+ { PHY_ID_VSC8662, 0x000ffff0 },
{ PHY_ID_VSC8221, 0x000ffff0 },
{ PHY_ID_VSC8211, 0x000ffff0 },
{ }
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] net/phy: Add the autocross feature for forced links on VSC82x4
2013-11-15 22:58 [PATCH 1/4] net/phy: Add VSC8234 support Shruti Kanetkar
2013-11-15 22:58 ` [PATCH 2/4] net/phy: Add VSC8574 support Shruti Kanetkar
2013-11-15 22:58 ` [PATCH 3/4] net/phy: Add VSC8662 support Shruti Kanetkar
@ 2013-11-15 22:58 ` Shruti Kanetkar
2013-11-16 1:58 ` [PATCH 1/4] net/phy: Add VSC8234 support David Miller
3 siblings, 0 replies; 8+ messages in thread
From: Shruti Kanetkar @ 2013-11-15 22:58 UTC (permalink / raw)
To: davem, netdev; +Cc: Madalin Bucur, Shruti Kanetkar
From: Madalin Bucur <madalin.bucur@freescale.com>
Add auto-MDI/MDI-X capability for forced (autonegotiation disabled)
10/100 Mbps speeds on Vitesse VSC82x4 PHYs. Exported previously static
function genphy_setup_forced() required by the new config_aneg handler
in the Vitesse PHY module.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Signed-off-by: Shruti Kanetkar <Shruti@freescale.com>
---
drivers/net/phy/phy_device.c | 4 +--
drivers/net/phy/vitesse.c | 75 +++++++++++++++++++++++++++++++++++++++++---
include/linux/phy.h | 1 +
3 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 74630e9..d6447b3 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -697,7 +697,7 @@ static int genphy_config_advert(struct phy_device *phydev)
* to the values in phydev. Assumes that the values are valid.
* Please see phy_sanitize_settings().
*/
-static int genphy_setup_forced(struct phy_device *phydev)
+int genphy_setup_forced(struct phy_device *phydev)
{
int err;
int ctl = 0;
@@ -716,7 +716,7 @@ static int genphy_setup_forced(struct phy_device *phydev)
return err;
}
-
+EXPORT_SYMBOL(genphy_setup_forced);
/**
* genphy_restart_aneg - Enable and Restart Autonegotiation
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 40406bc..508e435 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -3,7 +3,7 @@
*
* Author: Kriston Carson
*
- * Copyright (c) 2005, 2009 Freescale Semiconductor, Inc.
+ * Copyright (c) 2005, 2009, 2011 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -18,6 +18,11 @@
#include <linux/ethtool.h>
#include <linux/phy.h>
+/* Vitesse Extended Page Magic Register(s) */
+#define MII_VSC82X4_EXT_PAGE_16E 0x10
+#define MII_VSC82X4_EXT_PAGE_17E 0x11
+#define MII_VSC82X4_EXT_PAGE_18E 0x12
+
/* Vitesse Extended Control Register 1 */
#define MII_VSC8244_EXT_CON1 0x17
#define MII_VSC8244_EXTCON1_INIT 0x0000
@@ -54,6 +59,9 @@
#define MII_VSC8221_AUXCONSTAT_INIT 0x0004 /* need to set this bit? */
#define MII_VSC8221_AUXCONSTAT_RESERVED 0x0004
+/* Vitesse Extended Page Access Register */
+#define MII_VSC82X4_EXT_PAGE_ACCESS 0x1f
+
#define PHY_ID_VSC8234 0x000fc620
#define PHY_ID_VSC8244 0x000fc6c0
#define PHY_ID_VSC8574 0x000704a0
@@ -154,6 +162,63 @@ static int vsc8221_config_init(struct phy_device *phydev)
*/
}
+/* vsc82x4_config_autocross_enable - Enable auto MDI/MDI-X for forced links
+ * @phydev: target phy_device struct
+ *
+ * Enable auto MDI/MDI-X when in 10/100 forced link speeds by writing
+ * special values in the VSC8234/VSC8244 extended reserved registers
+ */
+static int vsc82x4_config_autocross_enable(struct phy_device *phydev)
+{
+ int ret;
+
+ if (phydev->autoneg == AUTONEG_ENABLE || phydev->speed > SPEED_100)
+ return 0;
+
+ /* map extended registers set 0x10 - 0x1e */
+ ret = phy_write(phydev, MII_VSC82X4_EXT_PAGE_ACCESS, 0x52b5);
+ if (ret >= 0)
+ ret = phy_write(phydev, MII_VSC82X4_EXT_PAGE_18E, 0x0012);
+ if (ret >= 0)
+ ret = phy_write(phydev, MII_VSC82X4_EXT_PAGE_17E, 0x2803);
+ if (ret >= 0)
+ ret = phy_write(phydev, MII_VSC82X4_EXT_PAGE_16E, 0x87fa);
+ /* map standard registers set 0x10 - 0x1e */
+ if (ret >= 0)
+ ret = phy_write(phydev, MII_VSC82X4_EXT_PAGE_ACCESS, 0x0000);
+ else
+ phy_write(phydev, MII_VSC82X4_EXT_PAGE_ACCESS, 0x0000);
+
+ return ret;
+}
+
+/* vsc82x4_config_aneg - restart auto-negotiation or write BMCR
+ * @phydev: target phy_device struct
+ *
+ * Description: If auto-negotiation is enabled, we configure the
+ * advertising, and then restart auto-negotiation. If it is not
+ * enabled, then we write the BMCR and also start the auto
+ * MDI/MDI-X feature
+ */
+static int vsc82x4_config_aneg(struct phy_device *phydev)
+{
+ int ret;
+
+ /* Enable auto MDI/MDI-X when in 10/100 forced link speeds by
+ * writing special values in the VSC8234 extended reserved registers
+ */
+ if (phydev->autoneg != AUTONEG_ENABLE && phydev->speed <= SPEED_100) {
+ ret = genphy_setup_forced(phydev);
+
+ if (ret < 0) /* error */
+ return ret;
+
+ return vsc82x4_config_autocross_enable(phydev);
+ }
+
+ return genphy_config_aneg(phydev);
+}
+
/* Vitesse 82xx */
static struct phy_driver vsc82xx_driver[] = {
{
@@ -163,7 +228,7 @@ static struct phy_driver vsc82xx_driver[] = {
.features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = &vsc824x_config_init,
- .config_aneg = &genphy_config_aneg,
+ .config_aneg = &vsc82x4_config_aneg,
.read_status = &genphy_read_status,
.ack_interrupt = &vsc824x_ack_interrupt,
.config_intr = &vsc82xx_config_intr,
@@ -175,7 +240,7 @@ static struct phy_driver vsc82xx_driver[] = {
.features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = &vsc824x_config_init,
- .config_aneg = &genphy_config_aneg,
+ .config_aneg = &vsc82x4_config_aneg,
.read_status = &genphy_read_status,
.ack_interrupt = &vsc824x_ack_interrupt,
.config_intr = &vsc82xx_config_intr,
@@ -187,7 +252,7 @@ static struct phy_driver vsc82xx_driver[] = {
.features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = &vsc824x_config_init,
- .config_aneg = &genphy_config_aneg,
+ .config_aneg = &vsc82x4_config_aneg,
.read_status = &genphy_read_status,
.ack_interrupt = &vsc824x_ack_interrupt,
.config_intr = &vsc82xx_config_intr,
@@ -199,7 +264,7 @@ static struct phy_driver vsc82xx_driver[] = {
.features = PHY_GBIT_FEATURES,
.flags = PHY_HAS_INTERRUPT,
.config_init = &vsc824x_config_init,
- .config_aneg = &genphy_config_aneg,
+ .config_aneg = &vsc82x4_config_aneg,
.read_status = &genphy_read_status,
.ack_interrupt = &vsc824x_ack_interrupt,
.config_intr = &vsc82xx_config_intr,
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 64ab823..48a4dc3 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -559,6 +559,7 @@ static inline int phy_read_status(struct phy_device *phydev) {
return phydev->drv->read_status(phydev);
}
+int genphy_setup_forced(struct phy_device *phydev);
int genphy_restart_aneg(struct phy_device *phydev);
int genphy_config_aneg(struct phy_device *phydev);
int genphy_update_link(struct phy_device *phydev);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/4] net/phy: Add VSC8234 support
2013-11-15 22:58 [PATCH 1/4] net/phy: Add VSC8234 support Shruti Kanetkar
` (2 preceding siblings ...)
2013-11-15 22:58 ` [PATCH 4/4] net/phy: Add the autocross feature for forced links on VSC82x4 Shruti Kanetkar
@ 2013-11-16 1:58 ` David Miller
2013-11-16 2:04 ` Florian Fainelli
3 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2013-11-16 1:58 UTC (permalink / raw)
To: Shruti; +Cc: netdev, afleming, galak
These patches didn't actually make it to the netdev list, so they
were not queued up in patchwork.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/4] net/phy: Add VSC8234 support
2013-11-16 1:58 ` [PATCH 1/4] net/phy: Add VSC8234 support David Miller
@ 2013-11-16 2:04 ` Florian Fainelli
2013-11-16 2:09 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Florian Fainelli @ 2013-11-16 2:04 UTC (permalink / raw)
To: David Miller; +Cc: Shruti, netdev, afleming, galak
2013/11/15 David Miller <davem@davemloft.net>:
>
> These patches didn't actually make it to the netdev list, so they
> were not queued up in patchwork.
Are you sure about them not making it to netdev? marc.info also has
the 4 of them here:
http://marc.info/?l=linux-netdev&m=138455632228947&w=2
http://marc.info/?l=linux-netdev&m=138455632828949&w=2
http://marc.info/?l=linux-netdev&m=138455633228950&w=2
http://marc.info/?l=linux-netdev&m=138455633628952&w=2
--
Florian
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] net/phy: Add VSC8234 support
2013-11-16 2:04 ` Florian Fainelli
@ 2013-11-16 2:09 ` David Miller
2013-11-18 0:55 ` Shruti
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2013-11-16 2:09 UTC (permalink / raw)
To: f.fainelli; +Cc: Shruti, netdev, afleming, galak
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Fri, 15 Nov 2013 18:04:36 -0800
> 2013/11/15 David Miller <davem@davemloft.net>:
>>
>> These patches didn't actually make it to the netdev list, so they
>> were not queued up in patchwork.
>
> Are you sure about them not making it to netdev? marc.info also has
> the 4 of them here:
>
> http://marc.info/?l=linux-netdev&m=138455632228947&w=2
> http://marc.info/?l=linux-netdev&m=138455632828949&w=2
> http://marc.info/?l=linux-netdev&m=138455633228950&w=2
> http://marc.info/?l=linux-netdev&m=138455633628952&w=2
More specifically I meant that they didn't end up in patchwork,
which is what actually matters for my workflow.
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH 1/4] net/phy: Add VSC8234 support
2013-11-16 2:09 ` David Miller
@ 2013-11-18 0:55 ` Shruti
0 siblings, 0 replies; 8+ messages in thread
From: Shruti @ 2013-11-18 0:55 UTC (permalink / raw)
To: David Miller, f.fainelli@gmail.com
Cc: Shruti@freescale.com, netdev@vger.kernel.org, afleming@gmail.com,
galak@kernel.crashing.org
Hello David,
> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Friday, November 15, 2013 8:09 PM
> To: f.fainelli@gmail.com
> Cc: Kanetkar Shruti-B44454; netdev@vger.kernel.org; afleming@gmail.com;
> galak@kernel.crashing.org
> Subject: Re: [PATCH 1/4] net/phy: Add VSC8234 support
>
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Fri, 15 Nov 2013 18:04:36 -0800
>
> > 2013/11/15 David Miller <davem@davemloft.net>:
> >>
> >> These patches didn't actually make it to the netdev list, so they
> >> were not queued up in patchwork.
How can I fix this?
Should I resend them?
> >
> > Are you sure about them not making it to netdev? marc.info also has
> > the 4 of them here:
> >
> > http://marc.info/?l=linux-netdev&m=138455632228947&w=2
> > http://marc.info/?l=linux-netdev&m=138455632828949&w=2
> > http://marc.info/?l=linux-netdev&m=138455633228950&w=2
> > http://marc.info/?l=linux-netdev&m=138455633628952&w=2
>
> More specifically I meant that they didn't end up in patchwork,
> which is what actually matters for my workflow.
Regards,
Shruti
^ permalink raw reply [flat|nested] 8+ messages in thread