diff options
| author | Michael J. Ruhl <michael.j.ruhl@intel.com> | 2018-08-15 22:58:49 -0700 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2018-09-01 08:11:34 -0400 |
| commit | 6a516bc9d70b291d3271c6c66b89c25e3c2b5795 (patch) | |
| tree | 19016cca73615a89d8e37f202f9db22d5a2150e7 /drivers/infiniband/hw/hfi1/chip.c | |
| parent | 22c21438aad76022b6e41fea02e7e382d94ab361 (diff) | |
| download | linux-stable-6a516bc9d70b291d3271c6c66b89c25e3c2b5795.tar.gz linux-stable-6a516bc9d70b291d3271c6c66b89c25e3c2b5795.tar.bz2 linux-stable-6a516bc9d70b291d3271c6c66b89c25e3c2b5795.zip | |
IB/hfi1: tune_pcie_caps is arbitrarily placed, poorly
The tune_pcie_caps needs to occur sometime after PCI is enabled, but
before the HFI is enabled. Currently it is placed in the MSIx
allocation code which doesn't really fit. Moving it to just after
the gen3 bump.
Clean up the associated code (modules, etc.).
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Sadanand Warrier <sadanand.warrier@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/chip.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/chip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index 2c19bf772451..db6b095e9d15 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -15123,6 +15123,12 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev, if (ret) goto bail_cleanup; + /* + * This should probably occur in hfi1_pcie_init(), but historically + * occurs after the do_pcie_gen3_transition() code. + */ + tune_pcie_caps(dd); + /* start setting dd values and adjusting CSRs */ init_early_variables(dd); |