IB/hfi1: Permanently enable P_Key checking in HFI

Ingress and egress port P_Key checking should always be performed for
HFIs. This patch will enable ingress and egress P_Key checking when
the port is initialized and will ignore the P_Key information sent by
the FM in the port info structure which is meant to be used only by the
switch.

Reviewed-by: Easwar Hariharan <easwar.hariharan@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Neel Desai <neel.desai@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 21dca7ac059ca77313b694db5cbf3bdefa252e25..51b760971e1e8645800ac4a2985089106ae3893b 100644 (file)
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -484,6 +484,9 @@ void hfi1_init_pportdata(struct pci_dev *pdev, struct hfi1_pportdata *ppd,
        default_pkey_idx = 1;
 
        ppd->pkeys[default_pkey_idx] = DEFAULT_P_KEY;
+       ppd->part_enforce |= HFI1_PART_ENFORCE_IN;
+       ppd->part_enforce |= HFI1_PART_ENFORCE_OUT;
+
        if (loopback) {
                hfi1_early_err(&pdev->dev,
                               "Faking data partition 0x8001 in idx %u\n",

diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 08ed5a4a0c622a1131453bdbab0b4198de12c12a..4c6f51ce258466ef28d0468706a0c6ef6ca3b512 100644 (file)
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -1155,16 +1155,6 @@ static int __subn_set_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data,
                ppd->linkinit_reason =
                        (pi->partenforce_filterraw &
                         OPA_PI_MASK_LINKINIT_REASON);
-       /* enable/disable SW pkey checking as per FM control */
-       if (pi->partenforce_filterraw & OPA_PI_MASK_PARTITION_ENFORCE_IN)
-               ppd->part_enforce |= HFI1_PART_ENFORCE_IN;
-       else
-               ppd->part_enforce &= ~HFI1_PART_ENFORCE_IN;
-
-       if (pi->partenforce_filterraw & OPA_PI_MASK_PARTITION_ENFORCE_OUT)
-               ppd->part_enforce |= HFI1_PART_ENFORCE_OUT;
-       else
-               ppd->part_enforce &= ~HFI1_PART_ENFORCE_OUT;
 
        /* Must be a valid unicast LID address. */
        if ((smlid == 0 && ls_old > IB_PORT_INIT) ||