Commit 6cf54437 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: (51 commits)
  netfilter: ipset: Fix the order of listing of sets
  ip6_pol_route panic: Do not allow VLAN on loopback
  bnx2x: Fix port identification problem
  r8169: add Realtek as maintainer.
  ip: ip_options_compile() resilient to NULL skb route
  bna: fix memory leak during RX path cleanup
  bna: fix for clean fw re-initialization
  usbnet: Fix up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps.
  iwlegacy: fix tx_power initialization
  Revert "tcp: disallow bind() to reuse addr/port"
  qlcnic: limit skb frags for non tso packet
  net: can: mscan: fix build breakage in mpc5xxx_can
  netfilter: ipset: set match and SET target fixes
  netfilter: ipset: bitmap:ip,mac type requires "src" for MAC
  sctp: fix oops while removed transport still using as retran path
  sctp: fix oops when updating retransmit path with DEBUG on
  net: Disable NETIF_F_TSO_ECN when TSO is disabled
  net: Disable all TSO features when SG is disabled
  sfc: Use rmb() to ensure reads occur in order
  ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile
  ...
parents 97ddec65 0b0dc0f1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ S: Maintained 
F:	drivers/net/hamradio/6pack.c



8169 10/100/1000 GIGABIT ETHERNET DRIVER

M:	Realtek linux nic maintainers <nic_swsd@realtek.com>

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

S:	Maintained

drivers/connector/connector.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ static int cn_call_callback(struct sk_buff *skb) 
		cbq->callback(msg, nsp);

		kfree_skb(skb);

		cn_queue_release_callback(cbq);

		err = 0;

	}



	return err;

drivers/net/bna/bfa_ioc.c

+18 −13
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#define bfa_ioc_map_port(__ioc) ((__ioc)->ioc_hwif->ioc_map_port(__ioc))

#define bfa_ioc_notify_fail(__ioc)			\

			((__ioc)->ioc_hwif->ioc_notify_fail(__ioc))

#define bfa_ioc_sync_start(__ioc)               \

			((__ioc)->ioc_hwif->ioc_sync_start(__ioc))

#define bfa_ioc_sync_join(__ioc)			\

			((__ioc)->ioc_hwif->ioc_sync_join(__ioc))

