From patchwork Fri Sep 28 11:38:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10619781 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84F033CF1 for ; Fri, 28 Sep 2018 11:39:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75D902B252 for ; Fri, 28 Sep 2018 11:39:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ABDB2B2C2; Fri, 28 Sep 2018 11:39:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E5C72B2BD for ; Fri, 28 Sep 2018 11:39:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729509AbeI1SCl (ORCPT ); Fri, 28 Sep 2018 14:02:41 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40817 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729479AbeI1SCk (ORCPT ); Fri, 28 Sep 2018 14:02:40 -0400 Received: by mail-wm1-f67.google.com with SMTP id o2-v6so1849317wmh.5 for ; Fri, 28 Sep 2018 04:39:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UPi+Ozi5hq3DT/rpyIQpoXgcGDcvVQraZYfmRsgnS7Q=; b=mWuehR5RgX2jhKYA4n21MH/bfDE1pqkyUUxIKyWSYCFpQmhDrOW569qwKl5QvfsJYe E4O9iPhCBxp/gfQUky8VqGUSM6nP8tONNJmCstbyNf1jCf0F7weLXxntzPKDspxMOHaZ kLcxwm8IWSXkZ+06nEZNcJ5NTvchW52dAAtFmGwbC88gSB8dVYAnzU9B8zoTCHoXpOnc +NtrzWVGx0r8AmNECs8m4lkKafPIpp5VhBSOLfDee0xshMmqO5hLs2L/LbbjuKS+VFBy EaNQv8AlwMePeW7MNm7gpilUb7urnv8ytC2UKMnX8HxibxrpSCYQV6VAJ0QIxYwXCcf5 fclA== X-Gm-Message-State: ABuFfojUR+ZnI3j8esDBXa5C9HvX6q79AgVzNjMGtkyaoid72eqAKZO7 ApNnYZxTLMpY+A2OrsY4XxkjeA== X-Google-Smtp-Source: ACcGV62D0fOgtlTcRp84XFzBqkcbVN5um1gQDsJ/Mes1A/0Kl/2VWDgOFu6KYBJvv2eYHPb3FLqoDQ== X-Received: by 2002:a1c:9141:: with SMTP id t62-v6mr1403473wmd.69.1538134757319; Fri, 28 Sep 2018 04:39:17 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id s10-v6sm2395655wmd.22.2018.09.28.04.39.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Sep 2018 04:39:16 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Cc: sgruszka@redhat.com, linux-wireless@vger.kernel.org Subject: [PATCH v3 01/24] mt76x0: use mt76_poll in mt76x0_set_wlan_state Date: Fri, 28 Sep 2018 13:38:44 +0200 Message-Id: <995c4f1662edc0fe8f3fc1ed7901de3d59916a05.1538134522.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use mt76_poll utility routine in mt76x0_set_wlan_state to check if the PLL/XTAL is ready Signed-off-by: Lorenzo Bianconi --- .../net/wireless/mediatek/mt76/mt76x0/init.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c index 3a88be267daf..5e3ec1bef144 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c @@ -43,7 +43,7 @@ static void mt76x0_vht_cap_mask(struct ieee80211_supported_band *sband) static void mt76x0_set_wlan_state(struct mt76x0_dev *dev, u32 val, bool enable) { - int i; + u32 mask = MT_CMB_CTRL_XTAL_RDY | MT_CMB_CTRL_PLL_LD; /* Note: we don't turn off WLAN_CLK because that makes the device * not respond properly on the probe path. @@ -60,24 +60,12 @@ mt76x0_set_wlan_state(struct mt76x0_dev *dev, u32 val, bool enable) mt76_wr(dev, MT_WLAN_FUN_CTRL, val); udelay(20); - if (!enable) - return; - - for (i = 200; i; i--) { - val = mt76_rr(dev, MT_CMB_CTRL); - - if (val & MT_CMB_CTRL_XTAL_RDY && val & MT_CMB_CTRL_PLL_LD) - break; - - udelay(20); - } - /* Note: vendor driver tries to disable/enable wlan here and retry * but the code which does it is so buggy it must have never * triggered, so don't bother. */ - if (!i) - dev_err(dev->mt76.dev, "Error: PLL and XTAL check failed!\n"); + if (enable && !mt76_poll(dev, MT_CMB_CTRL, mask, mask, 2000)) + dev_err(dev->mt76.dev, "PLL and XTAL check failed\n"); } void mt76x0_chip_onoff(struct mt76x0_dev *dev, bool enable, bool reset)