Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe: "Small set of three regression fixing patches, things are looking pretty good here. - Fix cxgb4 to work again with non-4k page sizes - NULL pointer oops in SRP during sg_reset" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: iw_cxgb4: cq/qp mask depends on bar2 pages in a host page cxgb4: Export sge_host_page_size to ulds RDMA/srp: Rework SCSI device reset handling
This commit is contained in:
@@ -660,6 +660,7 @@ static void uld_init(struct adapter *adap, struct cxgb4_lld_info *lld)
|
||||
lld->cclk_ps = 1000000000 / adap->params.vpd.cclk;
|
||||
lld->udb_density = 1 << adap->params.sge.eq_qpp;
|
||||
lld->ucq_density = 1 << adap->params.sge.iq_qpp;
|
||||
lld->sge_host_page_size = 1 << (adap->params.sge.hps + 10);
|
||||
lld->filt_mode = adap->params.tp.vlan_pri_map;
|
||||
/* MODQ_REQ_MAP sets queues 0-3 to chan 0-3 */
|
||||
for (i = 0; i < NCHAN; i++)
|
||||
|
@@ -336,6 +336,7 @@ struct cxgb4_lld_info {
|
||||
unsigned int cclk_ps; /* Core clock period in psec */
|
||||
unsigned short udb_density; /* # of user DB/page */
|
||||
unsigned short ucq_density; /* # of user CQs/page */
|
||||
unsigned int sge_host_page_size; /* SGE host page size */
|
||||
unsigned short filt_mode; /* filter optional components */
|
||||
unsigned short tx_modq[NCHAN]; /* maps each tx channel to a */
|
||||
/* scheduler queue */
|
||||
|
Reference in New Issue
Block a user