Message ID | 20190108164732.4024-2-idosch@mellanox.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) 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="F7xAhB33"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Yyqs0dzKz9sLw for <patchwork-incoming-netdev@ozlabs.org>; Wed, 9 Jan 2019 03:48:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728987AbfAHQsI (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Tue, 8 Jan 2019 11:48:08 -0500 Received: from mail-eopbgr50086.outbound.protection.outlook.com ([40.107.5.86]:21248 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728238AbfAHQsH (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 8 Jan 2019 11:48:07 -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=Q07T2MPTOSO8bL/ue+c4sxDxMt7HSf1orVJOOliereg=; b=F7xAhB33OwMipvCo4MRh54viJhWkAhunJ+KnhtLrFwS4NWa8yGqT0zIMcWeyZKD+0+b7REnLuhKnS67VJjxvu7Xda+h+KQEts79Z90RVrQx3PfdS/61eh0z4Md1OfnSxP3xMfFrpRxR/YOmI5Aa8iQuxkScPF82kJMvIcqrOv3A= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB4405.eurprd05.prod.outlook.com (52.135.163.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Tue, 8 Jan 2019 16:48:03 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.010; Tue, 8 Jan 2019 16:48:03 +0000 From: Ido Schimmel <idosch@mellanox.com> To: "netdev@vger.kernel.org" <netdev@vger.kernel.org> CC: "davem@davemloft.net" <davem@davemloft.net>, Jiri Pirko <jiri@mellanox.com>, Petr Machata <petrm@mellanox.com>, Nir Dotan <nird@mellanox.com>, mlxsw <mlxsw@mellanox.com>, Ido Schimmel <idosch@mellanox.com> Subject: [PATCH net 01/11] mlxsw: spectrum_acl: Add cleanup after C-TCAM update error condition Thread-Topic: [PATCH net 01/11] mlxsw: spectrum_acl: Add cleanup after C-TCAM update error condition Thread-Index: AQHUp3HskAnPeDvgx0C/v0BOcfxj4A== Date: Tue, 8 Jan 2019 16:48:03 +0000 Message-ID: <20190108164732.4024-2-idosch@mellanox.com> References: <20190108164732.4024-1-idosch@mellanox.com> In-Reply-To: <20190108164732.4024-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P192CA0024.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::37) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) 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; AM6PR05MB4405; 6:tATmo/z6ajDBfyBU3+evKWsmqBURfOUf/Hk3Ja2Mx5HZuovz9d5CG0T/PIfAddJqPmKikUs2flc0znwckEQ5Fb4bRB2R3kMf+E5n7QvI/PRHEyUH/G1DjNYwT4nL3QVd+rzmlvNozfqMa3+kS48FPXgeW8gj/nOalIgTBuQBOQtfzAPurdffedTUDB6A2pSwghtYlY6A+QeVb6nsfJqETnOn/gMvUhEhAmL9beRN9NUyB0aIoNir5egAOtub8TRFwCvKRQHOdhYCoX69bXYj+PfBV6Vlee8GE175sXnCim6EhkSuEogWJlMptIMOkoSXJIWV/hHhu2plKHWj9wHnR2ECSzfAb90kqYr4Q/th6m3333dcTICwS2fRBPcKo9MRCqdJV85AZvI9Ei3BxjN45nRbguDKkAzivett/m8ai7GXlMY2lWJ4pfv7lchfT1gItgwl5GVNMQGphBpNUrp0QA==; 5:S7jeydmrh9igATZ89CcG5D5aqbpRIYDHnTj1KJylsFF+WxCJQqc+VvoxPL3/hDk0Bvl7o7+PQMlHmoacPWLxhklwGi1hGp14ga1iqGNkVa+f0GQGx1XmqyueEnOAm3eYR9rANSfoEegIGTm2I2H69/Bl+Oarc5J871qvlyaEVQR1Qqovcgr6pPj6fRcAb2Mt4HoF03XymD4h/fd4bIrMZw==; 7:BGvJgFXwzSu13DlE0kGZVN0f+cwsUiET8sxqS60V5FK7oba4kbCE8wHDKMn3GuS7si+0h7epWzyQMJazjzJTr/2TqBe7NGZcSbuk49w7N0d0NTHOPn6399ACQHBQuIOZ3jSNXnJ1CaSkFkgcwlXrZA== x-ms-office365-filtering-correlation-id: 6e32d529-6ea9-4675-d4ef-08d675890e5d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4405; x-ms-traffictypediagnostic: AM6PR05MB4405: x-microsoft-antispam-prvs: <AM6PR05MB4405AD346E33A2B9234BCB73BF8A0@AM6PR05MB4405.eurprd05.prod.outlook.com> x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231475)(944501520)(52105112)(6055026)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM6PR05MB4405; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4405; x-forefront-prvs: 0911D5CE78 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(39860400002)(396003)(366004)(189003)(199004)(106356001)(105586002)(2906002)(6486002)(6116002)(3846002)(99286004)(6506007)(305945005)(486006)(7736002)(102836004)(386003)(76176011)(86362001)(52116002)(26005)(66066001)(5640700003)(6436002)(186003)(97736004)(2501003)(6512007)(2351001)(25786009)(1076003)(478600001)(81156014)(8936002)(36756003)(81166006)(68736007)(4326008)(50226002)(5660300001)(14444005)(575784001)(256004)(1730700003)(107886003)(8676002)(6916009)(53936002)(54906003)(316002)(11346002)(14454004)(2616005)(71200400001)(71190400001)(476003)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4405; H:AM6PR05MB6056.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: RraCXQVBmmOurAXovV0R5Pt2uxrvOe7KLe/6l7LD96wlqVV2YODg4LHJp2XHxMXOpsJcYV78x5jxBHZIAYjy/xAyOebTaYvtzs1SEUAk4uQQ4CNSuSf2ynK+yEhMd7z+hAQwMmXhXhz0m1cw6ypdqc0VQBzDBuui592cSyz1GjFIwPLxLtXZW2gzZFBoApTCFBcjvERmrqZbFiRl00CYTm38JpuIzjaGwswQJRlUo55jFStZhaulz+mNCqf5GR3qyQ6z7EstQTwGfuCn2kwrGTZoSONIBq7BRrP8axJLSnJWIZ3CGq6ZqGwas26/grH3 spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e32d529-6ea9-4675-d4ef-08d675890e5d X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2019 16:48:02.5959 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4405 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
mlxsw: Various fixes
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c index b0f2d8e8ded0..ac222833a5cf 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c @@ -72,7 +72,15 @@ mlxsw_sp_acl_ctcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp, act_set = mlxsw_afa_block_first_set(rulei->act_block); mlxsw_reg_ptce2_flex_action_set_memcpy_to(ptce2_pl, act_set); - return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl); + err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl); + if (err) + goto err_ptce2_write; + + return 0; + +err_ptce2_write: + cregion->ops->entry_remove(cregion, centry); + return err; } static void