Commit c1fef618 authored by Sandipan Patra's avatar Sandipan Patra Committed by Jakub Kicinski
Browse files

net/mlx5: Implement thermal zone 



Implement thermal zone support for mlx5 based HW. The NIC
uses temperature sensor provided by ASIC to report current temperature
to thermal core.

Signed-off-by: default avatarSandipan Patra <spatra@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://lore.kernel.org/r/20230314054234.267365-5-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ceefcfb8

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ mlx5_core-$(CONFIG_MLX5_ESWITCH) += esw/acl/helper.o \ 


mlx5_core-$(CONFIG_MLX5_BRIDGE)    += esw/bridge.o en/rep/bridge.o



mlx5_core-$(CONFIG_THERMAL)        += thermal.o

mlx5_core-$(CONFIG_MLX5_MPFS)      += lib/mpfs.o

mlx5_core-$(CONFIG_VXLAN)          += lib/vxlan.o

mlx5_core-$(CONFIG_PTP_1588_CLOCK) += lib/clock.o

drivers/net/ethernet/mellanox/mlx5/core/main.c

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/version.h>

#include <net/devlink.h>

#include "mlx5_core.h"

#include "thermal.h"

#include "lib/eq.h"

#include "fs_core.h"

#include "lib/mpfs.h"
@@ -1768,6 +1769,10 @@ static int probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (err)

		dev_err(&pdev->dev, "mlx5_crdump_enable failed with error code %d\n", err);



	err = mlx5_thermal_init(dev);

	if (err)

		dev_err(&pdev->dev, "mlx5_thermal_init failed with error code %d\n", err);



	pci_save_state(pdev);

	devlink_register(devlink);

	return 0;
@@ -1796,6 +1801,7 @@ static void remove_one(struct pci_dev *pdev) 
	set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state);

	devlink_unregister(devlink);

	mlx5_sriov_disable(pdev);

	mlx5_thermal_uninit(dev);

	mlx5_crdump_disable(dev);

	mlx5_drain_health_wq(dev);

	mlx5_uninit_one(dev);

drivers/net/ethernet/mellanox/mlx5/core/thermal.c

0 → 100644
+108 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/device.h>

#include <linux/thermal.h>

#include <linux/err.h>

#include <linux/mlx5/driver.h>

#include "mlx5_core.h"

#include "thermal.h"



#define MLX5_THERMAL_POLL_INT_MSEC	1000

#define MLX5_THERMAL_NUM_TRIPS		0

#define MLX5_THERMAL_ASIC_SENSOR_INDEX	0



/* Bit string indicating the writeablility of trip points if any */

#define MLX5_THERMAL_TRIP_MASK	(BIT(MLX5_THERMAL_NUM_TRIPS) - 1)



struct mlx5_thermal {

	struct mlx5_core_dev *mdev;

	struct thermal_zone_device *tzdev;

};



static int mlx5_thermal_get_mtmp_temp(struct mlx5_core_dev *mdev, u32 id, int *p_temp)

{

	u32 mtmp_out[MLX5_ST_SZ_DW(mtmp_reg)] = {};

	u32 mtmp_in[MLX5_ST_SZ_DW(mtmp_reg)] = {};

	int err;



	MLX5_SET(mtmp_reg, mtmp_in, sensor_index, id);



	err = mlx5_core_access_reg(mdev, mtmp_in,  sizeof(mtmp_in),

				   mtmp_out, sizeof(mtmp_out),

				   MLX5_REG_MTMP, 0, 0);



	if (err)

		return err;



	*p_temp = MLX5_GET(mtmp_reg, mtmp_out, temperature);



	return 0;

}



static int mlx5_thermal_get_temp(struct thermal_zone_device *tzdev,

				 int *p_temp)

