@@ -455,4 +455,6 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
return dev_name(&phy->dev);
}
+void ieee802154_configure_durations(struct wpan_phy *phy);
+
#endif /* __NET_CFG802154_H */
@@ -118,6 +118,7 @@ ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel)
if (!ret) {
wpan_phy->current_page = page;
wpan_phy->current_channel = channel;
+ ieee802154_configure_durations(wpan_phy);
}
return ret;
@@ -113,6 +113,109 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
}
EXPORT_SYMBOL(ieee802154_alloc_hw);
+void ieee802154_configure_durations(struct wpan_phy *phy)
+{
+ struct phy_page *page = &phy->supported.page[phy->current_page];
+ struct phy_channels *chan;
+ bool valid_band = false;
+ unsigned int chunk;
+ u32 duration = 0;
+
+ for (chunk = 0; chunk < page->nchunks; chunk++) {
+ if (page->chunk[chunk].channels & BIT(phy->current_channel))
+ break;
+ }
+
+ if (chunk == page->nchunks) {
+ pr_debug("Wrong channels description\n");
+ return;
+ }
+
+ chan = &page->chunk[chunk];
+ switch (chan->protocol) {
+ case IEEE802154_BPSK_PHY:
+ switch (chan->band) {
+ case IEEE802154_868_MHZ_BAND:
+ /* 868 MHz BPSK 802.15.4-2003: 20 ksym/s */
+ duration = 50 * NSEC_PER_USEC;
+ break;
+ case IEEE802154_915_MHZ_BAND:
+ /* 915 MHz BPSK 802.15.4-2003: 40 ksym/s */
+ duration = 25 * NSEC_PER_USEC;
+ break;
+ default:
+ break;
+ }
+ break;
+ case IEEE802154_OQPSK_PHY:
+ switch (chan->band) {
+ case IEEE802154_868_MHZ_BAND:
+ /* 868 MHz O-QPSK 802.15.4-2006: 25 ksym/s */
+ duration = 40 * NSEC_PER_USEC;
+ break;
+ case IEEE802154_915_MHZ_BAND:
+ case IEEE802154_2400_MHZ_BAND:
+ /* 915/2400 MHz O-QPSK 802.15.4-2006: 62.5 ksym/s */
+ duration = 16 * NSEC_PER_USEC;
+ break;
+ default:
+ break;
+ }
+ break;
+ case IEEE802154_CSS_PHY:
+ switch (chan->band) {
+ case IEEE802154_2400_MHZ_BAND:
+ /* 2.4 GHz CSS 802.15.4a-2007: 1/6 Msym/s */
+ duration = 6 * NSEC_PER_USEC;
+ break;
+ default:
+ break;
+ }
+ break;
+ case IEEE802154_HRP_UWB_PHY:
+ switch (chan->band) {
+ case IEEE802154_250_750_MHZ_BAND:
+ case IEEE802154_3100_4800_MHZ_BAND:
+ case IEEE802154_6000_10600_MHZ_BAND:
+ valid_band = true;
+ break;
+ default:
+ break;
+ }
+
+ if (!valid_band)
+ break;
+
+ /* UWB 802.15.4a-2007: 993.6 or 1017.6 or 3974.4 ns */
+ switch (chan->prf) {
+ case IEEE802154_16100KHZ_MEAN_PRF:
+ duration = 994;
+ break;
+ case IEEE802154_4030KHZ_MEAN_PRF:
+ duration = 3974;
+ break;
+ case IEEE802154_62890KHZ_MEAN_PRF:
+ duration = 1018;
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (!duration) {
+ pr_debug("Unknown PHY symbol duration\n");
+ return;
+ }
+
+ phy->symbol_duration = duration;
+ phy->lifs_period = (IEEE802154_LIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC;
+ phy->sifs_period = (IEEE802154_SIFS_PERIOD * phy->symbol_duration) / NSEC_PER_SEC;
+}
+EXPORT_SYMBOL(ieee802154_configure_durations);
+
void ieee802154_free_hw(struct ieee802154_hw *hw)
{
struct ieee802154_local *local = hw_to_local(hw);
@@ -157,6 +260,8 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
ieee802154_setup_wpan_phy_pib(local->phy);
+ ieee802154_configure_durations(local->phy);
+
if (!(hw->flags & IEEE802154_HW_CSMA_PARAMS)) {
local->phy->supported.min_csma_backoffs = 4;
local->phy->supported.max_csma_backoffs = 4;
Now that we have access to all the basic information to know which symbol duration should be applied, let's set the symbol duration automatically. The two locations that must call for the symbol duration to be set are: - when manually requesting a channel change though the netlink interface - at PHY creation, ieee802154_alloc_hw() already calls ieee802154_change_channel() which will now update the symbol duration accordingly. If an information is missing, the symbol duration is not touched, a debug message is eventually printed. This keeps the compatibility with the unconverted drivers for which it was too complicated for me to find their precise information. If they initially provided a symbol duration, it would be kept. If they don't, the symbol duration value is left untouched. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- include/net/cfg802154.h | 2 + net/mac802154/cfg.c | 1 + net/mac802154/main.c | 105 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+)