wcn36xx: Add ipv6 namespace offload in suspend

We need to respond to ipv6 namespace lookups when in suspend. This patch
adds the necessary changes to issue the appropriate firmware command on
suspend and resume to enter/exit firmware offloaded ns lookup.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reported-by: kernel test robot <lkp@intel.com>
Tested-by: Benjamin Li <benl@squareup.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210605011140.2004643-7-bryan.odonoghue@linaro.org

diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h
index 90333da..3b949b0 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/hal.h
+++ b/drivers/net/wireless/ath/wcn36xx/hal.h
@@ -3464,6 +3464,9 @@ struct wcn36xx_hal_rem_bcn_filter_req {
 #define WCN36XX_HAL_OFFLOAD_DISABLE                         0
 #define WCN36XX_HAL_OFFLOAD_ENABLE                          1
 #define WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE             0x2
+#define WCN36XX_HAL_OFFLOAD_MCAST_FILTER_ENABLE             0x4
+#define WCN36XX_HAL_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE \
+       (WCN36XX_HAL_OFFLOAD_ENABLE | WCN36XX_HAL_OFFLOAD_MCAST_FILTER_ENABLE)
 #define WCN36XX_HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE        \
        (WCN36XX_HAL_OFFLOAD_ENABLE | WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE)
 #define WCN36XX_HAL_IPV6_OFFLOAD_ADDR_MAX              0x02

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 240ecdd..09e22f8 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1118,6 +1118,9 @@ static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)
                ret = wcn36xx_smd_arp_offload(wcn, vif, true);
                if (ret)
                        goto out;
+               ret = wcn36xx_smd_ipv6_ns_offload(wcn, vif, true);
+               if (ret)
+                       goto out;
                ret = wcn36xx_smd_set_power_params(wcn, true);
        }
 out:
@@ -1136,6 +1139,7 @@ static int wcn36xx_resume(struct ieee80211_hw *hw)
        vif = wcn36xx_get_first_assoc_vif(wcn);
        if (vif) {
                wcn36xx_smd_set_power_params(wcn, false);
+               wcn36xx_smd_ipv6_ns_offload(wcn, vif, false);
                wcn36xx_smd_arp_offload(wcn, vif, false);
        }
        mutex_unlock(&wcn->conf_mutex);

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 478e363..4a50e5f 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -2793,6 +2793,69 @@ out:
        return ret;
 }
 
+#if IS_ENABLED(CONFIG_IPV6)
+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,
+                               bool enable)
+{
+       struct wcn36xx_vif *vif_priv = wcn36xx_vif_to_priv(vif);
+       struct wcn36xx_hal_host_offload_req_msg msg_body;
+       struct wcn36xx_hal_ns_offload_params *ns_params;
+       struct wcn36xx_hal_host_offload_req *ho_params;
+       int ret;
+
+       mutex_lock(&wcn->hal_mutex);
+
+       INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_OFFLOAD_REQ);
+       ho_params = &msg_body.host_offload_params;
+       ns_params = &msg_body.ns_offload_params;
+
+       ho_params->offload_type = WCN36XX_HAL_IPV6_NS_OFFLOAD;
+       if (enable) {
+               ho_params->enable =
+                       WCN36XX_HAL_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE;
+               if (vif_priv->num_target_ipv6_addrs) {
+                       memcpy(&ho_params->u,
+                              &vif_priv->target_ipv6_addrs[0].in6_u,
+                              sizeof(struct in6_addr));
+                       memcpy(&ns_params->target_ipv6_addr1,
+                              &vif_priv->target_ipv6_addrs[0].in6_u,
+                              sizeof(struct in6_addr));
+                       ns_params->target_ipv6_addr1_valid = 1;
+               }
+               if (vif_priv->num_target_ipv6_addrs > 1) {
+                       memcpy(&ns_params->target_ipv6_addr2,
+                              &vif_priv->target_ipv6_addrs[1].in6_u,
+                              sizeof(struct in6_addr));
+                       ns_params->target_ipv6_addr2_valid = 1;
+               }
+       }
+       memcpy(&ns_params->self_addr, vif->addr, ETH_ALEN);
+       ns_params->bss_index = vif_priv->bss_index;
+
+       PREPARE_HAL_BUF(wcn->hal_buf, msg_body);
+
+       ret = wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
+       if (ret) {
+               wcn36xx_err("Sending host_offload_arp failed\n");
+               goto out;
+       }
+       ret = wcn36xx_smd_rsp_status_check(wcn->hal_buf, wcn->hal_rsp_len);
+       if (ret) {
+               wcn36xx_err("host_offload_arp failed err=%d\n", ret);
+               goto out;
+       }
+out:
+       mutex_unlock(&wcn->hal_mutex);
+       return ret;
+}
+#else
+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,
+                               bool enable)
+{
+       return 0;
+}
+#endif
+
 int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,
                            void *buf, int len, void *priv, u32 addr)
 {

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index 6492a62..e03ab78 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -150,4 +150,7 @@ int wcn36xx_smd_set_mc_list(struct wcn36xx *wcn,
 int wcn36xx_smd_arp_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,
                            bool enable);
 
+int wcn36xx_smd_ipv6_ns_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,
+                               bool enable);
+
 #endif /* _SMD_H_ */