Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp619836pxy; Wed, 5 May 2021 09:41:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVa0VjOBHIzFYQ28WuDTkN2rQWa0bilgLLnOKaOWCVEec5DUKgqMpRKtVssa94SEYWMkQF X-Received: by 2002:a17:906:a0c6:: with SMTP id bh6mr28334112ejb.359.1620232872311; Wed, 05 May 2021 09:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620232872; cv=none; d=google.com; s=arc-20160816; b=WudUBXuTVmKOT8HjXGzUdB6zNWCDhaVOseaDyOt2kYfp76ytXABAchEyTtA+5OdDD4 tNuZd1IW2RYRxwoYmI4UnHaHL/ltRO/mX2TkMWrVRHxXc5XH7FhLJgCXwNJ08uNdEY51 WYJukA9dfMKHWxn3oVT7l63vevQznCE6IsFDa8j3ehyAKkgVYHjLAhM3bnAWz+LDD+aa h1UG4x7eln8AoZrfRdSQr0XpVlzLCt6h8Rx89k31hBHX6I/GWQmoFHixV+EA63LMpADC NgIj86CQXZdEqjKGjF0kNPPjALJxeJQDcxP0AEqdmbqNgcJe6EhN9qCfhwfImjLfiI7a kHFw== 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=V5RXpg0w1ToDQZdR/KmdQfAO3+SLFSGvzjllH4a6x9A=; b=IH4PIe6/fR47PQaNKcfxcW4VAIyx6bx3XD5HO/tqyvMz1++J9laSyQt5p3YWniElv9 zeslCOaP30R11jWmwvSWCNTU+PtDHJGyZdoFS/03R9+e/mMbFTdhwtjKpjwEpj6iZUzT ugHEAcPp9+RANptVKxwf3jnprzHlGyPl9ba1JojuOyT/2CPfGRUhyGv6/RNOxHq7Nn4K ZIU5BvGxssLgUGOiAL7PdOR+D8A/qTT7+CpOw9+PfeAhJvGbYJduV7nDxUrYEe65bhbV 8B8U3jOfiquqQJ2I5a57x1G3KaWo6Z18WeuTwDmi3CWtENK4Ev4K6EoPJCBJL0ehzcLc fIog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HHcs2TG1; 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 kl9si5874381ejc.271.2021.05.05.09.40.25; Wed, 05 May 2021 09:41:12 -0700 (PDT) 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=HHcs2TG1; 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 S234893AbhEEQkf (ORCPT + 99 others); Wed, 5 May 2021 12:40:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:38090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234858AbhEEQid (ORCPT ); Wed, 5 May 2021 12:38:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E196061412; Wed, 5 May 2021 16:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232423; bh=WxiO4EXeA5EqQoSx5olH+tfFxfI2Xf4bWODHUl7UKeY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HHcs2TG1XPUtV17b9vYGSigKgsjRSwdQ9OdmwzOrB1HcMkM5c3KrR9lRo7BDuErGV gOP0bGl7nkL07KfOLJxAKILIiM9SonDMHPquwVZnIX7muJtzoZ7g9lrVWw994OOk/I nMyxKfgRBFSyACZrIKzgPkoNJurILC3GDgC7Rb9JS+CxfKZTv0CjqOQzWVOgwxF4T6 A6HCYZ16gsVUK8+h+8VRAovOb8CytRgvVmZVWV2Pb1qQq5DDQ+gp1i74Q8vUR2wSRu MnEOk0+cdqf+ngdSt4VPzmw6V9Qv+288eTUmj8LUgjVaxczXouDvvmfqdgqfh4xNJr mHavanr7uNeiA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 098/116] mt76: mt7615: fix entering driver-own state on mt7663 Date: Wed, 5 May 2021 12:31:06 -0400 Message-Id: <20210505163125.3460440-98-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163125.3460440-1-sashal@kernel.org> References: <20210505163125.3460440-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Felix Fietkau [ Upstream commit 5c7d374444afdeb9dd534a37c4f6c13af032da0c ] Fixes hardware wakeup issues Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 4ecbd5406e2a..198e9025b681 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -291,12 +291,20 @@ static int mt7615_mcu_drv_pmctrl(struct mt7615_dev *dev) u32 addr; int err; - addr = is_mt7663(mdev) ? MT_PCIE_DOORBELL_PUSH : MT_CFG_LPCR_HOST; + if (is_mt7663(mdev)) { + /* Clear firmware own via N9 eint */ + mt76_wr(dev, MT_PCIE_DOORBELL_PUSH, MT_CFG_LPCR_HOST_DRV_OWN); + mt76_poll(dev, MT_CONN_ON_MISC, MT_CFG_LPCR_HOST_FW_OWN, 0, 3000); + + addr = MT_CONN_HIF_ON_LPCTL; + } else { + addr = MT_CFG_LPCR_HOST; + } + mt76_wr(dev, addr, MT_CFG_LPCR_HOST_DRV_OWN); mt7622_trigger_hif_int(dev, true); - addr = is_mt7663(mdev) ? MT_CONN_HIF_ON_LPCTL : MT_CFG_LPCR_HOST; err = !mt76_poll_msec(dev, addr, MT_CFG_LPCR_HOST_FW_OWN, 0, 3000); mt7622_trigger_hif_int(dev, false); -- 2.30.2