mrf24j40: async rx/tx handling and new features
Subsystems (4)
Alexander Aring
maintainercover mrf24j40: async rx/tx handling and new features
Hi,
this patch series contains some cleanups, devicetree support, rx/tx async handling, threaded irq to hardirq, csma params settings, cca mode settings, cca energy detection levels, tx power settings and promiscuous mode settings.
Also I add regmap support, the lowlevel spi calls are only used in hotpaths for handling receive/transmit and irq handling. There are also some many magic numbers, maybe we can introduce some register bits defines.
- Alex
changes since PATCH:
- add warning for edge triggered irq's
- add patch to replace magic numbers, except hw_init which is specified by datasheet instruction
- remove WARN_ON for max_be
- fix cca mode setting s/OR/AND
- add warning for spi freq is above maximum
- let txpower also working for mrf24j40 chips by default
- re-add DEBUG things for rssi and lqi value
- add several reviewed-by's
- use for cca_ed_thres register regmap_write instead update bits with full 0xff mask
Alexander Aring (22):
mrf24j40: cleanup define identation
mrf24j40: use ieee802154_alloc_hw for private data
mrf24j40: calling ieee802154_register_hw at last
mrf24j40: remove spi settings overwrite
mrf24j40: add device-tree support
mrf24j40: add default channel setting
mrf24j40: add random extended addr generation
mrf24j40: add more register defines
mrf24j40: add regmap support
mrf24j40: use regmap for register access
mrf24j40: change to frame delivery with crc
ieee802154: add helpers for frame control checks
mrf24j40: rework tx handling to async tx handling
mrf24j40: rework rx handling to async rx handling
mrf24j40: async interrupt handling
mrf24j40: add csma params support
mrf24j40: add cca mode support
mrf24j40: add cca ed level support
mrf24j40: add tx power support
mrf24j40: add promiscuous mode support
mrf24j40: change irq trigger type behaviour
mrf24j40: replace magic numbers
.../bindings/net/ieee802154/mrf24j40.txt | 20 + MAINTAINERS | 1 + drivers/net/ieee802154/Kconfig | 1 + drivers/net/ieee802154/mrf24j40.c | 1424 ++++++++++++++------ include/linux/ieee802154.h | 12 + 5 files changed, 1031 insertions(+), 427 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 1/22 mrf24j40: cleanup define identation
This patch replaces the spaces after define by a tab.
--- drivers/net/ieee802154/mrf24j40.c | 76 +++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-)
drivers/net/ieee802154/mrf24j40.c +38 -38
@@ -23,46 +23,46 @@#include <net/mac802154.h> /* MRF24J40 Short Address Registers */ -#define REG_RXMCR 0x00/* Receive MAC control */ -#define REG_PANIDL 0x01/* PAN ID (low) */ -#define REG_PANIDH 0x02/* PAN ID (high) */ -#define REG_SADRL 0x03/* Short address (low) */ -#define REG_SADRH 0x04/* Short address (high) */ -#define REG_EADR0 0x05/* Long address (low) (high is EADR7) */ -#define REG_TXMCR 0x11/* Transmit MAC control */ -#define REG_PACON0 0x16/* Power Amplifier Control */ -#define REG_PACON1 0x17/* Power Amplifier Control */ -#define REG_PACON2 0x18/* Power Amplifier Control */ -#define REG_TXNCON 0x1B/* Transmit Normal FIFO Control */ -#define REG_TXSTAT 0x24/* TX MAC Status Register */ -#define REG_SOFTRST 0x2A/* Soft Reset */ -#define REG_TXSTBL 0x2E/* TX Stabilization */ -#define REG_INTSTAT 0x31/* Interrupt Status */ -#define REG_INTCON 0x32/* Interrupt Control */ -#define REG_GPIO 0x33/* GPIO */ -#define REG_TRISGPIO 0x34/* GPIO direction */ -#define REG_RFCTL 0x36/* RF Control Mode Register */ -#define REG_BBREG1 0x39/* Baseband Registers */ -#define REG_BBREG2 0x3A/* */ -#define REG_BBREG6 0x3E/* */ -#define REG_CCAEDTH 0x3F/* Energy Detection Threshold */ +#define REG_RXMCR 0x00/* Receive MAC control */ +#define REG_PANIDL 0x01/* PAN ID (low) */ +#define REG_PANIDH 0x02/* PAN ID (high) */ +#define REG_SADRL 0x03/* Short address (low) */ +#define REG_SADRH 0x04/* Short address (high) */ +#define REG_EADR0 0x05/* Long address (low) (high is EADR7) */ +#define REG_TXMCR 0x11/* Transmit MAC control */ +#define REG_PACON0 0x16/* Power Amplifier Control */ +#define REG_PACON1 0x17/* Power Amplifier Control */ +#define REG_PACON2 0x18/* Power Amplifier Control */ +#define REG_TXNCON 0x1B/* Transmit Normal FIFO Control */ +#define REG_TXSTAT 0x24/* TX MAC Status Register */ +#define REG_SOFTRST 0x2A/* Soft Reset */ +#define REG_TXSTBL 0x2E/* TX Stabilization */ +#define REG_INTSTAT 0x31/* Interrupt Status */ +#define REG_INTCON 0x32/* Interrupt Control */ +#define REG_GPIO 0x33/* GPIO */ +#define REG_TRISGPIO 0x34/* GPIO direction */ +#define REG_RFCTL 0x36/* RF Control Mode Register */ +#define REG_BBREG1 0x39/* Baseband Registers */ +#define REG_BBREG2 0x3A/* */ +#define REG_BBREG6 0x3E/* */ +#define REG_CCAEDTH 0x3F/* Energy Detection Threshold */ /* MRF24J40 Long Address Registers */ -#define REG_RFCON0 0x200/* RF Control Registers */ -#define REG_RFCON1 0x201 -#define REG_RFCON2 0x202 -#define REG_RFCON3 0x203 -#define REG_RFCON5 0x205 -#define REG_RFCON6 0x206 -#define REG_RFCON7 0x207 -#define REG_RFCON8 0x208 -#define REG_RSSI 0x210 -#define REG_SLPCON0 0x211/* Sleep Clock Control Registers */ -#define REG_SLPCON1 0x220 -#define REG_WAKETIMEL 0x222/* Wake-up Time Match Value Low */ -#define REG_WAKETIMEH 0x223/* Wake-up Time Match Value High */ -#define REG_TESTMODE 0x22F/* Test mode */ -#define REG_RX_FIFO 0x300/* Receive FIFO */ +#define REG_RFCON0 0x200/* RF Control Registers */ +#define REG_RFCON1 0x201 +#define REG_RFCON2 0x202 +#define REG_RFCON3 0x203 +#define REG_RFCON5 0x205 +#define REG_RFCON6 0x206 +#define REG_RFCON7 0x207 +#define REG_RFCON8 0x208 +#define REG_RSSI 0x210 +#define REG_SLPCON0 0x211/* Sleep Clock Control Registers */ +#define REG_SLPCON1 0x220 +#define REG_WAKETIMEL 0x222/* Wake-up Time Match Value Low */ +#define REG_WAKETIMEH 0x223/* Wake-up Time Match Value High */ +#define REG_TESTMODE 0x22F/* Test mode */ +#define REG_RX_FIFO 0x300/* Receive FIFO */ /* Device configuration: Only channels 11-26 on page 0 are supported. */ #define MRF24J40_CHAN_MIN 11
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 2/22 mrf24j40: use ieee802154_alloc_hw for private data
In reply to Alexander AringThis patch removes the own private dataroom allocation by calling devm_kzalloc for devrec and assign this pointer to "devrec->hw->priv". Instead we using like all other drivers ieee802154_alloc_hw and give the size for the private driver dataroom at the first argument.
--- drivers/net/ieee802154/mrf24j40.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/net/ieee802154/mrf24j40.c +15 -16
@@ -723,16 +723,28 @@ err_ret:static int mrf24j40_probe (struct spi_device *spi) {int ret = -ENOMEM ; +struct ieee802154_hw *hw;struct mrf24j40 *devrec;dev_info (&spi->dev,"probe(). IRQ: %d\n" , spi->irq); - devrec =devm_kzalloc (&spi->dev,sizeof (struct mrf24j40 ),GFP_KERNEL ); -if (!devrec) +/* Register with the 802154 subsystem */ + + hw =ieee802154_alloc_hw (sizeof (*devrec), &mrf24j40_ops); +if (!hw) goto err_ret; + + devrec = hw->priv; + devrec->spi = spi; +spi_set_drvdata (spi, devrec); + devrec->hw = hw; + devrec->hw->parent = &spi->dev; + devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; + devrec->hw->flags =IEEE802154_HW_OMIT_CKSUM |IEEE802154_HW_AFILT ; + devrec->buf =devm_kzalloc (&spi->dev,3 ,GFP_KERNEL );if (!devrec->buf) - goto err_ret; + goto err_register_device; spi->mode =SPI_MODE_0 ;/* TODO: Is this appropriate for right here? */ if (spi->max_speed_hz >MAX_SPI_SPEED_HZ )
@@ -740,19 +752,6 @@ static int mrf24j40_probe(struct spi_device *spi)mutex_init (&devrec->buffer_mutex);init_completion (&devrec->tx_complete); - devrec->spi = spi; -spi_set_drvdata (spi, devrec); - -/* Register with the 802154 subsystem */ - - devrec->hw =ieee802154_alloc_hw (0 , &mrf24j40_ops); -if (!devrec->hw) - goto err_ret; - - devrec->hw->priv = devrec; - devrec->hw->parent = &devrec->spi->dev; - devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; - devrec->hw->flags =IEEE802154_HW_OMIT_CKSUM |IEEE802154_HW_AFILT ;dev_dbg (printdev (devrec),"registered mrf24j40\n" ); ret =ieee802154_register_hw (devrec->hw);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 3/22 mrf24j40: calling ieee802154_register_hw at last
In reply to Alexander AringThe function ieee802154_register_hw should always called at last. Currently we do hardware init and such things after register hardware into the subsystem. It could be that the subsystem already call driver operations while running hardware init.
--- drivers/net/ieee802154/mrf24j40.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/net/ieee802154/mrf24j40.c +7 -10
@@ -753,14 +753,9 @@ static int mrf24j40_probe(struct spi_device *spi)mutex_init (&devrec->buffer_mutex);init_completion (&devrec->tx_complete); -dev_dbg (printdev (devrec),"registered mrf24j40\n" ); - ret =ieee802154_register_hw (devrec->hw); -if (ret) - goto err_register_device; - ret =mrf24j40_hw_init (devrec);if (ret) - goto err_hw_init; + goto err_register_device; ret = devm_request_threaded_irq(&spi->dev, spi->irq,
@@ -772,14 +767,16 @@ static int mrf24j40_probe(struct spi_device *spi)if (ret) {dev_err (printdev (devrec),"Unable to get IRQ" ); - goto err_irq; + goto err_register_device; } +dev_dbg (printdev (devrec),"registered mrf24j40\n" ); + ret =ieee802154_register_hw (devrec->hw); +if (ret) + goto err_register_device; +return 0 ; -err_irq: -err_hw_init: -ieee802154_unregister_hw (devrec->hw); err_register_device:ieee802154_free_hw (devrec->hw); err_ret:
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 4/22 mrf24j40: remove spi settings overwrite
In reply to Alexander AringThis patch removes spi settings while mrf24j40 probing. These settings cannot be overwrite while device probing where spi controller should be already configured. These settings need to be setup by device tree or platform data.
--- drivers/net/ieee802154/mrf24j40.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ieee802154/mrf24j40.c +5 -3
@@ -746,9 +746,11 @@ static int mrf24j40_probe(struct spi_device *spi)if (!devrec->buf) goto err_register_device; - spi->mode =SPI_MODE_0 ;/* TODO: Is this appropriate for right here? */ -if (spi->max_speed_hz >MAX_SPI_SPEED_HZ ) - spi->max_speed_hz =MAX_SPI_SPEED_HZ ; +if (spi->max_speed_hz >MAX_SPI_SPEED_HZ ) { +dev_warn (&spi->dev,"spi clock above possible maximum: %d" , +MAX_SPI_SPEED_HZ ); +return -EINVAL ; + }mutex_init (&devrec->buffer_mutex);init_completion (&devrec->tx_complete);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 5/22 mrf24j40: add device-tree support
In reply to Alexander AringThis patch adds devicetree support to mrf24j40 with proper devicetree compatible strings.
--- .../devicetree/bindings/net/ieee802154/mrf24j40.txt | 20 ++++++++++++++++++++ MAINTAINERS | 1 + drivers/net/ieee802154/mrf24j40.c | 9 +++++++++ 3 files changed, 30 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt new file +20 -0
@@ -0,0 +1,20 @@ +* MRF24J40 IEEE 802.15.4 * + +Required properties: + - compatible: should be "microchip,mrf24j40", "microchip,mrf24j40ma", + or "microchip,mrf24j40mc" depends on your transceiver + board + - spi-max-frequency: maximal bus speed, should be set something under or equal + 10000000 + - reg: the chipselect index + - interrupts: the interrupt generated by the device. + +Example: + + mrf24j40ma@0 { + compatible = "microchip,mrf24j40ma"; + spi-max-frequency = <8500000>; + reg = <0>; + interrupts = <19 8>; + interrupt-parent = <&gpio3>; + };
MAINTAINERS +1 -0
@@ -6830,6 +6830,7 @@ M: Alan Ott <[email protected]> L: [email protected] S: Maintained F: drivers/net/ieee802154/mrf24j40.c +F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt MSI LAPTOP SUPPORT M: "Lee, Chun-Yi" <[email protected]>
drivers/net/ieee802154/mrf24j40.c +9 -0
@@ -799,6 +799,14 @@ static int mrf24j40_remove(struct spi_device *spi)return 0 ; } +static const struct of_device_id mrf24j40_of_match[] = { + { .compatible ="microchip,mrf24j40" , .data = (void *)MRF24J40 }, + { .compatible ="microchip,mrf24j40ma" , .data = (void *)MRF24J40MA }, + { .compatible ="microchip,mrf24j40mc" , .data = (void *)MRF24J40MC }, + { }, +}; +MODULE_DEVICE_TABLE (of, mrf24j40_of_match); +static const struct spi_device_id mrf24j40_ids[] = { {"mrf24j40" ,MRF24J40 }, {"mrf24j40ma" ,MRF24J40MA },
@@ -809,6 +817,7 @@ MODULE_DEVICE_TABLE(spi, mrf24j40_ids);static struct spi_driver mrf24j40_driver = { .driver = { + .of_match_table =of_match_ptr (mrf24j40_of_match), .name ="mrf24j40" , .owner =THIS_MODULE , },
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 6/22 mrf24j40: add default channel setting
In reply to Alexander AringPer default mrf24j40 has the channel 11 after reset. This patch adds the right phy default value for the channel setting.
--- drivers/net/ieee802154/mrf24j40.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ieee802154/mrf24j40.c +7 -0
@@ -720,6 +720,11 @@ err_ret:return ret; } +static void mrf24j40_phy_setup (struct mrf24j40 *devrec) +{ + devrec->hw->phy->current_channel =11 ; +} +static int mrf24j40_probe (struct spi_device *spi) {int ret = -ENOMEM ;
@@ -759,6 +764,8 @@ static int mrf24j40_probe(struct spi_device *spi)if (ret) goto err_register_device; +mrf24j40_phy_setup (devrec); + ret = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 7/22 mrf24j40: add random extended addr generation
In reply to Alexander AringThe mrf24j40 has no source to get a permanent extended address. This patch will add a random generated permanent extended address source.
--- drivers/net/ieee802154/mrf24j40.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ieee802154/mrf24j40.c +1 -0
@@ -722,6 +722,7 @@ err_ret:static void mrf24j40_phy_setup (struct mrf24j40 *devrec) { +ieee802154_random_extended_addr (&devrec->hw->phy->perm_extended_addr); devrec->hw->phy->current_channel =11 ; }
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 8/22 mrf24j40: add more register defines
In reply to Alexander AringFor supporting regmap, this patch will add more register defines to prepare a full register dump by regmap debugfs.
--- drivers/net/ieee802154/mrf24j40.c | 68 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
drivers/net/ieee802154/mrf24j40.c +68 -0
@@ -29,21 +29,56 @@#define REG_SADRL 0x03/* Short address (low) */ #define REG_SADRH 0x04/* Short address (high) */ #define REG_EADR0 0x05/* Long address (low) (high is EADR7) */ +#define REG_EADR1 0x06 +#define REG_EADR2 0x07 +#define REG_EADR3 0x08 +#define REG_EADR4 0x09 +#define REG_EADR5 0x0A +#define REG_EADR6 0x0B +#define REG_EADR7 0x0C +#define REG_RXFLUSH 0x0D +#define REG_ORDER 0x10#define REG_TXMCR 0x11/* Transmit MAC control */ +#define REG_ACKTMOUT 0x12 +#define REG_ESLOTG1 0x13 +#define REG_SYMTICKL 0x14 +#define REG_SYMTICKH 0x15#define REG_PACON0 0x16/* Power Amplifier Control */ #define REG_PACON1 0x17/* Power Amplifier Control */ #define REG_PACON2 0x18/* Power Amplifier Control */ +#define REG_TXBCON0 0x1A#define REG_TXNCON 0x1B/* Transmit Normal FIFO Control */ +#define REG_TXG1CON 0x1C +#define REG_TXG2CON 0x1D +#define REG_ESLOTG23 0x1E +#define REG_ESLOTG45 0x1F +#define REG_ESLOTG67 0x20 +#define REG_TXPEND 0x21 +#define REG_WAKECON 0x22 +#define REG_FROMOFFSET 0x23#define REG_TXSTAT 0x24/* TX MAC Status Register */ +#define REG_TXBCON1 0x25 +#define REG_GATECLK 0x26 +#define REG_TXTIME 0x27 +#define REG_HSYMTMRL 0x28 +#define REG_HSYMTMRH 0x29#define REG_SOFTRST 0x2A/* Soft Reset */ +#define REG_SECCON0 0x2C +#define REG_SECCON1 0x2D#define REG_TXSTBL 0x2E/* TX Stabilization */ +#define REG_RXSR 0x30#define REG_INTSTAT 0x31/* Interrupt Status */ #define REG_INTCON 0x32/* Interrupt Control */ #define REG_GPIO 0x33/* GPIO */ #define REG_TRISGPIO 0x34/* GPIO direction */ +#define REG_SLPACK 0x35#define REG_RFCTL 0x36/* RF Control Mode Register */ +#define REG_SECCR2 0x37 +#define REG_BBREG0 0x38#define REG_BBREG1 0x39/* Baseband Registers */ #define REG_BBREG2 0x3A/* */ +#define REG_BBREG3 0x3B +#define REG_BBREG4 0x3C#define REG_BBREG6 0x3E/* */ #define REG_CCAEDTH 0x3F/* Energy Detection Threshold */
@@ -56,12 +91,45 @@#define REG_RFCON6 0x206#define REG_RFCON7 0x207#define REG_RFCON8 0x208 +#define REG_SLPCAL0 0x209 +#define REG_SLPCAL1 0x20A +#define REG_SLPCAL2 0x20B +#define REG_RFSTATE 0x20F#define REG_RSSI 0x210#define REG_SLPCON0 0x211/* Sleep Clock Control Registers */ #define REG_SLPCON1 0x220#define REG_WAKETIMEL 0x222/* Wake-up Time Match Value Low */ #define REG_WAKETIMEH 0x223/* Wake-up Time Match Value High */ +#define REG_REMCNTL 0x224 +#define REG_REMCNTH 0x225 +#define REG_MAINCNT0 0x226 +#define REG_MAINCNT1 0x227 +#define REG_MAINCNT2 0x228 +#define REG_MAINCNT3 0x229#define REG_TESTMODE 0x22F/* Test mode */ +#define REG_ASSOEAR0 0x230 +#define REG_ASSOEAR1 0x231 +#define REG_ASSOEAR2 0x232 +#define REG_ASSOEAR3 0x233 +#define REG_ASSOEAR4 0x234 +#define REG_ASSOEAR5 0x235 +#define REG_ASSOEAR6 0x236 +#define REG_ASSOEAR7 0x237 +#define REG_ASSOSAR0 0x238 +#define REG_ASSOSAR1 0x239 +#define REG_UNONCE0 0x240 +#define REG_UNONCE1 0x241 +#define REG_UNONCE2 0x242 +#define REG_UNONCE3 0x243 +#define REG_UNONCE4 0x244 +#define REG_UNONCE5 0x245 +#define REG_UNONCE6 0x246 +#define REG_UNONCE7 0x247 +#define REG_UNONCE8 0x248 +#define REG_UNONCE9 0x249 +#define REG_UNONCE10 0x24A +#define REG_UNONCE11 0x24B +#define REG_UNONCE12 0x24C#define REG_RX_FIFO 0x300/* Receive FIFO */ /* Device configuration: Only channels 11-26 on page 0 are supported. */
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 9/22 mrf24j40: add regmap support
In reply to Alexander AringThis patch introduce regmap support for short and long address space of mrf24j40. It's only possible to use regmap_read/write/update_bits for long address range. This is because I added lowlevel bus operation because the write operation need to set the 12th bit to mark a register write, but regmap only supports to set bits for register write access in the first byte. We use other regmap register functions than read/write/update_bits, so this should be fine.
--- drivers/net/ieee802154/Kconfig | 1 + drivers/net/ieee802154/mrf24j40.c | 312 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+)
drivers/net/ieee802154/Kconfig +1 -0
@@ -43,6 +43,7 @@ config IEEE802154_MRF24J40 tristate "Microchip MRF24J40 transceiver driver" depends on IEEE802154_DRIVERS && MAC802154 depends on SPI + select REGMAP_SPI ---help--- Say Y here to enable the MRF24J20 SPI 802.15.4 wireless controller.
drivers/net/ieee802154/mrf24j40.c +312 -0
341 lines not on this page · raw message
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 10/22 mrf24j40: use regmap for register access
In reply to Alexander AringThis patch uses the regmap functions for transceiver register settings where it's possible. This means everything except the hotpaths like receive/transmit handling.
--- drivers/net/ieee802154/mrf24j40.c | 147 +++++++++++++------------------------- 1 file changed, 50 insertions(+), 97 deletions(-)
drivers/net/ieee802154/mrf24j40.c +50 -97
@@ -543,35 +543,6 @@ static int read_long_reg(struct mrf24j40 *devrec, u16 reg, u8 *value)return ret; } -static int write_long_reg (struct mrf24j40 *devrec,u16 reg,u8 val) -{ -int ret; -u16 cmd; -struct spi_message msg; -struct spi_transfer xfer = { - .len =3 , - .tx_buf = devrec->buf, - .rx_buf = devrec->buf, - }; - -spi_message_init (&msg); -spi_message_add_tail (&xfer, &msg); - - cmd =MRF24J40_WRITELONG (reg); -mutex_lock (&devrec->buffer_mutex); - devrec->buf[0 ] = cmd >>8 &0xff ; - devrec->buf[1 ] = cmd &0xff ; - devrec->buf[2 ] = val; - - ret =spi_sync (devrec->spi, &msg); -if (ret) -dev_err (printdev (devrec), -"SPI write Failed for long register 0x%hx\n" , reg); - -mutex_unlock (&devrec->buffer_mutex); -return ret; -} -/* This function relies on an undocumented write method. Once a write command and address is set, as many bytes of data as desired can be clocked into the device. The datasheet only shows setting one byte at a time. */
@@ -755,33 +726,23 @@ static int mrf24j40_ed(struct ieee802154_hw *hw, u8 *level)static int mrf24j40_start (struct ieee802154_hw *hw) {struct mrf24j40 *devrec = hw->priv; -u8 val; -int ret;dev_dbg (printdev (devrec),"start\n" ); - ret =read_short_reg (devrec,REG_INTCON , &val); -if (ret) -return ret; - val &= ~(0x1 |0x8 );/* Clear TXNIE and RXIE. Enable interrupts */ -write_short_reg (devrec,REG_INTCON , val); - -return 0 ; +/* Clear TXNIE and RXIE. Enable interrupts */ +return regmap_update_bits (devrec->regmap_short,REG_INTCON , +0x01 |0x08 ,0x00 ); }static void mrf24j40_stop (struct ieee802154_hw *hw) {struct mrf24j40 *devrec = hw->priv; -u8 val; -int ret;dev_dbg (printdev (devrec),"stop\n" ); - ret =read_short_reg (devrec,REG_INTCON , &val); -if (ret) -return ; - val |=0x1 |0x8 ;/* Set TXNIE and RXIE. Disable Interrupts */ -write_short_reg (devrec,REG_INTCON , val); +/* Set TXNIE and RXIE. Disable Interrupts */ +regmap_update_bits (devrec->regmap_short,REG_INTCON ,0x01 |0x08 , +0x01 |0x08 ); }static int mrf24j40_set_channel (struct ieee802154_hw *hw,u8 page,u8 channel)
@@ -798,20 +759,20 @@ static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)/* Set Channel TODO */ val = (channel-11 ) <<4 |0x03 ; -write_long_reg (devrec,REG_RFCON0 , val); + ret =regmap_update_bits (devrec->regmap_long,REG_RFCON0 ,0xf0 , val); +if (ret) +return ret;/* RF Reset */ - ret =read_short_reg (devrec,REG_RFCTL , &val); + ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,0x04 ,0x04 );if (ret)return ret; - val |=0x04 ; -write_short_reg (devrec,REG_RFCTL , val); - val &= ~0x04 ; -write_short_reg (devrec,REG_RFCTL , val); -udelay (SET_CHANNEL_DELAY_US );/* per datasheet */ + ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,0x04 ,0x00 ); +if (!ret) +udelay (SET_CHANNEL_DELAY_US );/* per datasheet */ -return 0 ; +return ret; } static int mrf24j40_filter(struct ieee802154_hw *hw,
@@ -829,8 +790,8 @@ static int mrf24j40_filter(struct ieee802154_hw *hw, addrh =le16_to_cpu (filt->short_addr) >>8 &0xff ; addrl =le16_to_cpu (filt->short_addr) &0xff ; -write_short_reg (devrec,REG_SADRH , addrh); -write_short_reg (devrec,REG_SADRL , addrl); +regmap_write (devrec->regmap_short,REG_SADRH , addrh); +regmap_write (devrec->regmap_short,REG_SADRL , addrl);dev_dbg (printdev (devrec),"Set short addr to %04hx\n" , filt->short_addr); }
@@ -841,7 +802,8 @@ static int mrf24j40_filter(struct ieee802154_hw *hw,memcpy (addr, &filt->ieee_addr,8 );for (i =0 ; i <8 ; i++) -write_short_reg (devrec,REG_EADR0 + i, addr[i]); +regmap_write (devrec->regmap_short,REG_EADR0 + i, + addr[i]);#ifdef DEBUG pr_debug ("Set long addr to: " );
@@ -857,8 +819,8 @@ static int mrf24j40_filter(struct ieee802154_hw *hw, panidh =le16_to_cpu (filt->pan_id) >>8 &0xff ; panidl =le16_to_cpu (filt->pan_id) &0xff ; -write_short_reg (devrec,REG_PANIDH , panidh); -write_short_reg (devrec,REG_PANIDL , panidl); +regmap_write (devrec->regmap_short,REG_PANIDH , panidh); +regmap_write (devrec->regmap_short,REG_PANIDL , panidl);dev_dbg (printdev (devrec),"Set PANID to %04hx\n" , filt->pan_id); }
@@ -868,14 +830,14 @@ static int mrf24j40_filter(struct ieee802154_hw *hw,u8 val;int ret; - ret =read_short_reg (devrec,REG_RXMCR , &val); -if (ret) -return ret;if (filt->pan_coord) - val |=0x8 ; + val =0x8 ;else - val &= ~0x8 ; -write_short_reg (devrec,REG_RXMCR , val); + val =0x0 ; + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x8 , + val); +if (ret) +return ret;/* REG_SLOTTED is maintained as default (unslotted/CSMA-CA). * REG_ORDER is maintained as default (no beacon/superframe).
@@ -976,80 +938,73 @@ out:static int mrf24j40_hw_init (struct mrf24j40 *devrec) {int ret; -u8 val;/* Initialize the device. From datasheet section 3.2: Initialization. */ - ret =write_short_reg (devrec,REG_SOFTRST ,0x07 ); + ret =regmap_write (devrec->regmap_short,REG_SOFTRST ,0x07 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_PACON2 ,0x98 ); + ret =regmap_write (devrec->regmap_short,REG_PACON2 ,0x98 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_TXSTBL ,0x95 ); + ret =regmap_write (devrec->regmap_short,REG_TXSTBL ,0x95 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON0 ,0x03 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON0 ,0x03 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON1 ,0x01 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON1 ,0x01 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON2 ,0x80 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON2 ,0x80 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON6 ,0x90 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON6 ,0x90 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON7 ,0x80 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON7 ,0x80 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_RFCON8 ,0x10 ); + ret =regmap_write (devrec->regmap_long,REG_RFCON8 ,0x10 );if (ret) goto err_ret; - ret =write_long_reg (devrec,REG_SLPCON1 ,0x21 ); + ret =regmap_write (devrec->regmap_long,REG_SLPCON1 ,0x21 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_BBREG2 ,0x80 ); + ret =regmap_write (devrec->regmap_short,REG_BBREG2 ,0x80 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_CCAEDTH ,0x60 ); + ret =regmap_write (devrec->regmap_short,REG_CCAEDTH ,0x60 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_BBREG6 ,0x40 ); + ret =regmap_write (devrec->regmap_short,REG_BBREG6 ,0x40 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_RFCTL ,0x04 ); + ret =regmap_write (devrec->regmap_short,REG_RFCTL ,0x04 );if (ret) goto err_ret; - ret =write_short_reg (devrec,REG_RFCTL ,0x0 ); + ret =regmap_write (devrec->regmap_short,REG_RFCTL ,0x0 );if (ret) goto err_ret;udelay (192 );/* Set RX Mode. RXMCR<1:0>: 0x0 normal, 0x1 promisc, 0x2 error */ - ret =read_short_reg (devrec,REG_RXMCR , &val); -if (ret) - goto err_ret; - - val &= ~0x3 ;/* Clear RX mode (normal) */ - - ret =write_short_reg (devrec,REG_RXMCR , val); + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x03 ,0x00 );if (ret) goto err_ret;
@@ -1057,22 +1012,20 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)/* Enable external amplifier. * From MRF24J40MC datasheet section 1.3: Operation. */ -read_long_reg (devrec,REG_TESTMODE , &val); - val |=0x7 ;/* Configure GPIO 0-2 to control amplifier */ -write_long_reg (devrec,REG_TESTMODE , val); +regmap_update_bits (devrec->regmap_long,REG_TESTMODE ,0x07 , +0x07 ); -read_short_reg (devrec,REG_TRISGPIO , &val); - val |=0x8 ;/* Set GPIO3 as output. */ -write_short_reg (devrec,REG_TRISGPIO , val); +/* Set GPIO3 as output. */ +regmap_update_bits (devrec->regmap_short,REG_TRISGPIO ,0x08 , +0x08 ); -read_short_reg (devrec,REG_GPIO , &val); - val |=0x8 ;/* Set GPIO3 HIGH to enable U5 voltage regulator */ -write_short_reg (devrec,REG_GPIO , val); +/* Set GPIO3 HIGH to enable U5 voltage regulator */ +regmap_update_bits (devrec->regmap_short,REG_GPIO ,0x08 ,0x08 );/* Reduce TX pwr to meet FCC requirements. * From MRF24J40MC datasheet section 3.1.1 */ -write_long_reg (devrec,REG_RFCON3 ,0x28 ); +regmap_write (devrec->regmap_long,REG_RFCON3 ,0x28 ); }return 0 ;
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 11/22 mrf24j40: change to frame delivery with crc
In reply to Alexander AringThis patch changes the frame delivery to mac802154 with crc. This is useful for monitor interface types which deliver the crc to userspace.
--- drivers/net/ieee802154/mrf24j40.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ieee802154/mrf24j40.c +1 -4
@@ -881,9 +881,6 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec) goto out; } -/* Cut off the checksum */ -skb_trim (skb, len-2 ); -/* TODO: Other drivers call ieee20154_rx_irqsafe() here (eg: cc2040, * also from a workqueue). I think irqsafe is not necessary here. * Can someone confirm? */
@@ -1060,7 +1057,7 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw = hw; devrec->hw->parent = &spi->dev; devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; - devrec->hw->flags =IEEE802154_HW_OMIT_CKSUM |IEEE802154_HW_AFILT ; + devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT ; devrec->regmap_short =devm_regmap_init_spi (spi, &mrf24j40_short_regmap);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 12/22 ieee802154: add helpers for frame control checks
In reply to Alexander AringThis patch introduce two static inline functions. The first to get the frame control field from an sk_buff. The second is for checking on the acknowledgment request bit on the frame control field. Later we can introduce more functions to check on the frame control fields.
These will deprecate the current behaviour which requires a host-byteorder conversion and manually bit handling.
--- include/linux/ieee802154.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/ieee802154.h +12 -0
@@ -25,6 +25,8 @@#include <linux/types.h> #include <linux/random.h> +#include <linux/skbuff.h> +#include <linux/unaligned/memmove.h> #include <asm/byteorder.h> #define IEEE802154_MTU 127
@@ -207,6 +209,7 @@ enum {/* frame control handling */ #define IEEE802154_FCTL_FTYPE 0x0003 +#define IEEE802154_FCTL_ACKREQ 0x0020#define IEEE802154_FCTL_INTRA_PAN 0x0040#define IEEE802154_FTYPE_DATA 0x0001
@@ -222,6 +225,15 @@ static inline int ieee802154_is_data(__le16 fc) }/** +* ieee802154_is_ackreq - check if acknowledgment request bit is set +* @fc: frame control bytes in little-endian byteorder +*/ +static inline bool ieee802154_is_ackreq (__le16 fc) +{ +return fc &cpu_to_le16 (IEEE802154_FCTL_ACKREQ ); +} + +/** * ieee802154_is_intra_pan - check if intra pan id communication * @fc: frame control bytes in little-endian byteorder */
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 13/22 mrf24j40: rework tx handling to async tx handling
In reply to Alexander AringThis patch reworks the current transmit API to spi_async handling. We removed the error handling check, because mac802154 has no chance to report it. Also the transmit timeout handling can't be handled by xmit async handling, for this usecase we need to implement the netdev watchdog. These are all unlikely cases which we drop now and should be provided by netdev watchdog.
We also drop the bit setting for TXNACKREQ at register TXNCON, this is not necessary. The TXNCON register should set only once for each frame, previous settings doesn't matter.
--- drivers/net/ieee802154/mrf24j40.c | 161 ++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 83 deletions(-)
drivers/net/ieee802154/mrf24j40.c +78 -83
@@ -152,8 +152,22 @@ struct mrf24j40 {struct regmap *regmap_short;struct regmap *regmap_long; + +/* for writing txfifo */ +struct spi_message tx_msg; +u8 tx_hdr_buf[2 ]; +struct spi_transfer tx_hdr_trx; +u8 tx_len_buf[2 ]; +struct spi_transfer tx_len_trx; +struct spi_transfer tx_buf_trx; +struct sk_buff *tx_skb; + +/* post transmit message to send frame out */ +struct spi_message tx_post_msg; +u8 tx_post_buf[2 ]; +struct spi_transfer tx_post_trx; +struct mutex buffer_mutex;/* only used to protect buf */ -struct completion tx_complete;u8 *buf;/* 3 bytes. Used for SPI single-register transfers. */ };
@@ -543,28 +557,33 @@ static int read_long_reg(struct mrf24j40 *devrec, u16 reg, u8 *value)return ret; } +static void write_tx_buf_complete (void *context) +{ +struct mrf24j40 *devrec = context; +__le16 fc =ieee802154_get_fc_from_skb (devrec->tx_skb); +u8 val =0x01 ; +int ret; + +if (ieee802154_is_ackreq (fc)) + val |=0x04 ; + + devrec->tx_post_msg.complete =NULL ; + devrec->tx_post_buf[0 ] =MRF24J40_WRITESHORT (REG_TXNCON ); + devrec->tx_post_buf[1 ] = val; + + ret =spi_async (devrec->spi, &devrec->tx_post_msg); +if (ret) +dev_err (printdev (devrec),"SPI write Failed for transmit buf\n" ); +} +/* This function relies on an undocumented write method. Once a write command and address is set, as many bytes of data as desired can be clocked into the device. The datasheet only shows setting one byte at a time. */ static int write_tx_buf (struct mrf24j40 *devrec,u16 reg,const u8 *data,size_t length) { -int ret;u16 cmd; -u8 lengths[2 ]; -struct spi_message msg; -struct spi_transfer addr_xfer = { - .len =2 , - .tx_buf = devrec->buf, - }; -struct spi_transfer lengths_xfer = { - .len =2 , - .tx_buf = &lengths,/* TODO: Is DMA really required for SPI? */ - }; -struct spi_transfer data_xfer = { - .len = length, - .tx_buf = data, - }; +int ret;/* Range check the length. 2 bytes are used for the length fields.*/ if (length >TX_FIFO_SIZE -2 ) {
@@ -572,26 +591,31 @@ static int write_tx_buf(struct mrf24j40 *devrec, u16 reg, length =TX_FIFO_SIZE -2 ; } -spi_message_init (&msg); -spi_message_add_tail (&addr_xfer, &msg); -spi_message_add_tail (&lengths_xfer, &msg); -spi_message_add_tail (&data_xfer, &msg); - cmd =MRF24J40_WRITELONG (reg); -mutex_lock (&devrec->buffer_mutex); - devrec->buf[0 ] = cmd >>8 &0xff ; - devrec->buf[1 ] = cmd &0xff ; - lengths[0 ] =0x0 ;/* Header Length. Set to 0 for now. TODO */ - lengths[1 ] = length;/* Total length */ - - ret =spi_sync (devrec->spi, &msg); + devrec->tx_hdr_buf[0 ] = cmd >>8 &0xff ; + devrec->tx_hdr_buf[1 ] = cmd &0xff ; + devrec->tx_len_buf[0 ] =0x0 ;/* Header Length. Set to 0 for now. TODO */ + devrec->tx_len_buf[1 ] = length;/* Total length */ + devrec->tx_buf_trx.tx_buf = data; + devrec->tx_buf_trx.len = length; + + ret =spi_async (devrec->spi, &devrec->tx_msg);if (ret)dev_err (printdev (devrec),"SPI write Failed for TX buf\n" ); -mutex_unlock (&devrec->buffer_mutex);return ret; } +static int mrf24j40_tx (struct ieee802154_hw *hw,struct sk_buff *skb) +{ +struct mrf24j40 *devrec = hw->priv; + +dev_dbg (printdev (devrec),"tx packet of %d bytes\n" , skb->len); + devrec->tx_skb = skb; + +return write_tx_buf (devrec,0x000 , skb->data, skb->len); +} +static int mrf24j40_read_rx_buf (struct mrf24j40 *devrec,u8 *data,u8 *len,u8 *lqi) {
@@ -664,57 +688,6 @@ out:return ret; } -static int mrf24j40_tx (struct ieee802154_hw *hw,struct sk_buff *skb) -{ -struct mrf24j40 *devrec = hw->priv; -u8 val; -int ret =0 ; - -dev_dbg (printdev (devrec),"tx packet of %d bytes\n" , skb->len); - - ret =write_tx_buf (devrec,0x000 , skb->data, skb->len); -if (ret) - goto err; - -reinit_completion (&devrec->tx_complete); - -/* Set TXNTRIG bit of TXNCON to send packet */ - ret =read_short_reg (devrec,REG_TXNCON , &val); -if (ret) - goto err; - val |=0x1 ; -/* Set TXNACKREQ if the ACK bit is set in the packet. */ -if (skb->data[0 ] &IEEE802154_FC_ACK_REQ ) - val |=0x4 ; -write_short_reg (devrec,REG_TXNCON , val); - -/* Wait for the device to send the TX complete interrupt. */ - ret =wait_for_completion_interruptible_timeout ( - &devrec->tx_complete, -5 *HZ ); -if (ret == -ERESTARTSYS ) - goto err; -if (ret ==0 ) { -dev_warn (printdev (devrec),"Timeout waiting for TX interrupt\n" ); - ret = -ETIMEDOUT ; - goto err; - } - -/* Check for send error from the device. */ - ret =read_short_reg (devrec,REG_TXSTAT , &val); -if (ret) - goto err; -if (val &0x1 ) { -dev_dbg (printdev (devrec),"Error Sending. Retry count exceeded\n" ); - ret = -ECOMM ;/* TODO: Better error code ? */ - }else -dev_dbg (printdev (devrec),"Packet Sent\n" ); - -err: - -return ret; -} -static int mrf24j40_ed (struct ieee802154_hw *hw,u8 *level) {/* TODO: */
@@ -901,7 +874,7 @@ out:static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , - .xmit_sync = mrf24j40_tx, + .xmit_async = mrf24j40_tx, .ed = mrf24j40_ed, .start = mrf24j40_start, .stop = mrf24j40_stop,
@@ -922,7 +895,7 @@ static irqreturn_t mrf24j40_isr(int irq, void *data)/* Check for TX complete */ if (intstat &0x1 ) -complete (&devrec->tx_complete); +ieee802154_xmit_complete (devrec->hw, devrec->tx_skb, false);/* Check for Rx */ if (intstat &0x8 )
@@ -1031,6 +1004,27 @@ err_ret:return ret; } +static void +mrf24j40_setup_tx_spi_messages (struct mrf24j40 *devrec) +{ +spi_message_init (&devrec->tx_msg); + devrec->tx_msg.context = devrec; + devrec->tx_msg.complete = write_tx_buf_complete; + devrec->tx_hdr_trx.len =2 ; + devrec->tx_hdr_trx.tx_buf = devrec->tx_hdr_buf; +spi_message_add_tail (&devrec->tx_hdr_trx, &devrec->tx_msg); + devrec->tx_len_trx.len =2 ; + devrec->tx_len_trx.tx_buf = devrec->tx_len_buf; +spi_message_add_tail (&devrec->tx_len_trx, &devrec->tx_msg); +spi_message_add_tail (&devrec->tx_buf_trx, &devrec->tx_msg); + +spi_message_init (&devrec->tx_post_msg); + devrec->tx_post_msg.context = devrec; + devrec->tx_post_trx.len =2 ; + devrec->tx_post_trx.tx_buf = devrec->tx_post_buf; +spi_message_add_tail (&devrec->tx_post_trx, &devrec->tx_post_msg); +} +static void mrf24j40_phy_setup (struct mrf24j40 *devrec) {ieee802154_random_extended_addr (&devrec->hw->phy->perm_extended_addr);
@@ -1059,6 +1053,8 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT ; +mrf24j40_setup_tx_spi_messages (devrec); + devrec->regmap_short =devm_regmap_init_spi (spi, &mrf24j40_short_regmap);if (IS_ERR (devrec->regmap_short)) {
@@ -1089,7 +1085,6 @@ static int mrf24j40_probe(struct spi_device *spi) }mutex_init (&devrec->buffer_mutex); -init_completion (&devrec->tx_complete); ret =mrf24j40_hw_init (devrec);if (ret)
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 14/22 mrf24j40: rework rx handling to async rx handling
In reply to Alexander AringThis patch prepares that we can do the receive handling inside interrupt context by using spi_async. This is necessary for introduce a non-threaded irq handling.
Also we drop the bit setting for "RXDECINV" at register "BBREG1", we do a driectly full write of register "BBREG1", because it contains the bit RXDECINV only.
--- drivers/net/ieee802154/mrf24j40.c | 282 ++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 164 deletions(-)
drivers/net/ieee802154/mrf24j40.c +118 -164
@@ -167,6 +167,20 @@ struct mrf24j40 {u8 tx_post_buf[2 ];struct spi_transfer tx_post_trx; +/* for protect/unprotect/read length rxfifo */ +struct spi_message rx_msg; +u8 rx_buf[3 ]; +struct spi_transfer rx_trx; + +/* receive handling */ +struct spi_message rx_buf_msg; +u8 rx_addr_buf[2 ]; +struct spi_transfer rx_addr_trx; +u8 rx_lqi_buf[2 ]; +struct spi_transfer rx_lqi_trx; +u8 rx_fifo_buf[RX_FIFO_SIZE ]; +struct spi_transfer rx_fifo_buf_trx; +struct mutex buffer_mutex;/* only used to protect buf */ u8 *buf;/* 3 bytes. Used for SPI single-register transfers. */ };
@@ -472,32 +486,6 @@ static const struct regmap_bus mrf24j40_long_regmap_bus = { .val_format_endian_default = REGMAP_ENDIAN_BIG, }; -static int write_short_reg (struct mrf24j40 *devrec,u8 reg,u8 value) -{ -int ret; -struct spi_message msg; -struct spi_transfer xfer = { - .len =2 , - .tx_buf = devrec->buf, - .rx_buf = devrec->buf, - }; - -spi_message_init (&msg); -spi_message_add_tail (&xfer, &msg); - -mutex_lock (&devrec->buffer_mutex); - devrec->buf[0 ] =MRF24J40_WRITESHORT (reg); - devrec->buf[1 ] = value; - - ret =spi_sync (devrec->spi, &msg); -if (ret) -dev_err (printdev (devrec), -"SPI write Failed for short register 0x%hhx\n" , reg); - -mutex_unlock (&devrec->buffer_mutex); -return ret; -} -static int read_short_reg (struct mrf24j40 *devrec,u8 reg,u8 *val) {int ret =-1 ;
@@ -526,37 +514,6 @@ static int read_short_reg(struct mrf24j40 *devrec, u8 reg, u8 *val)return ret; } -static int read_long_reg (struct mrf24j40 *devrec,u16 reg,u8 *value) -{ -int ret; -u16 cmd; -struct spi_message msg; -struct spi_transfer xfer = { - .len =3 , - .tx_buf = devrec->buf, - .rx_buf = devrec->buf, - }; - -spi_message_init (&msg); -spi_message_add_tail (&xfer, &msg); - - cmd =MRF24J40_READLONG (reg); -mutex_lock (&devrec->buffer_mutex); - devrec->buf[0 ] = cmd >>8 &0xff ; - devrec->buf[1 ] = cmd &0xff ; - devrec->buf[2 ] =0 ; - - ret =spi_sync (devrec->spi, &msg); -if (ret) -dev_err (printdev (devrec), -"SPI read Failed for long register 0x%hx\n" , reg); -else - *value = devrec->buf[2 ]; - -mutex_unlock (&devrec->buffer_mutex); -return ret; -} -static void write_tx_buf_complete (void *context) {struct mrf24j40 *devrec = context;
@@ -616,78 +573,6 @@ static int mrf24j40_tx(struct ieee802154_hw *hw, struct sk_buff *skb)return write_tx_buf (devrec,0x000 , skb->data, skb->len); } -static int mrf24j40_read_rx_buf (struct mrf24j40 *devrec, -u8 *data,u8 *len,u8 *lqi) -{ -u8 rx_len; -u8 addr[2 ]; -u8 lqi_rssi[2 ]; -u16 cmd; -int ret; -struct spi_message msg; -struct spi_transfer addr_xfer = { - .len =2 , - .tx_buf = &addr, - }; -struct spi_transfer data_xfer = { - .len =0x0 ,/* set below */ - .rx_buf = data, - }; -struct spi_transfer status_xfer = { - .len =2 , - .rx_buf = &lqi_rssi, - }; - -/* Get the length of the data in the RX FIFO. The length in this -* register exclues the 1-byte length field at the beginning. */ - ret =read_long_reg (devrec,REG_RX_FIFO , &rx_len); -if (ret) - goto out; - -/* Range check the RX FIFO length, accounting for the one-byte -* length field at the beginning. */ -if (rx_len >RX_FIFO_SIZE -1 ) { -dev_err (printdev (devrec),"Invalid length read from device. Performing short read.\n" ); - rx_len =RX_FIFO_SIZE -1 ; - } - -if (rx_len > *len) { -/* Passed in buffer wasn't big enough. Should never happen. */ -dev_err (printdev (devrec),"Buffer not big enough. Performing short read\n" ); - rx_len = *len; - } - -/* Set up the commands to read the data. */ - cmd =MRF24J40_READLONG (REG_RX_FIFO +1 ); - addr[0 ] = cmd >>8 &0xff ; - addr[1 ] = cmd &0xff ; - data_xfer.len = rx_len; - -spi_message_init (&msg); -spi_message_add_tail (&addr_xfer, &msg); -spi_message_add_tail (&data_xfer, &msg); -spi_message_add_tail (&status_xfer, &msg); - - ret =spi_sync (devrec->spi, &msg); -if (ret) { -dev_err (printdev (devrec),"SPI RX Buffer Read Failed.\n" ); - goto out; - } - - *lqi = lqi_rssi[0 ]; - *len = rx_len; - -#ifdef DEBUG -print_hex_dump (KERN_DEBUG ,"mrf24j40 rx: " , -DUMP_PREFIX_OFFSET ,16 ,1 , data, *len,0 ); -pr_debug ("mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n" , - lqi_rssi[0 ], lqi_rssi[1 ]); -#endif - -out: -return ret; -} -static int mrf24j40_ed (struct ieee802154_hw *hw,u8 *level) {/* TODO: */
@@ -823,53 +708,98 @@ static int mrf24j40_filter(struct ieee802154_hw *hw,return 0 ; } -static int mrf24j40_handle_rx (struct mrf24j40 *devrec) +static void mrf24j40_handle_rx_read_buf_unlock (struct mrf24j40 *devrec) { -u8 len =RX_FIFO_SIZE ; -u8 lqi =0 ; -u8 val; -int ret =0 ; -int ret2; -struct sk_buff *skb; +int ret; -/* Turn off reception of packets off the air. This prevents the -* device from overwriting the buffer while we're reading it. */ - ret =read_short_reg (devrec,REG_BBREG1 , &val); +/* Turn back on reception of packets off the air. */ + devrec->rx_msg.complete =NULL ; + devrec->rx_buf[0 ] =MRF24J40_WRITESHORT (REG_BBREG1 ); + devrec->rx_buf[1 ] =0x00 ;/* CLR RXDECINV */ + ret =spi_async (devrec->spi, &devrec->rx_msg);if (ret) - goto out; - val |=4 ;/* SET RXDECINV */ -write_short_reg (devrec,REG_BBREG1 , val); +dev_err (printdev (devrec),"failed to unlock rx buffer\n" ); +} - skb =dev_alloc_skb (len); +static void mrf24j40_handle_rx_read_buf_complete (void *context) +{ +struct mrf24j40 *devrec = context; +u8 len = devrec->rx_buf[2 ]; +u8 rx_local_buf[RX_FIFO_SIZE ]; +struct sk_buff *skb; + +memcpy (rx_local_buf, devrec->rx_fifo_buf, len); +mrf24j40_handle_rx_read_buf_unlock (devrec); + + skb =dev_alloc_skb (IEEE802154_MTU );if (!skb) { - ret = -ENOMEM ; - goto out; +dev_err (printdev (devrec),"failed to allocate skb\n" ); +return ; } - ret =mrf24j40_read_rx_buf (devrec,skb_put (skb, len), &len, &lqi); -if (ret <0 ) { -dev_err (printdev (devrec),"Failure reading RX FIFO\n" ); -kfree_skb (skb); - ret = -EINVAL ; - goto out; +memcpy (skb_put (skb, len), rx_local_buf, len); +ieee802154_rx_irqsafe (devrec->hw, skb,0 ); + +#ifdef DEBUG +print_hex_dump (KERN_DEBUG ,"mrf24j40 rx: " ,DUMP_PREFIX_OFFSET ,16 ,1 , + rx_local_buf, len,0 ); +pr_debug ("mrf24j40 rx: lqi: %02hhx rssi: %02hhx\n" , + devrec->rx_lqi_buf[0 ], devrec->rx_lqi_buf[1 ]); +#endif +} + +static void mrf24j40_handle_rx_read_buf (void *context) +{ +struct mrf24j40 *devrec = context; +u16 cmd; +int ret; + +/* if length is invalid read the full MTU */ +if (!ieee802154_is_valid_psdu_len (devrec->rx_buf[2 ])) + devrec->rx_buf[2 ] =IEEE802154_MTU ; + + cmd =MRF24J40_READLONG (REG_RX_FIFO +1 ); + devrec->rx_addr_buf[0 ] = cmd >>8 &0xff ; + devrec->rx_addr_buf[1 ] = cmd &0xff ; + devrec->rx_fifo_buf_trx.len = devrec->rx_buf[2 ]; + ret =spi_async (devrec->spi, &devrec->rx_buf_msg); +if (ret) { +dev_err (printdev (devrec),"failed to read rx buffer\n" ); +mrf24j40_handle_rx_read_buf_unlock (devrec); } +} -/* TODO: Other drivers call ieee20154_rx_irqsafe() here (eg: cc2040, -* also from a workqueue). I think irqsafe is not necessary here. -* Can someone confirm? */ -ieee802154_rx_irqsafe (devrec->hw, skb, lqi); +static void mrf24j40_handle_rx_read_len (void *context) +{ +struct mrf24j40 *devrec = context; +u16 cmd; +int ret; -dev_dbg (printdev (devrec),"RX Handled\n" ); +/* read the length of received frame */ + devrec->rx_msg.complete = mrf24j40_handle_rx_read_buf; + devrec->rx_trx.len =3 ; + cmd =MRF24J40_READLONG (REG_RX_FIFO ); + devrec->rx_buf[0 ] = cmd >>8 &0xff ; + devrec->rx_buf[1 ] = cmd &0xff ; -out: -/* Turn back on reception of packets off the air. */ - ret2 =read_short_reg (devrec,REG_BBREG1 , &val); -if (ret2) -return ret2; - val &= ~0x4 ;/* Clear RXDECINV */ -write_short_reg (devrec,REG_BBREG1 , val); + ret =spi_async (devrec->spi, &devrec->rx_msg); +if (ret) { +dev_err (printdev (devrec),"failed to read rx buffer length\n" ); +mrf24j40_handle_rx_read_buf_unlock (devrec); + } +} -return ret; +static int mrf24j40_handle_rx (struct mrf24j40 *devrec) +{ +/* Turn off reception of packets off the air. This prevents the +* device from overwriting the buffer while we're reading it. +*/ + devrec->rx_msg.complete = mrf24j40_handle_rx_read_len; + devrec->rx_trx.len =2 ; + devrec->rx_buf[0 ] =MRF24J40_WRITESHORT (REG_BBREG1 ); + devrec->rx_buf[1 ] =0x04 ;/* SET RXDECINV */ + +return spi_async (devrec->spi, &devrec->rx_msg); }static const struct ieee802154_ops mrf24j40_ops = {
@@ -1025,6 +955,29 @@ mrf24j40_setup_tx_spi_messages(struct mrf24j40 *devrec)spi_message_add_tail (&devrec->tx_post_trx, &devrec->tx_post_msg); } +static void +mrf24j40_setup_rx_spi_messages (struct mrf24j40 *devrec) +{ +spi_message_init (&devrec->rx_msg); + devrec->rx_msg.context = devrec; + devrec->rx_trx.len =2 ; + devrec->rx_trx.tx_buf = devrec->rx_buf; + devrec->rx_trx.rx_buf = devrec->rx_buf; +spi_message_add_tail (&devrec->rx_trx, &devrec->rx_msg); + +spi_message_init (&devrec->rx_buf_msg); + devrec->rx_buf_msg.context = devrec; + devrec->rx_buf_msg.complete = mrf24j40_handle_rx_read_buf_complete; + devrec->rx_addr_trx.len =2 ; + devrec->rx_addr_trx.tx_buf = devrec->rx_addr_buf; +spi_message_add_tail (&devrec->rx_addr_trx, &devrec->rx_buf_msg); + devrec->rx_fifo_buf_trx.rx_buf = devrec->rx_fifo_buf; +spi_message_add_tail (&devrec->rx_fifo_buf_trx, &devrec->rx_buf_msg); + devrec->rx_lqi_trx.len =2 ; + devrec->rx_lqi_trx.rx_buf = devrec->rx_lqi_buf; +spi_message_add_tail (&devrec->rx_lqi_trx, &devrec->rx_buf_msg); +} +static void mrf24j40_phy_setup (struct mrf24j40 *devrec) {ieee802154_random_extended_addr (&devrec->hw->phy->perm_extended_addr);
@@ -1054,6 +1007,7 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT ;mrf24j40_setup_tx_spi_messages (devrec); +mrf24j40_setup_rx_spi_messages (devrec); devrec->regmap_short =devm_regmap_init_spi (spi, &mrf24j40_short_regmap);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 15/22 mrf24j40: async interrupt handling
In reply to Alexander AringThis patch removes the threaded irq handling and do a hardirq instead. We need to switch to spi_async for this step for getting the irq status register.
--- drivers/net/ieee802154/mrf24j40.c | 93 +++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 53 deletions(-)
drivers/net/ieee802154/mrf24j40.c +40 -53
@@ -181,8 +181,10 @@ struct mrf24j40 {u8 rx_fifo_buf[RX_FIFO_SIZE ];struct spi_transfer rx_fifo_buf_trx; -struct mutex buffer_mutex;/* only used to protect buf */ -u8 *buf;/* 3 bytes. Used for SPI single-register transfers. */ +/* isr handling for reading intstat */ +struct spi_message irq_msg; +u8 irq_buf[2 ]; +struct spi_transfer irq_trx; };/* regmap information for short address register access */
@@ -486,34 +488,6 @@ static const struct regmap_bus mrf24j40_long_regmap_bus = { .val_format_endian_default = REGMAP_ENDIAN_BIG, }; -static int read_short_reg (struct mrf24j40 *devrec,u8 reg,u8 *val) -{ -int ret =-1 ; -struct spi_message msg; -struct spi_transfer xfer = { - .len =2 , - .tx_buf = devrec->buf, - .rx_buf = devrec->buf, - }; - -spi_message_init (&msg); -spi_message_add_tail (&xfer, &msg); - -mutex_lock (&devrec->buffer_mutex); - devrec->buf[0 ] =MRF24J40_READSHORT (reg); - devrec->buf[1 ] =0 ; - - ret =spi_sync (devrec->spi, &msg); -if (ret) -dev_err (printdev (devrec), -"SPI read Failed for short register 0x%hhx\n" , reg); -else - *val = devrec->buf[1 ]; - -mutex_unlock (&devrec->buffer_mutex); -return ret; -} -static void write_tx_buf_complete (void *context) {struct mrf24j40 *devrec = context;
@@ -812,16 +786,12 @@ static const struct ieee802154_ops mrf24j40_ops = { .set_hw_addr_filt = mrf24j40_filter, }; -static irqreturn_t mrf24j40_isr (int irq,void *data) +static void mrf24j40_intstat_complete (void *context) { -struct mrf24j40 *devrec = data; -u8 intstat; -int ret; +struct mrf24j40 *devrec = context; +u8 intstat = devrec->irq_buf[1 ]; -/* Read the interrupt status */ - ret =read_short_reg (devrec,REG_INTSTAT , &intstat); -if (ret) - goto out; +enable_irq (devrec->spi->irq);/* Check for TX complete */ if (intstat &0x1 )
@@ -830,8 +800,23 @@ static irqreturn_t mrf24j40_isr(int irq, void *data)/* Check for Rx */ if (intstat &0x8 )mrf24j40_handle_rx (devrec); +} + +static irqreturn_t mrf24j40_isr (int irq,void *data) +{ +struct mrf24j40 *devrec = data; +int ret; + +disable_irq_nosync (irq); + + devrec->irq_buf[0 ] =MRF24J40_READSHORT (REG_INTSTAT ); +/* Read the interrupt status */ + ret =spi_async (devrec->spi, &devrec->irq_msg); +if (ret) { +enable_irq (irq); +return IRQ_NONE ; + } -out:return IRQ_HANDLED ; }
@@ -978,6 +963,18 @@ mrf24j40_setup_rx_spi_messages(struct mrf24j40 *devrec)spi_message_add_tail (&devrec->rx_lqi_trx, &devrec->rx_buf_msg); } +static void +mrf24j40_setup_irq_spi_messages (struct mrf24j40 *devrec) +{ +spi_message_init (&devrec->irq_msg); + devrec->irq_msg.context = devrec; + devrec->irq_msg.complete = mrf24j40_intstat_complete; + devrec->irq_trx.len =2 ; + devrec->irq_trx.tx_buf = devrec->irq_buf; + devrec->irq_trx.rx_buf = devrec->irq_buf; +spi_message_add_tail (&devrec->irq_trx, &devrec->irq_msg); +} +static void mrf24j40_phy_setup (struct mrf24j40 *devrec) {ieee802154_random_extended_addr (&devrec->hw->phy->perm_extended_addr);
@@ -1008,6 +1005,7 @@ static int mrf24j40_probe(struct spi_device *spi)mrf24j40_setup_tx_spi_messages (devrec);mrf24j40_setup_rx_spi_messages (devrec); +mrf24j40_setup_irq_spi_messages (devrec); devrec->regmap_short =devm_regmap_init_spi (spi, &mrf24j40_short_regmap);
@@ -1028,32 +1026,21 @@ static int mrf24j40_probe(struct spi_device *spi) goto err_register_device; } - devrec->buf =devm_kzalloc (&spi->dev,3 ,GFP_KERNEL ); -if (!devrec->buf) - goto err_register_device; -if (spi->max_speed_hz >MAX_SPI_SPEED_HZ ) {dev_warn (&spi->dev,"spi clock above possible maximum: %d" ,MAX_SPI_SPEED_HZ );return -EINVAL ; } -mutex_init (&devrec->buffer_mutex); - ret =mrf24j40_hw_init (devrec);if (ret) goto err_register_device;mrf24j40_phy_setup (devrec); - ret =devm_request_threaded_irq (&spi->dev, - spi->irq, -NULL , - mrf24j40_isr, -IRQF_TRIGGER_LOW |IRQF_ONESHOT , -dev_name (&spi->dev), - devrec); - + ret =devm_request_irq (&spi->dev, spi->irq, mrf24j40_isr, +IRQF_TRIGGER_LOW ,dev_name (&spi->dev), + devrec);if (ret) {dev_err (printdev (devrec),"Unable to get IRQ" ); goto err_register_device;
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 16/22 mrf24j40: add csma params support
In reply to Alexander AringThis patch adds supports to change the CSMA parameters. The datasheet doesn't say anything about max_be value. Seems not configurable and we assume the 802.15.4 default. But this value must exists because there is a min_be value.
--- drivers/net/ieee802154/mrf24j40.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
drivers/net/ieee802154/mrf24j40.c +26 -1
@@ -776,6 +776,21 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec)return spi_async (devrec->spi, &devrec->rx_msg); } +static int +mrf24j40_csma_params (struct ieee802154_hw *hw,u8 min_be,u8 max_be, +u8 retries) +{ +struct mrf24j40 *devrec = hw->priv; +u8 val; + +/* min_be */ + val = min_be <<3 ; +/* csma backoffs */ + val |= retries; + +return regmap_update_bits (devrec->regmap_short,REG_TXMCR ,0x1f , val); +} +static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , .xmit_async = mrf24j40_tx,
@@ -784,6 +799,7 @@ static const struct ieee802154_ops mrf24j40_ops = { .stop = mrf24j40_stop, .set_channel = mrf24j40_set_channel, .set_hw_addr_filt = mrf24j40_filter, + .set_csma_params = mrf24j40_csma_params, };static void mrf24j40_intstat_complete (void *context)
@@ -979,6 +995,14 @@ static void mrf24j40_phy_setup(struct mrf24j40 *devrec) {ieee802154_random_extended_addr (&devrec->hw->phy->perm_extended_addr); devrec->hw->phy->current_channel =11 ; + +/* mrf24j40 supports max_minbe 0 - 3 */ + devrec->hw->phy->supported.max_minbe =3 ; +/* datasheet doesn't say anything about max_be, but we have min_be +* So we assume the max_be default. +*/ + devrec->hw->phy->supported.min_maxbe =5 ; + devrec->hw->phy->supported.max_maxbe =5 ; }static int mrf24j40_probe (struct spi_device *spi)
@@ -1001,7 +1025,8 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw = hw; devrec->hw->parent = &spi->dev; devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; - devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT ; + devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT | +IEEE802154_HW_CSMA_PARAMS ;mrf24j40_setup_tx_spi_messages (devrec);mrf24j40_setup_rx_spi_messages (devrec);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 17/22 mrf24j40: add cca mode support
In reply to Alexander AringThis patch supports cca mode handling for mrf24j40.
--- drivers/net/ieee802154/mrf24j40.c | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/net/ieee802154/mrf24j40.c +40 -0
@@ -791,6 +791,37 @@ mrf24j40_csma_params(struct ieee802154_hw *hw, u8 min_be, u8 max_be,return regmap_update_bits (devrec->regmap_short,REG_TXMCR ,0x1f , val); } +static int mrf24j40_set_cca_mode (struct ieee802154_hw *hw, +const struct wpan_phy_cca *cca) +{ +struct mrf24j40 *devrec = hw->priv; +u8 val; + +/* mapping 802.15.4 to driver spec */ +switch (cca->mode) { +case NL802154_CCA_ENERGY : + val =2 ; +break ; +case NL802154_CCA_CARRIER : + val =1 ; +break ; +case NL802154_CCA_ENERGY_CARRIER : +switch (cca->opt) { +case NL802154_CCA_OPT_ENERGY_CARRIER_AND : + val =3 ; +break ; +default : +return -EINVAL ; + } +break ; +default : +return -EINVAL ; + } + +return regmap_update_bits (devrec->regmap_short,REG_BBREG2 ,0xc0 , + val <<6 ); +} +static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , .xmit_async = mrf24j40_tx,
@@ -800,6 +831,7 @@ static const struct ieee802154_ops mrf24j40_ops = { .set_channel = mrf24j40_set_channel, .set_hw_addr_filt = mrf24j40_filter, .set_csma_params = mrf24j40_csma_params, + .set_cca_mode = mrf24j40_set_cca_mode, };static void mrf24j40_intstat_complete (void *context)
@@ -1003,6 +1035,12 @@ static void mrf24j40_phy_setup(struct mrf24j40 *devrec)*/ devrec->hw->phy->supported.min_maxbe =5 ; devrec->hw->phy->supported.max_maxbe =5 ; + + devrec->hw->phy->cca.mode =NL802154_CCA_CARRIER ;; + devrec->hw->phy->supported.cca_modes =BIT (NL802154_CCA_ENERGY ) | +BIT (NL802154_CCA_CARRIER ) | +BIT (NL802154_CCA_ENERGY_CARRIER ); + devrec->hw->phy->supported.cca_opts =BIT (NL802154_CCA_OPT_ENERGY_CARRIER_AND ); }static int mrf24j40_probe (struct spi_device *spi)
@@ -1028,6 +1066,8 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT |IEEE802154_HW_CSMA_PARAMS ; + devrec->hw->phy->flags =WPAN_PHY_FLAG_CCA_MODE ; +mrf24j40_setup_tx_spi_messages (devrec);mrf24j40_setup_rx_spi_messages (devrec);mrf24j40_setup_irq_spi_messages (devrec);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 18/22 mrf24j40: add cca ed level support
In reply to Alexander AringThis patch supports handling to set the cca energy detection level for the mrf24j40 transceiver.
--- drivers/net/ieee802154/mrf24j40.c | 50 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)
drivers/net/ieee802154/mrf24j40.c +49 -1
@@ -822,6 +822,48 @@ static int mrf24j40_set_cca_mode(struct ieee802154_hw *hw, val << 6); } +/* array for representing ed levels */ +static const s32 mrf24j40_ed_levels[] = { +-9000 ,-8900 ,-8800 ,-8700 ,-8600 ,-8500 ,-8400 ,-8300 ,-8200 ,-8100 , +-8000 ,-7900 ,-7800 ,-7700 ,-7600 ,-7500 ,-7400 ,-7300 ,-7200 ,-7100 , +-7000 ,-6900 ,-6800 ,-6700 ,-6600 ,-6500 ,-6400 ,-6300 ,-6200 ,-6100 , +-6000 ,-5900 ,-5800 ,-5700 ,-5600 ,-5500 ,-5400 ,-5300 ,-5200 ,-5100 , +-5000 ,-4900 ,-4800 ,-4700 ,-4600 ,-4500 ,-4400 ,-4300 ,-4200 ,-4100 , +-4000 ,-3900 ,-3800 ,-3700 ,-3600 ,-3500 +}; + +/* map ed levels to register value */ +static const s32 mrf24j40_ed_levels_map[][2 ] = { + {-9000 ,0 }, {-8900 ,1 }, {-8800 ,2 }, {-8700 ,5 }, {-8600 ,9 }, + {-8500 ,13 }, {-8400 ,18 }, {-8300 ,23 }, {-8200 ,27 }, + {-8100 ,32 }, {-8000 ,37 }, {-7900 ,43 }, {-7800 ,48 }, + {-7700 ,53 }, {-7600 ,58 }, {-7500 ,63 }, {-7400 ,68 }, + {-7300 ,73 }, {-7200 ,78 }, {-7100 ,83 }, {-7000 ,89 }, + {-6900 ,95 }, {-6800 ,100 }, {-6700 ,107 }, {-6600 ,111 }, + {-6500 ,117 }, {-6400 ,121 }, {-6300 ,125 }, {-6200 ,129 }, + {-6100 ,133 }, {-6000 ,138 }, {-5900 ,143 }, {-5800 ,148 }, + {-5700 ,153 }, {-5600 ,159 }, {-5500 ,165 }, {-5400 ,170 }, + {-5300 ,176 }, {-5200 ,183 }, {-5100 ,188 }, {-5000 ,193 }, + {-4900 ,198 }, {-4800 ,203 }, {-4700 ,207 }, {-4600 ,212 }, + {-4500 ,216 }, {-4400 ,221 }, {-4300 ,225 }, {-4200 ,228 }, + {-4100 ,233 }, {-4000 ,239 }, {-3900 ,245 }, {-3800 ,250 }, + {-3700 ,253 }, {-3600 ,254 }, {-3500 ,255 }, +}; + +static int mrf24j40_set_cca_ed_level (struct ieee802154_hw *hw,s32 mbm) +{ +struct mrf24j40 *devrec = hw->priv; +int i; + +for (i =0 ; i <ARRAY_SIZE (mrf24j40_ed_levels_map); i++) { +if (mrf24j40_ed_levels_map[i][0 ] == mbm) +return regmap_write (devrec->regmap_short,REG_CCAEDTH , + mrf24j40_ed_levels_map[i][1 ]); + } + +return -EINVAL ; +} +static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , .xmit_async = mrf24j40_tx,
@@ -832,6 +874,7 @@ static const struct ieee802154_ops mrf24j40_ops = { .set_hw_addr_filt = mrf24j40_filter, .set_csma_params = mrf24j40_csma_params, .set_cca_mode = mrf24j40_set_cca_mode, + .set_cca_ed_level = mrf24j40_set_cca_ed_level, };static void mrf24j40_intstat_complete (void *context)
@@ -1041,6 +1084,10 @@ static void mrf24j40_phy_setup(struct mrf24j40 *devrec)BIT (NL802154_CCA_CARRIER ) |BIT (NL802154_CCA_ENERGY_CARRIER ); devrec->hw->phy->supported.cca_opts =BIT (NL802154_CCA_OPT_ENERGY_CARRIER_AND ); + + devrec->hw->phy->cca_ed_level =-6900 ; + devrec->hw->phy->supported.cca_ed_levels = mrf24j40_ed_levels; + devrec->hw->phy->supported.cca_ed_levels_size =ARRAY_SIZE (mrf24j40_ed_levels); }static int mrf24j40_probe (struct spi_device *spi)
@@ -1066,7 +1113,8 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT |IEEE802154_HW_CSMA_PARAMS ; - devrec->hw->phy->flags =WPAN_PHY_FLAG_CCA_MODE ; + devrec->hw->phy->flags =WPAN_PHY_FLAG_CCA_MODE | +WPAN_PHY_FLAG_CCA_ED_LEVEL ;mrf24j40_setup_tx_spi_messages (devrec);mrf24j40_setup_rx_spi_messages (devrec);
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 19/22 mrf24j40: add tx power support
In reply to Alexander AringThis patch supports setting of transmit power for the mrf24j40ma transceiver only. The mrf24j40mc has some amplifier to change the transmit power, I am currently not sure how the mapping for this amplifier looks like.
--- drivers/net/ieee802154/mrf24j40.c | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)
drivers/net/ieee802154/mrf24j40.c +71 -0
@@ -864,6 +864,65 @@ static int mrf24j40_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)return -EINVAL ; } +static const s32 mrf24j40ma_powers[] = { +0 ,-50 ,-120 ,-190 ,-280 ,-370 ,-490 ,-630 ,-1000 ,-1050 ,-1120 ,-1190 , +-1280 ,-1370 ,-1490 ,-1630 ,-2000 ,-2050 ,-2120 ,-2190 ,-2280 ,-2370 , +-2490 ,-2630 ,-3000 ,-3050 ,-3120 ,-3190 ,-3280 ,-3370 ,-3490 ,-3630 , +}; + +static int mrf24j40_set_txpower (struct ieee802154_hw *hw,s32 mbm) +{ +struct mrf24j40 *devrec = hw->priv; +s32 small_scale; +u8 val; + +if (0 >= mbm && mbm >-1000 ) { + val =0 ; + small_scale = mbm; + }else if (-1000 >= mbm && mbm >-2000 ) { + val =0x40 ; + small_scale = mbm +1000 ; + }else if (-2000 >= mbm && mbm >-3000 ) { + val =0x80 ; + small_scale = mbm +2000 ; + }else if (-3000 >= mbm && mbm >-4000 ) { + val =0xc0 ; + small_scale = mbm +3000 ; + }else { +return -EINVAL ; + } + +switch (small_scale) { +case 0 : +break ; +case -50 : + val |=0x08 ; +break ; +case -120 : + val |=0x10 ; +break ; +case -190 : + val |=0x18 ; +break ; +case -280 : + val |=0x20 ; +break ; +case -370 : + val |=0x28 ; +break ; +case -490 : + val |=0x30 ; +break ; +case -630 : + val |=0x38 ; +break ; +default : +return -EINVAL ; + } + +return regmap_update_bits (devrec->regmap_long,REG_RFCON3 ,0xf8 , val); +} +static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , .xmit_async = mrf24j40_tx,
@@ -875,6 +934,7 @@ static const struct ieee802154_ops mrf24j40_ops = { .set_csma_params = mrf24j40_csma_params, .set_cca_mode = mrf24j40_set_cca_mode, .set_cca_ed_level = mrf24j40_set_cca_ed_level, + .set_txpower = mrf24j40_set_txpower, };static void mrf24j40_intstat_complete (void *context)
@@ -1088,6 +1148,17 @@ static void mrf24j40_phy_setup(struct mrf24j40 *devrec) devrec->hw->phy->cca_ed_level =-6900 ; devrec->hw->phy->supported.cca_ed_levels = mrf24j40_ed_levels; devrec->hw->phy->supported.cca_ed_levels_size =ARRAY_SIZE (mrf24j40_ed_levels); + +switch (spi_get_device_id (devrec->spi)->driver_data) { +case MRF24J40 : +case MRF24J40MA : + devrec->hw->phy->supported.tx_powers = mrf24j40ma_powers; + devrec->hw->phy->supported.tx_powers_size =ARRAY_SIZE (mrf24j40ma_powers); + devrec->hw->phy->flags |=WPAN_PHY_FLAG_TXPOWER ; +break ; +default : +break ; + } }static int mrf24j40_probe (struct spi_device *spi)
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 20/22 mrf24j40: add promiscuous mode support
In reply to Alexander AringThis patch adds support for promiscuous mode by setting promiscuous (no frame filtering), disable automatic ack handling and not filtering frames where the crc is invalid.
--- drivers/net/ieee802154/mrf24j40.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/net/ieee802154/mrf24j40.c +21 -1
@@ -923,6 +923,24 @@ static int mrf24j40_set_txpower(struct ieee802154_hw *hw, s32 mbm)return regmap_update_bits (devrec->regmap_long,REG_RFCON3 ,0xf8 , val); } +static int mrf24j40_set_promiscuous_mode (struct ieee802154_hw *hw,bool on) +{ +struct mrf24j40 *devrec = hw->priv; +int ret; + +if (on) { +/* set PROMI, ERRPKT and NOACKRSP */ + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x23 , +0x23 ); + }else { +/* clear PROMI, ERRPKT and NOACKRSP */ + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x23 , +0x00 ); + } + +return ret; +} +static const struct ieee802154_ops mrf24j40_ops = { .owner =THIS_MODULE , .xmit_async = mrf24j40_tx,
@@ -935,6 +953,7 @@ static const struct ieee802154_ops mrf24j40_ops = { .set_cca_mode = mrf24j40_set_cca_mode, .set_cca_ed_level = mrf24j40_set_cca_ed_level, .set_txpower = mrf24j40_set_txpower, + .set_promiscuous_mode = mrf24j40_set_promiscuous_mode, };static void mrf24j40_intstat_complete (void *context)
@@ -1182,7 +1201,8 @@ static int mrf24j40_probe(struct spi_device *spi) devrec->hw->parent = &spi->dev; devrec->hw->phy->supported.channels[0 ] =CHANNEL_MASK ; devrec->hw->flags =IEEE802154_HW_TX_OMIT_CKSUM |IEEE802154_HW_AFILT | -IEEE802154_HW_CSMA_PARAMS ; +IEEE802154_HW_CSMA_PARAMS | +IEEE802154_HW_PROMISCUOUS ; devrec->hw->phy->flags =WPAN_PHY_FLAG_CCA_MODE |WPAN_PHY_FLAG_CCA_ED_LEVEL ;
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 21/22 mrf24j40: change irq trigger type behaviour
In reply to Alexander AringThis patch changes the irq trigger type value while calling devm_request_irq by using IRQF_TRIGGER_LOW when no irq type was given. Additional we add support for change the irq polarity while hw init if high level or low level triggered irq type are given.
For rising edge triggered irq's the mrf24j40 can't deal with that, this races at position of tx completion irq, while the irq is disabled we readout the irq status registers. This will resets the irq line so other irq's can occur. Wile readout the irq status register the irq is still disabled and edge triggered interrupts will be ignored.
--- drivers/net/ieee802154/mrf24j40.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)
drivers/net/ieee802154/mrf24j40.c +28 -3
@@ -20,6 +20,7 @@#include <linux/module.h> #include <linux/regmap.h> #include <linux/ieee802154.h> +#include <linux/irq.h> #include <net/cfg802154.h> #include <net/mac802154.h>
@@ -992,6 +993,7 @@ static irqreturn_t mrf24j40_isr(int irq, void *data)static int mrf24j40_hw_init (struct mrf24j40 *devrec) { +u32 irq_type;int ret;/* Initialize the device.
@@ -1083,6 +1085,25 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)regmap_write (devrec->regmap_long,REG_RFCON3 ,0x28 ); } + irq_type =irq_get_trigger_type (devrec->spi->irq); +if (irq_type ==IRQ_TYPE_EDGE_RISING || + irq_type ==IRQ_TYPE_EDGE_FALLING ) +dev_warn (&devrec->spi->dev, +"Using edge triggered irq's are not recommended, because it can cause races and result in a non-functional driver!\n" ); +switch (irq_type) { +case IRQ_TYPE_EDGE_RISING : +case IRQ_TYPE_LEVEL_HIGH : +/* set interrupt polarity to rising */ + ret =regmap_update_bits (devrec->regmap_long,REG_SLPCON0 , +0x02 ,0x02 ); +if (ret) + goto err_ret; +break ; +default : +/* default is falling edge */ +break ; + } +return 0 ; err_ret:
@@ -1182,7 +1203,7 @@ static void mrf24j40_phy_setup(struct mrf24j40 *devrec)static int mrf24j40_probe (struct spi_device *spi) { -int ret = -ENOMEM ; +int ret = -ENOMEM , irq_type;struct ieee802154_hw *hw;struct mrf24j40 *devrec;
@@ -1242,9 +1263,13 @@ static int mrf24j40_probe(struct spi_device *spi)mrf24j40_phy_setup (devrec); +/* request IRQF_TRIGGER_LOW as fallback default */ + irq_type =irq_get_trigger_type (spi->irq); +if (!irq_type) + irq_type =IRQF_TRIGGER_LOW ; + ret =devm_request_irq (&spi->dev, spi->irq, mrf24j40_isr, -IRQF_TRIGGER_LOW ,dev_name (&spi->dev), - devrec); + irq_type,dev_name (&spi->dev), devrec);if (ret) {dev_err (printdev (devrec),"Unable to get IRQ" ); goto err_register_device;
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 22/22 mrf24j40: replace magic numbers
In reply to Alexander AringThis patch replaces some magic numbers with defines for register bits, mask and shifts.
--- drivers/net/ieee802154/mrf24j40.c | 136 +++++++++++++++++++++++++++----------- 1 file changed, 98 insertions(+), 38 deletions(-)
drivers/net/ieee802154/mrf24j40.c +98 -38
@@ -26,6 +26,11 @@/* MRF24J40 Short Address Registers */ #define REG_RXMCR 0x00/* Receive MAC control */ +#define BIT_PROMI BIT(0) +#define BIT_ERRPKT BIT(1) +#define BIT_NOACKRSP BIT(5) +#define BIT_PANCOORD BIT(3) +#define REG_PANIDL 0x01/* PAN ID (low) */ #define REG_PANIDH 0x02/* PAN ID (high) */ #define REG_SADRL 0x03/* Short address (low) */
@@ -41,6 +46,11 @@#define REG_RXFLUSH 0x0D#define REG_ORDER 0x10#define REG_TXMCR 0x11/* Transmit MAC control */ +#define TXMCR_MIN_BE_SHIFT 3 +#define TXMCR_MIN_BE_MASK 0x18 +#define TXMCR_CSMA_RETRIES_SHIFT 0 +#define TXMCR_CSMA_RETRIES_MASK 0x07 +#define REG_ACKTMOUT 0x12#define REG_ESLOTG1 0x13#define REG_SYMTICKL 0x14
@@ -50,6 +60,9 @@#define REG_PACON2 0x18/* Power Amplifier Control */ #define REG_TXBCON0 0x1A#define REG_TXNCON 0x1B/* Transmit Normal FIFO Control */ +#define BIT_TXNTRIG BIT(0) +#define BIT_TXNACKREQ BIT(2) +#define REG_TXG1CON 0x1C#define REG_TXG2CON 0x1D#define REG_ESLOTG23 0x1E
@@ -70,15 +83,28 @@#define REG_TXSTBL 0x2E/* TX Stabilization */ #define REG_RXSR 0x30#define REG_INTSTAT 0x31/* Interrupt Status */ +#define BIT_TXNIF BIT(0) +#define BIT_RXIF BIT(3) +#define REG_INTCON 0x32/* Interrupt Control */ +#define BIT_TXNIE BIT(0) +#define BIT_RXIE BIT(3) +#define REG_GPIO 0x33/* GPIO */ #define REG_TRISGPIO 0x34/* GPIO direction */ #define REG_SLPACK 0x35#define REG_RFCTL 0x36/* RF Control Mode Register */ +#define BIT_RFRST BIT(2) +#define REG_SECCR2 0x37#define REG_BBREG0 0x38#define REG_BBREG1 0x39/* Baseband Registers */ +#define BIT_RXDECINV BIT(2) +#define REG_BBREG2 0x3A/* */ +#define BBREG2_CCA_MODE_SHIFT 6 +#define BBREG2_CCA_MODE_MASK 0xc0 +#define REG_BBREG3 0x3B#define REG_BBREG4 0x3C#define REG_BBREG6 0x3E/* */
@@ -86,9 +112,32 @@/* MRF24J40 Long Address Registers */ #define REG_RFCON0 0x200/* RF Control Registers */ +#define RFCON0_CH_SHIFT 4 +#define RFCON0_CH_MASK 0xf0 +#define RFOPT_RECOMMEND 3 +#define REG_RFCON1 0x201#define REG_RFCON2 0x202#define REG_RFCON3 0x203 + +#define TXPWRL_MASK 0xc0 +#define TXPWRL_SHIFT 6 +#define TXPWRL_30 0x3 +#define TXPWRL_20 0x2 +#define TXPWRL_10 0x1 +#define TXPWRL_0 0x0 + +#define TXPWRS_MASK 0x38 +#define TXPWRS_SHIFT 3 +#define TXPWRS_6_3 0x7 +#define TXPWRS_4_9 0x6 +#define TXPWRS_3_7 0x5 +#define TXPWRS_2_8 0x4 +#define TXPWRS_1_9 0x3 +#define TXPWRS_1_2 0x2 +#define TXPWRS_0_5 0x1 +#define TXPWRS_0 0x0 +#define REG_RFCON5 0x205#define REG_RFCON6 0x206#define REG_RFCON7 0x207
@@ -99,6 +148,8 @@#define REG_RFSTATE 0x20F#define REG_RSSI 0x210#define REG_SLPCON0 0x211/* Sleep Clock Control Registers */ +#define BIT_INTEDGE BIT(1) +#define REG_SLPCON1 0x220#define REG_WAKETIMEL 0x222/* Wake-up Time Match Value Low */ #define REG_WAKETIMEH 0x223/* Wake-up Time Match Value High */
@@ -493,11 +544,11 @@ static void write_tx_buf_complete(void *context) {struct mrf24j40 *devrec = context;__le16 fc =ieee802154_get_fc_from_skb (devrec->tx_skb); -u8 val =0x01 ; +u8 val =BIT_TXNTRIG ;int ret;if (ieee802154_is_ackreq (fc)) - val |=0x04 ; + val |=BIT_TXNACKREQ ; devrec->tx_post_msg.complete =NULL ; devrec->tx_post_buf[0 ] =MRF24J40_WRITESHORT (REG_TXNCON );
@@ -564,7 +615,7 @@ static int mrf24j40_start(struct ieee802154_hw *hw)/* Clear TXNIE and RXIE. Enable interrupts */ return regmap_update_bits (devrec->regmap_short,REG_INTCON , -0x01 |0x08 ,0x00 ); +BIT_TXNIE |BIT_RXIE ,0 ); }static void mrf24j40_stop (struct ieee802154_hw *hw)
@@ -574,8 +625,8 @@ static void mrf24j40_stop(struct ieee802154_hw *hw)dev_dbg (printdev (devrec),"stop\n" );/* Set TXNIE and RXIE. Disable Interrupts */ -regmap_update_bits (devrec->regmap_short,REG_INTCON ,0x01 |0x08 , -0x01 |0x08 ); +regmap_update_bits (devrec->regmap_short,REG_INTCON , +BIT_TXNIE |BIT_TXNIE ,BIT_TXNIE |BIT_TXNIE ); }static int mrf24j40_set_channel (struct ieee802154_hw *hw,u8 page,u8 channel)
@@ -591,17 +642,19 @@ static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)WARN_ON (channel >MRF24J40_CHAN_MAX );/* Set Channel TODO */ - val = (channel-11 ) <<4 |0x03 ; - ret =regmap_update_bits (devrec->regmap_long,REG_RFCON0 ,0xf0 , val); + val = (channel -11 ) <<RFCON0_CH_SHIFT |RFOPT_RECOMMEND ; + ret =regmap_update_bits (devrec->regmap_long,REG_RFCON0 , +RFCON0_CH_MASK , val);if (ret)return ret;/* RF Reset */ - ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,0x04 ,0x04 ); + ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,BIT_RFRST , +BIT_RFRST );if (ret)return ret; - ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,0x04 ,0x00 ); + ret =regmap_update_bits (devrec->regmap_short,REG_RFCTL ,BIT_RFRST ,0 );if (!ret)udelay (SET_CHANNEL_DELAY_US );/* per datasheet */
@@ -664,11 +717,11 @@ static int mrf24j40_filter(struct ieee802154_hw *hw,int ret;if (filt->pan_coord) - val =0x8 ; + val =BIT_PANCOORD ;else - val =0x0 ; - ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x8 , - val); + val =0 ; + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR , +BIT_PANCOORD , val);if (ret)return ret;
@@ -772,7 +825,7 @@ static int mrf24j40_handle_rx(struct mrf24j40 *devrec) devrec->rx_msg.complete = mrf24j40_handle_rx_read_len; devrec->rx_trx.len =2 ; devrec->rx_buf[0 ] =MRF24J40_WRITESHORT (REG_BBREG1 ); - devrec->rx_buf[1 ] =0x04 ;/* SET RXDECINV */ + devrec->rx_buf[1 ] =BIT_RXDECINV ;/* SET RXDECINV */ return spi_async (devrec->spi, &devrec->rx_msg); }
@@ -785,11 +838,13 @@ mrf24j40_csma_params(struct ieee802154_hw *hw, u8 min_be, u8 max_be,u8 val;/* min_be */ - val = min_be <<3 ; + val = min_be <<TXMCR_MIN_BE_SHIFT ;/* csma backoffs */ - val |= retries; + val |= retries <<TXMCR_CSMA_RETRIES_SHIFT ; -return regmap_update_bits (devrec->regmap_short,REG_TXMCR ,0x1f , val); +return regmap_update_bits (devrec->regmap_short,REG_TXMCR , +TXMCR_MIN_BE_MASK |TXMCR_CSMA_RETRIES_MASK , + val); } static int mrf24j40_set_cca_mode(struct ieee802154_hw *hw,
@@ -819,8 +874,9 @@ static int mrf24j40_set_cca_mode(struct ieee802154_hw *hw,return -EINVAL ; } -return regmap_update_bits (devrec->regmap_short,REG_BBREG2 ,0xc0 , - val <<6 ); +return regmap_update_bits (devrec->regmap_short,REG_BBREG2 , +BBREG2_CCA_MODE_MASK , + val <<BBREG2_CCA_MODE_SHIFT ); }/* array for representing ed levels */
@@ -878,16 +934,16 @@ static int mrf24j40_set_txpower(struct ieee802154_hw *hw, s32 mbm)u8 val;if (0 >= mbm && mbm >-1000 ) { - val =0 ; + val =TXPWRL_0 <<TXPWRL_SHIFT ; small_scale = mbm; }else if (-1000 >= mbm && mbm >-2000 ) { - val =0x40 ; + val =TXPWRL_10 <<TXPWRL_SHIFT ; small_scale = mbm +1000 ; }else if (-2000 >= mbm && mbm >-3000 ) { - val =0x80 ; + val =TXPWRL_20 <<TXPWRL_SHIFT ; small_scale = mbm +2000 ; }else if (-3000 >= mbm && mbm >-4000 ) { - val =0xc0 ; + val =TXPWRL_30 <<TXPWRL_SHIFT ; small_scale = mbm +3000 ; }else {return -EINVAL ;
@@ -895,33 +951,35 @@ static int mrf24j40_set_txpower(struct ieee802154_hw *hw, s32 mbm)switch (small_scale) {case 0 : + val |= (TXPWRS_0 <<TXPWRS_SHIFT );break ;case -50 : - val |=0x08 ; + val |= (TXPWRS_0_5 <<TXPWRS_SHIFT );break ;case -120 : - val |=0x10 ; + val |= (TXPWRS_1_2 <<TXPWRS_SHIFT );break ;case -190 : - val |=0x18 ; + val |= (TXPWRS_1_9 <<TXPWRS_SHIFT );break ;case -280 : - val |=0x20 ; + val |= (TXPWRS_2_8 <<TXPWRS_SHIFT );break ;case -370 : - val |=0x28 ; + val |= (TXPWRS_3_7 <<TXPWRS_SHIFT );break ;case -490 : - val |=0x30 ; + val |= (TXPWRS_4_9 <<TXPWRS_SHIFT );break ;case -630 : - val |=0x38 ; + val |= (TXPWRS_6_3 <<TXPWRS_SHIFT );break ;default :return -EINVAL ; } -return regmap_update_bits (devrec->regmap_long,REG_RFCON3 ,0xf8 , val); +return regmap_update_bits (devrec->regmap_long,REG_RFCON3 , +TXPWRL_MASK |TXPWRS_MASK , val); }static int mrf24j40_set_promiscuous_mode (struct ieee802154_hw *hw,bool on)
@@ -931,12 +989,14 @@ static int mrf24j40_set_promiscuous_mode(struct ieee802154_hw *hw, bool on)if (on) {/* set PROMI, ERRPKT and NOACKRSP */ - ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x23 , -0x23 ); + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR , +BIT_PROMI |BIT_ERRPKT |BIT_NOACKRSP , +BIT_PROMI |BIT_ERRPKT |BIT_NOACKRSP ); }else {/* clear PROMI, ERRPKT and NOACKRSP */ - ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR ,0x23 , -0x00 ); + ret =regmap_update_bits (devrec->regmap_short,REG_RXMCR , +BIT_PROMI |BIT_ERRPKT |BIT_NOACKRSP , +0 ); }return ret;
@@ -965,11 +1025,11 @@ static void mrf24j40_intstat_complete(void *context)enable_irq (devrec->spi->irq);/* Check for TX complete */ -if (intstat &0x1 ) +if (intstat &BIT_TXNIF )ieee802154_xmit_complete (devrec->hw, devrec->tx_skb, false);/* Check for Rx */ -if (intstat &0x8 ) +if (intstat &BIT_RXIF )mrf24j40_handle_rx (devrec); }
@@ -1095,7 +1155,7 @@ static int mrf24j40_hw_init(struct mrf24j40 *devrec)case IRQ_TYPE_LEVEL_HIGH :/* set interrupt polarity to rising */ ret =regmap_update_bits (devrec->regmap_long,REG_SLPCON0 , -0x02 ,0x02 ); +BIT_INTEDGE ,BIT_INTEDGE );if (ret) goto err_ret;break ;
Signature · 1 line
2.5.2
Hi Alex,
Quoted 48 lines
this patch series contains some cleanups, devicetree support, rx/tx async handling, threaded irq to hardirq, csma params settings, cca mode settings, cca energy detection levels, tx power settings and promiscuous mode settings.
Also I add regmap support, the lowlevel spi calls are only used in hotpaths for handling receive/transmit and irq handling. There are also some many magic numbers, maybe we can introduce some register bits defines.
- Alex
changes since PATCH:
- add warning for edge triggered irq's
- add patch to replace magic numbers, excepthw_initwhich is specified by datasheet instruction
- removeWARN_ONformax_be
- fix cca mode setting s/OR/AND
- add warning for spi freq is above maximum
- let txpower also working for mrf24j40 chips by default
- re-add DEBUG things for rssi and lqi value
- add several reviewed-by's
- use forcca_ed_thresregisterregmap_writeinstead update bits with full0xffmaskAlexander Aring (22):
mrf24j40: cleanup define identation
mrf24j40: useieee802154_alloc_hwfor private data
mrf24j40: callingieee802154_register_hwat last
mrf24j40: remove spi settings overwrite
mrf24j40: add device-tree support
mrf24j40: add default channel setting
mrf24j40: add random extended addr generation
mrf24j40: add more register defines
mrf24j40: add regmap support
mrf24j40: use regmap for register access
mrf24j40: change to frame delivery with crc
ieee802154: add helpers for frame control checks
mrf24j40: rework tx handling to async tx handling
mrf24j40: rework rx handling to async rx handling
mrf24j40: async interrupt handling
mrf24j40: add csma params support
mrf24j40: add cca mode support
mrf24j40: add cca ed level support
mrf24j40: add tx power support
mrf24j40: add promiscuous mode support
mrf24j40: change irq trigger type behaviour
mrf24j40: replace magic numbers
Quoted 7 lines
.../bindings/net/ieee802154/mrf24j40.txt | 20 + MAINTAINERS | 1 + drivers/net/ieee802154/Kconfig | 1 + drivers/net/ieee802154/mrf24j40.c | 1424 ++++++++++++++------ include/linux/ieee802154.h | 12 + 5 files changed, 1031 insertions(+), 427 deletions(-)create mode 100644
Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
all 22 patches has been applied to bluetooth-next tree.
Regards
Marcel