Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7423569rwi; Mon, 24 Oct 2022 14:33:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM51ZPC/Pt5xkub4/YO1Ct8UnZUMzOS1npz/kKXI5vtT+EwGD68PXbCwBbEnOzGg61r93a+j X-Received: by 2002:a17:907:7610:b0:78d:b374:898e with SMTP id jx16-20020a170907761000b0078db374898emr30947675ejc.28.1666647208703; Mon, 24 Oct 2022 14:33:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666647208; cv=none; d=google.com; s=arc-20160816; b=woAdR+PH/ZhRJG/dRAExZD6Dj1JFeXHBqeiQMfpI1k/KtrvcTFz7vQn0jMflbAyCIg aLhLVYA0a7FPHyFymJCF7NTi4HrbWBPW4n4xcz9+NRrvmZgVsDa4AiS6QOAeRG6Q9r1p KwzVVmGs4DPmrOHM91vby5TDgkpnRSp4rrmPrrvKkFzKRfv3M3RLep5A/x2Hw1/VWwdA zpjHj04YNhled5j9ibLisw1FZM5HT6k+gOi0RWfi9T+VZ3TI8OQFC3+q7P9PYAjctHcf V5CrWCdFz6aTsNzqoWJHJsLktrZ1o3PeqQbHrCQXYRY49T9+yKYv8ge9OZa4C4OZCUnM GeAQ== 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=rFkrgv48tFsyQD5nqYrOtg0LdzKN7uiq09nrCtyrIxk=; b=ViVFZqUhlfGLy22dqoBW2af0z4w0xPP7/liai1Gy8WxhKthOK2YLrfANBJz36WVfCd 8JLW+rI4/54wj0t7R/nMys2ed0h+xdcR7IHEMTDxHvO7M7YLdhya4Jv0FCXF2l2aKdgD +xS/muXMkWqjpp4LASkt0dFsvKknQ7g6B10f7KyYnEDw0P1ahHId5L0kGvac4FcqzMIg FSOyWOKPWm2zpIJPLOmIanvtSowTN6XNAddP30X5OrZ+cgviGOm0Cbq8bzq47pfwLh/Q g/XXxkpFilQc6SPInI9s9eiBljefD9mVdrD5IcJ/vpwNGDsNcB1W2Kd5kHK/hK2oGf7e 42PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="YazZ8VU/"; 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 w9-20020a056402128900b00461ad211828si740324edv.259.2022.10.24.14.33.03; Mon, 24 Oct 2022 14:33:28 -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="YazZ8VU/"; 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 S232689AbiJXUZI (ORCPT + 99 others); Mon, 24 Oct 2022 16:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232985AbiJXUXP (ORCPT ); Mon, 24 Oct 2022 16:23:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32CD014D0B; Mon, 24 Oct 2022 11:38:44 -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 ams.source.kernel.org (Postfix) with ESMTPS id 070A6B81603; Mon, 24 Oct 2022 12:13:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60F84C433D6; Mon, 24 Oct 2022 12:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613608; bh=29BCPCbZfYMbwNEpy/5MBOlEcHtdxVBIrRAdPeoNTg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YazZ8VU/sqAh21HtZm0wna48dPwSEazeBumqFDgi6szXUgSgILg55xul41d2Bi+m5 DgdnNEFgGtH2cTqL/Luds4seT2CCAMIkAuHy/xSWC46kKxegzfyTLtCk/lmhItMmKD HVemTswSqmS2EyssL9b0UtX3BKRUuPleO/i/Srhk= 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.4 202/255] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:31:52 +0200 Message-Id: <20221024113009.735881817@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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.6 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 c99f1912e266..9b56a4df2e94 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -4355,7 +4355,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