From patchwork Fri Jan 19 20:12:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 863796 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bIk7b3FO"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zNX7Y4N5Mz9s7F for ; Sat, 20 Jan 2018 07:12:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=91Q4avihUpeBbIgS3cKRedD42XupRrEi1Tv8RRO/13M=; b=bIk7b3FOizIYum nJE7q+OYbNN1pFjzUKil7ZiLAeBQAnaEpoKV7pW5m9Scl8eMFmd8sNnD9B2zPykEwaEfhHQMAXGHC nRdPP+cBlzzbzUZoUh7hw8yCqqDkTThDzK9wGAzqV8JE7c4zRVKoLJE9I6BtSHHLCUj8ZiBbL32H8 BREpY9uTHUZCMskYq0sgtjSrpFZe+ATeMbdDwZmmmxtSATCJFvoq4euZZE6Qvm2E4nhzRSVL0WJIb IeZ2bL1W4ObM90+X0X0/GB45xWQvgfW43jmay1FXyA56AX9i0acTscu33qrlCqw6J/tGPG5+8nc0+ a0oM6KjtaKFFzp6KQBGw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ecd1y-00062w-KK; Fri, 19 Jan 2018 20:12:54 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ecd1U-0005UO-Sa for lede-dev@lists.infradead.org; Fri, 19 Jan 2018 20:12:28 +0000 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id 9576940A30A; Fri, 19 Jan 2018 12:12:08 -0800 (PST) From: greearb@candelatech.com To: lede-dev@lists.infradead.org Date: Fri, 19 Jan 2018 12:12:03 -0800 Message-Id: <1516392726-28656-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 1/4] Update to latest ath10k-ct driver, enable AHB. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear The driver updates include: ath10k driver backport to fix WPA 'pn' related security bugs (4.13 based driver only currently), a fix for off-channel TX for CT wave-1 firmware, a likely fix for napi related crashes, and a backport of the firmware fetch patch. AHB is needed for the IPQ4019 platform radios. Signed-off-by: Ben Greear --- package/kernel/ath10k-ct/Makefile | 14 +++++---- ...ctivate-user-space-firmware-loading-again.patch | 36 ---------------------- 2 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index fe094e7..af326d6 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -9,8 +9,8 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2017-06-13 -PKG_SOURCE_VERSION:=bded1823912549017d819d1796273b3134c3de20 -PKG_MIRROR_HASH:=616174650e12a82edb6b6bd18ac186e2c6a48fdad0082df9d2011ab20940814b +PKG_SOURCE_VERSION:=33899b08d900404dfc88e850fd27992a8227325c +PKG_MIRROR_HASH:=3c501336a4fdfe2b00b8ce03fd8bf10193502bbdfd68fb8a6eafa7dc5362521b PKG_MAINTAINER:=Ben Greear PKG_BUILD_PARALLEL:=1 @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/ath10k-ct SUBMENU:=Wireless Drivers TITLE:=ath10k-ct driver optimized for CT ath10k firmware - DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT @PCI_SUPPORT +kmod-hwmon-core + DEPENDS:= +kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +kmod-hwmon-core FILES:=\ $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \ $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko @@ -50,9 +50,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH endif CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m -# No AHB support enabled yet. Could conditionally enable it later. -#CT_MAKEDEFS += CONFIG_ATH10K_AHB=y -#NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB + +# This AHB logic is needed for IPQ4019 radios +CT_MAKEDEFS += CONFIG_ATH10K_AHB=m +NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB + NOSTDINC_FLAGS += -DSTANDALONE_CT ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS diff --git a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch b/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch deleted file mode 100644 index dc02a9d..0000000 --- a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c0cc00f250e19c717fc9cdbdb7f55aaa569c7498 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Thu, 24 Aug 2017 23:06:41 +0200 -Subject: [PATCH] ath10k: activate user space firmware loading again - -In commit 9f5bcfe93315 ("ath10k: silence firmware file probing -warnings") the firmware loading was changed from request_firmware() to -request_firmware_direct() to silence some warnings in case it fails. -request_firmware_direct() directly searches in the file system only and -does not send a hotplug event to user space in case it could not find -the firmware directly. -In LEDE we use a user space script to extract the calibration data from -the flash memory which gets triggered by the hotplug event. This way the -firmware gets extracted from some vendor specific partition when the -driver requests this firmware. This mechanism does not work any more -after this change. - -Fixes: 9f5bcfe93315 ("ath10k: silence firmware file probing warnings") -Signed-off-by: Hauke Mehrtens -Cc: Michal Kazior -Signed-off-by: Kalle Valo ---- - ath10k-4.13/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/ath10k-4.13/core.c -+++ b/ath10k-4.13/core.c -@@ -556,7 +556,7 @@ static const struct firmware *ath10k_fet - dir = "."; - - snprintf(filename, sizeof(filename), "%s/%s", dir, file); -- ret = request_firmware_direct(&fw, filename, ar->dev); -+ ret = request_firmware(&fw, filename, ar->dev); - ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", - filename, ret); -