From patchwork Tue Mar 26 13:46:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1065600 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="k6vtERAW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TC926T5Cz9sSX for ; Wed, 27 Mar 2019 00:46:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731595AbfCZNqp (ORCPT ); Tue, 26 Mar 2019 09:46:45 -0400 Received: from mail-eopbgr30053.outbound.protection.outlook.com ([40.107.3.53]:3586 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731491AbfCZNqo (ORCPT ); Tue, 26 Mar 2019 09:46:44 -0400 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=OMZK63uD+O9YiyMvJQ8NJUWbAbx5M1Ld6h2b4Hd5IKc=; b=k6vtERAWtr0c3nqw1N6FGpk69M17TqR1KzAFZNroVB4G52wOh0bvcf2AfrG3H5PPiev6ApVdftf9WxqiEoa92GAI126i+8RfxdOKYfyliIu7kv1/AjzKw9OBVep62lygKxUeDuE7C9Y++Zr9ce1sASJfeYq6/9laTBMjcDHQ0rM= Received: from AM0PR05MB6100.eurprd05.prod.outlook.com (20.178.119.209) by AM0PR05MB6035.eurprd05.prod.outlook.com (20.178.118.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Tue, 26 Mar 2019 13:46:26 +0000 Received: from AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9]) by AM0PR05MB6100.eurprd05.prod.outlook.com ([fe80::85ee:723:721e:51f9%4]) with mapi id 15.20.1730.019; Tue, 26 Mar 2019 13:46:26 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Shalom Toledo , mlxsw , Ido Schimmel Subject: [PATCH net-next 2/2] mlxsw: core: Add support for devlink info command Thread-Topic: [PATCH net-next 2/2] mlxsw: core: Add support for devlink info command Thread-Index: AQHU49pOtMpWuzM01EOTyE/364bNug== Date: Tue, 26 Mar 2019 13:46:26 +0000 Message-ID: <20190326134535.3826-3-idosch@mellanox.com> References: <20190326134535.3826-1-idosch@mellanox.com> In-Reply-To: <20190326134535.3826-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0357.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::33) To AM0PR05MB6100.eurprd05.prod.outlook.com (2603:10a6:208:12e::17) 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-ms-office365-filtering-correlation-id: 9f0f6109-697b-48fd-384a-08d6b1f17149 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB6035; x-ms-traffictypediagnostic: AM0PR05MB6035: authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-microsoft-antispam-prvs: x-forefront-prvs: 09888BC01D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(366004)(396003)(136003)(346002)(199004)(189003)(53936002)(6512007)(102836004)(6916009)(8676002)(476003)(486006)(446003)(25786009)(105586002)(50226002)(2616005)(36756003)(52116002)(186003)(106356001)(86362001)(6116002)(8936002)(99286004)(2351001)(3846002)(4326008)(76176011)(7736002)(68736007)(11346002)(316002)(2501003)(5660300002)(14454004)(1076003)(107886003)(6506007)(54906003)(478600001)(81166006)(1730700003)(6436002)(6486002)(66066001)(2906002)(71190400001)(256004)(26005)(71200400001)(81156014)(97736004)(386003)(305945005)(5640700003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB6035; H:AM0PR05MB6100.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: /lsjD/TbTKOj3lE031cUXXSExDd9QRpCPT/CZLAXe/DNUXDMN5dVgT6I9QqGp+p/hd4tZm1K2+ri1OztgocPbvy1aVDBNoaPrH0K6Z03EcYIv0Nd4uZRcD/YgwP6NZ47AXTCcVIP8z0ByqMOfoUvalpsK+lPGF4KDhorTcpA2d5lKgHEe3+jKSjli9MgdtXB67jLkzj4trj451G1sKoh9aLwDYN2WrSCpkkb1ycwi32acFIAXKDjtQnkChyseRWIDPkrO1JmYW+z+s85HGeNSCvba4hgxwJHxhhT1A9gnITLfWqwoORk4TFUhTyz7R08Z6dRTc9UpqWx1FghAyaknLaZuZSmqgs7AxJ9hBKV3HvBLEDUSWEorYZ67tuC0fC1ZpIgq5D14apMcBOqwTs21iB0ZKfwZNzY8PAYBTn1WdU= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f0f6109-697b-48fd-384a-08d6b1f17149 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Mar 2019 13:46:26.8324 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB6035 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shalom Toledo Expose the following ASIC information via devlink info command: - Hardware revision - Firmware PSID - Running firmware version Standard output example: $ devlink dev info pci/0000:03:00.0 pci/0000:03:00.0: versions: fixed: hw.revision A0 fw.psid MT_2750110033 running: fw.version 13.1910.622 Pretty JSON example: $ devlink -jp dev info pci/0000:03:00.0 { "info": { "pci/0000:03:00.0": { "versions": { "fixed": { "hw.revision": "A0", "fw.psid": "MT_2750110033" }, "running": { "fw.version": "13.1910.622" } } } } } Signed-off-by: Shalom Toledo Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/core.c | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index e70bb673eeec..61ab3fea2376 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -934,6 +934,41 @@ mlxsw_devlink_sb_occ_tc_port_bind_get(struct devlink_port *devlink_port, pool_type, p_cur, p_max); } +static int +mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, + struct netlink_ext_ack *extack) +{ + struct mlxsw_core *mlxsw_core = devlink_priv(devlink); + char fw_info_psid[MLXSW_REG_MGIR_FW_INFO_PSID_SIZE]; + u32 hw_rev, fw_major, fw_minor, fw_sub_minor; + char mgir_pl[MLXSW_REG_MGIR_LEN]; + char buf[32]; + int err; + + mlxsw_reg_mgir_pack(mgir_pl); + err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mgir), mgir_pl); + if (err) + return err; + mlxsw_reg_mgir_unpack(mgir_pl, &hw_rev, fw_info_psid, &fw_major, + &fw_minor, &fw_sub_minor); + + sprintf(buf, "%X", hw_rev); + err = devlink_info_version_fixed_put(req, "hw.revision", buf); + if (err) + return err; + + err = devlink_info_version_fixed_put(req, "fw.psid", fw_info_psid); + if (err) + return err; + + sprintf(buf, "%d.%d.%d", fw_major, fw_minor, fw_sub_minor); + err = devlink_info_version_running_put(req, "fw.version", buf); + if (err) + return err; + + return 0; +} + static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink, struct netlink_ext_ack *extack) { @@ -968,6 +1003,7 @@ static const struct devlink_ops mlxsw_devlink_ops = { .sb_occ_max_clear = mlxsw_devlink_sb_occ_max_clear, .sb_occ_port_pool_get = mlxsw_devlink_sb_occ_port_pool_get, .sb_occ_tc_port_bind_get = mlxsw_devlink_sb_occ_tc_port_bind_get, + .info_get = mlxsw_devlink_info_get, }; static int