Commit 18604c54 authored by Jan-Bernd Themann's avatar Jan-Bernd Themann Committed by Jeff Garzik

ehea: NAPI multi queue TX/RX path for SMP

This patch provides a functionality that allows parallel
RX processing on multiple RX queues by using dummy netdevices.
Signed-off-by: default avatarJan-Bernd Themann <themann@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1acf2318
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "ehea" #define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0048" #define DRV_VERSION "EHEA_0052"
#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
| NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
...@@ -78,8 +78,6 @@ ...@@ -78,8 +78,6 @@
#define EHEA_RQ2_PKT_SIZE 1522 #define EHEA_RQ2_PKT_SIZE 1522
#define EHEA_L_PKT_SIZE 256 /* low latency */ #define EHEA_L_PKT_SIZE 256 /* low latency */
#define EHEA_POLL_MAX_RWQE 1000
/* Send completion signaling */ /* Send completion signaling */
#define EHEA_SIG_IV_LONG 1 #define EHEA_SIG_IV_LONG 1
...@@ -357,8 +355,8 @@ struct ehea_port_res { ...@@ -357,8 +355,8 @@ struct ehea_port_res {
struct ehea_qp *qp; struct ehea_qp *qp;
struct ehea_cq *send_cq; struct ehea_cq *send_cq;
struct ehea_cq *recv_cq; struct ehea_cq *recv_cq;
struct ehea_eq *send_eq; struct ehea_eq *eq;
struct ehea_eq *recv_eq; struct net_device *d_netdev;
spinlock_t send_lock; spinlock_t send_lock;
struct ehea_q_skb_arr rq1_skba; struct ehea_q_skb_arr rq1_skba;
struct ehea_q_skb_arr rq2_skba; struct ehea_q_skb_arr rq2_skba;
...@@ -372,7 +370,6 @@ struct ehea_port_res { ...@@ -372,7 +370,6 @@ struct ehea_port_res {
int swqe_count; int swqe_count;
u32 swqe_id_counter; u32 swqe_id_counter;
u64 tx_packets; u64 tx_packets;
struct tasklet_struct send_comp_task;
spinlock_t recv_lock; spinlock_t recv_lock;
struct port_state p_state; struct port_state p_state;
u64 rx_packets; u64 rx_packets;
...@@ -416,7 +413,9 @@ struct ehea_port { ...@@ -416,7 +413,9 @@ struct ehea_port {
char int_aff_name[EHEA_IRQ_NAME_SIZE]; char int_aff_name[EHEA_IRQ_NAME_SIZE];
int allmulti; /* Indicates IFF_ALLMULTI state */ int allmulti; /* Indicates IFF_ALLMULTI state */
int promisc; /* Indicates IFF_PROMISC state */ int promisc; /* Indicates IFF_PROMISC state */
int num_tx_qps;
int num_add_tx_qps; int num_add_tx_qps;
int num_mcs;
int resets; int resets;
u64 mac_addr; u64 mac_addr;
u32 logical_port_id; u32 logical_port_id;
......
This diff is collapsed.
...@@ -320,6 +320,11 @@ static inline struct ehea_cqe *ehea_poll_rq1(struct ehea_qp *qp, int *wqe_index) ...@@ -320,6 +320,11 @@ static inline struct ehea_cqe *ehea_poll_rq1(struct ehea_qp *qp, int *wqe_index)
return hw_qeit_get_valid(queue); return hw_qeit_get_valid(queue);
} }
static inline void ehea_inc_cq(struct ehea_cq *cq)
{
hw_qeit_inc(&cq->hw_queue);
}
static inline void ehea_inc_rq1(struct ehea_qp *qp) static inline void ehea_inc_rq1(struct ehea_qp *qp)
{ {
hw_qeit_inc(&qp->hw_rqueue1); hw_qeit_inc(&qp->hw_rqueue1);
...@@ -327,7 +332,7 @@ static inline void ehea_inc_rq1(struct ehea_qp *qp) ...@@ -327,7 +332,7 @@ static inline void ehea_inc_rq1(struct ehea_qp *qp)
static inline struct ehea_cqe *ehea_poll_cq(struct ehea_cq *my_cq) static inline struct ehea_cqe *ehea_poll_cq(struct ehea_cq *my_cq)
{ {
return hw_qeit_get_inc_valid(&my_cq->hw_queue); return hw_qeit_get_valid(&my_cq->hw_queue);
} }
#define EHEA_CQ_REGISTER_ORIG 0 #define EHEA_CQ_REGISTER_ORIG 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment