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

Commit 500ca9ba authored by Ajit Khaparde's avatar Ajit Khaparde Committed by David S. Miller
Browse files

be2net: remove usage of be_pci_func 



When PCI functions are virtuialized in applications by assigning PCI
functions to VM (PCI passthrough), the be2net driver in the VM sees a

different function number. So, use of PCI function number in any
calculation will break existing code. This patch takes care of it.

Signed-off-by: default avatarAjit Khaparde <ajitk@serverengines.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6cce09f8

drivers/net/benet/be.h

+0 −5
Original line number Diff line number Diff line
@@ -290,11 +290,6 @@ extern const struct ethtool_ops be_ethtool_ops; 


#define drvr_stats(adapter)		(&adapter->stats.drvr_stats)



static inline unsigned int be_pci_func(struct be_adapter *adapter)

{

	return PCI_FUNC(adapter->pdev->devfn);

}



#define BE_SET_NETDEV_OPS(netdev, ops)	(netdev->netdev_ops = ops)



#define PAGE_SHIFT_4K		12

drivers/net/benet/be_cmds.c

+0 −6
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ int be_cmd_eq_create(struct be_adapter *adapter, 


	req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));



	AMAP_SET_BITS(struct amap_eq_context, func, req->context,

			be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_eq_context, valid, req->context, 1);

	/* 4byte eqe*/

	AMAP_SET_BITS(struct amap_eq_context, size, req->context, 0);
@@ -629,7 +627,6 @@ int be_cmd_cq_create(struct be_adapter *adapter, 
	AMAP_SET_BITS(struct amap_cq_context, eventable, ctxt, 1);

	AMAP_SET_BITS(struct amap_cq_context, eqid, ctxt, eq->id);

	AMAP_SET_BITS(struct amap_cq_context, armed, ctxt, 1);

	AMAP_SET_BITS(struct amap_cq_context, func, ctxt, be_pci_func(adapter));

	be_dws_cpu_to_le(ctxt, sizeof(req->context));



	be_cmd_page_addrs_prepare(req->pages, ARRAY_SIZE(req->pages), q_mem);
@@ -678,7 +675,6 @@ int be_cmd_mccq_create(struct be_adapter *adapter, 


	req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);



	AMAP_SET_BITS(struct amap_mcc_context, fid, ctxt, be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_mcc_context, valid, ctxt, 1);

	AMAP_SET_BITS(struct amap_mcc_context, ring_size, ctxt,

		be_encoded_q_len(mccq->len));
@@ -727,8 +723,6 @@ int be_cmd_txq_create(struct be_adapter *adapter, 


	AMAP_SET_BITS(struct amap_tx_context, tx_ring_size, ctxt,

		be_encoded_q_len(txq->len));

	AMAP_SET_BITS(struct amap_tx_context, pci_func_id, ctxt,

			be_pci_func(adapter));

	AMAP_SET_BITS(struct amap_tx_context, ctx_valid, ctxt, 1);

	AMAP_SET_BITS(struct amap_tx_context, cq_id_send, ctxt, cq->id);

drivers/net/benet/be_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static int be_rx_queues_create(struct be_adapter *adapter) 
/* There are 8 evt ids per func. Retruns the evt id's bit number */

static inline int be_evt_bit_get(struct be_adapter *adapter, u32 eq_id)

{

	return eq_id - 8 * be_pci_func(adapter);

	return eq_id % 8;

}



static irqreturn_t be_intx(int irq, void *dev)