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 957BD1B424F; Sun, 7 Sep 2025 20:14:13 +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=1757276053; cv=none; b=nCnZRlVREYB+s1yDiSeDZLi8riBLQPvME4tpi1cGolD+Ytf8u+kZayCLYo1Yb0mPS9K0A/uUrL3NQJBm8hwf0txpM1k3WDUzZMzQgCY0nGGgcyILAwFVI4R/A9tTgH33C48wLUqStgvJQ/YtDVsUexx9Pl6vAflH3OU4SavfNN0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276053; c=relaxed/simple; bh=O6uKuLhSfEVJ4P735Khfb2LQXYKIXQ1FujrFG2VfDNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=omyWoQey/vnfgWRrnTayKNhnppiGyuMiJjTlpQicPkh4oQbZt4QM9GFO5NmoCqIN4MLC2wDkQPhKvhK1TZIznE3zjHwDWnJ00IJauu56SW9vNUMU21k3SGPkbFRIsBzeMNUBBJ5ErIwG6rEz4rC6oG9mmyyVWdj5+a48zZPf8hk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GugPqJhk; 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="GugPqJhk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EB87C4CEF0; Sun, 7 Sep 2025 20:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757276053; bh=O6uKuLhSfEVJ4P735Khfb2LQXYKIXQ1FujrFG2VfDNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GugPqJhkO8CcLC3M3mCUnn1ktReVDZINilg1CJpOMz7//DT/lAP0PBeXftuA1H+xS lWp31Xb8riBguDfOQicZVm47yWT3NR2mH7Ssbup+REm2NbZfftje+2ZN4vkUsmQCla LUyYh9HemTVrt34GcY54IoUbzCjih0YP9gQLNqnE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pieter Van Trappen , Florian Fainelli , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 48/64] net: dsa: microchip: update tag_ksz masks for KSZ9477 family Date: Sun, 7 Sep 2025 21:58:30 +0200 Message-ID: <20250907195604.733986074@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195603.394640159@linuxfoundation.org> References: <20250907195603.394640159@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pieter Van Trappen [ Upstream commit 3f464b193d40e49299dcd087b10cc3b77cbbea68 ] Remove magic number 7 by introducing a GENMASK macro instead. Remove magic number 0x80 by using the BIT macro instead. Signed-off-by: Pieter Van Trappen Reviewed-by: Florian Fainelli Link: https://patch.msgid.link/20240909134301.75448-1-vtpieter@gmail.com Signed-off-by: Jakub Kicinski Stable-dep-of: ba54bce747fa ("net: dsa: microchip: linearize skb for tail-tagging switches") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/dsa/tag_ksz.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -104,8 +104,9 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROT #define KSZ9477_INGRESS_TAG_LEN 2 #define KSZ9477_PTP_TAG_LEN 4 -#define KSZ9477_PTP_TAG_INDICATION 0x80 +#define KSZ9477_PTP_TAG_INDICATION BIT(7) +#define KSZ9477_TAIL_TAG_EG_PORT_M GENMASK(2, 0) #define KSZ9477_TAIL_TAG_OVERRIDE BIT(9) #define KSZ9477_TAIL_TAG_LOOKUP BIT(10) @@ -138,7 +139,7 @@ static struct sk_buff *ksz9477_rcv(struc { /* Tag decoding */ u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN; - unsigned int port = tag[0] & 7; + unsigned int port = tag[0] & KSZ9477_TAIL_TAG_EG_PORT_M; unsigned int len = KSZ_EGRESS_TAG_LEN; /* Extra 4-bytes PTP timestamp */