diff mbox series

[V5,net-next,6/8] net: hns3: Add MDIO support to HNS3 Ethernet driver for hip08 SoC

Message ID 20170728222652.118448-7-salil.mehta@huawei.com
State Superseded
Headers show
Series Hisilicon Network Subsystem 3 Ethernet Driver | expand

Commit Message

Salil Mehta July 28, 2017, 10:26 p.m. UTC
This patch adds the support of MDIO bus interface for HNS3 driver.
Code provides various interfaces to start and stop the PHY layer
and to read and write the MDIO bus or PHY.

Signed-off-by: Daode Huang <huangdaode@hisilicon.com>

Signed-off-by: lipeng <lipeng321@huawei.com>

Signed-off-by: Salil Mehta <salil.mehta@huawei.com>

Signed-off-by: Yisen Zhuang <yisen.zhuang@huawei.com>

---
Patch V5: Addressed following comments:
 1. Florian Fainelli
    https://lkml.org/lkml/2017/7/23/91
Patch V4: Addressed following comments:
 1. Andrew Lunn
    https://lkml.org/lkml/2017/6/17/208
Patch V3: Addressed Below comments:
 1. Florian Fainelli
    https://lkml.org/lkml/2017/6/13/963
 2. Andrew Lunn
    https://lkml.org/lkml/2017/6/13/1039
Patch V2: Addressed below comments:
 1. Florian Fainelli
    https://lkml.org/lkml/2017/6/10/130
 2. Andrew Lunn
    https://lkml.org/lkml/2017/6/10/168
Patch V1: Initial Submit
---
 .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c    | 209 +++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c

-- 
2.7.4

Comments

Andrew Lunn July 28, 2017, 11:24 p.m. UTC | #1
> +static void hclge_mac_adjust_link(struct net_device *netdev)

> +{

> +	struct hnae3_handle *h = *((void **)netdev_priv(netdev));

> +	struct hclge_vport *vport = hclge_get_vport(h);

> +	struct hclge_dev *hdev = vport->back;

> +	int duplex, speed;

> +	int ret;

> +

> +	speed = netdev->phydev->speed;

> +	duplex = netdev->phydev->duplex;

> +

> +	ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex);

> +	if (ret)

> +		dev_err(&hdev->pdev->dev, "adjust link fail.\n");


Here and hclge_mac_start_phy() you have a netdev, so you should be
using netdev_err()

> +}

> +

> +int hclge_mac_start_phy(struct hclge_dev *hdev)

> +{

> +	struct net_device *netdev = hdev->vport[0].nic.netdev;

> +	struct phy_device *phydev = hdev->hw.mac.phydev;

> +	int ret;

> +

> +	if (!phydev)

> +		return 0;

> +

> +	ret = phy_connect_direct(netdev, phydev,

> +				 hclge_mac_adjust_link,

> +				 PHY_INTERFACE_MODE_SGMII);

> +	if (ret) {

> +		pr_info("phy_connect_direct err");

> +		return ret;


netdev_err(). checkpatch probably gave you a warning about this?

> +	}

> +

> +	phy_start(phydev);

> +

> +	return 0;

> +}

> +

> +void hclge_mac_stop_phy(struct hclge_dev *hdev)

> +{

> +	struct net_device *netdev = hdev->vport[0].nic.netdev;

> +	struct phy_device *phydev = netdev->phydev;

> +

> +	phy_stop(phydev);

> +	phy_disconnect(phydev);

> +}


In hclge_mac_start_phy() you check for !phydev. Here you
unconditionally use phydev. Seems inconsistent.

	Andrew
Andrew Lunn July 28, 2017, 11:28 p.m. UTC | #2
> +int hclge_mac_mdio_config(struct hclge_dev *hdev)

> +{

..

> +}

> +

> +int hclge_mac_start_phy(struct hclge_dev *hdev)

> +{


> +}

> +

> +void hclge_mac_stop_phy(struct hclge_dev *hdev)