{

	struct mlx5_thermal *thermal = tzdev->devdata;

	struct mlx5_core_dev *mdev = thermal->mdev;

	int err;



	err = mlx5_thermal_get_mtmp_temp(mdev, MLX5_THERMAL_ASIC_SENSOR_INDEX, p_temp);



	if (err)

		return err;



	/* The unit of temp returned is in 0.125 C. The thermal

	 * framework expects the value in 0.001 C.

	 */

	*p_temp *= 125;



	return 0;

}



static struct thermal_zone_device_ops mlx5_thermal_ops = {

	.get_temp = mlx5_thermal_get_temp,

};



int mlx5_thermal_init(struct mlx5_core_dev *mdev)

{

	struct mlx5_thermal *thermal;

	struct thermal_zone_device *tzd;

	const char *data = "mlx5";



	tzd = thermal_zone_get_zone_by_name(data);

	if (!IS_ERR(tzd))

		return 0;



	thermal = kzalloc(sizeof(*thermal), GFP_KERNEL);

	if (!thermal)

		return -ENOMEM;



	thermal->mdev = mdev;

	thermal->tzdev = thermal_zone_device_register(data,

						      MLX5_THERMAL_NUM_TRIPS,

						      MLX5_THERMAL_TRIP_MASK,

						      thermal,

						      &mlx5_thermal_ops,

						      NULL, 0, MLX5_THERMAL_POLL_INT_MSEC);

	if (IS_ERR(thermal->tzdev)) {

		dev_err(mdev->device, "Failed to register thermal zone device (%s) %ld\n",

			data, PTR_ERR(thermal->tzdev));

		kfree(thermal);

		return -EINVAL;

	}



	mdev->thermal = thermal;

	return 0;

}



void mlx5_thermal_uninit(struct mlx5_core_dev *mdev)

{

	if (!mdev->thermal)

		return;



	thermal_zone_device_unregister(mdev->thermal->tzdev);

	kfree(mdev->thermal);

}

drivers/net/ethernet/mellanox/mlx5/core/thermal.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

 * Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.

 */

#ifndef __MLX5_THERMAL_DRIVER_H

#define __MLX5_THERMAL_DRIVER_H



#if IS_ENABLED(CONFIG_THERMAL)

int mlx5_thermal_init(struct mlx5_core_dev *mdev);

void mlx5_thermal_uninit(struct mlx5_core_dev *mdev);

#else

static inline int mlx5_thermal_init(struct mlx5_core_dev *mdev)

{

	mdev->thermal = NULL;

	return 0;

}



static inline void mlx5_thermal_uninit(struct mlx5_core_dev *mdev) { }

#endif



#endif /* __MLX5_THERMAL_DRIVER_H */

include/linux/mlx5/driver.h

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ enum { 
	MLX5_REG_PCAM		 = 0x507f,

	MLX5_REG_NODE_DESC	 = 0x6001,

	MLX5_REG_HOST_ENDIANNESS = 0x7004,

	MLX5_REG_MTMP		 = 0x900A,

	MLX5_REG_MCIA		 = 0x9014,

	MLX5_REG_MFRL		 = 0x9028,

	MLX5_REG_MLCR		 = 0x902b,
@@ -731,6 +732,7 @@ struct mlx5_fw_tracer; 
struct mlx5_vxlan;

struct mlx5_geneve;

struct mlx5_hv_vhca;

struct mlx5_thermal;



#define MLX5_LOG_SW_ICM_BLOCK_SIZE(dev) (MLX5_CAP_DEV_MEM(dev, log_sw_icm_alloc_granularity))

#define MLX5_SW_ICM_BLOCK_SIZE(dev) (1 << MLX5_LOG_SW_ICM_BLOCK_SIZE(dev))
@@ -808,6 +810,7 @@ struct mlx5_core_dev { 
	struct mlx5_rsc_dump    *rsc_dump;

	u32                      vsc_addr;

	struct mlx5_hv_vhca	*hv_vhca;

	struct mlx5_thermal	*thermal;

};



struct mlx5_db {