Commit 6ca00197 authored by Phoebe Buckheister's avatar Phoebe Buckheister Committed by David S. Miller
Browse files

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: default avatarPhoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba08fea5

drivers/net/ieee802154/at86rf230.c

+24 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct at86rf230_local { 
	spinlock_t lock;

	bool irq_busy;

	bool is_tx;



	int rssi_base_val;

};



static inline int is_rf212(struct at86rf230_local *local)
@@ -580,6 +582,8 @@ at86rf230_stop(struct ieee802154_dev *dev) 
static int

at86rf230_set_channel(struct at86rf230_local *lp, int page, int channel)

{

	lp->rssi_base_val = -91;



	return at86rf230_write_subreg(lp, SR_CHANNEL, channel);

}
@@ -595,10 +599,13 @@ at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel) 
	if (rc < 0)

		return rc;



	if (page == 0)

	if (page == 0) {

		rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 0);

	else

		lp->rssi_base_val = -100;

	} else {

		rc = at86rf230_write_subreg(lp, SR_BPSK_QPSK, 1);

		lp->rssi_base_val = -98;

	}

	if (rc < 0)

		return rc;
@@ -802,6 +809,20 @@ at86rf212_set_cca_mode(struct ieee802154_dev *dev, u8 mode) 
	return at86rf230_write_subreg(lp, SR_CCA_MODE, mode);

}



static int

at86rf212_set_cca_ed_level(struct ieee802154_dev *dev, s32 level)

{

	struct at86rf230_local *lp = dev->priv;

	int desens_steps;



	if (level < lp->rssi_base_val || level > 30)

		return -EINVAL;



	desens_steps = (level - lp->rssi_base_val) * 100 / 207;



	return at86rf230_write_subreg(lp, SR_CCA_ED_THRES, desens_steps);

}



static struct ieee802154_ops at86rf230_ops = {

	.owner = THIS_MODULE,

	.xmit = at86rf230_xmit,
@@ -823,6 +844,7 @@ static struct ieee802154_ops at86rf212_ops = { 
	.set_txpower = at86rf212_set_txpower,

	.set_lbt = at86rf212_set_lbt,

	.set_cca_mode = at86rf212_set_cca_mode,

	.set_cca_ed_level = at86rf212_set_cca_ed_level,

};



static void at86rf230_irqwork(struct work_struct *work)

include/linux/nl802154.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ enum { 
	IEEE802154_ATTR_TXPOWER,

	IEEE802154_ATTR_LBT_ENABLED,

	IEEE802154_ATTR_CCA_MODE,

	IEEE802154_ATTR_CCA_ED_LEVEL,



	__IEEE802154_ATTR_MAX,

};

include/net/mac802154.h

+7 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ struct ieee802154_dev { 
 * set_cca_mode

 *	  Sets the CCA mode used by the device. Called with pib_lock held.

 *	  Returns either zero, or negative errno.

 *

 * set_cca_ed_level

 *	  Sets the CCA energy detection threshold in dBm. Called with pib_lock

 *	  held.

 *	  Returns either zero, or negative errno.

 */

struct ieee802154_ops {

	struct module	*owner;
@@ -145,6 +150,8 @@ struct ieee802154_ops { 
	int		(*set_txpower)(struct ieee802154_dev *dev, int db);

	int		(*set_lbt)(struct ieee802154_dev *dev, bool on);

	int		(*set_cca_mode)(struct ieee802154_dev *dev, u8 mode);

	int		(*set_cca_ed_level)(struct ieee802154_dev *dev,

					    s32 level);

};



/* Basic interface to register ieee802154 device */

include/net/wpan-phy.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct wpan_phy { 
	u8 cca_mode;



	bool lbt;

	s32 cca_ed_level;



	struct device dev;

	int idx;
@@ -59,6 +60,7 @@ struct wpan_phy { 
	int (*set_txpower)(struct wpan_phy *phy, int db);

	int (*set_lbt)(struct wpan_phy *phy, bool on);

	int (*set_cca_mode)(struct wpan_phy *phy, u8 cca_mode);

	int (*set_cca_ed_level)(struct wpan_phy *phy, int level);



	char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));

};

net/ieee802154/nl-phy.c

+27 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE