* [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs
@ 2017-01-31 5:46 ` Raju Lakkaraju
0 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-01-31 5:46 UTC (permalink / raw)
To: netdev, devicetree; +Cc: f.fainelli, Allan.Nielsen, andrew, Raju Lakkaraju
From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
LED Mode:
Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
status information that can be selected by setting LED mode.
LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
from Device Tree.
Tested on Beaglebone Black with VSC 8531 PHY.
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
Raju Lakkaraju (1):
net: phy: Add LED mode driver for Microsemi PHYs.
.../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs
@ 2017-01-31 5:46 ` Raju Lakkaraju
0 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-01-31 5:46 UTC (permalink / raw)
To: netdev, devicetree; +Cc: f.fainelli, Allan.Nielsen, andrew, Raju Lakkaraju
From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
LED Mode:
Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
status information that can be selected by setting LED mode.
LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
from Device Tree.
Tested on Beaglebone Black with VSC 8531 PHY.
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
Raju Lakkaraju (1):
net: phy: Add LED mode driver for Microsemi PHYs.
.../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs.
2017-01-31 5:46 ` Raju Lakkaraju
@ 2017-01-31 5:46 ` Raju Lakkaraju
-1 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-01-31 5:46 UTC (permalink / raw)
To: netdev, devicetree; +Cc: f.fainelli, Allan.Nielsen, andrew, Raju Lakkaraju
From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
LED Mode:
Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
status information that can be selected by setting LED mode.
LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
from Device Tree.
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
---
.../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
index bdefefc6..1abf4b6 100644
--- a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
+++ b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
@@ -27,6 +27,12 @@ Optional properties:
'vddmac'.
Default value is 0%.
Ref: Table:1 - Edge rate change (below).
+- vsc8531,led-0-mode : LED mode. Specify how the LED[0] should behave.
+ Allowed values is listed in the 'PHY LED Mode' -
+ Table 2 (below). Default value is 1.
+- vsc8531,led-1-mode : LED mode. Specify how the LED[1] should behave.
+ Allowed values is listed in the 'PHY LED Mode' -
+ Table 2 (below). Default value is 2.
Table: 1 - Edge rate change
----------------------------------------------------------------|
@@ -54,10 +60,43 @@ Table: 1 - Edge rate change
| (slowest) |
|---------------------------------------------------------------|
+Table: 2 - PHY LED Mode
+|-----------------------------------------------|
+| LINK_ACTIVITY | 0 |
+|-----------------------------------------------|
+| LINK_1000_ACTIVITY | 1 |
+|-----------------------------------------------|
+| LINK_100_ACTIVITY | 2 |
+|-----------------------------------------------|
+| LINK_10_ACTIVITY | 3 |
+|-----------------------------------------------|
+| LINK_100_1000_ACTIVITY | 4 |
+|-----------------------------------------------|
+| LINK_10_1000_ACTIVITY | 5 |
+|-----------------------------------------------|
+| LINK_10_100_ACTIVITY | 6 |
+|-----------------------------------------------|
+| DUPLEX_COLLISION | 8 |
+|-----------------------------------------------|
+| COLLISION | 9 |
+|-----------------------------------------------|
+| ACTIVITY | 10 |
+|-----------------------------------------------|
+| AUTONEG_FAULT | 12 |
+|-----------------------------------------------|
+| SERIAL_MODE | 13 |
+|-----------------------------------------------|
+| FORCE_LED_OFF | 14 |
+|-----------------------------------------------|
+| FORCE_LED_ON | 15 |
+|-----------------------------------------------|
+
Example:
vsc8531_0: ethernet-phy@0 {
compatible = "ethernet-phy-id0007.0570";
vsc8531,vddmac = <3300>;
vsc8531,edge-slowdown = <7>;
+ vsc8531,led-0-mode = <1>;
+ vsc8531,led-1-mode = <2>;
};
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index e03ead8..ec808bf 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -25,6 +25,25 @@ enum rgmii_rx_clock_delay {
RGMII_RX_CLK_DELAY_3_4_NS = 7
};
+enum phy_led_mode {
+ LINK_ACTIVITY = 0,
+ LINK_1000_ACTIVITY = 1,
+ LINK_100_ACTIVITY = 2,
+ LINK_10_ACTIVITY = 3,
+ LINK_100_1000_ACTIVITY = 4,
+ LINK_10_1000_ACTIVITY = 5,
+ LINK_10_100_ACTIVITY = 6,
+ LINK_RESERVED = 7,
+ DUPLEX_COLLISION = 8,
+ COLLISION = 9,
+ ACTIVITY = 10,
+ LINK_RESERVED_1 = 11,
+ AUTONEG_FAULT = 12,
+ SERIAL_MODE = 13,
+ FORCE_LED_OFF = 14,
+ FORCE_LED_ON = 15,
+};
+
/* Microsemi VSC85xx PHY registers */
/* IEEE 802. Std Registers */
#define MSCC_PHY_BYPASS_CONTROL 18
@@ -52,6 +71,11 @@ enum rgmii_rx_clock_delay {
#define MSCC_PHY_DEV_AUX_CNTL 28
#define HP_AUTO_MDIX_X_OVER_IND_MASK 0x2000
+#define MSCC_PHY_LED_MODE_SEL 29
+#define LED_1_MODE_SEL_MASK 0x00F0
+#define LED_0_MODE_SEL_MASK 0x000F
+#define LED_1_MODE_SEL_POS 4
+
#define MSCC_EXT_PAGE_ACCESS 31
#define MSCC_PHY_PAGE_STANDARD 0x0000 /* Standard registers */
#define MSCC_PHY_PAGE_EXTENDED 0x0001 /* Extended registers */
@@ -99,6 +123,8 @@ enum rgmii_rx_clock_delay {
struct vsc8531_private {
int rate_magic;
+ u8 led_0_mode;
+ u8 led_1_mode;
};
#ifdef CONFIG_OF_MDIO
@@ -123,6 +149,28 @@ static int vsc85xx_phy_page_set(struct phy_device *phydev, u8 page)
return rc;
}
+static int vsc85xx_led_cntl_set(struct phy_device *phydev,
+ u8 led_num,
+ u8 mode)
+{
+ int rc;
+ u16 reg_val;
+
+ mutex_lock(&phydev->lock);
+ reg_val = phy_read(phydev, MSCC_PHY_LED_MODE_SEL);
+ if (led_num) {
+ reg_val &= ~LED_1_MODE_SEL_MASK;
+ reg_val |= (((u16)mode << LED_1_MODE_SEL_POS) &
+ LED_1_MODE_SEL_MASK);
+ } else {
+ reg_val |= ((u16)mode & LED_0_MODE_SEL_MASK);
+ }
+ rc = phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val);
+ mutex_unlock(&phydev->lock);
+
+ return rc;
+}
+
static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix)
{
u16 reg_val;
@@ -499,6 +547,13 @@ static int vsc85xx_config_init(struct phy_device *phydev)
if (rc)
return rc;
+ rc = vsc85xx_led_cntl_set(phydev, 1, vsc8531->led_1_mode);
+ if (rc)
+ return rc;
+ rc = vsc85xx_led_cntl_set(phydev, 0, vsc8531->led_0_mode);
+ if (rc)
+ return rc;
+
rc = genphy_config_init(phydev);
return rc;
@@ -555,8 +610,13 @@ static int vsc85xx_read_status(struct phy_device *phydev)
static int vsc85xx_probe(struct phy_device *phydev)
{
+ int rc;
int rate_magic;
+ u8 led_0_mode;
+ u8 led_1_mode;
struct vsc8531_private *vsc8531;
+ struct device *dev = &phydev->mdio.dev;
+ struct device_node *of_node = dev->of_node;
rate_magic = vsc85xx_edge_rate_magic_get(phydev);
if (rate_magic < 0)
@@ -570,6 +630,18 @@ static int vsc85xx_probe(struct phy_device *phydev)
vsc8531->rate_magic = rate_magic;
+ /* LED[0] and LED[1] mode */
+ rc = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
+ if (rc != 0)
+ vsc8531->led_0_mode = LINK_1000_ACTIVITY;
+ else
+ vsc8531->led_0_mode = led_0_mode;
+ rc = of_property_read_u8(of_node, "vsc8531,led-1-mode", &led_1_mode);
+ if (rc != 0)
+ vsc8531->led_1_mode = LINK_100_ACTIVITY;
+ else
+ vsc8531->led_1_mode = led_1_mode;
+
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs.
@ 2017-01-31 5:46 ` Raju Lakkaraju
0 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-01-31 5:46 UTC (permalink / raw)
To: netdev, devicetree; +Cc: f.fainelli, Allan.Nielsen, andrew, Raju Lakkaraju
From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
LED Mode:
Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
status information that can be selected by setting LED mode.
LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
from Device Tree.
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
---
.../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
index bdefefc6..1abf4b6 100644
--- a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
+++ b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
@@ -27,6 +27,12 @@ Optional properties:
'vddmac'.
Default value is 0%.
Ref: Table:1 - Edge rate change (below).
+- vsc8531,led-0-mode : LED mode. Specify how the LED[0] should behave.
+ Allowed values is listed in the 'PHY LED Mode' -
+ Table 2 (below). Default value is 1.
+- vsc8531,led-1-mode : LED mode. Specify how the LED[1] should behave.
+ Allowed values is listed in the 'PHY LED Mode' -
+ Table 2 (below). Default value is 2.
Table: 1 - Edge rate change
----------------------------------------------------------------|
@@ -54,10 +60,43 @@ Table: 1 - Edge rate change
| (slowest) |
|---------------------------------------------------------------|
+Table: 2 - PHY LED Mode
+|-----------------------------------------------|
+| LINK_ACTIVITY | 0 |
+|-----------------------------------------------|
+| LINK_1000_ACTIVITY | 1 |
+|-----------------------------------------------|
+| LINK_100_ACTIVITY | 2 |
+|-----------------------------------------------|
+| LINK_10_ACTIVITY | 3 |
+|-----------------------------------------------|
+| LINK_100_1000_ACTIVITY | 4 |
+|-----------------------------------------------|
+| LINK_10_1000_ACTIVITY | 5 |
+|-----------------------------------------------|
+| LINK_10_100_ACTIVITY | 6 |
+|-----------------------------------------------|
+| DUPLEX_COLLISION | 8 |
+|-----------------------------------------------|
+| COLLISION | 9 |
+|-----------------------------------------------|
+| ACTIVITY | 10 |
+|-----------------------------------------------|
+| AUTONEG_FAULT | 12 |
+|-----------------------------------------------|
+| SERIAL_MODE | 13 |
+|-----------------------------------------------|
+| FORCE_LED_OFF | 14 |
+|-----------------------------------------------|
+| FORCE_LED_ON | 15 |
+|-----------------------------------------------|
+
Example:
vsc8531_0: ethernet-phy@0 {
compatible = "ethernet-phy-id0007.0570";
vsc8531,vddmac = <3300>;
vsc8531,edge-slowdown = <7>;
+ vsc8531,led-0-mode = <1>;
+ vsc8531,led-1-mode = <2>;
};
diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
index e03ead8..ec808bf 100644
--- a/drivers/net/phy/mscc.c
+++ b/drivers/net/phy/mscc.c
@@ -25,6 +25,25 @@ enum rgmii_rx_clock_delay {
RGMII_RX_CLK_DELAY_3_4_NS = 7
};
+enum phy_led_mode {
+ LINK_ACTIVITY = 0,
+ LINK_1000_ACTIVITY = 1,
+ LINK_100_ACTIVITY = 2,
+ LINK_10_ACTIVITY = 3,
+ LINK_100_1000_ACTIVITY = 4,
+ LINK_10_1000_ACTIVITY = 5,
+ LINK_10_100_ACTIVITY = 6,
+ LINK_RESERVED = 7,
+ DUPLEX_COLLISION = 8,
+ COLLISION = 9,
+ ACTIVITY = 10,
+ LINK_RESERVED_1 = 11,
+ AUTONEG_FAULT = 12,
+ SERIAL_MODE = 13,
+ FORCE_LED_OFF = 14,
+ FORCE_LED_ON = 15,
+};
+
/* Microsemi VSC85xx PHY registers */
/* IEEE 802. Std Registers */
#define MSCC_PHY_BYPASS_CONTROL 18
@@ -52,6 +71,11 @@ enum rgmii_rx_clock_delay {
#define MSCC_PHY_DEV_AUX_CNTL 28
#define HP_AUTO_MDIX_X_OVER_IND_MASK 0x2000
+#define MSCC_PHY_LED_MODE_SEL 29
+#define LED_1_MODE_SEL_MASK 0x00F0
+#define LED_0_MODE_SEL_MASK 0x000F
+#define LED_1_MODE_SEL_POS 4
+
#define MSCC_EXT_PAGE_ACCESS 31
#define MSCC_PHY_PAGE_STANDARD 0x0000 /* Standard registers */
#define MSCC_PHY_PAGE_EXTENDED 0x0001 /* Extended registers */
@@ -99,6 +123,8 @@ enum rgmii_rx_clock_delay {
struct vsc8531_private {
int rate_magic;
+ u8 led_0_mode;
+ u8 led_1_mode;
};
#ifdef CONFIG_OF_MDIO
@@ -123,6 +149,28 @@ static int vsc85xx_phy_page_set(struct phy_device *phydev, u8 page)
return rc;
}
+static int vsc85xx_led_cntl_set(struct phy_device *phydev,
+ u8 led_num,
+ u8 mode)
+{
+ int rc;
+ u16 reg_val;
+
+ mutex_lock(&phydev->lock);
+ reg_val = phy_read(phydev, MSCC_PHY_LED_MODE_SEL);
+ if (led_num) {
+ reg_val &= ~LED_1_MODE_SEL_MASK;
+ reg_val |= (((u16)mode << LED_1_MODE_SEL_POS) &
+ LED_1_MODE_SEL_MASK);
+ } else {
+ reg_val |= ((u16)mode & LED_0_MODE_SEL_MASK);
+ }
+ rc = phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val);
+ mutex_unlock(&phydev->lock);
+
+ return rc;
+}
+
static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix)
{
u16 reg_val;
@@ -499,6 +547,13 @@ static int vsc85xx_config_init(struct phy_device *phydev)
if (rc)
return rc;
+ rc = vsc85xx_led_cntl_set(phydev, 1, vsc8531->led_1_mode);
+ if (rc)
+ return rc;
+ rc = vsc85xx_led_cntl_set(phydev, 0, vsc8531->led_0_mode);
+ if (rc)
+ return rc;
+
rc = genphy_config_init(phydev);
return rc;
@@ -555,8 +610,13 @@ static int vsc85xx_read_status(struct phy_device *phydev)
static int vsc85xx_probe(struct phy_device *phydev)
{
+ int rc;
int rate_magic;
+ u8 led_0_mode;
+ u8 led_1_mode;
struct vsc8531_private *vsc8531;
+ struct device *dev = &phydev->mdio.dev;
+ struct device_node *of_node = dev->of_node;
rate_magic = vsc85xx_edge_rate_magic_get(phydev);
if (rate_magic < 0)
@@ -570,6 +630,18 @@ static int vsc85xx_probe(struct phy_device *phydev)
vsc8531->rate_magic = rate_magic;
+ /* LED[0] and LED[1] mode */
+ rc = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
+ if (rc != 0)
+ vsc8531->led_0_mode = LINK_1000_ACTIVITY;
+ else
+ vsc8531->led_0_mode = led_0_mode;
+ rc = of_property_read_u8(of_node, "vsc8531,led-1-mode", &led_1_mode);
+ if (rc != 0)
+ vsc8531->led_1_mode = LINK_100_ACTIVITY;
+ else
+ vsc8531->led_1_mode = led_1_mode;
+
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs.
2017-01-31 5:46 ` Raju Lakkaraju
(?)
@ 2017-01-31 13:30 ` Andrew Lunn
2017-02-01 9:32 ` Raju Lakkaraju
-1 siblings, 1 reply; 7+ messages in thread
From: Andrew Lunn @ 2017-01-31 13:30 UTC (permalink / raw)
To: Raju Lakkaraju; +Cc: netdev, devicetree, f.fainelli, Allan.Nielsen
On Tue, Jan 31, 2017 at 11:16:01AM +0530, Raju Lakkaraju wrote:
> From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
>
> LED Mode:
> Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
> status information that can be selected by setting LED mode.
>
> LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
> from Device Tree.
Hi Raju
How is vddmac an LED mode parameter?
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
> ---
> .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
> drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
> 2 files changed, 111 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> index bdefefc6..1abf4b6 100644
> --- a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> +++ b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> @@ -27,6 +27,12 @@ Optional properties:
> 'vddmac'.
> Default value is 0%.
> Ref: Table:1 - Edge rate change (below).
> +- vsc8531,led-0-mode : LED mode. Specify how the LED[0] should behave.
> + Allowed values is listed in the 'PHY LED Mode' -
> + Table 2 (below). Default value is 1.
> +- vsc8531,led-1-mode : LED mode. Specify how the LED[1] should behave.
> + Allowed values is listed in the 'PHY LED Mode' -
> + Table 2 (below). Default value is 2.
>
> Table: 1 - Edge rate change
> ----------------------------------------------------------------|
> @@ -54,10 +60,43 @@ Table: 1 - Edge rate change
> | (slowest) |
> |---------------------------------------------------------------|
>
> +Table: 2 - PHY LED Mode
> +|-----------------------------------------------|
> +| LINK_ACTIVITY | 0 |
> +|-----------------------------------------------|
> +| LINK_1000_ACTIVITY | 1 |
> +|-----------------------------------------------|
> +| LINK_100_ACTIVITY | 2 |
> +|-----------------------------------------------|
> +| LINK_10_ACTIVITY | 3 |
> +|-----------------------------------------------|
> +| LINK_100_1000_ACTIVITY | 4 |
> +|-----------------------------------------------|
> +| LINK_10_1000_ACTIVITY | 5 |
> +|-----------------------------------------------|
> +| LINK_10_100_ACTIVITY | 6 |
> +|-----------------------------------------------|
> +| DUPLEX_COLLISION | 8 |
> +|-----------------------------------------------|
> +| COLLISION | 9 |
> +|-----------------------------------------------|
> +| ACTIVITY | 10 |
> +|-----------------------------------------------|
> +| AUTONEG_FAULT | 12 |
> +|-----------------------------------------------|
> +| SERIAL_MODE | 13 |
> +|-----------------------------------------------|
> +| FORCE_LED_OFF | 14 |
> +|-----------------------------------------------|
> +| FORCE_LED_ON | 15 |
> +|-----------------------------------------------|
> +
> Example:
>
> vsc8531_0: ethernet-phy@0 {
> compatible = "ethernet-phy-id0007.0570";
> vsc8531,vddmac = <3300>;
> vsc8531,edge-slowdown = <7>;
> + vsc8531,led-0-mode = <1>;
> + vsc8531,led-1-mode = <2>;
Numbers like this are pretty unreadable. I would suggest adding a header file in
include/dt-bindings/net/
> +static int vsc85xx_led_cntl_set(struct phy_device *phydev,
> + u8 led_num,
> + u8 mode)
> +{
> + int rc;
> + u16 reg_val;
> +
> + mutex_lock(&phydev->lock);
> + reg_val = phy_read(phydev, MSCC_PHY_LED_MODE_SEL);
> + if (led_num) {
> + reg_val &= ~LED_1_MODE_SEL_MASK;
> + reg_val |= (((u16)mode << LED_1_MODE_SEL_POS) &
> + LED_1_MODE_SEL_MASK);
> + } else {
> + reg_val |= ((u16)mode & LED_0_MODE_SEL_MASK);
> + }
The asymmetry here makes me think this is wrong.
> + rc = phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val);
> + mutex_unlock(&phydev->lock);
> +
> + return rc;
> +}
> +
> static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix)
> {
> u16 reg_val;
> @@ -499,6 +547,13 @@ static int vsc85xx_config_init(struct phy_device *phydev)
> if (rc)
> return rc;
>
> + rc = vsc85xx_led_cntl_set(phydev, 1, vsc8531->led_1_mode);
> + if (rc)
> + return rc;
> + rc = vsc85xx_led_cntl_set(phydev, 0, vsc8531->led_0_mode);
> + if (rc)
> + return rc;
> +
> rc = genphy_config_init(phydev);
>
> return rc;
> @@ -555,8 +610,13 @@ static int vsc85xx_read_status(struct phy_device *phydev)
>
> static int vsc85xx_probe(struct phy_device *phydev)
> {
> + int rc;
> int rate_magic;
> + u8 led_0_mode;
> + u8 led_1_mode;
> struct vsc8531_private *vsc8531;
> + struct device *dev = &phydev->mdio.dev;
> + struct device_node *of_node = dev->of_node;
declarations are supposed to be reverse Christmas tree. i.e. longest
lines first.
>
> rate_magic = vsc85xx_edge_rate_magic_get(phydev);
> if (rate_magic < 0)
> @@ -570,6 +630,18 @@ static int vsc85xx_probe(struct phy_device *phydev)
>
> vsc8531->rate_magic = rate_magic;
>
> + /* LED[0] and LED[1] mode */
> + rc = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
> + if (rc != 0)
Please simplify this to just if (rc). Actually, it can be even
simpler. of_property_read_u8 guarantees not to modify the return
value unless it has a value to return. So
vsc8531->led_0_mode = LINK_1000_ACTIVITY;
err = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
if (err != EINVAL)
return err;
vsc8531->led_1_mode = LINK_100_ACTIVITY;
err = of_property_read_u8(of_node, "vsc8531,led-1-mode", &led_1_mode);
if (err != EINVAL)
return err;
What about range checking? I could put 42 in the device tree for led
0, and it would set led 1 as well i think?
Andrew
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs.
2017-01-31 13:30 ` Andrew Lunn
@ 2017-02-01 9:32 ` Raju Lakkaraju
0 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-02-01 9:32 UTC (permalink / raw)
To: Andrew Lunn; +Cc: netdev, devicetree, f.fainelli, Allan.Nielsen
Hi Andrew,
Thank you for review and valuable comments.
On Tue, Jan 31, 2017 at 02:30:09PM +0100, Andrew Lunn wrote:
> EXTERNAL EMAIL
>
>
> On Tue, Jan 31, 2017 at 11:16:01AM +0530, Raju Lakkaraju wrote:
> > From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
> >
> > LED Mode:
> > Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
> > status information that can be selected by setting LED mode.
> >
> > LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
> > from Device Tree.
>
> Hi Raju
>
> How is vddmac an LED mode parameter?
>
Typo. I will correct.
It should be "vsc8531, led-0-mode".
> > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
> > ---
> > .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
> > drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
> > 2 files changed, 111 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > index bdefefc6..1abf4b6 100644
> > --- a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > +++ b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > @@ -27,6 +27,12 @@ Optional properties:
> > 'vddmac'.
> > Default value is 0%.
> > Ref: Table:1 - Edge rate change (below).
> > +- vsc8531,led-0-mode : LED mode. Specify how the LED[0] should behave.
> > + Allowed values is listed in the 'PHY LED Mode' -
> > + Table 2 (below). Default value is 1.
> > +- vsc8531,led-1-mode : LED mode. Specify how the LED[1] should behave.
> > + Allowed values is listed in the 'PHY LED Mode' -
> > + Table 2 (below). Default value is 2.
> >
> > Table: 1 - Edge rate change
> > ----------------------------------------------------------------|
> > @@ -54,10 +60,43 @@ Table: 1 - Edge rate change
> > | (slowest) |
> > |---------------------------------------------------------------|
> >
> > +Table: 2 - PHY LED Mode
> > +|-----------------------------------------------|
> > +| LINK_ACTIVITY | 0 |
> > +|-----------------------------------------------|
> > +| LINK_1000_ACTIVITY | 1 |
> > +|-----------------------------------------------|
> > +| LINK_100_ACTIVITY | 2 |
> > +|-----------------------------------------------|
> > +| LINK_10_ACTIVITY | 3 |
> > +|-----------------------------------------------|
> > +| LINK_100_1000_ACTIVITY | 4 |
> > +|-----------------------------------------------|
> > +| LINK_10_1000_ACTIVITY | 5 |
> > +|-----------------------------------------------|
> > +| LINK_10_100_ACTIVITY | 6 |
> > +|-----------------------------------------------|
> > +| DUPLEX_COLLISION | 8 |
> > +|-----------------------------------------------|
> > +| COLLISION | 9 |
> > +|-----------------------------------------------|
> > +| ACTIVITY | 10 |
> > +|-----------------------------------------------|
> > +| AUTONEG_FAULT | 12 |
> > +|-----------------------------------------------|
> > +| SERIAL_MODE | 13 |
> > +|-----------------------------------------------|
> > +| FORCE_LED_OFF | 14 |
> > +|-----------------------------------------------|
> > +| FORCE_LED_ON | 15 |
> > +|-----------------------------------------------|
> > +
> > Example:
> >
> > vsc8531_0: ethernet-phy@0 {
> > compatible = "ethernet-phy-id0007.0570";
> > vsc8531,vddmac = <3300>;
> > vsc8531,edge-slowdown = <7>;
> > + vsc8531,led-0-mode = <1>;
> > + vsc8531,led-1-mode = <2>;
>
> Numbers like this are pretty unreadable. I would suggest adding a header file in
> include/dt-bindings/net/
>
Accpeted. I will create new header file for DT Macros.
> > +static int vsc85xx_led_cntl_set(struct phy_device *phydev,
> > + u8 led_num,
> > + u8 mode)
> > +{
> > + int rc;
> > + u16 reg_val;
> > +
> > + mutex_lock(&phydev->lock);
> > + reg_val = phy_read(phydev, MSCC_PHY_LED_MODE_SEL);
> > + if (led_num) {
> > + reg_val &= ~LED_1_MODE_SEL_MASK;
> > + reg_val |= (((u16)mode << LED_1_MODE_SEL_POS) &
> > + LED_1_MODE_SEL_MASK);
> > + } else {
> > + reg_val |= ((u16)mode & LED_0_MODE_SEL_MASK);
> > + }
>
> The asymmetry here makes me think this is wrong.
>
Yes. You are correct.
I missed following line in else part:
"reg_val &= ~LED_0_MODE_SEL_MASK;"
> > + rc = phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val);
> > + mutex_unlock(&phydev->lock);
> > +
> > + return rc;
> > +}
> > +
> > static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix)
> > {
> > u16 reg_val;
> > @@ -499,6 +547,13 @@ static int vsc85xx_config_init(struct phy_device *phydev)
> > if (rc)
> > return rc;
> >
> > + rc = vsc85xx_led_cntl_set(phydev, 1, vsc8531->led_1_mode);
> > + if (rc)
> > + return rc;
> > + rc = vsc85xx_led_cntl_set(phydev, 0, vsc8531->led_0_mode);
> > + if (rc)
> > + return rc;
> > +
> > rc = genphy_config_init(phydev);
> >
> > return rc;
> > @@ -555,8 +610,13 @@ static int vsc85xx_read_status(struct phy_device *phydev)
> >
> > static int vsc85xx_probe(struct phy_device *phydev)
> > {
> > + int rc;
> > int rate_magic;
> > + u8 led_0_mode;
> > + u8 led_1_mode;
> > struct vsc8531_private *vsc8531;
> > + struct device *dev = &phydev->mdio.dev;
> > + struct device_node *of_node = dev->of_node;
>
> declarations are supposed to be reverse Christmas tree. i.e. longest
> lines first.
>
Accpeted.
> >
> > rate_magic = vsc85xx_edge_rate_magic_get(phydev);
> > if (rate_magic < 0)
> > @@ -570,6 +630,18 @@ static int vsc85xx_probe(struct phy_device *phydev)
> >
> > vsc8531->rate_magic = rate_magic;
> >
> > + /* LED[0] and LED[1] mode */
> > + rc = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
> > + if (rc != 0)
>
> Please simplify this to just if (rc). Actually, it can be even
> simpler. of_property_read_u8 guarantees not to modify the return
> value unless it has a value to return. So
>
> vsc8531->led_0_mode = LINK_1000_ACTIVITY;
> err = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
> if (err != EINVAL)
> return err;
>
> vsc8531->led_1_mode = LINK_100_ACTIVITY;
> err = of_property_read_u8(of_node, "vsc8531,led-1-mode", &led_1_mode);
> if (err != EINVAL)
> return err;
>
> What about range checking? I could put 42 in the device tree for led
> 0, and it would set led 1 as well i think?
>
Accpeted. I will add range check and error condition.
If DT don't have LED parameters define, driver should program with default values.
> Andrew
---
Thanks,
Raju.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs.
@ 2017-02-01 9:32 ` Raju Lakkaraju
0 siblings, 0 replies; 7+ messages in thread
From: Raju Lakkaraju @ 2017-02-01 9:32 UTC (permalink / raw)
To: Andrew Lunn; +Cc: netdev, devicetree, f.fainelli, Allan.Nielsen
Hi Andrew,
Thank you for review and valuable comments.
On Tue, Jan 31, 2017 at 02:30:09PM +0100, Andrew Lunn wrote:
> EXTERNAL EMAIL
>
>
> On Tue, Jan 31, 2017 at 11:16:01AM +0530, Raju Lakkaraju wrote:
> > From: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
> >
> > LED Mode:
> > Microsemi PHY support 2 LEDs (LED[0] and LED[1]) to display different
> > status information that can be selected by setting LED mode.
> >
> > LED Mode parameter (vddmac, led-0-mode) and (vddmac, led-1-mode) get
> > from Device Tree.
>
> Hi Raju
>
> How is vddmac an LED mode parameter?
>
Typo. I will correct.
It should be "vsc8531, led-0-mode".
> > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microsemi.com>
> > ---
> > .../devicetree/bindings/net/mscc-phy-vsc8531.txt | 39 ++++++++++++
> > drivers/net/phy/mscc.c | 72 ++++++++++++++++++++++
> > 2 files changed, 111 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > index bdefefc6..1abf4b6 100644
> > --- a/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > +++ b/Documentation/devicetree/bindings/net/mscc-phy-vsc8531.txt
> > @@ -27,6 +27,12 @@ Optional properties:
> > 'vddmac'.
> > Default value is 0%.
> > Ref: Table:1 - Edge rate change (below).
> > +- vsc8531,led-0-mode : LED mode. Specify how the LED[0] should behave.
> > + Allowed values is listed in the 'PHY LED Mode' -
> > + Table 2 (below). Default value is 1.
> > +- vsc8531,led-1-mode : LED mode. Specify how the LED[1] should behave.
> > + Allowed values is listed in the 'PHY LED Mode' -
> > + Table 2 (below). Default value is 2.
> >
> > Table: 1 - Edge rate change
> > ----------------------------------------------------------------|
> > @@ -54,10 +60,43 @@ Table: 1 - Edge rate change
> > | (slowest) |
> > |---------------------------------------------------------------|
> >
> > +Table: 2 - PHY LED Mode
> > +|-----------------------------------------------|
> > +| LINK_ACTIVITY | 0 |
> > +|-----------------------------------------------|
> > +| LINK_1000_ACTIVITY | 1 |
> > +|-----------------------------------------------|
> > +| LINK_100_ACTIVITY | 2 |
> > +|-----------------------------------------------|
> > +| LINK_10_ACTIVITY | 3 |
> > +|-----------------------------------------------|
> > +| LINK_100_1000_ACTIVITY | 4 |
> > +|-----------------------------------------------|
> > +| LINK_10_1000_ACTIVITY | 5 |
> > +|-----------------------------------------------|
> > +| LINK_10_100_ACTIVITY | 6 |
> > +|-----------------------------------------------|
> > +| DUPLEX_COLLISION | 8 |
> > +|-----------------------------------------------|
> > +| COLLISION | 9 |
> > +|-----------------------------------------------|
> > +| ACTIVITY | 10 |
> > +|-----------------------------------------------|
> > +| AUTONEG_FAULT | 12 |
> > +|-----------------------------------------------|
> > +| SERIAL_MODE | 13 |
> > +|-----------------------------------------------|
> > +| FORCE_LED_OFF | 14 |
> > +|-----------------------------------------------|
> > +| FORCE_LED_ON | 15 |
> > +|-----------------------------------------------|
> > +
> > Example:
> >
> > vsc8531_0: ethernet-phy@0 {
> > compatible = "ethernet-phy-id0007.0570";
> > vsc8531,vddmac = <3300>;
> > vsc8531,edge-slowdown = <7>;
> > + vsc8531,led-0-mode = <1>;
> > + vsc8531,led-1-mode = <2>;
>
> Numbers like this are pretty unreadable. I would suggest adding a header file in
> include/dt-bindings/net/
>
Accpeted. I will create new header file for DT Macros.
> > +static int vsc85xx_led_cntl_set(struct phy_device *phydev,
> > + u8 led_num,
> > + u8 mode)
> > +{
> > + int rc;
> > + u16 reg_val;
> > +
> > + mutex_lock(&phydev->lock);
> > + reg_val = phy_read(phydev, MSCC_PHY_LED_MODE_SEL);
> > + if (led_num) {
> > + reg_val &= ~LED_1_MODE_SEL_MASK;
> > + reg_val |= (((u16)mode << LED_1_MODE_SEL_POS) &
> > + LED_1_MODE_SEL_MASK);
> > + } else {
> > + reg_val |= ((u16)mode & LED_0_MODE_SEL_MASK);
> > + }
>
> The asymmetry here makes me think this is wrong.
>
Yes. You are correct.
I missed following line in else part:
"reg_val &= ~LED_0_MODE_SEL_MASK;"
> > + rc = phy_write(phydev, MSCC_PHY_LED_MODE_SEL, reg_val);
> > + mutex_unlock(&phydev->lock);
> > +
> > + return rc;
> > +}
> > +
> > static int vsc85xx_mdix_get(struct phy_device *phydev, u8 *mdix)
> > {
> > u16 reg_val;
> > @@ -499,6 +547,13 @@ static int vsc85xx_config_init(struct phy_device *phydev)
> > if (rc)
> > return rc;
> >
> > + rc = vsc85xx_led_cntl_set(phydev, 1, vsc8531->led_1_mode);
> > + if (rc)
> > + return rc;
> > + rc = vsc85xx_led_cntl_set(phydev, 0, vsc8531->led_0_mode);
> > + if (rc)
> > + return rc;
> > +
> > rc = genphy_config_init(phydev);
> >
> > return rc;
> > @@ -555,8 +610,13 @@ static int vsc85xx_read_status(struct phy_device *phydev)
> >
> > static int vsc85xx_probe(struct phy_device *phydev)
> > {
> > + int rc;
> > int rate_magic;
> > + u8 led_0_mode;
> > + u8 led_1_mode;
> > struct vsc8531_private *vsc8531;
> > + struct device *dev = &phydev->mdio.dev;
> > + struct device_node *of_node = dev->of_node;
>
> declarations are supposed to be reverse Christmas tree. i.e. longest
> lines first.
>
Accpeted.
> >
> > rate_magic = vsc85xx_edge_rate_magic_get(phydev);
> > if (rate_magic < 0)
> > @@ -570,6 +630,18 @@ static int vsc85xx_probe(struct phy_device *phydev)
> >
> > vsc8531->rate_magic = rate_magic;
> >
> > + /* LED[0] and LED[1] mode */
> > + rc = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
> > + if (rc != 0)
>
> Please simplify this to just if (rc). Actually, it can be even
> simpler. of_property_read_u8 guarantees not to modify the return
> value unless it has a value to return. So
>
> vsc8531->led_0_mode = LINK_1000_ACTIVITY;
> err = of_property_read_u8(of_node, "vsc8531,led-0-mode", &led_0_mode);
> if (err != EINVAL)
> return err;
>
> vsc8531->led_1_mode = LINK_100_ACTIVITY;
> err = of_property_read_u8(of_node, "vsc8531,led-1-mode", &led_1_mode);
> if (err != EINVAL)
> return err;
>
> What about range checking? I could put 42 in the device tree for led
> 0, and it would set led 1 as well i think?
>
Accpeted. I will add range check and error condition.
If DT don't have LED parameters define, driver should program with default values.
> Andrew
---
Thanks,
Raju.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-01 9:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-31 5:46 [PATCH net-next] net: phy: Add LED mode driver for Microsemi PHYs Raju Lakkaraju
2017-01-31 5:46 ` Raju Lakkaraju
2017-01-31 5:46 ` Raju Lakkaraju
2017-01-31 5:46 ` Raju Lakkaraju
2017-01-31 13:30 ` Andrew Lunn
2017-02-01 9:32 ` Raju Lakkaraju
2017-02-01 9:32 ` Raju Lakkaraju
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.