From patchwork Mon Oct 24 11:31:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8664 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp421839wru; Mon, 24 Oct 2022 05:21:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7BcirNYlzq+uxp/o/f/Cy148TXhFxaq+Snezndcz98gle3Vj766F8MNlGMNrS59D5Dts6e X-Received: by 2002:a05:6402:2681:b0:461:cbda:fe4b with SMTP id w1-20020a056402268100b00461cbdafe4bmr3836145edd.124.1666614078627; Mon, 24 Oct 2022 05:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614078; cv=none; d=google.com; s=arc-20160816; b=GGFglYPOnKlLWEBe4P20IaVu8/O+BnqGxI1ju9+fO15rSL5XDE2amPgrna87HQkJQi 4b9ap2+z5Y+qNdduQd5q4q8ho71FM47Q5S4hnN4AGEpGIS6PpWDUZuPtdhNF6nlBNegN wH89k0E5EpaOe+Zh5avvPH603fo5S+ldvyMMerwnRvEUSk/tTzMDEfwC+wQsgp1h11PQ 9yxobnyDW8gstjFJrD4+9d5ilHW+TEurSstKmWV9ETJaeiG++QAFF9n6AB3Yfl8OTLFr FCsQjMoBBwKtmiytd43B/BjSUvbzZ3fIQvItrYNJkWnJgQGRUV/bmHvvXaldWR0TQYtj XKRg== 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=OZP4371EwT/rySPRMPpAzaWg8YVzv0n9oyFaNTG/JhI=; b=k/fMf8Tys8SX9xPkYdp4WOBZB1u6o+VUU2tgYpeRA+KBYtRNm4yYhrH15QlDJDgtw6 TuZQr1E8G+Op+M6dG6zYc9W+66Lm56u3HYbAYclXWHeZTwNwVbSkRkkRI2+D02pri8Ig SGH9WYN3BA3Y/vLotl2Wwu2R/9VXXNGTkiChFORvqZ3kp62xUTqCEj1iP7xeumsj7SEi i1tcSUstLxy2htWeb15JATyyzkiUho4SbjUjZnfhXJ13Ts1xDc4Fg+poYP9QxgUNnLEN ItKJEWjZxiya879YmV2Ol6v6097ruGGHFhoL9jebpH64GHb/UsVB3t/XqbT2p6iOkMsD 4+Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xmboJOkb; 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 hv20-20020a17090760d400b00791a67e4c00si16912817ejc.835.2022.10.24.05.20.53; Mon, 24 Oct 2022 05:21:18 -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=xmboJOkb; 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 S233025AbiJXMRp (ORCPT + 99 others); Mon, 24 Oct 2022 08:17:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233013AbiJXMPj (ORCPT ); Mon, 24 Oct 2022 08:15:39 -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 964B880E9E; Mon, 24 Oct 2022 04:56:16 -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 EF3DF61257; Mon, 24 Oct 2022 11:53:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11090C433C1; Mon, 24 Oct 2022 11:53:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612381; bh=UUPFGVE5yNPwnJWYQ5KMH0OyH9TrpTMtg+zVr4sFNE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xmboJOkbbcMv8taM6TJmEfbXg+Qcp1tEH/Gigrt6yasD9ZhloqCobmBDkfvH5OLyT mTns0FOM/Kz/nmxElHssRjJTHaTwedC+WAu2JAPUfNum+QzFf07rkQRMn9z7KIizfI d4mRnWGflI2JppACKRPyWMTDVIYgaQVrTz5xnZ5o= 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.14 177/210] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:31:34 +0200 Message-Id: <20221024113002.695313072@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571524032658801?= X-GMAIL-MSGID: =?utf-8?q?1747571524032658801?= 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 d2c289446c00..1309c136f7f3 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3835,7 +3835,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);