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

3 files changed, 13 insertions, 2 deletions

diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index fd4f2d1cdf6c..625d19e0a1de 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -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,
 };
 
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 807d6b7a943f..8bd2785a663c 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -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 */
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index b52bda8d13b1..47fc0c1bc3c7 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -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)));
 };