Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp632829pxy; Wed, 5 May 2021 09:57:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPj0TsiNM/xqNwdV+ODZr0pd4G4QxZo7JH3eYAUVhx/zWbNAizNBL07AvFTxfa/zdrfbRr X-Received: by 2002:a05:6402:d05:: with SMTP id eb5mr26161edb.6.1620233850507; Wed, 05 May 2021 09:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620233850; cv=none; d=google.com; s=arc-20160816; b=h5PJ3DC+Dj95Q2HmCWHVUSlGpzRRWuWhXiPCl/yIJLmDklw/1ntuPIQ9wy6YenbEDb 0iFFszKOVLAoq+8LnWnLM7THm5DBPVu14XYL9Q7kvnqAp7Lp+CXHGU+sK9brRAej9pJo iwmLrubY3oWjrzuDuOU0LpL/LP6odzPu4eTIhWKVWNTetcNAKiLxXcGR8pv0VrbtvkK8 PCMHpElz7HMbyxLvD98X8swgLv4VJur5zMwUng/VGkKCp4mSYOzVQszeNIOe3d7eimtT mwcqPnzE5lLouxieHGwZHdRZIR+P2rxOSbpuQ14W8Q106PC34HrOZeApyPjg2UHivEnn Oybg== 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=VQoO3oCApZ3pKKm/W6X/a8FrJWlV1CnhnDGiQRRBacw=; b=0U9Zw+xQ3YhyPH3HwQdna8EQbb8cc8yy5ndMS1bb2+5oARW2eIK14/Os4V7Bmgt1mY WbFYGleT9qUVQun184b6FGMD/uPVcN5ZFbfeM3PawDy0Hl7cK7HxOKYVAnNZsyNiyYKz v1jrKWH+Dz/3H4yBpobA5x8cchPo3gZwXeByWmytGsOirOB2J+p8OEjZW1/K36DCTmkL 7j269B7PG0X3KumiWs1lPWqJOCPrev8czM1s4K0wRSoE3VW+m+aQNbQVFjEquTaKy2hB Ujr//h0y3r81JgOSo6sN4nWDj2hPGUrOdHn7S2uSbrFx9bXSyaEQ57ihWjgsnPUik9Ly 4V7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f8LuGWZ0; 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 z12si14297031edr.265.2021.05.05.09.57.06; Wed, 05 May 2021 09:57:30 -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=f8LuGWZ0; 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 S236581AbhEEQ4w (ORCPT + 99 others); Wed, 5 May 2021 12:56:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:60392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236415AbhEEQyM (ORCPT ); Wed, 5 May 2021 12:54:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6DB8D61461; Wed, 5 May 2021 16:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232710; bh=VWFWm5cUN1jSxsItT/U9HhoMnGvxh07KV69SrLyK5ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8LuGWZ0CFj/j9LrHALciQam79aHAsxzB46F5Zd+SozCbu61OLfawa3NqI4nGC9vc uO/fjc3WFz8z1p/ui/kiXc1LIWmlvdXUkDsAGCHSEFVQTCN9wYZgJw0dLThgsmOFpB HRNIo5MXFVNX8Z+bfkcQc0yRfYpWYBWmI9tvLkJx6358qnA8G+sYmDWG11db2pViYQ 1/GQc/1UkMp9nTwhVGwbmDIiIMkpOXk11UOQ7m55Iofw4vPCe+MiqkLeUex2CP+qkb Lc26wgxXCzxoXUN1FzXA/mzNwBU8i64JP0DxAHgmyds6GrNT+/RlHLKZfJKmSO/ern VpobiP70NR+hg== 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.10 69/85] mt76: mt7615: fix entering driver-own state on mt7663 Date: Wed, 5 May 2021 12:36:32 -0400 Message-Id: <20210505163648.3462507-69-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163648.3462507-1-sashal@kernel.org> References: <20210505163648.3462507-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 c31036f57aef..62a971660da7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -341,12 +341,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