Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (7ef52737) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/bnx2.c

+27 −21

Original line number	Diff line number	Diff line
		@@ -58,8 +58,8 @@
		#include "bnx2_fw.h"

		#define DRV_MODULE_NAME "bnx2"
		#define DRV_MODULE_VERSION "2.0.8"
		#define DRV_MODULE_RELDATE "Feb 15, 2010"
		#define DRV_MODULE_VERSION "2.0.9"
		#define DRV_MODULE_RELDATE "April 27, 2010"
		#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-5.0.0.j6.fw"
		#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-5.0.0.j3.fw"
		#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-5.0.0.j9.fw"
		@@ -651,8 +651,9 @@ bnx2_napi_enable(struct bnx2 *bp)
		}

		static void
		bnx2_netif_stop(struct bnx2 *bp)
		bnx2_netif_stop(struct bnx2 *bp, bool stop_cnic)
		{
		if (stop_cnic)
		bnx2_cnic_stop(bp);
		if (netif_running(bp->dev)) {
		int i;
		@@ -671,13 +672,14 @@ bnx2_netif_stop(struct bnx2 *bp)
		}

		static void
		bnx2_netif_start(struct bnx2 *bp)
		bnx2_netif_start(struct bnx2 *bp, bool start_cnic)
		{
		if (atomic_dec_and_test(&bp->intr_sem)) {
		if (netif_running(bp->dev)) {
		netif_tx_wake_all_queues(bp->dev);
		bnx2_napi_enable(bp);
		bnx2_enable_int(bp);
		if (start_cnic)
		bnx2_cnic_start(bp);
		}
		}
		@@ -4758,8 +4760,12 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
		rc = bnx2_alloc_bad_rbuf(bp);
		}

		if (bp->flags & BNX2_FLAG_USING_MSIX)
		if (bp->flags & BNX2_FLAG_USING_MSIX) {
		bnx2_setup_msix_tbl(bp);
		/* Prevent MSIX table reads and write from timing out */
		REG_WR(bp, BNX2_MISC_ECO_HW_CTL,
		BNX2_MISC_ECO_HW_CTL_LARGE_GRC_TMOUT_EN);
		}

		return rc;
		}
		@@ -6272,12 +6278,12 @@ bnx2_reset_task(struct work_struct *work)
		return;
		}

		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);

		bnx2_init_nic(bp, 1);

		atomic_set(&bp->intr_sem, 1);
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);
		rtnl_unlock();
		}

		@@ -6319,7 +6325,7 @@ bnx2_vlan_rx_register(struct net_device dev, struct vlan_group vlgrp)
		struct bnx2 *bp = netdev_priv(dev);

		if (netif_running(dev))
		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, false);

		bp->vlgrp = vlgrp;

		@@ -6330,7 +6336,7 @@ bnx2_vlan_rx_register(struct net_device dev, struct vlan_group vlgrp)
		if (bp->flags & BNX2_FLAG_CAN_KEEP_VLAN)
		bnx2_fw_sync(bp, BNX2_DRV_MSG_CODE_KEEP_VLAN_UPDATE, 0, 1);

		bnx2_netif_start(bp);
		bnx2_netif_start(bp, false);
		}
		#endif

		@@ -7050,9 +7056,9 @@ bnx2_set_coalesce(struct net_device dev, struct ethtool_coalesce coal)
		bp->stats_ticks &= BNX2_HC_STATS_TICKS_HC_STAT_TICKS;

		if (netif_running(bp->dev)) {
		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);
		bnx2_init_nic(bp, 0);
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);
		}

		return 0;
		@@ -7082,7 +7088,7 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
		/* Reset will erase chipset stats; save them */
		bnx2_save_stats(bp);

		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);
		bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
		bnx2_free_skbs(bp);
		bnx2_free_mem(bp);
		@@ -7110,7 +7116,7 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
		bnx2_setup_cnic_irq_info(bp);
		mutex_unlock(&bp->cnic_lock);
		#endif
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);
		}
		return 0;
		}
		@@ -7363,7 +7369,7 @@ bnx2_self_test(struct net_device dev, struct ethtool_test etest, u64 *buf)
		if (etest->flags & ETH_TEST_FL_OFFLINE) {
		int i;

		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);
		bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_DIAG);
		bnx2_free_skbs(bp);

		@@ -7382,7 +7388,7 @@ bnx2_self_test(struct net_device dev, struct ethtool_test etest, u64 *buf)
		bnx2_shutdown_chip(bp);
		else {
		bnx2_init_nic(bp, 1);
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);
		}

		/* wait for link up */
		@@ -8376,7 +8382,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
		return 0;

		flush_scheduled_work();
		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);
		netif_device_detach(dev);
		del_timer_sync(&bp->timer);
		bnx2_shutdown_chip(bp);
		@@ -8398,7 +8404,7 @@ bnx2_resume(struct pci_dev *pdev)
		bnx2_set_power_state(bp, PCI_D0);
		netif_device_attach(dev);
		bnx2_init_nic(bp, 1);
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);
		return 0;
		}

		@@ -8425,7 +8431,7 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev,
		}

		if (netif_running(dev)) {
		bnx2_netif_stop(bp);
		bnx2_netif_stop(bp, true);
		del_timer_sync(&bp->timer);
		bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET);
		}
		@@ -8482,7 +8488,7 @@ static void bnx2_io_resume(struct pci_dev *pdev)

		rtnl_lock();
		if (netif_running(dev))
		bnx2_netif_start(bp);
		bnx2_netif_start(bp, true);

		netif_device_attach(dev);
		rtnl_unlock();

