From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 446571AA1E6; Wed, 20 Nov 2024 12:59:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732107577; cv=none; b=nY0o1+Kv5j1BK69ZAdx5DktSCJGbaQXs90W1agXcI5bibFEq6I9uZzh4AygmV3ny2Xfl8WtfyOsLG12fQTmSkmvPmy9g3+ePxjFMWL2dsXqBqgtvI27Rf5haMZ8ET074d4a8q75lLjEtkg1t6PKE2/FzJVkFvKM1runQ1Bpr/bk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732107577; c=relaxed/simple; bh=iwtrMIB16FUEqaD9mGel1Q4TKyi/CAKyW036pQy5sho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=I8mvNQJGwoF7m5hxgkS4Ntr7YmTRGRpRPlFs2EJfR31WriBrjnKJQFCzAHvcW8SUTj/coIMXha+F/AX3Hh7PpLQk9lBFRA/SUpLjeEGc5IAUkh9u7RRnRtGhsYTJz7eWT9NtDs5+GHhP1WrwqhclSISG+8poP5isempyjzZBTMI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gerqy+dA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gerqy+dA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12CC2C4CECD; Wed, 20 Nov 2024 12:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1732107577; bh=iwtrMIB16FUEqaD9mGel1Q4TKyi/CAKyW036pQy5sho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gerqy+dAYrHuYE8rXWjwKjzuT4Qd6TGamkogdVqPZEI3H9ytbgIeat6oKHpZq0XLx Dji+BMWxZO4YODbeNIXcG8WuQd8zqdfQcsppFkfdxQeRXYR/TvpwzafpcrkP4dZnHx yKI5541ulIzqhs5lVlKlpVUN1MoEaTk6V7z+mg+c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "=?UTF-8?q?N=C3=ADcolas=20F . =20R . =20A . =20Prado?=" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 18/82] net: stmmac: dwmac-mediatek: Fix inverted handling of mediatek,mac-wol Date: Wed, 20 Nov 2024 13:56:28 +0100 Message-ID: <20241120125630.023536437@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241120125629.623666563@linuxfoundation.org> References: <20241120125629.623666563@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nícolas F. R. A. Prado [ Upstream commit a03b18a71c128846360cc81ac6fdb0e7d41597b4 ] The mediatek,mac-wol property is being handled backwards to what is described in the binding: it currently enables PHY WOL when the property is present and vice versa. Invert the driver logic so it matches the binding description. Fixes: fd1d62d80ebc ("net: stmmac: replace the use_phy_wol field with a flag") Signed-off-by: Nícolas F. R. A. Prado Link: https://patch.msgid.link/20241109-mediatek-mac-wol-noninverted-v2-1-0e264e213878@collabora.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c index cd796ec04132d..634ea6b33ea3c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c @@ -589,9 +589,9 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, plat->mac_interface = priv_plat->phy_mode; if (priv_plat->mac_wol) - plat->flags |= STMMAC_FLAG_USE_PHY_WOL; - else plat->flags &= ~STMMAC_FLAG_USE_PHY_WOL; + else + plat->flags |= STMMAC_FLAG_USE_PHY_WOL; plat->riwt_off = 1; plat->maxmtu = ETH_DATA_LEN; plat->host_dma_width = priv_plat->variant->dma_bit_mask; -- 2.43.0