From patchwork Tue Aug 18 12:23:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josef Schlehofer X-Patchwork-Id: 1346802 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hDhqPk/w; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uV9J5qc2; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BW99d43Gdz9sRK for ; Tue, 18 Aug 2020 22:25:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=fOyuwd/fOssz0TiLasqGV1Axfw+A23HHK/rrIgngjbE=; b=hDhqPk/w0uSlG2EUuMI6SQIHk+ 8XcAXfiqeSFILmkGLM9+5tqG7zsGl/v3an0zDiUcVraKVEZ++Vpul5GbFWZBqTRmVxq8AtTjbr/vZ wZ6lBX8gBo6FFC184j58ce9nnBZdUwZiT9tTFmiVc9Nq5Xszgd4CGDpdmqAXgA1T/ugzI8CqmPWqB CL+dbIFWK1P18GDPu9cYt7mt5iS/Phpmbys0YuecoWa6g1eBdMESmA3/bcJ+0HFuTt1XNLteVGgtR BSrAnXNcwcBeGcURZJdla2HwhMDDMplYaLilratwRlixImxdbDEu5DuvQ3nJM9cD0lacQZBjxLNsO nzaU22Yg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k80eB-0007cO-0o; Tue, 18 Aug 2020 12:23:23 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k80e8-0007bt-4s for openwrt-devel@lists.openwrt.org; Tue, 18 Aug 2020 12:23:21 +0000 Received: by mail-wr1-x444.google.com with SMTP id z18so18053799wrm.12 for ; Tue, 18 Aug 2020 05:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=l6I0Ay6bms1wyYBzHdM7laYu5TnlrV1dEYy8ElH+OYE=; b=uV9J5qc20SPUakn7Ocuy/YPBiMIzgawXtym08d9iALjVDMR9mo5ebPsUtngwtHHFFD d57oFZKBMkfzLbXvXUNYsdhGQTIcfXQ8DVL966MInKOLiLJk+HmD7MjS3vOfhehyBBjA 2mMedkmUeAK6lesMrAA2hPECJ7E6MpCqA+0RZFsmr8Q+hEXLooaTMstxuDDDh5OZJ+U3 OA//mUoHvW/GbmHJAOXZ2RWMyTNCgVkuvkT+lEAs4xfQ+rznxTSWn2MxpAXuJratr4+d mNySc6s2TxUg9Ps5R7/reVWkinF6bXvlDz7pA+v8gM1igyFx+PTQlDzXPIPxXWzBvdya dUUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=l6I0Ay6bms1wyYBzHdM7laYu5TnlrV1dEYy8ElH+OYE=; b=qM4N91IcBrAP/RovJpCkcmZcBpq2O8NFEpGrlxVM9xfdIy/Y0UoQmZw74UnlyBpQG7 1Zke4RNx7c1HYSvY2XZapI/0KTmCWy4Ik0uDxIj78CDZkHBdHtEpaqlDcLDpWkLxI0kS 6saQPHpM8TGetzJaWqHqXB4BVptIytzJZZrU1IS+On2ipkeuwEygYi4dJdyhY+WOJ++y /tWZGr15/nhZMk+p0MaTSxEUm3IZDeYSN6l5Q/G3xuai4L9QQi1x4v/PV3pEeCMUQict yl7HSJvVey9FTUejx40TkreBOCdltftO+IChslwrsNItQvCD5LuE69DK2BmfBSFYzYqV TShQ== X-Gm-Message-State: AOAM533Q9Am7R4GFY0C2CvWPD0h3D3tX6owCraAgC/A1G4wJRbeHW5x/ udyXGMrVRCCwRPxD6jj4oxrbLg4MI3Racg== X-Google-Smtp-Source: ABdhPJy9ESioJDm/hN9zziq9TJB37VeYzBUwrB7pmpettNbXmnuIscuDyuHTpr4EBgrR1mE7SodNwg== X-Received: by 2002:a5d:4c45:: with SMTP id n5mr11377699wrt.68.1597753397572; Tue, 18 Aug 2020 05:23:17 -0700 (PDT) Received: from supernoodles.foo ([2001:1488:fffe:6006:450d:5092:65c0:747]) by smtp.gmail.com with ESMTPSA id x82sm33585279wmb.30.2020.08.18.05.23.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 05:23:16 -0700 (PDT) From: Josef Schlehofer To: openwrt-devel@lists.openwrt.org Subject: [PATCH] linux-firmware: add support for Marvell SDIO 8997 Date: Tue, 18 Aug 2020 14:23:03 +0200 Message-Id: <20200818122303.999164-1-pepe.schlehofer@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200818_082320_208864_6A976F0E X-CRM114-Status: GOOD ( 16.63 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [pepe.schlehofer[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org For example, Turris MOX SDIO card is using Marvell (NXP) 88W8997 chip. Technical specs of 88W8997: - 28nm - 802.11 ac wave-2 It should support simultaneous dual-band 2.4 GHz and 5 GHz, but it requires to support multiSSID for one Wi-Fi card [1], which is not supported in OpenWrt, yet and if we tried to run two instances of hostapd, it didn't work well, so it's 2.4 GHz or 5 GHz. - 2x2 MU-MIMO - Bluetooth 5.1 with LE support - Unfortunately, there can be connected only 8 clients at the same time (limited by FW, however, there exists "enterprise" chip, its equal chip, it is just different that it uses different FW) Symlink is necessary as mwifiex_sdio tries to load sd8997_uapsta.bin [ 13.651182] mwifiex_sdio mmc0:0001:1: Direct firmware load for mrvl/sd8997_uapsta.bin failed with error -2 [ 13.661065] mwifiex_sdio mmc0:0001:1: Falling back to user helper [ 13.684880] firmware mrvl!sd8997_uapsta.bin: firmware_loading_store: map pages failed [ 13.695910] mwifiex_sdio mmc0:0001:1: Failed to get firmware mrvl/sd8997_uapsta.bin [ 13.703774] mwifiex_sdio mmc0:0001:1: info: _mwifiex_fw_dpc: unregister device Pali Rohár sent two patches [2] [3] into kernel to fix default firmware name for SD8997, so the symlink will not be required in the future versions of kernel, which was accepted and right now, according to my details it was backported to 5.8, 5.7 and 5.4 [1] https://bugs.openwrt.org/index.php?do=details&task_id=3243 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=00eb0cb36fad5 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2e1fcac52a9ea Signed-off-by: Josef Schlehofer --- package/firmware/linux-firmware/Makefile | 2 +- package/firmware/linux-firmware/marvell.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index b50a025409..59ce1fb1af 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware PKG_VERSION:=20200619 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/package/firmware/linux-firmware/marvell.mk b/package/firmware/linux-firmware/marvell.mk index 6c3f171216..78edac0ff3 100644 --- a/package/firmware/linux-firmware/marvell.mk +++ b/package/firmware/linux-firmware/marvell.mk @@ -20,12 +20,14 @@ define Package/mwifiex-pcie-firmware/install endef $(eval $(call BuildPackage,mwifiex-pcie-firmware)) -Package/mwifiex-sdio-firmware = $(call Package/firmware-default,Marvell 8887 firmware) +Package/mwifiex-sdio-firmware = $(call Package/firmware-default,Marvell 8887/8997 firmware) define Package/mwifiex-sdio-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/mrvl $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/mrvl/sd8887_uapsta.bin \ + $(PKG_BUILD_DIR)/mrvl/sdsd8997_combo_v4.bin \ $(1)/lib/firmware/mrvl/ + ln -s ../mrvl/sdsd8997_combo_v4.bin $(1)/lib/firmware/mrvl/sd8997_uapsta.bin endef $(eval $(call BuildPackage,mwifiex-sdio-firmware))