Re: [PATCH v2 2/6] net: MOXA ART: connect to PHY
Le lundi 25 novembre 2013, 16:27:04 Jonas Jensen a écrit :
> The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP),
> connect to this PHY using OF.
>
> Signed-off-by: Jonas Jensen
Looks good:
Reviewed-by: Florian Fainelli
> ---
>
> Notes:
> Thanks for reviewing!
>
> Changes since v1:
>
> 1. split ethtool support to separate patch
> 2. changes to devicetree binding document
> 3. add moxart_mac_update_duplex()
> 4. compare previous link state/speed/duplex on link adjust
> 5. use of_get_phy_mode() not PHY_INTERFACE_MODE_MII
> 6. bail on of_parse_phandle() failure
> 7. remove "if (!priv->phy_dev) return -ENODEV;"
>moxart_do_ioctl()
> 8. remove "if (priv->phy_dev)"
>moxart_mac_open(), moxart_mac_stop()
>
> Applies to next-20131125
>
> .../devicetree/bindings/net/moxa,moxart-mac.txt| 47 ++-
> drivers/net/ethernet/moxa/moxart_ether.c | 92
> +- drivers/net/ethernet/moxa/moxart_ether.h |
> 2 +
> 3 files changed, 138 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt index
> 583418b..56f0374 100644
> --- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> +++ b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
> @@ -1,21 +1,64 @@
> MOXA ART Ethernet Controller
>
> +Integrated MDIO bus node:
> +
> +- compatible: "moxa,moxart-mdio"
> +- Inherets from MDIO bus node binding[1]
> +
> +[1] Documentation/devicetree/bindings/net/phy.txt
> +
> +
> +Ethernet node:
> +
> Required properties:
>
> - compatible : Must be "moxa,moxart-mac"
> - reg : Should contain register location and length
> - interrupts : Should contain the mac interrupt number
>
> +Optional Properties:
> +
> +- phy-handle : the phandle to a PHY node
> +
> +
> Example:
>
> + mdio0: mdio@90900090 {
> + compatible = "moxa,moxart-mdio";
> + reg = <0x90900090 0x8>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ethphy0: ethernet-phy@1 {
> + device_type = "ethernet-phy";
> + compatible = "moxa,moxart-rtl8201cp",
> "ethernet-phy-ieee802.3-c22";
> + reg = <1>;
> + };
> + };
> +
> + mdio1: mdio@9290 {
> + compatible = "moxa,moxart-mdio";
> + reg = <0x9290 0x8>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ethphy1: ethernet-phy@1 {
> + device_type = "ethernet-phy";
> + compatible = "moxa,moxart-rtl8201cp",
> "ethernet-phy-ieee802.3-c22";
> + reg = <1>;
> + };
> + };
> +
> mac0: mac@9090 {
> compatible = "moxa,moxart-mac";
> - reg = <0x9090 0x100>;
> + reg = <0x9090 0x90>;
> interrupts = <25 0>;
> + phy-handle = <>;
> };
>
> mac1: mac@9200 {
> compatible = "moxa,moxart-mac";
> - reg = <0x9200 0x100>;
> + reg = <0x9200 0x90>;
> interrupts = <27 0>;
> + phy-handle = <>;
> };
> diff --git a/drivers/net/ethernet/moxa/moxart_ether.c
> b/drivers/net/ethernet/moxa/moxart_ether.c index 3c14afd..1b87034 100644
> --- a/drivers/net/ethernet/moxa/moxart_ether.c
> +++ b/drivers/net/ethernet/moxa/moxart_ether.c
> @@ -26,6 +26,9 @@
> #include
> #include
> #include
> +#include
> +#include
> +#include
>
> #include "moxart_ether.h"
>
> @@ -61,6 +64,16 @@ static int moxart_set_mac_address(struct net_device
> *ndev, void *addr) return 0;
> }
>
> +static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int
> cmd) +{
> + struct moxart_mac_priv_t *priv = netdev_priv(ndev);
> +
> + if (!netif_running(ndev))
> + return -EINVAL;
> +
> + return phy_mii_ioctl(priv->phy_dev, ir, cmd);
> +}
> +
> static void moxart_mac_free_memory(struct net_device *ndev)
> {
> struct moxart_mac_priv_t *priv = netdev_priv(ndev);
> @@ -110,6 +123,19 @@ static void moxart_mac_enable(struct net_device *ndev)
> writel(priv->reg_maccr, priv->base + REG_MAC_CTRL);
> }
>
> +static void moxart_mac_update_duplex(struct net_device *ndev)
> +{
> + struct moxart_mac_priv_t *priv = netdev_priv(ndev);
> +
> + priv->reg_maccr &= ~(FULLDUP | ENRX_IN_HALFTX);
> + if (priv->duplex)
> + priv->reg_maccr |= FULLDUP;
> + else
> + priv->reg_maccr |= ENRX_IN_HALFTX;
> +
> + writel(priv->reg_maccr, priv->base + REG_MAC_CTRL);
> +}
> +
> static void moxart_mac_setup_desc_ring(struct net_device *ndev)
> {
> struct moxart_mac_priv_t *priv = netdev_priv(ndev);
> @@ -169,6 +195,9 @@ static int moxart_mac_open(struct net_device *ndev)
>
[PATCH v2 2/6] net: MOXA ART: connect to PHY
The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP),
connect to this PHY using OF.
Signed-off-by: Jonas Jensen
---
Notes:
Thanks for reviewing!
Changes since v1:
1. split ethtool support to separate patch
2. changes to devicetree binding document
3. add moxart_mac_update_duplex()
4. compare previous link state/speed/duplex on link adjust
5. use of_get_phy_mode() not PHY_INTERFACE_MODE_MII
6. bail on of_parse_phandle() failure
7. remove "if (!priv->phy_dev) return -ENODEV;"
moxart_do_ioctl()
8. remove "if (priv->phy_dev)"
moxart_mac_open(), moxart_mac_stop()
Applies to next-20131125
.../devicetree/bindings/net/moxa,moxart-mac.txt| 47 ++-
drivers/net/ethernet/moxa/moxart_ether.c | 92 +-
drivers/net/ethernet/moxa/moxart_ether.h | 2 +
3 files changed, 138 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
index 583418b..56f0374 100644
--- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
+++ b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
@@ -1,21 +1,64 @@
MOXA ART Ethernet Controller
+Integrated MDIO bus node:
+
+- compatible: "moxa,moxart-mdio"
+- Inherets from MDIO bus node binding[1]
+
+[1] Documentation/devicetree/bindings/net/phy.txt
+
+
+Ethernet node:
+
Required properties:
- compatible : Must be "moxa,moxart-mac"
- reg : Should contain register location and length
- interrupts : Should contain the mac interrupt number
+Optional Properties:
+
+- phy-handle : the phandle to a PHY node
+
+
Example:
+ mdio0: mdio@90900090 {
+ compatible = "moxa,moxart-mdio";
+ reg = <0x90900090 0x8>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy0: ethernet-phy@1 {
+ device_type = "ethernet-phy";
+ compatible = "moxa,moxart-rtl8201cp",
"ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+ };
+
+ mdio1: mdio@9290 {
+ compatible = "moxa,moxart-mdio";
+ reg = <0x9290 0x8>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy1: ethernet-phy@1 {
+ device_type = "ethernet-phy";
+ compatible = "moxa,moxart-rtl8201cp",
"ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+ };
+
mac0: mac@9090 {
compatible = "moxa,moxart-mac";
- reg = <0x9090 0x100>;
+ reg = <0x9090 0x90>;
interrupts = <25 0>;
+ phy-handle = <>;
};
mac1: mac@9200 {
compatible = "moxa,moxart-mac";
- reg = <0x9200 0x100>;
+ reg = <0x9200 0x90>;
interrupts = <27 0>;
+ phy-handle = <>;
};
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c
b/drivers/net/ethernet/moxa/moxart_ether.c
index 3c14afd..1b87034 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -26,6 +26,9 @@
#include
#include
#include
+#include
+#include
+#include
#include "moxart_ether.h"
@@ -61,6 +64,16 @@ static int moxart_set_mac_address(struct net_device *ndev,
void *addr)
return 0;
}
+static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int cmd)
+{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ if (!netif_running(ndev))
+ return -EINVAL;
+
+ return phy_mii_ioctl(priv->phy_dev, ir, cmd);
+}
+
static void moxart_mac_free_memory(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -110,6 +123,19 @@ static void moxart_mac_enable(struct net_device *ndev)
writel(priv->reg_maccr, priv->base + REG_MAC_CTRL);
}
+static void moxart_mac_update_duplex(struct net_device *ndev)
+{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ priv->reg_maccr &= ~(FULLDUP | ENRX_IN_HALFTX);
+ if (priv->duplex)
+ priv->reg_maccr |= FULLDUP;
+ else
+ priv->reg_maccr |= ENRX_IN_HALFTX;
+
+ writel(priv->reg_maccr, priv->base + REG_MAC_CTRL);
+}
+
static void moxart_mac_setup_desc_ring(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -169,6 +195,9 @@ static int moxart_mac_open(struct net_device *ndev)
moxart_update_mac_address(ndev);
moxart_mac_setup_desc_ring(ndev);
moxart_mac_enable(ndev);
+
+ phy_start(priv->phy_dev);
+
netif_start_queue(ndev);
netdev_dbg(ndev, "%s: IMR=0x%x, MACCR=0x%x\n",
@@ -184,6 +213,8 @@ static int moxart_mac_stop(struct net_device *ndev)
[PATCH v2 2/6] net: MOXA ART: connect to PHY
The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP),
connect to this PHY using OF.
Signed-off-by: Jonas Jensen jonas.jen...@gmail.com
---
Notes:
Thanks for reviewing!
Changes since v1:
1. split ethtool support to separate patch
2. changes to devicetree binding document
3. add moxart_mac_update_duplex()
4. compare previous link state/speed/duplex on link adjust
5. use of_get_phy_mode() not PHY_INTERFACE_MODE_MII
6. bail on of_parse_phandle() failure
7. remove if (!priv-phy_dev) return -ENODEV;
moxart_do_ioctl()
8. remove if (priv-phy_dev)
moxart_mac_open(), moxart_mac_stop()
Applies to next-20131125
.../devicetree/bindings/net/moxa,moxart-mac.txt| 47 ++-
drivers/net/ethernet/moxa/moxart_ether.c | 92 +-
drivers/net/ethernet/moxa/moxart_ether.h | 2 +
3 files changed, 138 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
index 583418b..56f0374 100644
--- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
+++ b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
@@ -1,21 +1,64 @@
MOXA ART Ethernet Controller
+Integrated MDIO bus node:
+
+- compatible: moxa,moxart-mdio
+- Inherets from MDIO bus node binding[1]
+
+[1] Documentation/devicetree/bindings/net/phy.txt
+
+
+Ethernet node:
+
Required properties:
- compatible : Must be moxa,moxart-mac
- reg : Should contain register location and length
- interrupts : Should contain the mac interrupt number
+Optional Properties:
+
+- phy-handle : the phandle to a PHY node
+
+
Example:
+ mdio0: mdio@90900090 {
+ compatible = moxa,moxart-mdio;
+ reg = 0x90900090 0x8;
+ #address-cells = 1;
+ #size-cells = 0;
+
+ ethphy0: ethernet-phy@1 {
+ device_type = ethernet-phy;
+ compatible = moxa,moxart-rtl8201cp,
ethernet-phy-ieee802.3-c22;
+ reg = 1;
+ };
+ };
+
+ mdio1: mdio@9290 {
+ compatible = moxa,moxart-mdio;
+ reg = 0x9290 0x8;
+ #address-cells = 1;
+ #size-cells = 0;
+
+ ethphy1: ethernet-phy@1 {
+ device_type = ethernet-phy;
+ compatible = moxa,moxart-rtl8201cp,
ethernet-phy-ieee802.3-c22;
+ reg = 1;
+ };
+ };
+
mac0: mac@9090 {
compatible = moxa,moxart-mac;
- reg = 0x9090 0x100;
+ reg = 0x9090 0x90;
interrupts = 25 0;
+ phy-handle = ethphy0;
};
mac1: mac@9200 {
compatible = moxa,moxart-mac;
- reg = 0x9200 0x100;
+ reg = 0x9200 0x90;
interrupts = 27 0;
+ phy-handle = ethphy1;
};
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c
b/drivers/net/ethernet/moxa/moxart_ether.c
index 3c14afd..1b87034 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -26,6 +26,9 @@
#include linux/of_irq.h
#include linux/crc32.h
#include linux/crc32c.h
+#include linux/phy.h
+#include linux/of_mdio.h
+#include linux/of_net.h
#include moxart_ether.h
@@ -61,6 +64,16 @@ static int moxart_set_mac_address(struct net_device *ndev,
void *addr)
return 0;
}
+static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int cmd)
+{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ if (!netif_running(ndev))
+ return -EINVAL;
+
+ return phy_mii_ioctl(priv-phy_dev, ir, cmd);
+}
+
static void moxart_mac_free_memory(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -110,6 +123,19 @@ static void moxart_mac_enable(struct net_device *ndev)
writel(priv-reg_maccr, priv-base + REG_MAC_CTRL);
}
+static void moxart_mac_update_duplex(struct net_device *ndev)
+{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ priv-reg_maccr = ~(FULLDUP | ENRX_IN_HALFTX);
+ if (priv-duplex)
+ priv-reg_maccr |= FULLDUP;
+ else
+ priv-reg_maccr |= ENRX_IN_HALFTX;
+
+ writel(priv-reg_maccr, priv-base + REG_MAC_CTRL);
+}
+
static void moxart_mac_setup_desc_ring(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -169,6 +195,9 @@ static int moxart_mac_open(struct net_device *ndev)
moxart_update_mac_address(ndev);
moxart_mac_setup_desc_ring(ndev);
moxart_mac_enable(ndev);
+
+ phy_start(priv-phy_dev);
+
netif_start_queue(ndev);
netdev_dbg(ndev, %s: IMR=0x%x, MACCR=0x%x\n,
@@ -184,6 +213,8 @@ static int
Re: [PATCH v2 2/6] net: MOXA ART: connect to PHY
Le lundi 25 novembre 2013, 16:27:04 Jonas Jensen a écrit :
The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP),
connect to this PHY using OF.
Signed-off-by: Jonas Jensen jonas.jen...@gmail.com
Looks good:
Reviewed-by: Florian Fainelli f.faine...@gmail.com
---
Notes:
Thanks for reviewing!
Changes since v1:
1. split ethtool support to separate patch
2. changes to devicetree binding document
3. add moxart_mac_update_duplex()
4. compare previous link state/speed/duplex on link adjust
5. use of_get_phy_mode() not PHY_INTERFACE_MODE_MII
6. bail on of_parse_phandle() failure
7. remove if (!priv-phy_dev) return -ENODEV;
moxart_do_ioctl()
8. remove if (priv-phy_dev)
moxart_mac_open(), moxart_mac_stop()
Applies to next-20131125
.../devicetree/bindings/net/moxa,moxart-mac.txt| 47 ++-
drivers/net/ethernet/moxa/moxart_ether.c | 92
+- drivers/net/ethernet/moxa/moxart_ether.h |
2 +
3 files changed, 138 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt index
583418b..56f0374 100644
--- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
+++ b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
@@ -1,21 +1,64 @@
MOXA ART Ethernet Controller
+Integrated MDIO bus node:
+
+- compatible: moxa,moxart-mdio
+- Inherets from MDIO bus node binding[1]
+
+[1] Documentation/devicetree/bindings/net/phy.txt
+
+
+Ethernet node:
+
Required properties:
- compatible : Must be moxa,moxart-mac
- reg : Should contain register location and length
- interrupts : Should contain the mac interrupt number
+Optional Properties:
+
+- phy-handle : the phandle to a PHY node
+
+
Example:
+ mdio0: mdio@90900090 {
+ compatible = moxa,moxart-mdio;
+ reg = 0x90900090 0x8;
+ #address-cells = 1;
+ #size-cells = 0;
+
+ ethphy0: ethernet-phy@1 {
+ device_type = ethernet-phy;
+ compatible = moxa,moxart-rtl8201cp,
ethernet-phy-ieee802.3-c22;
+ reg = 1;
+ };
+ };
+
+ mdio1: mdio@9290 {
+ compatible = moxa,moxart-mdio;
+ reg = 0x9290 0x8;
+ #address-cells = 1;
+ #size-cells = 0;
+
+ ethphy1: ethernet-phy@1 {
+ device_type = ethernet-phy;
+ compatible = moxa,moxart-rtl8201cp,
ethernet-phy-ieee802.3-c22;
+ reg = 1;
+ };
+ };
+
mac0: mac@9090 {
compatible = moxa,moxart-mac;
- reg = 0x9090 0x100;
+ reg = 0x9090 0x90;
interrupts = 25 0;
+ phy-handle = ethphy0;
};
mac1: mac@9200 {
compatible = moxa,moxart-mac;
- reg = 0x9200 0x100;
+ reg = 0x9200 0x90;
interrupts = 27 0;
+ phy-handle = ethphy1;
};
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c
b/drivers/net/ethernet/moxa/moxart_ether.c index 3c14afd..1b87034 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -26,6 +26,9 @@
#include linux/of_irq.h
#include linux/crc32.h
#include linux/crc32c.h
+#include linux/phy.h
+#include linux/of_mdio.h
+#include linux/of_net.h
#include moxart_ether.h
@@ -61,6 +64,16 @@ static int moxart_set_mac_address(struct net_device
*ndev, void *addr) return 0;
}
+static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int
cmd) +{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ if (!netif_running(ndev))
+ return -EINVAL;
+
+ return phy_mii_ioctl(priv-phy_dev, ir, cmd);
+}
+
static void moxart_mac_free_memory(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -110,6 +123,19 @@ static void moxart_mac_enable(struct net_device *ndev)
writel(priv-reg_maccr, priv-base + REG_MAC_CTRL);
}
+static void moxart_mac_update_duplex(struct net_device *ndev)
+{
+ struct moxart_mac_priv_t *priv = netdev_priv(ndev);
+
+ priv-reg_maccr = ~(FULLDUP | ENRX_IN_HALFTX);
+ if (priv-duplex)
+ priv-reg_maccr |= FULLDUP;
+ else
+ priv-reg_maccr |= ENRX_IN_HALFTX;
+
+ writel(priv-reg_maccr, priv-base + REG_MAC_CTRL);
+}
+
static void moxart_mac_setup_desc_ring(struct net_device *ndev)
{
struct moxart_mac_priv_t *priv = netdev_priv(ndev);
@@ -169,6 +195,9 @@ static int moxart_mac_open(struct net_device *ndev)
moxart_update_mac_address(ndev);
moxart_mac_setup_desc_ring(ndev);
moxart_mac_enable(ndev);
+
+
