From patchwork Wed Oct 19 08:26:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp302628wrs; Wed, 19 Oct 2022 05:39:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM525pm8hfsRynuOKZfJvxyCeHcimICRPUa4G8YEC30KcPOQ6j+PSUVYz51d0Z7AKfQ+DjpI X-Received: by 2002:a05:6402:1cc1:b0:453:1517:94e4 with SMTP id ds1-20020a0564021cc100b00453151794e4mr7200679edb.399.1666183153208; Wed, 19 Oct 2022 05:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666183153; cv=none; d=google.com; s=arc-20160816; b=SUn+fJjyVq6CN8T/VQ3/LMuCb+xojhpoknzObL+EvRA9z0FEatsBnsJ9cFTAk4d+PA mqFWwQeN7gPWrNqHG4fyi9CU0+LatWTuDN1ui0pnb/yXFY/y7JqtmIsNpg0zt7QUvkB1 ovfUeaxfZhy9DsZFRHbH/nDD2cogc7ukLX71pnJN5s8aeImvgVFDoOOB1dVRRe0v4LTN Z6Nyj2xILlDID49x0JAdAXZlxLJcW/v6rvGCvUAeVOjmyR1XnXAQyJS2b4vEcngQPe6h gRqlUM5igqUJfp8UPQKZMTvHsckUPp8WbNcTyuaZGzAWQh//znBdGgXfoRMh6zwqJqe1 A2zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GmwvHgT4s23e4ZqfXvZhsJVKVdUeDFpp8UN/UcUkXDM=; b=FteZakueeaOH1H/1BoVJNamoqh7BWmEsOvpq5sSgWlQIZT/M8Py+fX3QMciJWcK45P IRqy0iQEnKJxTFUeYdyWfnPadDFh3VVTwMyk9Ipeh8SUeBEhplCkdtPqZOu9JqU96tt3 WLJb3QEGjak1lvo04wDmabZXmaelpE3wDVYhwU3/nEpFEUPlL68267r7xtUD637q9XEe zlOZP20No1IhFIuJIYJybzzUKVyn1BeJ05bjyvP45FT3L8Rf7ERNLVup2FBZfsOeZ4WJ FZmiL/HYV17WlA+7SPXRscz5MTkLEswiX9+9civGFoQIIEtdizvjCY/ggoq2uCThVvDW 80oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xqegrmoI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r17-20020a170906a21100b0077547abf08fsi14329435ejy.169.2022.10.19.05.38.46; Wed, 19 Oct 2022 05:39:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xqegrmoI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229840AbiJSMZV (ORCPT + 99 others); Wed, 19 Oct 2022 08:25:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233109AbiJSMXo (ORCPT ); Wed, 19 Oct 2022 08:23:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8841E696FB; Wed, 19 Oct 2022 04:59:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 447AF6184A; Wed, 19 Oct 2022 08:51:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54681C433D6; Wed, 19 Oct 2022 08:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169469; bh=2+gx3wWCA2o5UX2WNEx+l1I7W2tZK/1eydy8g3EycQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xqegrmoIt4n7t8Xh8hKdIxZRMKljSwEe6WP7J6WRRM6CN9hSiN1SwUlxan7qiRSAb IskXaTnwmbMZuYDEgBEnwNJ/EO/tCZDBl6DDNEbqtIavfWY3LgPmdUYKUo3dEOb/45 MFAA+aSsDfbhZQoFua3GBD2jcRzwcqJSfMmGXcJ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 6.0 288/862] wifi: mt76: mt7921: fix the firmware version report Date: Wed, 19 Oct 2022 10:26:15 +0200 Message-Id: <20221019083302.732187973@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747119666251228631?= X-GMAIL-MSGID: =?utf-8?q?1747119666251228631?= From: Sean Wang [ Upstream commit 00be84d6dfc8319ed1864d3ca8658569d36a1882 ] Fix the regression of the firmware version report since 'b9ec27102ac0 ('mt76: connac: move mt76_connac2_load_ram in connac module')'. Fixes: b9ec27102ac0 ("mt76: connac: move mt76_connac2_load_ram in connac module") Signed-off-by: Sean Wang Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 13d4722e4186..7cac7b126e59 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -2888,6 +2888,10 @@ int mt76_connac2_load_ram(struct mt76_dev *dev, const char *fw_wm, goto out; } + snprintf(dev->hw->wiphy->fw_version, + sizeof(dev->hw->wiphy->fw_version), + "%.10s-%.15s", hdr->fw_ver, hdr->build_date); + release_firmware(fw); if (!fw_wa)