From patchwork Thu Mar 15 17:24:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10285377 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.web.codeaurora.org (Postfix) with ESMTP id 171B660386 for ; Thu, 15 Mar 2018 17:24:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 088C028B05 for ; Thu, 15 Mar 2018 17:24:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFB5028B9B; Thu, 15 Mar 2018 17:24:28 +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=-6.9 required=2.0 tests=BAYES_00,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 894F728B05 for ; Thu, 15 Mar 2018 17:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbeCORY0 (ORCPT ); Thu, 15 Mar 2018 13:24:26 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:55595 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929AbeCORY0 (ORCPT ); Thu, 15 Mar 2018 13:24:26 -0400 Received: by mail-wm0-f65.google.com with SMTP id q83so11987468wme.5 for ; Thu, 15 Mar 2018 10:24:25 -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=1P5rBA2ObY3VaTczfccim60wxEasWaSM6uYme+tfgNY=; b=P8OWHdP2hf2iYCiAQ8KOp/fkbmPdXEG7fpdVa98dtm2fEGdiMYXLBa06yQA9vqTyuh fX3lT5675gmWM5gBtQb2l3J/Wll7QDaSbrWq80Q37s14tkHfQWQsJT1o20tvQCddwe4s OBy2gSHg6TY32Lq2xx0CGBeP+yCH0YK7OZKt0x+AHabvurrSeJV/4kq8rCwy8nmayV6K WPm0Loi8l4jdN87IhU5DJ2T1TBvPWTY675oF0jbfY3GBuoaL+o6g2a/3az5s3BW1RT/A F48s69oMsBOM671cQqFAZDKwX+XQSu2YHjo7Y959Uh8GW4nKL+fL7hapg5xPu8fBYNFw fQQQ== X-Gm-Message-State: AElRT7H9w1z3Mx+5y0cGcCTNXqhnqXUizk04ckNG/RhABbEgB/hSx/DE kSpMuQsfHHHKO2KWEQqaZtyuK1aS3qY= X-Google-Smtp-Source: AG47ELusxf8lXR6E8gBcM55fZAuoG+9I+PMwv6nOz2Uw+4/8PvPvrP2aoYtvuf+PVl2ZDys8N1pZig== X-Received: by 10.28.66.65 with SMTP id p62mr5241091wma.8.1521134664969; Thu, 15 Mar 2018 10:24:24 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id n23sm5809896wra.14.2018.03.15.10.24.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Mar 2018 10:24:24 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org Subject: [PATCH] mt76: use mt76_poll_msec routine in mt76pci_load_firmware() Date: Thu, 15 Mar 2018 18:24:20 +0100 Message-Id: X-Mailer: git-send-email 2.14.3 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_msec() in mt76pci_load_firmware to check if the firmware has been started instead of explicitly poll MCU running register Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c index 15820b11f9db..dfd36d736b06 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c @@ -187,7 +187,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev) { const struct firmware *fw; const struct mt76x2_fw_header *hdr; - int i, len, ret; + int len, ret; __le32 *cur; u32 offset, val; @@ -240,16 +240,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev) /* trigger firmware */ mt76_wr(dev, MT_MCU_INT_LEVEL, 2); - for (i = 200; i > 0; i--) { - val = mt76_rr(dev, MT_MCU_COM_REG0); - - if (val & 1) - break; - - msleep(10); - } - - if (!i) { + if (!mt76_poll_msec(dev, MT_MCU_COM_REG0, 1, 1, 200)) { dev_err(dev->mt76.dev, "Firmware failed to start\n"); release_firmware(fw); return -ETIMEDOUT;