Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3930673rwi; Sat, 22 Oct 2022 02:25:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79o6gJRpgJDweoZ7vs3FI3IWTlE4PkOc/EsbEaJ2dKzbLNBXzUMdGLLVGnruSiq6FjmDFZ X-Received: by 2002:a05:6a00:3493:b0:562:f7c0:cbd9 with SMTP id cp19-20020a056a00349300b00562f7c0cbd9mr23472604pfb.4.1666430705986; Sat, 22 Oct 2022 02:25:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666430705; cv=none; d=google.com; s=arc-20160816; b=o0LO6Qx4bVYwyxswevOspgEiCW7DY5EoVqPmPIzHa00UfWp/tnowEDygKpcVfYuV2m Vl33SuM+77/ComnMyFh+kPV4luz3KxZstsJDbGJWuLLGG5KuQ3PiOvtNWQieRz/KckFM Ui9xyRSs0GDrkfkH28ARWcQINf8RHmZhIYGsm76jQ5X3SYJyJa7NDLRVwIK4gW7Htlrt kyv46QJ2KWUYCm0tIAhG/2+ecqS+2tqOiThluZdffDVpFqol40VHcsjYl3tV0GHJYuDN 3YFAJjmKo/MS4xe8mlDUvUR61HRwu+HQSOJgL5vvPqkxGrDB51rIwJYlsYl2OsmK8ew6 cmLw== 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=Ske73MuT1IXEo+gGunIKu5I/82K9kQTDsYWeP0SL6fI=; b=rzOwPFIm55wVSgDWnOwuk5tP+LU/4artdDDJ5do+/JDNbxiAnXGaRgj6y8cQD3jmn4 T3SMt4mLzBIkMopC+A2L+apHWhJ5pVre7RFcedtYfOhZZs37fkUgpjZHoX/OOTYXY5Nt o5+AuVmDMEpcwECNqglyygxg+Y7rNLoF+Hzo8fEeMyMuoTIyKruWUE5u4GnVfF+Jc7fp chgVW1BkK0h38nZwTndLEefDcOQO4txiNdNfMuYaw3l6qerxyYq2pxO2RvRtrVoALLz3 5YeZfKYWRD3y9/gZJ/3VeOsP+ZoaqtHY5C4W6H/25dBBL0A8pUqRfziekcvcMEY5XNjB nayw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bIew6r+k; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j191-20020a6380c8000000b0046ec396db31si3762218pgd.857.2022.10.22.02.24.54; Sat, 22 Oct 2022 02:25:05 -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=bIew6r+k; 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 S231598AbiJVIcK (ORCPT + 99 others); Sat, 22 Oct 2022 04:32:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234005AbiJVI3K (ORCPT ); Sat, 22 Oct 2022 04:29:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBE96257600; Sat, 22 Oct 2022 01:01:43 -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 075BB60BAF; Sat, 22 Oct 2022 08:01:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B4E0C433C1; Sat, 22 Oct 2022 08:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425701; bh=F5C9xZeKmsTJNbgIxGRpnScpQISfkO8XGRXBB5xjG3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bIew6r+k1CEz+walomXavC5ALUjxWjidrB4lRAIcx4wbkk8de15ncCdZG79hDhct6 DuhYrorWblXmq8144AqkjFymQVksFEj9u5x/ZF8KuC43ySTBb5CM6pBdRL/UmWwvLN URLIJ+4qOpwQ9IysrItnoW0CAc6BnI+QMncNuz5E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Serge Vasilugin , Daniel Golle , Kalle Valo , Sasha Levin Subject: [PATCH 5.19 586/717] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Sat, 22 Oct 2022 09:27:45 +0200 Message-Id: <20221022072524.361651007@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.3 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 From: Daniel Golle [ Upstream commit d3aad83d05aec0cfd7670cf0028f2ad4b81de92e ] The function rt2800_iq_calibrate is intended for Rt5592 only. Don't call it for MT7620 which has it's own calibration functions. Reported-by: Serge Vasilugin Signed-off-by: Daniel Golle Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/31a1c34ddbd296b82f38c18c9ae7339059215fdc.1663445157.git.daniel@makrotopia.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index cbdaf7992f98..b4fb4d1bff57 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -4365,7 +4365,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, reg = (rf->channel <= 14 ? 0x1c : 0x24) + 2*rt2x00dev->lna_gain; rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); - rt2800_iq_calibrate(rt2x00dev, rf->channel); + if (rt2x00_rt(rt2x00dev, RT5592)) + rt2800_iq_calibrate(rt2x00dev, rf->channel); } bbp = rt2800_bbp_read(rt2x00dev, 4); -- 2.35.1