evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ehca' into for-next

Browse source
This commit is contained in:
Roland Dreier 2010-03-01 23:51:55 -08:00
commit 85f938a70c
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/infiniband/hw/ehca/ehca_irq.c
View file

@ -548,11 +548,10 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
struct ehca_eq *eq = &shca->eq; struct ehca_eq *eq = &shca->eq;
struct ehca_eqe_cache_entry *eqe_cache = eq->eqe_cache; struct ehca_eqe_cache_entry *eqe_cache = eq->eqe_cache;
u64 eqe_value, ret; u64 eqe_value, ret;
unsigned long flags;
int eqe_cnt, i; int eqe_cnt, i;
int eq_empty = 0; int eq_empty = 0;
spin_lock_irqsave(&eq->irq_spinlock, flags); spin_lock(&eq->irq_spinlock);
if (is_irq) { if (is_irq) {
const int max_query_cnt = 100; const int max_query_cnt = 100;
int query_cnt = 0; int query_cnt = 0;
@ -643,7 +642,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
} while (1); } while (1);
unlock_irq_spinlock: unlock_irq_spinlock:
spin_unlock_irqrestore(&eq->irq_spinlock, flags); spin_unlock(&eq->irq_spinlock);
} }
void ehca_tasklet_eq(unsigned long data) void ehca_tasklet_eq(unsigned long data)

4
drivers/infiniband/hw/ehca/ehca_qp.c
View file

@ -55,9 +55,7 @@ static struct kmem_cache *qp_cache;
/* /*
* attributes not supported by query qp * attributes not supported by query qp
*/ */
#define QP_ATTR_QUERY_NOT_SUPPORTED (IB_QP_MAX_DEST_RD_ATOMIC | \ #define QP_ATTR_QUERY_NOT_SUPPORTED (IB_QP_ACCESS_FLAGS | \
IB_QP_MAX_QP_RD_ATOMIC | \
IB_QP_ACCESS_FLAGS | \
IB_QP_EN_SQD_ASYNC_NOTIFY) IB_QP_EN_SQD_ASYNC_NOTIFY)
/* /*

2
drivers/infiniband/hw/ehca/ehca_sqp.c
View file

@ -222,7 +222,7 @@ int ehca_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
{ {
int ret; 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; return IB_MAD_RESULT_FAILURE;
/* accept only pma request */ /* accept only pma request */