From patchwork Thu Feb 7 11:22:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1037985 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="DiMTcoY3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43wGCV0HTFz9s3x for ; Thu, 7 Feb 2019 22:23:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727151AbfBGLXc (ORCPT ); Thu, 7 Feb 2019 06:23:32 -0500 Received: from mail-eopbgr50078.outbound.protection.outlook.com ([40.107.5.78]:63312 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727122AbfBGLXb (ORCPT ); Thu, 7 Feb 2019 06:23:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4qNqAZ8rLFjqB8VTXXPkBKX6wnHbvOMrit2JoT4aRk4=; b=DiMTcoY3v2cacxhs//lczcFtBYb76tLq3f6py+ajAq7529M6GRp/FR3RPB5vgH3vS2J3cXvvRfyzcQElkxpCN3PV0J7KHw/G2+jYIaGpXYJCbW3lXS4t++FJCDUfRW0OfNGqZd0UTCiVUbJvDb+03dJHmaExEOmjnQE+yRcTlYk= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB5624.eurprd05.prod.outlook.com (20.178.86.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Thu, 7 Feb 2019 11:22:53 +0000 Received: from AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866]) by AM6PR05MB5240.eurprd05.prod.outlook.com ([fe80::3542:889c:3a85:3866%5]) with mapi id 15.20.1601.016; Thu, 7 Feb 2019 11:22:53 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 10/14] mlxsw: reg: Add multi field to PAGT register Thread-Topic: [PATCH net-next 10/14] mlxsw: reg: Add multi field to PAGT register Thread-Index: AQHUvtd33Ijc7Q2HKEWJaGPYNoaNXQ== Date: Thu, 7 Feb 2019 11:22:53 +0000 Message-ID: <20190207112211.10375-11-idosch@mellanox.com> References: <20190207112211.10375-1-idosch@mellanox.com> In-Reply-To: <20190207112211.10375-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0032.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:90::45) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5624; 6:iZXs+OqF+fEgPpm1CTwDxKvJttCB1HOluM8PyPQoaC1AeIalbKA+8X8kJ7O0TrtowC3y3wvQL4SYP09KOuDejWEAaY5LpTsnJ//xwbKJT2GY83p6arfVK6KeZBdDlfFwrWI50hB/oTWRX7Q2p1KGqN4ya7tf3E/yTOO85rVqLaXITwKmMe8JwNQ9yOAZ0HZ4thnPC1BXG9F+5dMZqoqHdACDPOfov/Rb7C9SdGeXqWPExY38BGY8aI72cdVluot2SstLnqTQNm0X8DpM79nNPbMXdYCbXtlzbGfc5tIcI6ZNuxc4L8LSEz1Uu8guLkmzq7b5DJsBpaa4i+/xsOLK6XRSc+c5DOwCu9BK+j/uIJjd/0/BTKtiHL222q9SiqqrTGZJ1L+8oLpR+NbfLy1O7vW/JmmFsAkCvQwgwqD7b4z0KChVLj9etHTxRASlPYeiru5KosZRwA5O9YUkBfEqNA==; 5:KHws5Xz7uko03UPJviOSL76NXc6ftv0HeY4l6XuVIHcY6aM3s83z+n4q1yhGYd/uLjJiOXKB43LmCa9p5Luo6WgMU9gG/6+cxSA38fDVb7m5TQ/uISmCYUAsgqK7MPof91dAIKeJXNS6PV4bvzx/PRJ1F+248ECJCP0XXnXftKcWh17kB8Y8pZjvCCVRjpdJEROqBpDA+3CTxVxw14HsyQ==; 7:V6yOnZwXYtWweH2usZkCRNosbvsVkbJQxGcRZoQ4Sr7rmj8JxwM6PwqQBu8cem//M130zLKrAbH8m6xZngUwgif8V/ISK7m9Cu3WSk3sfGhlXZHJAjOPCNGLPbkmw3WgL4cBj7RxCbsOrtY0cxIUcw== x-ms-office365-filtering-correlation-id: ebb5fd33-3627-40a1-e4c4-08d68cee99d3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5624; x-ms-traffictypediagnostic: AM6PR05MB5624: x-microsoft-antispam-prvs: x-forefront-prvs: 0941B96580 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(396003)(136003)(366004)(39860400002)(189003)(199004)(81166006)(81156014)(8676002)(68736007)(8936002)(66066001)(6916009)(105586002)(3846002)(6116002)(71200400001)(71190400001)(6506007)(386003)(1076003)(102836004)(2351001)(478600001)(36756003)(52116002)(2501003)(14454004)(76176011)(106356001)(26005)(1730700003)(50226002)(305945005)(186003)(54906003)(4326008)(2616005)(6512007)(6486002)(7736002)(446003)(53936002)(107886003)(6436002)(256004)(14444005)(99286004)(11346002)(5640700003)(316002)(86362001)(476003)(2906002)(486006)(97736004)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5624; H:AM6PR05MB5240.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: IS4KPwkLPT7mrZnkv4PV0zJddEXaWoMetULW23BTSoshAuY//52Nz4ZbxUujYEsZwV/itTLiybx9OmqK3HAtFDLHoRkVabYSNt8QJlFPLeeoTeMtaCZHQOSbPxVGgbsueypd+86UHcyklwZWlyj2s0xAx6Dromgo8NtSn9kz6+7soBgnOPSP8Mq7M0/+mG5Mih56C1vDpYWofLjrEJmfxp6Z1ly3+llibS5uHCh8pG/2Azvls3STGZU5V/h3rFBFs3q7uEFZi1JveGYiO9nW1GmdDC7w4CGXmbgpidhMFWfjXHuzuBH+5iUZHgUWwIA2k2P8fFhMt1pGaY+qXY4Nt0Ez3ta8xo4DV2ewvADLFdG5jrXcoYqfl/D7kBGSXmp974/jrIucbe4WUhspfAEPYmmhRJCMhngSbkfYmO3T5aU= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebb5fd33-3627-40a1-e4c4-08d68cee99d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2019 11:22:52.5926 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5624 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko For Spectrum-2 this allows parallel lookups in multiple regions. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 11 ++++++++++- .../net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index 5f8066ab7d40..227720ce3982 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -2199,6 +2199,14 @@ MLXSW_ITEM32(reg, pagt, size, 0x00, 0, 8); */ MLXSW_ITEM32(reg, pagt, acl_group_id, 0x08, 0, 16); +/* reg_pagt_multi + * Multi-ACL + * 0 - This ACL is the last ACL in the multi-ACL + * 1 - This ACL is part of a multi-ACL + * Access: RW + */ +MLXSW_ITEM32_INDEXED(reg, pagt, multi, 0x30, 31, 1, 0x04, 0x00, false); + /* reg_pagt_acl_id * ACL identifier * Access: RW @@ -2212,12 +2220,13 @@ static inline void mlxsw_reg_pagt_pack(char *payload, u16 acl_group_id) } static inline void mlxsw_reg_pagt_acl_id_pack(char *payload, int index, - u16 acl_id) + u16 acl_id, bool multi) { u8 size = mlxsw_reg_pagt_size_get(payload); if (index >= size) mlxsw_reg_pagt_size_set(payload, index + 1); + mlxsw_reg_pagt_multi_set(payload, index, multi); mlxsw_reg_pagt_acl_id_set(payload, index, acl_id); } diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 1077c893438b..12d202afa233 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -217,7 +217,7 @@ static int mlxsw_sp_acl_tcam_group_update(struct mlxsw_sp *mlxsw_sp, mlxsw_reg_pagt_pack(pagt_pl, group->id); list_for_each_entry(vregion, &group->vregion_list, list) mlxsw_reg_pagt_acl_id_pack(pagt_pl, acl_index++, - vregion->region->id); + vregion->region->id, false); mlxsw_reg_pagt_size_set(pagt_pl, acl_index); return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pagt), pagt_pl); }