Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next (0636b33c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/infiniband/core/mad.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2953,6 +2953,9 @@ static void ib_mad_remove_device(struct ib_device *device)
		{
		int i, num_ports, cur_port;

		if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
		return;

		if (device->node_type == RDMA_NODE_IB_SWITCH) {
		num_ports = 1;
		cur_port = 0;

drivers/infiniband/hw/nes/nes_hw.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1899,9 +1899,14 @@ void nes_destroy_nic_qp(struct nes_vnic *nesvnic)
		u16 wqe_fragment_index;
		u64 wqe_frag;
		u32 cqp_head;
		u32 wqm_cfg0;
		unsigned long flags;
		int ret;

		/* clear wqe stall before destroying NIC QP */
		wqm_cfg0 = nes_read_indexed(nesdev, NES_IDX_WQM_CONFIG0);
		nes_write_indexed(nesdev, NES_IDX_WQM_CONFIG0, wqm_cfg0 & 0xFFFF7FFF);

		/* Free remaining NIC receive buffers */
		while (nesvnic->nic.rq_head != nesvnic->nic.rq_tail) {
		nic_rqe = &nesvnic->nic.rq_vbase[nesvnic->nic.rq_tail];
		@@ -2020,6 +2025,9 @@ void nes_destroy_nic_qp(struct nes_vnic *nesvnic)

		pci_free_consistent(nesdev->pcidev, nesvnic->nic_mem_size, nesvnic->nic_vbase,
		nesvnic->nic_pbase);

		/* restore old wqm_cfg0 value */
		nes_write_indexed(nesdev, NES_IDX_WQM_CONFIG0, wqm_cfg0);
		}

		/**

drivers/infiniband/hw/nes/nes_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ enum indexed_regs {
		NES_IDX_ENDNODE0_NSTAT_TX_OCTETS_HI = 0x7004,
		NES_IDX_ENDNODE0_NSTAT_TX_FRAMES_LO = 0x7008,
		NES_IDX_ENDNODE0_NSTAT_TX_FRAMES_HI = 0x700c,
		NES_IDX_WQM_CONFIG0 = 0x5000,
		NES_IDX_WQM_CONFIG1 = 0x5004,
		NES_IDX_CM_CONFIG = 0x5100,
		NES_IDX_NIC_LOGPORT_TO_PHYPORT = 0x6000,

drivers/infiniband/hw/nes/nes_nic.c

+28 −2

Original line number	Diff line number	Diff line
		@@ -1595,7 +1595,6 @@ struct net_device nes_netdev_init(struct nes_device nesdev,
		struct nes_vnic *nesvnic;
		struct net_device *netdev;
		struct nic_qp_map *curr_qp_map;
		u32 u32temp;
		u8 phy_type = nesdev->nesadapter->phy_type[nesdev->mac_index];

		netdev = alloc_etherdev(sizeof(struct nes_vnic));
		@@ -1707,6 +1706,10 @@ struct net_device nes_netdev_init(struct nes_device nesdev,
		((phy_type == NES_PHY_TYPE_PUMA_1G) &&
		(((PCI_FUNC(nesdev->pcidev->devfn) == 1) && (nesdev->mac_index == 2)) \|\|
		((PCI_FUNC(nesdev->pcidev->devfn) == 2) && (nesdev->mac_index == 1)))))) {
		u32 u32temp;
		u32 link_mask;
		u32 link_val;

		u32temp = nes_read_indexed(nesdev, NES_IDX_PHY_PCS_CONTROL_STATUS0 +
		(0x200 * (nesdev->mac_index & 1)));
		if (phy_type != NES_PHY_TYPE_PUMA_1G) {
		@@ -1715,13 +1718,36 @@ struct net_device nes_netdev_init(struct nes_device nesdev,
		(0x200 * (nesdev->mac_index & 1)), u32temp);
		}

		/* Check and set linkup here. This is for back to back */
		/* configuration where second port won't get link interrupt */
		switch (phy_type) {
		case NES_PHY_TYPE_PUMA_1G:
		if (nesdev->mac_index < 2) {
		link_mask = 0x01010000;
		link_val = 0x01010000;
		} else {
		link_mask = 0x02020000;
		link_val = 0x02020000;
		}
		break;
		default:
		link_mask = 0x0f1f0000;
		link_val = 0x0f0f0000;
		break;
		}

		u32temp = nes_read_indexed(nesdev,
		NES_IDX_PHY_PCS_CONTROL_STATUS0 +
		(0x200 * (nesdev->mac_index & 1)));
		if ((u32temp & link_mask) == link_val)
		nesvnic->linkup = 1;

		/* clear the MAC interrupt status, assumes direct logical to physical mapping */
		u32temp = nes_read_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index));
		nes_debug(NES_DBG_INIT, "Phy interrupt status = 0x%X.\n", u32temp);
		nes_write_indexed(nesdev, NES_IDX_MAC_INT_STATUS + (0x200 * nesdev->mac_index), u32temp);

		nes_init_phy(nesdev);

		}

		return netdev;

drivers/infiniband/hw/nes/nes_verbs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1323,6 +1323,7 @@ static struct ib_qp nes_create_qp(struct ib_pd ibpd,
		nesqp->nesqp_context->aeq_token_low = cpu_to_le32((u32)((unsigned long)(nesqp)));
		nesqp->nesqp_context->aeq_token_high = cpu_to_le32((u32)(upper_32_bits((unsigned long)(nesqp))));
		nesqp->nesqp_context->ird_ord_sizes = cpu_to_le32(NES_QPCONTEXT_ORDIRD_ALSMM \|
		NES_QPCONTEXT_ORDIRD_AAH \|
		((((u32)nesadapter->max_irrq_wr) <<
		NES_QPCONTEXT_ORDIRD_IRDSIZE_SHIFT) & NES_QPCONTEXT_ORDIRD_IRDSIZE_MASK));
		if (disable_mpa_crc) {