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

Commit 168bd298 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3504f7a f09ef134

drivers/infiniband/hw/cxgb4/device.c

+13 −2
Original line number Diff line number Diff line
@@ -783,6 +783,7 @@ void c4iw_init_dev_ucontext(struct c4iw_rdev *rdev, 
static int c4iw_rdev_open(struct c4iw_rdev *rdev)

{

	int err;

	unsigned int factor;



	c4iw_init_dev_ucontext(rdev, &rdev->uctx);
@@ -806,8 +807,18 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev) 
		return -EINVAL;

	}



	rdev->qpmask = rdev->lldi.udb_density - 1;

	rdev->cqmask = rdev->lldi.ucq_density - 1;

	/* This implementation requires a sge_host_page_size <= PAGE_SIZE. */

	if (rdev->lldi.sge_host_page_size > PAGE_SIZE) {

		pr_err("%s: unsupported sge host page size %u\n",

		       pci_name(rdev->lldi.pdev),

		       rdev->lldi.sge_host_page_size);

		return -EINVAL;

	}



	factor = PAGE_SIZE / rdev->lldi.sge_host_page_size;

	rdev->qpmask = (rdev->lldi.udb_density * factor) - 1;

	rdev->cqmask = (rdev->lldi.ucq_density * factor) - 1;



	pr_debug("dev %s stag start 0x%0x size 0x%0x num stags %d pbl start 0x%0x size 0x%0x rq start 0x%0x size 0x%0x qp qid start %u size %u cq qid start %u size %u srq size %u\n",

		 pci_name(rdev->lldi.pdev), rdev->lldi.vr->stag.start,

		 rdev->lldi.vr->stag.size, c4iw_num_stags(rdev),

drivers/infiniband/ulp/srp/ib_srp.c

+0 −10
Original line number Diff line number Diff line
@@ -3032,7 +3032,6 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) 
{

	struct srp_target_port *target = host_to_target(scmnd->device->host);

	struct srp_rdma_ch *ch;

	int i, j;

	u8 status;



	shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n");
@@ -3044,15 +3043,6 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) 
	if (status)

		return FAILED;



	for (i = 0; i < target->ch_count; i++) {

		ch = &target->ch[i];

		for (j = 0; j < target->req_ring_size; ++j) {

			struct srp_request *req = &ch->req_ring[j];



			srp_finish_req(ch, req, scmnd->device, DID_RESET << 16);

		}

	}



	return SUCCESS;

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c

+1 −0
Original line number Diff line number Diff line
@@ -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++)

drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */