lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 May 2011 18:34:07 -0700 From: Mahesh Bandewar <maheshb@...gle.com> To: Matt Carlson <mcarlson@...adcom.com>, David Miller <davem@...emloft.net> Cc: netdev <netdev@...r.kernel.org>, Michael Chan <mchan@...adcom.com>, Tom Herbert <therbert@...gle.com>, Mahesh Bandewar <maheshb@...gle.com> Subject: [PATCHv4 2/2] tg3: Allow ethtool to enable/disable loopback. This patch adds tg3_set_features() to handle loopback mode. Currently the capability is added for the devices which support internal MAC loopback mode. So when enabled, it enables internal-MAC loopback. Signed-off-by: Mahesh Bandewar <maheshb@...gle.com> --- Changes since v3: (a) Corrected the condition (|| => &&) where loopback capability is added. (b) set_features() always returns 0. (c) Clear the loopback bit in ndo_open callback to avoid discrepancy. Changes since v2: Implemtned Joe Perches's style change. Changes since v1: Implemented Matt Carlson's suggestions. (a) Enable this capability on the devices which are capable of MAC-loopback mode. (b) check if the device is running before making changes. (c) check bits before making changes. drivers/net/tg3.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 7c7c9a8..7f7a290 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -6309,6 +6309,44 @@ dma_error: return NETDEV_TX_OK; } +static int tg3_set_loopback(struct net_device *dev, u32 features) +{ + struct tg3 *tp = netdev_priv(dev); + u32 cur_mode = 0; + int retval = 0; + + spin_lock_bh(&tp->lock); + cur_mode = tr32(MAC_MODE); + if (features & NETIF_F_LOOPBACK) { + if (cur_mode & MAC_MODE_PORT_INT_LPBACK) + goto sfeatures_unlock; + + /* + * Clear MAC_MODE_HALF_DUPLEX or you won't get packets back in + * loopback mode if Half-Duplex mode was negotiated earlier. + */ + cur_mode &= ~MAC_MODE_HALF_DUPLEX; + + /* Enable internal MAC loopback mode */ + tw32(MAC_MODE, cur_mode | MAC_MODE_PORT_INT_LPBACK); + netif_carrier_on(tp->dev); + netdev_info(dev, "Internal MAC loopback mode enabled.\n"); + } else { + if (!(cur_mode & MAC_MODE_PORT_INT_LPBACK)) + goto sfeatures_unlock; + + /* Disable internal MAC loopback mode */ + tw32(MAC_MODE, cur_mode & ~MAC_MODE_PORT_INT_LPBACK); + /* Force link status check */ + tg3_setup_phy(tp, 1); + netdev_info(dev, "Internal MAC loopback mode disabled.\n"); + } + +sfeatures_unlock: + spin_unlock_bh(&tp->lock); + return retval; +} + static u32 tg3_fix_features(struct net_device *dev, u32 features) { struct tg3 *tp = netdev_priv(dev); @@ -6319,6 +6357,16 @@ static u32 tg3_fix_features(struct net_device *dev, u32 features) return features; } +static int tg3_set_features(struct net_device *dev, u32 features) +{ + u32 changed = dev->features ^ features; + + if ((changed & NETIF_F_LOOPBACK) && netif_running(dev)) + tg3_set_loopback(dev, features); + + return 0; +} + static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp, int new_mtu) { @@ -9485,6 +9533,15 @@ static int tg3_open(struct net_device *dev) netif_tx_start_all_queues(dev); + /* + * Reset loopback feature if it was turned on while the device was down + * to avoid and any discrepancy in features reporting. + */ + if (dev->features & NETIF_F_LOOPBACK) { + dev->features &= ~NETIF_F_LOOPBACK; + dev->wanted_features &= ~NETIF_F_LOOPBACK; + } + return 0; err_out3: @@ -15029,6 +15086,7 @@ static const struct net_device_ops tg3_netdev_ops = { .ndo_tx_timeout = tg3_tx_timeout, .ndo_change_mtu = tg3_change_mtu, .ndo_fix_features = tg3_fix_features, + .ndo_set_features = tg3_set_features, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = tg3_poll_controller, #endif @@ -15045,6 +15103,7 @@ static const struct net_device_ops tg3_netdev_ops_dma_bug = { .ndo_do_ioctl = tg3_ioctl, .ndo_tx_timeout = tg3_tx_timeout, .ndo_change_mtu = tg3_change_mtu, + .ndo_set_features = tg3_set_features, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = tg3_poll_controller, #endif @@ -15242,6 +15301,16 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, dev->features |= hw_features; dev->vlan_features |= hw_features; + /* + * Add loopback capability only for a subset of devices that support + * MAC-LOOPBACK. Eventually this need to be enhanced to allow INT-PHY + * loopback for the remaining devices. + */ + if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5780 && + !tg3_flag(tp, CPMU_PRESENT)) + /* Add the loopback capability */ + dev->hw_features |= NETIF_F_LOOPBACK; + if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 && !tg3_flag(tp, TSO_CAPABLE) && !(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH)) { -- 1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists