From patchwork Wed Jul 2 22:20:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 366501 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 907811400DF for ; Thu, 3 Jul 2014 08:22:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757953AbaGBWWE (ORCPT ); Wed, 2 Jul 2014 18:22:04 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:59223 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757796AbaGBWVl (ORCPT ); Wed, 2 Jul 2014 18:21:41 -0400 Received: by mail-wg0-f51.google.com with SMTP id x12so11914922wgg.10 for ; Wed, 02 Jul 2014 15:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ot23BZiUFZtr7bg0peWbPErphynUN+Q/iDh334dyW7M=; b=fE730jxVnGf4bfIuLDQJJsay3C2TGpFl5Hsd6oaE78KDfUsmA/ASHDW3bij1ue/zME e5dM8X9cQ5s+TjEs8e4zS6NcPdMO4SOZFg7NMuLT9p0XlLZVaw9Dot2XKg9nKvKC9mcB A37lY/JiW8qTn8PojnBQ2QfXjnnEhYzttuvJJ7+UfQHNfFtsROShKpWgWAFT1+S53vF9 oI3Cixkru9K6Q9shKTed+pxEQWs4hugk0Co7Olza1aZtQy6YgJK066wfcovCbwxK2fwF 2kkBOx9kUQMxEae9ZfNdWRIBYmigcoBdlgD4FaSFik/BH3dHFV2U9Dd+bt87lvlYYJih 9Tkw== X-Received: by 10.194.133.1 with SMTP id oy1mr545463wjb.87.1404339700154; Wed, 02 Jul 2014 15:21:40 -0700 (PDT) Received: from omega.localdomain (p4FD3BDAF.dip0.t-ipconnect.de. [79.211.189.175]) by mx.google.com with ESMTPSA id a13sm57797875wjs.12.2014.07.02.15.21.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jul 2014 15:21:39 -0700 (PDT) From: Alexander Aring To: alex.bluesman.smirnov@gmail.com Cc: dbaryshkov@gmail.com, linux-zigbee-devel@lists.sourceforge.net, netdev@vger.kernel.org, stilwellt@openlabs.co, Alexander Aring Subject: [PATCH v3 net-next 09/13] at86rf230: rework state change and start/stop Date: Thu, 3 Jul 2014 00:20:51 +0200 Message-Id: <1404339655-8456-10-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1404339655-8456-1-git-send-email-alex.aring@gmail.com> References: <1404339655-8456-1-git-send-email-alex.aring@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch removes the current synchron state change function and add a new function for a state assert. Change the start and stop callbacks to use this new synchron state change behaviour. It's a wrapper around the async state change function. Signed-off-by: Alexander Aring --- drivers/net/ieee802154/at86rf230.c | 126 ++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 46db6f8..265fea8 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -42,6 +42,8 @@ struct at86rf230_local; * All timings are in us. */ struct at86rf2xx_chip_data { + u16 t_off_to_aack; + u16 t_off_to_tx_on; u16 t_frame; u16 t_p_ack; /* short interframe spacing time */ @@ -77,6 +79,9 @@ struct at86rf230_local { struct at86rf2xx_chip_data *data; struct regmap *regmap; + struct completion state_complete; + struct at86rf230_state_change state; + struct at86rf230_state_change irq; bool tx_aret; @@ -547,6 +552,19 @@ at86rf230_async_state_delay(void *context) } 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: @@ -632,6 +650,39 @@ at86rf230_async_state_change(struct at86rf230_local *lp, } 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 +at86rf230_sync_state_change(struct at86rf230_local *lp, unsigned int state) +{ + int rc; + + rc = at86rf230_async_state_change(lp, &lp->state, state, + at86rf230_sync_state_change_complete); + if (rc) { + at86rf230_async_error(lp, &lp->state, rc); + return rc; + } + + rc = wait_for_completion_timeout(&lp->state_complete, + msecs_to_jiffies(100)); + if (!rc) + return -ETIMEDOUT; + + return 0; +} + +static void at86rf230_tx_complete(void *context) { struct at86rf230_state_change *ctx = context; @@ -957,72 +1008,15 @@ at86rf230_ed(struct ieee802154_dev *dev, u8 *level) } static int -at86rf230_state(struct ieee802154_dev *dev, int state) -{ - struct at86rf230_local *lp = dev->priv; - int rc; - unsigned int val; - u8 desired_status; - - might_sleep(); - - if (state == STATE_FORCE_TX_ON) - desired_status = STATE_TX_ON; - else if (state == STATE_FORCE_TRX_OFF) - desired_status = STATE_TRX_OFF; - else - desired_status = state; - - do { - rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val); - if (rc) - goto err; - } while (val == STATE_TRANSITION_IN_PROGRESS); - - if (val == desired_status) - return 0; - - /* state is equal to phy states */ - rc = at86rf230_write_subreg(lp, SR_TRX_CMD, state); - if (rc) - goto err; - - do { - rc = at86rf230_read_subreg(lp, SR_TRX_STATUS, &val); - if (rc) - goto err; - } while (val == STATE_TRANSITION_IN_PROGRESS); - - - if (val == desired_status || - (desired_status == STATE_RX_ON && val == STATE_BUSY_RX) || - (desired_status == STATE_RX_AACK_ON && val == STATE_BUSY_RX_AACK)) - return 0; - - pr_err("unexpected state change: %d, asked for %d\n", val, state); - return -EBUSY; - -err: - pr_err("error: %d\n", rc); - return rc; -} - -static int at86rf230_start(struct ieee802154_dev *dev) { - u8 rc; - - rc = at86rf230_state(dev, STATE_TX_ON); - if (rc) - return rc; - - return at86rf230_state(dev, STATE_RX_AACK_ON); + return at86rf230_sync_state_change(dev->priv, STATE_RX_AACK_ON); } static void 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 @@ -1242,6 +1236,8 @@ static struct ieee802154_ops at86rf230_ops = { }; static struct at86rf2xx_chip_data at86rf233_data = { + .t_off_to_aack = 80, + .t_off_to_tx_on = 80, .t_frame = 4096, .t_p_ack = 545, .t_sifs = 192, @@ -1253,6 +1249,8 @@ static struct at86rf2xx_chip_data at86rf233_data = { }; static struct at86rf2xx_chip_data at86rf231_data = { + .t_off_to_aack = 110, + .t_off_to_tx_on = 110, .t_frame = 4096, .t_p_ack = 545, .t_sifs = 192, @@ -1264,6 +1262,8 @@ static struct at86rf2xx_chip_data at86rf231_data = { }; static struct at86rf2xx_chip_data at86rf212_data = { + .t_off_to_aack = 200, + .t_off_to_tx_on = 200, .t_frame = 4096, .t_p_ack = 545, .t_sifs = 192, @@ -1427,6 +1427,13 @@ at86rf230_detect_device(struct at86rf230_local *lp) 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; @@ -1509,6 +1516,7 @@ static int at86rf230_probe(struct spi_device *spi) spin_lock_init(&lp->lock); init_completion(&lp->tx_complete); + init_completion(&lp->state_complete); spi_set_drvdata(spi, lp);