Commit 7cb9e6bf authored by David S. Miller's avatar David S. Miller

Merge branch 'at86rf230-next'

Alexander Aring says:

====================
at86rf230: rework driver implementation

this patch series includes a rework of the at86rf230 driver.

There are several changes:

 - Add regmap support.
 - Merge at86rf212 operations with generic at86rf2xx operations, all chips
   supports these operations.
 - Drop of irqworker. This is a workqueue which will scheduled by an irq to
   handle synchronous spi handling. Instead using asynchronous spi handling,
   then no scheduler is involved at irq handling.
 - Also detected some bugs by receiving frame like CRC can be correct and a
   802.15.4 frame length could be above 127 bytes. This would crash the whole
   kernel (but should be handled by the mac layer). Another bug is the handling
   with RX_SAFE_MODE which protect the frame buffer after a readout. This is
   currently not working because we read out the buffer twice and the first one
   to get the frame size. Solution is to readout always the whole frame buffer.
 - Added some timing relevants things from the datasheet for state changes And
   IEEE 802.15.4 standard like interframe spacing. Interframe spacing is needed
   to insert some receiving space time between frame transmitting. This should be
   also handled by MAC layer, but it's currently a workaround to add this inside
   the driver layer.
 - Add some callback setting for chip specific handling, instead of runtime decisions
   if (is_chip_type()). Callbacks are set only once at probe time.
 - We don't using a force state change anymore. A force state change will do a
   abort of receiving frames while we want to transmit a new frame. This should
   decrease the drop rate of packets.
 - And many others changes and bug fixes...

changes since v3:
 - fix irq polarity in patch ("at86rf230: rework irq_pol setting").

