| Message ID | 20220725141000.70347-4-wenjia@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8b2fed8e2712e8c23665df3c9e0fbabbb76e466c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net/smc: updates 2022-7-25 | expand |
On Mon, Jul 25, 2022 at 04:09:59PM +0200, Wenjia Zhang wrote: > From: Stefan Raspl <raspl@linux.ibm.com> > > Make the DMBE bits, which are passed on individually in ism_move() as > parameter idx, available to the receiver. > > Signed-off-by: Stefan Raspl <raspl@linux.ibm.com> > Signed-off-by: Wenjia Zhang < wenjia@linux.ibm.com> LGTM. Reviewed-by: Tony Lu <tonylu@linux.alibaba.com> > --- > drivers/s390/net/ism_drv.c | 4 +++- > include/net/smc.h | 2 +- > net/smc/smc_ism.c | 6 +++--- > 3 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c > index 4665e9a0e048..d34bb6ec1490 100644 > --- a/drivers/s390/net/ism_drv.c > +++ b/drivers/s390/net/ism_drv.c > @@ -443,6 +443,7 @@ static irqreturn_t ism_handle_irq(int irq, void *data) > struct ism_dev *ism = data; > unsigned long bit, end; > unsigned long *bv; > + u16 dmbemask; > > bv = (void *) &ism->sba->dmb_bits[ISM_DMB_WORD_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) > break; > > 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; > 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) { > diff --git a/include/net/smc.h b/include/net/smc.h > index 1868a5014dea..c926d3313e05 100644 > --- a/include/net/smc.h > +++ b/include/net/smc.h > @@ -101,5 +101,5 @@ int smcd_register_dev(struct smcd_dev *smcd); > void smcd_unregister_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_irq(struct smcd_dev *dev, unsigned int bit); > +void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit, u16 dmbemask); > #endif /* _SMC_H */ > diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c > index e51c0cdff8e0..911fe08bc54b 100644 > --- a/net/smc/smc_ism.c > +++ b/net/smc/smc_ism.c > @@ -508,13 +508,13 @@ void smcd_handle_event(struct smcd_dev *smcd, struct smcd_event *event) > EXPORT_SYMBOL_GPL(smcd_handle_event); > > /* SMCD Device interrupt handler. Called from ISM device interrupt handler. > - * Parameters are smcd device pointer and DMB number. Find the connection and > - * schedule the tasklet for this connection. > + * Parameters are smcd device pointer, DMB number, and the DMBE bitmask. > + * Find the connection and schedule the tasklet for this connection. > * > * Context: > * - 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; > unsigned long flags; > -- > 2.35.2
diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c index 4665e9a0e048..d34bb6ec1490 100644 --- a/drivers/s390/net/ism_drv.c +++ b/drivers/s390/net/ism_drv.c @@ -443,6 +443,7 @@ static irqreturn_t ism_handle_irq(int irq, void *data) struct ism_dev *ism = data; unsigned long bit, end; unsigned long *bv; + u16 dmbemask; bv = (void *) &ism->sba->dmb_bits[ISM_DMB_WORD_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) break; 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; 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) { diff --git a/include/net/smc.h b/include/net/smc.h index 1868a5014dea..c926d3313e05 100644 --- a/include/net/smc.h +++ b/include/net/smc.h @@ -101,5 +101,5 @@ int smcd_register_dev(struct smcd_dev *smcd); void smcd_unregister_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_irq(struct smcd_dev *dev, unsigned int bit); +void smcd_handle_irq(struct smcd_dev *dev, unsigned int bit, u16 dmbemask); #endif /* _SMC_H */ diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c index e51c0cdff8e0..911fe08bc54b 100644 --- a/net/smc/smc_ism.c +++ b/net/smc/smc_ism.c @@ -508,13 +508,13 @@ void smcd_handle_event(struct smcd_dev *smcd, struct smcd_event *event) EXPORT_SYMBOL_GPL(smcd_handle_event); /* SMCD Device interrupt handler. Called from ISM device interrupt handler. - * Parameters are smcd device pointer and DMB number. Find the connection and - * schedule the tasklet for this connection. + * Parameters are smcd device pointer, DMB number, and the DMBE bitmask. + * Find the connection and schedule the tasklet for this connection. * * Context: * - 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; unsigned long flags;