Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (d83b14c0) · Commits · 戴 / test

drivers/atm/he.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1542,6 +1542,7 @@ he_start(struct atm_dev *dev)
		/* initialize framer */

		#ifdef CONFIG_ATM_HE_USE_SUNI
		if (he_isMM(he_dev))
		suni_init(he_dev->atm_dev);
		if (he_dev->atm_dev->phy && he_dev->atm_dev->phy->start)
		he_dev->atm_dev->phy->start(he_dev->atm_dev);
		@@ -1554,6 +1555,7 @@ he_start(struct atm_dev *dev)
		val = he_phy_get(he_dev->atm_dev, SUNI_TPOP_APM);
		val = (val & ~SUNI_TPOP_APM_S) \| (SUNI_TPOP_S_SDH << SUNI_TPOP_APM_S_SHIFT);
		he_phy_put(he_dev->atm_dev, val, SUNI_TPOP_APM);
		he_phy_put(he_dev->atm_dev, SUNI_TACP_IUCHP_CLP, SUNI_TACP_IUCHP);
		}

		/* 5.1.12 enable transmit and receive */
		@@ -2848,6 +2850,11 @@ he_ioctl(struct atm_dev atm_dev, unsigned int cmd, void __user arg)
		spin_lock_irqsave(&he_dev->global_lock, flags);
		switch (reg.type) {
		case HE_REGTYPE_PCI:
		if (reg.addr < 0 \|\| reg.addr >= HE_REGMAP_SIZE) {
		err = -EINVAL;
		break;
		}

		reg.val = he_readl(he_dev, reg.addr);
		break;
		case HE_REGTYPE_RCM:

drivers/atm/he.h

+4 −9

Original line number	Diff line number	Diff line
		@@ -267,13 +267,7 @@ struct he_dev {

		char prod_id[30];
		char mac_addr[6];
		int media; /*
		* 0x26 = HE155 MM
		* 0x27 = HE622 MM
		* 0x46 = HE155 SM
		* 0x47 = HE622 SM
		*/

		int media;

		unsigned int vcibits, vpibits;
		unsigned int cells_per_row;
		@@ -392,6 +386,7 @@ struct he_vcc
		#define HE_DEV(dev) ((struct he_dev *) (dev)->dev_data)

		#define he_is622(dev) ((dev)->media & 0x1)
		#define he_isMM(dev) ((dev)->media & 0x20)

		#define HE_REGMAP_SIZE 0x100000

		@@ -876,8 +871,8 @@ struct he_vcc
		#define M_SN 0x3a /* integer */
		#define MEDIA 0x3e /* integer */
		#define HE155MM 0x26
		#define HE155SM 0x27
		#define HE622MM 0x46
		#define HE622MM 0x27
		#define HE155SM 0x46
		#define HE622SM 0x47
		#define MAC_ADDR 0x42 /* char[] */

drivers/atm/iphase.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -2562,17 +2562,11 @@ static int __devinit ia_start(struct atm_dev *dev)
		error = suni_init(dev);
		if (error)
		goto err_free_rx;
		/*
		* Enable interrupt on loss of signal
		* SUNI_RSOP_CIE - 0x10
		* SUNI_RSOP_CIE_LOSE - 0x04
		*/
		ia_phy_put(dev, ia_phy_get(dev, 0x10) \| 0x04, 0x10);
		#ifndef MODULE
		if (dev->phy->start) {
		error = dev->phy->start(dev);
		if (error)
		goto err_free_rx;
		#endif
		}
		/* Get iadev->carrier_detect status */
		IaFrontEndIntr(iadev);
		}
		@@ -3198,6 +3192,8 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
		IF_INIT(printk("dev_id = 0x%x iadev->LineRate = %d \n", (u32)dev,
		iadev->LineRate);)

		pci_set_drvdata(pdev, dev);

		ia_dev[iadev_count] = iadev;
		_ia_dev[iadev_count] = dev;
		iadev_count++;
		@@ -3219,8 +3215,6 @@ static int __devinit ia_init_one(struct pci_dev *pdev,
		iadev->next_board = ia_boards;
		ia_boards = dev;

		pci_set_drvdata(pdev, dev);

		return 0;

		err_out_deregister_dev:
		@@ -3238,9 +3232,14 @@ static void __devexit ia_remove_one(struct pci_dev *pdev)
		struct atm_dev *dev = pci_get_drvdata(pdev);
		IADEV *iadev = INPH_IA_DEV(dev);

		ia_phy_put(dev, ia_phy_get(dev,0x10) & ~(0x4), 0x10);
		/* Disable phy interrupts */
		ia_phy_put(dev, ia_phy_get(dev, SUNI_RSOP_CIE) & ~(SUNI_RSOP_CIE_LOSE),
		SUNI_RSOP_CIE);
		udelay(1);

		if (dev->phy && dev->phy->stop)
		dev->phy->stop(dev);

		/* De-register device */
		free_irq(iadev->irq, dev);
		iadev_count--;

drivers/net/atlx/atl1.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -471,7 +471,6 @@ static int atl1_get_permanent_address(struct atl1_hw *hw)
		memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
		return 0;
		}
		return 1;
		}

		/* see if SPI FLAGS exist ? */

