Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (8466c833) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/3c59x.c

+13 −15

Original line number	Original line	Diff line number	Diff line
	@@ -858,19 +858,7 @@ static struct eisa_device_id vortex_eisa_ids[] = {
	};		};
	MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);		MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);

	static int vortex_eisa_probe(struct device *device);		static int __init vortex_eisa_probe(struct device *device)
	static int vortex_eisa_remove(struct device *device);

	static struct eisa_driver vortex_eisa_driver = {
	.id_table = vortex_eisa_ids,
	.driver = {
	.name = "3c59x",
	.probe = vortex_eisa_probe,
	.remove = vortex_eisa_remove
	}
	};

	static int vortex_eisa_probe(struct device *device)
	{		{
	void __iomem *ioaddr;		void __iomem *ioaddr;
	struct eisa_device *edev;		struct eisa_device *edev;
	@@ -893,7 +881,7 @@ static int vortex_eisa_probe(struct device *device)
	return 0;		return 0;
	}		}

	static int vortex_eisa_remove(struct device *device)		static int __devexit vortex_eisa_remove(struct device *device)
	{		{
	struct eisa_device *edev;		struct eisa_device *edev;
	struct net_device *dev;		struct net_device *dev;
	@@ -918,7 +906,17 @@ static int vortex_eisa_remove(struct device *device)
	free_netdev(dev);		free_netdev(dev);
	return 0;		return 0;
	}		}
	#endif
			static struct eisa_driver vortex_eisa_driver = {
			.id_table = vortex_eisa_ids,
			.driver = {
			.name = "3c59x",
			.probe = vortex_eisa_probe,
			.remove = __devexit_p(vortex_eisa_remove)
			}
			};

			#endif /* CONFIG_EISA */

	/* returns count found (>= 0), or negative on error */		/* returns count found (>= 0), or negative on error */
	static int __init vortex_eisa_init(void)		static int __init vortex_eisa_init(void)

