mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) OpenVswitch's lookup_datapath() returns error pointers, so don't
check against NULL. From Jiri Pirko.
2) pfkey_compile_policy() code path tries to do a GFP_KERNEL allocation
under RCU locks, fix by using GFP_ATOMIC when necessary. From
Nikolay Aleksandrov.
3) phy_suspend() indirectly passes uninitialized data into the ethtool
get wake-on-land implementations. Fix from Sebastian Hesselbarth.
4) CPSW driver unregisters CPTS twice, fix from Benedikt Spranger.
5) If SKB allocation of reply packet fails, vxlan's arp_reduce() defers
a NULL pointer. Fix from David Stevens.
6) IPV6 neigh handling in vxlan doesn't validate the destination
address properly, and it builds a packet with the src and dst
reversed. Fix also from David Stevens.
7) Fix spinlock recursion during subscription failures in TIPC stack,
from Erik Hugne.
8) Revert buggy conversion of davinci_emac to devm_request_irq, from
Chrstian Riesch.
9) Wrong flags passed into forwarding database netlink notifications,
from Nicolas Dichtel.
10) The netpoll neighbour soliciation handler checks wrong ethertype,
needs to be ETH_P_IPV6 rather than ETH_P_ARP. Fix from Li RongQing.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
tipc: fix spinlock recursion bug for failed subscriptions
vxlan: fix nonfunctional neigh_reduce()
net: davinci_emac: Fix rollback of emac_dev_open()
net: davinci_emac: Replace devm_request_irq with request_irq
netpoll: fix the skb check in pkt_is_ns
net: micrel : ks8851-ml: add vdd-supply support
ip6mr: fix mfc notification flags
ipmr: fix mfc notification flags
rtnetlink: fix fdb notification flags
tcp: syncookies: do not use getnstimeofday()
netlink: fix setsockopt in mmap examples in documentation
openvswitch: Correctly report flow used times for first 5 minutes after boot.
via-rhine: Disable device in error path
ATHEROS-ATL1E: Convert iounmap to pci_iounmap
vxlan: fix potential NULL dereference in arp_reduce()
cnic: Update version to 2.5.20 and copyright year.
cnic,bnx2i,bnx2fc: Fix inconsistent use of page size
cnic: Use proper ulp_ops for per device operations.
net: cdc_ncm: fix control message ordering
ipv6: ip6_append_data_mtu do not handle the mtu of the second fragment properly
...
This commit is contained in:
Linus Torvalds
commit
8a1094462c
47 changed files with 508 additions and 306 deletions
|
|
@ -594,13 +594,13 @@ static void bnx2fc_free_mp_resc(struct bnx2fc_cmd *io_req)
|
|||
mp_req->mp_resp_bd = NULL;
|
||||
}
|
||||
if (mp_req->req_buf) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
mp_req->req_buf,
|
||||
mp_req->req_buf_dma);
|
||||
mp_req->req_buf = NULL;
|
||||
}
|
||||
if (mp_req->resp_buf) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
mp_req->resp_buf,
|
||||
mp_req->resp_buf_dma);
|
||||
mp_req->resp_buf = NULL;
|
||||
|
|
@ -622,7 +622,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
|
|||
|
||||
mp_req->req_len = sizeof(struct fcp_cmnd);
|
||||
io_req->data_xfer_len = mp_req->req_len;
|
||||
mp_req->req_buf = dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
mp_req->req_buf = dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
&mp_req->req_buf_dma,
|
||||
GFP_ATOMIC);
|
||||
if (!mp_req->req_buf) {
|
||||
|
|
@ -631,7 +631,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
|
|||
return FAILED;
|
||||
}
|
||||
|
||||
mp_req->resp_buf = dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
mp_req->resp_buf = dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
&mp_req->resp_buf_dma,
|
||||
GFP_ATOMIC);
|
||||
if (!mp_req->resp_buf) {
|
||||
|
|
@ -639,8 +639,8 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
|
|||
bnx2fc_free_mp_resc(io_req);
|
||||
return FAILED;
|
||||
}
|
||||
memset(mp_req->req_buf, 0, PAGE_SIZE);
|
||||
memset(mp_req->resp_buf, 0, PAGE_SIZE);
|
||||
memset(mp_req->req_buf, 0, CNIC_PAGE_SIZE);
|
||||
memset(mp_req->resp_buf, 0, CNIC_PAGE_SIZE);
|
||||
|
||||
/* Allocate and map mp_req_bd and mp_resp_bd */
|
||||
sz = sizeof(struct fcoe_bd_ctx);
|
||||
|
|
@ -665,7 +665,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
|
|||
mp_req_bd = mp_req->mp_req_bd;
|
||||
mp_req_bd->buf_addr_lo = (u32)addr & 0xffffffff;
|
||||
mp_req_bd->buf_addr_hi = (u32)((u64)addr >> 32);
|
||||
mp_req_bd->buf_len = PAGE_SIZE;
|
||||
mp_req_bd->buf_len = CNIC_PAGE_SIZE;
|
||||
mp_req_bd->flags = 0;
|
||||
|
||||
/*
|
||||
|
|
@ -677,7 +677,7 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
|
|||
addr = mp_req->resp_buf_dma;
|
||||
mp_resp_bd->buf_addr_lo = (u32)addr & 0xffffffff;
|
||||
mp_resp_bd->buf_addr_hi = (u32)((u64)addr >> 32);
|
||||
mp_resp_bd->buf_len = PAGE_SIZE;
|
||||
mp_resp_bd->buf_len = CNIC_PAGE_SIZE;
|
||||
mp_resp_bd->flags = 0;
|
||||
|
||||
return SUCCESS;
|
||||
|
|
|
|||
|
|
@ -673,7 +673,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
|
||||
/* Allocate and map SQ */
|
||||
tgt->sq_mem_size = tgt->max_sqes * BNX2FC_SQ_WQE_SIZE;
|
||||
tgt->sq_mem_size = (tgt->sq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
tgt->sq_mem_size = (tgt->sq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->sq = dma_alloc_coherent(&hba->pcidev->dev, tgt->sq_mem_size,
|
||||
&tgt->sq_dma, GFP_KERNEL);
|
||||
|
|
@ -686,7 +687,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
|
||||
/* Allocate and map CQ */
|
||||
tgt->cq_mem_size = tgt->max_cqes * BNX2FC_CQ_WQE_SIZE;
|
||||
tgt->cq_mem_size = (tgt->cq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
tgt->cq_mem_size = (tgt->cq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->cq = dma_alloc_coherent(&hba->pcidev->dev, tgt->cq_mem_size,
|
||||
&tgt->cq_dma, GFP_KERNEL);
|
||||
|
|
@ -699,7 +701,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
|
||||
/* Allocate and map RQ and RQ PBL */
|
||||
tgt->rq_mem_size = tgt->max_rqes * BNX2FC_RQ_WQE_SIZE;
|
||||
tgt->rq_mem_size = (tgt->rq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
tgt->rq_mem_size = (tgt->rq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->rq = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_mem_size,
|
||||
&tgt->rq_dma, GFP_KERNEL);
|
||||
|
|
@ -710,8 +713,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
}
|
||||
memset(tgt->rq, 0, tgt->rq_mem_size);
|
||||
|
||||
tgt->rq_pbl_size = (tgt->rq_mem_size / PAGE_SIZE) * sizeof(void *);
|
||||
tgt->rq_pbl_size = (tgt->rq_pbl_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
tgt->rq_pbl_size = (tgt->rq_mem_size / CNIC_PAGE_SIZE) * sizeof(void *);
|
||||
tgt->rq_pbl_size = (tgt->rq_pbl_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->rq_pbl = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_pbl_size,
|
||||
&tgt->rq_pbl_dma, GFP_KERNEL);
|
||||
|
|
@ -722,7 +726,7 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
}
|
||||
|
||||
memset(tgt->rq_pbl, 0, tgt->rq_pbl_size);
|
||||
num_pages = tgt->rq_mem_size / PAGE_SIZE;
|
||||
num_pages = tgt->rq_mem_size / CNIC_PAGE_SIZE;
|
||||
page = tgt->rq_dma;
|
||||
pbl = (u32 *)tgt->rq_pbl;
|
||||
|
||||
|
|
@ -731,13 +735,13 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
pbl++;
|
||||
*pbl = (u32)((u64)page >> 32);
|
||||
pbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* Allocate and map XFERQ */
|
||||
tgt->xferq_mem_size = tgt->max_sqes * BNX2FC_XFERQ_WQE_SIZE;
|
||||
tgt->xferq_mem_size = (tgt->xferq_mem_size + (PAGE_SIZE - 1)) &
|
||||
PAGE_MASK;
|
||||
tgt->xferq_mem_size = (tgt->xferq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->xferq = dma_alloc_coherent(&hba->pcidev->dev, tgt->xferq_mem_size,
|
||||
&tgt->xferq_dma, GFP_KERNEL);
|
||||
|
|
@ -750,8 +754,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
|
||||
/* Allocate and map CONFQ & CONFQ PBL */
|
||||
tgt->confq_mem_size = tgt->max_sqes * BNX2FC_CONFQ_WQE_SIZE;
|
||||
tgt->confq_mem_size = (tgt->confq_mem_size + (PAGE_SIZE - 1)) &
|
||||
PAGE_MASK;
|
||||
tgt->confq_mem_size = (tgt->confq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->confq = dma_alloc_coherent(&hba->pcidev->dev, tgt->confq_mem_size,
|
||||
&tgt->confq_dma, GFP_KERNEL);
|
||||
|
|
@ -763,9 +767,9 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
memset(tgt->confq, 0, tgt->confq_mem_size);
|
||||
|
||||
tgt->confq_pbl_size =
|
||||
(tgt->confq_mem_size / PAGE_SIZE) * sizeof(void *);
|
||||
(tgt->confq_mem_size / CNIC_PAGE_SIZE) * sizeof(void *);
|
||||
tgt->confq_pbl_size =
|
||||
(tgt->confq_pbl_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(tgt->confq_pbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
|
||||
tgt->confq_pbl = dma_alloc_coherent(&hba->pcidev->dev,
|
||||
tgt->confq_pbl_size,
|
||||
|
|
@ -777,7 +781,7 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
}
|
||||
|
||||
memset(tgt->confq_pbl, 0, tgt->confq_pbl_size);
|
||||
num_pages = tgt->confq_mem_size / PAGE_SIZE;
|
||||
num_pages = tgt->confq_mem_size / CNIC_PAGE_SIZE;
|
||||
page = tgt->confq_dma;
|
||||
pbl = (u32 *)tgt->confq_pbl;
|
||||
|
||||
|
|
@ -786,7 +790,7 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
pbl++;
|
||||
*pbl = (u32)((u64)page >> 32);
|
||||
pbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* Allocate and map ConnDB */
|
||||
|
|
@ -805,8 +809,8 @@ static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
|
|||
|
||||
/* Allocate and map LCQ */
|
||||
tgt->lcq_mem_size = (tgt->max_sqes + 8) * BNX2FC_SQ_WQE_SIZE;
|
||||
tgt->lcq_mem_size = (tgt->lcq_mem_size + (PAGE_SIZE - 1)) &
|
||||
PAGE_MASK;
|
||||
tgt->lcq_mem_size = (tgt->lcq_mem_size + (CNIC_PAGE_SIZE - 1)) &
|
||||
CNIC_PAGE_MASK;
|
||||
|
||||
tgt->lcq = dma_alloc_coherent(&hba->pcidev->dev, tgt->lcq_mem_size,
|
||||
&tgt->lcq_dma, GFP_KERNEL);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ static void bnx2i_adjust_qp_size(struct bnx2i_hba *hba)
|
|||
* yield integral num of page buffers
|
||||
*/
|
||||
/* adjust SQ */
|
||||
num_elements_per_pg = PAGE_SIZE / BNX2I_SQ_WQE_SIZE;
|
||||
num_elements_per_pg = CNIC_PAGE_SIZE / BNX2I_SQ_WQE_SIZE;
|
||||
if (hba->max_sqes < num_elements_per_pg)
|
||||
hba->max_sqes = num_elements_per_pg;
|
||||
else if (hba->max_sqes % num_elements_per_pg)
|
||||
|
|
@ -69,7 +69,7 @@ static void bnx2i_adjust_qp_size(struct bnx2i_hba *hba)
|
|||
~(num_elements_per_pg - 1);
|
||||
|
||||
/* adjust CQ */
|
||||
num_elements_per_pg = PAGE_SIZE / BNX2I_CQE_SIZE;
|
||||
num_elements_per_pg = CNIC_PAGE_SIZE / BNX2I_CQE_SIZE;
|
||||
if (hba->max_cqes < num_elements_per_pg)
|
||||
hba->max_cqes = num_elements_per_pg;
|
||||
else if (hba->max_cqes % num_elements_per_pg)
|
||||
|
|
@ -77,7 +77,7 @@ static void bnx2i_adjust_qp_size(struct bnx2i_hba *hba)
|
|||
~(num_elements_per_pg - 1);
|
||||
|
||||
/* adjust RQ */
|
||||
num_elements_per_pg = PAGE_SIZE / BNX2I_RQ_WQE_SIZE;
|
||||
num_elements_per_pg = CNIC_PAGE_SIZE / BNX2I_RQ_WQE_SIZE;
|
||||
if (hba->max_rqes < num_elements_per_pg)
|
||||
hba->max_rqes = num_elements_per_pg;
|
||||
else if (hba->max_rqes % num_elements_per_pg)
|
||||
|
|
@ -959,7 +959,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
|
||||
/* SQ page table */
|
||||
memset(ep->qp.sq_pgtbl_virt, 0, ep->qp.sq_pgtbl_size);
|
||||
num_pages = ep->qp.sq_mem_size / PAGE_SIZE;
|
||||
num_pages = ep->qp.sq_mem_size / CNIC_PAGE_SIZE;
|
||||
page = ep->qp.sq_phys;
|
||||
|
||||
if (cnic_dev_10g)
|
||||
|
|
@ -973,7 +973,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) ((u64) page >> 32);
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
} else {
|
||||
/* PTE is written in big endian format for
|
||||
* 5706/5708/5709 devices */
|
||||
|
|
@ -981,13 +981,13 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) page;
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
|
||||
/* RQ page table */
|
||||
memset(ep->qp.rq_pgtbl_virt, 0, ep->qp.rq_pgtbl_size);
|
||||
num_pages = ep->qp.rq_mem_size / PAGE_SIZE;
|
||||
num_pages = ep->qp.rq_mem_size / CNIC_PAGE_SIZE;
|
||||
page = ep->qp.rq_phys;
|
||||
|
||||
if (cnic_dev_10g)
|
||||
|
|
@ -1001,7 +1001,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) ((u64) page >> 32);
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
} else {
|
||||
/* PTE is written in big endian format for
|
||||
* 5706/5708/5709 devices */
|
||||
|
|
@ -1009,13 +1009,13 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) page;
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
|
||||
/* CQ page table */
|
||||
memset(ep->qp.cq_pgtbl_virt, 0, ep->qp.cq_pgtbl_size);
|
||||
num_pages = ep->qp.cq_mem_size / PAGE_SIZE;
|
||||
num_pages = ep->qp.cq_mem_size / CNIC_PAGE_SIZE;
|
||||
page = ep->qp.cq_phys;
|
||||
|
||||
if (cnic_dev_10g)
|
||||
|
|
@ -1029,7 +1029,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) ((u64) page >> 32);
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
} else {
|
||||
/* PTE is written in big endian format for
|
||||
* 5706/5708/5709 devices */
|
||||
|
|
@ -1037,7 +1037,7 @@ static void setup_qp_page_tables(struct bnx2i_endpoint *ep)
|
|||
ptbl++;
|
||||
*ptbl = (u32) page;
|
||||
ptbl++;
|
||||
page += PAGE_SIZE;
|
||||
page += CNIC_PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1064,11 +1064,11 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep)
|
|||
/* Allocate page table memory for SQ which is page aligned */
|
||||
ep->qp.sq_mem_size = hba->max_sqes * BNX2I_SQ_WQE_SIZE;
|
||||
ep->qp.sq_mem_size =
|
||||
(ep->qp.sq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.sq_mem_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
ep->qp.sq_pgtbl_size =
|
||||
(ep->qp.sq_mem_size / PAGE_SIZE) * sizeof(void *);
|
||||
(ep->qp.sq_mem_size / CNIC_PAGE_SIZE) * sizeof(void *);
|
||||
ep->qp.sq_pgtbl_size =
|
||||
(ep->qp.sq_pgtbl_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.sq_pgtbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
|
||||
ep->qp.sq_pgtbl_virt =
|
||||
dma_alloc_coherent(&hba->pcidev->dev, ep->qp.sq_pgtbl_size,
|
||||
|
|
@ -1101,11 +1101,11 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep)
|
|||
/* Allocate page table memory for CQ which is page aligned */
|
||||
ep->qp.cq_mem_size = hba->max_cqes * BNX2I_CQE_SIZE;
|
||||
ep->qp.cq_mem_size =
|
||||
(ep->qp.cq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.cq_mem_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
ep->qp.cq_pgtbl_size =
|
||||
(ep->qp.cq_mem_size / PAGE_SIZE) * sizeof(void *);
|
||||
(ep->qp.cq_mem_size / CNIC_PAGE_SIZE) * sizeof(void *);
|
||||
ep->qp.cq_pgtbl_size =
|
||||
(ep->qp.cq_pgtbl_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.cq_pgtbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
|
||||
ep->qp.cq_pgtbl_virt =
|
||||
dma_alloc_coherent(&hba->pcidev->dev, ep->qp.cq_pgtbl_size,
|
||||
|
|
@ -1144,11 +1144,11 @@ int bnx2i_alloc_qp_resc(struct bnx2i_hba *hba, struct bnx2i_endpoint *ep)
|
|||
/* Allocate page table memory for RQ which is page aligned */
|
||||
ep->qp.rq_mem_size = hba->max_rqes * BNX2I_RQ_WQE_SIZE;
|
||||
ep->qp.rq_mem_size =
|
||||
(ep->qp.rq_mem_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.rq_mem_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
ep->qp.rq_pgtbl_size =
|
||||
(ep->qp.rq_mem_size / PAGE_SIZE) * sizeof(void *);
|
||||
(ep->qp.rq_mem_size / CNIC_PAGE_SIZE) * sizeof(void *);
|
||||
ep->qp.rq_pgtbl_size =
|
||||
(ep->qp.rq_pgtbl_size + (PAGE_SIZE - 1)) & PAGE_MASK;
|
||||
(ep->qp.rq_pgtbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
|
||||
|
||||
ep->qp.rq_pgtbl_virt =
|
||||
dma_alloc_coherent(&hba->pcidev->dev, ep->qp.rq_pgtbl_size,
|
||||
|
|
@ -1270,7 +1270,7 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba)
|
|||
bnx2i_adjust_qp_size(hba);
|
||||
|
||||
iscsi_init.flags =
|
||||
ISCSI_PAGE_SIZE_4K << ISCSI_KWQE_INIT1_PAGE_SIZE_SHIFT;
|
||||
(CNIC_PAGE_BITS - 8) << ISCSI_KWQE_INIT1_PAGE_SIZE_SHIFT;
|
||||
if (en_tcp_dack)
|
||||
iscsi_init.flags |= ISCSI_KWQE_INIT1_DELAYED_ACK_ENABLE;
|
||||
iscsi_init.reserved0 = 0;
|
||||
|
|
@ -1288,15 +1288,15 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba)
|
|||
((hba->num_ccell & 0xFFFF) | (hba->max_sqes << 16));
|
||||
iscsi_init.num_ccells_per_conn = hba->num_ccell;
|
||||
iscsi_init.num_tasks_per_conn = hba->max_sqes;
|
||||
iscsi_init.sq_wqes_per_page = PAGE_SIZE / BNX2I_SQ_WQE_SIZE;
|
||||
iscsi_init.sq_wqes_per_page = CNIC_PAGE_SIZE / BNX2I_SQ_WQE_SIZE;
|
||||
iscsi_init.sq_num_wqes = hba->max_sqes;
|
||||
iscsi_init.cq_log_wqes_per_page =
|
||||
(u8) bnx2i_power_of2(PAGE_SIZE / BNX2I_CQE_SIZE);
|
||||
(u8) bnx2i_power_of2(CNIC_PAGE_SIZE / BNX2I_CQE_SIZE);
|
||||
iscsi_init.cq_num_wqes = hba->max_cqes;
|
||||
iscsi_init.cq_num_pages = (hba->max_cqes * BNX2I_CQE_SIZE +
|
||||
(PAGE_SIZE - 1)) / PAGE_SIZE;
|
||||
(CNIC_PAGE_SIZE - 1)) / CNIC_PAGE_SIZE;
|
||||
iscsi_init.sq_num_pages = (hba->max_sqes * BNX2I_SQ_WQE_SIZE +
|
||||
(PAGE_SIZE - 1)) / PAGE_SIZE;
|
||||
(CNIC_PAGE_SIZE - 1)) / CNIC_PAGE_SIZE;
|
||||
iscsi_init.rq_buffer_size = BNX2I_RQ_WQE_SIZE;
|
||||
iscsi_init.rq_num_wqes = hba->max_rqes;
|
||||
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ static int bnx2i_setup_mp_bdt(struct bnx2i_hba *hba)
|
|||
struct iscsi_bd *mp_bdt;
|
||||
u64 addr;
|
||||
|
||||
hba->mp_bd_tbl = dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
hba->mp_bd_tbl = dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
&hba->mp_bd_dma, GFP_KERNEL);
|
||||
if (!hba->mp_bd_tbl) {
|
||||
printk(KERN_ERR "unable to allocate Middle Path BDT\n");
|
||||
|
|
@ -533,11 +533,12 @@ static int bnx2i_setup_mp_bdt(struct bnx2i_hba *hba)
|
|||
goto out;
|
||||
}
|
||||
|
||||
hba->dummy_buffer = dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
hba->dummy_buffer = dma_alloc_coherent(&hba->pcidev->dev,
|
||||
CNIC_PAGE_SIZE,
|
||||
&hba->dummy_buf_dma, GFP_KERNEL);
|
||||
if (!hba->dummy_buffer) {
|
||||
printk(KERN_ERR "unable to alloc Middle Path Dummy Buffer\n");
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
hba->mp_bd_tbl, hba->mp_bd_dma);
|
||||
hba->mp_bd_tbl = NULL;
|
||||
rc = -1;
|
||||
|
|
@ -548,7 +549,7 @@ static int bnx2i_setup_mp_bdt(struct bnx2i_hba *hba)
|
|||
addr = (unsigned long) hba->dummy_buf_dma;
|
||||
mp_bdt->buffer_addr_lo = addr & 0xffffffff;
|
||||
mp_bdt->buffer_addr_hi = addr >> 32;
|
||||
mp_bdt->buffer_length = PAGE_SIZE;
|
||||
mp_bdt->buffer_length = CNIC_PAGE_SIZE;
|
||||
mp_bdt->flags = ISCSI_BD_LAST_IN_BD_CHAIN |
|
||||
ISCSI_BD_FIRST_IN_BD_CHAIN;
|
||||
out:
|
||||
|
|
@ -565,12 +566,12 @@ out:
|
|||
static void bnx2i_free_mp_bdt(struct bnx2i_hba *hba)
|
||||
{
|
||||
if (hba->mp_bd_tbl) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
hba->mp_bd_tbl, hba->mp_bd_dma);
|
||||
hba->mp_bd_tbl = NULL;
|
||||
}
|
||||
if (hba->dummy_buffer) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
hba->dummy_buffer, hba->dummy_buf_dma);
|
||||
hba->dummy_buffer = NULL;
|
||||
}
|
||||
|
|
@ -934,14 +935,14 @@ static void bnx2i_conn_free_login_resources(struct bnx2i_hba *hba,
|
|||
struct bnx2i_conn *bnx2i_conn)
|
||||
{
|
||||
if (bnx2i_conn->gen_pdu.resp_bd_tbl) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
bnx2i_conn->gen_pdu.resp_bd_tbl,
|
||||
bnx2i_conn->gen_pdu.resp_bd_dma);
|
||||
bnx2i_conn->gen_pdu.resp_bd_tbl = NULL;
|
||||
}
|
||||
|
||||
if (bnx2i_conn->gen_pdu.req_bd_tbl) {
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
bnx2i_conn->gen_pdu.req_bd_tbl,
|
||||
bnx2i_conn->gen_pdu.req_bd_dma);
|
||||
bnx2i_conn->gen_pdu.req_bd_tbl = NULL;
|
||||
|
|
@ -998,13 +999,13 @@ static int bnx2i_conn_alloc_login_resources(struct bnx2i_hba *hba,
|
|||
bnx2i_conn->gen_pdu.resp_wr_ptr = bnx2i_conn->gen_pdu.resp_buf;
|
||||
|
||||
bnx2i_conn->gen_pdu.req_bd_tbl =
|
||||
dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
&bnx2i_conn->gen_pdu.req_bd_dma, GFP_KERNEL);
|
||||
if (bnx2i_conn->gen_pdu.req_bd_tbl == NULL)
|
||||
goto login_req_bd_tbl_failure;
|
||||
|
||||
bnx2i_conn->gen_pdu.resp_bd_tbl =
|
||||
dma_alloc_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
&bnx2i_conn->gen_pdu.resp_bd_dma,
|
||||
GFP_KERNEL);
|
||||
if (bnx2i_conn->gen_pdu.resp_bd_tbl == NULL)
|
||||
|
|
@ -1013,7 +1014,7 @@ static int bnx2i_conn_alloc_login_resources(struct bnx2i_hba *hba,
|
|||
return 0;
|
||||
|
||||
login_resp_bd_tbl_failure:
|
||||
dma_free_coherent(&hba->pcidev->dev, PAGE_SIZE,
|
||||
dma_free_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
|
||||
bnx2i_conn->gen_pdu.req_bd_tbl,
|
||||
bnx2i_conn->gen_pdu.req_bd_dma);
|
||||
bnx2i_conn->gen_pdu.req_bd_tbl = NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue