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

Commit 11501ab9 authored by Krzysztof Blaszkowski's avatar Krzysztof Blaszkowski Committed by Doug Ledford
Browse files

IB/hfi1: Relocate rcvhdrcnt module parameter check. 



Validate the rcvhdrcnt module parameter in a single function at module
load time. This allows proper error reporting.

Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarKrzysztof Blaszkowski <krzysztof.blaszkowski@intel.com>
Signed-off-by: default avatarTymoteusz Kielan <tymoteusz.kielan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 458ed666

drivers/infiniband/hw/hfi1/init.c

+26 −18
Original line number Original line Diff line number Diff line
@@ -262,13 +262,6 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt, 
		}

		}

		rcd->eager_base = base * dd->rcv_entries.group_size;

		rcd->eager_base = base * dd->rcv_entries.group_size;





		/* Validate and initialize Rcv Hdr Q variables */

		if (rcvhdrcnt % HDRQ_INCREMENT) {

			dd_dev_err(dd,

				   "ctxt%u: header queue count %d must be divisible by %lu\n",

				   rcd->ctxt, rcvhdrcnt, HDRQ_INCREMENT);

			goto bail;

		}

		rcd->rcvhdrq_cnt = rcvhdrcnt;

		rcd->rcvhdrq_cnt = rcvhdrcnt;

		rcd->rcvhdrqentsize = hfi1_hdrq_entsize;

		rcd->rcvhdrqentsize = hfi1_hdrq_entsize;

		/*

		/*
@@ -1399,6 +1392,29 @@ static void postinit_cleanup(struct hfi1_devdata *dd) 
	hfi1_free_devdata(dd);

	hfi1_free_devdata(dd);

}

}





static int init_validate_rcvhdrcnt(struct device *dev, uint thecnt)

{

	if (thecnt <= HFI1_MIN_HDRQ_EGRBUF_CNT) {

		hfi1_early_err(dev, "Receive header queue count too small\n");

		return -EINVAL;

	}



	if (thecnt > HFI1_MAX_HDRQ_EGRBUF_CNT) {

		hfi1_early_err(dev,

			       "Receive header queue count cannot be greater than %u\n",

			       HFI1_MAX_HDRQ_EGRBUF_CNT);

		return -EINVAL;

	}



	if (thecnt % HDRQ_INCREMENT) {

		hfi1_early_err(dev, "Receive header queue count %d must be divisible by %lu\n",

			       thecnt, HDRQ_INCREMENT);

		return -EINVAL;

	}



	return 0;

}



static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

{

	int ret = 0, j, pidx, initfail;

	int ret = 0, j, pidx, initfail;
@@ -1409,18 +1425,10 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	HFI1_CAP_LOCK();

	HFI1_CAP_LOCK();





	/* Validate some global module parameters */

	/* Validate some global module parameters */

	if (rcvhdrcnt <= HFI1_MIN_HDRQ_EGRBUF_CNT) {

	ret = init_validate_rcvhdrcnt(&pdev->dev, rcvhdrcnt);

		hfi1_early_err(&pdev->dev, "Header queue  count too small\n");

	if (ret)

		ret = -EINVAL;

		goto bail;

	}

	if (rcvhdrcnt > HFI1_MAX_HDRQ_EGRBUF_CNT) {

		hfi1_early_err(&pdev->dev,

			       "Receive header queue count cannot be greater than %u\n",

			       HFI1_MAX_HDRQ_EGRBUF_CNT);

		ret = -EINVAL;

		goto bail;

		goto bail;

	}



	/* use the encoding function as a sanitization check */

	/* use the encoding function as a sanitization check */

	if (!encode_rcv_header_entry_size(hfi1_hdrq_entsize)) {

	if (!encode_rcv_header_entry_size(hfi1_hdrq_entsize)) {

		hfi1_early_err(&pdev->dev, "Invalid HdrQ Entry size %u\n",

		hfi1_early_err(&pdev->dev, "Invalid HdrQ Entry size %u\n",