#define bfa_ioc_sync_leave(__ioc)			\
@@ -602,7 +604,7 @@ bfa_iocpf_sm_fwcheck(struct bfa_iocpf *iocpf, enum iocpf_event event) 
	switch (event) {

	case IOCPF_E_SEMLOCKED:

		if (bfa_ioc_firmware_lock(ioc)) {

			if (bfa_ioc_sync_complete(ioc)) {

			if (bfa_ioc_sync_start(ioc)) {

				iocpf->retry_count = 0;

				bfa_ioc_sync_join(ioc);

				bfa_fsm_set_state(iocpf, bfa_iocpf_sm_hwinit);
@@ -1314,7 +1316,7 @@ bfa_nw_ioc_fwver_cmp(struct bfa_ioc *ioc, struct bfi_ioc_image_hdr *fwhdr) 
 * execution context (driver/bios) must match.

 */

static bool

bfa_ioc_fwver_valid(struct bfa_ioc *ioc)

bfa_ioc_fwver_valid(struct bfa_ioc *ioc, u32 boot_env)

{

	struct bfi_ioc_image_hdr fwhdr, *drv_fwhdr;
@@ -1325,7 +1327,7 @@ bfa_ioc_fwver_valid(struct bfa_ioc *ioc) 
	if (fwhdr.signature != drv_fwhdr->signature)

		return false;



	if (fwhdr.exec != drv_fwhdr->exec)

	if (swab32(fwhdr.param) != boot_env)

		return false;



	return bfa_nw_ioc_fwver_cmp(ioc, &fwhdr);
@@ -1352,9 +1354,12 @@ bfa_ioc_hwinit(struct bfa_ioc *ioc, bool force) 
{

	enum bfi_ioc_state ioc_fwstate;

	bool fwvalid;

	u32 boot_env;



	ioc_fwstate = readl(ioc->ioc_regs.ioc_fwstate);



	boot_env = BFI_BOOT_LOADER_OS;



	if (force)

		ioc_fwstate = BFI_IOC_UNINIT;
@@ -1362,10 +1367,10 @@ bfa_ioc_hwinit(struct bfa_ioc *ioc, bool force) 
	 * check if firmware is valid

	 */

	fwvalid = (ioc_fwstate == BFI_IOC_UNINIT) ?

		false : bfa_ioc_fwver_valid(ioc);

		false : bfa_ioc_fwver_valid(ioc, boot_env);



	if (!fwvalid) {

		bfa_ioc_boot(ioc, BFI_BOOT_TYPE_NORMAL, ioc->pcidev.device_id);

		bfa_ioc_boot(ioc, BFI_BOOT_TYPE_NORMAL, boot_env);

		return;

	}
@@ -1396,7 +1401,7 @@ bfa_ioc_hwinit(struct bfa_ioc *ioc, bool force) 
	/**

	 * Initialize the h/w for any other states.

	 */

	bfa_ioc_boot(ioc, BFI_BOOT_TYPE_NORMAL, ioc->pcidev.device_id);

	bfa_ioc_boot(ioc, BFI_BOOT_TYPE_NORMAL, boot_env);

}



void
@@ -1506,7 +1511,7 @@ bfa_ioc_hb_stop(struct bfa_ioc *ioc) 
 */

static void

bfa_ioc_download_fw(struct bfa_ioc *ioc, u32 boot_type,

		    u32 boot_param)

		    u32 boot_env)

{

	u32 *fwimg;

	u32 pgnum, pgoff;
@@ -1558,10 +1563,10 @@ bfa_ioc_download_fw(struct bfa_ioc *ioc, u32 boot_type, 
	/*

	 * Set boot type and boot param at the end.

	*/

	writel((swab32(swab32(boot_type))), ((ioc->ioc_regs.smem_page_start)

	writel(boot_type, ((ioc->ioc_regs.smem_page_start)

			+ (BFI_BOOT_TYPE_OFF)));

	writel((swab32(swab32(boot_param))), ((ioc->ioc_regs.smem_page_start)

			+ (BFI_BOOT_PARAM_OFF)));

	writel(boot_env, ((ioc->ioc_regs.smem_page_start)

			+ (BFI_BOOT_LOADER_OFF)));

}



static void
@@ -1721,7 +1726,7 @@ bfa_ioc_pll_init(struct bfa_ioc *ioc) 
 * as the entry vector.

 */

static void

bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type, u32 boot_param)

bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type, u32 boot_env)

{

	void __iomem *rb;
@@ -1734,7 +1739,7 @@ bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type, u32 boot_param) 
	 * Initialize IOC state of all functions on a chip reset.

	 */

	rb = ioc->pcidev.pci_bar_kva;

	if (boot_param == BFI_BOOT_TYPE_MEMTEST) {

	if (boot_type == BFI_BOOT_TYPE_MEMTEST) {

		writel(BFI_IOC_MEMTEST, (rb + BFA_IOC0_STATE_REG));

		writel(BFI_IOC_MEMTEST, (rb + BFA_IOC1_STATE_REG));

	} else {
@@ -1743,7 +1748,7 @@ bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type, u32 boot_param) 
	}



	bfa_ioc_msgflush(ioc);

	bfa_ioc_download_fw(ioc, boot_type, boot_param);

	bfa_ioc_download_fw(ioc, boot_type, boot_env);



	/**

	 * Enable interrupts just before starting LPU

drivers/net/bna/bfa_ioc.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct bfa_ioc_hwif { 
					bool msix);

	void		(*ioc_notify_fail)	(struct bfa_ioc *ioc);

	void		(*ioc_ownership_reset)	(struct bfa_ioc *ioc);

	bool		(*ioc_sync_start)       (struct bfa_ioc *ioc);

	void		(*ioc_sync_join)	(struct bfa_ioc *ioc);

	void		(*ioc_sync_leave)	(struct bfa_ioc *ioc);

	void		(*ioc_sync_ack)		(struct bfa_ioc *ioc);

drivers/net/bna/bfa_ioc_ct.c

+28 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static void bfa_ioc_ct_map_port(struct bfa_ioc *ioc); 
static void bfa_ioc_ct_isr_mode_set(struct bfa_ioc *ioc, bool msix);

static void bfa_ioc_ct_notify_fail(struct bfa_ioc *ioc);

static void bfa_ioc_ct_ownership_reset(struct bfa_ioc *ioc);

static bool bfa_ioc_ct_sync_start(struct bfa_ioc *ioc);

static void bfa_ioc_ct_sync_join(struct bfa_ioc *ioc);

static void bfa_ioc_ct_sync_leave(struct bfa_ioc *ioc);

static void bfa_ioc_ct_sync_ack(struct bfa_ioc *ioc);
@@ -63,6 +64,7 @@ bfa_nw_ioc_set_ct_hwif(struct bfa_ioc *ioc) 
	nw_hwif_ct.ioc_isr_mode_set = bfa_ioc_ct_isr_mode_set;

	nw_hwif_ct.ioc_notify_fail = bfa_ioc_ct_notify_fail;

	nw_hwif_ct.ioc_ownership_reset = bfa_ioc_ct_ownership_reset;

	nw_hwif_ct.ioc_sync_start = bfa_ioc_ct_sync_start;

	nw_hwif_ct.ioc_sync_join = bfa_ioc_ct_sync_join;

	nw_hwif_ct.ioc_sync_leave = bfa_ioc_ct_sync_leave;

	nw_hwif_ct.ioc_sync_ack = bfa_ioc_ct_sync_ack;
@@ -342,6 +344,32 @@ bfa_ioc_ct_ownership_reset(struct bfa_ioc *ioc) 
	bfa_nw_ioc_hw_sem_release(ioc);

}



/**

 * Synchronized IOC failure processing routines

 */

static bool

bfa_ioc_ct_sync_start(struct bfa_ioc *ioc)

{

	u32 r32 = readl(ioc->ioc_regs.ioc_fail_sync);

	u32 sync_reqd = bfa_ioc_ct_get_sync_reqd(r32);



	/*

	 * Driver load time.  If the sync required bit for this PCI fn

	 * is set, it is due to an unclean exit by the driver for this

	 * PCI fn in the previous incarnation. Whoever comes here first

	 * should clean it up, no matter which PCI fn.

	 */



	if (sync_reqd & bfa_ioc_ct_sync_pos(ioc)) {

		writel(0, ioc->ioc_regs.ioc_fail_sync);

		writel(1, ioc->ioc_regs.ioc_usage_reg);

		writel(BFI_IOC_UNINIT, ioc->ioc_regs.ioc_fwstate);

		writel(BFI_IOC_UNINIT, ioc->ioc_regs.alt_ioc_fwstate);

		return true;

	}



	return bfa_ioc_ct_sync_complete(ioc);

}

/**

 * Synchronized IOC failure processing routines

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE