Commit e02d9c4c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: Bug fixes.

3 small bug fix patches.  The 1st two are aRFS fixes and the last one
fixes a fatal driver load failure on some kernels without PCIe
extended config space support enabled.

Please also queue these for -stable.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5a9ef194 d061b241

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+20 −9
Original line number Diff line number Diff line
@@ -11065,11 +11065,23 @@ static bool bnxt_fltr_match(struct bnxt_ntuple_filter *f1, 
	struct flow_keys *keys1 = &f1->fkeys;

	struct flow_keys *keys2 = &f2->fkeys;



	if (keys1->addrs.v4addrs.src == keys2->addrs.v4addrs.src &&

	    keys1->addrs.v4addrs.dst == keys2->addrs.v4addrs.dst &&

	    keys1->ports.ports == keys2->ports.ports &&

	    keys1->basic.ip_proto == keys2->basic.ip_proto &&

	    keys1->basic.n_proto == keys2->basic.n_proto &&

	if (keys1->basic.n_proto != keys2->basic.n_proto ||

	    keys1->basic.ip_proto != keys2->basic.ip_proto)

		return false;



	if (keys1->basic.n_proto == htons(ETH_P_IP)) {

		if (keys1->addrs.v4addrs.src != keys2->addrs.v4addrs.src ||

		    keys1->addrs.v4addrs.dst != keys2->addrs.v4addrs.dst)

			return false;

	} else {

		if (memcmp(&keys1->addrs.v6addrs.src, &keys2->addrs.v6addrs.src,

			   sizeof(keys1->addrs.v6addrs.src)) ||

		    memcmp(&keys1->addrs.v6addrs.dst, &keys2->addrs.v6addrs.dst,

			   sizeof(keys1->addrs.v6addrs.dst)))

			return false;

	}



	if (keys1->ports.ports == keys2->ports.ports &&

	    keys1->control.flags == keys2->control.flags &&

	    ether_addr_equal(f1->src_mac_addr, f2->src_mac_addr) &&

	    ether_addr_equal(f1->dst_mac_addr, f2->dst_mac_addr))
@@ -11361,7 +11373,7 @@ int bnxt_get_port_parent_id(struct net_device *dev, 
		return -EOPNOTSUPP;



	/* The PF and it's VF-reps only support the switchdev framework */

	if (!BNXT_PF(bp))

	if (!BNXT_PF(bp) || !(bp->flags & BNXT_FLAG_DSN_VALID))

		return -EOPNOTSUPP;



	ppid->id_len = sizeof(bp->switch_id);
@@ -11734,6 +11746,7 @@ static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[]) 
	put_unaligned_le32(dw, &dsn[0]);

	pci_read_config_dword(pdev, pos + 4, &dw);

	put_unaligned_le32(dw, &dsn[4]);

	bp->flags |= BNXT_FLAG_DSN_VALID;

	return 0;

}
@@ -11845,9 +11858,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	if (BNXT_PF(bp)) {

		/* Read the adapter's DSN to use as the eswitch switch_id */

		rc = bnxt_pcie_dsn_get(bp, bp->switch_id);

		if (rc)

			goto init_err_pci_clean;

		bnxt_pcie_dsn_get(bp, bp->switch_id);

	}



	/* MTU range: 60 - FW defined max */

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −3
Original line number Diff line number Diff line
@@ -1532,6 +1532,7 @@ struct bnxt { 
	#define BNXT_FLAG_NO_AGG_RINGS	0x20000

	#define BNXT_FLAG_RX_PAGE_MODE	0x40000

	#define BNXT_FLAG_MULTI_HOST	0x100000

	#define BNXT_FLAG_DSN_VALID	0x200000

	#define BNXT_FLAG_DOUBLE_DB	0x400000

	#define BNXT_FLAG_CHIP_NITRO_A0	0x1000000

	#define BNXT_FLAG_DIM		0x2000000
@@ -1936,9 +1937,6 @@ static inline bool bnxt_cfa_hwrm_message(u16 req_type) 
	case HWRM_CFA_ENCAP_RECORD_FREE:

	case HWRM_CFA_DECAP_FILTER_ALLOC:

	case HWRM_CFA_DECAP_FILTER_FREE:

	case HWRM_CFA_NTUPLE_FILTER_ALLOC:

	case HWRM_CFA_NTUPLE_FILTER_FREE:

	case HWRM_CFA_NTUPLE_FILTER_CFG:

	case HWRM_CFA_EM_FLOW_ALLOC:

	case HWRM_CFA_EM_FLOW_FREE:

	case HWRM_CFA_EM_FLOW_CFG:

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+3 −0
Original line number Diff line number Diff line
@@ -398,6 +398,9 @@ static int bnxt_vf_reps_create(struct bnxt *bp) 
	struct net_device *dev;

	int rc, i;



	if (!(bp->flags & BNXT_FLAG_DSN_VALID))

		return -ENODEV;



	bp->vf_reps = kcalloc(num_vfs, sizeof(vf_rep), GFP_KERNEL);

	if (!bp->vf_reps)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE