Commit 8b2fed8e authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller

net/smc: Pass on DMBE bit mask in IRQ handler

Make the DMBE bits, which are passed on individually in ism_move() as
parameter idx, available to the receiver.
Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Wenjia Zhang < wenjia@linux.ibm.com>
Reviewed-by: default avatarTony Lu <tonylu@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a2f4f98
...@@ -443,6 +443,7 @@ static irqreturn_t ism_handle_irq(int irq, void *data) ...@@ -443,6 +443,7 @@ static irqreturn_t ism_handle_irq(int irq, void *data)
struct ism_dev *ism = data; struct ism_dev *ism = data;
unsigned long bit, end; unsigned long bit, end;
unsigned long *bv; unsigned long *bv;
u16 dmbemask;
bv = (void *) &ism->sba->dmb_bits[ISM_DMB_WORD_OFFSET]; bv = (void *) &ism->sba->dmb_bits[ISM_DMB_WORD_OFFSET];
end = sizeof(ism->sba->dmb_bits) * BITS_PER_BYTE - ISM_DMB_BIT_OFFSET; end = sizeof(ism->sba->dmb_bits) * BITS_PER_BYTE - ISM_DMB_BIT_OFFSET;
...@@ -456,9 +457,10 @@ static irqreturn_t ism_handle_irq(int irq, void *data) ...@@ -456,9 +457,10 @@ static irqreturn_t ism_handle_irq(int irq, void *data)
break; break;
clear_bit_inv(bit, bv); clear_bit_inv(bit, bv);
dmbemask = ism->sba->dmbe_mask[bit + ISM_DMB_BIT_OFFSET];
ism->sba->dmbe_mask[bit + ISM_DMB_BIT_OFFSET] = 0; ism->sba->dmbe_mask[bit + ISM_DMB_BIT_OFFSET] = 0;
barrier(); barrier();
smcd_handle_irq(ism->smcd, bit + ISM_DMB_BIT_OFFSET); smcd_handle_irq(ism->smcd, bit + ISM_DMB_BIT_OFFSET, dmbemask);
} }
if (ism->sba->e) { if (ism->sba->e) {
......
...@@ -101,5 +101,5 @@ int smcd_register_dev(struct smcd_dev *smcd); ...@@ -101,5 +101,5 @@ int smcd_register_dev(struct smcd_dev *smcd);
void smcd_unregister_dev(struct smcd_dev *smcd); void smcd_unregister_dev(struct smcd_dev *smcd);
void smcd_free_dev(struct smcd_dev *smcd); void smcd_free_dev(struct smcd_dev *smcd);
void smcd_handle_event(struct smcd_dev *dev, struct smcd_event *event); void smcd_handle_event(struct smcd_dev *dev, struct smcd_event *event);
void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit); void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit, u16 dmbemask);
#endif /* _SMC_H */ #endif /* _SMC_H */
...@@ -508,13 +508,13 @@ void smcd_handle_event(struct smcd_dev *smcd, struct smcd_event *event) ...@@ -508,13 +508,13 @@ void smcd_handle_event(struct smcd_dev *smcd, struct smcd_event *event)
EXPORT_SYMBOL_GPL(smcd_handle_event); EXPORT_SYMBOL_GPL(smcd_handle_event);
/* SMCD Device interrupt handler. Called from ISM device interrupt handler. /* SMCD Device interrupt handler. Called from ISM device interrupt handler.
* Parameters are smcd device pointer and DMB number. Find the connection and * Parameters are smcd device pointer, DMB number, and the DMBE bitmask.
* schedule the tasklet for this connection. * Find the connection and schedule the tasklet for this connection.
* *
* Context: * Context:
* - Function called in IRQ context from ISM device driver IRQ handler. * - Function called in IRQ context from ISM device driver IRQ handler.
*/ */
void smcd_handle_irq(struct smcd_dev *smcd, unsigned int dmbno) void smcd_handle_irq(struct smcd_dev *smcd, unsigned int dmbno, u16 dmbemask)
{ {
struct smc_connection *conn = NULL; struct smc_connection *conn = NULL;
unsigned long flags; unsigned long flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment