From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 825A1C43381 for ; Fri, 22 Feb 2019 13:58:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44CAA2075A for ; Fri, 22 Feb 2019 13:58:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="DwSyqFzM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727097AbfBVN6E (ORCPT ); Fri, 22 Feb 2019 08:58:04 -0500 Received: from mail-eopbgr150071.outbound.protection.outlook.com ([40.107.15.71]:17186 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726380AbfBVN6D (ORCPT ); Fri, 22 Feb 2019 08:58:03 -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=5mHh98cjegiBd9KyA6YkiDavwl6mC2yJAKxcgjBIAJE=; b=DwSyqFzMGAAowHzKwC88m1JmBQ4jnK+diRDTf/wyfUCiJ4dFfx0Gn1UCsscdmwtxQazckJoWFfwAOUfn6OrZzGnLryO8M/UTgIue03K4j8By+KcpdW8HluNP6TDbfJ9Fv6b7HZSBzNb/jK6yM/FQlJPuhjvUKkix5CsMJc2xgoY= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB4358.eurprd05.prod.outlook.com (52.135.162.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.19; Fri, 22 Feb 2019 13:56:44 +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.1643.014; Fri, 22 Feb 2019 13:56:44 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Shalom Toledo , mlxsw , Ido Schimmel Subject: [PATCH net-next 08/10] mlxsw: reg: Add new port type-speed fields for PTYS register Thread-Topic: [PATCH net-next 08/10] mlxsw: reg: Add new port type-speed fields for PTYS register Thread-Index: AQHUyrZxHqATgwGh2kme2SnRdLskpA== Date: Fri, 22 Feb 2019 13:56:44 +0000 Message-ID: <20190222135613.27692-9-idosch@mellanox.com> References: <20190222135613.27692-1-idosch@mellanox.com> In-Reply-To: <20190222135613.27692-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR10CA0017.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::30) 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: [79.176.7.115] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 71ec1572-fb98-42c2-9d4c-08d698cd93f9 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)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB4358; x-ms-traffictypediagnostic: AM6PR05MB4358: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB4358;23:aSYZkQBUbW+1QfXxKKcV0DxsVRDG5gBVE8qCdlX?= =?iso-8859-1?Q?bTGbub+OPb9EHLjj/IxKzfdMjIjTDgH0bFLOK4CJjs4+uWobKil1xTTLcY?= =?iso-8859-1?Q?y4EITdJcQhCxzrQH7ut86kQsNjkZelKKaHEElPKIvNXWpITcI8VhwzkLrT?= =?iso-8859-1?Q?TdYPKLTUJsmhIAOYNbOQ5foy5KUtAWNMySD6QsbA+b3Y2jZVz4kcaVCW4V?= =?iso-8859-1?Q?Z9FDxQZoWEzKUGdGFgccqrl0cyyv3dbZWUk1EUoprlyTZ+bV2DZOQBBRZN?= =?iso-8859-1?Q?8w4ZK81RpUG+2TXVv+VzAWtFoBUo7te4jGkZxcNbB+9nrHHAGZYtQ9Icw0?= =?iso-8859-1?Q?dZhFCZulWiaXrnhShKe7jtp0GV1/bVcZUl/BDhllbD3VqgY5cyC1eMKJUJ?= =?iso-8859-1?Q?oFGRyy5LASplCbGvrYo6cVNt+hhFIVpzGtotjIZ+WN0hAen79tgtWb/xpv?= =?iso-8859-1?Q?0FI0FBSSl+ZiXt7LDj9RpZyR2+xI82oDUJo85mb12zU9UfyOnl/qfYnQtF?= =?iso-8859-1?Q?JKoXIvEdJJTFD3cF1GaX1a6QqriS0mLmLd7v1TNHOBm62wPFhOAtMjnL/U?= =?iso-8859-1?Q?qYFRtHE0Rxr+cZ27Vk7DnysnHLJ9w6No3hLOPzZo868bDJGAx/+/hwqW1l?= =?iso-8859-1?Q?kiR9cYNPv9f7X/K0Pq70bEcf6Mo4x8+dh0rFDvaxpZE9IkRdlWDOEGS/4w?= =?iso-8859-1?Q?P/iX3c0IvRnhBvf2Xh5JpXVThuXUqJS9m3QwBa/PTzA2AC/Ml/YnSeAv61?= =?iso-8859-1?Q?VrUOlq2juiLrnLw06Osz+NtxMhobyqN5hgmFiv9D3TccbZbue3Cn09wBlL?= =?iso-8859-1?Q?O2cO1gAVt5RDrMJsszrfiRxC1tnnm8w95jbquoIJLK2xLaowx9zWmKA9iu?= =?iso-8859-1?Q?QKy+19Lzn0rnef6VAD1cLOlGkTWbr3RnMSlhtJCcO9dlPgiw1eEjuVh9lV?= =?iso-8859-1?Q?zQd+AwqP4GDW9y1se8qMRPuxv4i9DAYOCKuiBwlWqE8RzXKiPwVFU50oiE?= =?iso-8859-1?Q?Y9SPQBXz4h0Ot8pm4QvZMjWmOtIu7SQEY2Ua8YWgqBLbDpg8UNHZz0yRXu?= =?iso-8859-1?Q?Sp84HvOxgVFtt10pnqDl7994KdweL4wt6WMBdEomcwOv4GSroWxB194WXU?= =?iso-8859-1?Q?UpdDH4goDNjnNmOHil0gGlu31ywzvkBhZyW2inHN1rlEf8wryb+okG3C0F?= =?iso-8859-1?Q?FxXgDF3mcfrnqeBH34Q94Lg3SIM2RHaCXvfDnvzx3NB0W9tidA8mEkOuB7?= =?iso-8859-1?Q?MlL8O+4LBdUJL6Vf7GDUbb+vrq5BhKIBJik+7ZSb2m4XQ+n2V17kotsgAk?= =?iso-8859-1?Q?AA0fzcq9go4GAiJRc3KnH55jkmBeAU+zXM7A8rVoc/jiDapKzYWJeYTCE7?= =?iso-8859-1?Q?gKUjSxDFQWrxisVwZ7DcvmcOZNlr0?= x-microsoft-antispam-prvs: x-forefront-prvs: 09565527D6 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(346002)(136003)(376002)(396003)(189003)(199004)(81166006)(99286004)(3846002)(66066001)(50226002)(81156014)(11346002)(1730700003)(68736007)(2351001)(26005)(478600001)(8676002)(25786009)(6116002)(14454004)(97736004)(6916009)(6512007)(316002)(8936002)(6486002)(256004)(14444005)(5640700003)(54906003)(6436002)(105586002)(6506007)(186003)(106356001)(386003)(7736002)(5660300002)(76176011)(1076003)(52116002)(476003)(107886003)(86362001)(2906002)(53936002)(71190400001)(2501003)(4326008)(486006)(102836004)(36756003)(446003)(71200400001)(305945005)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB4358;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: MiaFxEjVcV1OYKnzBF8tnysU5Ig/wHdCOQ5heYwUtaQKHmKfqZsUNpRNaUokv3cIEkc6egvzancHF7GVTYDb85QLo7IufuqznriaeN2QA796Vfwy1/4JLMBhTYTOgWVkOsju/+HZKVORfzP/rItor78B3kY9+3zdeA66OGr8qACzojYcrcm2M5f3bi6ZdRCtLWLWVXvxbmoLYCItnncNf1Jvv7KJnkagC7Ix2TDxVdnhCE+2SzyVexzgu0bWRdsZfyG8Uft57wALpEvDjBNCMaH04a9dalIaQ/EADkZ71Xzpo6SyI1B8xyz+WI85C1GQJ12FYRdlv9lQOCsCKS/iNNxD5T9VwWKD3fNjme7wwhW0/FDyHJJnIZU4SFniNMx1knPS8E5a0y5Y0AWK28o2ldnEWIsoj6GwoGe9EIlzNQ0= 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: 71ec1572-fb98-42c2-9d4c-08d698cd93f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2019 13:56:43.1296 (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: AM6PR05MB4358 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shalom Toledo PTYS register introduces a new layout for port type-speed fields. These fields extend the existing ones in order to handle more types and speeds. For example, the new 200Gbps speed. Signed-off-by: Shalom Toledo Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 57 +++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethern= et/mellanox/mlxsw/reg.h index a174ff2f8a8d..eb4c5e8964cd 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -3971,6 +3971,25 @@ enum { */ MLXSW_ITEM32(reg, ptys, an_status, 0x04, 28, 4); =20 +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_SGMII_100M BIT(0) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_1000BASE_X_SGMII BIT(1) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_2_5GBASE_X_2_5GMII BIT(2) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_5GBASE_R BIT(3) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_XFI_XAUI_1_10G BIT(4) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_XLAUI_4_XLPPI_4_40G BIT(5) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_25GAUI_1_25GBASE_CR_KR BIT(6) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_50GAUI_2_LAUI_2_50GBASE_CR2_KR2 BIT(7= ) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_50GAUI_1_LAUI_1_50GBASE_CR_KR BIT(8) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_CAUI_4_100GBASE_CR4_KR4 BIT(9) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_100GAUI_2_100GBASE_CR2_KR2 BIT(10) +#define MLXSW_REG_PTYS_EXT_ETH_SPEED_200GAUI_4_200GBASE_CR4_KR4 BIT(12) + +/* reg_ptys_ext_eth_proto_cap + * Extended Ethernet port supported speeds and protocols. + * Access: RO + */ +MLXSW_ITEM32(reg, ptys, ext_eth_proto_cap, 0x08, 0, 32); + #define MLXSW_REG_PTYS_ETH_SPEED_SGMII BIT(0) #define MLXSW_REG_PTYS_ETH_SPEED_1000BASE_KX BIT(1) #define MLXSW_REG_PTYS_ETH_SPEED_10GBASE_CX4 BIT(2) @@ -4025,6 +4044,12 @@ MLXSW_ITEM32(reg, ptys, ib_link_width_cap, 0x10, 16,= 16); */ MLXSW_ITEM32(reg, ptys, ib_proto_cap, 0x10, 0, 16); =20 +/* reg_ptys_ext_eth_proto_admin + * Extended speed and protocol to set port to. + * Access: RW + */ +MLXSW_ITEM32(reg, ptys, ext_eth_proto_admin, 0x14, 0, 32); + /* reg_ptys_eth_proto_admin * Speed and protocol to set port to. * Access: RW @@ -4043,6 +4068,12 @@ MLXSW_ITEM32(reg, ptys, ib_link_width_admin, 0x1C, 1= 6, 16); */ MLXSW_ITEM32(reg, ptys, ib_proto_admin, 0x1C, 0, 16); =20 +/* reg_ptys_ext_eth_proto_oper + * The extended current speed and protocol configured for the port. + * Access: RO + */ +MLXSW_ITEM32(reg, ptys, ext_eth_proto_oper, 0x20, 0, 32); + /* reg_ptys_eth_proto_oper * The current speed and protocol configured for the port. * Access: RO @@ -4089,6 +4120,16 @@ static inline void mlxsw_reg_ptys_eth_pack(char *pay= load, u8 local_port, mlxsw_reg_ptys_an_disable_admin_set(payload, !autoneg); } =20 +static inline void mlxsw_reg_ptys_ext_eth_pack(char *payload, u8 local_por= t, + u32 proto_admin, bool autoneg) +{ + MLXSW_REG_ZERO(ptys, payload); + mlxsw_reg_ptys_local_port_set(payload, local_port); + mlxsw_reg_ptys_proto_mask_set(payload, MLXSW_REG_PTYS_PROTO_MASK_ETH); + mlxsw_reg_ptys_ext_eth_proto_admin_set(payload, proto_admin); + mlxsw_reg_ptys_an_disable_admin_set(payload, !autoneg); +} + static inline void mlxsw_reg_ptys_eth_unpack(char *payload, u32 *p_eth_proto_cap, u32 *p_eth_proto_admin, @@ -4105,6 +4146,22 @@ static inline void mlxsw_reg_ptys_eth_unpack(char *p= ayload, mlxsw_reg_ptys_eth_proto_oper_get(payload); } =20 +static inline void mlxsw_reg_ptys_ext_eth_unpack(char *payload, + u32 *p_eth_proto_cap, + u32 *p_eth_proto_admin, + u32 *p_eth_proto_oper) +{ + if (p_eth_proto_cap) + *p_eth_proto_cap =3D + mlxsw_reg_ptys_ext_eth_proto_cap_get(payload); + if (p_eth_proto_admin) + *p_eth_proto_admin =3D + mlxsw_reg_ptys_ext_eth_proto_admin_get(payload); + if (p_eth_proto_oper) + *p_eth_proto_oper =3D + mlxsw_reg_ptys_ext_eth_proto_oper_get(payload); +} + static inline void mlxsw_reg_ptys_ib_pack(char *payload, u8 local_port, u16 proto_admin, u16 link_width) { --=20 2.20.1