> +{

> +}

> -- 


These are not static functions. So i would expect them to be in a
header file somewhere....

       Andrew
Salil Mehta July 28, 2017, 11:50 p.m. UTC | #3
Hi Andrew,

> -----Original Message-----

> From: Andrew Lunn [mailto:andrew@lunn.ch]

> Sent: Saturday, July 29, 2017 12:24 AM

> To: Salil Mehta

> Cc: davem@davemloft.net; Zhuangyuzeng (Yisen); huangdaode; lipeng (Y);

> mehta.salil.lnk@gmail.com; netdev@vger.kernel.org; linux-

> kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Linuxarm

> Subject: Re: [PATCH V5 net-next 6/8] net: hns3: Add MDIO support to

> HNS3 Ethernet driver for hip08 SoC

> 

> > +static void hclge_mac_adjust_link(struct net_device *netdev)

> > +{

> > +	struct hnae3_handle *h = *((void **)netdev_priv(netdev));

> > +	struct hclge_vport *vport = hclge_get_vport(h);

> > +	struct hclge_dev *hdev = vport->back;

> > +	int duplex, speed;

> > +	int ret;

> > +

> > +	speed = netdev->phydev->speed;

> > +	duplex = netdev->phydev->duplex;

> > +

> > +	ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex);

> > +	if (ret)

> > +		dev_err(&hdev->pdev->dev, "adjust link fail.\n");

> 

> Here and hclge_mac_start_phy() you have a netdev, so you should be

> using netdev_err()

Ok sure. Will replace in next patch.

> 

> > +}

> > +

> > +int hclge_mac_start_phy(struct hclge_dev *hdev)

> > +{

> > +	struct net_device *netdev = hdev->vport[0].nic.netdev;

> > +	struct phy_device *phydev = hdev->hw.mac.phydev;

> > +	int ret;

> > +

> > +	if (!phydev)

> > +		return 0;

> > +

> > +	ret = phy_connect_direct(netdev, phydev,

> > +				 hclge_mac_adjust_link,

> > +				 PHY_INTERFACE_MODE_SGMII);

> > +	if (ret) {

> > +		pr_info("phy_connect_direct err");

> > +		return ret;

> 

> netdev_err(). checkpatch probably gave you a warning about this?

No, it did not.

> 

> > +	}

> > +

> > +	phy_start(phydev);

> > +

> > +	return 0;

> > +}

> > +

> > +void hclge_mac_stop_phy(struct hclge_dev *hdev)

> > +{

> > +	struct net_device *netdev = hdev->vport[0].nic.netdev;

> > +	struct phy_device *phydev = netdev->phydev;

> > +

> > +	phy_stop(phydev);

> > +	phy_disconnect(phydev);

> > +}

> 

> In hclge_mac_start_phy() you check for !phydev. Here you

> unconditionally use phydev. Seems inconsistent.

Yes, I think NULL check for phy should be present here as well.

> 

> 	Andrew
Salil Mehta July 28, 2017, 11:52 p.m. UTC | #4
Hi Andrew,

> -----Original Message-----

> From: linux-rdma-owner@vger.kernel.org [mailto:linux-rdma-

> owner@vger.kernel.org] On Behalf Of Andrew Lunn

> Sent: Saturday, July 29, 2017 12:29 AM

> To: Salil Mehta

> Cc: davem@davemloft.net; Zhuangyuzeng (Yisen); huangdaode; lipeng (Y);

> mehta.salil.lnk@gmail.com; netdev@vger.kernel.org; linux-

> kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Linuxarm

> Subject: Re: [PATCH V5 net-next 6/8] net: hns3: Add MDIO support to

> HNS3 Ethernet driver for hip08 SoC

> 

> > +int hclge_mac_mdio_config(struct hclge_dev *hdev)

> > +{

> ..

> 

> > +}

> > +

> > +int hclge_mac_start_phy(struct hclge_dev *hdev)

> > +{

> 

> > +}

> > +

