Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b06690 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (44 commits)
  qlge: Fix sparse warnings for tx ring indexes.
  qlge: Fix sparse warning regarding rx buffer queues.
  qlge: Fix sparse endian warning in ql_hw_csum_setup().
  qlge: Fix sparse endian warning for inbound packet control block flags.
  qlge: Fix sparse warnings for byte swapping in qlge_ethool.c
  myri10ge: print MAC and serial number on probe failure
  pkt_sched: cls_u32: Fix locking in u32_change()
  iucv: fix cpu hotplug
  af_iucv: Free iucv path/socket in path_pending callback
  af_iucv: avoid left over IUCV connections from failing connects
  af_iucv: New error return codes for connect()
  net/ehea: bitops work on unsigned longs
  Revert "net: Fix for initial link state in 2.6.28"
  tcp: Kill extraneous SPLICE_F_NONBLOCK checks.
  tcp: don't mask EOF and socket errors on nonblocking splice receive
  dccp: Integrate the TFRC library with DCCP
  dccp: Clean up ccid.c after integration of CCID plugins
  dccp: Lockless integration of CCID congestion-control plugins
  qeth: get rid of extra argument after printk to dev_* conversion
  qeth: No large send using EDDP for HiperSockets.
  ...
parents c155b914 3537d54c

drivers/isdn/capi/capidrv.c

+2 −2
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep) 
		int digit2 = 0;

		if (!isdigit(*s)) return -3;

		while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; }

		if (digit1 <= 0 && digit1 > 30) return -4;

		if (digit1 <= 0 || digit1 > 30) return -4;

		if (*s == 0 || *s == ',' || *s == ' ') {

			bmask |= (1 << digit1);

			digit1 = 0;
@@ -1530,7 +1530,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep) 
		s++;

		if (!isdigit(*s)) return -3;

		while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; }

		if (digit2 <= 0 && digit2 > 30) return -4;

		if (digit2 <= 0 || digit2 > 30) return -4;

		if (*s == 0 || *s == ',' || *s == ' ') {

			if (digit1 > digit2)

				for (i = digit2; i <= digit1 ; i++)

drivers/net/acenic.c

+71 −46
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include <linux/mm.h>

#include <linux/highmem.h>

#include <linux/sockios.h>

#include <linux/firmware.h>



#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

#include <linux/if_vlan.h>
@@ -186,8 +187,6 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl); 
#define MAX_RODATA_LEN	8*1024

#define MAX_DATA_LEN	2*1024



#include "acenic_firmware.h"



#ifndef tigon2FwReleaseLocal

#define tigon2FwReleaseLocal 0

#endif
@@ -417,6 +416,10 @@ static int dis_pci_mem_inval[ACE_MAX_MOD_PARMS] = {1, 1, 1, 1, 1, 1, 1, 1}; 
MODULE_AUTHOR("Jes Sorensen <jes@trained-monkey.org>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("AceNIC/3C985/GA620 Gigabit Ethernet driver");

#ifndef CONFIG_ACENIC_OMIT_TIGON_I

MODULE_FIRMWARE("acenic/tg1.bin");

#endif

MODULE_FIRMWARE("acenic/tg2.bin");



module_param_array_named(link, link_state, int, NULL, 0);

module_param_array(trace, int, NULL, 0);
@@ -943,8 +946,8 @@ static int __devinit ace_init(struct net_device *dev) 
	case 4:

	case 5:

		printk(KERN_INFO "  Tigon I  (Rev. %i), Firmware: %i.%i.%i, ",

		       tig_ver, tigonFwReleaseMajor, tigonFwReleaseMinor,

		       tigonFwReleaseFix);

		       tig_ver, ap->firmware_major, ap->firmware_minor,

		       ap->firmware_fix);

		writel(0, &regs->LocalCtrl);

		ap->version = 1;

		ap->tx_ring_entries = TIGON_I_TX_RING_ENTRIES;