changes since v2:
 - add check if necessary functions are implemented when hw flags are set in patch
   ("mac802154: at86rf230: add hw flags and merge ops"). I choosed the second variant.
 - remove unnecessary includes for workqueue and mutex in patch
   ("at86rf230: rework transmit and receive").
 - remove unnecessary cast in patch ("at86rf230: rework transmit and receive").
 - acivate regmap cache with REGCACHE_RBTREE in patch
   ("at86rf230: add regmap support").
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1598c36a 01ebd60b
...@@ -34,6 +34,7 @@ config IEEE802154_AT86RF230 ...@@ -34,6 +34,7 @@ config IEEE802154_AT86RF230
depends on IEEE802154_DRIVERS && MAC802154 depends on IEEE802154_DRIVERS && MAC802154
tristate "AT86RF230/231/233/212 transceiver driver" tristate "AT86RF230/231/233/212 transceiver driver"
depends on SPI depends on SPI
select REGMAP_SPI
---help--- ---help---
Say Y here to enable the at86rf230/231/233/212 SPI 802.15.4 wireless Say Y here to enable the at86rf230/231/233/212 SPI 802.15.4 wireless
controller. controller.
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Written by: * Written by:
* Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Alexander Smirnov <alex.bluesman.smirnov@gmail.com> * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
* Alexander Aring <aar@pengutronix.de>
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -26,43 +27,75 @@ ...@@ -26,43 +27,75 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/workqueue.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/at86rf230.h> #include <linux/spi/at86rf230.h>
#include <linux/regmap.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <net/ieee802154.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
struct at86rf230_local { struct at86rf230_local;
struct spi_device *spi; /* at86rf2xx chip depend data.
* All timings are in us.
*/
struct at86rf2xx_chip_data {
u16 t_sleep_cycle;
u16 t_channel_switch;
u16 t_reset_to_off;
u16 t_off_to_aack;
u16 t_off_to_tx_on;
u16 t_frame;
u16 t_p_ack;
/* short interframe spacing time */
u16 t_sifs;
/* long interframe spacing time */
u16 t_lifs;
/* completion timeout for tx in msecs */
u16 t_tx_timeout;
int rssi_base_val;
u8 part; int (*set_channel)(struct at86rf230_local *, int, int);
u8 vers; int (*get_desense_steps)(struct at86rf230_local *, s32);
};
u8 buf[2]; #define AT86RF2XX_MAX_BUF (127 + 3)
struct mutex bmux;
struct work_struct irqwork; struct at86rf230_state_change {
struct completion tx_complete; struct at86rf230_local *lp;
struct spi_message msg;
struct spi_transfer trx;
u8 buf[AT86RF2XX_MAX_BUF];
void (*complete)(void *context);
u8 from_state;
u8 to_state;
};
struct at86rf230_local {
struct spi_device *spi;
struct ieee802154_dev *dev; struct ieee802154_dev *dev;
struct at86rf2xx_chip_data *data;
struct regmap *regmap;
spinlock_t lock; struct completion state_complete;
bool irq_busy; struct at86rf230_state_change state;
bool is_tx;
bool tx_aret;
int rssi_base_val; struct at86rf230_state_change irq;
};
static bool is_rf212(struct at86rf230_local *local) bool tx_aret;
{ bool is_tx;
return local->part == 7; /* spinlock for is_tx protection */
} spinlock_t lock;
struct completion tx_complete;
struct sk_buff *tx_skb;
struct at86rf230_state_change tx;
};
#define RG_TRX_STATUS (0x01) #define RG_TRX_STATUS (0x01)
#define SR_TRX_STATUS 0x01, 0x1f, 0 #define SR_TRX_STATUS 0x01, 0x1f, 0
...@@ -256,344 +289,753 @@ static bool is_rf212(struct at86rf230_local *local) ...@@ -256,344 +289,753 @@ static bool is_rf212(struct at86rf230_local *local)
#define STATE_BUSY_RX_AACK_NOCLK 0x1E #define STATE_BUSY_RX_AACK_NOCLK 0x1E
#define STATE_TRANSITION_IN_PROGRESS 0x1F #define STATE_TRANSITION_IN_PROGRESS 0x1F
#define AT86RF2XX_NUMREGS 0x3F
static int static int
__at86rf230_detect_device(struct spi_device *spi, u16 *man_id, u8 *part, at86rf230_async_state_change(struct at86rf230_local *lp,
u8 *version) struct at86rf230_state_change *ctx,
const u8 state, void (*complete)(void *context));
static inline int
__at86rf230_write(struct at86rf230_local *lp,
unsigned int addr, unsigned int data)
{ {
u8 data[4]; return regmap_write(lp->regmap, addr, data);
u8 *buf = kmalloc(2, GFP_KERNEL); }
int status;
struct spi_message msg;
struct spi_transfer xfer = {
.len = 2,
.tx_buf = buf,
.rx_buf = buf,
};
u8 reg;
if (!buf)
return -ENOMEM;
for (reg = RG_PART_NUM; reg <= RG_MAN_ID_1; reg++) { static inline int
buf[0] = (reg & CMD_REG_MASK) | CMD_REG; __at86rf230_read(struct at86rf230_local *lp,
buf[1] = 0xff; unsigned int addr, unsigned int *data)
dev_vdbg(&spi->dev, "buf[0] = %02x\n", buf[0]); {
spi_message_init(&msg); return regmap_read(lp->regmap, addr, data);
spi_message_add_tail(&xfer, &msg); }
status = spi_sync(spi, &msg); static inline int
dev_vdbg(&spi->dev, "status = %d\n", status); at86rf230_read_subreg(struct at86rf230_local *lp,
if (msg.status) unsigned int addr, unsigned int mask,
status = msg.status; unsigned int shift, unsigned int *data)
{
int rc;
dev_vdbg(&spi->dev, "status = %d\n", status); rc = __at86rf230_read(lp, addr, data);
dev_vdbg(&spi->dev, "buf[0] = %02x\n", buf[0]); if (rc > 0)
dev_vdbg(&spi->dev, "buf[1] = %02x\n", buf[1]); *data = (*data & mask) >> shift;
if (status == 0) return rc;
data[reg - RG_PART_NUM] = buf[1]; }
else
break; static inline int
at86rf230_write_subreg(struct at86rf230_local *lp,
unsigned int addr, unsigned int mask,
unsigned int shift, unsigned int data)
{
return regmap_update_bits(lp->regmap, addr, mask, data << shift);
}
static bool
at86rf230_reg_writeable(struct device *dev, unsigned int reg)
{
switch (reg) {
case RG_TRX_STATE:
case RG_TRX_CTRL_0:
case RG_TRX_CTRL_1:
case RG_PHY_TX_PWR:
case RG_PHY_ED_LEVEL:
case RG_PHY_CC_CCA:
case RG_CCA_THRES:
case RG_RX_CTRL:
case RG_SFD_VALUE:
case RG_TRX_CTRL_2:
case RG_ANT_DIV:
case RG_IRQ_MASK:
case RG_VREG_CTRL:
case RG_BATMON:
case RG_XOSC_CTRL:
case RG_RX_SYN:
case RG_XAH_CTRL_1:
case RG_FTN_CTRL:
case RG_PLL_CF:
case RG_PLL_DCU:
case RG_SHORT_ADDR_0:
case RG_SHORT_ADDR_1:
case RG_PAN_ID_0:
case RG_PAN_ID_1:
case RG_IEEE_ADDR_0:
case RG_IEEE_ADDR_1:
case RG_IEEE_ADDR_2:
case RG_IEEE_ADDR_3:
case RG_IEEE_ADDR_4:
case RG_IEEE_ADDR_5:
case RG_IEEE_ADDR_6:
case RG_IEEE_ADDR_7:
case RG_XAH_CTRL_0:
case RG_CSMA_SEED_0:
case RG_CSMA_SEED_1:
case RG_CSMA_BE:
return true;
default:
return false;
}
}
static bool
at86rf230_reg_readable(struct device *dev, unsigned int reg)
{
bool rc;
/* all writeable are also readable */
rc = at86rf230_reg_writeable(dev, reg);
if (rc)
return rc;
/* readonly regs */
switch (reg) {
case RG_TRX_STATUS:
case RG_PHY_RSSI:
case RG_IRQ_STATUS:
case RG_PART_NUM:
case RG_VERSION_NUM:
case RG_MAN_ID_1:
case RG_MAN_ID_0:
return true;
default:
return false;
}
}
static bool
at86rf230_reg_volatile(struct device *dev, unsigned int reg)
{
/* can be changed during runtime */
switch (reg) {
case RG_TRX_STATUS:
case RG_TRX_STATE:
case RG_PHY_RSSI:
case RG_PHY_ED_LEVEL:
case RG_IRQ_STATUS:
case RG_VREG_CTRL:
return true;
default:
return false;
} }
}
if (status == 0) { static bool
*part = data[0]; at86rf230_reg_precious(struct device *dev, unsigned int reg)
*version = data[1]; {
*man_id = (data[3] << 8) | data[2]; /* don't clear irq line on read */
switch (reg) {
case RG_IRQ_STATUS:
return true;
default:
return false;
} }
}
kfree(buf); static struct regmap_config at86rf230_regmap_spi_config = {
.reg_bits = 8,
.val_bits = 8,
.write_flag_mask = CMD_REG | CMD_WRITE,
.read_flag_mask = CMD_REG,
.cache_type = REGCACHE_RBTREE,
.max_register = AT86RF2XX_NUMREGS,
.writeable_reg = at86rf230_reg_writeable,
.readable_reg = at86rf230_reg_readable,
.volatile_reg = at86rf230_reg_volatile,
.precious_reg = at86rf230_reg_precious,
};
return status; static void
at86rf230_async_error_recover(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
at86rf230_async_state_change(lp, ctx, STATE_RX_AACK_ON, NULL);
} }
static int static void
__at86rf230_write(struct at86rf230_local *lp, u8 addr, u8 data) at86rf230_async_error(struct at86rf230_local *lp,
struct at86rf230_state_change *ctx, int rc)
{ {
u8 *buf = lp->buf; dev_err(&lp->spi->dev, "spi_async error %d\n", rc);
int status;
struct spi_message msg; at86rf230_async_state_change(lp, ctx, STATE_FORCE_TRX_OFF,
struct spi_transfer xfer = { at86rf230_async_error_recover);
.len = 2,
.tx_buf = buf,
};
buf[0] = (addr & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
buf[1] = data;
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
status = spi_sync(lp->spi, &msg);
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
if (msg.status)
status = msg.status;
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
return status;
} }
/* Generic function to get some register value in async mode */
static int static int
__at86rf230_read_subreg(struct at86rf230_local *lp, at86rf230_async_read_reg(struct at86rf230_local *lp, const u8 reg,
u8 addr, u8 mask, int shift, u8 *data) struct at86rf230_state_change *ctx,
void (*complete)(void *context))
{ {
u8 *buf = lp->buf; u8 *tx_buf = ctx->buf;
int status;
struct spi_message msg; tx_buf[0] = (reg & CMD_REG_MASK) | CMD_REG;
struct spi_transfer xfer = { ctx->trx.len = 2;
.len = 2, ctx->msg.complete = complete;
.tx_buf = buf, return spi_async(lp->spi, &ctx->msg);
.rx_buf = buf,
};
buf[0] = (addr & CMD_REG_MASK) | CMD_REG;
buf[1] = 0xff;
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
status = spi_sync(lp->spi, &msg);
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
if (msg.status)
status = msg.status;
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
if (status == 0)
*data = (buf[1] & mask) >> shift;
return status;
} }
static int static void
at86rf230_read_subreg(struct at86rf230_local *lp, at86rf230_async_state_assert(void *context)
u8 addr, u8 mask, int shift, u8 *data)
{ {
int status; struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
const u8 *buf = ctx->buf;
const u8 trx_state = buf[1] & 0x1f;
/* Assert state change */
if (trx_state != ctx->to_state) {
/* Special handling if transceiver state is in
* STATE_BUSY_RX_AACK and a SHR was detected.
*/
if (trx_state == STATE_BUSY_RX_AACK) {
/* Undocumented race condition. If we send a state
* change to STATE_RX_AACK_ON the transceiver could
* change his state automatically to STATE_BUSY_RX_AACK
* if a SHR was detected. This is not an error, but we
* can't assert this.
*/
if (ctx->to_state == STATE_RX_AACK_ON)
goto done;
/* If we change to STATE_TX_ON without forcing and
* transceiver state is STATE_BUSY_RX_AACK, we wait
* 'tFrame + tPAck' receiving time. In this time the
* PDU should be received. If the transceiver is still
* in STATE_BUSY_RX_AACK, we run a force state change
* to STATE_TX_ON. This is a timeout handling, if the
* transceiver stucks in STATE_BUSY_RX_AACK.
*/
if (ctx->to_state == STATE_TX_ON) {
at86rf230_async_state_change(lp, ctx,
STATE_FORCE_TX_ON,
ctx->complete);
return;
}
}
mutex_lock(&lp->bmux); dev_warn(&lp->spi->dev, "unexcept state change from 0x%02x to 0x%02x. Actual state: 0x%02x\n",
status = __at86rf230_read_subreg(lp, addr, mask, shift, data); ctx->from_state, ctx->to_state, trx_state);
mutex_unlock(&lp->bmux); }
return status; done:
if (ctx->complete)
ctx->complete(context);
} }
static int /* Do state change timing delay. */
at86rf230_write_subreg(struct at86rf230_local *lp, static void
u8 addr, u8 mask, int shift, u8 data) at86rf230_async_state_delay(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
struct at86rf2xx_chip_data *c = lp->data;
bool force = false;
int rc;
/* The force state changes are will show as normal states in the
* state status subregister. We change the to_state to the
* corresponding one and remember if it was a force change, this
* differs if we do a state change from STATE_BUSY_RX_AACK.
*/
switch (ctx->to_state) {
case STATE_FORCE_TX_ON:
ctx->to_state = STATE_TX_ON;
force = true;
break;
case STATE_FORCE_TRX_OFF:
ctx->to_state = STATE_TRX_OFF;
force = true;
break;
default:
break;
}
switch (ctx->from_state) {
case STATE_TRX_OFF:
switch (ctx->to_state) {
case STATE_RX_AACK_ON:
usleep_range(c->t_off_to_aack, c->t_off_to_aack + 10);
goto change;
case STATE_TX_ON:
usleep_range(c->t_off_to_tx_on,
c->t_off_to_tx_on + 10);
goto change;
default:
break;
}
break;
case STATE_BUSY_RX_AACK:
switch (ctx->to_state) {
case STATE_TX_ON:
/* Wait for worst case receiving time if we
* didn't make a force change from BUSY_RX_AACK
* to TX_ON.
*/
if (!force) {
usleep_range(c->t_frame + c->t_p_ack,
c->t_frame + c->t_p_ack + 1000);
goto change;
}
break;
default:
break;
}
break;
/* Default value, means RESET state */
case STATE_P_ON:
switch (ctx->to_state) {
case STATE_TRX_OFF:
usleep_range(c->t_reset_to_off, c->t_reset_to_off + 10);
goto change;
default:
break;
}
break;
default:
break;
}
/* Default delay is 1us in the most cases */
udelay(1);
change:
rc = at86rf230_async_read_reg(lp, RG_TRX_STATUS, ctx,
at86rf230_async_state_assert);
if (rc)
dev_err(&lp->spi->dev, "spi_async error %d\n", rc);
}
static void
at86rf230_async_state_change_start(void *context)
{ {
int status; struct at86rf230_state_change *ctx = context;
u8 val; struct at86rf230_local *lp = ctx->lp;
u8 *buf = ctx->buf;
const u8 trx_state = buf[1] & 0x1f;
int rc;
mutex_lock(&lp->bmux); /* Check for "possible" STATE_TRANSITION_IN_PROGRESS */
status = __at86rf230_read_subreg(lp, addr, 0xff, 0, &val); if (trx_state == STATE_TRANSITION_IN_PROGRESS) {
if (status) udelay(1);
goto out; rc = at86rf230_async_read_reg(lp, RG_TRX_STATUS, ctx,
at86rf230_async_state_change_start);
if (rc)
dev_err(&lp->spi->dev, "spi_async error %d\n", rc);
return;
}
val &= ~mask; /* Check if we already are in the state which we change in */
val |= (data << shift) & mask; if (trx_state == ctx->to_state) {
if (ctx->complete)
ctx->complete(context);
return;
}
status = __at86rf230_write(lp, addr, val); /* Set current state to the context of state change */
out: ctx->from_state = trx_state;
mutex_unlock(&lp->bmux);
return status; /* Going into the next step for a state change which do a timing
* relevant delay.
*/
buf[0] = (RG_TRX_STATE & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
buf[1] = ctx->to_state;
ctx->trx.len = 2;
ctx->msg.complete = at86rf230_async_state_delay;
rc = spi_async(lp->spi, &ctx->msg);
if (rc)
dev_err(&lp->spi->dev, "spi_async error %d\n", rc);
} }
static int static int
at86rf230_write_fbuf(struct at86rf230_local *lp, u8 *data, u8 len) at86rf230_async_state_change(struct at86rf230_local *lp,
struct at86rf230_state_change *ctx,
const u8 state, void (*complete)(void *context))
{ {
u8 *buf = lp->buf; /* Initialization for the state change context */
int status; ctx->to_state = state;
struct spi_message msg; ctx->complete = complete;
struct spi_transfer xfer_head = { return at86rf230_async_read_reg(lp, RG_TRX_STATUS, ctx,
.len = 2, at86rf230_async_state_change_start);
.tx_buf = buf,
};
struct spi_transfer xfer_buf = {
.len = len,
.tx_buf = data,
};
mutex_lock(&lp->bmux);
buf[0] = CMD_WRITE | CMD_FB;
buf[1] = len + 2; /* 2 bytes for CRC that isn't written */
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
spi_message_init(&msg);
spi_message_add_tail(&xfer_head, &msg);
spi_message_add_tail(&xfer_buf, &msg);
status = spi_sync(lp->spi, &msg);
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
if (msg.status)
status = msg.status;
dev_vdbg(&lp->spi->dev, "status = %d\n", status);
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]);
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]);
mutex_unlock(&lp->bmux);
return status;
} }
static void
at86rf230_sync_state_change_complete(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
complete(&lp->state_complete);
}
/* This function do a sync framework above the async state change.
* Some callbacks of the IEEE 802.15.4 driver interface need to be
* handled synchronously.
*/
static int static int
at86rf230_read_fbuf(struct at86rf230_local *lp, u8 *data, u8 *len, u8 *lqi) at86rf230_sync_state_change(struct at86rf230_local *lp, unsigned int state)
{ {
u8 *buf = lp->buf; int rc;
int status;
struct spi_message msg;
struct spi_transfer xfer_head = {
.len = 2,
.tx_buf = buf,
.rx_buf = buf,
};
struct spi_transfer xfer_head1 = {
.len = 2,
.tx_buf = buf,
.rx_buf = buf,
};
struct spi_transfer xfer_buf = {
.len = 0,
.rx_buf = data,
};
mutex_lock(&lp->bmux);
buf[0] = CMD_FB; rc = at86rf230_async_state_change(lp, &lp->state, state,
buf[1] = 0x00; at86rf230_sync_state_change_complete);
if (rc) {
at86rf230_async_error(lp, &lp->state, rc);
return rc;
}
spi_message_init(&msg); rc = wait_for_completion_timeout(&lp->state_complete,
spi_message_add_tail(&xfer_head, &msg); msecs_to_jiffies(100));
if (!rc)
return -ETIMEDOUT;
status = spi_sync(lp->spi, &msg); return 0;
dev_vdbg(&lp->spi->dev, "status = %d\n", status); }
xfer_buf.len = *(buf + 1) + 1; static void
*len = buf[1]; at86rf230_tx_complete(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
buf[0] = CMD_FB; complete(&lp->tx_complete);
buf[1] = 0x00; }
spi_message_init(&msg); static void
spi_message_add_tail(&xfer_head1, &msg); at86rf230_tx_on(void *context)
spi_message_add_tail(&xfer_buf, &msg); {
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
int rc;
rc = at86rf230_async_state_change(lp, &lp->irq, STATE_RX_AACK_ON,
at86rf230_tx_complete);
if (rc)
at86rf230_async_error(lp, ctx, rc);
}
status = spi_sync(lp->spi, &msg); static void
at86rf230_tx_trac_error(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
int rc;
if (msg.status) rc = at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
status = msg.status; at86rf230_tx_on);
if (rc)
at86rf230_async_error(lp, ctx, rc);
}
dev_vdbg(&lp->spi->dev, "status = %d\n", status); static void
dev_vdbg(&lp->spi->dev, "buf[0] = %02x\n", buf[0]); at86rf230_tx_trac_check(void *context)
dev_vdbg(&lp->spi->dev, "buf[1] = %02x\n", buf[1]); {
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
const u8 *buf = ctx->buf;
const u8 trac = (buf[1] & 0xe0) >> 5;
int rc;
if (status) { /* If trac status is different than zero we need to do a state change
if (lqi && (*len > lp->buf[1])) * to STATE_FORCE_TRX_OFF then STATE_TX_ON to recover the transceiver
*lqi = data[lp->buf[1]]; * state to TX_ON.
*/
if (trac) {
rc = at86rf230_async_state_change(lp, ctx, STATE_FORCE_TRX_OFF,
at86rf230_tx_trac_error);
if (rc)
at86rf230_async_error(lp, ctx, rc);
return;
} }
mutex_unlock(&lp->bmux);
return status; at86rf230_tx_on(context);
} }
static int
at86rf230_ed(struct ieee802154_dev *dev, u8 *level) static void
at86rf230_tx_trac_status(void *context)
{ {
might_sleep(); struct at86rf230_state_change *ctx = context;
BUG_ON(!level); struct at86rf230_local *lp = ctx->lp;
*level = 0xbe; int rc;
return 0;
rc = at86rf230_async_read_reg(lp, RG_TRX_STATE, ctx,
at86rf230_tx_trac_check);
if (rc)
at86rf230_async_error(lp, ctx, rc);
}
static void
at86rf230_rx(struct at86rf230_local *lp,
const u8 *data, u8 len)
{
u8 lqi;
struct sk_buff *skb;
u8 rx_local_buf[AT86RF2XX_MAX_BUF];
if (len < 2)
return;
/* read full frame buffer and invalid lqi value to lowest
* indicator if frame was is in a corrupted state.
*/
if (len > IEEE802154_MTU) {
lqi = 0;
len = IEEE802154_MTU;
dev_vdbg(&lp->spi->dev, "corrupted frame received\n");
} else {
lqi = data[len];
}
memcpy(rx_local_buf, data, len);
enable_irq(lp->spi->irq);
skb = alloc_skb(IEEE802154_MTU, GFP_ATOMIC);
if (!skb) {
dev_vdbg(&lp->spi->dev, "failed to allocate sk_buff\n");
return;
}
memcpy(skb_put(skb, len), rx_local_buf, len);
/* We do not put CRC into the frame */
skb_trim(skb, len - 2);
ieee802154_rx_irqsafe(lp->dev, skb, lqi);
}
static void
at86rf230_rx_read_frame_complete(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
const u8 *buf = lp->irq.buf;
const u8 len = buf[1];
at86rf230_rx(lp, buf + 2, len);
} }
static int static int
at86rf230_state(struct ieee802154_dev *dev, int state) at86rf230_rx_read_frame(struct at86rf230_local *lp)
{ {
struct at86rf230_local *lp = dev->priv; u8 *buf = lp->irq.buf;
buf[0] = CMD_FB;
lp->irq.trx.len = AT86RF2XX_MAX_BUF;
lp->irq.msg.complete = at86rf230_rx_read_frame_complete;
return spi_async(lp->spi, &lp->irq.msg);
}
static void
at86rf230_rx_trac_check(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
int rc; int rc;
u8 val;
u8 desired_status;
might_sleep(); /* Possible check on trac status here. This could be useful to make
* some stats why receive is failed. Not used at the moment, but it's
* maybe timing relevant. Datasheet doesn't say anything about this.
* The programming guide say do it so.
*/
if (state == STATE_FORCE_TX_ON) rc = at86rf230_rx_read_frame(lp);
desired_status = STATE_TX_ON; if (rc) {
else if (state == STATE_FORCE_TRX_OFF) enable_irq(lp->spi->irq);
desired_status = STATE_TRX_OFF; at86rf230_async_error(lp, ctx, rc);
else }
desired_status = state; }
static int
at86rf230_irq_trx_end(struct at86rf230_local *lp)
{
spin_lock(&lp->lock);
if (lp->is_tx) {
lp->is_tx = 0;
spin_unlock(&lp->lock);
enable_irq(lp->spi->irq);
if (lp->tx_aret)
return at86rf230_async_state_change(lp, &lp->irq,
STATE_FORCE_TX_ON,
at86rf230_tx_trac_status);
else
return at86rf230_async_state_change(lp, &lp->irq,
STATE_RX_AACK_ON,
at86rf230_tx_complete);
} else {
spin_unlock(&lp->lock);
return at86rf230_async_read_reg(lp, RG_TRX_STATE, &lp->irq,
at86rf230_rx_trac_check);
}
}
do { static void
rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val); at86rf230_irq_status(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
const u8 *buf = lp->irq.buf;
const u8 irq = buf[1];
int rc;
if (irq & IRQ_TRX_END) {
rc = at86rf230_irq_trx_end(lp);
if (rc) if (rc)
goto err; at86rf230_async_error(lp, ctx, rc);
} while (val == STATE_TRANSITION_IN_PROGRESS); } else {
enable_irq(lp->spi->irq);
dev_err(&lp->spi->dev, "not supported irq %02x received\n",
irq);
}
}
if (val == desired_status) static irqreturn_t at86rf230_isr(int irq, void *data)
return 0; {
struct at86rf230_local *lp = data;
struct at86rf230_state_change *ctx = &lp->irq;
u8 *buf = ctx->buf;
int rc;
/* state is equal to phy states */ disable_irq_nosync(lp->spi->irq);
rc = at86rf230_write_subreg(lp, SR_TRX_CMD, state);
if (rc)
goto err;
do { buf[0] = (RG_IRQ_STATUS & CMD_REG_MASK) | CMD_REG;
rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val); ctx->trx.len = 2;
if (rc) ctx->msg.complete = at86rf230_irq_status;
goto err; rc = spi_async(lp->spi, &ctx->msg);
} while (val == STATE_TRANSITION_IN_PROGRESS); if (rc) {
at86rf230_async_error(lp, ctx, rc);
return IRQ_NONE;
}
return IRQ_HANDLED;
}
if (val == desired_status || static void
(desired_status == STATE_RX_ON && val == STATE_BUSY_RX) || at86rf230_write_frame_complete(void *context)
(desired_status == STATE_RX_AACK_ON && val == STATE_BUSY_RX_AACK)) {
return 0; struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
u8 *buf = ctx->buf;
int rc;
pr_err("unexpected state change: %d, asked for %d\n", val, state); buf[0] = (RG_TRX_STATE & CMD_REG_MASK) | CMD_REG | CMD_WRITE;
return -EBUSY; buf[1] = STATE_BUSY_TX;
ctx->trx.len = 2;
ctx->msg.complete = NULL;
rc = spi_async(lp->spi, &ctx->msg);
if (rc)
at86rf230_async_error(lp, ctx, rc);
}
err: static void
pr_err("error: %d\n", rc); at86rf230_write_frame(void *context)
return rc; {
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
struct sk_buff *skb = lp->tx_skb;
u8 *buf = lp->tx.buf;
int rc;
spin_lock(&lp->lock);
lp->is_tx = 1;
spin_unlock(&lp->lock);
buf[0] = CMD_FB | CMD_WRITE;
buf[1] = skb->len + 2;
memcpy(buf + 2, skb->data, skb->len);
lp->tx.trx.len = skb->len + 2;
lp->tx.msg.complete = at86rf230_write_frame_complete;
rc = spi_async(lp->spi, &lp->tx.msg);
if (rc)
at86rf230_async_error(lp, ctx, rc);
}
static void
at86rf230_xmit_tx_on(void *context)
{
struct at86rf230_state_change *ctx = context;
struct at86rf230_local *lp = ctx->lp;
int rc;
rc = at86rf230_async_state_change(lp, ctx, STATE_TX_ARET_ON,
at86rf230_write_frame);
if (rc)
at86rf230_async_error(lp, ctx, rc);
} }
static int static int
at86rf230_start(struct ieee802154_dev *dev) at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
u8 rc; struct at86rf230_state_change *ctx = &lp->tx;
rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); void (*tx_complete)(void *context) = at86rf230_write_frame;
if (rc) int rc;
return rc;
rc = at86rf230_state(dev, STATE_TX_ON); lp->tx_skb = skb;
if (rc)
/* In ARET mode we need to go into STATE_TX_ARET_ON after we
* are in STATE_TX_ON. The pfad differs here, so we change
* the complete handler.
*/
if (lp->tx_aret)
tx_complete = at86rf230_xmit_tx_on;
rc = at86rf230_async_state_change(lp, ctx, STATE_TX_ON,
tx_complete);
if (rc) {
at86rf230_async_error(lp, ctx, rc);
return rc; return rc;
}
rc = wait_for_completion_interruptible_timeout(&lp->tx_complete,
msecs_to_jiffies(lp->data->t_tx_timeout));
if (!rc) {
at86rf230_async_error(lp, ctx, rc);
return -ETIMEDOUT;
}
/* Interfame spacing time, which is phy depend.
* TODO
* Move this handling in MAC 802.15.4 layer.
* This is currently a workaround to avoid fragmenation issues.
*/
if (skb->len > 18)
usleep_range(lp->data->t_lifs, lp->data->t_lifs + 10);
else
usleep_range(lp->data->t_sifs, lp->data->t_sifs + 10);
return 0;
}
return at86rf230_state(dev, STATE_RX_AACK_ON); static int
at86rf230_ed(struct ieee802154_dev *dev, u8 *level)
{
might_sleep();
BUG_ON(!level);
*level = 0xbe;
return 0;
}
static int
at86rf230_start(struct ieee802154_dev *dev)
{
return at86rf230_sync_state_change(dev->priv, STATE_RX_AACK_ON);
} }
static void static void
at86rf230_stop(struct ieee802154_dev *dev) at86rf230_stop(struct ieee802154_dev *dev)
{ {
at86rf230_state(dev, STATE_FORCE_TRX_OFF); at86rf230_sync_state_change(dev->priv, STATE_FORCE_TRX_OFF);
} }
static int static int
at86rf230_set_channel(struct at86rf230_local *lp, int page, int channel) at86rf23x_set_channel(struct at86rf230_local *lp, int page, int channel)
{ {
lp->rssi_base_val = -91;
return at86rf230_write_subreg(lp, SR_CHANNEL, channel); return at86rf230_write_subreg(lp, SR_CHANNEL, channel);
} }
...@@ -611,10 +1053,10 @@ at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel) ...@@ -611,10 +1053,10 @@ at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel)
if (page == 0) { if (page == 0) {
rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 0); rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 0);
lp->rssi_base_val = -100; lp->data->rssi_base_val = -100;
} else { } else {
rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 1); rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 1);
lp->rssi_base_val = -98; lp->data->rssi_base_val = -98;
} }
if (rc < 0) if (rc < 0)
return rc; return rc;
...@@ -636,106 +1078,19 @@ at86rf230_channel(struct ieee802154_dev *dev, int page, int channel) ...@@ -636,106 +1078,19 @@ at86rf230_channel(struct ieee802154_dev *dev, int page, int channel)
return -EINVAL; return -EINVAL;
} }
if (is_rf212(lp)) rc = lp->data->set_channel(lp, page, channel);
rc = at86rf212_set_channel(lp, page, channel);
else
rc = at86rf230_set_channel(lp, page, channel);
if (rc < 0) if (rc < 0)
return rc; return rc;
msleep(1); /* Wait for PLL */ /* Wait for PLL */
usleep_range(lp->data->t_channel_switch,
lp->data->t_channel_switch + 10);
dev->phy->current_channel = channel; dev->phy->current_channel = channel;
dev->phy->current_page = page; dev->phy->current_page = page;
return 0; return 0;
} }
static int
at86rf230_xmit(struct ieee802154_dev *dev, struct sk_buff *skb)
{
struct at86rf230_local *lp = dev->priv;
int rc;
unsigned long flags;
spin_lock_irqsave(&lp->lock, flags);
if (lp->irq_busy) {
spin_unlock_irqrestore(&lp->lock, flags);
return -EBUSY;
}
spin_unlock_irqrestore(&lp->lock, flags);
might_sleep();
rc = at86rf230_state(dev, STATE_FORCE_TX_ON);
if (rc)
goto err;
spin_lock_irqsave(&lp->lock, flags);
lp->is_tx = 1;
reinit_completion(&lp->tx_complete);
spin_unlock_irqrestore(&lp->lock, flags);
rc = at86rf230_write_fbuf(lp, skb->data, skb->len);
if (rc)
goto err_rx;
if (lp->tx_aret) {
rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_TX_ARET_ON);
if (rc)
goto err_rx;
}
rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_BUSY_TX);
if (rc)
goto err_rx;
rc = wait_for_completion_interruptible(&lp->tx_complete);
if (rc < 0)
goto err_rx;
return at86rf230_start(dev);
err_rx:
at86rf230_start(dev);
err:
pr_err("error: %d\n", rc);
spin_lock_irqsave(&lp->lock, flags);
lp->is_tx = 0;
spin_unlock_irqrestore(&lp->lock, flags);
return rc;
}
static int at86rf230_rx(struct at86rf230_local *lp)
{
u8 len = 128, lqi = 0;
struct sk_buff *skb;
skb = alloc_skb(len, GFP_KERNEL);
if (!skb)
return -ENOMEM;
if (at86rf230_read_fbuf(lp, skb_put(skb, len), &len, &lqi))
goto err;
if (len < 2)
goto err;
skb_trim(skb, len - 2); /* We do not put CRC into the frame */
ieee802154_rx_irqsafe(lp->dev, skb, lqi);
dev_dbg(&lp->spi->dev, "READ_FBUF: %d %x\n", len, lqi);
return 0;
err:
pr_debug("received frame is too small\n");
kfree_skb(skb);
return -EINVAL;
}
static int static int
at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
struct ieee802154_hw_addr_filt *filt, struct ieee802154_hw_addr_filt *filt,
...@@ -784,7 +1139,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, ...@@ -784,7 +1139,7 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev,
} }
static int static int
at86rf212_set_txpower(struct ieee802154_dev *dev, int db) at86rf230_set_txpower(struct ieee802154_dev *dev, int db)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
...@@ -803,7 +1158,7 @@ at86rf212_set_txpower(struct ieee802154_dev *dev, int db) ...@@ -803,7 +1158,7 @@ at86rf212_set_txpower(struct ieee802154_dev *dev, int db)
} }
static int static int
at86rf212_set_lbt(struct ieee802154_dev *dev, bool on) at86rf230_set_lbt(struct ieee802154_dev *dev, bool on)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
...@@ -811,7 +1166,7 @@ at86rf212_set_lbt(struct ieee802154_dev *dev, bool on) ...@@ -811,7 +1166,7 @@ at86rf212_set_lbt(struct ieee802154_dev *dev, bool on)
} }
static int static int
at86rf212_set_cca_mode(struct ieee802154_dev *dev, u8 mode) at86rf230_set_cca_mode(struct ieee802154_dev *dev, u8 mode)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
...@@ -819,21 +1174,31 @@ at86rf212_set_cca_mode(struct ieee802154_dev *dev, u8 mode) ...@@ -819,21 +1174,31 @@ at86rf212_set_cca_mode(struct ieee802154_dev *dev, u8 mode)
} }
static int static int
at86rf212_set_cca_ed_level(struct ieee802154_dev *dev, s32 level) at86rf212_get_desens_steps(struct at86rf230_local *lp, s32 level)
{
return (level - lp->data->rssi_base_val) * 100 / 207;
}
static int
at86rf23x_get_desens_steps(struct at86rf230_local *lp, s32 level)
{
return (level - lp->data->rssi_base_val) / 2;
}
static int
at86rf230_set_cca_ed_level(struct ieee802154_dev *dev, s32 level)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
int desens_steps;
if (level < lp->rssi_base_val || level > 30) if (level < lp->data->rssi_base_val || level > 30)
return -EINVAL; return -EINVAL;
desens_steps = (level - lp->rssi_base_val) * 100 / 207; return at86rf230_write_subreg(lp, SR_CCA_ED_THRES,
lp->data->get_desense_steps(lp, level));
return at86rf230_write_subreg(lp, SR_CCA_ED_THRES, desens_steps);
} }
static int static int
at86rf212_set_csma_params(struct ieee802154_dev *dev, u8 min_be, u8 max_be, at86rf230_set_csma_params(struct ieee802154_dev *dev, u8 min_be, u8 max_be,
u8 retries) u8 retries)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
...@@ -854,7 +1219,7 @@ at86rf212_set_csma_params(struct ieee802154_dev *dev, u8 min_be, u8 max_be, ...@@ -854,7 +1219,7 @@ at86rf212_set_csma_params(struct ieee802154_dev *dev, u8 min_be, u8 max_be,
} }
static int static int
at86rf212_set_frame_retries(struct ieee802154_dev *dev, s8 retries) at86rf230_set_frame_retries(struct ieee802154_dev *dev, s8 retries)
{ {
struct at86rf230_local *lp = dev->priv; struct at86rf230_local *lp = dev->priv;
int rc = 0; int rc = 0;
...@@ -878,110 +1243,84 @@ static struct ieee802154_ops at86rf230_ops = { ...@@ -878,110 +1243,84 @@ static struct ieee802154_ops at86rf230_ops = {
.start = at86rf230_start, .start = at86rf230_start,
.stop = at86rf230_stop, .stop = at86rf230_stop,
.set_hw_addr_filt = at86rf230_set_hw_addr_filt, .set_hw_addr_filt = at86rf230_set_hw_addr_filt,
.set_txpower = at86rf230_set_txpower,
.set_lbt = at86rf230_set_lbt,
.set_cca_mode = at86rf230_set_cca_mode,
.set_cca_ed_level = at86rf230_set_cca_ed_level,
.set_csma_params = at86rf230_set_csma_params,
.set_frame_retries = at86rf230_set_frame_retries,
}; };
static struct ieee802154_ops at86rf212_ops = { static struct at86rf2xx_chip_data at86rf233_data = {
.owner = THIS_MODULE, .t_sleep_cycle = 330,
.xmit = at86rf230_xmit, .t_channel_switch = 11,
.ed = at86rf230_ed, .t_reset_to_off = 26,
.set_channel = at86rf230_channel, .t_off_to_aack = 80,
.start = at86rf230_start, .t_off_to_tx_on = 80,
.stop = at86rf230_stop, .t_frame = 4096,
.set_hw_addr_filt = at86rf230_set_hw_addr_filt, .t_p_ack = 545,
.set_txpower = at86rf212_set_txpower, .t_sifs = 192,
.set_lbt = at86rf212_set_lbt, .t_lifs = 480,
.set_cca_mode = at86rf212_set_cca_mode, .t_tx_timeout = 2000,
.set_cca_ed_level = at86rf212_set_cca_ed_level, .rssi_base_val = -91,
.set_csma_params = at86rf212_set_csma_params, .set_channel = at86rf23x_set_channel,
.set_frame_retries = at86rf212_set_frame_retries, .get_desense_steps = at86rf23x_get_desens_steps
}; };
static void at86rf230_irqwork(struct work_struct *work) static struct at86rf2xx_chip_data at86rf231_data = {
{ .t_sleep_cycle = 330,
struct at86rf230_local *lp = .t_channel_switch = 24,
container_of(work, struct at86rf230_local, irqwork); .t_reset_to_off = 37,
u8 status = 0, val; .t_off_to_aack = 110,
int rc; .t_off_to_tx_on = 110,
unsigned long flags; .t_frame = 4096,
.t_p_ack = 545,
rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &val); .t_sifs = 192,
status |= val; .t_lifs = 480,
.t_tx_timeout = 2000,
status &= ~IRQ_PLL_LOCK; /* ignore */ .rssi_base_val = -91,
status &= ~IRQ_RX_START; /* ignore */ .set_channel = at86rf23x_set_channel,
status &= ~IRQ_AMI; /* ignore */ .get_desense_steps = at86rf23x_get_desens_steps
status &= ~IRQ_TRX_UR; /* FIXME: possibly handle ???*/ };
if (status & IRQ_TRX_END) {
status &= ~IRQ_TRX_END;
spin_lock_irqsave(&lp->lock, flags);
if (lp->is_tx) {
lp->is_tx = 0;
spin_unlock_irqrestore(&lp->lock, flags);
complete(&lp->tx_complete);
} else {
spin_unlock_irqrestore(&lp->lock, flags);
at86rf230_rx(lp);
}
}
spin_lock_irqsave(&lp->lock, flags);
lp->irq_busy = 0;
spin_unlock_irqrestore(&lp->lock, flags);
}
static void at86rf230_irqwork_level(struct work_struct *work)
{
struct at86rf230_local *lp =
container_of(work, struct at86rf230_local, irqwork);
at86rf230_irqwork(work);
enable_irq(lp->spi->irq);
}
static irqreturn_t at86rf230_isr(int irq, void *data)
{
struct at86rf230_local *lp = data;
unsigned long flags;
spin_lock_irqsave(&lp->lock, flags);
lp->irq_busy = 1;
spin_unlock_irqrestore(&lp->lock, flags);
schedule_work(&lp->irqwork);
return IRQ_HANDLED;
}
static irqreturn_t at86rf230_isr_level(int irq, void *data)
{
disable_irq_nosync(irq);
return at86rf230_isr(irq, data); static struct at86rf2xx_chip_data at86rf212_data = {
} .t_sleep_cycle = 330,
.t_channel_switch = 11,
.t_reset_to_off = 26,
.t_off_to_aack = 200,
.t_off_to_tx_on = 200,
.t_frame = 4096,
.t_p_ack = 545,
.t_sifs = 192,
.t_lifs = 480,
.t_tx_timeout = 2000,
.rssi_base_val = -100,
.set_channel = at86rf212_set_channel,
.get_desense_steps = at86rf212_get_desens_steps
};
static int at86rf230_hw_init(struct at86rf230_local *lp) static int at86rf230_hw_init(struct at86rf230_local *lp)
{ {
int rc, irq_pol, irq_type; int rc, irq_type, irq_pol = IRQ_ACTIVE_HIGH;
u8 dvdd; unsigned int dvdd;
u8 csma_seed[2]; u8 csma_seed[2];
rc = at86rf230_write_subreg(lp, SR_TRX_CMD, STATE_FORCE_TRX_OFF); rc = at86rf230_sync_state_change(lp, STATE_FORCE_TRX_OFF);
if (rc) if (rc)
return rc; return rc;
irq_type = irq_get_trigger_type(lp->spi->irq); irq_type = irq_get_trigger_type(lp->spi->irq);
/* configure irq polarity, defaults to high active */ if (irq_type == IRQ_TYPE_EDGE_FALLING)
if (irq_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW))
irq_pol = IRQ_ACTIVE_LOW; irq_pol = IRQ_ACTIVE_LOW;
else
irq_pol = IRQ_ACTIVE_HIGH;
rc = at86rf230_write_subreg(lp, SR_IRQ_POLARITY, irq_pol); rc = at86rf230_write_subreg(lp, SR_IRQ_POLARITY, irq_pol);
if (rc) if (rc)
return rc; return rc;
rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1);
if (rc)
return rc;
rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END); rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END);
if (rc) if (rc)
return rc; return rc;
...@@ -1004,7 +1343,8 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) ...@@ -1004,7 +1343,8 @@ static int at86rf230_hw_init(struct at86rf230_local *lp)
if (rc) if (rc)
return rc; return rc;
/* Wait the next SLEEP cycle */ /* Wait the next SLEEP cycle */
msleep(100); usleep_range(lp->data->t_sleep_cycle,
lp->data->t_sleep_cycle + 100);
rc = at86rf230_read_subreg(lp, SR_DVDD_OK, &dvdd); rc = at86rf230_read_subreg(lp, SR_DVDD_OK, &dvdd);
if (rc) if (rc)
...@@ -1037,18 +1377,111 @@ at86rf230_get_pdata(struct spi_device *spi) ...@@ -1037,18 +1377,111 @@ at86rf230_get_pdata(struct spi_device *spi)
return pdata; return pdata;
} }
static int
at86rf230_detect_device(struct at86rf230_local *lp)
{
unsigned int part, version, val;
u16 man_id = 0;
const char *chip;
int rc;
rc = __at86rf230_read(lp, RG_MAN_ID_0, &val);
if (rc)
return rc;
man_id |= val;
rc = __at86rf230_read(lp, RG_MAN_ID_1, &val);
if (rc)
return rc;
man_id |= (val << 8);
rc = __at86rf230_read(lp, RG_PART_NUM, &part);
if (rc)
return rc;
rc = __at86rf230_read(lp, RG_PART_NUM, &version);
if (rc)
return rc;
if (man_id != 0x001f) {
dev_err(&lp->spi->dev, "Non-Atmel dev found (MAN_ID %02x %02x)\n",
man_id >> 8, man_id & 0xFF);
return -EINVAL;
}
lp->dev->extra_tx_headroom = 0;
lp->dev->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK |
IEEE802154_HW_TXPOWER | IEEE802154_HW_CSMA;
switch (part) {
case 2:
chip = "at86rf230";
rc = -ENOTSUPP;
break;
case 3:
chip = "at86rf231";
lp->data = &at86rf231_data;
lp->dev->phy->channels_supported[0] = 0x7FFF800;
break;
case 7:
chip = "at86rf212";
if (version == 1) {
lp->data = &at86rf212_data;
lp->dev->flags |= IEEE802154_HW_LBT;
lp->dev->phy->channels_supported[0] = 0x00007FF;
lp->dev->phy->channels_supported[2] = 0x00007FF;
} else {
rc = -ENOTSUPP;
}
break;
case 11:
chip = "at86rf233";
lp->data = &at86rf233_data;
lp->dev->phy->channels_supported[0] = 0x7FFF800;
break;
default:
chip = "unkown";
rc = -ENOTSUPP;
break;
}
dev_info(&lp->spi->dev, "Detected %s chip version %d\n", chip, version);
return rc;
}
static void
at86rf230_setup_spi_messages(struct at86rf230_local *lp)
{
lp->state.lp = lp;
spi_message_init(&lp->state.msg);
lp->state.msg.context = &lp->state;
lp->state.trx.tx_buf = lp->state.buf;
lp->state.trx.rx_buf = lp->state.buf;
spi_message_add_tail(&lp->state.trx, &lp->state.msg);
lp->irq.lp = lp;
spi_message_init(&lp->irq.msg);
lp->irq.msg.context = &lp->irq;
lp->irq.trx.tx_buf = lp->irq.buf;
lp->irq.trx.rx_buf = lp->irq.buf;
spi_message_add_tail(&lp->irq.trx, &lp->irq.msg);
lp->tx.lp = lp;
spi_message_init(&lp->tx.msg);
lp->tx.msg.context = &lp->tx;
lp->tx.trx.tx_buf = lp->tx.buf;
lp->tx.trx.rx_buf = lp->tx.buf;
spi_message_add_tail(&lp->tx.trx, &lp->tx.msg);
}
static int at86rf230_probe(struct spi_device *spi) static int at86rf230_probe(struct spi_device *spi)
{ {
struct at86rf230_platform_data *pdata; struct at86rf230_platform_data *pdata;
struct ieee802154_dev *dev; struct ieee802154_dev *dev;
struct at86rf230_local *lp; struct at86rf230_local *lp;
u16 man_id = 0; unsigned int status;
u8 part = 0, version = 0, status;
irq_handler_t irq_handler;
work_func_t irq_worker;
int rc, irq_type; int rc, irq_type;
const char *chip;
struct ieee802154_ops *ops = NULL;
if (!spi->irq) { if (!spi->irq) {
dev_err(&spi->dev, "no IRQ specified\n"); dev_err(&spi->dev, "no IRQ specified\n");
...@@ -1084,107 +1517,60 @@ static int at86rf230_probe(struct spi_device *spi) ...@@ -1084,107 +1517,60 @@ static int at86rf230_probe(struct spi_device *spi)
usleep_range(120, 240); usleep_range(120, 240);
} }
rc = __at86rf230_detect_device(spi, &man_id, &part, &version); dev = ieee802154_alloc_device(sizeof(*lp), &at86rf230_ops);
if (rc < 0)
return rc;
if (man_id != 0x001f) {
dev_err(&spi->dev, "Non-Atmel dev found (MAN_ID %02x %02x)\n",
man_id >> 8, man_id & 0xFF);
return -EINVAL;
}
switch (part) {
case 2:
chip = "at86rf230";
/* FIXME: should be easy to support; */
break;
case 3:
chip = "at86rf231";
ops = &at86rf230_ops;
break;
case 7:
chip = "at86rf212";
if (version == 1)
ops = &at86rf212_ops;
break;
case 11:
chip = "at86rf233";
ops = &at86rf230_ops;
break;
default:
chip = "UNKNOWN";
break;
}
dev_info(&spi->dev, "Detected %s chip version %d\n", chip, version);
if (!ops)
return -ENOTSUPP;
dev = ieee802154_alloc_device(sizeof(*lp), ops);
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
lp = dev->priv; lp = dev->priv;
lp->dev = dev; lp->dev = dev;
lp->part = part;
lp->vers = version;
lp->spi = spi; lp->spi = spi;
dev->parent = &spi->dev; dev->parent = &spi->dev;
dev->extra_tx_headroom = 0;
dev->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK;
irq_type = irq_get_trigger_type(spi->irq); lp->regmap = devm_regmap_init_spi(spi, &at86rf230_regmap_spi_config);
if (!irq_type) if (IS_ERR(lp->regmap)) {
irq_type = IRQF_TRIGGER_RISING; rc = PTR_ERR(lp->regmap);
if (irq_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) { dev_err(&spi->dev, "Failed to allocate register map: %d\n",
irq_worker = at86rf230_irqwork; rc);
irq_handler = at86rf230_isr; goto free_dev;
} else {
irq_worker = at86rf230_irqwork_level;
irq_handler = at86rf230_isr_level;
} }
mutex_init(&lp->bmux); at86rf230_setup_spi_messages(lp);
INIT_WORK(&lp->irqwork, irq_worker);
rc = at86rf230_detect_device(lp);
if (rc < 0)
goto free_dev;
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
init_completion(&lp->tx_complete); init_completion(&lp->tx_complete);
init_completion(&lp->state_complete);
spi_set_drvdata(spi, lp); spi_set_drvdata(spi, lp);
if (is_rf212(lp)) {
dev->phy->channels_supported[0] = 0x00007FF;
dev->phy->channels_supported[2] = 0x00007FF;
} else {
dev->phy->channels_supported[0] = 0x7FFF800;
}
rc = at86rf230_hw_init(lp); rc = at86rf230_hw_init(lp);
if (rc) if (rc)
goto err_hw_init; goto free_dev;
/* Read irq status register to reset irq line */ /* Read irq status register to reset irq line */
rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status); rc = at86rf230_read_subreg(lp, RG_IRQ_STATUS, 0xff, 0, &status);
if (rc) if (rc)
goto err_hw_init; goto free_dev;
irq_type = irq_get_trigger_type(spi->irq);
if (!irq_type)
irq_type = IRQF_TRIGGER_RISING;
rc = devm_request_irq(&spi->dev, spi->irq, irq_handler, rc = devm_request_irq(&spi->dev, spi->irq, at86rf230_isr,
IRQF_SHARED | irq_type, IRQF_SHARED | irq_type, dev_name(&spi->dev), lp);
dev_name(&spi->dev), lp);
if (rc) if (rc)
goto err_hw_init; goto free_dev;
rc = ieee802154_register_device(lp->dev); rc = ieee802154_register_device(lp->dev);
if (rc) if (rc)
goto err_hw_init; goto free_dev;
return rc; return rc;
err_hw_init: free_dev:
flush_work(&lp->irqwork);
mutex_destroy(&lp->bmux);
ieee802154_free_device(lp->dev); ieee802154_free_device(lp->dev);
return rc; return rc;
...@@ -1197,8 +1583,6 @@ static int at86rf230_remove(struct spi_device *spi) ...@@ -1197,8 +1583,6 @@ static int at86rf230_remove(struct spi_device *spi)
/* mask all at86rf230 irq's */ /* mask all at86rf230 irq's */
at86rf230_write_subreg(lp, SR_IRQ_MASK, 0); at86rf230_write_subreg(lp, SR_IRQ_MASK, 0);
ieee802154_unregister_device(lp->dev); ieee802154_unregister_device(lp->dev);
flush_work(&lp->irqwork);
mutex_destroy(&lp->bmux);
ieee802154_free_device(lp->dev); ieee802154_free_device(lp->dev);
dev_dbg(&spi->dev, "unregistered at86rf230\n"); dev_dbg(&spi->dev, "unregistered at86rf230\n");
......
...@@ -80,6 +80,25 @@ struct ieee802154_dev { ...@@ -80,6 +80,25 @@ struct ieee802154_dev {
#define IEEE802154_HW_OMIT_CKSUM 0x00000001 #define IEEE802154_HW_OMIT_CKSUM 0x00000001
/* Indicates that receiver will autorespond with ACK frames. */ /* Indicates that receiver will autorespond with ACK frames. */
#define IEEE802154_HW_AACK 0x00000002 #define IEEE802154_HW_AACK 0x00000002
/* Indicates that transceiver will support transmit power setting. */
#define IEEE802154_HW_TXPOWER 0x00000004
/* Indicates that transceiver will support listen before transmit. */
#define IEEE802154_HW_LBT 0x00000008
/* Indicates that transceiver will support cca mode setting. */
#define IEEE802154_HW_CCA_MODE 0x00000010
/* Indicates that transceiver will support cca ed level setting. */
#define IEEE802154_HW_CCA_ED_LEVEL 0x00000020
/* Indicates that transceiver will support csma (max_be, min_be, csma retries)
* settings. */
#define IEEE802154_HW_CSMA_PARAMS 0x00000040
/* Indicates that transceiver will support ARET frame retries setting. */
#define IEEE802154_HW_FRAME_RETRIES 0x00000080
/* This groups the most common CSMA support fields into one. */
#define IEEE802154_HW_CSMA (IEEE802154_HW_CCA_MODE | \
IEEE802154_HW_CCA_ED_LEVEL | \
IEEE802154_HW_CSMA_PARAMS | \
IEEE802154_HW_FRAME_RETRIES)
/* struct ieee802154_ops - callbacks from mac802154 to the driver /* struct ieee802154_ops - callbacks from mac802154 to the driver
* *
......
...@@ -304,29 +304,61 @@ EXPORT_SYMBOL(ieee802154_free_device); ...@@ -304,29 +304,61 @@ EXPORT_SYMBOL(ieee802154_free_device);
int ieee802154_register_device(struct ieee802154_dev *dev) int ieee802154_register_device(struct ieee802154_dev *dev)
{ {
struct mac802154_priv *priv = mac802154_to_priv(dev); struct mac802154_priv *priv = mac802154_to_priv(dev);
int rc = -ENOMEM; int rc = -ENOSYS;
if (dev->flags & IEEE802154_HW_TXPOWER) {
if (!priv->ops->set_txpower)
goto out;
priv->phy->set_txpower = mac802154_set_txpower;
}
if (dev->flags & IEEE802154_HW_LBT) {
if (!priv->ops->set_lbt)
goto out;
priv->phy->set_lbt = mac802154_set_lbt;
}
if (dev->flags & IEEE802154_HW_CCA_MODE) {
if (!priv->ops->set_cca_mode)
goto out;
priv->phy->set_cca_mode = mac802154_set_cca_mode;
}
if (dev->flags & IEEE802154_HW_CCA_ED_LEVEL) {
if (!priv->ops->set_cca_ed_level)
goto out;
priv->phy->set_cca_ed_level = mac802154_set_cca_ed_level;
}
if (dev->flags & IEEE802154_HW_CSMA_PARAMS) {
if (!priv->ops->set_csma_params)
goto out;
priv->phy->set_csma_params = mac802154_set_csma_params;
}
if (dev->flags & IEEE802154_HW_FRAME_RETRIES) {
if (!priv->ops->set_frame_retries)
goto out;
priv->phy->set_frame_retries = mac802154_set_frame_retries;
}
priv->dev_workqueue = priv->dev_workqueue =
create_singlethread_workqueue(wpan_phy_name(priv->phy)); create_singlethread_workqueue(wpan_phy_name(priv->phy));
if (!priv->dev_workqueue) if (!priv->dev_workqueue) {
rc = -ENOMEM;
goto out; goto out;
}
wpan_phy_set_dev(priv->phy, priv->hw.parent); wpan_phy_set_dev(priv->phy, priv->hw.parent);
priv->phy->add_iface = mac802154_add_iface; priv->phy->add_iface = mac802154_add_iface;
priv->phy->del_iface = mac802154_del_iface; priv->phy->del_iface = mac802154_del_iface;
if (priv->ops->set_txpower)
priv->phy->set_txpower = mac802154_set_txpower;
if (priv->ops->set_lbt)
priv->phy->set_lbt = mac802154_set_lbt;
if (priv->ops->set_cca_mode)
priv->phy->set_cca_mode = mac802154_set_cca_mode;
if (priv->ops->set_cca_ed_level)
priv->phy->set_cca_ed_level = mac802154_set_cca_ed_level;
if (priv->ops->set_csma_params)
priv->phy->set_csma_params = mac802154_set_csma_params;
if (priv->ops->set_frame_retries)
priv->phy->set_frame_retries = mac802154_set_frame_retries;
rc = wpan_phy_register(priv->phy); rc = wpan_phy_register(priv->phy);
if (rc < 0) if (rc < 0)
......
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