| Message ID | 1457633643-12535-2-git-send-email-web+oss@zopieux.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hello. On 10/03/16 19:14, web+oss@zopieux.com wrote: > From: Alexandre Macabies <web+oss@zopieux.com> > > When receiving a security-enabled IEEE 802.15.4 frame, the MRF24J40 > triggers a SECIF interrupt that needs to be handled for RX processing > to keep functioning properly. > > This patch enables the SECIF interrupt and makes the MRF ignores all > hardware processing of security-enabled frames, that is handled by the > ieee802154 stack instead. Missing SOB again. > Signed-off-by: Alexander Aring <aar@pengutronix.de> > Reported-by: Alexandre Macabies <web+oss@zopieux.com> > Tested-by: Alexandre Macabies <web+oss@zopieux.com> > --- > drivers/net/ieee802154/mrf24j40.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index 764a2bd..96814cf 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -85,10 +85,12 @@ > #define REG_INTSTAT 0x31 /* Interrupt Status */ > #define BIT_TXNIF BIT(0) > #define BIT_RXIF BIT(3) > +#define BIT_SECIF BIT(4) > > #define REG_INTCON 0x32 /* Interrupt Control */ > #define BIT_TXNIE BIT(0) > #define BIT_RXIE BIT(3) > +#define BIT_SECIE BIT(4) > > #define REG_GPIO 0x33 /* GPIO */ > #define REG_TRISGPIO 0x34 /* GPIO direction */ > @@ -616,7 +618,7 @@ static int mrf24j40_start(struct ieee802154_hw *hw) > > /* Clear TXNIE and RXIE. Enable interrupts */ > return regmap_update_bits(devrec->regmap_short, REG_INTCON, > - BIT_TXNIE | BIT_RXIE, 0); > + BIT_TXNIE | BIT_RXIE | BIT_SECIE, 0); > } > > static void mrf24j40_stop(struct ieee802154_hw *hw) > @@ -1025,6 +1027,9 @@ static void mrf24j40_intstat_complete(void *context) > > enable_irq(devrec->spi->irq); > > + if (intstat & BIT_SECIF) > + regmap_write_async(devrec->regmap_short, REG_SECCON0, 0x80); Not sure I like the magic number 0x80 here. Maybe a define for it? > + > /* Check for TX complete */ > if (intstat & BIT_TXNIF) > ieee802154_xmit_complete(devrec->hw, devrec->tx_skb, false); With the SOB and the magic number fixed you get my: Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com> regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 764a2bd..96814cf 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -85,10 +85,12 @@ #define REG_INTSTAT 0x31 /* Interrupt Status */ #define BIT_TXNIF BIT(0) #define BIT_RXIF BIT(3) +#define BIT_SECIF BIT(4) #define REG_INTCON 0x32 /* Interrupt Control */ #define BIT_TXNIE BIT(0) #define BIT_RXIE BIT(3) +#define BIT_SECIE BIT(4) #define REG_GPIO 0x33 /* GPIO */ #define REG_TRISGPIO 0x34 /* GPIO direction */ @@ -616,7 +618,7 @@ static int mrf24j40_start(struct ieee802154_hw *hw) /* Clear TXNIE and RXIE. Enable interrupts */ return regmap_update_bits(devrec->regmap_short, REG_INTCON, - BIT_TXNIE | BIT_RXIE, 0); + BIT_TXNIE | BIT_RXIE | BIT_SECIE, 0); } static void mrf24j40_stop(struct ieee802154_hw *hw) @@ -1025,6 +1027,9 @@ static void mrf24j40_intstat_complete(void *context) enable_irq(devrec->spi->irq); + if (intstat & BIT_SECIF) + regmap_write_async(devrec->regmap_short, REG_SECCON0, 0x80); + /* Check for TX complete */ if (intstat & BIT_TXNIF) ieee802154_xmit_complete(devrec->hw, devrec->tx_skb, false);