From: Igor Russkikh <Igor.Russkikh@aquantia.com> To: "David S . Miller" <davem@davemloft.net> Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>, "netdev@vger.kernel.org" <netdev@vger.kernel.org>, Igor Russkikh <Igor.Russkikh@aquantia.com>, Dmitry Bezrukov <Dmitry.Bezrukov@aquantia.com> Subject: [PATCH net-next 19/19] net: usb: aqc111: Add support for wake on LAN by MAGIC packet Date: Fri, 5 Oct 2018 10:25:35 +0000 [thread overview] Message-ID: <1a7d4af1b3a6397b76338d543f86bb4c327f5060.1538734658.git.igor.russkikh@aquantia.com> (raw) In-Reply-To: <cover.1538734658.git.igor.russkikh@aquantia.com> From: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com> Signed-off-by: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com> Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> --- drivers/net/usb/aqc111.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 11 +++ 2 files changed, 214 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 20d4347ea3ad..e2ea8dc54d3a 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -192,6 +192,35 @@ static void aqc111_get_drvinfo(struct net_device *net, info->regdump_len = 0x00; } +static void aqc111_get_wol(struct net_device *net, + struct ethtool_wolinfo *wolinfo) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + wolinfo->supported = WAKE_MAGIC; + wolinfo->wolopts = 0; + + if (aqc111_data->wol_cfg.flags & AQ_WOL_FLAG_MP) + wolinfo->wolopts |= WAKE_MAGIC; +} + +static int aqc111_set_wol(struct net_device *net, + struct ethtool_wolinfo *wolinfo) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + if (wolinfo->wolopts & ~WAKE_MAGIC) + return -EINVAL; + + aqc111_data->wol_cfg.flags = 0; + if (wolinfo->wolopts & WAKE_MAGIC) + aqc111_data->wol_cfg.flags |= AQ_WOL_FLAG_MP; + + return 0; +} + static void aqc111_speed_to_link_mode(u32 speed, struct ethtool_link_ksettings *elk) { @@ -441,6 +470,8 @@ static int aqc111_set_link_ksettings(struct net_device *net, static const struct ethtool_ops aqc111_ethtool_ops = { .get_drvinfo = aqc111_get_drvinfo, + .get_wol = aqc111_get_wol, + .set_wol = aqc111_set_wol, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, .get_link = ethtool_op_get_link, @@ -1346,6 +1377,176 @@ static const struct driver_info aqc111_info = { .tx_fixup = aqc111_tx_fixup, }; +static int aqc111_suspend(struct usb_interface *intf, pm_message_t message) +{ + struct usbnet *dev = usb_get_intfdata(intf); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + u8 reg8; + u16 reg16; + u16 temp_rx_ctrl = 0x00; + + usbnet_suspend(intf, message); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + temp_rx_ctrl = reg16; + /* Stop RX operations*/ + reg16 &= ~SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, ®16); + /* Force bz */ + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, + 2, 2, ®16); + reg16 |= SFR_PHYPWR_RSTCTL_BZ; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, + 2, 2, ®16); + + reg8 = SFR_BULK_OUT_EFF_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, + 1, 1, ®8); + + temp_rx_ctrl &= ~(SFR_RX_CTL_START | SFR_RX_CTL_RF_WAK | + SFR_RX_CTL_AP | SFR_RX_CTL_AM); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &temp_rx_ctrl); + + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + + if (aqc111_data->wol_cfg.flags) { + aqc111_data->phy_ops.wol = 1; + if (aqc111_data->dpa) { + reg8 = 0; + if (aqc111_data->wol_cfg.flags & AQ_WOL_FLAG_MP) + reg8 |= SFR_MONITOR_MODE_RWMP; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MONITOR_MODE, 1, 1, ®8); + } else { + memcpy(aqc111_data->wol_cfg.hw_addr, + dev->net->dev_addr, ETH_ALEN); + } + + temp_rx_ctrl |= (SFR_RX_CTL_AB | SFR_RX_CTL_START); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &temp_rx_ctrl); + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, + 1, 1, ®8); + reg8 = SFR_BMRX_DMA_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BMRX_DMA_CONTROL, + 1, 1, ®8); + reg8 = SFR_RX_PATH_READY; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + reg8 = 0x07; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QCTRL, + 1, 1, ®8); + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_RX_BULKIN_QTIMR_LOW, 1, 1, ®8); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_RX_BULKIN_QTIMR_HIGH, 1, 1, ®8); + reg8 = 0xFF; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QSIZE, + 1, 1, ®8); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QIFG, + 1, 1, ®8); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + reg16 |= SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + + if (aqc111_data->dpa) { + aqc111_set_phy_speed(dev, AUTONEG_DISABLE, SPEED_100); + } else { + aqc111_write_cmd(dev, AQ_WOL_CFG, 0, 0, + WOL_CFG_SIZE, &aqc111_data->wol_cfg); + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } + } else { + aqc111_data->phy_ops.low_power = 1; + if (!aqc111_data->dpa) { + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } else { + reg16 = AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, + AQ_PHY_GLOBAL_ADDR, 2, ®16); + } + + /* Disable RX path */ + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg16 &= ~SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + } + + return 0; +} + +static int aqc111_resume(struct usb_interface *intf) +{ + struct usbnet *dev = usb_get_intfdata(intf); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + u8 reg8; + u16 reg16; + + netif_carrier_off(dev->net); + + /* Power up ethernet PHY */ + aqc111_data->phy_ops.phy_power = 1; + aqc111_data->phy_ops.low_power = 0; + aqc111_data->phy_ops.wol = 0; + if (aqc111_data->dpa) { + aqc111_read_cmd_nopm(dev, AQ_PHY_POWER, 0, 0, 1, ®8); + if (reg8 == 0x00) { + reg8 = 0x02; + aqc111_write_cmd_nopm(dev, AQ_PHY_POWER, 0, 0, + 1, ®8); + msleep(200); + } + + aq_mdio_read_cmd(dev, AQ_GLB_STD_CTRL_REG, AQ_PHY_GLOBAL_ADDR, + 2, ®16); + if (reg16 & AQ_PHY_LOW_POWER_MODE) { + reg16 &= ~AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, + AQ_PHY_GLOBAL_ADDR, 2, ®16); + } + } + + reg8 = 0xFF; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, + 1, 1, ®8); + /* Configure RX control register => start operation */ + reg16 = aqc111_data->rxctl; + reg16 &= ~SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + + reg16 |= SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + + aqc111_set_phy_speed(dev, aqc111_data->autoneg, + aqc111_data->advertised_speed); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg16 |= SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg8 = SFR_RX_PATH_READY; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + reg8 = 0x0; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BMRX_DMA_CONTROL, 1, 1, ®8); + + return usbnet_resume(intf); +} + #define AQC111_USB_ETH_DEV(vid, pid, table) \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ USB_DEVICE_ID_MATCH_INT_CLASS, \ @@ -1371,6 +1572,8 @@ static struct usb_driver aq_driver = { .name = "aqc111", .id_table = products, .probe = usbnet_probe, + .suspend = aqc111_suspend, + .resume = aqc111_resume, .disconnect = usbnet_disconnect, }; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index a7ccee225e93..9a900c325273 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -19,6 +19,7 @@ #define AQ_FLASH_PARAMETERS 0x20 #define AQ_PHY_POWER 0x31 #define AQ_PHY_CMD 0x32 +#define AQ_WOL_CFG 0x60 #define AQ_PHY_OPS 0x61 #define AQC111_PHY_ID 0x00 @@ -169,6 +170,7 @@ #define AQ_FW_VER_MINOR 0xDB #define AQ_FW_VER_REV 0xDC +#define AQ_WOL_FLAG_MP 0x2 /******************************************************************************/ struct aqc111_phy_options { @@ -214,6 +216,14 @@ struct aqc111_phy_options { }; }; +struct aqc111_wol_cfg { + u8 hw_addr[6]; + u8 flags; + u8 rsvd[283]; +}; + +#define WOL_CFG_SIZE sizeof(struct aqc111_wol_cfg) + struct aqc111_data { u16 rxctl; u8 rx_checksum; @@ -228,6 +238,7 @@ struct aqc111_data { } fw_ver; u8 dpa; /*direct PHY access*/ struct aqc111_phy_options phy_ops; + struct aqc111_wol_cfg wol_cfg; } __packed; struct aqc111_int_data { -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Igor Russkikh <igor.russkikh@aquantia.com> To: "David S . Miller" <davem@davemloft.net> Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>, "netdev@vger.kernel.org" <netdev@vger.kernel.org>, Igor Russkikh <Igor.Russkikh@aquantia.com>, Dmitry Bezrukov <Dmitry.Bezrukov@aquantia.com> Subject: [net-next,19/19] net: usb: aqc111: Add support for wake on LAN by MAGIC packet Date: Fri, 5 Oct 2018 10:25:35 +0000 [thread overview] Message-ID: <1a7d4af1b3a6397b76338d543f86bb4c327f5060.1538734658.git.igor.russkikh@aquantia.com> (raw) From: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com> Signed-off-by: Dmitry Bezrukov <dmitry.bezrukov@aquantia.com> Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> --- drivers/net/usb/aqc111.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/usb/aqc111.h | 11 +++ 2 files changed, 214 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 20d4347ea3ad..e2ea8dc54d3a 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -192,6 +192,35 @@ static void aqc111_get_drvinfo(struct net_device *net, info->regdump_len = 0x00; } +static void aqc111_get_wol(struct net_device *net, + struct ethtool_wolinfo *wolinfo) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + wolinfo->supported = WAKE_MAGIC; + wolinfo->wolopts = 0; + + if (aqc111_data->wol_cfg.flags & AQ_WOL_FLAG_MP) + wolinfo->wolopts |= WAKE_MAGIC; +} + +static int aqc111_set_wol(struct net_device *net, + struct ethtool_wolinfo *wolinfo) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + + if (wolinfo->wolopts & ~WAKE_MAGIC) + return -EINVAL; + + aqc111_data->wol_cfg.flags = 0; + if (wolinfo->wolopts & WAKE_MAGIC) + aqc111_data->wol_cfg.flags |= AQ_WOL_FLAG_MP; + + return 0; +} + static void aqc111_speed_to_link_mode(u32 speed, struct ethtool_link_ksettings *elk) { @@ -441,6 +470,8 @@ static int aqc111_set_link_ksettings(struct net_device *net, static const struct ethtool_ops aqc111_ethtool_ops = { .get_drvinfo = aqc111_get_drvinfo, + .get_wol = aqc111_get_wol, + .set_wol = aqc111_set_wol, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, .get_link = ethtool_op_get_link, @@ -1346,6 +1377,176 @@ static const struct driver_info aqc111_info = { .tx_fixup = aqc111_tx_fixup, }; +static int aqc111_suspend(struct usb_interface *intf, pm_message_t message) +{ + struct usbnet *dev = usb_get_intfdata(intf); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + u8 reg8; + u16 reg16; + u16 temp_rx_ctrl = 0x00; + + usbnet_suspend(intf, message); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + temp_rx_ctrl = reg16; + /* Stop RX operations*/ + reg16 &= ~SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, ®16); + /* Force bz */ + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, + 2, 2, ®16); + reg16 |= SFR_PHYPWR_RSTCTL_BZ; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_PHYPWR_RSTCTL, + 2, 2, ®16); + + reg8 = SFR_BULK_OUT_EFF_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BULK_OUT_CTRL, + 1, 1, ®8); + + temp_rx_ctrl &= ~(SFR_RX_CTL_START | SFR_RX_CTL_RF_WAK | + SFR_RX_CTL_AP | SFR_RX_CTL_AM); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &temp_rx_ctrl); + + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + + if (aqc111_data->wol_cfg.flags) { + aqc111_data->phy_ops.wol = 1; + if (aqc111_data->dpa) { + reg8 = 0; + if (aqc111_data->wol_cfg.flags & AQ_WOL_FLAG_MP) + reg8 |= SFR_MONITOR_MODE_RWMP; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MONITOR_MODE, 1, 1, ®8); + } else { + memcpy(aqc111_data->wol_cfg.hw_addr, + dev->net->dev_addr, ETH_ALEN); + } + + temp_rx_ctrl |= (SFR_RX_CTL_AB | SFR_RX_CTL_START); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, + 2, 2, &temp_rx_ctrl); + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, + 1, 1, ®8); + reg8 = SFR_BMRX_DMA_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BMRX_DMA_CONTROL, + 1, 1, ®8); + reg8 = SFR_RX_PATH_READY; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + reg8 = 0x07; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QCTRL, + 1, 1, ®8); + reg8 = 0x00; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_RX_BULKIN_QTIMR_LOW, 1, 1, ®8); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_RX_BULKIN_QTIMR_HIGH, 1, 1, ®8); + reg8 = 0xFF; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QSIZE, + 1, 1, ®8); + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_BULKIN_QIFG, + 1, 1, ®8); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_MEDIUM_STATUS_MODE, + 2, 2, ®16); + reg16 |= SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + + if (aqc111_data->dpa) { + aqc111_set_phy_speed(dev, AUTONEG_DISABLE, SPEED_100); + } else { + aqc111_write_cmd(dev, AQ_WOL_CFG, 0, 0, + WOL_CFG_SIZE, &aqc111_data->wol_cfg); + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } + } else { + aqc111_data->phy_ops.low_power = 1; + if (!aqc111_data->dpa) { + aqc111_write_cmd(dev, AQ_PHY_OPS, 0, 0, + 4, &aqc111_data->phy_ops); + } else { + reg16 = AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, + AQ_PHY_GLOBAL_ADDR, 2, ®16); + } + + /* Disable RX path */ + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg16 &= ~SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + } + + return 0; +} + +static int aqc111_resume(struct usb_interface *intf) +{ + struct usbnet *dev = usb_get_intfdata(intf); + struct aqc111_data *aqc111_data = (struct aqc111_data *)dev->data[0]; + u8 reg8; + u16 reg16; + + netif_carrier_off(dev->net); + + /* Power up ethernet PHY */ + aqc111_data->phy_ops.phy_power = 1; + aqc111_data->phy_ops.low_power = 0; + aqc111_data->phy_ops.wol = 0; + if (aqc111_data->dpa) { + aqc111_read_cmd_nopm(dev, AQ_PHY_POWER, 0, 0, 1, ®8); + if (reg8 == 0x00) { + reg8 = 0x02; + aqc111_write_cmd_nopm(dev, AQ_PHY_POWER, 0, 0, + 1, ®8); + msleep(200); + } + + aq_mdio_read_cmd(dev, AQ_GLB_STD_CTRL_REG, AQ_PHY_GLOBAL_ADDR, + 2, ®16); + if (reg16 & AQ_PHY_LOW_POWER_MODE) { + reg16 &= ~AQ_PHY_LOW_POWER_MODE; + aq_mdio_write_cmd(dev, AQ_GLB_STD_CTRL_REG, + AQ_PHY_GLOBAL_ADDR, 2, ®16); + } + } + + reg8 = 0xFF; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_BM_INT_MASK, + 1, 1, ®8); + /* Configure RX control register => start operation */ + reg16 = aqc111_data->rxctl; + reg16 &= ~SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + + reg16 |= SFR_RX_CTL_START; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, 2, ®16); + + aqc111_set_phy_speed(dev, aqc111_data->autoneg, + aqc111_data->advertised_speed); + + aqc111_read_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg16 |= SFR_MEDIUM_RECEIVE_EN; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, + SFR_MEDIUM_STATUS_MODE, 2, 2, ®16); + reg8 = SFR_RX_PATH_READY; + aqc111_write_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_ETH_MAC_PATH, + 1, 1, ®8); + reg8 = 0x0; + aqc111_write_cmd(dev, AQ_ACCESS_MAC, SFR_BMRX_DMA_CONTROL, 1, 1, ®8); + + return usbnet_resume(intf); +} + #define AQC111_USB_ETH_DEV(vid, pid, table) \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \ USB_DEVICE_ID_MATCH_INT_CLASS, \ @@ -1371,6 +1572,8 @@ static struct usb_driver aq_driver = { .name = "aqc111", .id_table = products, .probe = usbnet_probe, + .suspend = aqc111_suspend, + .resume = aqc111_resume, .disconnect = usbnet_disconnect, }; diff --git a/drivers/net/usb/aqc111.h b/drivers/net/usb/aqc111.h index a7ccee225e93..9a900c325273 100644 --- a/drivers/net/usb/aqc111.h +++ b/drivers/net/usb/aqc111.h @@ -19,6 +19,7 @@ #define AQ_FLASH_PARAMETERS 0x20 #define AQ_PHY_POWER 0x31 #define AQ_PHY_CMD 0x32 +#define AQ_WOL_CFG 0x60 #define AQ_PHY_OPS 0x61 #define AQC111_PHY_ID 0x00 @@ -169,6 +170,7 @@ #define AQ_FW_VER_MINOR 0xDB #define AQ_FW_VER_REV 0xDC +#define AQ_WOL_FLAG_MP 0x2 /******************************************************************************/ struct aqc111_phy_options { @@ -214,6 +216,14 @@ struct aqc111_phy_options { }; }; +struct aqc111_wol_cfg { + u8 hw_addr[6]; + u8 flags; + u8 rsvd[283]; +}; + +#define WOL_CFG_SIZE sizeof(struct aqc111_wol_cfg) + struct aqc111_data { u16 rxctl; u8 rx_checksum; @@ -228,6 +238,7 @@ struct aqc111_data { } fw_ver; u8 dpa; /*direct PHY access*/ struct aqc111_phy_options phy_ops; + struct aqc111_wol_cfg wol_cfg; } __packed; struct aqc111_int_data {
next prev parent reply other threads:[~2018-10-05 17:23 UTC|newest] Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-05 10:24 [PATCH net-next 00/19] Add support for Aquantia AQtion USB to 5/2.5GbE devices Igor Russkikh 2018-10-05 10:24 ` [PATCH net-next 01/19] net: usb: aqc111: Driver skeleton for Aquantia AQtion USB to 5GbE Igor Russkikh 2018-10-05 10:24 ` [net-next,01/19] " Igor Russkikh 2018-10-09 13:37 ` [PATCH net-next 01/19] " Bjørn Mork 2018-10-09 13:37 ` [net-next,01/19] " Bjørn Mork 2018-10-05 10:24 ` [PATCH net-next 02/19] net: usb: aqc111: Add bind and empty unbind callbacks Igor Russkikh 2018-10-05 10:24 ` [net-next,02/19] " Igor Russkikh 2018-10-05 17:39 ` [PATCH net-next 02/19] " David Miller 2018-10-05 17:39 ` [net-next,02/19] " David Miller 2018-10-05 10:24 ` [PATCH net-next 03/19] net: usb: aqc111: Add implementation of read and write commands Igor Russkikh 2018-10-05 10:24 ` [net-next,03/19] " Igor Russkikh 2018-10-05 17:40 ` [PATCH net-next 03/19] " David Miller 2018-10-05 17:40 ` [net-next,03/19] " David Miller 2018-10-08 13:44 ` [PATCH net-next 03/19] " Oliver Neukum 2018-10-08 13:44 ` [net-next,03/19] " Oliver Neukum 2018-10-09 13:33 ` [PATCH net-next 03/19] " Bjørn Mork 2018-10-09 13:33 ` [net-next,03/19] " Bjørn Mork 2018-10-05 10:24 ` [PATCH net-next 04/19] net: usb: aqc111: Various callbacks implementation Igor Russkikh 2018-10-05 10:24 ` [net-next,04/19] " Igor Russkikh 2018-10-08 13:47 ` [PATCH net-next 04/19] " Oliver Neukum 2018-10-08 13:47 ` [net-next,04/19] " Oliver Neukum 2018-10-09 13:27 ` [PATCH net-next 04/19] " Bjørn Mork 2018-10-09 13:27 ` [net-next,04/19] " Bjørn Mork 2018-10-10 11:33 ` [PATCH net-next 04/19] " Oliver Neukum 2018-10-10 11:33 ` [net-next,04/19] " Oliver Neukum 2018-10-05 10:24 ` [PATCH net-next 05/19] net: usb: aqc111: Introduce PHY access Igor Russkikh 2018-10-05 10:24 ` [net-next,05/19] " Igor Russkikh 2018-10-05 22:04 ` [PATCH net-next 05/19] " Andrew Lunn 2018-10-05 22:04 ` [net-next,05/19] " Andrew Lunn 2018-10-08 9:09 ` [PATCH net-next 05/19] " Igor Russkikh 2018-10-08 9:09 ` [net-next,05/19] " Igor Russkikh 2018-10-08 12:17 ` [PATCH net-next 05/19] " Andrew Lunn 2018-10-08 12:17 ` [net-next,05/19] " Andrew Lunn 2018-10-08 14:07 ` [PATCH net-next 05/19] " Igor Russkikh 2018-10-08 14:07 ` [net-next,05/19] " Igor Russkikh 2018-10-10 0:58 ` [PATCH net-next 05/19] " Andrew Lunn 2018-10-10 0:58 ` [net-next,05/19] " Andrew Lunn 2018-10-10 7:54 ` [PATCH net-next 05/19] " Igor Russkikh 2018-10-10 7:54 ` [net-next,05/19] " Igor Russkikh 2018-10-08 13:52 ` [PATCH net-next 05/19] " Oliver Neukum 2018-10-08 13:52 ` [net-next,05/19] " Oliver Neukum 2018-10-08 14:10 ` [PATCH net-next 05/19] " Igor Russkikh 2018-10-08 14:10 ` [net-next,05/19] " Igor Russkikh 2018-10-08 14:24 ` [PATCH net-next 05/19] " Oliver Neukum 2018-10-08 14:24 ` [net-next,05/19] " Oliver Neukum 2018-10-05 10:24 ` [PATCH net-next 06/19] net: usb: aqc111: Introduce link management Igor Russkikh 2018-10-05 10:24 ` [net-next,06/19] " Igor Russkikh 2018-10-05 17:11 ` [PATCH net-next 06/19] " Andrew Lunn 2018-10-05 17:11 ` [net-next,06/19] " Andrew Lunn 2018-10-08 13:22 ` [PATCH net-next 06/19] " Igor Russkikh 2018-10-08 13:22 ` [net-next,06/19] " Igor Russkikh 2018-10-05 17:46 ` [PATCH net-next 06/19] " David Miller 2018-10-05 17:46 ` [net-next,06/19] " David Miller 2018-10-06 17:35 ` [PATCH net-next 06/19] " Andrew Lunn 2018-10-06 17:35 ` [net-next,06/19] " Andrew Lunn 2018-10-08 9:29 ` [PATCH net-next 06/19] " Igor Russkikh 2018-10-08 9:29 ` [net-next,06/19] " Igor Russkikh 2018-10-08 12:12 ` [PATCH net-next 06/19] " Andrew Lunn 2018-10-08 12:12 ` [net-next,06/19] " Andrew Lunn 2018-10-08 13:59 ` [PATCH net-next 06/19] " Oliver Neukum 2018-10-08 13:59 ` [net-next,06/19] " Oliver Neukum 2018-10-05 10:24 ` [PATCH net-next 07/19] net: usb: aqc111: Add support for getting and setting of MAC address Igor Russkikh 2018-10-05 10:24 ` [net-next,07/19] " Igor Russkikh 2018-10-06 1:03 ` [PATCH net-next 07/19] " Andrew Lunn 2018-10-06 1:03 ` [net-next,07/19] " Andrew Lunn 2018-10-09 14:34 ` [PATCH net-next 07/19] " Igor Russkikh 2018-10-09 14:34 ` [net-next,07/19] " Igor Russkikh 2018-10-09 14:46 ` [PATCH net-next 07/19] " Andrew Lunn 2018-10-09 14:46 ` [net-next,07/19] " Andrew Lunn 2018-10-05 10:25 ` [PATCH net-next 08/19] net: usb: aqc111: Implement TX data path Igor Russkikh 2018-10-05 10:25 ` [net-next,08/19] " Igor Russkikh 2018-10-06 1:13 ` [PATCH net-next 08/19] " Andrew Lunn 2018-10-06 1:13 ` [net-next,08/19] " Andrew Lunn 2018-10-08 13:43 ` [PATCH net-next 08/19] " Igor Russkikh 2018-10-08 13:43 ` [net-next,08/19] " Igor Russkikh 2018-10-08 14:07 ` [PATCH net-next 08/19] " Oliver Neukum 2018-10-08 14:07 ` [net-next,08/19] " Oliver Neukum 2018-10-09 13:50 ` [PATCH net-next 08/19] " Bjørn Mork 2018-10-09 13:50 ` [net-next,08/19] " Bjørn Mork 2018-10-05 10:25 ` [PATCH net-next 09/19] net: usb: aqc111: Implement RX " Igor Russkikh 2018-10-05 10:25 ` [net-next,09/19] " Igor Russkikh 2018-10-06 1:18 ` [PATCH net-next 09/19] " Andrew Lunn 2018-10-06 1:18 ` [net-next,09/19] " Andrew Lunn 2018-10-09 13:39 ` [PATCH net-next 09/19] " Bjørn Mork 2018-10-09 13:39 ` [net-next,09/19] " Bjørn Mork 2018-10-05 10:25 ` [PATCH net-next 10/19] net: usb: aqc111: Add checksum offload support Igor Russkikh 2018-10-05 10:25 ` [net-next,10/19] " Igor Russkikh 2018-10-05 10:25 ` [PATCH net-next 11/19] net: usb: aqc111: Add support for changing MTU Igor Russkikh 2018-10-05 10:25 ` [net-next,11/19] " Igor Russkikh 2018-10-06 16:56 ` [PATCH net-next 11/19] " Andrew Lunn 2018-10-06 16:56 ` [net-next,11/19] " Andrew Lunn 2018-10-05 10:25 ` [PATCH net-next 12/19] net: usb: aqc111: Add support for enable/disable checksum offload Igor Russkikh 2018-10-05 10:25 ` [net-next,12/19] " Igor Russkikh 2018-10-05 10:25 ` [PATCH net-next 13/19] net: usb: aqc111: Add support for TSO Igor Russkikh 2018-10-05 10:25 ` [net-next,13/19] " Igor Russkikh 2018-10-08 14:12 ` [PATCH net-next 13/19] " Oliver Neukum 2018-10-08 14:12 ` [net-next,13/19] " Oliver Neukum 2018-10-05 10:25 ` [PATCH net-next 14/19] net: usb: aqc111: Implement set_rx_mode callback Igor Russkikh 2018-10-05 10:25 ` [net-next,14/19] " Igor Russkikh 2018-10-06 17:03 ` [PATCH net-next 14/19] " Andrew Lunn 2018-10-06 17:03 ` [net-next,14/19] " Andrew Lunn 2018-10-08 13:49 ` [PATCH net-next 14/19] " Igor Russkikh 2018-10-08 13:49 ` [net-next,14/19] " Igor Russkikh 2018-10-05 10:25 ` [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Igor Russkikh 2018-10-05 10:25 ` [net-next,15/19] " Igor Russkikh 2018-10-08 14:14 ` [PATCH net-next 15/19] " Oliver Neukum 2018-10-08 14:14 ` [net-next,15/19] " Oliver Neukum 2018-10-05 10:25 ` [PATCH net-next 16/19] net: usb: aqc111: Add RX VLAN filtering support Igor Russkikh 2018-10-05 10:25 ` [net-next,16/19] " Igor Russkikh 2018-10-06 17:05 ` [PATCH net-next 16/19] " Andrew Lunn 2018-10-06 17:05 ` [net-next,16/19] " Andrew Lunn 2018-10-05 10:25 ` [PATCH net-next 17/19] net: usb: aqc111: Initialize ethtool_ops structure Igor Russkikh 2018-10-05 10:25 ` [net-next,17/19] " Igor Russkikh 2018-10-06 17:08 ` [PATCH net-next 17/19] " Andrew Lunn 2018-10-06 17:08 ` [net-next,17/19] " Andrew Lunn 2018-10-05 10:25 ` [PATCH net-next 18/19] net: usb: aqc111: Implement get/set_link_ksettings callbacks Igor Russkikh 2018-10-05 10:25 ` [net-next,18/19] " Igor Russkikh 2018-10-06 17:38 ` [PATCH net-next 18/19] " Andrew Lunn 2018-10-06 17:38 ` [net-next,18/19] " Andrew Lunn 2018-10-08 14:18 ` [PATCH net-next 18/19] " Oliver Neukum 2018-10-08 14:18 ` [net-next,18/19] " Oliver Neukum 2018-10-05 10:25 ` Igor Russkikh [this message] 2018-10-05 10:25 ` [net-next,19/19] net: usb: aqc111: Add support for wake on LAN by MAGIC packet Igor Russkikh 2018-10-06 17:49 ` [PATCH net-next 19/19] " Andrew Lunn 2018-10-06 17:49 ` [net-next,19/19] " Andrew Lunn 2018-10-08 14:12 ` [PATCH net-next 19/19] " Igor Russkikh 2018-10-08 14:12 ` [net-next,19/19] " Igor Russkikh 2018-10-08 14:47 ` [PATCH net-next 19/19] " Andrew Lunn 2018-10-08 14:47 ` [net-next,19/19] " Andrew Lunn 2018-10-06 17:51 ` [PATCH net-next 00/19] Add support for Aquantia AQtion USB to 5/2.5GbE devices Andrew Lunn 2018-10-08 7:58 ` Igor Russkikh 2018-10-08 14:21 ` Oliver Neukum 2018-10-08 14:52 ` Igor Russkikh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1a7d4af1b3a6397b76338d543f86bb4c327f5060.1538734658.git.igor.russkikh@aquantia.com \ --to=igor.russkikh@aquantia.com \ --cc=Dmitry.Bezrukov@aquantia.com \ --cc=davem@davemloft.net \ --cc=linux-usb@vger.kernel.org \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.