All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, alan@signal11.us, jonatan@myeden.se,
	stefan@osg.samsung.com, Alexander Aring <alex.aring@gmail.com>
Subject: [RFC bluetooth-next 18/21] mrf24j40: add cca ed level support
Date: Thu, 13 Aug 2015 14:22:45 +0200	[thread overview]
Message-ID: <1439468568-22288-19-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1439468568-22288-1-git-send-email-alex.aring@gmail.com>

This patch supports handling to set the cca energy detection level for
the mrf24j40 transceiver.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 drivers/net/ieee802154/mrf24j40.c | 51 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index 0fc7628..00fd97e 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -820,6 +820,49 @@ 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_update_bits(devrec->regmap_short,
+						  REG_CCAEDTH, 0xff,
+						  mrf24j40_ed_levels_map[i][1]);
+	}
+
+	return -EINVAL;
+}
+
 static const struct ieee802154_ops mrf24j40_ops = {
 	.owner = THIS_MODULE,
 	.xmit_async = mrf24j40_tx,
@@ -830,6 +873,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)
@@ -1037,6 +1081,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)
@@ -1062,7 +1110,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);
-- 
2.5.0


  parent reply	other threads:[~2015-08-13 12:23 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-13 12:22 [RFC bluetooth-next 00/21] mrf24j40: async rx/tx handling and new features Alexander Aring
2015-08-13 12:22 ` [RFC bluetooth-next 01/21] mrf24j40: cleanup define identation Alexander Aring
2015-08-27 12:59   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 02/21] mrf24j40: use ieee802154_alloc_hw for private data Alexander Aring
2015-08-27 13:03   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 03/21] mrf24j40: calling ieee802154_register_hw at last Alexander Aring
2015-08-27 13:06   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 04/21] mrf24j40: remove spi settings overwrite Alexander Aring
2015-08-27 13:14   ` Stefan Schmidt
2015-08-28  7:50     ` Alexander Aring
2015-08-28  7:58       ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 05/21] mrf24j40: add device-tree support Alexander Aring
2015-08-27 13:16   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 06/21] mrf24j40: add default channel setting Alexander Aring
2015-08-27 13:24   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 07/21] mrf24j40: add random extended addr generation Alexander Aring
2015-08-27 13:25   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 08/21] mrf24j40: add more register defines Alexander Aring
2015-08-27 13:28   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 09/21] mrf24j40: add regmap support Alexander Aring
2015-08-27 17:45   ` Alexander Aring
2015-08-28  8:37   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 10/21] mrf24j40: use regmap for register access Alexander Aring
2015-08-28  8:43   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 11/21] mrf24j40: change to frame delivery with crc Alexander Aring
2015-08-27 13:30   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 12/21] ieee802154: add helpers for frame control checks Alexander Aring
2015-08-13 12:22 ` [RFC bluetooth-next 13/21] mrf24j40: rework tx handling to async tx handling Alexander Aring
2015-08-28  8:50   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 14/21] mrf24j40: rework rx handling to async rx handling Alexander Aring
2015-08-28  8:55   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 15/21] mrf24j40: async interrupt handling Alexander Aring
2015-08-28  8:57   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 16/21] mrf24j40: add csma params support Alexander Aring
2015-08-27 13:46   ` Stefan Schmidt
2015-08-28  7:53     ` Alexander Aring
2015-08-13 12:22 ` [RFC bluetooth-next 17/21] mrf24j40: add cca mode support Alexander Aring
2015-08-27 13:50   ` Stefan Schmidt
2015-08-27 17:49   ` Alexander Aring
2015-08-13 12:22 ` Alexander Aring [this message]
2015-08-27 13:52   ` [RFC bluetooth-next 18/21] mrf24j40: add cca ed level support Stefan Schmidt
2015-08-27 17:44   ` Alexander Aring
2015-08-13 12:22 ` [RFC bluetooth-next 19/21] mrf24j40: add tx power support Alexander Aring
2015-08-27 13:59   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 20/21] mrf24j40: add promiscuous mode support Alexander Aring
2015-08-27 14:00   ` Stefan Schmidt
2015-08-13 12:22 ` [RFC bluetooth-next 21/21] mrf24j40: change irq trigger type behaviour Alexander Aring
2015-08-28  8:28   ` Stefan Schmidt
2015-08-18 13:54 ` [RFC bluetooth-next 00/21] mrf24j40: async rx/tx handling and new features Alan Ott
2015-08-27 12:29 ` Stefan Schmidt
2015-08-27 12:33   ` Alan Ott

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439468568-22288-19-git-send-email-alex.aring@gmail.com \
    --to=alex.aring@gmail.com \
    --cc=alan@signal11.us \
    --cc=jonatan@myeden.se \
    --cc=kernel@pengutronix.de \
    --cc=linux-wpan@vger.kernel.org \
    --cc=stefan@osg.samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.