drivers/net/enc28j60.c

+60 −27

Original line number	Diff line number	Diff line
		@@ -400,26 +400,31 @@ enc28j60_packet_write(struct enc28j60_net priv, int len, const u8 data)
		mutex_unlock(&priv->lock);
		}

		/*
		* Wait until the PHY operation is complete.
		*/
		static int wait_phy_ready(struct enc28j60_net *priv)
		static unsigned long msec20_to_jiffies;

		static int poll_ready(struct enc28j60_net *priv, u8 reg, u8 mask, u8 val)
		{
		unsigned long timeout = jiffies + 20 * HZ / 1000;
		int ret = 1;
		unsigned long timeout = jiffies + msec20_to_jiffies;

		/* 20 msec timeout read */
		while (nolock_regb_read(priv, MISTAT) & MISTAT_BUSY) {
		while ((nolock_regb_read(priv, reg) & mask) != val) {
		if (time_after(jiffies, timeout)) {
		if (netif_msg_drv(priv))
		printk(KERN_DEBUG DRV_NAME
		": PHY ready timeout!\n");
		ret = 0;
		break;
		dev_dbg(&priv->spi->dev,
		"reg %02x ready timeout!\n", reg);
		return -ETIMEDOUT;
		}
		cpu_relax();
		}
		return ret;
		return 0;
		}

		/*
		* Wait until the PHY operation is complete.
		*/
		static int wait_phy_ready(struct enc28j60_net *priv)
		{
		return poll_ready(priv, MISTAT, MISTAT_BUSY, 0) ? 0 : 1;
		}

		/*
		@@ -594,6 +599,32 @@ static void nolock_txfifo_init(struct enc28j60_net *priv, u16 start, u16 end)
		nolock_regw_write(priv, ETXNDL, end);
		}

		/*
		* Low power mode shrinks power consumption about 100x, so we'd like
		* the chip to be in that mode whenever it's inactive. (However, we
		* can't stay in lowpower mode during suspend with WOL active.)
		*/
		static void enc28j60_lowpower(struct enc28j60_net *priv, bool is_low)
		{
		if (netif_msg_drv(priv))
		dev_dbg(&priv->spi->dev, "%s power...\n",
		is_low ? "low" : "high");

		mutex_lock(&priv->lock);
		if (is_low) {
		nolock_reg_bfclr(priv, ECON1, ECON1_RXEN);
		poll_ready(priv, ESTAT, ESTAT_RXBUSY, 0);
		poll_ready(priv, ECON1, ECON1_TXRTS, 0);
		/* ECON2_VRPS was set during initialization */
		nolock_reg_bfset(priv, ECON2, ECON2_PWRSV);
		} else {
		nolock_reg_bfclr(priv, ECON2, ECON2_PWRSV);
		poll_ready(priv, ESTAT, ESTAT_CLKRDY, ESTAT_CLKRDY);
		/* caller sets ECON1_RXEN */
		}
		mutex_unlock(&priv->lock);
		}

		static int enc28j60_hw_init(struct enc28j60_net *priv)
		{
		u8 reg;
		@@ -612,8 +643,8 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)
		priv->tx_retry_count = 0;
		priv->max_pk_counter = 0;
		priv->rxfilter = RXFILTER_NORMAL;
		/* enable address auto increment */
		nolock_regb_write(priv, ECON2, ECON2_AUTOINC);
		/* enable address auto increment and voltage regulator powersave */
		nolock_regb_write(priv, ECON2, ECON2_AUTOINC \| ECON2_VRPS);

		nolock_rxfifo_init(priv, RXSTART_INIT, RXEND_INIT);
		nolock_txfifo_init(priv, TXSTART_INIT, TXEND_INIT);
		@@ -690,7 +721,7 @@ static int enc28j60_hw_init(struct enc28j60_net *priv)

		static void enc28j60_hw_enable(struct enc28j60_net *priv)
		{
		/* enable interrutps */
		/* enable interrupts */
		if (netif_msg_hw(priv))
		printk(KERN_DEBUG DRV_NAME ": %s() enabling interrupts.\n",
		__FUNCTION__);
		@@ -726,15 +757,12 @@ enc28j60_setlink(struct net_device *ndev, u8 autoneg, u16 speed, u8 duplex)
		int ret = 0;

		if (!priv->hw_enable) {
		if (autoneg == AUTONEG_DISABLE && speed == SPEED_10) {
		/* link is in low power mode now; duplex setting
		* will take effect on next enc28j60_hw_init().
		*/
		if (autoneg == AUTONEG_DISABLE && speed == SPEED_10)
		priv->full_duplex = (duplex == DUPLEX_FULL);
		if (!enc28j60_hw_init(priv)) {
		if (netif_msg_drv(priv))
		dev_err(&ndev->dev,
		"hw_reset() failed\n");
		ret = -EINVAL;
		}
		} else {
		else {
		if (netif_msg_link(priv))
		dev_warn(&ndev->dev,
		"unsupported link setting\n");
		@@ -1307,7 +1335,8 @@ static int enc28j60_net_open(struct net_device *dev)
		}
		return -EADDRNOTAVAIL;
		}
		/* Reset the hardware here */
		/* Reset the hardware here (and take it out of low power mode) */
		enc28j60_lowpower(priv, false);
		enc28j60_hw_disable(priv);
		if (!enc28j60_hw_init(priv)) {
		if (netif_msg_ifup(priv))
		@@ -1337,6 +1366,7 @@ static int enc28j60_net_close(struct net_device *dev)
		printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __FUNCTION__);

		enc28j60_hw_disable(priv);
		enc28j60_lowpower(priv, true);
		netif_stop_queue(dev);

		return 0;
		@@ -1537,6 +1567,8 @@ static int __devinit enc28j60_probe(struct spi_device *spi)
		dev->watchdog_timeo = TX_TIMEOUT;
		SET_ETHTOOL_OPS(dev, &enc28j60_ethtool_ops);

		enc28j60_lowpower(priv, true);

		ret = register_netdev(dev);
		if (ret) {
		if (netif_msg_probe(priv))
		@@ -1556,7 +1588,7 @@ error_alloc:
		return ret;
		}

		static int enc28j60_remove(struct spi_device *spi)
		static int __devexit enc28j60_remove(struct spi_device *spi)
		{
		struct enc28j60_net *priv = dev_get_drvdata(&spi->dev);

		@@ -1573,7 +1605,6 @@ static int enc28j60_remove(struct spi_device *spi)
		static struct spi_driver enc28j60_driver = {
		.driver = {
		.name = DRV_NAME,
		.bus = &spi_bus_type,
		.owner = THIS_MODULE,
		},
		.probe = enc28j60_probe,
		@@ -1582,6 +1613,8 @@ static struct spi_driver enc28j60_driver = {

		static int __init enc28j60_init(void)
		{
		msec20_to_jiffies = msecs_to_jiffies(20);

		return spi_register_driver(&enc28j60_driver);
		}

Admin message