mac802154: Prepare forcing specific symbol duration

The scan logic will bypass the whole ->set_channel() logic from the top
by calling the driver hook to just switch between channels when
required.

We can no longer rely on the "current" page/channel settings to set the
right symbol duration. Let's add these as new parameters to allow
providing the page/channel couple that we want.

There is no functional change.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20230103165644.432209-5-miquel.raynal@bootlin.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>

diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 1184b54..c16ae5d 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -483,6 +483,7 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
        return dev_name(&phy->dev);
 }
 
-void ieee802154_configure_durations(struct wpan_phy *phy);
+void ieee802154_configure_durations(struct wpan_phy *phy,
+                                   unsigned int page, unsigned int channel);
 
 #endif /* __NET_CFG802154_H */

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index dc2d918..469d6e8 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -118,7 +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);
+               ieee802154_configure_durations(wpan_phy, page, channel);
        }
 
        return ret;

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 3ed31da..12a13a8 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -113,32 +113,33 @@ 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)
+void ieee802154_configure_durations(struct wpan_phy *phy,
+                                   unsigned int page, unsigned int channel)
 {
        u32 duration = 0;
 
-       switch (phy->current_page) {
+       switch (page) {
        case 0:
-               if (BIT(phy->current_channel) & 0x1)
+               if (BIT(channel) & 0x1)
                        /* 868 MHz BPSK 802.15.4-2003: 20 ksym/s */
                        duration = 50 * NSEC_PER_USEC;
-               else if (BIT(phy->current_channel) & 0x7FE)
+               else if (BIT(channel) & 0x7FE)
                        /* 915 MHz BPSK 802.15.4-2003: 40 ksym/s */
                        duration = 25 * NSEC_PER_USEC;
-               else if (BIT(phy->current_channel) & 0x7FFF800)
+               else if (BIT(channel) & 0x7FFF800)
                        /* 2400 MHz O-QPSK 802.15.4-2006: 62.5 ksym/s */
                        duration = 16 * NSEC_PER_USEC;
                break;
        case 2:
-               if (BIT(phy->current_channel) & 0x1)
+               if (BIT(channel) & 0x1)
                        /* 868 MHz O-QPSK 802.15.4-2006: 25 ksym/s */
                        duration = 40 * NSEC_PER_USEC;
-               else if (BIT(phy->current_channel) & 0x7FE)
+               else if (BIT(channel) & 0x7FE)
                        /* 915 MHz O-QPSK 802.15.4-2006: 62.5 ksym/s */
                        duration = 16 * NSEC_PER_USEC;
                break;
        case 3:
-               if (BIT(phy->current_channel) & 0x3FFF)
+               if (BIT(channel) & 0x3FFF)
                        /* 2.4 GHz CSS 802.15.4a-2007: 1/6 Msym/s */
                        duration = 6 * NSEC_PER_USEC;
                break;
@@ -201,7 +202,8 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
 
        ieee802154_setup_wpan_phy_pib(local->phy);
 
-       ieee802154_configure_durations(local->phy);
+       ieee802154_configure_durations(local->phy, local->phy->current_page,
+                                      local->phy->current_channel);
 
        if (!(hw->flags & IEEE802154_HW_CSMA_PARAMS)) {
                local->phy->supported.min_csma_backoffs = 4;