Commit 3a7029d8 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:
  amd8111e: Fix rx return code
  pktgen: fix multiple queue warning
  mac80211.h: fix kernel-doc excesses
  p54: fix build warnings
  ath5k: Reset key cache on interface up, thus fixing resume
  mac80211: correct warnings in minstrel rate control algorithm
  RFKILL: fix input layer initialisation
  p54: fix misbehavings when firmware can't be found
  dm9601: runtime mac address change support
  via-velocity: use driver string instead of dev->name before register_netdev()
  drivers/net/wan/syncppp: Fix unused-var warnings
  mlx4: Setting the correct offset for default mac address
  mlx4_en: remove duplicated #include
  ibm_newemac: Fix typo in flow control config option
  ehea: Detect 16GB hugepages for firmware restriction
  dmfe: check pci_alloc_consistent errors
  qeth: avoid skb_under_panic for malformatted inbound data
  qeth: remove unnecessary support ckeck in sysfs route6
  qeth: fix offset error in non prealloc header path
  qeth: remove non-recover-thread checkings
parents 4ac08d36 48e5ecae

drivers/net/amd8111e.c

+8 −6
Original line number Diff line number Diff line
@@ -833,12 +833,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget) 


	} while(intr0 & RINT0);



	if (rx_pkt_limit > 0) {

		/* Receive descriptor is empty now */

		spin_lock_irqsave(&lp->lock, flags);

		__netif_rx_complete(dev, napi);

		writel(VAL0|RINTEN0, mmio + INTEN0);

		writel(VAL2 | RDMD0, mmio + CMD0);

		spin_unlock_irqrestore(&lp->lock, flags);

	}



rx_not_empty:

	return num_rx_pkt;

drivers/net/ehea/ehea.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <asm/io.h>



#define DRV_NAME	"ehea"

#define DRV_VERSION	"EHEA_0094"

#define DRV_VERSION	"EHEA_0095"



/* eHEA capability flags */

#define DLPAR_PORT_ADD_REM 1

drivers/net/ehea/ehea_qmr.c

+52 −5
Original line number Diff line number Diff line
@@ -632,10 +632,13 @@ static void ehea_rebuild_busmap(void) 
	}

}



static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)

static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)

{

	unsigned long i, start_section, end_section;



	if (!nr_pages)

		return 0;



	if (!ehea_bmap) {

		ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);

		if (!ehea_bmap)
@@ -643,7 +646,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add) 
	}



	start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;

	end_section = start_section + ((pgnum * PAGE_SIZE) / EHEA_SECTSIZE);

	end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);

	/* Mark entries as valid or invalid only; address is assigned later */

	for (i = start_section; i < end_section; i++) {

		u64 flag;
@@ -692,10 +695,54 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages) 
	return ret;

}



static int ehea_create_busmap_callback(unsigned long pfn,

				       unsigned long nr_pages, void *arg)

static int ehea_is_hugepage(unsigned long pfn)

{

	int page_order;



	if (pfn & EHEA_HUGEPAGE_PFN_MASK)

		return 0;



	page_order = compound_order(pfn_to_page(pfn));

	if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT)

		return 0;



	return 1;

}



static int ehea_create_busmap_callback(unsigned long initial_pfn,

				       unsigned long total_nr_pages, void *arg)

{

	return ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);

	int ret;

	unsigned long pfn, start_pfn, end_pfn, nr_pages;



	if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)

		return ehea_update_busmap(initial_pfn, total_nr_pages,

					  EHEA_BUSMAP_ADD_SECT);



	/* Given chunk is >= 16GB -> check for hugepages */

	start_pfn = initial_pfn;

	end_pfn = initial_pfn + total_nr_pages;

	pfn = start_pfn;



	while (pfn < end_pfn) {

		if (ehea_is_hugepage(pfn)) {

			/* Add mem found in front of the hugepage */

			nr_pages = pfn - start_pfn;

			ret = ehea_update_busmap(start_pfn, nr_pages,

						 EHEA_BUSMAP_ADD_SECT);

			if (ret)

				return ret;



			/* Skip the hugepage */

			pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);

			start_pfn = pfn;

		} else

			pfn += (EHEA_SECTSIZE / PAGE_SIZE);

	}



	/* Add mem found behind the hugepage(s)  */

	nr_pages = pfn - start_pfn;

	return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);

}



int ehea_create_busmap(void)

drivers/net/ehea/ehea_qmr.h

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
#define EHEA_PAGESIZE          (1UL << EHEA_PAGESHIFT)

#define EHEA_SECTSIZE          (1UL << 24)

#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)

#define EHEA_HUGEPAGESHIFT     34

#define EHEA_HUGEPAGE_SIZE     (1UL << EHEA_HUGEPAGESHIFT)

#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)



#if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)

#error eHEA module cannot work if kernel sectionsize < ehea sectionsize

drivers/net/ibm_newemac/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2605,7 +2605,7 @@ static int __devinit emac_init_config(struct emac_instance *dev) 
		    of_device_is_compatible(np, "ibm,emac-440gr"))

			dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;

		if (of_device_is_compatible(np, "ibm,emac-405ez")) {

#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL

#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL

			dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;

#else

			printk(KERN_ERR "%s: Flow control not disabled!\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE