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 AA585C282C2 for ; Wed, 13 Feb 2019 11:29:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F5742073D for ; Wed, 13 Feb 2019 11:29:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="DGdKJCvD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403935AbfBML3F (ORCPT ); Wed, 13 Feb 2019 06:29:05 -0500 Received: from mail-eopbgr150041.outbound.protection.outlook.com ([40.107.15.41]:45056 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1732733AbfBML3B (ORCPT ); Wed, 13 Feb 2019 06:29:01 -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=Rw/rdzFUEOwf6cmuQJMhVLyQR1nCJbJINMUaEzuSO0k=; b=DGdKJCvDacbT2Ef7w+hlE7oa3jDBnquyditOT+xy9TfwHgwDPI0srXIhyKNVxPcefgY+EEiy7s92ZKXtwyvw6r4XQ9QpJTn0qdYPrl+OKDDlTqoUMbJ/SwVsUPCWv9QCm04qmIAerHNqACtV0E6v/KSu67jfsDZANAmvMXtTwlA= Received: from AM6PR05MB5240.eurprd05.prod.outlook.com (20.177.196.214) by AM6PR05MB6230.eurprd05.prod.outlook.com (20.178.95.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Wed, 13 Feb 2019 11:28:51 +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:51 +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 07/12] mlxsw: core: Replace thermal temperature trips with defines Thread-Topic: [PATCH net-next 07/12] mlxsw: core: Replace thermal temperature trips with defines Thread-Index: AQHUw49Li0fABknbvUSzfInJz9b3QQ== Date: Wed, 13 Feb 2019 11:28:51 +0000 Message-ID: <20190213112814.32334-8-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) 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-ms-office365-filtering-correlation-id: b6cb5867-1dad-4f69-1aaf-08d691a66d95 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:AM6PR05MB6230; x-ms-traffictypediagnostic: AM6PR05MB6230: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB6230;23:VTbGOMr1m1+C8XtRREjanhbek26f43zKjYrIANh?= =?iso-8859-1?Q?20+mfOHEgR/qkkC0/fuQWoD+iSh6zeXLNaqoJ1xAqava4ZY59YuFxu1hsa?= =?iso-8859-1?Q?twTjniW6HeJrrw5uJILFK7u8g7e5nyekM2pqxE0TptW83jNMuzLIbAGTJM?= =?iso-8859-1?Q?Zz4k9tZp8PZV9e4+5Kj3+3ppxq4EZyn6nfEhC3uKuS0LvcSVJu7pZqAYub?= =?iso-8859-1?Q?NbKrjqRniY8HOXK3uXzt2oN19X8VCrwzpOVgf7mViJibuuc21dAynCmxt8?= =?iso-8859-1?Q?6WQqHQKQs5NcSU13nQdo/e2apyqRLDnuLNQZ3LbmJ7SbrQx9u6c8rgQN92?= =?iso-8859-1?Q?eMoTIQKUJbfu6QkLcdi4nU5tko1vJIeq7+57PcLXfC5b/P1vZHSrFiw/U4?= =?iso-8859-1?Q?pJPUMWK6CLOB4KsQAOgV7a8Qjn+hzoCPT8+leKs2ZNW/5E70poXCMcLlue?= =?iso-8859-1?Q?FumCyoqvpslaunVvobv+62oG2Ozu45peLMlIdunrOq0R5nda5HbOED57si?= =?iso-8859-1?Q?sAzWvs7uBJCiAt7/v7u/0pqIhhL3jhIozsAq7fOsnf+urqliOioB++T4p+?= =?iso-8859-1?Q?6dTLvRe9thnPegBMsboxho5uFr18OMFXAN3uTNao2owjn2LuRVJgk7QdC4?= =?iso-8859-1?Q?XnXwuAlTfRl7DxC6BuutWnQ372jZqNrXjJjU3/mR+Ue4Nz2KlhW1opnptx?= =?iso-8859-1?Q?/+hWgFHeAtjNlSiLjb4PmxY20/EFnphmoZQM7TX/jircFMjl1p/SNcad/R?= =?iso-8859-1?Q?+lDg2xwqaBvMP1TT1v6zZZmLwv2COfcmraMY0TfMg63uyRnV4s+SX+erHj?= =?iso-8859-1?Q?RjlMv2C8gFW+5VPLl4oOqtWAJxDp682dMD7Hg/gGc7znIk5tapTGTH1ojq?= =?iso-8859-1?Q?FNZBXigzccjtTChlajH66VIPy2D9SJUNRQfSGcg2VHC6mIL/GgIVsr9NOH?= =?iso-8859-1?Q?fmi8lyoMhM4mT0BcPcwAHcaRppQwiISWXGE36DruuKnbDcWADvpA2Zq9Hu?= =?iso-8859-1?Q?5o6nLm5MX5FU1JyIre7D9mSSrWTEETBGsBjO/odvcJKszmLXrLKb/vbcJu?= =?iso-8859-1?Q?PsYUOce6d7RI6Z+spooIsiX0CoyDFn7jC4Jx9iiMqxbLKhncEjHl8N0teW?= =?iso-8859-1?Q?flHT00syjd1RiTWGe4E9d3NstiD5M85g8qM6DR3niRqIUkDYOgxfpsvIEx?= =?iso-8859-1?Q?gwIMOxVCpLhGYHSJp1cMAxo4G8MbIpTs6pGs41HH/lXS9pHlQNejqe9mhv?= =?iso-8859-1?Q?1gRDDsJOLIls6YLpOeytLQwjQDC7fWnCiDwmRftkmlbHTbdHxZ8kyQd4ba?= =?iso-8859-1?Q?x8DmY0cJrjSkn0hTGwKey0OmxpA0LkHPpuFxQLNbII+G7E2aBILb2UOXsd?= =?iso-8859-1?Q?LUIG2e8o=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(366004)(396003)(346002)(136003)(39860400002)(189003)(199004)(26005)(186003)(386003)(6506007)(2616005)(476003)(446003)(11346002)(102836004)(486006)(2906002)(8936002)(106356001)(105586002)(71200400001)(2351001)(71190400001)(50226002)(97736004)(81166006)(8676002)(1730700003)(81156014)(6916009)(305945005)(7736002)(14454004)(478600001)(6116002)(3846002)(86362001)(2501003)(66066001)(14444005)(256004)(68736007)(107886003)(53936002)(6436002)(6512007)(1076003)(36756003)(25786009)(54906003)(316002)(6486002)(4326008)(5640700003)(99286004)(76176011)(52116002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB6230;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: eBsdeUXuemZz1lJsGEQSLUoqFoBa0GZF/jV9LiZbsIXqhjEMUGaUx/GoQrlIphiJN5fBObUpxej2JLjFx/MyJRVf0gjs8Q5YZwSOoBZ2V7079rI5/Bp9UxJ4s4SCAuhfzSmfDdxkyvSwmwNMt1n4156LGitbsnBxAb9rpVLjJSk1Yx5pydSeTTg0rjQ5wgjVD6Zt/W1+UFEQqVD57Bloud7aVr6h/n/S71azDpLHRV9CYzNDY6dWrsDrdtnjeiPAnCv7Z5I1/egrRrloz5u7ZCtsP35L/5Ao0tt7+vGSOyx1/R/FNy1S4/ujRgN5ySoRcCj0wJRhY0CKx7QlnPRr+BQPLas5/uoUcGHyDu9kjGs44uruQ9/ooK8a2JuFZyHaoo2us+jnZZ7VUXJ7Xxpuq5uRg1o2oY3zccEhRDeUgYI= 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: b6cb5867-1dad-4f69-1aaf-08d691a66d95 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2019 11:28:50.2066 (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: AM6PR05MB6230 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vadim Pasternak Replace thermal hardcoded temperature trip values with defines. Signed-off-by: Vadim Pasternak Reviewed-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/core_thermal.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/n= et/ethernet/mellanox/mlxsw/core_thermal.c index dbf9a845084a..b9fb33417a82 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c @@ -14,7 +14,10 @@ =20 #define MLXSW_THERMAL_POLL_INT 1000 /* ms */ #define MLXSW_THERMAL_SLOW_POLL_INT 20000 /* ms */ -#define MLXSW_THERMAL_MAX_TEMP 110000 /* 110C */ +#define MLXSW_THERMAL_ASIC_TEMP_NORM 75000 /* 75C */ +#define MLXSW_THERMAL_ASIC_TEMP_HIGH 85000 /* 85C */ +#define MLXSW_THERMAL_ASIC_TEMP_HOT 105000 /* 105C */ +#define MLXSW_THERMAL_ASIC_TEMP_CRIT 110000 /* 110C */ #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */ #define MLXSW_THERMAL_MAX_STATE 10 #define MLXSW_THERMAL_MAX_DUTY 255 @@ -39,7 +42,7 @@ struct mlxsw_thermal_trip { static const struct mlxsw_thermal_trip default_thermal_trips[] =3D { { /* In range - 0-40% PWM */ .type =3D THERMAL_TRIP_ACTIVE, - .temp =3D 75000, + .temp =3D MLXSW_THERMAL_ASIC_TEMP_NORM, .hyst =3D MLXSW_THERMAL_HYSTERESIS_TEMP, .min_state =3D 0, .max_state =3D (4 * MLXSW_THERMAL_MAX_STATE) / 10, @@ -47,21 +50,21 @@ static const struct mlxsw_thermal_trip default_thermal_= trips[] =3D { { /* In range - 40-100% PWM */ .type =3D THERMAL_TRIP_ACTIVE, - .temp =3D 80000, + .temp =3D MLXSW_THERMAL_ASIC_TEMP_HIGH, .hyst =3D MLXSW_THERMAL_HYSTERESIS_TEMP, .min_state =3D (4 * MLXSW_THERMAL_MAX_STATE) / 10, .max_state =3D MLXSW_THERMAL_MAX_STATE, }, { /* Warning */ .type =3D THERMAL_TRIP_HOT, - .temp =3D 85000, + .temp =3D MLXSW_THERMAL_ASIC_TEMP_HOT, .hyst =3D MLXSW_THERMAL_HYSTERESIS_TEMP, .min_state =3D MLXSW_THERMAL_MAX_STATE, .max_state =3D MLXSW_THERMAL_MAX_STATE, }, { /* Critical - soft poweroff */ .type =3D THERMAL_TRIP_CRITICAL, - .temp =3D MLXSW_THERMAL_MAX_TEMP, + .temp =3D MLXSW_THERMAL_ASIC_TEMP_CRIT, .min_state =3D MLXSW_THERMAL_MAX_STATE, .max_state =3D MLXSW_THERMAL_MAX_STATE, } @@ -238,7 +241,7 @@ static int mlxsw_thermal_set_trip_temp(struct thermal_z= one_device *tzdev, struct mlxsw_thermal *thermal =3D tzdev->devdata; =20 if (trip < 0 || trip >=3D MLXSW_THERMAL_NUM_TRIPS || - temp > MLXSW_THERMAL_MAX_TEMP) + temp > MLXSW_THERMAL_ASIC_TEMP_CRIT) return -EINVAL; =20 thermal->trips[trip].temp =3D temp; --=20 2.20.1