From patchwork Mon Sep 21 22:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1368652 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=HUaoY2wD; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BwKZc1gLfz9sTC for ; Tue, 22 Sep 2020 08:57:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728712AbgIUW5L (ORCPT ); Mon, 21 Sep 2020 18:57:11 -0400 Received: from mail-eopbgr70085.outbound.protection.outlook.com ([40.107.7.85]:20979 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728692AbgIUW5K (ORCPT ); Mon, 21 Sep 2020 18:57:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GfoQD+60fagr7vpUWrXcy2eAaOqh1DCdT4xEahB2lkcjXJuD0xpZYjm5tyJ8yO+4/2hStk2yBSZOAlALBxpz2dc4R5ZZ0xhPRzshnprfhDQdO+Q58YiKzkNt4otvp1bn6JhPaTxI7P6oLxJJq75eRB8N7W5CKrEXEx+O1HwPmezDKvrj0V5dXZhgANzXkrppfg/Z4B9+ehdgg1MzKzj21W/a6+whCma0SUSqePWuspHcb8Gc9g/3AWgI9WMzubnS9FyS4vJww8ohIkGuPX1XdjOz364hXeIzzYQh1cgSrfUnRPo/a7RGq85qqNGIfCEbCqUB1S/V4G70jrrayZAXjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gogENdhR17acp27l5UML+BzCiiBTk22zCOkp4UL8hKY=; b=Yr3unvIYhoVk7azxhHNxAW7zLeldBEf7VMpkYfutU7i88ZRT0UHMHltH0KAeAz/rCKwv3c1dBDQSC95DevNDS4IV+i6cwhRfcL+lhhvnJsXKBiJ769WXVGjqyxsPWvtUQy+bDEomDmG3Aco8QklvYjZwsA7Ych/bVOxfSl67tLzjTvgui6RK9we5sfjdSA0Ab4idMEj6f03qmePgR+8eGWRHOACTVw54Zp2zloHco/0KcksiJaoiIWIP5CA+ivq5DMqd1pDPzZ3e497ZW/YVxigGM1G01ikXB5uHTbUCoyyc26hehzdNJnrmcXqehNIxfE3gQZu2aZoIw7J/ZkYlvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gogENdhR17acp27l5UML+BzCiiBTk22zCOkp4UL8hKY=; b=HUaoY2wD+0LTtnvbcwX5ryFFzNLDOTFdTtH5UbNstv9cszFh00mJ56zVPbKeXSeYZfwDFMoc0OnX/PnB5pVkexHTHB9zxugUTWV8DM1ILSmp0Ew1NZG1pcHPYgjUpXOmdHfuRzhXxSLsKx3OKJRHxMgjsMDErmOZetbXmHC84fs= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) by VI1PR04MB5343.eurprd04.prod.outlook.com (2603:10a6:803:48::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.14; Mon, 21 Sep 2020 22:57:00 +0000 Received: from VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d]) by VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d%3]) with mapi id 15.20.3391.025; Mon, 21 Sep 2020 22:57:00 +0000 From: Vladimir Oltean To: davem@davemloft.net, netdev@vger.kernel.org Cc: yangbo.lu@nxp.com, xiaoliang.yang_1@nxp.com, UNGLinuxDriver@microchip.com, claudiu.manoil@nxp.com, alexandre.belloni@bootlin.com, andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, kuba@kernel.org Subject: [PATCH net 1/3] net: dsa: felix: fix some key offsets for IP4_TCP_UDP VCAP IS2 entries Date: Tue, 22 Sep 2020 01:56:36 +0300 Message-Id: <20200921225638.114962-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921225638.114962-1-vladimir.oltean@nxp.com> References: <20200921225638.114962-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) To VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.217.212) by VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.11 via Frontend Transport; Mon, 21 Sep 2020 22:56:59 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [188.25.217.212] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 704fa14d-572c-4b53-7a03-08d85e81a584 X-MS-TrafficTypeDiagnostic: VI1PR04MB5343: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 02QVC4yH1rf4ns57Cjm3c3AJK8Lo0X82HnXPvDeLcsjikfPNE4x1Is6bq7cWzBeM+B0jDIC7+5NX8fspnkma+/nBx2hmwaZaN1UKz8oJ5NuY9bVpkQdTwpPCVPJr5Xo416rfAA+95OSt5FxqRok16KldkZcXAMW12cS3sLWnTqr0WtEiTVz0TPfTQP9XVuCl+f1kBLADsHelJSYKnPiPhfHacTUj+XcAa5aegVS/eeg8z4W26vlEm3ff4FY3V3MsopV5EqHkaLK3Ppkm24dlGr6WCxgO/s+sUtdbpe8iiw/jyAhmFTaJxSaLZ3aOvgwOxNOGhle6+dnY5wvQ2/1gbR5jvdkB9QCLRL6y6wachvhuYJbO+8/4TiiShA8/bEbeoqJJ96l3tugRQ7InkEjWO8u31ySywFyvTb7c4qc9HzUYmxWA6a+RigHkQ7uLwiXg X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5696.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(39850400004)(396003)(136003)(346002)(366004)(6506007)(316002)(52116002)(6666004)(86362001)(6512007)(6486002)(2906002)(69590400008)(66556008)(8936002)(66946007)(66476007)(83380400001)(1076003)(44832011)(186003)(26005)(5660300002)(4326008)(2616005)(478600001)(36756003)(8676002)(16526019)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PakAIF4qSTQy4xRjWsTpCR7877pl3ehUvlRvkmrS0D54MjmnoPYCOipXFDP89QZ6VvjGNf3mGAuE4EoNMTtTNuCkBrjB1GFbh+rA00m4ktSnZLcs94gZ9xPM4VB7jcKVVqGj2oFPYufH+G+ax4SKMn0PjoHVONXtsaJ0IrrZrr99yX+ZsXtM1Qz/gvVQbJyykYyN3bgOqRZ9+vfg8r4m9js8C+ctNnJHJrC8zh4Lw4tkWBWhZBWxVv8OTJRFp10tD2qdNu/A6jLHC+GJRo3puWgQqa1pNiBt33WuDc8tsxokvmR2lktsSMlt1p8wRYycOejCj3zBVZCNBehTUG/eCWTsz/YPFDXoN5jGKVAU7vqhh5GwmKvQHaIkgtp3Ly2rNEuSeXlrAfHPTy0fMXvWzh3G499Ny18Uw8mdNUJk1IYxLdukak34Hwz5TP0G4U9VoqQW/yGkeOWnptv7ccIlXuG68+jW6zxz9FVlkCwL4agPX/rrqPQ1wUc8MMlZqY2q5p0b7AeVaKExHL9/h4nVOyChsygNNus8+QEiL/ZVZMQZO8QBfYXWPRbYGWENJfSdjUsnDqN6NB6rkpcYnTdGdUUQHakqnpzJROM9B02ZVGXoe9sbKt3nmSggNu3x4E5Uu6MoigmGcMB9WxG6D4gqfw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 704fa14d-572c-4b53-7a03-08d85e81a584 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5696.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2020 22:56:59.5918 (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: SN2Thsa+oNnANnglDQk059gwJVAoigQhfjMrJIU6CkhK9emfN4JtEeCweeQ2yeB8qhSlZtxtJ9K4FCT65Lp8aA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5343 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xiaoliang Yang Some of the IS2 IP4_TCP_UDP keys are not correct, like L4_DPORT, L4_SPORT and other L4 keys. This prevents offloaded tc-flower rules from matching on src_port and dst_port for TCP and UDP packets. Signed-off-by: Xiaoliang Yang Signed-off-by: Vladimir Oltean --- drivers/net/dsa/ocelot/felix_vsc9959.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c index e1df0b85cc86..6690c2fff5eb 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -646,17 +646,17 @@ static struct vcap_field vsc9959_vcap_is2_keys[] = { [VCAP_IS2_HK_DIP_EQ_SIP] = {118, 1}, /* IP4_TCP_UDP (TYPE=100) */ [VCAP_IS2_HK_TCP] = {119, 1}, - [VCAP_IS2_HK_L4_SPORT] = {120, 16}, - [VCAP_IS2_HK_L4_DPORT] = {136, 16}, + [VCAP_IS2_HK_L4_DPORT] = {120, 16}, + [VCAP_IS2_HK_L4_SPORT] = {136, 16}, [VCAP_IS2_HK_L4_RNG] = {152, 8}, [VCAP_IS2_HK_L4_SPORT_EQ_DPORT] = {160, 1}, [VCAP_IS2_HK_L4_SEQUENCE_EQ0] = {161, 1}, - [VCAP_IS2_HK_L4_URG] = {162, 1}, - [VCAP_IS2_HK_L4_ACK] = {163, 1}, - [VCAP_IS2_HK_L4_PSH] = {164, 1}, - [VCAP_IS2_HK_L4_RST] = {165, 1}, - [VCAP_IS2_HK_L4_SYN] = {166, 1}, - [VCAP_IS2_HK_L4_FIN] = {167, 1}, + [VCAP_IS2_HK_L4_FIN] = {162, 1}, + [VCAP_IS2_HK_L4_SYN] = {163, 1}, + [VCAP_IS2_HK_L4_RST] = {164, 1}, + [VCAP_IS2_HK_L4_PSH] = {165, 1}, + [VCAP_IS2_HK_L4_ACK] = {166, 1}, + [VCAP_IS2_HK_L4_URG] = {167, 1}, [VCAP_IS2_HK_L4_1588_DOM] = {168, 8}, [VCAP_IS2_HK_L4_1588_VER] = {176, 4}, /* IP4_OTHER (TYPE=101) */ From patchwork Mon Sep 21 22:56:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1368650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=Yv0RGPZz; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BwKZV1T2Sz9sTC for ; Tue, 22 Sep 2020 08:57:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728691AbgIUW5E (ORCPT ); Mon, 21 Sep 2020 18:57:04 -0400 Received: from mail-eopbgr70085.outbound.protection.outlook.com ([40.107.7.85]:20979 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726913AbgIUW5E (ORCPT ); Mon, 21 Sep 2020 18:57:04 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TJSBi8GqSkAwIz44pg0oaLzWWyTYI8Gla3C7q5PVC9Z+0dInq/cOS8vXbF2nj1vEeRQL/LgZRzXZLrAeDOGHtX4hlnFsX/Umy5v7seHUTx3HwhDnuaDgqaxEb+SuGl3t0ZHUDaqlAWjEpruGTYudxkKYGKeJLM3AUaEwcT4oTJ3w3mFWyMAbv6fTNJcGJF6x00RHdPGQMdUlhq2knPvR8c9D3JbGnBv6HNjDP/jA9mPP9183ZTiiy7utqk72q01rBSWhLft4S1J95/icks+Cz31RdfBUaHDtQliS7lLufjyaT1dIBO7rul0sHUWHHkhQfAOF0NsH2VdQu4U7REjsIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MoBZdArA7I3u9j6TcPGyht/e/9WAMUSsRy7Qq7gDqeQ=; b=FnTgz0bVhrvshAK5fsADrwjwJjBeYU2U4AUWWSRjnMGHpspJalg1Tfdh9xI4BEwPytznrGDERMAfsp4SSox8S2U5LkRdF5edadq/AEerbHbulKkbBZdgRoH7U3jw7kC+b7wpUbEGWFS2Ch/G4+YOgBTXq2t0DfpCpntozSqkaX3jfKSMyiZtY7nuRuWYzdhHX+sOgl4YMUmbhXFhqSGGC2+xugLOpAN6uBGx+I+39ahtUukd0PCjBgKfGw4LJPPCTGUz9elnJ5K5qOi7LFbpYKBCmIKFxeSUL4V4ayqjFBW783lNx9U0frB3263kkZewnkT0HQue6S4Nr7abuSxT7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MoBZdArA7I3u9j6TcPGyht/e/9WAMUSsRy7Qq7gDqeQ=; b=Yv0RGPZzQVN7ob2SnrAa5XqkPFG/RIvTido225ApfmQ2qsX1Lftle24rmfEQ1h18vbbvMul8MDAryQES38dAlNafxs3TZ4YKQ7/arkGLDL5AnKyWBJjc5SUN9kZ3HRxAAk2L3g3JtPaveFrGFzoJPqJuQ+lJ4cuMiO5lZP5a/fs= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) by VI1PR04MB5343.eurprd04.prod.outlook.com (2603:10a6:803:48::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.14; Mon, 21 Sep 2020 22:57:00 +0000 Received: from VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d]) by VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d%3]) with mapi id 15.20.3391.025; Mon, 21 Sep 2020 22:57:00 +0000 From: Vladimir Oltean To: davem@davemloft.net, netdev@vger.kernel.org Cc: yangbo.lu@nxp.com, xiaoliang.yang_1@nxp.com, UNGLinuxDriver@microchip.com, claudiu.manoil@nxp.com, alexandre.belloni@bootlin.com, andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, kuba@kernel.org Subject: [PATCH net 2/3] net: dsa: seville: fix some key offsets for IP4_TCP_UDP VCAP IS2 entries Date: Tue, 22 Sep 2020 01:56:37 +0300 Message-Id: <20200921225638.114962-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921225638.114962-1-vladimir.oltean@nxp.com> References: <20200921225638.114962-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) To VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.217.212) by VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.11 via Frontend Transport; Mon, 21 Sep 2020 22:56:59 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [188.25.217.212] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: dedfcb20-5fc6-4021-ec25-08d85e81a5ee X-MS-TrafficTypeDiagnostic: VI1PR04MB5343: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1148; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qnNE0fnkiHg7qRDuPxrBM6Ce5XxXvR1oO8e0qBcwf5GAUZn+75KapDK0bjrz6GBKqLyvCqGNXMaHPQJNN7aaGNdNRIWX0hVsIb3xdEiOh3r6REV+sWqIlLhsRuPVHxv8GiHdNod6H3WXUgFRm9R25zHh/kdY5N+UwqfxyrvBQuco+MHKyQAc8u1GGvp0F9qddeFnTPFjPFeSnvYUcEvnDzaXBJOxj3TwQwchPiWan4f1Zcqybc7tI+YZSD0Wa9kKvG2oCUxGWsngWZ4GdRBdhEPVb+u9n+HM+tOUu4KNri+owxq/+TBD1kuPYwlQsA61saatbDaAObu8v/ZJUH4NX3hH3sjGl3sykTF4yMr+MGiSdfGSo2lmYW1ee3mfzqIecyzWPEO4XIVNedGBXbvYcKBKgQ1dRbW8VAfffD2ok50= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5696.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(39850400004)(396003)(136003)(346002)(366004)(6506007)(316002)(52116002)(6666004)(86362001)(6512007)(6486002)(2906002)(69590400008)(66556008)(8936002)(66946007)(66476007)(83380400001)(1076003)(44832011)(186003)(26005)(5660300002)(4326008)(2616005)(478600001)(36756003)(8676002)(16526019)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PKwP/3SKQiI3AdQZRcEYVgwpp2Dq5+8N13Z7DIAoHda4oLWsO9FcU0HoTqAXnDAThU8T0/z4poZXXydedlW9E92T0SQt/s6ZsNBbMuWh92K5JPars/hyY4B2gtT9OHFkazc3OsScGXhE5vAX+152eTts0sICXkeLhGP/jl6k9nBSZ82FFL2uBrlQgD3/XsjWn/AhaX4Wpa+aGwnNNuFrxZEApl6TiUvbnN6biEbRqQ0eB8ewlPuRYmopkbwmfTgSbQ7CWXGwMBRgQVx7Ti0HdZPvRnj0UZe1tYtqMRNsApktESvd4vrLStlU53ZLUB+83L79W04fS/9fLrnYz5COGt2DxVvowU0XaGZjlofhXFeStvm/4yJ9gzN2erHXUjAzbncFG+sYzv8c/u76hvU5m4GOw/bu9V3nLf8SvT7v+McO7lrK8Q0qSIV2X55Psy0hDa1DmPGWmt13p6LVi5fFIz6c6DEITv0Q9NionVZclGCD/Vp98XN1JhqSEtq5FXNFq7Gn2xt10Q03OcTLC99U3WbG0xLsotM/gpYgPyp6FQgoLNVF1biUDyW2xIY2hUK4Y9VCFYh2J2Jwq+MwtzrOOoyIKT2dRt/wvTxcPFkI8eZ5dSIwSelq+Rk+E+4S1dYeyfJSCFFoJFMOsenJDnoYbw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dedfcb20-5fc6-4021-ec25-08d85e81a5ee X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5696.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2020 22:57:00.3224 (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: CrKkWU5YvqcnphZ0wUjIoYLdB+F2+Be+vOAYS9no0xasa28yxgoVNudWsK0Z8T1yTiKLYXxsHlzEOODy1uYhtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5343 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since these were copied from the Felix VCAP IS2 code, and only the offsets were adjusted, the order of the bit fields is still wrong. Fix it. Signed-off-by: Vladimir Oltean --- drivers/net/dsa/ocelot/seville_vsc9953.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c index 57baa42b515c..c3f4ed8daa3f 100644 --- a/drivers/net/dsa/ocelot/seville_vsc9953.c +++ b/drivers/net/dsa/ocelot/seville_vsc9953.c @@ -649,17 +649,17 @@ static struct vcap_field vsc9953_vcap_is2_keys[] = { [VCAP_IS2_HK_DIP_EQ_SIP] = {122, 1}, /* IP4_TCP_UDP (TYPE=100) */ [VCAP_IS2_HK_TCP] = {123, 1}, - [VCAP_IS2_HK_L4_SPORT] = {124, 16}, - [VCAP_IS2_HK_L4_DPORT] = {140, 16}, + [VCAP_IS2_HK_L4_DPORT] = {124, 16}, + [VCAP_IS2_HK_L4_SPORT] = {140, 16}, [VCAP_IS2_HK_L4_RNG] = {156, 8}, [VCAP_IS2_HK_L4_SPORT_EQ_DPORT] = {164, 1}, [VCAP_IS2_HK_L4_SEQUENCE_EQ0] = {165, 1}, - [VCAP_IS2_HK_L4_URG] = {166, 1}, - [VCAP_IS2_HK_L4_ACK] = {167, 1}, - [VCAP_IS2_HK_L4_PSH] = {168, 1}, - [VCAP_IS2_HK_L4_RST] = {169, 1}, - [VCAP_IS2_HK_L4_SYN] = {170, 1}, - [VCAP_IS2_HK_L4_FIN] = {171, 1}, + [VCAP_IS2_HK_L4_FIN] = {166, 1}, + [VCAP_IS2_HK_L4_SYN] = {167, 1}, + [VCAP_IS2_HK_L4_RST] = {168, 1}, + [VCAP_IS2_HK_L4_PSH] = {169, 1}, + [VCAP_IS2_HK_L4_ACK] = {170, 1}, + [VCAP_IS2_HK_L4_URG] = {171, 1}, /* IP4_OTHER (TYPE=101) */ [VCAP_IS2_HK_IP4_L3_PROTO] = {123, 8}, [VCAP_IS2_HK_L3_PAYLOAD] = {131, 56}, From patchwork Mon Sep 21 22:56:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1368653 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=iMX6dIO8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BwKZk4741z9sTH for ; Tue, 22 Sep 2020 08:57:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728734AbgIUW5O (ORCPT ); Mon, 21 Sep 2020 18:57:14 -0400 Received: from mail-eopbgr70085.outbound.protection.outlook.com ([40.107.7.85]:20979 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728708AbgIUW5O (ORCPT ); Mon, 21 Sep 2020 18:57:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=abnpyZ67rM08Qdj5IWZpZT8562BYspSD3UPTMLuEA/0p3CM/wYq9Nrn8D/PHdodbgZshYbYQ65gPUTP2h8r24LhIo7dJ08IY9cRRMKEUQQsNKMacY4xFtbFYpwy0N18kTGFO0rip7Yq3Np+vgCTAyegEZ8u7eUzfc0A2Fxd1k7eXEQktJ3d/dEUJaL8rKZ9JY0cqk6/8PPgUIaUF9Trgd7VSSkpKnH155Wl2BO7+Dkwl9oznt0DH4H8uqvfZLXB6CiF7KQqgJC5Urt1kia4UAHXObSDgIVh54U+XGF7iOMHbZG4BwTKZlBBUNl7gnmxXw2b3qNYQ6MG6e5vcRMPCjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UoOax/UqpjKzDgeSyGwIL/7PZ78IKHWd50YCZbCLLbo=; b=OBLbmiYMbhn/Q9Amq6u8NqgfSAZOX+2pMxBAuvtWJqVtwmtzLyhwwMD8GdakCRePtBwmx6dgohNLJ5W76Rc4oWZus3dm8D44hrEIsHFuyBhWTKat2wVaKMb0NLQTk8RcfkblcjUOGSfj6CbxBgAfHAM8tPSAkVP/iBAexhyqZLIBEe1RC0D/0lSHrMTa+tBGNfQ4Ha6RxGCNU0zC0rhJ3St0J/ojlShyN3GSupr6lbSZKGRno8cB91dEYxNmWJgmN6RRB2XhvUbeB91MHTV2aWmf3QO5TRgAJAEU1xY5HxYTtuP/42bTTg6xPci8J3NpVKaIxYlcQISrxxyrnAgWUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UoOax/UqpjKzDgeSyGwIL/7PZ78IKHWd50YCZbCLLbo=; b=iMX6dIO86HyyxH+yZF5zWSb5+z/gai4ynmmaBe/qxHdSa2jtAnLbDYjE/akusWaME/jAh1xnfi44mJleOlHWSLkr7raParu6PX5YylMuNI0LdM7ifOn+UK5JBvEnEc26MjwPtDVzlTZnOyVQDcMLbwK37856tR1nRRrGxpIX23k= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) by VI1PR04MB5343.eurprd04.prod.outlook.com (2603:10a6:803:48::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.14; Mon, 21 Sep 2020 22:57:01 +0000 Received: from VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d]) by VI1PR04MB5696.eurprd04.prod.outlook.com ([fe80::983b:73a7:cc93:e63d%3]) with mapi id 15.20.3391.025; Mon, 21 Sep 2020 22:57:01 +0000 From: Vladimir Oltean To: davem@davemloft.net, netdev@vger.kernel.org Cc: yangbo.lu@nxp.com, xiaoliang.yang_1@nxp.com, UNGLinuxDriver@microchip.com, claudiu.manoil@nxp.com, alexandre.belloni@bootlin.com, andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, kuba@kernel.org Subject: [PATCH net 3/3] net: mscc: ocelot: fix some key offsets for IP4_TCP_UDP VCAP IS2 entries Date: Tue, 22 Sep 2020 01:56:38 +0300 Message-Id: <20200921225638.114962-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921225638.114962-1-vladimir.oltean@nxp.com> References: <20200921225638.114962-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) To VI1PR04MB5696.eurprd04.prod.outlook.com (2603:10a6:803:e7::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (188.25.217.212) by VI1PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:800:a9::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.11 via Frontend Transport; Mon, 21 Sep 2020 22:57:00 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [188.25.217.212] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6d853255-27bc-4ddf-e88f-08d85e81a661 X-MS-TrafficTypeDiagnostic: VI1PR04MB5343: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tX7kVMwSvYRbFUzEe7DlLYyfuvydPfh1XQSi/Jb3z+dcCrGsSzqzp2r0qMySoGodt0756PYKkEkoB0o3vZZS8/GN5dUGvcCjQDlU8WVmWHPlokWajA1fEgnHlgkfoUN3yIQ0cYUOxgWmw4ccMRcLJvJ3fr/XfDDuIU1uIqRTk7fTOGalqxZNewaQ2Hwjq4YmgqwtoCFZXueNWohYdiFoItrijZ0K+g8sJSueOVAIdwO+1MnfceuDmYnLdchrGkKyKIpER6pdbBjwhcA+8Q7djERr+3DvL1J7DBB+jI09vcmFvSdbqkBDWNruCTDrSPz+ezJL+g5gKQJBMaaYkUnxIPMjWfl9idUa/8X6DMLC5xslVyLa6KqSccsB5lEZstqxoCxLbY4cl5TuKtHYXw5EEcNMucbqYeIZzkjFP9zTpt+h8nRYOCQJIonR0xQlr+G3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5696.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(39850400004)(396003)(136003)(346002)(366004)(6506007)(316002)(52116002)(6666004)(86362001)(6512007)(6486002)(2906002)(69590400008)(66556008)(8936002)(66946007)(66476007)(83380400001)(1076003)(44832011)(186003)(26005)(5660300002)(4326008)(2616005)(478600001)(36756003)(8676002)(16526019)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: mQHCsLYVPjq2kt52zj45y6kSanPmGPexU/n5gZP8ODqVRzqMZ3pHwIHCQfsJFq5mWSnGFpBVJPXlDplaBUoyRuCW9qQ5Zb8lmRfsmUlvot7CWgQ3qH8mT5Se4t5ImTySpTyCv8DoZ4wUmbmnPb+AxdJ1qEQstV8Mqf0BYch+3zqEOMkN3ng3d9BfVGqoQ+KpSVRJka15aQGKHz1ML4rQnS+hHQHKdgOouaAas4SqU3jFfY6m5M4y1rbk4H9A5hdO1pzN+7V+hTZ6EvJyIDSh1LzFN/EMhXn5cogSv84xMlulDKShIusoAMlJV67TlDXAZERSIkaAMy9ySRNWN3HSZr4t5ivJFGXB3zYWksrLHEtLK/6va1UxpfBeYiJiy5i7SwIZ9+TSfmwCDggq/QuQ4QIYBAqODN3JgrtX5Hf6KYcRmG2vWNg7uofpfTCu9cB9rEY5cTim/vrQc47mPC5KfJbkedqXWuxNjKFqspAv2JUeNOiYN+4/dxGO/f/wAR0pU8xb1HrKDzP8vnW5/T71GvQF27RYNrxzSt6Xn9jfKn1g0XhOzraIlYnRIWEGdDH4W1wYMpPGsTeSv3fAo1eZZKRz3IDEOfMe4EIvVi3HnX3gQgd7JSxc16ehYv9LeA/doyCpftCQtxm9YCb8CjbjJQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d853255-27bc-4ddf-e88f-08d85e81a661 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5696.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2020 22:57:01.0240 (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: XmZ/IYZ9agwOy2kiYYlPtV4P314WJ5nHn9fEo1v0gJXHs/AJypHuUjVyhQxv0ABtxeiPzWNgy/DlTaiKEDkh0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5343 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The IS2 IP4_TCP_UDP key offsets do not correspond to the VSC7514 datasheet. Whether they work or not is unknown to me. On VSC9959 and VSC9953, with the same mistake and same discrepancy from the documentation, tc-flower src_port and dst_port rules did not work, so I am assuming the same is true here. Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/mscc/ocelot_vsc7514.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c index 40558578eb75..eac241ee30ba 100644 --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c @@ -807,17 +807,17 @@ static const struct vcap_field vsc7514_vcap_is2_keys[] = { [VCAP_IS2_HK_DIP_EQ_SIP] = {123, 1}, /* IP4_TCP_UDP (TYPE=100) */ [VCAP_IS2_HK_TCP] = {124, 1}, - [VCAP_IS2_HK_L4_SPORT] = {125, 16}, - [VCAP_IS2_HK_L4_DPORT] = {141, 16}, + [VCAP_IS2_HK_L4_DPORT] = {125, 16}, + [VCAP_IS2_HK_L4_SPORT] = {141, 16}, [VCAP_IS2_HK_L4_RNG] = {157, 8}, [VCAP_IS2_HK_L4_SPORT_EQ_DPORT] = {165, 1}, [VCAP_IS2_HK_L4_SEQUENCE_EQ0] = {166, 1}, - [VCAP_IS2_HK_L4_URG] = {167, 1}, - [VCAP_IS2_HK_L4_ACK] = {168, 1}, - [VCAP_IS2_HK_L4_PSH] = {169, 1}, - [VCAP_IS2_HK_L4_RST] = {170, 1}, - [VCAP_IS2_HK_L4_SYN] = {171, 1}, - [VCAP_IS2_HK_L4_FIN] = {172, 1}, + [VCAP_IS2_HK_L4_FIN] = {167, 1}, + [VCAP_IS2_HK_L4_SYN] = {168, 1}, + [VCAP_IS2_HK_L4_RST] = {169, 1}, + [VCAP_IS2_HK_L4_PSH] = {170, 1}, + [VCAP_IS2_HK_L4_ACK] = {171, 1}, + [VCAP_IS2_HK_L4_URG] = {172, 1}, [VCAP_IS2_HK_L4_1588_DOM] = {173, 8}, [VCAP_IS2_HK_L4_1588_VER] = {181, 4}, /* IP4_OTHER (TYPE=101) */