From patchwork Mon Oct 24 11:31:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp548566wru; Mon, 24 Oct 2022 09:41:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5oXLm+2EYopx3CVUqCMIE/axPB/zz8XJdBIQPwSj4BWpNd/KzMk5wMxnrCt+LC5y32fa5B X-Received: by 2002:a05:6a00:1943:b0:563:8173:b46a with SMTP id s3-20020a056a00194300b005638173b46amr33573531pfk.34.1666629712486; Mon, 24 Oct 2022 09:41:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629712; cv=none; d=google.com; s=arc-20160816; b=OM6Yr4DydEgMJ5TEBhuTwNyQVL38sHXTMaqq7VzTr5HVasTwFthYdOI8Q4EkW4FppV vNAk6VL1615ngo19IRVgAK7oh+qXFfbR38KoCscj8ltO4rRL3XDWFJDI83QIGcAIF2CZ t0RFpDfL38uoLFaFY3EJExi/yr4q9eFdsYQ5/9FKqjGTrbctDFqnc2OcxLp0zy5sv7Sv gcT8K4KtDfAdPctlp8KaWR+5kIoGa+Nlk802ukQmZFfNVd7jvhFj9pZBz2L+IQLrc9F7 TtesnI6M4rZmdz97BSs0s1nKODM77Epyyg8H0xJJc8MdZoKwR+lgaM3Fzve0YdPFNYO7 bNvA== 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=0YcRAtOdJiq5FB+FFdzLMfsEplQVbzXXrJMUjfL66kk=; b=thKUljMVjlX55f4hol9CVSn3Fnw6oHx9YQQ12BRT94WXipf2q/e2C2wG7DXM0ZkURr PpeN8NdIA3rMxterAwmwkLPu/QieCdCvIw6ecSJ1Fp2GFpH6E9iiebHg4CquEKDAOPsN SjfQ78Y5+XYE5SEJfjvtddd/VBGGmZTlTIMnWEkvz2pTMDdhD4rrK3brjMHRdWsf/uiI wgdXy7VJiDZTFJEkB+fbYyU+JSo2IC1khG6Pyp95X2i8e5EoLzBqeHynBebiwUOTbqUi 8+FXxycObHW9DgINLwm9Fs1YRHN2ReRgoWF6TKkyccXjnvzT+v2mB4yy5Ex2N6KfT+Om cF5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YniwDv0p; 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 g1-20020a635641000000b0042b57d7bc14si34490693pgm.763.2022.10.24.09.41.39; Mon, 24 Oct 2022 09:41:52 -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=YniwDv0p; 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 S234419AbiJXQks (ORCPT + 99 others); Mon, 24 Oct 2022 12:40:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234398AbiJXQkS (ORCPT ); Mon, 24 Oct 2022 12:40:18 -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 EDE9BDD8B8; Mon, 24 Oct 2022 08:27:28 -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 97C08B811D2; Mon, 24 Oct 2022 12:03:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 014ABC433D6; Mon, 24 Oct 2022 12:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613035; bh=9bBZYAXceArHwz/IrqPMXLuYHRvA+j2qC4KJRN/Ft08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YniwDv0pKXw8lluU6IS0VHOf0HVRrw85YYRlv4MoU/AuVx523rDfnp3P806tKN0a2 eQLJKnkSXkL7FY+N3sFvB0tQWNsg/hg9LkrO7nAuumvyIw5c3uC2UZM+4Jwc2oJcgl Di/qdZWIpB6UBWr0OkwrOmBBNMQTrIV2aMeOhnWI= 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 4.19 186/229] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:31:45 +0200 Message-Id: <20221024113005.132248780@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747587917473086856?= X-GMAIL-MSGID: =?utf-8?q?1747587917473086856?= 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 a567bc273ffc..2a119f314c38 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3838,7 +3838,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, reg += 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);