Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1559664pxb; Mon, 8 Mar 2021 00:03:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJ0rzJd+0VGFZ4BapmqVH6o3Ne7lYPomj/QrD71nwyzg8KCoHuXzfK+VqRbC8g8y4bKJzN X-Received: by 2002:a17:906:b004:: with SMTP id v4mr14195193ejy.340.1615190589524; Mon, 08 Mar 2021 00:03:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615190589; cv=none; d=google.com; s=arc-20160816; b=JlYGNijriEFc1kOk7cTcIsvpJBLQoly1fpFPLc1kcGaOCcA6Yn6i1Ru5SRqawaesVg 29YswZTpsdrDe3G3570iX4jxQ02GDhkmaxWhpFT/6psBh/+2G5eXFpKPOKWWNAhIw27i mEm4G2s/cM3WUqYEmgA8x+C9b+8VghiBFaVfvZPaQbQPdwIS9n1DQacEGKcxgLHiURck rSscqcJQHtf8/a4UQWAmiQzFhGyXPZOM9E+sQCchSY1hhtvzL6Pe5NyryOGlHcl6wfqQ wvA/jklvKIphaFJh/3sGihfhXAlxy+l3rtPTp2RYNWuDH/y/33V01IBntPza1ztyvSzM YZsg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TW6TVAlaTgdJQZwcbX+TBEAKKIRCLbzuCOMEB2v32sw=; b=JUG67ttk7o6VFCHxxn0IjIFt8xe36SU0n1scq14Y4h9hXFZ8Y0tCW7h39dw6yBoSmh SUN51I1aPqjWNzcbqt4a/8SGCiGtfbx+3/nc8B3x2R1snj2wcY/Eue4c25XOhVV9+M5t cQIyC3jXbpb+Q04ail9oLZ8dUSH+CrmlsnD4G0O272CYQWVpc6zBAz7nSYBioZA3xmAA HSSzPt2tFV+MpmsnQufNXzWNVLPlF7QpGAOjBm9Ixu6hmylu1l63tCkNTLhFecbjDUxe EQfJ4sDw4Rmkg4NCEI2nmNMwTAJqFfcoRoFoVH8h58NBdJ7izUe+rRcfDw/M9/8ZZnX1 +txg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oYfDADlZ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id os24si6812781ejb.729.2021.03.08.00.02.47; Mon, 08 Mar 2021 00:03:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oYfDADlZ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231252AbhCGSVM (ORCPT + 99 others); Sun, 7 Mar 2021 13:21:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:35600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231159AbhCGSVK (ORCPT ); Sun, 7 Mar 2021 13:21:10 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 868F965186; Sun, 7 Mar 2021 18:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615141270; bh=V+fOmAhqFRXLpQza7Zgx/IdpztHQYZeeV4NgnO/k47U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oYfDADlZfdEgjf7dQ2Xv4zPYvmyGoqMU5GBv+YMqqiUe+/veyOLQkxuM2WA/4NtHp iVzMWSHdA4YsqhqGjOs06pvRfJuf4iihV4XDmhWZVQQ48RqbqO6GFj0czmalvhO/SK FBJ/y/GtL+EJDp0IuLj+d2WXFWxeJhrBzmiw+fjBm1KEqPxQS6nSCC/TOlEO7QwfKR 5W7R6G79G4cmvalORl0LtgM+5zyCtGbkYJ2ZJ2BebebWOKquCFeoynspH3oaQ8tr4j kNzKjZvzHIeBFOacuKPN2KRu8byIFjNuYYgIDp8eLqSyFaHKYp/IHnkHo9QFvei147 V59iZ1GFhc88g== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, sean.wang@mediatek.com Subject: [PATCH 3/7] mt76: mt7921: introduce mt7921_run_firmware utility routine. Date: Sun, 7 Mar 2021 19:20:47 +0100 Message-Id: <9a7bb378c10d7a7ef8379d3256967207be901853.1615140875.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This is a preliminary patch to introduce chip reset for mt7921 devices. Co-developed-by: Sean Wang Signed-off-by: Sean Wang Signed-off-by: Lorenzo Bianconi --- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 32 +++++++++++-------- .../wireless/mediatek/mt76/mt7921/mt7921.h | 1 + 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index 1c686e4abd80..cbe35c76189e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -928,6 +928,24 @@ int mt7921_mcu_fw_log_2_host(struct mt7921_dev *dev, u8 ctrl) sizeof(data), false); } +int mt7921_run_firmware(struct mt7921_dev *dev) +{ + int err; + + err = mt7921_driver_own(dev); + if (err) + return err; + + err = mt7921_load_firmware(dev); + if (err) + return err; + + set_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state); + mt7921_mcu_fw_log_2_host(dev, 1); + + return 0; +} + int mt7921_mcu_init(struct mt7921_dev *dev) { static const struct mt76_mcu_ops mt7921_mcu_ops = { @@ -936,22 +954,10 @@ int mt7921_mcu_init(struct mt7921_dev *dev) .mcu_parse_response = mt7921_mcu_parse_response, .mcu_restart = mt7921_mcu_restart, }; - int ret; dev->mt76.mcu_ops = &mt7921_mcu_ops; - ret = mt7921_driver_own(dev); - if (ret) - return ret; - - ret = mt7921_load_firmware(dev); - if (ret) - return ret; - - set_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state); - mt7921_mcu_fw_log_2_host(dev, 1); - - return 0; + return mt7921_run_firmware(dev); } void mt7921_mcu_exit(struct mt7921_dev *dev) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index 2979d06ee0ad..72dc2ba8fd40 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -220,6 +220,7 @@ void mt7921_eeprom_init_sku(struct mt7921_dev *dev); int mt7921_dma_init(struct mt7921_dev *dev); void mt7921_dma_prefetch(struct mt7921_dev *dev); void mt7921_dma_cleanup(struct mt7921_dev *dev); +int mt7921_run_firmware(struct mt7921_dev *dev); int mt7921_mcu_init(struct mt7921_dev *dev); int mt7921_mcu_add_bss_info(struct mt7921_phy *phy, struct ieee80211_vif *vif, int enable); -- 2.29.2