Merge "wil6210: support IPA offload" (477a28a3) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ath/wil6210/Kconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -75,3 +75,12 @@ config WIL6210_WRITE_IOCTL
		debugging purposes only.

		If unsure, say N.

		config WIL6210_IPA
		bool "wil6210 IPA offload support"
		depends on WIL6210
		depends on ARCH_QCOM
		default y
		help
		Say Y here to enable wil6210 driver support for data path
		IPA offload

drivers/net/wireless/ath/wil6210/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ wil6210-y += ethtool.o
		wil6210-y += wil_crash_dump.o
		wil6210-y += p2p.o
		wil6210-y += ftm.o
		wil6210-$(CONFIG_WIL6210_IPA) += ipa.o

		# for tracing framework to find trace.h
		CFLAGS_trace.o := -I$(src)

drivers/net/wireless/ath/wil6210/cfg80211.c

+31 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include "wmi.h"
		#include "ftm.h"
		#include "fw.h"
		#include "ipa.h"

		#define WIL_MAX_ROC_DURATION_MS 5000
		#define WIL_BRD_SUFFIX_CN "CN"
		@@ -2054,7 +2055,22 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
		mutex_lock(&wil->mutex);

		if (!wil_has_other_active_ifaces(wil, ndev, true, false)) {
		if (wil->ipa_handle) {
		wil_ipa_uninit(wil->ipa_handle);
		wil->ipa_handle = NULL;
		}

		__wil_down(wil);

		if (wil_ipa_offload()) {
		wil->ipa_handle = wil_ipa_init(wil);
		if (!wil->ipa_handle) {
		wil_err(wil, "wil_ipa_init failed\n");
		rc = -ENOMEM;
		goto out;
		}
		}

		rc = __wil_up(wil);
		if (rc)
		goto out;
		@@ -2076,6 +2092,12 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
		memcpy(vif->ssid, ssid, ssid_len);
		vif->ssid_len = ssid_len;

		if (wil->ipa_handle) {
		rc = wil_ipa_start_ap(wil->ipa_handle);
		if (rc)
		goto out;
		}

		netif_carrier_on(ndev);
		if (!wil_has_other_active_ifaces(wil, ndev, false, true))
		wil6210_bus_request(wil, WIL_MAX_BUS_REQUEST_KBPS);
		@@ -2097,6 +2119,11 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy,
		if (!wil_has_other_active_ifaces(wil, ndev, false, true))
		wil6210_bus_request(wil, WIL_DEFAULT_BUS_REQUEST_KBPS);
		out:
		if (rc && wil->ipa_handle) {
		wil_ipa_uninit(wil->ipa_handle);
		wil->ipa_handle = NULL;
		}

		mutex_unlock(&wil->mutex);
		return rc;
		}
		@@ -2277,6 +2304,10 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy,
		memset(vif->gtk, 0, WMI_MAX_KEY_LEN);
		vif->gtk_len = 0;

		if (wil->ipa_handle) {
		wil_ipa_uninit(wil->ipa_handle);
		wil->ipa_handle = NULL;
		}
		if (last)
		__wil_down(wil);
		else

drivers/net/wireless/ath/wil6210/interrupt.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -224,6 +224,9 @@ void wil_configure_interrupt_moderation_edma(struct wil6210_priv *wil)
		/* Update RX and TX moderation */
		moderation = wil->rx_max_burst_duration \|
		(WIL_EDMA_AGG_WATERMARK << WIL_EDMA_AGG_WATERMARK_POS);
		if (wil->ipa_handle)
		/* additional int per client, for Tx desc ring */
		num_int_lines += max_assoc_sta;
		for (i = 0; i < num_int_lines; i++)
		wil_w(wil, i * 4 + RGF_INT_CTRL_INT_GEN_CFG, moderation);

		@@ -531,7 +534,7 @@ static bool wil_validate_mbox_regs(struct wil6210_priv *wil)
		return true;
		}

		static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
		irqreturn_t wil6210_irq_misc(int irq, void *cookie)
		{
		struct wil6210_priv *wil = cookie;
		u32 isr;
		@@ -600,7 +603,7 @@ static irqreturn_t wil6210_irq_misc(int irq, void *cookie)
		}
		}

		static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie)
		irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie)
		{
		struct wil6210_priv *wil = cookie;
		u32 isr = wil->isr_misc;

drivers/net/wireless/ath/wil6210/ipa.c

0 → 100644

+982 −0

File added.

Preview size limit exceeded, changes collapsed.