From patchwork Mon Oct 24 11:32:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp480162wru; Mon, 24 Oct 2022 07:20:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6En3iEQ7c94smwEpyUg05SKw6mrTk0viXo65qoZidd3yroKtJb5MjFjLyxUiQwp67CTSWa X-Received: by 2002:a05:6402:3547:b0:45d:1578:9424 with SMTP id f7-20020a056402354700b0045d15789424mr30244919edd.281.1666621231482; Mon, 24 Oct 2022 07:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621231; cv=none; d=google.com; s=arc-20160816; b=blKOiVnZmZjrAfWBWMsz9CIWHSNUy79LBPlxgz66r8DRp3lD9PRAcciLTkpYvCR0qS mBIu0TJaEccL4DSPJ7OxQhBeleStfNWRpfIdFpUMvQiIzt23x3lrWpFB04m4sCOt+++3 ibJiDmZWJnHbeVBxBNuvyIv/AW2H3eNmCLeVzoJNtUVBsEOaUvQ9WGSY/zFhdIZas/km hy3dZc8q2Flz9GV/Gug6W2tuOzEi1dNltPUacHsmYM9/k0ZRbDG7q2zQZLCLd7jZj3aB LhG2ESnQsz5TQrBg4Guba9C8mnn2T7KZCJJQ6HniJIXtH2rrK5PspqOlUMZUEybVkxh+ KTNQ== 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=GdnzQUUUURtkwbhGZvlXewpQtyikmf8QNvAUDohIeoA=; b=OESsa8p7MWvfYmJK33oAEIGJ5kn6ISNFhCfrz9o9DryDRrnwhUm1dNyKQV76uHtbJl Ac1EM9GgZ5uMsG6DgGmhO3snJ2BrdDUi4y1m17Srpv1kpQAqT1dw+eVlthtbBDng84Lg 7Cd0x6ZSCE9dMX16MjQoc06+g79yPqeKUkzRgpuqWVXsG11QmC2hqqUBki83LIPPj2xB WqMC8Ab20EHW8hW94Hhg54XlCltKPpZFAAyns9FlnrAq1BvEI9KnHjOqq0nhe75jNRay EDFq5gw1P6+QIM0z/Dc8RTqU4tgZZKALJqcBZ7x7M3MJRvikV/ZdKVJkFa8odvFyB/r3 LdZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=koI4Qa+x; 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 ga13-20020a1709070c0d00b0078db1343eedsi29549128ejc.774.2022.10.24.07.20.00; Mon, 24 Oct 2022 07:20:31 -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=koI4Qa+x; 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 S234793AbiJXORh (ORCPT + 99 others); Mon, 24 Oct 2022 10:17:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235872AbiJXOPJ (ORCPT ); Mon, 24 Oct 2022 10:15:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3AAC24F2B; Mon, 24 Oct 2022 05:54:55 -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 67A21611D9; Mon, 24 Oct 2022 12:53:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 781E8C433C1; Mon, 24 Oct 2022 12:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616002; bh=3dk4lsVmXc2kcE7gGqoX3o3+0bQ4x9VGpzcSJYn+YW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=koI4Qa+x7zY5LM29kZNLffJiAxB6ubDbLAUJtEDzMLyxkDzSanxJ9nXfp61OhRZ28 Peb6CifN3LY+pr5xTX6KRjo8fVfDnVCZpA5bY9pgVpRYdi0rp6ZlQsZWYGhNSPNrRl NzbkkpdNbZAyL5DNvXzCMiHAIpAaLHwC1BZIJTVI= 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.15 434/530] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:32:58 +0200 Message-Id: <20221024113104.741276367@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747579024531911975?= X-GMAIL-MSGID: =?utf-8?q?1747579024531911975?= 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 deddb0afd312..0a47180f321a 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);