@@ -952,8 +955,8 @@ static int __devinit ace_init(struct net_device *dev) 
#endif

	case 6:

		printk(KERN_INFO "  Tigon II (Rev. %i), Firmware: %i.%i.%i, ",

		       tig_ver, tigon2FwReleaseMajor, tigon2FwReleaseMinor,

		       tigon2FwReleaseFix);

		       tig_ver, ap->firmware_major, ap->firmware_minor,

		       ap->firmware_fix);

		writel(readl(&regs->CpuBCtrl) | CPU_HALT, &regs->CpuBCtrl);

		readl(&regs->CpuBCtrl);		/* PCI write posting */

		/*
@@ -1205,7 +1208,9 @@ static int __devinit ace_init(struct net_device *dev) 
	memset(ap->info, 0, sizeof(struct ace_info));

	memset(ap->skb, 0, sizeof(struct ace_skb));



	ace_load_firmware(dev);

	if (ace_load_firmware(dev))

		goto init_error;



	ap->fw_running = 0;



	tmp_ptr = ap->info_dma;
@@ -1441,10 +1446,7 @@ static int __devinit ace_init(struct net_device *dev) 
	if (ap->version >= 2)

		writel(tmp, &regs->TuneFastLink);



	if (ACE_IS_TIGON_I(ap))

		writel(tigonFwStartAddr, &regs->Pc);

	if (ap->version == 2)

		writel(tigon2FwStartAddr, &regs->Pc);

	writel(ap->firmware_start, &regs->Pc);



	writel(0, &regs->Mb0Lo);
@@ -2761,8 +2763,8 @@ static void ace_get_drvinfo(struct net_device *dev, 


	strlcpy(info->driver, "acenic", sizeof(info->driver));

	snprintf(info->version, sizeof(info->version), "%i.%i.%i",

		tigonFwReleaseMajor, tigonFwReleaseMinor,

		tigonFwReleaseFix);

		 ap->firmware_major, ap->firmware_minor,

		 ap->firmware_fix);



	if (ap->pdev)

		strlcpy(info->bus_info, pci_name(ap->pdev),
@@ -2869,11 +2871,10 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev) 
}





static void __devinit ace_copy(struct ace_regs __iomem *regs, void *src,

static void __devinit ace_copy(struct ace_regs __iomem *regs, const __be32 *src,

			       u32 dest, int size)

{

	void __iomem *tdest;

	u32 *wsrc;

	short tsize, i;



	if (size <= 0)
@@ -2885,20 +2886,15 @@ static void __devinit ace_copy(struct ace_regs __iomem *regs, void *src, 
		tdest = (void __iomem *) &regs->Window +

			(dest & (ACE_WINDOW_SIZE - 1));

		writel(dest & ~(ACE_WINDOW_SIZE - 1), &regs->WinBase);

		/*

		 * This requires byte swapping on big endian, however

		 * writel does that for us

		 */

		wsrc = src;

		for (i = 0; i < (tsize / 4); i++) {

			writel(wsrc[i], tdest + i*4);

			/* Firmware is big-endian */

			writel(be32_to_cpup(src), tdest);

			src++;

			tdest += 4;

			dest += 4;

			size -= 4;

		}

		dest += tsize;

		src += tsize;

		size -= tsize;

	}



	return;

}
@@ -2937,8 +2933,13 @@ static void __devinit ace_clear(struct ace_regs __iomem *regs, u32 dest, int siz 
 */

static int __devinit ace_load_firmware(struct net_device *dev)

{

	const struct firmware *fw;

	const char *fw_name = "acenic/tg2.bin";

	struct ace_private *ap = netdev_priv(dev);

	struct ace_regs __iomem *regs = ap->regs;

	const __be32 *fw_data;

	u32 load_addr;

	int ret;



	if (!(readl(&regs->CpuCtrl) & CPU_HALTED)) {

		printk(KERN_ERR "%s: trying to download firmware while the "
@@ -2946,28 +2947,52 @@ static int __devinit ace_load_firmware(struct net_device *dev) 
		return -EFAULT;

	}



	if (ACE_IS_TIGON_I(ap))

		fw_name = "acenic/tg1.bin";



	ret = request_firmware(&fw, fw_name, &ap->pdev->dev);

	if (ret) {

		printk(KERN_ERR "%s: Failed to load firmware \"%s\"\n",

		       ap->name, fw_name);

		return ret;

	}



	fw_data = (void *)fw->data;



	/* Firmware blob starts with version numbers, followed by

	   load and start address. Remainder is the blob to be loaded

	   contiguously from load address. We don't bother to represent

	   the BSS/SBSS sections any more, since we were clearing the

	   whole thing anyway. */

	ap->firmware_major = fw->data[0];

	ap->firmware_minor = fw->data[1];

	ap->firmware_fix = fw->data[2];



	ap->firmware_start = be32_to_cpu(fw_data[1]);

	if (ap->firmware_start < 0x4000 || ap->firmware_start >= 0x80000) {

		printk(KERN_ERR "%s: bogus load address %08x in \"%s\"\n",

		       ap->name, ap->firmware_start, fw_name);

		ret = -EINVAL;

		goto out;

	}



	load_addr = be32_to_cpu(fw_data[2]);

	if (load_addr < 0x4000 || load_addr >= 0x80000) {

		printk(KERN_ERR "%s: bogus load address %08x in \"%s\"\n",

		       ap->name, load_addr, fw_name);

		ret = -EINVAL;

		goto out;

	}



	/*

	 * Do not try to clear more than 512KB or we end up seeing

	 * funny things on NICs with only 512KB SRAM

	 * Do not try to clear more than 512KiB or we end up seeing

	 * funny things on NICs with only 512KiB SRAM

	 */

	ace_clear(regs, 0x2000, 0x80000-0x2000);

	if (ACE_IS_TIGON_I(ap)) {

		ace_copy(regs, tigonFwText, tigonFwTextAddr, tigonFwTextLen);

		ace_copy(regs, tigonFwData, tigonFwDataAddr, tigonFwDataLen);

		ace_copy(regs, tigonFwRodata, tigonFwRodataAddr,

			 tigonFwRodataLen);

		ace_clear(regs, tigonFwBssAddr, tigonFwBssLen);

		ace_clear(regs, tigonFwSbssAddr, tigonFwSbssLen);

	}else if (ap->version == 2) {

		ace_clear(regs, tigon2FwBssAddr, tigon2FwBssLen);

		ace_clear(regs, tigon2FwSbssAddr, tigon2FwSbssLen);

		ace_copy(regs, tigon2FwText, tigon2FwTextAddr,tigon2FwTextLen);

		ace_copy(regs, tigon2FwRodata, tigon2FwRodataAddr,

			 tigon2FwRodataLen);

		ace_copy(regs, tigon2FwData, tigon2FwDataAddr,tigon2FwDataLen);

	}



	return 0;

	ace_copy(regs, &fw_data[3], load_addr, fw->size-12);

 out:

	release_firmware(fw);

	return ret;

}

drivers/net/acenic.h

+4 −0
Original line number Diff line number Diff line
@@ -694,6 +694,10 @@ struct ace_private 
	u32			last_tx, last_std_rx, last_mini_rx;

#endif

	int			pci_using_dac;

	u8			firmware_major;

	u8			firmware_minor;

	u8			firmware_fix;

	u32			firmware_start;

};

drivers/net/ehea/ehea.h

+1 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ struct ehea_port { 
	int num_add_tx_qps;

	int num_mcs;

	int resets;

	u64 flags;

	unsigned long flags;

	u64 mac_addr;

	u32 logical_port_id;

	u32 port_speed;
@@ -510,7 +510,6 @@ void ehea_set_ethtool_ops(struct net_device *netdev); 
int ehea_sense_port_attr(struct ehea_port *port);

int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);



extern u64 ehea_driver_flags;

extern struct work_struct ehea_rereg_mr_task;



#endif	/* __EHEA_H__ */

drivers/net/ehea/ehea_main.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, " 


static int port_name_cnt;

static LIST_HEAD(adapter_list);

u64 ehea_driver_flags;

static unsigned long ehea_driver_flags;

struct work_struct ehea_rereg_mr_task;

static DEFINE_MUTEX(dlpar_mem_lock);

struct ehea_fw_handle_array ehea_fw_handles;