Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp1874771pxb; Sun, 18 Apr 2021 09:46:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEPCJmZhRWOfOWjax5pm8qikC5BOHY/1fpXra8SPlY+6WZ6/BMV/SDe4dI/6MRReUDftaY X-Received: by 2002:a62:878d:0:b029:257:ba2e:b6b2 with SMTP id i135-20020a62878d0000b0290257ba2eb6b2mr15615880pfe.11.1618764396970; Sun, 18 Apr 2021 09:46:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618764396; cv=none; d=google.com; s=arc-20160816; b=oiUy/hJqZ3jRnCWjWzeAh1epZvwvLOkjNkaTiKw1RPzjDW5p3i2lylYU/Odzs67NJM GplH0tV+FwwD3eTmS6y6pI3rQxcvGAjZ0xUVxKlsvv/8My0QvCfIngxqj4bLD5S0O6Tl bQbGoxWISYH1/InbVDKy5UvCzrTL9pKH34KUy8jzX3FQQQ1rZKNLf0qW5ikbmZExOxKf kyJ7k2sgJc53EzkwMm8RJB/ypkFIuZOOXHQXV4+SI2ibZQS7xCmSHCzhHiwtExO/eENr VDIzzXZEVGHohYA1gbcvJJ/jBggWAO/d6kOiMV/6iOtrxtc6J0DzyTQ+KK+AiQYB+Dn+ 77Bw== 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=cGOto74bUJDuPIyyp4GGDceDEEnYpFjspY8S0kP+GD0=; b=bsWlBC7ZytSbMiD2XSJTl/M1n3l9mXIwfND9RzyynvzbIXBwEFt0VoBx4l+HpJw3Yq VpO3/99kWT3uNExA0i2WG6E0fdaNEABW2tL9cdaQEPi7VmOYbvIcmJpYdvzri3a8hgsC F7HHr2PZJCWGhnwVtwaCgb0iMumzWdyKRYroHEi/LjfohT88KecRP4/lBw28BHN82dGu lzuLFI7/gub/icxxrJiavsGiOBEf1K9k+X/IwSbv8UE2l4Xcnsfpuen1XUj1n3jrD+JR nssgqdtlfJXAr0jFrw4L9TV2rzmeToT0R5j7guKzqmhYZc/iazfuaIdubvAdazaIl8Y4 a6mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lPgGC+e2; 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 q13si13719652plk.238.2021.04.18.09.46.24; Sun, 18 Apr 2021 09:46:36 -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=lPgGC+e2; 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 S232200AbhDRQqg (ORCPT + 99 others); Sun, 18 Apr 2021 12:46:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:49814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232095AbhDRQqg (ORCPT ); Sun, 18 Apr 2021 12:46:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EDD0C6135D; Sun, 18 Apr 2021 16:46:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618764367; bh=LCzANB/MXiKU/3fnjO0RYiby0QCBO5lTsoUBIJoPlTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lPgGC+e2GuqFaGjdmMWQeroo/Oq5zK/nGw/eeKUsfV8/9MmY4yfjE9Al3vBXCXj39 ri2Fpi1QqIz9Y/dvlbuXGGaFbQ1Nu8Oz58Pz4lkd97Uo9x6mPmlx7KoVzqh84zZFAm FIaOA+CRLwxcAVvS47vS+2QKGIN2mpwxLGlSUzGLsnodxRa8+smyoqgsRXCqHwNmgC 1chZ8sa+BMiDiDmkekxXt0xsMGbSqA6qxXbvWi9e1gopqGGASDztEZ4W1rYCbskN45 kKZOEBSkITMQKiy9jUrFpfJWB1uBMtbbJ+buq5TGTQBEOxELP5YpR9+DbhLVZ03y5d TtfkDxngyueNg== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, sean.wang@mediatek.com Subject: [PATCH 09/19] mt76: connac: unschedule ps_work in mt76_connac_pm_wake Date: Sun, 18 Apr 2021 18:45:35 +0200 Message-Id: X-Mailer: git-send-email 2.30.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 In order to avoid synchronization issues between wake and ps works, cancel ps_work in mt76_connac_pm_wake routine Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 1 - drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 1 + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 7081bb4a28bd..5890fee98d97 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -345,7 +345,6 @@ static int mt7615_mcu_lp_drv_pmctrl(struct mt7615_dev *dev) clear_bit(MT76_STATE_PM, &mphy->state); out: - dev->pm.last_activity = jiffies; mutex_unlock(&dev->pm.mutex); return err; diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c index c5f5037f5757..32d664ac1e35 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c @@ -13,6 +13,7 @@ int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm) if (!mt76_is_mmio(dev)) return 0; + cancel_delayed_work_sync(&pm->ps_work); if (!test_bit(MT76_STATE_PM, &phy->state)) return 0; diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index ea00f6b6af56..44f02cbf9cc7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1289,7 +1289,6 @@ int mt7921_mcu_drv_pmctrl(struct mt7921_dev *dev) clear_bit(MT76_STATE_PM, &mphy->state); out: - dev->pm.last_activity = jiffies; mutex_unlock(&dev->pm.mutex); if (err) -- 2.30.2