Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b2777d6 authored by Phoebe Buckheister's avatar Phoebe Buckheister Committed by David S. Miller
Browse files

ieee802154: add TX power control to wpan_phy 



Replace the current u8 transmit_power in wpan_phy with s8 transmit_power.
The u8 field contained the actual tx power and a tolerance field,
which no physical radio every used. Adjust sysfs entries to keep
compatibility with userspace, give tolerances of +-1dB statically there.

This patch only adds support for this in the at86rf230 driver and the
RF212 chip. Configuration calculation for RF212 is also somewhat basic,
but does the job - the RF212 datasheet gives a large table with
suggested values for combinations of TX power and page/channel, if this
does not work well, we might have to copy the whole table.

Signed-off-by: default avatarPhoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b520bbb

drivers/net/ieee802154/at86rf230.c

+25 −0
Original line number Diff line number Diff line
@@ -753,6 +753,30 @@ at86rf230_set_hw_addr_filt(struct ieee802154_dev *dev, 
	return 0;

}



static int

at86rf212_set_txpower(struct ieee802154_dev *dev, int db)

{

	struct at86rf230_local *lp = dev->priv;

	int rc;



	/* typical maximum output is 5dBm with RG_PHY_TX_PWR 0x60, lower five

	 * bits decrease power in 1dB steps. 0x60 represents extra PA gain of

	 * 0dB.

	 * thus, supported values for db range from -26 to 5, for 31dB of

	 * reduction to 0dB of reduction.

	 */

	if (db > 5 || db < -26)

		return -EINVAL;



	db = -(db - 5);



	rc = __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db);

	if (rc)

		return rc;



	return 0;

}



static struct ieee802154_ops at86rf230_ops = {

	.owner = THIS_MODULE,

	.xmit = at86rf230_xmit,
@@ -771,6 +795,7 @@ static struct ieee802154_ops at86rf212_ops = { 
	.start = at86rf230_start,

	.stop = at86rf230_stop,

	.set_hw_addr_filt = at86rf230_set_hw_addr_filt,

	.set_txpower = at86rf212_set_txpower,

};



static void at86rf230_irqwork(struct work_struct *work)

include/linux/nl802154.h

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ enum { 
	IEEE802154_ATTR_PHY_NAME,

	IEEE802154_ATTR_DEV_TYPE,



	IEEE802154_ATTR_TXPOWER,



	__IEEE802154_ATTR_MAX,

};
@@ -122,6 +124,8 @@ enum { 
	IEEE802154_ADD_IFACE,

	IEEE802154_DEL_IFACE,



	IEEE802154_SET_PHYPARAMS,



	__IEEE802154_CMD_MAX,

};

include/net/mac802154.h

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ struct ieee802154_dev { 
 *	  Set radio for listening on specific address.

 *	  Set the device for listening on specified address.

 *	  Returns either zero, or negative errno.

 *

 * set_txpower:

 *	  Set radio transmit power in dB. Called with pib_lock held.

 *	  Returns either zero, or negative errno.

 */

struct ieee802154_ops {

	struct module	*owner;
@@ -129,6 +133,7 @@ struct ieee802154_ops { 
					    unsigned long changed);

	int		(*ieee_addr)(struct ieee802154_dev *dev,

				     u8 addr[IEEE802154_ADDR_LEN]);

	int		(*set_txpower)(struct ieee802154_dev *dev, int db);

};



/* Basic interface to register ieee802154 device */

include/net/wpan-phy.h

+4 −2
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ struct wpan_phy { 
	struct mutex pib_lock;



	/*

	 * This is a PIB according to 802.15.4-2006.

	 * This is a PIB according to 802.15.4-2011.

	 * We do not provide timing-related variables, as they

	 * aren't used outside of driver

	 */

	u8 current_channel;

	u8 current_page;

	u32 channels_supported[32];

	u8 transmit_power;

	s8 transmit_power;

	u8 cca_mode;



	struct device dev;
@@ -54,6 +54,8 @@ struct wpan_phy { 
					const char *name, int type);

	void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);



	int (*set_txpower)(struct wpan_phy *phy, int db);



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

};

net/ieee802154/ieee802154.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ int ieee802154_list_phy(struct sk_buff *skb, struct genl_info *info); 
int ieee802154_dump_phy(struct sk_buff *skb, struct netlink_callback *cb);

int ieee802154_add_iface(struct sk_buff *skb, struct genl_info *info);

int ieee802154_del_iface(struct sk_buff *skb, struct genl_info *info);

int ieee802154_set_phyparams(struct sk_buff *skb, struct genl_info *info);



enum ieee802154_mcgrp_ids {

	IEEE802154_COORD_MCGRP,