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 38E59D528; Sun, 7 Sep 2025 20:25:31 +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=1757276731; cv=none; b=M2I0Ns9um8l9VT+LXs5su4r+PnLfLpzn1jYF00ocB2d6hQLwHYD+Es4o8IEi6z5UsSV3KfCj7nt2rTo4w+XKJBA0VrUO/qTPn3n6X9AJaQkFxvJkwetLeToAPFI2Ykq3i7fTvgnJC8fABcZUJ5GNL1RyaCmrJSm8wioIGKAyNgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276731; c=relaxed/simple; bh=usjPrkwXl571CUNLSeGJUx5SAWs534OIZqoFirvPxBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r9iUXVDQuX9CF1jjWJ+Y8LC61m9cQHT5H4RANBlMRo3Zv27WuEaq2f2mmduWxbNACR5/sF7UaKgrU8k9etMUuDuDNyD+LoHbT46X6aE+jDHh4V3tnZfNiOVObWeN9grEw3Y811iiIds/hekfZLq0i97n1I4IG3ZM0NoPuIy3u9Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kOSygmEU; 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="kOSygmEU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B206AC4CEF0; Sun, 7 Sep 2025 20:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757276731; bh=usjPrkwXl571CUNLSeGJUx5SAWs534OIZqoFirvPxBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kOSygmEUl2RTxfgXAsha05Wu4hwTawyfmNaaG9ASnIQ8rHkLHlEIEJFpyCvBh800+ LoBCdXOupHzPFq+O8tVwsMXsLdeuBzfQ6TSKrJvK4NhseWd06ytiiomfuqRIjp1w3K nFShO03G9ccB7udU+UArNrPnMMAw+/kzOYrFFm/0= 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 6.6 090/121] net: dsa: microchip: update tag_ksz masks for KSZ9477 family Date: Sun, 7 Sep 2025 21:58:46 +0200 Message-ID: <20250907195612.154459383@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195609.817339617@linuxfoundation.org> References: <20250907195609.817339617@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.6-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 @@ -176,8 +176,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_PRIO GENMASK(8, 7) #define KSZ9477_TAIL_TAG_OVERRIDE BIT(9) #define KSZ9477_TAIL_TAG_LOOKUP BIT(10) @@ -302,7 +303,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 */