Commit 33cd597f authored by Dmitry Bezrukov's avatar Dmitry Bezrukov Committed by David S. Miller

net: usb: aqc111: Introduce PHY access

Add helpers to write 32bit values.
Implement PHY power up/down sequences.
AQC111, PHY is being controlled via vendor command interface.
Signed-off-by: default avatarDmitry Bezrukov <dmitry.bezrukov@aquantia.com>
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3aa095a
...@@ -137,14 +137,49 @@ static int aqc111_write16_cmd(struct usbnet *dev, u8 cmd, u16 value, ...@@ -137,14 +137,49 @@ static int aqc111_write16_cmd(struct usbnet *dev, u8 cmd, u16 value,
return aqc111_write_cmd(dev, cmd, value, index, sizeof(tmp), &tmp); return aqc111_write_cmd(dev, cmd, value, index, sizeof(tmp), &tmp);
} }
static int aqc111_write32_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value,
u16 index, u32 *data)
{
u32 tmp = *data;
cpu_to_le32s(&tmp);
return aqc111_write_cmd_nopm(dev, cmd, value, index, sizeof(tmp), &tmp);
}
static int aqc111_write32_cmd(struct usbnet *dev, u8 cmd, u16 value,
u16 index, u32 *data)
{
u32 tmp = *data;
cpu_to_le32s(&tmp);
return aqc111_write_cmd(dev, cmd, value, index, sizeof(tmp), &tmp);
}
static const struct net_device_ops aqc111_netdev_ops = { static const struct net_device_ops aqc111_netdev_ops = {
.ndo_open = usbnet_open, .ndo_open = usbnet_open,
.ndo_stop = usbnet_stop, .ndo_stop = usbnet_stop,
}; };
static void aqc111_read_fw_version(struct usbnet *dev,
struct aqc111_data *aqc111_data)
{
aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_MAJOR,
1, 1, &aqc111_data->fw_ver.major);
aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_MINOR,
1, 1, &aqc111_data->fw_ver.minor);
aqc111_read_cmd(dev, AQ_ACCESS_MAC, AQ_FW_VER_REV,
1, 1, &aqc111_data->fw_ver.rev);
if (aqc111_data->fw_ver.major & 0x80)
aqc111_data->fw_ver.major &= ~0x80;
}
static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf)
{ {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
struct aqc111_data *aqc111_data;
int ret; int ret;
/* Check if vendor configuration */ /* Check if vendor configuration */
...@@ -161,13 +196,23 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) ...@@ -161,13 +196,23 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf)
return ret; return ret;
} }
aqc111_data = kzalloc(sizeof(*aqc111_data), GFP_KERNEL);
if (!aqc111_data)
return -ENOMEM;
/* store aqc111_data pointer in device data field */
dev->driver_priv = aqc111_data;
dev->net->netdev_ops = &aqc111_netdev_ops; dev->net->netdev_ops = &aqc111_netdev_ops;
aqc111_read_fw_version(dev, aqc111_data);
return 0; return 0;
} }
static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf)
{ {
struct aqc111_data *aqc111_data = dev->driver_priv;
u16 reg16; u16 reg16;
/* Force bz */ /* Force bz */
...@@ -177,12 +222,26 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf) ...@@ -177,12 +222,26 @@ static void aqc111_unbind(struct usbnet *dev, struct usb_interface *intf)
reg16 = 0; reg16 = 0;
aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL,
2, &reg16); 2, &reg16);
/* Power down ethernet PHY */
aqc111_data->phy_cfg |= AQ_LOW_POWER;
aqc111_data->phy_cfg &= ~AQ_PHY_POWER_EN;
aqc111_write32_cmd_nopm(dev, AQ_PHY_OPS, 0, 0,
&aqc111_data->phy_cfg);
kfree(aqc111_data);
} }
static int aqc111_reset(struct usbnet *dev) static int aqc111_reset(struct usbnet *dev)
{ {
struct aqc111_data *aqc111_data = dev->driver_priv;
u8 reg8 = 0; u8 reg8 = 0;
/* Power up ethernet PHY */
aqc111_data->phy_cfg = AQ_PHY_POWER_EN;
aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0,
&aqc111_data->phy_cfg);
reg8 = 0xFF; reg8 = 0xFF;
aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, 1, 1, &reg8); aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, 1, 1, &reg8);
...@@ -200,6 +259,7 @@ static int aqc111_reset(struct usbnet *dev) ...@@ -200,6 +259,7 @@ static int aqc111_reset(struct usbnet *dev)
static int aqc111_stop(struct usbnet *dev) static int aqc111_stop(struct usbnet *dev)
{ {
struct aqc111_data *aqc111_data = dev->driver_priv;
u16 reg16 = 0; u16 reg16 = 0;
aqc111_read16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, aqc111_read16_cmd(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE,
...@@ -210,6 +270,11 @@ static int aqc111_stop(struct usbnet *dev) ...@@ -210,6 +270,11 @@ static int aqc111_stop(struct usbnet *dev)
reg16 = 0; reg16 = 0;
aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16); aqc111_write16_cmd(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
/* Put PHY to low power*/
aqc111_data->phy_cfg |= AQ_LOW_POWER;
aqc111_write32_cmd(dev, AQ_PHY_OPS, 0, 0,
&aqc111_data->phy_cfg);
return 0; return 0;
} }
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#define AQ_ACCESS_MAC 0x01 #define AQ_ACCESS_MAC 0x01
#define AQ_PHY_POWER 0x31 #define AQ_PHY_POWER 0x31
#define AQ_PHY_OPS 0x61
#define AQ_USB_PHY_SET_TIMEOUT 10000 #define AQ_USB_PHY_SET_TIMEOUT 10000
#define AQ_USB_SET_TIMEOUT 4000 #define AQ_USB_SET_TIMEOUT 4000
...@@ -102,6 +103,38 @@ ...@@ -102,6 +103,38 @@
#define SFR_BULK_OUT_FLUSH_EN 0x01 #define SFR_BULK_OUT_FLUSH_EN 0x01
#define SFR_BULK_OUT_EFF_EN 0x02 #define SFR_BULK_OUT_EFF_EN 0x02
#define AQ_FW_VER_MAJOR 0xDA
#define AQ_FW_VER_MINOR 0xDB
#define AQ_FW_VER_REV 0xDC
/*PHY_OPS**********************************************************************/
#define AQ_ADV_100M BIT(0)
#define AQ_ADV_1G BIT(1)
#define AQ_ADV_2G5 BIT(2)
#define AQ_ADV_5G BIT(3)
#define AQ_PAUSE BIT(16)
#define AQ_ASYM_PAUSE BIT(17)
#define AQ_LOW_POWER BIT(18)
#define AQ_PHY_POWER_EN BIT(19)
#define AQ_WOL BIT(20)
#define AQ_DOWNSHIFT BIT(21)
#define AQ_DSH_RETRIES_SHIFT 0x18
#define AQ_DSH_RETRIES_MASK 0xF000000
/******************************************************************************/
struct aqc111_data {
struct {
u8 major;
u8 minor;
u8 rev;
} fw_ver;
u32 phy_cfg;
};
static struct { static struct {
unsigned char ctrl; unsigned char ctrl;
unsigned char timer_l; unsigned char timer_l;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment