Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f938a7 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branch 'ehca' into for-next

parents 216fe702 45e354e3

drivers/infiniband/hw/ehca/ehca_irq.c

+2 −3
Original line number Diff line number Diff line
@@ -548,11 +548,10 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq) 
	struct ehca_eq *eq = &shca->eq;

	struct ehca_eqe_cache_entry *eqe_cache = eq->eqe_cache;

	u64 eqe_value, ret;

	unsigned long flags;

	int eqe_cnt, i;

	int eq_empty = 0;



	spin_lock_irqsave(&eq->irq_spinlock, flags);

	spin_lock(&eq->irq_spinlock);

	if (is_irq) {

		const int max_query_cnt = 100;

		int query_cnt = 0;
@@ -643,7 +642,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq) 
	} while (1);



unlock_irq_spinlock:

	spin_unlock_irqrestore(&eq->irq_spinlock, flags);

	spin_unlock(&eq->irq_spinlock);

}



void ehca_tasklet_eq(unsigned long data)

drivers/infiniband/hw/ehca/ehca_qp.c

+1 −3
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ static struct kmem_cache *qp_cache; 
/*

 * attributes not supported by query qp

 */

#define QP_ATTR_QUERY_NOT_SUPPORTED (IB_QP_MAX_DEST_RD_ATOMIC | \

				     IB_QP_MAX_QP_RD_ATOMIC   | \

				     IB_QP_ACCESS_FLAGS       | \

#define QP_ATTR_QUERY_NOT_SUPPORTED (IB_QP_ACCESS_FLAGS       | \

				     IB_QP_EN_SQD_ASYNC_NOTIFY)



/*

drivers/infiniband/hw/ehca/ehca_sqp.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ int ehca_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, 
{

	int ret;



	if (!port_num || port_num > ibdev->phys_port_cnt)

	if (!port_num || port_num > ibdev->phys_port_cnt || !in_wc)

		return IB_MAD_RESULT_FAILURE;



	/* accept only pma request */