hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/hfi1: Replace custom hfi1 macros with PCIe macros 

IB/hfi1 contains custom macros for PCIe link configuration. Remove the
custom macros in favor of the PCIe link macros. No functional change
intended.

Signed-off-by: Frederick Lawler <fred@fredlawl.com>
[bhelgaas: use "GT" instead of "GB"]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
This commit is contained in:
Frederick Lawler 2018-04-16 19:28:25 -05:00 committed by Bjorn Helgaas
parent c80851f6ce
commit 8a7d1b16bc
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/infiniband/hw/hfi1/pcie.c
View File

@ -56,11 +56,6 @@
#include "chip_registers.h" #include "chip_registers.h"
#include "aspm.h" #include "aspm.h"
/* link speed vector for Gen3 speed - not in Linux headers */
#define GEN1_SPEED_VECTOR 0x1
#define GEN2_SPEED_VECTOR 0x2
#define GEN3_SPEED_VECTOR 0x3
/* /*
* This file contains PCIe utility routines. * This file contains PCIe utility routines.
*/ */
@ -265,7 +260,7 @@ static u32 extract_speed(u16 linkstat)
case PCI_EXP_LNKSTA_CLS_5_0GB: case PCI_EXP_LNKSTA_CLS_5_0GB:
speed = 5000; /* Gen 2, 5GHz */ speed = 5000; /* Gen 2, 5GHz */
break; break;
case GEN3_SPEED_VECTOR: case PCI_EXP_LNKSTA_CLS_8_0GB:
speed = 8000; /* Gen 3, 8GHz */ speed = 8000; /* Gen 3, 8GHz */
break; break;
} }
@ -320,7 +315,7 @@ int pcie_speeds(struct hfi1_devdata *dd)
return ret; return ret;
} }
if ((linkcap & PCI_EXP_LNKCAP_SLS) != GEN3_SPEED_VECTOR) { if ((linkcap & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_8_0GB) {
dd_dev_info(dd, dd_dev_info(dd,
"This HFI is not Gen3 capable, max speed 0x%x, need 0x3\n", "This HFI is not Gen3 capable, max speed 0x%x, need 0x3\n",
linkcap & PCI_EXP_LNKCAP_SLS); linkcap & PCI_EXP_LNKCAP_SLS);
@ -697,9 +692,6 @@ const struct pci_error_handlers hfi1_pci_err_handler = {
/* gasket block secondary bus reset delay */ /* gasket block secondary bus reset delay */
#define SBR_DELAY_US 200000 /* 200ms */ #define SBR_DELAY_US 200000 /* 200ms */
/* mask for PCIe capability register lnkctl2 target link speed */
#define LNKCTL2_TARGET_LINK_SPEED_MASK 0xf
static uint pcie_target = 3; static uint pcie_target = 3;
module_param(pcie_target, uint, S_IRUGO); module_param(pcie_target, uint, S_IRUGO);
MODULE_PARM_DESC(pcie_target, "PCIe target speed (0 skip, 1-3 Gen1-3)"); MODULE_PARM_DESC(pcie_target, "PCIe target speed (0 skip, 1-3 Gen1-3)");
@ -1048,13 +1040,13 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
return 0; return 0;
if (pcie_target == 1) { /* target Gen1 */ if (pcie_target == 1) { /* target Gen1 */
target_vector = GEN1_SPEED_VECTOR; target_vector = PCI_EXP_LNKCTL2_TLS_2_5GT;
target_speed = 2500; target_speed = 2500;
} else if (pcie_target == 2) { /* target Gen2 */ } else if (pcie_target == 2) { /* target Gen2 */
target_vector = GEN2_SPEED_VECTOR; target_vector = PCI_EXP_LNKCTL2_TLS_5_0GT;
target_speed = 5000; target_speed = 5000;
} else if (pcie_target == 3) { /* target Gen3 */ } else if (pcie_target == 3) { /* target Gen3 */
target_vector = GEN3_SPEED_VECTOR; target_vector = PCI_EXP_LNKCTL2_TLS_8_0GT;
target_speed = 8000; target_speed = 8000;
} else { } else {
/* off or invalid target - skip */ /* off or invalid target - skip */
@ -1293,8 +1285,8 @@ retry:
dd_dev_info(dd, "%s: ..old link control2: 0x%x\n", __func__, dd_dev_info(dd, "%s: ..old link control2: 0x%x\n", __func__,
(u32)lnkctl2); (u32)lnkctl2);
/* only write to parent if target is not as high as ours */ /* only write to parent if target is not as high as ours */
if ((lnkctl2 & LNKCTL2_TARGET_LINK_SPEED_MASK) < target_vector) { if ((lnkctl2 & PCI_EXP_LNKCTL2_TLS) < target_vector) {
lnkctl2 &= ~LNKCTL2_TARGET_LINK_SPEED_MASK; lnkctl2 &= ~PCI_EXP_LNKCTL2_TLS;
lnkctl2 |= target_vector; lnkctl2 |= target_vector;
dd_dev_info(dd, "%s: ..new link control2: 0x%x\n", __func__, dd_dev_info(dd, "%s: ..new link control2: 0x%x\n", __func__,
(u32)lnkctl2); (u32)lnkctl2);
@ -1319,7 +1311,7 @@ retry:
dd_dev_info(dd, "%s: ..old link control2: 0x%x\n", __func__, dd_dev_info(dd, "%s: ..old link control2: 0x%x\n", __func__,
(u32)lnkctl2); (u32)lnkctl2);
lnkctl2 &= ~LNKCTL2_TARGET_LINK_SPEED_MASK; lnkctl2 &= ~PCI_EXP_LNKCTL2_TLS;
lnkctl2 |= target_vector; lnkctl2 |= target_vector;
dd_dev_info(dd, "%s: ..new link control2: 0x%x\n", __func__, dd_dev_info(dd, "%s: ..new link control2: 0x%x\n", __func__,
(u32)lnkctl2); (u32)lnkctl2);