ieee802154: add support for setting CCA energy detection levels

Since three of the four clear channel assesment modes make use of energy
detection, provide an API to set the energy detection threshold.
Driver support for this is available in at86rf230 for the RF212 chips.
Since for these chips the minimal energy detection threshold depends on
page and channel used, add a field to struct at86rf230_local that stores
the minimal threshold. Actual ED thresholds are configured as offsets
from this value.

For RF212, setting the ED threshold will not work before a channel/page
has been set due to the dependency of energy detection in the chip and
the actual channel/page selected.

Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 28 insertions, 3 deletions

diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index 36f58d633868..0af0d424dee0 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -58,7 +58,8 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid,
             nla_put_u8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel) ||
             nla_put_s8(msg, IEEE802154_ATTR_TXPOWER, phy->transmit_power) ||
             nla_put_u8(msg, IEEE802154_ATTR_LBT_ENABLED, phy->lbt) ||
-            nla_put_u8(msg, IEEE802154_ATTR_CCA_MODE, phy->cca_mode))
+            nla_put_u8(msg, IEEE802154_ATTR_CCA_MODE, phy->cca_mode) ||
+            nla_put_s32(msg, IEEE802154_ATTR_CCA_ED_LEVEL, phy->cca_ed_level))
                 goto nla_put_failure;
         for (i = 0; i < 32; i++) {
                 if (phy->channels_supported[i])
@@ -403,6 +404,20 @@ static int phy_set_cca_mode(struct wpan_phy *phy, struct genl_info *info)
         return 0;
 }
 
+static int phy_set_cca_ed_level(struct wpan_phy *phy, struct genl_info *info)
+{
+        s32 level = nla_get_s32(info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]);
+        int rc;
+
+        rc = phy->set_cca_ed_level(phy, level);
+        if (rc < 0)
+                return rc;
+
+        phy->cca_ed_level = level;
+
+        return 0;
+}
+
 int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info)
 {
         struct wpan_phy *phy;
@@ -413,7 +428,8 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info)
 
         if (!info->attrs[IEEE802154_ATTR_PHY_NAME] &&
             !info->attrs[IEEE802154_ATTR_LBT_ENABLED] &&
-            !info->attrs[IEEE802154_ATTR_CCA_MODE])
+            !info->attrs[IEEE802154_ATTR_CCA_MODE] &&
+            !info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL])
                 return -EINVAL;
 
         name = nla_data(info->attrs[IEEE802154_ATTR_PHY_NAME]);
@@ -426,7 +442,9 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info)
 
         if ((!phy->set_txpower && info->attrs[IEEE802154_ATTR_TXPOWER]) ||
             (!phy->set_lbt && info->attrs[IEEE802154_ATTR_LBT_ENABLED]) ||
-            (!phy->set_cca_mode && info->attrs[IEEE802154_ATTR_CCA_MODE]))
+            (!phy->set_cca_mode && info->attrs[IEEE802154_ATTR_CCA_MODE]) ||
+            (!phy->set_cca_ed_level &&
+             info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]))
                 goto out;
 
         mutex_lock(&phy->pib_lock);
@@ -449,6 +467,12 @@ int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info)
                         goto error;
         }
 
+        if (info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]) {
+                rc = phy_set_cca_ed_level(phy, info);
+                if (rc < 0)
+                        goto error;
+        }
+
         mutex_unlock(&phy->pib_lock);
 
         wpan_phy_put(phy);
diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c
index d87c2c904110..55b5616295ff 100644
--- a/net/ieee802154/nl_policy.c
+++ b/net/ieee802154/nl_policy.c
@@ -56,5 +56,6 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = {
         [IEEE802154_ATTR_TXPOWER] = { .type = NLA_S8, },
         [IEEE802154_ATTR_LBT_ENABLED] = { .type = NLA_U8, },
         [IEEE802154_ATTR_CCA_MODE] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_CCA_ED_LEVEL] = { .type = NLA_S32, },
 };