History

RDMA/vmw_pvrdma: Dont hardcode QP header page

Moved the header page count to a macro.

Adit Ranadive committed 9 years ago

Commit e51c2fb1 parent 6332dee2 files · +6 −4Browse files

Unified · Split

2 files
  1. drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +1 −0
  2. drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c +5 −4
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h+1−0
@@ -70,6 +70,7 @@ · 69 unmodified lines
70#define PCI_DEVICE_ID_VMWARE_PVRDMA 0x082070#define PCI_DEVICE_ID_VMWARE_PVRDMA 0x0820
71 71
72#define PVRDMA_NUM_RING_PAGES 472#define PVRDMA_NUM_RING_PAGES 4
73#define PVRDMA_QP_NUM_HEADER_PAGES 1
73 74
74struct pvrdma_dev;75struct pvrdma_dev;
75 76
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c+5−4
@@ -170,8 +170,9 @@ static int pvrdma_set_sq_size(struct pvrdma_dev *dev, struct ib_qp_cap *req_cap, · 169 unmodified lines
170 sizeof(struct pvrdma_sge) *170 sizeof(struct pvrdma_sge) *
171 qp->sq.max_sg);171 qp->sq.max_sg);
172 /* Note: one extra page for the header. */172 /* Note: one extra page for the header. */
173 qp->npages_send = 1 + (qp->sq.wqe_cnt * qp->sq.wqe_size +173 qp->npages_send = PVRDMA_QP_NUM_HEADER_PAGES +
174 PAGE_SIZE - 1) / PAGE_SIZE;174 (qp->sq.wqe_cnt * qp->sq.wqe_size + PAGE_SIZE - 1) /
175 PAGE_SIZE;
175 176
176 return 0;177 return 0;
177}178}
@@ -288,7 +289,7 @@ struct ib_qp *pvrdma_create_qp(struct ib_pd *pd, · 110 unmodified lines
288 qp->npages = qp->npages_send + qp->npages_recv;289 qp->npages = qp->npages_send + qp->npages_recv;
289 290
290 /* Skip header page. */291 /* Skip header page. */
291 qp->sq.offset = PAGE_SIZE;292 qp->sq.offset = PVRDMA_QP_NUM_HEADER_PAGES * PAGE_SIZE;
292 293
293 /* Recv queue pages are after send pages. */294 /* Recv queue pages are after send pages. */
294 qp->rq.offset = qp->npages_send * PAGE_SIZE;295 qp->rq.offset = qp->npages_send * PAGE_SIZE;
@@ -341,7 +342,7 @@ struct ib_qp *pvrdma_create_qp(struct ib_pd *pd, · 46 unmodified lines
341 cmd->qp_type = ib_qp_type_to_pvrdma(init_attr->qp_type);342 cmd->qp_type = ib_qp_type_to_pvrdma(init_attr->qp_type);
342 cmd->access_flags = IB_ACCESS_LOCAL_WRITE;343 cmd->access_flags = IB_ACCESS_LOCAL_WRITE;
343 cmd->total_chunks = qp->npages;344 cmd->total_chunks = qp->npages;
344 cmd->send_chunks = qp->npages_send - 1;345 cmd->send_chunks = qp->npages_send - PVRDMA_QP_NUM_HEADER_PAGES;
345 cmd->pdir_dma = qp->pdir.dir_dma;346 cmd->pdir_dma = qp->pdir.dir_dma;
346 347
347 dev_dbg(&dev->pdev->dev, "create queuepair with %d, %d, %d, %d\n",348 dev_dbg(&dev->pdev->dev, "create queuepair with %d, %d, %d, %d\n",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t