Merge branches '4.7-rc-misc', 'hfi1-fixes', 'i40iw-rc-fixes' and... (9903fd13) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/infiniband/core/cache.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -411,7 +411,9 @@ int ib_cache_gid_del_all_netdev_gids(struct ib_device *ib_dev, u8 port,

		for (ix = 0; ix < table->sz; ix++)
		if (table->data_vec[ix].attr.ndev == ndev)
		if (!del_gid(ib_dev, port, table, ix, false))
		if (!del_gid(ib_dev, port, table, ix,
		!!(table->data_vec[ix].props &
		GID_TABLE_ENTRY_DEFAULT)))
		deleted = true;

		write_unlock_irq(&table->rwlock);

drivers/infiniband/core/cma.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -3876,12 +3876,12 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,
		gid_type = id_priv->cma_dev->default_gid_type[id_priv->id.port_num -
		rdma_start_port(id_priv->cma_dev->device)];
		if (addr->sa_family == AF_INET) {
		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)
		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) {
		mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
		err = cma_igmp_send(ndev, &mc->multicast.ib->rec.mgid,
		true);
		if (!err) {
		if (!err)
		mc->igmp_joined = true;
		mc->multicast.ib->rec.hop_limit = IPV6_DEFAULT_HOPLIMIT;
		}
		} else {
		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)

drivers/infiniband/core/uverbs_cmd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1747,7 +1747,7 @@ static int create_qp(struct ib_uverbs_file *file,
		struct ib_srq *srq = NULL;
		struct ib_qp *qp;
		char *buf;
		struct ib_qp_init_attr attr;
		struct ib_qp_init_attr attr = {};
		struct ib_uverbs_ex_create_qp_resp resp;
		int ret;

drivers/infiniband/core/verbs.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -511,12 +511,16 @@ int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
		ah_attr->grh.dgid = sgid;

		if (!rdma_cap_eth_ah(device, port_num)) {
		if (dgid.global.interface_id != cpu_to_be64(IB_SA_WELL_KNOWN_GUID)) {
		ret = ib_find_cached_gid_by_port(device, &dgid,
		IB_GID_TYPE_IB,
		port_num, NULL,
		&gid_index);
		if (ret)
		return ret;
		} else {
		gid_index = 0;
		}
		}

		ah_attr->grh.sgid_index = (u8) gid_index;

drivers/infiniband/hw/hfi1/chip.c

+20 −8

Original line number	Diff line number	Diff line
		@@ -1037,7 +1037,7 @@ static void dc_shutdown(struct hfi1_devdata *);
		static void dc_start(struct hfi1_devdata *);
		static int qos_rmt_entries(struct hfi1_devdata dd, unsigned int mp,
		unsigned int *np);
		static void remove_full_mgmt_pkey(struct hfi1_pportdata *ppd);
		static void clear_full_mgmt_pkey(struct hfi1_pportdata *ppd);

		/*
		* Error interrupt table entry. This is used as input to the interrupt
		@@ -6962,8 +6962,6 @@ void handle_link_down(struct work_struct *work)
		}

		reset_neighbor_info(ppd);
		if (ppd->mgmt_allowed)
		remove_full_mgmt_pkey(ppd);

		/* disable the port */
		clear_rcvctrl(ppd->dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
		@@ -7070,12 +7068,16 @@ static void add_full_mgmt_pkey(struct hfi1_pportdata *ppd)
		__func__, ppd->pkeys[2], FULL_MGMT_P_KEY);
		ppd->pkeys[2] = FULL_MGMT_P_KEY;
		(void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
		hfi1_event_pkey_change(ppd->dd, ppd->port);
		}

		static void remove_full_mgmt_pkey(struct hfi1_pportdata *ppd)
		static void clear_full_mgmt_pkey(struct hfi1_pportdata *ppd)
		{
		if (ppd->pkeys[2] != 0) {
		ppd->pkeys[2] = 0;
		(void)hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_PKEYS, 0);
		hfi1_event_pkey_change(ppd->dd, ppd->port);
		}
		}

		/*
		@@ -9168,6 +9170,13 @@ int start_link(struct hfi1_pportdata *ppd)
		return 0;
		}

		/*
		* FULL_MGMT_P_KEY is cleared from the pkey table, so that the
		* pkey table can be configured properly if the HFI unit is connected
		* to switch port with MgmtAllowed=NO
		*/
		clear_full_mgmt_pkey(ppd);

		return set_link_state(ppd, HLS_DN_POLL);
		}

		@@ -9777,7 +9786,7 @@ static void set_send_length(struct hfi1_pportdata *ppd)
		u64 len1 = 0, len2 = (((dd->vld[15].mtu + max_hb) >> 2)
		& SEND_LEN_CHECK1_LEN_VL15_MASK) <<
		SEND_LEN_CHECK1_LEN_VL15_SHIFT;
		int i;
		int i, j;
		u32 thres;

		for (i = 0; i < ppd->vls_supported; i++) {
		@@ -9801,7 +9810,10 @@ static void set_send_length(struct hfi1_pportdata *ppd)
		sc_mtu_to_threshold(dd->vld[i].sc,
		dd->vld[i].mtu,
		dd->rcd[0]->rcvhdrqentsize));
		sc_set_cr_threshold(dd->vld[i].sc, thres);
		for (j = 0; j < INIT_SC_PER_VL; j++)
		sc_set_cr_threshold(
		pio_select_send_context_vl(dd, j, i),
		thres);
		}
		thres = min(sc_percent_to_threshold(dd->vld[15].sc, 50),
		sc_mtu_to_threshold(dd->vld[15].sc,