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,URIBL_BLOCKED,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 6A5F0C282CE for ; Wed, 13 Feb 2019 11:29:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F74B2073D for ; Wed, 13 Feb 2019 11:29:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="XoSOdG4z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403939AbfBML3G (ORCPT ); Wed, 13 Feb 2019 06:29:06 -0500 Received: from mail-eopbgr50079.outbound.protection.outlook.com ([40.107.5.79]:24665 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2403919AbfBML27 (ORCPT ); Wed, 13 Feb 2019 06:28:59 -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=+qxoN9u5WGY718q92Y4asa0aWvOOK7wxSgp8qjXeORg=; b=XoSOdG4zAuyhv6E2ejflhIz5XeAP7c+oIIQc/6duLgw6Q57Vu9tAe2yEy209oQ+dA9GCTLbiu9N9l/OMTy4HXpxkU434ipbAE8WBSaWP/Gn+TfqKCSDOWJT1wB2HBiOUmyLx7n1B4ey9cb6B4x+GbU4sEzcNAVl4Ogn+n6QmsRw= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB5111.eurprd05.prod.outlook.com (20.177.196.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.17; Wed, 13 Feb 2019 11:28:55 +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.023; Wed, 13 Feb 2019 11:28:55 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , "andrew@lunn.ch" , mlxsw , Vadim Pasternak , Ido Schimmel Subject: [PATCH net-next 11/12] mlxsw: core: Add QSFP module temperature label attribute to hwmon Thread-Topic: [PATCH net-next 11/12] mlxsw: core: Add QSFP module temperature label attribute to hwmon Thread-Index: AQHUw49NgzEPepyICUSSQWqrln0kRA== Date: Wed, 13 Feb 2019 11:28:55 +0000 Message-ID: <20190213112814.32334-12-idosch@mellanox.com> References: <20190213112814.32334-1-idosch@mellanox.com> In-Reply-To: <20190213112814.32334-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LNXP265CA0090.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::30) To AM6PR05MB5240.eurprd05.prod.outlook.com (2603:10a6:20b:64::22) 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: 23743678-b334-44fe-036b-08d691a67038 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:AM6PR05MB5111; x-ms-traffictypediagnostic: AM6PR05MB5111: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB5111;23:kuDRRuUw6XiWvy5a2XjZfCMMcne3os7xTLJoJbJ?= =?iso-8859-1?Q?GFDeqiqJxFDhx5Y0sZroJJD49YVnkXtx8Wu1/qQUFFTtj5EQC90QvpNBDg?= =?iso-8859-1?Q?H8baWWnSlSGiNfGZ5oRdg2xO/ujuZA9hEkUZ1EF8S4CB3GKEVzOP5VjIhv?= =?iso-8859-1?Q?zQrEIACvKXuxanV209k6OwPB5T/AKpurY0woqwOAqaxIiAlY2UGitLQESK?= =?iso-8859-1?Q?gEXKKIBHlLJPnWTrA58cBenVKc4mhfDuT0EgzsqM5pz0xTQjZRHm4cjtgm?= =?iso-8859-1?Q?7EH0SftWLY3fqxbiEiBfJ9pXEoUFE82drnCoczieqIghTTc9xqVx7ar2ux?= =?iso-8859-1?Q?KD+16kQ7XWpNJ1W8HD/7c/sK4fAVFEw7eZM7SwHLna7GS9YJZGlYXdDoIU?= =?iso-8859-1?Q?MHe0acon1DowL4sFKwdKw11jkYbQq8fk6N6RcjDpwoDpHDr2tOUG5kuHOU?= =?iso-8859-1?Q?3if3zZVdnrMQY/I+L0Hpn7qPMXHskRXTn1DIy7P1RXrHPLPV5CioA31Xyh?= =?iso-8859-1?Q?G80oeSyIsS3NmXvBIe9SQSFZ1nenlBLMoZrjW+NpsoJW3BuMTnJbQZRVum?= =?iso-8859-1?Q?KwMi4QZSWLY2SdY26H+qDYYUHMZO5BoOsPSRMsJg7IW9o70djSZjzGFQaK?= =?iso-8859-1?Q?bx3vHAJ4mDAfdftbuQ0neWu8ENME9L+oRA2tZr+bfJ06JgYWIGY+4/sKmS?= =?iso-8859-1?Q?bH/QtHqUXEjHcjyC4quI546KFa3/suoW+Sc6hTPCEBRZExolCDJ58/7ftA?= =?iso-8859-1?Q?KQLCDW34QqmHF1P2d/gSapjKL0v0X+GWEL0+WNJJb5VmaqP1P/4h1o79Kw?= =?iso-8859-1?Q?+W/3A0SVjxSBGlaSnzeF+lfgAb9mz/lJy/G9nXDkCcOcLq6S2Q2I9kGOax?= =?iso-8859-1?Q?3g6UjnhwqDpg3/0vjL963BZGvkF7lOcCLXS7aVwhSJl7B6AUnX6fmS9hNa?= =?iso-8859-1?Q?MUBtH9QgNKsrYfRvqKPKBDvPSUYR0RGjvJGh32EeNG4t8JvN9siBi2n7LO?= =?iso-8859-1?Q?Npik2XXq2xPCqd6sK69bSPvmanLdBp0pXHt0NEmrf2cTM6Inl2XyZcuPUR?= =?iso-8859-1?Q?Z8c6XA6AP3I6V4VJFJ45Oj9zVrzDYI4fwCYKm0WFFQLRFBZPASJIxZiiSk?= =?iso-8859-1?Q?65bCSy3QijUmnaoDVVc41dG/PlukcOtGwU9R058DFzDGLX96I6QHVHRRjY?= =?iso-8859-1?Q?hP5TkPqUz2d8FCiN4F/a0+1YQ8Ilhc1WSNo0D8zaJUxVMHEKrmnf6hgGpt?= =?iso-8859-1?Q?EKZBfRv9gMPi5cU7vmsguexHUkf4wj+pzC4Bm2wWQh+a1XFOycKdvL7Ejp?= =?iso-8859-1?Q?ChhzxTr2X39tNs+fho9APpwaB/S62RW918ndi31EoH0kKCeGjqAr3c2RPx?= =?iso-8859-1?Q?94QJwh3vcVA8NWKEzJuTzI0nBQcsQ?= x-microsoft-antispam-prvs: x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(376002)(396003)(39860400002)(366004)(346002)(199004)(189003)(68736007)(97736004)(76176011)(52116002)(7736002)(305945005)(102836004)(2351001)(14454004)(50226002)(2501003)(386003)(6506007)(8676002)(105586002)(1730700003)(106356001)(486006)(36756003)(81166006)(2906002)(81156014)(71200400001)(256004)(71190400001)(25786009)(1076003)(26005)(66066001)(6916009)(53936002)(3846002)(446003)(2616005)(6346003)(6436002)(316002)(4326008)(186003)(86362001)(6486002)(6512007)(5640700003)(54906003)(99286004)(6116002)(8936002)(476003)(107886003)(478600001)(11346002)(21314003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5111;H:AM6PR05MB5240.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) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: lVpjh8kPzaxp8Tm+NA5nr8+gIA8fKtE7OPXEfRBlqeX6Ryhzc1+Cv4jurK60z5GrrRARiDlSHwu+QjFQ5ewaBTN8EYTIltU5RuHwZ2zaCK42V5AszOQmmR/znyQMZxHN8KVRBoN6di036CrSwIzeRCzJW+vqDIW/2g2QaulH05XD6nqMD5YxH6jDyIEo6AGt/64BOCn13fBGeVXqJIDkIQY3EsRskrv2jMcttdQ14AkEJhT3wgMUdxnubJII9vxAne0jz5vZpvEbY6O5FEzA92yREyWC2ZjOkReT+RJCtDeJgJzXDzfNSs79ltqMwAAiLnor2f7vi/UmSeRHyCOgNS4xUa+M0/1R27XSjaKwSUw/aaFGyHvdUX8udpkUTi4k76/TMqg2QAqIuh9T0qPs782/+v9ZA6Ww4iJyFwIMoIo= 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: 23743678-b334-44fe-036b-08d691a67038 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2019 11:28:54.6457 (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: AM6PR05MB5111 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vadim Pasternak Add label attribute to hwmon object for exposing QSFP module's temperature sensor name. Modules are labeled as "front panel xxx". The label is used by utilities such as "sensors": front panel 001: +0.0C (crit =3D +0.0C, emerg =3D +0.0C) .. front panel 020: +31.0C (crit =3D +70.0C, emerg =3D +80.0C) .. front panel 056: +41.0C (crit =3D +70.0C, emerg =3D +80.0C) Signed-off-by: Vadim Pasternak Reviewed-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/core_hwmon.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c b/drivers/net= /ethernet/mellanox/mlxsw/core_hwmon.c index 504f6bba8874..f1ada4cdbd6b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c @@ -321,6 +321,18 @@ mlxsw_hwmon_module_temp_emergency_show(struct device *= dev, return sprintf(buf, "%u\n", temp); } =20 +static ssize_t +mlxsw_hwmon_module_temp_label_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct mlxsw_hwmon_attr *mlwsw_hwmon_attr =3D + container_of(attr, struct mlxsw_hwmon_attr, dev_attr); + + return sprintf(buf, "front panel %03u\n", + mlwsw_hwmon_attr->type_index); +} + enum mlxsw_hwmon_attr_type { MLXSW_HWMON_ATTR_TYPE_TEMP, MLXSW_HWMON_ATTR_TYPE_TEMP_MAX, @@ -332,6 +344,7 @@ enum mlxsw_hwmon_attr_type { MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_FAULT, MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_CRIT, MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_EMERG, + MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_LABEL, }; =20 static void mlxsw_hwmon_attr_add(struct mlxsw_hwmon *mlxsw_hwmon, @@ -408,6 +421,13 @@ static void mlxsw_hwmon_attr_add(struct mlxsw_hwmon *m= lxsw_hwmon, snprintf(mlxsw_hwmon_attr->name, sizeof(mlxsw_hwmon_attr->name), "temp%u_emergency", num + 1); break; + case MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_LABEL: + mlxsw_hwmon_attr->dev_attr.show =3D + mlxsw_hwmon_module_temp_label_show; + mlxsw_hwmon_attr->dev_attr.attr.mode =3D 0444; + snprintf(mlxsw_hwmon_attr->name, sizeof(mlxsw_hwmon_attr->name), + "temp%u_label", num + 1); + break; default: WARN_ON(1); } @@ -528,6 +548,9 @@ static int mlxsw_hwmon_module_init(struct mlxsw_hwmon *= mlxsw_hwmon) mlxsw_hwmon_attr_add(mlxsw_hwmon, MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_EMERG, index, index); + mlxsw_hwmon_attr_add(mlxsw_hwmon, + MLXSW_HWMON_ATTR_TYPE_TEMP_MODULE_LABEL, + index, index); index++; } =20 --=20 2.20.1