Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH net 0/2] Fix PTP received on wrong port with bridged SJA1105 DSA
Date:   Mon, 26 Jun 2023 18:51:10 +0300
Message-Id: <20230626155112.3155993-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H6hSEWRVMdtYdhNR+hr+qTQk6wm7ZDpQF2gEr90l39O+Pzrehclyw9/2kri8?=
 =?us-ascii?Q?yenWmIVJXoFmQ2klxxg4UwG34f/TefX9QE6jEkvHVxgU+U2pWoVqcY3PlUFm?=
 =?us-ascii?Q?xy2K+0YxLrL550I2hXV/6O1Mc4QiZqmhKF8lzlQuv1JWIz+pcnBwK+wOJcsd?=
 =?us-ascii?Q?to23yGGKGpVSCOEkvbaAOGgJs+ANWUkEg1MmAWWhCUP/hm/biVIWLmPa20ZR?=
 =?us-ascii?Q?BkX6boONxC+hlL+g0FcUDHWGw0jKCjq2uklHR6Z3oS9EvxuAV/FzaIGUKCcq?=
 =?us-ascii?Q?cBUK6b4tiZ1/AuEZ6K4rfjC4oeuG7jnTb6tYmxnOpPRI5d6tZxQBsIMmtLsU?=
 =?us-ascii?Q?EUtyn97rEGpD6G5aS2bSceTx8QHUGVOP//IAyTomPscKyIOW+Gvkn+TnxeyQ?=
 =?us-ascii?Q?9xn8yE4F7f+agFzc+YcH2msQf6S+uIuYYOJBwyYBFyW30dfTRx94BhWyhHyp?=
 =?us-ascii?Q?7jlPMGozdWJZCzyBRmQBU0OAK3TfTJHkn6/L3WY8tNrdiuSToxLgipMivrZ2?=
 =?us-ascii?Q?T1zqRjbUlgjgYjqIysRn49wqXaHU4kfO4Yn6ao0O9lhgFh7c9+GMR72Lwi0y?=
 =?us-ascii?Q?vQTrjADSiyeWzJJfxhBF/SXOvmHsBbUIt2whJ3LNdMTyKDUyABKG0gLG8bTw?=
 =?us-ascii?Q?W3Cf1QXrgxKgrh/8BXuddtFP48B+cXPfia9TshVJ1nLiu9QddYcBY2FxQNAR?=
 =?us-ascii?Q?7c4JvHPIpQjUWEn0DzEWQWc38+C5md999Kdttl+yaBVUxWa7W+FNgTf9MgbI?=
 =?us-ascii?Q?btkkxLI0G2PSIncQqtkHB1/A/pbMl63uUB8zs7snl2E84Glki/ssXLDCjy1V?=
 =?us-ascii?Q?I6PQfsVJ/x4I9c9QIQNKLJrvzg9EW6XbConRYjJR2MhZkE5/0rQ1Sh3ov6l4?=
 =?us-ascii?Q?LdB1PqgI9ER0EEJTm6mfgad5nGRk/7f7KVLRhZbpsRUgmEPM3awJgZpfsGlr?=
 =?us-ascii?Q?xWWJkoWxeBFinN0x3au9e0KSRQGciqOKMt6QpvXf+PQ27AAzY7h/yTMUuvwe?=
 =?us-ascii?Q?T8iOi8W5LM/GtjCjdrWxmzhUN33Ux2tkGsTXMhdIytwCLUe9UGtq1HmZfTTv?=
 =?us-ascii?Q?2e42+HsquSkVl62WXvpqlTzFKO+aNQmkgUU5XzqfByK5A2/7GdpIicUqWSYc?=
 =?us-ascii?Q?TITIyFxktM6BgRtkiKTAG5oLqU8kvPsoeCO9z9ZIMrGH/fOZpzxZT8sOocTU?=
 =?us-ascii?Q?p+h3tiSmERAUxBIY8e83hiMIKIzoxFnV6Kgi+nZuuiDmHQzZ5A7xihtOBEty?=
 =?us-ascii?Q?fVR7aWdCiTTYUXBNnb7KwDr6Z/Ns0tjk5SZiTTbiD4JHZqXP7jYOadCItdKS?=
 =?us-ascii?Q?l6i+Llh6r/wcgMG999TeB8xWKAxuE2AJUjRRnXOFerOkhs50GxSi8KiUg5Jy?=
 =?us-ascii?Q?nyhbBdkbnfzo7qKxykSBjK4nn06UMQOxZG3ufd2AlplbcfzU54GDl3fjTxNd?=
 =?us-ascii?Q?dKfPPP+daDWDBg9rcrhyd2/5K2ryfhd9ljDGBj8DQlX6GREdYanAYoaHr8cE?=
 =?us-ascii?Q?UVxFFMybHyOLPWMVWLR1ZmON0idSFajlLnrXG0KcJnPZE6xETwnVI+EKIB12?=
 =?us-ascii?Q?a8fuYm/p7GfDzK2N6ntU8MgelSiF3unD5U+eMsHvN9RTEcr94bdI8Zkm7BTK?=
 =?us-ascii?Q?ug=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c5629bdf-cefd-4d94-49c3-08db765d515a
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2023 15:52:17.3962
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mfxXKdFge37Vr3hHBOryNsFr8iRXZgu+MekrYlDboxGhJuf1jDt+jhXGo8i7R79r2jK3osC6nhiSJNaNQNTNSg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB9522
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since the changes were made to tag_8021q to support imprecise RX for
bridged ports, the tag_sja1105 driver still prefers the source port
information deduced from the VLAN headers for link-local traffic, even
though the switch can theoretically do better and report the precise
source port.

The problem is that the tagger doesn't know when to trust one source of
information over another, because the INCL_SRCPT option (to "tag" link
local frames) is sometimes enabled and sometimes it isn't.

The first patch makes the switch provide the hardware tag for link local
traffic under all circumstances, and the second patch makes the tagger
always use that hardware tag as primary source of information for link
local packets.

Vladimir Oltean (2):
  net: dsa: sja1105: always enable the INCL_SRCPT option
  net: dsa: tag_sja1105: always prefer source port information from
    INCL_SRCPT

 drivers/net/dsa/sja1105/sja1105_main.c |  9 ++-----
 net/dsa/tag_sja1105.c                  | 35 ++++++++++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

-- 
2.34.1