From patchwork Mon Oct 24 11:31:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478453wru; Mon, 24 Oct 2022 07:17:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zUOARFONoTnrbIdhm0HlnsYcEuwLoXoOxy2ZhRnv50nBtoZVqtvsEtk6Qn6rfXIXsAwir X-Received: by 2002:a17:907:7203:b0:7a5:b062:2338 with SMTP id dr3-20020a170907720300b007a5b0622338mr6638895ejc.8.1666621041274; Mon, 24 Oct 2022 07:17:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621041; cv=none; d=google.com; s=arc-20160816; b=Kr6XWCQ3Ml4xhEku2k3gjced3fkt5vHD3ZWk6+hELGx+J31R0oo/AKetgWBFVuVMd8 DixyHHqMlBp/QE1PSJLoXCxXxOR3qkIKqkBLlagf2m+wN+1u6MBcswCTyHpedgL2iqRc VWMnxMBaqGfpbjIP7VBQO3AFS5UwWN295WaLzvHdakd9qysIDMoF4T9WDNxWxqFRYB5K bJLnbRBkTPTaLQYKOlb9DK3rSWZ6/0RzMjVAAeAUkGoXxf+zlbQ+7ao8lI5nEq9waOsJ Y3NGxKKkETQZZsDVuD0APrVknIBgRivUUysooR23jie8IrMUnbpg+GL1K6EWxvv7kYuS FTLA== 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=OUhylasl+mSYAEY++1OMrw36UJk+YkBk3vJu/V29pfE=; b=uCCgCGPPKObNcM3z/ExspUSg5/1CZm7NRQLlhM8wHkxRPmvB7dHPZ0ExkVJSET9eeX 7SWMyJEVEjvZ5vRKW9bUNIStCQ9f8WzmaFSIHpQ2Nv4o9y0Z9rMHRB5arij83b1550gC c2Wo3C11d2hUPw1GvuIuQIII/CTLm79miwFgT9WSmKP4FBtwmxq4nJnUehSzeybi4q+N UxXUW0RYqdfwVemcDkfxvgRS+AMS/hVP8RjJ4JqDMICc0FYiGZ8iQ7ynX4JmDWdS+ny+ cr48KfpT9VwIR40rgIMHtsTZkkIAH1NpEpiRMKm64NO0LolieGvjwld7hE0FTvXX8+pS kdmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aXfd0iqS; 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 b19-20020a056402351300b00459e1ce80a7si20948052edd.241.2022.10.24.07.16.55; Mon, 24 Oct 2022 07:17:21 -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=aXfd0iqS; 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 S233890AbiJXOIL (ORCPT + 99 others); Mon, 24 Oct 2022 10:08:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237070AbiJXOEg (ORCPT ); Mon, 24 Oct 2022 10:04:36 -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 27A6F915DA; Mon, 24 Oct 2022 05:49:19 -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 8FF08B816A6; Mon, 24 Oct 2022 12:30:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6B31C433D6; Mon, 24 Oct 2022 12:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614657; bh=jyyJhhngZWyi1HqqiBN7m3fK6xGknx14ephTtA11qjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aXfd0iqSI6UgHSHhSVDR322UMZGC/JpE1TiqRUmYSrEL3Qw8ulWzqRjSEF7o4M8Dv KlXzBS+4UwYWG9mdzXwBL8ttVILEmlmnrVNBAw2TfIqT/6Aj34Qh+rGPmPxCyYZ/i2 RQtUreA00ADuWjZblmsSNDTOEQ/lfKalIai5iU8w= 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.10 317/390] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:31:54 +0200 Message-Id: <20221024113036.491462091@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747578825183305463?= X-GMAIL-MSGID: =?utf-8?q?1747578825183305463?= 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 fed6d21cd6ce..3f2c10c2aaf8 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -4352,7 +4352,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);