drivers/net/e1000e/netdev.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -5020,6 +5020,9 @@ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
		reg16 &= ~state;
		pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);

		if (!pdev->bus->self)
		return;

		pos = pci_pcie_cap(pdev->bus->self);
		pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);
		reg16 &= ~state;

drivers/net/gianfar.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1567,9 +1567,9 @@ static void gfar_halt_nodisable(struct net_device *dev)
		tempval \|= (DMACTRL_GRS \| DMACTRL_GTS);
		gfar_write(&regs->dmactrl, tempval);

		while (!(gfar_read(&regs->ievent) &
		(IEVENT_GRSC \| IEVENT_GTSC)))
		cpu_relax();
		spin_event_timeout(((gfar_read(&regs->ievent) &
		(IEVENT_GRSC \| IEVENT_GTSC)) ==
		(IEVENT_GRSC \| IEVENT_GTSC)), -1, 0);
		}
		}

drivers/net/pcmcia/smc91c92_cs.c

+21 −10

Original line number	Diff line number	Diff line
		@@ -1804,23 +1804,30 @@ static void media_check(u_long arg)
		SMC_SELECT_BANK(1);
		media \|= (inw(ioaddr + CONFIG) & CFG_AUI_SELECT) ? 2 : 1;

		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irqrestore(&smc->lock, flags);

		/* Check for pending interrupt with watchdog flag set: with
		this, we can limp along even if the interrupt is blocked */
		if (smc->watchdog++ && ((i>>8) & i)) {
		if (!smc->fast_poll)
		printk(KERN_INFO "%s: interrupt(s) dropped!\n", dev->name);
		local_irq_save(flags);
		smc_interrupt(dev->irq, dev);
		local_irq_restore(flags);
		smc->fast_poll = HZ;
		}
		if (smc->fast_poll) {
		smc->fast_poll--;
		smc->media.expires = jiffies + HZ/100;
		add_timer(&smc->media);
		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irqrestore(&smc->lock, flags);
		return;
		}

		spin_lock_irqsave(&smc->lock, flags);

		saved_bank = inw(ioaddr + BANK_SELECT);

		if (smc->cfg & CFG_MII_SELECT) {
		if (smc->mii_if.phy_id < 0)
		goto reschedule;
		@@ -1978,15 +1985,16 @@ static int smc_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
		unsigned int ioaddr = dev->base_addr;
		u16 saved_bank = inw(ioaddr + BANK_SELECT);
		int ret;
		unsigned long flags;

		spin_lock_irq(&smc->lock);
		spin_lock_irqsave(&smc->lock, flags);
		SMC_SELECT_BANK(3);
		if (smc->cfg & CFG_MII_SELECT)
		ret = mii_ethtool_gset(&smc->mii_if, ecmd);
		else
		ret = smc_netdev_get_ecmd(dev, ecmd);
		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irq(&smc->lock);
		spin_unlock_irqrestore(&smc->lock, flags);
		return ret;
		}

		@@ -1996,15 +2004,16 @@ static int smc_set_settings(struct net_device dev, struct ethtool_cmd ecmd)
		unsigned int ioaddr = dev->base_addr;
		u16 saved_bank = inw(ioaddr + BANK_SELECT);
		int ret;
		unsigned long flags;

		spin_lock_irq(&smc->lock);
		spin_lock_irqsave(&smc->lock, flags);
		SMC_SELECT_BANK(3);
		if (smc->cfg & CFG_MII_SELECT)
		ret = mii_ethtool_sset(&smc->mii_if, ecmd);
		else
		ret = smc_netdev_set_ecmd(dev, ecmd);
		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irq(&smc->lock);
		spin_unlock_irqrestore(&smc->lock, flags);
		return ret;
		}

		@@ -2014,12 +2023,13 @@ static u32 smc_get_link(struct net_device *dev)
		unsigned int ioaddr = dev->base_addr;
		u16 saved_bank = inw(ioaddr + BANK_SELECT);
		u32 ret;
		unsigned long flags;

		spin_lock_irq(&smc->lock);
		spin_lock_irqsave(&smc->lock, flags);
		SMC_SELECT_BANK(3);
		ret = smc_link_ok(dev);
		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irq(&smc->lock);
		spin_unlock_irqrestore(&smc->lock, flags);
		return ret;
		}

		@@ -2056,16 +2066,17 @@ static int smc_ioctl (struct net_device dev, struct ifreq rq, int cmd)
		int rc = 0;
		u16 saved_bank;
		unsigned int ioaddr = dev->base_addr;
		unsigned long flags;

		if (!netif_running(dev))
		return -EINVAL;

		spin_lock_irq(&smc->lock);
		spin_lock_irqsave(&smc->lock, flags);
		saved_bank = inw(ioaddr + BANK_SELECT);
		SMC_SELECT_BANK(3);
		rc = generic_mii_ioctl(&smc->mii_if, mii, cmd, NULL);
		SMC_SELECT_BANK(saved_bank);
		spin_unlock_irq(&smc->lock);
		spin_unlock_irqrestore(&smc->lock, flags);
		return rc;
		}

