Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 15 Aug 2022 14:55:13 +0300
From:   Ido Schimmel <idosch@nvidia.com>
To:     Daniel Lezcano <daniel.lezcano@linaro.org>
Cc:     rafael@kernel.org, vadimp@mellanox.com, davem@davemloft.net,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Vadim Pasternak <vadimp@nvidia.com>,
        Petr Machata <petrm@nvidia.com>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Subject: Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone
 detection"
Message-ID: <Yvo0IWgDQ0wZ20g6@shredder>
References: <20220815091032.1731268-1-daniel.lezcano@linaro.org>
 <20220815091032.1731268-2-daniel.lezcano@linaro.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220815091032.1731268-2-daniel.lezcano@linaro.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xRqAD3FOvis83oSTJyynSIMX91AiP9hJTFMjJXWy5V0187SJpa0NBNfGPMZ7?=
 =?us-ascii?Q?TIFg0gNtkaiQOaWD/jdXgTkU8cHiZesVWeExlzs1/fzb/wibGKyYz6hNGOVx?=
 =?us-ascii?Q?wnaISVME6zGMJmuSQqmDqDZrgAEwTZZY6gsdgh1tBmVtLhXrkwHx8eWP9Wcg?=
 =?us-ascii?Q?q13jk5cphGhj/Bm3GGmSo6PT9DCegni36szJ9cKKp+0Elt8oS1QTf/qxJIEk?=
 =?us-ascii?Q?2RLJap5KM4XUS3U8SFKQRG7bmGkq3SfZLAPxe6DDqu5cbed8xyrx2IFLr3xX?=
 =?us-ascii?Q?1B4phHFV8bYxKZ+AGGpIQWnEHv4AFkyQBPEYtFDzassrmiGwjsrTWnvl9yPR?=
 =?us-ascii?Q?Q8qgb6ObgXCmQNjjxoHBzERkWBBMeGfNg0L4eRU35uiOOEmMK3iaq2Y3bWNx?=
 =?us-ascii?Q?hX9R+AommRhOI6YoZoUi978DoFQP/c/6vgJo4Ut1JxyMebBwnIV2PjeHpOIp?=
 =?us-ascii?Q?RfXDudChFcx/IcvNqWDAh7tNV+O/HVqTsBtkGglK/s+ANBwzUVDnyKzvbZhU?=
 =?us-ascii?Q?Lodlt85W6llDEyclNoFNmLisariP/7Kzk4Otf1CU8VsdbTf+3/d0seViRdSB?=
 =?us-ascii?Q?feL6efTYZ883QoKQXeke76iGehQpgCf7LOrr8YDH4ckMwheUIgSJLzqwzASX?=
 =?us-ascii?Q?PH5DxVu3qPYPVL9x08+MlEowWd+HmwcjjGNoxj+0WcO/4u41Ui/mMbTXR/IO?=
 =?us-ascii?Q?OKvJGwxA1LIGYFO9tOl6iikPicFjz/3Xvm5+wjFQ6VT1lFGxKDkX1Qe+aseR?=
 =?us-ascii?Q?Q70HOwcojnSUdLN3udHL76nsuY/6UStUxZRLEMlytJv8bAJDUPvqDVcGuArQ?=
 =?us-ascii?Q?iSRipjZ9im0zzlCRGo453/SN0rKFTYT+FIapYiHusd/Q+C1hgTbA/Z5FSH/x?=
 =?us-ascii?Q?0goaX6nlwxb6H6M8ZmaDUxky3p1yfAYx+G95F6W2d1h3loO8Wtb7UvGEWR6Y?=
 =?us-ascii?Q?tNGeFM02C1jKXHmqJIitI2/wIDQ69CEQJpnEE5DCvSO6HmDV4VWmbRVJN1Be?=
 =?us-ascii?Q?kizkw0B9Ji4uOe+pv3175HdWjCdLN1vY9lzO5eBuaGMkL/VAMKkDYbMZDprL?=
 =?us-ascii?Q?cen/isXQbou1hELUN7Oero3S9dIEkBuL0iU7D92LjFp2++uK9uSkysmtML7U?=
 =?us-ascii?Q?3HxPz72sdXARgkNmn7aUbu/fLutHvFDBGBRuKhj4XBmEXE4+OR+MiMX4MPCk?=
 =?us-ascii?Q?titEfjeMuF/6vgLxG80J0IaxgLrpCO/PnoZHGN0szs9Qx/uCmOP4ZtCFdkX9?=
 =?us-ascii?Q?ghem034kX5z7eiQwKV0MQjFN37LBcaWvMnfpwOlAkqN73rN3iSWGlqjsbYmO?=
 =?us-ascii?Q?/eJMv9P0trHu/TISjy1EWFMnFdCo+uHPu5cnoh+LsOkkKht38eVYBCR9br+T?=
 =?us-ascii?Q?oNPlAEHLqEQc+47wSAmQhgor3eWdMIzCpzgoebkMwnGTJQVW6eN7QzUUf7fO?=
 =?us-ascii?Q?hfkk8As/Vphg4OX3MPFSJ+wDyMe+QKsyV6KZv7V0poFDZGwPgBnx9WBeAKNt?=
 =?us-ascii?Q?N5Jm2ZriyewBnrKKK7cCaVZ9eIccJa7ezeAdujn1q4g+MEhlwtgbrvwdE8aP?=
 =?us-ascii?Q?PUj35N39+hdIvvCYmUIjLdFiqSRYJsqZyCvA6I1I?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a1d1f3c1-360a-4d3a-4e71-08da7eb5058e
X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6163.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 11:55:17.4676
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +gwBhzhHJ5ZzFhUxITfeqz3X4r19SHZiMBRa77hQjwcIPWw2bajZ+TrAMGDyOAlV5mi7jn4TeqbgTdKFF88aOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0108
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Aug 15, 2022 at 11:10:32AM +0200, Daniel Lezcano wrote:
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> index f5751242653b..237a813fbb52 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> @@ -22,7 +22,6 @@
>  #define MLXSW_THERMAL_HYSTERESIS_TEMP	5000	/* 5C */
>  #define MLXSW_THERMAL_MODULE_TEMP_SHIFT	(MLXSW_THERMAL_HYSTERESIS_TEMP * 2)
>  #define MLXSW_THERMAL_ZONE_MAX_NAME	16

Which tree is this patch from? The define is no longer in mainline:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

Getting a conflict when trying to apply this patch

> -#define MLXSW_THERMAL_TEMP_SCORE_MAX	GENMASK(31, 0)
>  #define MLXSW_THERMAL_MAX_STATE	10
>  #define MLXSW_THERMAL_MIN_STATE	2
>  #define MLXSW_THERMAL_MAX_DUTY	255