drivers/net/mv643xx_eth.c

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -787,6 +787,12 @@ static int mv643xx_eth_open(struct net_device *dev)
	unsigned int size;		unsigned int size;
	int err;		int err;

			/* Clear any pending ethernet port interrupts */
			mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
			mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
			/* wait for previous write to complete */
			mv_read (MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num));

	err = request_irq(dev->irq, mv643xx_eth_int_handler,		err = request_irq(dev->irq, mv643xx_eth_int_handler,
	IRQF_SHARED \| IRQF_SAMPLE_RANDOM, dev->name, dev);		IRQF_SHARED \| IRQF_SAMPLE_RANDOM, dev->name, dev);
	if (err) {		if (err) {
	@@ -875,10 +881,6 @@ static int mv643xx_eth_open(struct net_device *dev)

	mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */		mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */

	/* Clear any pending ethernet port interrupts */
	mv_write(MV643XX_ETH_INTERRUPT_CAUSE_REG(port_num), 0);
	mv_write(MV643XX_ETH_INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);

	eth_port_start(dev);		eth_port_start(dev);

	/* Interrupt Coalescing */		/* Interrupt Coalescing */

drivers/net/myri10ge/myri10ge.c

+33 −9

Original line number	Original line	Diff line number	Diff line
	@@ -181,6 +181,7 @@ struct myri10ge_priv {
	int intr_coal_delay;		int intr_coal_delay;
	__be32 __iomem *intr_coal_delay_ptr;		__be32 __iomem *intr_coal_delay_ptr;
	int mtrr;		int mtrr;
			int wc_enabled;
	int wake_queue;		int wake_queue;
	int stop_queue;		int stop_queue;
	int down_cnt;		int down_cnt;
	@@ -717,6 +718,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
	int status;		int status;
	size_t bytes;		size_t bytes;
	u32 len;		u32 len;
			struct page *dmatest_page;
			dma_addr_t dmatest_bus;

	/* try to send a reset command to the card to see if it		/* try to send a reset command to the card to see if it
	* is alive */		* is alive */
	@@ -726,6 +729,11 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
	dev_err(&mgp->pdev->dev, "failed reset\n");		dev_err(&mgp->pdev->dev, "failed reset\n");
	return -ENXIO;		return -ENXIO;
	}		}
			dmatest_page = alloc_page(GFP_KERNEL);
			if (!dmatest_page)
			return -ENOMEM;
			dmatest_bus = pci_map_page(mgp->pdev, dmatest_page, 0, PAGE_SIZE,
			DMA_BIDIRECTIONAL);

	/* Now exchange information about interrupts */		/* Now exchange information about interrupts */

	@@ -764,8 +772,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)

	len = mgp->tx.boundary;		len = mgp->tx.boundary;

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);		cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);		cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
	cmd.data2 = len * 0x10000;		cmd.data2 = len * 0x10000;
	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);		status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
	if (status == 0)		if (status == 0)
	@@ -774,8 +782,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
	else		else
	dev_warn(&mgp->pdev->dev, "DMA read benchmark failed: %d\n",		dev_warn(&mgp->pdev->dev, "DMA read benchmark failed: %d\n",
	status);		status);
	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);		cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);		cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
	cmd.data2 = len * 0x1;		cmd.data2 = len * 0x1;
	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);		status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
	if (status == 0)		if (status == 0)
	@@ -785,8 +793,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
	dev_warn(&mgp->pdev->dev, "DMA write benchmark failed: %d\n",		dev_warn(&mgp->pdev->dev, "DMA write benchmark failed: %d\n",
	status);		status);

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);		cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);
	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);		cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);
	cmd.data2 = len * 0x10001;		cmd.data2 = len * 0x10001;
	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);		status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);
	if (status == 0)		if (status == 0)
	@@ -796,6 +804,9 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
	dev_warn(&mgp->pdev->dev,		dev_warn(&mgp->pdev->dev,
	"DMA read/write benchmark failed: %d\n", status);		"DMA read/write benchmark failed: %d\n", status);

			pci_unmap_page(mgp->pdev, dmatest_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);
			put_page(dmatest_page);

	memset(mgp->rx_done.entry, 0, bytes);		memset(mgp->rx_done.entry, 0, bytes);

	/* reset mcp/driver shared state back to 0 */		/* reset mcp/driver shared state back to 0 */
	@@ -1375,7 +1386,7 @@ myri10ge_get_ethtool_stats(struct net_device *netdev,
	data[i] = ((unsigned long *)&mgp->stats)[i];		data[i] = ((unsigned long *)&mgp->stats)[i];

	data[i++] = (unsigned int)mgp->tx.boundary;		data[i++] = (unsigned int)mgp->tx.boundary;
	data[i++] = (unsigned int)(mgp->mtrr >= 0);		data[i++] = (unsigned int)mgp->wc_enabled;
	data[i++] = (unsigned int)mgp->pdev->irq;		data[i++] = (unsigned int)mgp->pdev->irq;
	data[i++] = (unsigned int)mgp->msi_enabled;		data[i++] = (unsigned int)mgp->msi_enabled;
	data[i++] = (unsigned int)mgp->read_dma;		data[i++] = (unsigned int)mgp->read_dma;
	@@ -1456,6 +1467,8 @@ static int myri10ge_allocate_rings(struct net_device *dev)
	status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd, 0);		status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd, 0);
	tx_ring_size = cmd.data0;		tx_ring_size = cmd.data0;
	status \|= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0);		status \|= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0);
			if (status != 0)
			return status;
	rx_ring_size = cmd.data0;		rx_ring_size = cmd.data0;

	tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send);		tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send);
	@@ -1463,6 +1476,8 @@ static int myri10ge_allocate_rings(struct net_device *dev)
	mgp->tx.mask = tx_ring_entries - 1;		mgp->tx.mask = tx_ring_entries - 1;
	mgp->rx_small.mask = mgp->rx_big.mask = rx_ring_entries - 1;		mgp->rx_small.mask = mgp->rx_big.mask = rx_ring_entries - 1;

			status = -ENOMEM;

	/* allocate the host shadow rings */		/* allocate the host shadow rings */

	bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4)		bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4)
	@@ -1735,7 +1750,7 @@ static int myri10ge_open(struct net_device *dev)
	goto abort_with_irq;		goto abort_with_irq;
	}		}

	if (myri10ge_wcfifo && mgp->mtrr >= 0) {		if (myri10ge_wcfifo && mgp->wc_enabled) {
	mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4;		mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4;
	mgp->rx_small.wc_fifo =		mgp->rx_small.wc_fifo =
	(u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL;		(u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL;
	@@ -2510,6 +2525,12 @@ static void myri10ge_select_firmware(struct myri10ge_priv *mgp)
	bridge->vendor, bridge->device);		bridge->vendor, bridge->device);
	mgp->tx.boundary = 4096;		mgp->tx.boundary = 4096;
	mgp->fw_name = myri10ge_fw_aligned;		mgp->fw_name = myri10ge_fw_aligned;
			} else if (bridge &&
			bridge->vendor == PCI_VENDOR_ID_SGI &&
			bridge->device == 0x4002 /* TIOCE pcie-port */ ) {
			/* this pcie bridge does not support 4K rdma request */
			mgp->tx.boundary = 2048;
			mgp->fw_name = myri10ge_fw_aligned;
	}		}
	} else {		} else {
	if (myri10ge_force_firmware == 1) {		if (myri10ge_force_firmware == 1) {
	@@ -2830,9 +2851,12 @@ static int myri10ge_probe(struct pci_dev pdev, const struct pci_device_id ent)
	mgp->board_span = pci_resource_len(pdev, 0);		mgp->board_span = pci_resource_len(pdev, 0);
	mgp->iomem_base = pci_resource_start(pdev, 0);		mgp->iomem_base = pci_resource_start(pdev, 0);
	mgp->mtrr = -1;		mgp->mtrr = -1;
			mgp->wc_enabled = 0;
	#ifdef CONFIG_MTRR		#ifdef CONFIG_MTRR
	mgp->mtrr = mtrr_add(mgp->iomem_base, mgp->board_span,		mgp->mtrr = mtrr_add(mgp->iomem_base, mgp->board_span,
	MTRR_TYPE_WRCOMB, 1);		MTRR_TYPE_WRCOMB, 1);
			if (mgp->mtrr >= 0)
			mgp->wc_enabled = 1;
	#endif		#endif
	/* Hack. need to get rid of these magic numbers */		/* Hack. need to get rid of these magic numbers */
	mgp->sram_size =		mgp->sram_size =
	@@ -2927,7 +2951,7 @@ static int myri10ge_probe(struct pci_dev pdev, const struct pci_device_id ent)
	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",		dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
	(mgp->msi_enabled ? "MSI" : "xPIC"),		(mgp->msi_enabled ? "MSI" : "xPIC"),
	netdev->irq, mgp->tx.boundary, mgp->fw_name,		netdev->irq, mgp->tx.boundary, mgp->fw_name,
	(mgp->mtrr >= 0 ? "Enabled" : "Disabled"));		(mgp->wc_enabled ? "Enabled" : "Disabled"));

	return 0;		return 0;

drivers/net/netxen/netxen_nic_hw.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -228,7 +228,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
	&adapter->ctx_desc_pdev);		&adapter->ctx_desc_pdev);

	printk("ctx_desc_phys_addr: 0x%llx\n",		printk("ctx_desc_phys_addr: 0x%llx\n",
	(u64) adapter->ctx_desc_phys_addr);		(unsigned long long) adapter->ctx_desc_phys_addr);
	if (addr == NULL) {		if (addr == NULL) {
	DPRINTK(ERR, "bad return from pci_alloc_consistent\n");		DPRINTK(ERR, "bad return from pci_alloc_consistent\n");
	err = -ENOMEM;		err = -ENOMEM;
	@@ -247,7 +247,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
	adapter->max_tx_desc_count,		adapter->max_tx_desc_count,
	(dma_addr_t *) & hw->cmd_desc_phys_addr,		(dma_addr_t *) & hw->cmd_desc_phys_addr,
	&adapter->ahw.cmd_desc_pdev);		&adapter->ahw.cmd_desc_pdev);
	printk("cmd_desc_phys_addr: 0x%llx\n", (u64) hw->cmd_desc_phys_addr);		printk("cmd_desc_phys_addr: 0x%llx\n",
			(unsigned long long) hw->cmd_desc_phys_addr);

	if (addr == NULL) {		if (addr == NULL) {
	DPRINTK(ERR, "bad return from pci_alloc_consistent\n");		DPRINTK(ERR, "bad return from pci_alloc_consistent\n");

drivers/net/r8169.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -572,8 +572,8 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr)
	{		{
	unsigned int val;		unsigned int val;

	mdio_write(ioaddr, MII_BMCR, BMCR_RESET);		val = mdio_read(ioaddr, MII_BMCR) \| BMCR_RESET;
	val = mdio_read(ioaddr, MII_BMCR);		mdio_write(ioaddr, MII_BMCR, val & 0xffff);
	}		}

	static void rtl8169_check_link_status(struct net_device *dev,		static void rtl8169_check_link_status(struct net_device *dev,
	@@ -1368,11 +1368,7 @@ static inline void rtl8169_request_timer(struct net_device *dev)
	(tp->phy_version >= RTL_GIGA_PHY_VER_H))		(tp->phy_version >= RTL_GIGA_PHY_VER_H))
	return;		return;

	init_timer(timer);		mod_timer(timer, jiffies + RTL8169_PHY_TIMEOUT);
	timer->expires = jiffies + RTL8169_PHY_TIMEOUT;
	timer->data = (unsigned long)(dev);
	timer->function = rtl8169_phy_timer;
	add_timer(timer);
	}		}

	#ifdef CONFIG_NET_POLL_CONTROLLER		#ifdef CONFIG_NET_POLL_CONTROLLER
	@@ -1685,6 +1681,10 @@ rtl8169_init_one(struct pci_dev pdev, const struct pci_device_id ent)
	tp->mmio_addr = ioaddr;		tp->mmio_addr = ioaddr;
	tp->align = rtl_cfg_info[ent->driver_data].align;		tp->align = rtl_cfg_info[ent->driver_data].align;

			init_timer(&tp->timer);
			tp->timer.data = (unsigned long) dev;
			tp->timer.function = rtl8169_phy_timer;

	spin_lock_init(&tp->lock);		spin_lock_init(&tp->lock);

	rc = register_netdev(dev);		rc = register_netdev(dev);