From patchwork Mon Oct 24 11:31:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp405143wru; Mon, 24 Oct 2022 04:56:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4sPVc7ZedX/ji5evUxr759b8SUw8yaFi53wClEOU7u7c7cuGu9TYOCHc+K1HV7IElgGa2f X-Received: by 2002:a65:6cc4:0:b0:412:35fa:5bce with SMTP id g4-20020a656cc4000000b0041235fa5bcemr27303131pgw.466.1666612586610; Mon, 24 Oct 2022 04:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612586; cv=none; d=google.com; s=arc-20160816; b=qGpdBctvUqI09+bswGTGftscV+5TptRWbjUOh/DVH8BeJXzW5zdUFpeULdDeSQtL13 +Ko6Ou9H/xG1pydEUke0FIsKhz7bcRrtUlYur1QffjgYd7R0VxSJ3HLU1vCQJjL4OxBm 4dSf0ZsVjW5GUdutRJG1suyeUilgeYWxvqV/zRTd4lCy4uVawy5x7SaXyi/vd4p22s7V bOhHPTk/36CvX2dxdGIq5/37EyNs7NiADoIdByAre9pD+lGaYI+AkJXb7hTnP7fb0aXl u1+sNyfOZCbaemhb9aX1IAv9tClyegzbc1MucFx/uJXj0ZKplyXFWunVKGu860TmNMDJ FbbQ== 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=h+FiXORyv21SbCGiaDXQXMPodRpp/CqpsR6aAwcvVn4=; b=AyySA0dk7astpbBWURtRv7ehLK2nECuX85jVx0Zq5Z0yxxxhJr7t0AAzL1CSUW+axl iQaUoXEWCnq+UQjY/xOyXdrPfa4weOgHV5rfAO6ywjlIrDMxY/R20QzRTZyDJtLY0C5d 00M3g8FRPZuV4bWWvGiOKwGTfYaWuT4v2bCzIjfuUaFNlfjgj1k3gO79gkECKjPdYjCj +9aMMdLbP7KbmWSE24cJbLJJ0dAupP40n7VTl/sbmDsALmA7Q9wUw7RQqIoo8f/4XPO3 kyNKl6r8QyNQArHPUGvaRbPHlLXLw25/e2xyJzhrCp0KL9Yn7VDE/WUXeKcATORfAMG0 7o8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bp37qtT7; 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 j7-20020a170902da8700b001768b832a41si39846078plx.584.2022.10.24.04.56.13; Mon, 24 Oct 2022 04:56:26 -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=bp37qtT7; 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 S232222AbiJXLz5 (ORCPT + 99 others); Mon, 24 Oct 2022 07:55:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231977AbiJXLxI (ORCPT ); Mon, 24 Oct 2022 07:53:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A84984F664; Mon, 24 Oct 2022 04:45:09 -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 0C84F612A1; Mon, 24 Oct 2022 11:44:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D12DC433D6; Mon, 24 Oct 2022 11:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611849; bh=f3Kl8PSdbHZnVxN8KcE0aLttwySrFMb8eFbb3/cb1cc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bp37qtT7eqIdnHqh2iYMWuO/rNRDXcvPyH+x46vSs5VkZGiS/tVH8cMIGkrGLemiy AKAgChGNQSpckIRZUloHtq9XSeb62WdSolZ1gl2qgQ0fvchApBf7XoLQkcaptES/jL U64zuGlkjDW8xs5cUw/DNDuSWjB0uQ6xkpZtVR9U= 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.9 134/159] wifi: rt2x00: dont run Rt5592 IQ calibration on MT7620 Date: Mon, 24 Oct 2022 13:31:28 +0200 Message-Id: <20221024112954.365662772@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569959990430632?= X-GMAIL-MSGID: =?utf-8?q?1747569959990430632?= 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 9fc6f1615343..079611ff8def 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -3386,7 +3386,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); } rt2800_bbp_read(rt2x00dev, 4, &bbp);