wcn36xx: Add ipv4 ARP offload support in suspend

Add ARP offload support. Firmware is capable of responding to ARP requests
for a single ipv4 address only.

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

diff --git a/drivers/net/wireless/ath/wcn36xx/hal.h b/drivers/net/wireless/ath/wcn36xx/hal.h
index 65ef893f27365f6965edcf29e9c37d8990e1c673..b56c8292fa621dbe68548b3c59fbb67868c5548b 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/hal.h
+++ b/drivers/net/wireless/ath/wcn36xx/hal.h
@@ -3465,7 +3465,7 @@ struct wcn36xx_hal_rem_bcn_filter_req {
 #define WCN36XX_HAL_OFFLOAD_ENABLE                          1
 #define WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE             0x2
 #define WCN36XX_HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE        \
-       (HAL_OFFLOAD_ENABLE|HAL_OFFLOAD_BCAST_FILTER_ENABLE)
+       (WCN36XX_HAL_OFFLOAD_ENABLE | WCN36XX_HAL_OFFLOAD_BCAST_FILTER_ENABLE)
 
 struct wcn36xx_hal_ns_offload_params {
        u8 src_ipv6_addr[WCN36XX_HAL_IPV6_ADDR_LEN];
@@ -3487,10 +3487,10 @@ struct wcn36xx_hal_ns_offload_params {
        /* slot index for this offload */
        u32 slot_index;
        u8 bss_index;
-};
+} __packed;
 
 struct wcn36xx_hal_host_offload_req {
-       u8 offload_Type;
+       u8 offload_type;
 
        /* enable or disable */
        u8 enable;
@@ -3499,13 +3499,13 @@ struct wcn36xx_hal_host_offload_req {
                u8 host_ipv4_addr[4];
                u8 host_ipv6_addr[WCN36XX_HAL_IPV6_ADDR_LEN];
        } u;
-};
+} __packed;
 
 struct wcn36xx_hal_host_offload_req_msg {
        struct wcn36xx_hal_msg_header header;
        struct wcn36xx_hal_host_offload_req host_offload_params;
        struct wcn36xx_hal_ns_offload_params ns_offload_params;
-};
+} __packed;
 
 /* Packet Types. */
 #define WCN36XX_HAL_KEEP_ALIVE_NULL_PKT              1

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index 9a97a288a96f1423b1fb5cd2fbf36a0b265e0df0..0da123660fa1337c8dc12f83cbac4d2151957a63 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1112,11 +1112,16 @@ static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)
 
        flush_workqueue(wcn->hal_ind_wq);
        mutex_lock(&wcn->conf_mutex);
+
        vif = wcn36xx_get_first_assoc_vif(wcn);
-       if (vif)
+       if (vif) {
+               ret = wcn36xx_smd_arp_offload(wcn, vif, true);
+               if (ret)
+                       goto out;
                ret = wcn36xx_smd_set_power_params(wcn, true);
+       }
+out:
        mutex_unlock(&wcn->conf_mutex);
-
        return ret;
 }
 
@@ -1130,8 +1135,10 @@ static int wcn36xx_resume(struct ieee80211_hw *hw)
        flush_workqueue(wcn->hal_ind_wq);
        mutex_lock(&wcn->conf_mutex);
        vif = wcn36xx_get_first_assoc_vif(wcn);
-       if (vif)
+       if (vif) {
                wcn36xx_smd_set_power_params(wcn, false);
+               wcn36xx_smd_arp_offload(wcn, vif, false);
+       }
        mutex_unlock(&wcn->conf_mutex);
 
        return 0;

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index d0c3a1557e8d65f3ad343be316f1f4c8b1aa147c..478e363610e125d765b7e4c6756a5bdc6f4e47bd 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -2756,6 +2756,43 @@ out:
        return ret;
 }
 
+int wcn36xx_smd_arp_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;
+       int ret;
+
+       mutex_lock(&wcn->hal_mutex);
+
+       INIT_HAL_MSG(msg_body, WCN36XX_HAL_HOST_OFFLOAD_REQ);
+       msg_body.host_offload_params.offload_type =
+               WCN36XX_HAL_IPV4_ARP_REPLY_OFFLOAD;
+       if (enable) {
+               msg_body.host_offload_params.enable =
+                       WCN36XX_HAL_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE;
+               memcpy(&msg_body.host_offload_params.u,
+                      &vif->bss_conf.arp_addr_list[0], sizeof(__be32));
+       }
+       msg_body.ns_offload_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;
+}
+
 int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,
                            void *buf, int len, void *priv, u32 addr)
 {
@@ -2804,6 +2841,7 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,
        case WCN36XX_HAL_8023_MULTICAST_LIST_RSP:
        case WCN36XX_HAL_START_SCAN_OFFLOAD_RSP:
        case WCN36XX_HAL_STOP_SCAN_OFFLOAD_RSP:
+       case WCN36XX_HAL_HOST_OFFLOAD_RSP:
                memcpy(wcn->hal_buf, buf, len);
                wcn->hal_rsp_len = len;
                complete(&wcn->hal_rsp_compl);

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index 462860572e1f8313f7286982d3e753be57484e33..6492a628ea6a95c19965768e0bd374d7b1df079f 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -146,4 +146,8 @@ int wcn36xx_smd_rsp_process(struct rpmsg_device *rpdev,
 int wcn36xx_smd_set_mc_list(struct wcn36xx *wcn,
                            struct ieee80211_vif *vif,
                            struct wcn36xx_hal_rcv_flt_mc_addr_list_type *fp);
+
+int wcn36xx_smd_arp_offload(struct wcn36xx *wcn, struct ieee80211_vif *vif,
+                           bool enable);
+
 #endif /* _SMD_H_ */