> > +void hclge_mac_stop_phy(struct hclge_dev *hdev)

> > +{

> > +}

> > --

> 

> These are not static functions. So i would expect them to be in a

> header file somewhere....

Sure.

> 

>        Andrew

> --

> To unsubscribe from this list: send the line "unsubscribe linux-rdma"

> in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
new file mode 100644
index 0000000..677a48c
--- /dev/null
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
@@ -0,0 +1,209 @@ 
+/*
+ * Copyright (c) 2016~2017 Hisilicon Limited.
+ *
+ * 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 Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/etherdevice.h>
+#include <linux/kernel.h>
+
+#include "hclge_cmd.h"
+#include "hclge_main.h"
+
+enum hclge_mdio_c22_op_seq {
+	HCLGE_MDIO_C22_WRITE = 1,
+	HCLGE_MDIO_C22_READ = 2
+};
+
+#define HCLGE_MDIO_CTRL_START_B		0
+#define HCLGE_MDIO_CTRL_ST_S		1
+#define HCLGE_MDIO_CTRL_ST_M		(0x3 << HCLGE_MDIO_CTRL_ST_S)
+#define HCLGE_MDIO_CTRL_OP_S		3
+#define HCLGE_MDIO_CTRL_OP_M		(0x3 << HCLGE_MDIO_CTRL_OP_S)
+
+#define HCLGE_MDIO_PHYID_S		0
+#define HCLGE_MDIO_PHYID_M		(0x1f << HCLGE_MDIO_PHYID_S)
+
+#define HCLGE_MDIO_PHYREG_S		0
+#define HCLGE_MDIO_PHYREG_M		(0x1f << HCLGE_MDIO_PHYREG_S)
+
+#define HCLGE_MDIO_STA_B		0
+
+struct hclge_mdio_cfg_cmd {
+	u8 ctrl_bit;
+	u8 phyid;
+	u8 phyad;
+	u8 rsvd;
+	__le16 reserve;
+	__le16 data_wr;
+	__le16 data_rd;
+	__le16 sta;
+};
+
+static int hclge_mdio_write(struct mii_bus *bus, int phyid, int regnum,
+			    u16 data)
+{
+	struct hclge_mdio_cfg_cmd *mdio_cmd;
+	struct hclge_dev *hdev = bus->priv;
+	struct hclge_desc desc;
+	int ret;
+
+	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, false);
+
+	mdio_cmd = (struct hclge_mdio_cfg_cmd *)desc.data;
+
+	hnae_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M,
+		       HCLGE_MDIO_PHYID_S, phyid);
+	hnae_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M,
+		       HCLGE_MDIO_PHYREG_S, regnum);
+
+	hnae_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1);
+	hnae_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M,
+		       HCLGE_MDIO_CTRL_ST_S, 1);
+	hnae_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_OP_M,
+		       HCLGE_MDIO_CTRL_OP_S, HCLGE_MDIO_C22_WRITE);
+
+	mdio_cmd->data_wr = cpu_to_le16(data);
+
+	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+	if (ret) {
+		dev_err(&hdev->pdev->dev,
+			"mdio write fail when sending cmd, status is %d.\n",
+			ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int hclge_mdio_read(struct mii_bus *bus, int phyid, int regnum)
+{
+	struct hclge_mdio_cfg_cmd *mdio_cmd;
+	struct hclge_dev *hdev = bus->priv;
+	struct hclge_desc desc;
+	int ret;
+
+	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MDIO_CONFIG, true);
+
+	mdio_cmd = (struct hclge_mdio_cfg_cmd *)desc.data;
+
+	hnae_set_field(mdio_cmd->phyid, HCLGE_MDIO_PHYID_M,
+		       HCLGE_MDIO_PHYID_S, phyid);
+	hnae_set_field(mdio_cmd->phyad, HCLGE_MDIO_PHYREG_M,
+		       HCLGE_MDIO_PHYREG_S, regnum);
+
+	hnae_set_bit(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_START_B, 1);
+	hnae_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_ST_M,
+		       HCLGE_MDIO_CTRL_ST_S, 1);
+	hnae_set_field(mdio_cmd->ctrl_bit, HCLGE_MDIO_CTRL_OP_M,
+		       HCLGE_MDIO_CTRL_OP_S, HCLGE_MDIO_C22_READ);
+
+	/* Read out phy data */
+	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+	if (ret) {
+		dev_err(&hdev->pdev->dev,
+			"mdio read fail when get data, status is %d.\n",
+			ret);
+		return ret;
+	}
+
+	if (hnae_get_bit(le16_to_cpu(mdio_cmd->sta), HCLGE_MDIO_STA_B)) {
+		dev_err(&hdev->pdev->dev, "mdio read data error\n");
+		return -EIO;
+	}
+
+	return le16_to_cpu(mdio_cmd->data_rd);
+}
+
+int hclge_mac_mdio_config(struct hclge_dev *hdev)
+{
+	struct hclge_mac *mac = &hdev->hw.mac;
+	struct phy_device *phydev;
+	struct mii_bus *mdio_bus;
+	int ret;
+
+	if (hdev->hw.mac.phy_addr >= PHY_MAX_ADDR)
+		return 0;
+
+	mdio_bus = devm_mdiobus_alloc(&hdev->pdev->dev);
+	if (!mdio_bus)
+		return -ENOMEM;
+
+	mdio_bus->name = "hisilicon MII bus";
+	mdio_bus->read = hclge_mdio_read;
+	mdio_bus->write = hclge_mdio_write;
+	snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%s-%s", "mii",
+		 dev_name(&hdev->pdev->dev));
+
+	mdio_bus->parent = &hdev->pdev->dev;
+	mdio_bus->priv = hdev;
+	mdio_bus->phy_mask = ~(1 << mac->phy_addr);
+	ret = mdiobus_register(mdio_bus);
+	if (ret) {
+		dev_err(mdio_bus->parent,
+			"Failed to register MDIO bus ret = %#x\n", ret);
+		return ret;
+	}
+
+	phydev = mdiobus_get_phy(mdio_bus, mac->phy_addr);
+	if (!phydev || IS_ERR(phydev)) {
+		dev_err(mdio_bus->parent, "Failed to get phy device\n");
+		mdiobus_unregister(mdio_bus);
+		return -EIO;
+	}
+
+	mac->phydev = phydev;
+	mac->mdio_bus = mdio_bus;
+
+	return 0;
+}
+
+static void hclge_mac_adjust_link(struct net_device *netdev)
+{
+	struct hnae3_handle *h = *((void **)netdev_priv(netdev));
+	struct hclge_vport *vport = hclge_get_vport(h);
+	struct hclge_dev *hdev = vport->back;
+	int duplex, speed;
+	int ret;
+
+	speed = netdev->phydev->speed;
+	duplex = netdev->phydev->duplex;
+
+	ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex);
+	if (ret)
+		dev_err(&hdev->pdev->dev, "adjust link fail.\n");
+}
+
+int hclge_mac_start_phy(struct hclge_dev *hdev)
+{
+	struct net_device *netdev = hdev->vport[0].nic.netdev;
+	struct phy_device *phydev = hdev->hw.mac.phydev;
+	int ret;
+
+	if (!phydev)
+		return 0;
+
+	ret = phy_connect_direct(netdev, phydev,
+				 hclge_mac_adjust_link,
+				 PHY_INTERFACE_MODE_SGMII);
+	if (ret) {
+		pr_info("phy_connect_direct err");
+		return ret;
+	}
+
+	phy_start(phydev);
+
+	return 0;
+}
+
+void hclge_mac_stop_phy(struct hclge_dev *hdev)
+{
+	struct net_device *netdev = hdev->vport[0].nic.netdev;
+	struct phy_device *phydev = netdev->phydev;
+
+	phy_stop(phydev);
+	phy_disconnect(phydev);
+}