From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f171.google.com ([209.85.212.171]:36731 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbbHMMXf (ORCPT ); Thu, 13 Aug 2015 08:23:35 -0400 Received: by wicja10 with SMTP id ja10so149304628wic.1 for ; Thu, 13 Aug 2015 05:23:34 -0700 (PDT) From: Alexander Aring Subject: [RFC bluetooth-next 16/21] mrf24j40: add csma params support Date: Thu, 13 Aug 2015 14:22:43 +0200 Message-Id: <1439468568-22288-17-git-send-email-alex.aring@gmail.com> In-Reply-To: <1439468568-22288-1-git-send-email-alex.aring@gmail.com> References: <1439468568-22288-1-git-send-email-alex.aring@gmail.com> Sender: linux-wpan-owner@vger.kernel.org List-ID: To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, alan@signal11.us, jonatan@myeden.se, stefan@osg.samsung.com, Alexander Aring This 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. Signed-off-by: Alexander Aring --- drivers/net/ieee802154/mrf24j40.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index e992bff..fdb0b84 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -769,6 +769,26 @@ 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; + + /* datasheet doesn't say anything about max_be, but we have min_be + * So we assume the max_be default. + */ + WARN_ON(max_be != 5); + + /* 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, @@ -777,6 +797,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) @@ -972,6 +993,12 @@ 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; + /* We assume max_be is 802.15.4 default */ + devrec->hw->phy->supported.min_maxbe = 5; + devrec->hw->phy->supported.max_maxbe = 5; } static int mrf24j40_probe(struct spi_device *spi) @@ -994,7 +1021,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); -- 2.5.0