From patchwork Tue Apr 16 17:13:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Radulescu X-Patchwork-Id: 1086435 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=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="G4t3du26"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44kBm30kzxz9s5c for ; Wed, 17 Apr 2019 03:13:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730050AbfDPRNh (ORCPT ); Tue, 16 Apr 2019 13:13:37 -0400 Received: from mail-eopbgr30082.outbound.protection.outlook.com ([40.107.3.82]:60930 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726860AbfDPRNh (ORCPT ); Tue, 16 Apr 2019 13:13:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8lNDvAgWURaz0iMzNPHMseH6YL3z/8grTSD2UjufTKc=; b=G4t3du2688kH9TPkow0uRg2q73pjFTeKLhmOytAqxugBomV5Wtshn+pwBeTj/J6M5z9PQj9/gm8ohMPsyXmKNBTzBclvlFvDvpGOIoUFJaukL6M7PlArfWAWPk8CYwqla6W94G1mR+5o2/vVma8gxgkBqtbNiPWUcrjxB135Cis= Received: from AM0PR04MB4994.eurprd04.prod.outlook.com (20.177.40.15) by AM0PR04MB6081.eurprd04.prod.outlook.com (20.179.35.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.19; Tue, 16 Apr 2019 17:13:29 +0000 Received: from AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::80e9:c360:27b3:30b7]) by AM0PR04MB4994.eurprd04.prod.outlook.com ([fe80::80e9:c360:27b3:30b7%3]) with mapi id 15.20.1792.018; Tue, 16 Apr 2019 17:13:29 +0000 From: Ioana Ciocoi Radulescu To: "netdev@vger.kernel.org" , "davem@davemloft.net" CC: Ioana Ciornei Subject: [PATCH net-next 2/4] dpaa2-eth: Add a couple of macros Thread-Topic: [PATCH net-next 2/4] dpaa2-eth: Add a couple of macros Thread-Index: AQHU9He1jLtF7SV86EipLRUZHCpo8Q== Date: Tue, 16 Apr 2019 17:13:29 +0000 Message-ID: <1555434800-17462-3-git-send-email-ruxandra.radulescu@nxp.com> References: <1555434800-17462-1-git-send-email-ruxandra.radulescu@nxp.com> In-Reply-To: <1555434800-17462-1-git-send-email-ruxandra.radulescu@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR07CA0181.eurprd07.prod.outlook.com (2603:10a6:802:3e::29) To AM0PR04MB4994.eurprd04.prod.outlook.com (2603:10a6:208:c7::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ruxandra.radulescu@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-originating-ip: [212.146.100.6] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5a98c730-0ccd-401d-7dde-08d6c28ed83a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600140)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB6081; x-ms-traffictypediagnostic: AM0PR04MB6081: x-microsoft-antispam-prvs: x-forefront-prvs: 000947967F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(396003)(346002)(136003)(366004)(199004)(189003)(2501003)(52116002)(6486002)(186003)(26005)(5660300002)(66066001)(86362001)(53936002)(11346002)(6506007)(102836004)(386003)(6512007)(99286004)(68736007)(6116002)(76176011)(2616005)(3846002)(106356001)(446003)(105586002)(476003)(8936002)(8676002)(81166006)(71200400001)(71190400001)(486006)(256004)(14454004)(14444005)(25786009)(478600001)(2906002)(6436002)(7736002)(97736004)(316002)(305945005)(50226002)(81156014)(110136005)(36756003)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6081; H:AM0PR04MB4994.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: zX5XNPxHcId/2IIlh8pU4w/O6UE3KbUV/GhClH1PLZnlm/EsZVFYkCJ/Zv0/UT+E6MRTJ3JoPQRv2qKBT39PBFKeCHyE6H+3ZOmVAf5zl9a4QSpFzSfbnLdjNcx+TGTuidYx4RPPJv6TNm+irnLqRCjA5HrfeGOf274tulmOgYANK+LpXf3rABRn7OY6M5qzLpxDGBPMeIyBCgWJ8VTe6+PJt3VkDgDVhRwZUAkZpwXW+sLzeymmOSQEPfrxpyevnlIEJ+j/uXfyso0XW0RelKA1X9mNnXciBroQrkfidYyFwF7eyqrQXpEPuLcRVU/0lfCkAAvg7pc/+A3A2KobgD7UsXu3Ks8CEuxsJsp4AcBFX8+7iebQhuvfoY1KyqvZqvMhcxa9ry18iFFCSxu5kJIhE171zXtQsdloyWdvKGU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a98c730-0ccd-401d-7dde-08d6c28ed83a X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Apr 2019 17:13:29.2373 (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-Transport-CrossTenantHeadersStamped: AM0PR04MB6081 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add two macros to simplify reading DPNI options. Signed-off-by: Ioana Radulescu --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 3 +-- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 1cbef6c..b04ad06 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -2810,8 +2810,7 @@ static int dpaa2_eth_set_cls(struct dpaa2_eth_priv *priv) return -EOPNOTSUPP; } - if (priv->dpni_attrs.options & DPNI_OPT_NO_FS || - !(priv->dpni_attrs.options & DPNI_OPT_HAS_KEY_MASKING)) { + if (!dpaa2_eth_fs_enabled(priv) || !dpaa2_eth_fs_mask_enabled(priv)) { dev_dbg(dev, "Rx cls disabled in DPNI options\n"); return -EOPNOTSUPP; } diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index a11ebfd..958955c 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -437,6 +437,12 @@ static inline int dpaa2_eth_cmp_dpni_ver(struct dpaa2_eth_priv *priv, (dpaa2_eth_cmp_dpni_ver((priv), DPNI_RX_DIST_KEY_VER_MAJOR, \ DPNI_RX_DIST_KEY_VER_MINOR) < 0) +#define dpaa2_eth_fs_enabled(priv) \ + (!((priv)->dpni_attrs.options & DPNI_OPT_NO_FS)) + +#define dpaa2_eth_fs_mask_enabled(priv) \ + ((priv)->dpni_attrs.options & DPNI_OPT_HAS_KEY_MASKING) + #define dpaa2_eth_fs_count(priv) \ ((priv)->dpni_attrs.fs_entries)