IB/hfi1: Consider LMC in 16B/bypass ingress packet check

Ingress packet check for 16B/bypass packets should consider the port
LMC. Not doing this will result in packets sent to the LMC LIDs getting
dropped. The check is implemented in HW for 9B packets.

Reviewed-by: Mike Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index d5277c23cba60f3d077dfc88114448c2ac594984..a8ad70730203995c4529e909e09be028556afc18 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -1426,7 +1426,7 @@ static int hfi1_bypass_ingress_pkt_check(struct hfi1_packet *packet)
        if ((!(hfi1_is_16B_mcast(packet->dlid))) &&
            (packet->dlid !=
                opa_get_lid(be32_to_cpu(OPA_LID_PERMISSIVE), 16B))) {
-               if (packet->dlid != ppd->lid)
+               if ((packet->dlid & ~((1 << ppd->lmc) - 1)) != ppd->lid)
                        return -EINVAL;
        }