drivers/net/sb1250-mac.c

+33 −34

Original line number	Diff line number	Diff line
		@@ -2256,17 +2256,36 @@ static int sbmac_init(struct platform_device *pldev, long long base)

		sc->mii_bus = mdiobus_alloc();
		if (sc->mii_bus == NULL) {
		sbmac_uninitctx(sc);
		return -ENOMEM;
		err = -ENOMEM;
		goto uninit_ctx;
		}

		sc->mii_bus->name = sbmac_mdio_string;
		snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
		sc->mii_bus->priv = sc;
		sc->mii_bus->read = sbmac_mii_read;
		sc->mii_bus->write = sbmac_mii_write;
		sc->mii_bus->irq = sc->phy_irq;
		for (i = 0; i < PHY_MAX_ADDR; ++i)
		sc->mii_bus->irq[i] = SBMAC_PHY_INT;

		sc->mii_bus->parent = &pldev->dev;
		/*
		* Probe PHY address
		*/
		err = mdiobus_register(sc->mii_bus);
		if (err) {
		printk(KERN_ERR "%s: unable to register MDIO bus\n",
		dev->name);
		goto free_mdio;
		}
		dev_set_drvdata(&pldev->dev, sc->mii_bus);

		err = register_netdev(dev);
		if (err) {
		printk(KERN_ERR "%s.%d: unable to register netdev\n",
		sbmac_string, idx);
		mdiobus_free(sc->mii_bus);
		sbmac_uninitctx(sc);
		return err;
		goto unreg_mdio;
		}

		pr_info("%s.%d: registered as %s\n", sbmac_string, idx, dev->name);
		@@ -2282,19 +2301,15 @@ static int sbmac_init(struct platform_device *pldev, long long base)
		pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n",
		dev->name, base, eaddr);

		sc->mii_bus->name = sbmac_mdio_string;
		snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
		sc->mii_bus->priv = sc;
		sc->mii_bus->read = sbmac_mii_read;
		sc->mii_bus->write = sbmac_mii_write;
		sc->mii_bus->irq = sc->phy_irq;
		for (i = 0; i < PHY_MAX_ADDR; ++i)
		sc->mii_bus->irq[i] = SBMAC_PHY_INT;

		sc->mii_bus->parent = &pldev->dev;
		dev_set_drvdata(&pldev->dev, sc->mii_bus);

		return 0;
		unreg_mdio:
		mdiobus_unregister(sc->mii_bus);
		dev_set_drvdata(&pldev->dev, NULL);
		free_mdio:
		mdiobus_free(sc->mii_bus);
		uninit_ctx:
		sbmac_uninitctx(sc);
		return err;
		}


		@@ -2320,16 +2335,6 @@ static int sbmac_open(struct net_device *dev)
		goto out_err;
		}

		/*
		* Probe PHY address
		*/
		err = mdiobus_register(sc->mii_bus);
		if (err) {
		printk(KERN_ERR "%s: unable to register MDIO bus\n",
		dev->name);
		goto out_unirq;
		}

		sc->sbm_speed = sbmac_speed_none;
		sc->sbm_duplex = sbmac_duplex_none;
		sc->sbm_fc = sbmac_fc_none;
		@@ -2360,11 +2365,7 @@ static int sbmac_open(struct net_device *dev)
		return 0;

		out_unregister:
		mdiobus_unregister(sc->mii_bus);

		out_unirq:
		free_irq(dev->irq, dev);

		out_err:
		return err;
		}
		@@ -2553,9 +2554,6 @@ static int sbmac_close(struct net_device *dev)

		phy_disconnect(sc->phy_dev);
		sc->phy_dev = NULL;

		mdiobus_unregister(sc->mii_bus);

		free_irq(dev->irq, dev);

		sbdma_emptyring(&(sc->sbm_txdma));
		@@ -2662,6 +2660,7 @@ static int __exit sbmac_remove(struct platform_device *pldev)

		unregister_netdev(dev);
		sbmac_uninitctx(sc);
		mdiobus_unregister(sc->mii_bus);
		mdiobus_free(sc->mii_bus);
		iounmap(sc->sbm_base);
		free_netdev(dev);