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

Commit 0eb26022 authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

enic: Clean up: Remove support for an older version of hardware 



Remove support for an older version (A1) of hardware

Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69161425

drivers/net/enic/enic.h

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#define DRV_NAME		"enic"

#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"2.1.1.5"

#define DRV_VERSION		"2.1.1.6"

#define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"



#define ENIC_BARS_MAX		6
@@ -101,7 +101,6 @@ struct enic { 
	/* receive queue cache line section */

	____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];

	unsigned int rq_count;

	int (*rq_alloc_buf)(struct vnic_rq *rq);

	u64 rq_truncated_pkts;

	u64 rq_bad_fcs;

	struct napi_struct napi[ENIC_RQ_MAX];

drivers/net/enic/enic_dev.c

+0 −11
Original line number Diff line number Diff line
@@ -110,17 +110,6 @@ int enic_dev_del_addr(struct enic *enic, u8 *addr) 
	return err;

}



int enic_dev_hw_version(struct enic *enic, enum vnic_dev_hw_version *hw_ver)

{

	int err;



	spin_lock(&enic->devcmd_lock);

	err = vnic_dev_hw_version(enic->vdev, hw_ver);

	spin_unlock(&enic->devcmd_lock);



	return err;

}



int enic_dev_notify_unset(struct enic *enic)

{

	int err;

drivers/net/enic/enic_dev.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ int enic_dev_add_addr(struct enic *enic, u8 *addr); 
int enic_dev_del_addr(struct enic *enic, u8 *addr);

void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);

void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);

int enic_dev_hw_version(struct enic *enic, enum vnic_dev_hw_version *hw_ver);

int enic_dev_notify_unset(struct enic *enic);

int enic_dev_hang_notify(struct enic *enic);

int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);

drivers/net/enic/enic_main.c

+3 −53
Original line number Diff line number Diff line
@@ -1348,50 +1348,6 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq) 
	return 0;

}



static int enic_rq_alloc_buf_a1(struct vnic_rq *rq)

{

	struct rq_enet_desc *desc = vnic_rq_next_desc(rq);



	if (vnic_rq_posting_soon(rq)) {



		/* SW workaround for A0 HW erratum: if we're just about

		 * to write posted_index, insert a dummy desc

		 * of type resvd

		 */



		rq_enet_desc_enc(desc, 0, RQ_ENET_TYPE_RESV2, 0);

		vnic_rq_post(rq, 0, 0, 0, 0);

	} else {

		return enic_rq_alloc_buf(rq);

	}



	return 0;

}



static int enic_set_rq_alloc_buf(struct enic *enic)

{

	enum vnic_dev_hw_version hw_ver;

	int err;



	err = enic_dev_hw_version(enic, &hw_ver);

	if (err)

		return err;



	switch (hw_ver) {

	case VNIC_DEV_HW_VER_A1:

		enic->rq_alloc_buf = enic_rq_alloc_buf_a1;

		break;

	case VNIC_DEV_HW_VER_A2:

	case VNIC_DEV_HW_VER_UNKNOWN:

		enic->rq_alloc_buf = enic_rq_alloc_buf;

		break;

	default:

		return -ENODEV;

	}



	return 0;

}



static void enic_rq_indicate_buf(struct vnic_rq *rq,

	struct cq_desc *cq_desc, struct vnic_rq_buf *buf,

	int skipped, void *opaque)
@@ -1528,7 +1484,7 @@ static int enic_poll(struct napi_struct *napi, int budget) 
			0 /* don't unmask intr */,

			0 /* don't reset intr timer */);



	err = vnic_rq_fill(&enic->rq[0], enic->rq_alloc_buf);

	err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);



	/* Buffer allocation failed. Stay in polling

	 * mode so we can try to fill the ring again.
@@ -1578,7 +1534,7 @@ static int enic_poll_msix(struct napi_struct *napi, int budget) 
			0 /* don't unmask intr */,

			0 /* don't reset intr timer */);



	err = vnic_rq_fill(&enic->rq[rq], enic->rq_alloc_buf);

	err = vnic_rq_fill(&enic->rq[rq], enic_rq_alloc_buf);



	/* Buffer allocation failed. Stay in polling mode

	 * so we can try to fill the ring again.
@@ -1781,7 +1737,7 @@ static int enic_open(struct net_device *netdev) 
	}



	for (i = 0; i < enic->rq_count; i++) {

		vnic_rq_fill(&enic->rq[i], enic->rq_alloc_buf);

		vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);

		/* Need at least one buffer on ring to get going */

		if (vnic_rq_desc_used(&enic->rq[i]) == 0) {

			netdev_err(netdev, "Unable to alloc receive buffers\n");
@@ -2347,12 +2303,6 @@ static int enic_dev_init(struct enic *enic) 


	enic_init_vnic_resources(enic);



	err = enic_set_rq_alloc_buf(enic);

	if (err) {

		dev_err(dev, "Failed to set RQ buffer allocator, aborting\n");

		goto err_out_free_vnic_resources;

	}



	err = enic_set_rss_nic_cfg(enic);

	if (err) {

		dev_err(dev, "Failed to config nic, aborting\n");

drivers/net/enic/vnic_dev.c

+0 −19
Original line number Diff line number Diff line
@@ -419,25 +419,6 @@ int vnic_dev_fw_info(struct vnic_dev *vdev, 
	return err;

}



int vnic_dev_hw_version(struct vnic_dev *vdev, enum vnic_dev_hw_version *hw_ver)

{

	struct vnic_devcmd_fw_info *fw_info;

	int err;



	err = vnic_dev_fw_info(vdev, &fw_info);

	if (err)

		return err;



	if (strncmp(fw_info->hw_version, "A1", sizeof("A1")) == 0)

		*hw_ver = VNIC_DEV_HW_VER_A1;

	else if (strncmp(fw_info->hw_version, "A2", sizeof("A2")) == 0)

		*hw_ver = VNIC_DEV_HW_VER_A2;

	else

		*hw_ver = VNIC_DEV_HW_VER_UNKNOWN;



	return 0;

}



int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,

	void *value)

{