mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-24 10:34:43 +03:00
gpu: nvgpu: use nvmem API to read fuses
Replace the usage of tegra_fuse_readl with nvmem_cell_read_u32 for the below fuse registers added as nvmem cells on v5.10+ kernels. Older nvidia kernels do not have these tegra nvmem cell support. 1. FUSE_GCPLEX_CONFIG_FUSE_0 2. FUSE_RESERVED_CALIB0_0 3. FUSE_PDI0 4. FUSE_PDI1 bug 200633045 Change-Id: I187400720929233fcbc1970c9bbed34347b0a9a7 Signed-off-by: Sagar Kamble <skamble@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2670828 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com> Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com> Reviewed-by: Alex Waterman <alexw@nvidia.com> GVS: Gerrit_Virtual_Submit
This commit is contained in:
committed by
mobile promotions
parent
71eee998b1
commit
ad85b60bb0
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2017-2021, NVIDIA CORPORATION. All rights reserved.
|
||||
* Copyright (c) 2017-2022, NVIDIA CORPORATION. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <nvgpu/fuse.h>
|
||||
|
||||
#include <nvgpu/linux/soc_fuse.h>
|
||||
#include <nvgpu/linux/nvmem.h>
|
||||
|
||||
#include <soc/tegra/fuse.h>
|
||||
|
||||
@@ -26,12 +27,20 @@ int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g, int *id)
|
||||
|
||||
int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g, u32 *val)
|
||||
{
|
||||
#ifdef CONFIG_NVGPU_NVMEM_FUSE
|
||||
return nvgpu_tegra_nvmem_read_reserved_calib(g, val);
|
||||
#else
|
||||
return tegra_fuse_readl(FUSE_RESERVED_CALIB0_0, val);
|
||||
#endif
|
||||
}
|
||||
|
||||
int nvgpu_tegra_fuse_read_gcplex_config_fuse(struct gk20a *g, u32 *val)
|
||||
{
|
||||
#ifdef CONFIG_NVGPU_NVMEM_FUSE
|
||||
return nvgpu_tegra_nvmem_read_gcplex_config_fuse(g, val);
|
||||
#else
|
||||
return tegra_fuse_readl(FUSE_GCPLEX_CONFIG_FUSE_0, val);
|
||||
#endif
|
||||
}
|
||||
|
||||
int nvgpu_tegra_fuse_read_opt_gpc_disable(struct gk20a *g, u32 *val)
|
||||
@@ -41,6 +50,9 @@ int nvgpu_tegra_fuse_read_opt_gpc_disable(struct gk20a *g, u32 *val)
|
||||
|
||||
int nvgpu_tegra_fuse_read_per_device_identifier(struct gk20a *g, u64 *pdi)
|
||||
{
|
||||
#ifdef CONFIG_NVGPU_NVMEM_FUSE
|
||||
return nvgpu_tegra_nvmem_read_per_device_identifier(g, pdi);
|
||||
#else
|
||||
u32 lo = 0U;
|
||||
u32 hi = 0U;
|
||||
int err;
|
||||
@@ -56,6 +68,7 @@ int nvgpu_tegra_fuse_read_per_device_identifier(struct gk20a *g, u64 *pdi)
|
||||
*pdi = ((u64)lo) | (((u64)hi) << 32);
|
||||
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NVGPU_TEGRA_FUSE
|
||||
|
||||
80
drivers/gpu/nvgpu/os/linux/nvmem.c
Normal file
80
drivers/gpu/nvgpu/os/linux/nvmem.c
Normal file
@@ -0,0 +1,80 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
/*
|
||||
* Copyright (c) 2022, NVIDIA Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms and conditions of the GNU General Public License,
|
||||
* version 2, as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <nvgpu/linux/nvmem.h>
|
||||
#include <nvgpu/log.h>
|
||||
|
||||
#include <linux/nvmem-consumer.h>
|
||||
|
||||
#include "os_linux.h"
|
||||
|
||||
#define NVMEM_CELL_GCPLEX_CONFIG_FUSE "gcplex-config-fuse"
|
||||
#define NVMEM_CELL_CALIBRATION "calibration"
|
||||
#define NVMEM_CELL_PDI0 "pdi0"
|
||||
#define NVMEM_CELL_PDI1 "pdi1"
|
||||
|
||||
int nvgpu_tegra_nvmem_read_reserved_calib(struct gk20a *g, u32 *val)
|
||||
{
|
||||
struct device *dev = dev_from_gk20a(g);
|
||||
int ret;
|
||||
|
||||
ret = nvmem_cell_read_u32(dev, NVMEM_CELL_CALIBRATION, val);
|
||||
if (ret < 0) {
|
||||
nvgpu_err(g, "%s nvmem cell read failed %d",
|
||||
NVMEM_CELL_CALIBRATION, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int nvgpu_tegra_nvmem_read_gcplex_config_fuse(struct gk20a *g, u32 *val)
|
||||
{
|
||||
struct device *dev = dev_from_gk20a(g);
|
||||
int ret;
|
||||
|
||||
ret = nvmem_cell_read_u32(dev, NVMEM_CELL_GCPLEX_CONFIG_FUSE, val);
|
||||
if (ret < 0) {
|
||||
nvgpu_err(g, "%s nvmem cell read failed %d",
|
||||
NVMEM_CELL_GCPLEX_CONFIG_FUSE, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int nvgpu_tegra_nvmem_read_per_device_identifier(struct gk20a *g, u64 *pdi)
|
||||
{
|
||||
struct device *dev = dev_from_gk20a(g);
|
||||
u32 lo = 0U;
|
||||
u32 hi = 0U;
|
||||
int err;
|
||||
|
||||
err = nvmem_cell_read_u32(dev, NVMEM_CELL_PDI0, &lo);
|
||||
if (err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
err = nvmem_cell_read_u32(dev, NVMEM_CELL_PDI1, &hi);
|
||||
if (err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
*pdi = ((u64)lo) | (((u64)hi) << 32);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <nvgpu/nvhost.h>
|
||||
#include <nvgpu/soc.h>
|
||||
#include <nvgpu/fuse.h>
|
||||
#include <nvgpu/linux/soc_fuse.h>
|
||||
|
||||
#ifdef CONFIG_NV_TEGRA_BPMP
|
||||
#include <soc/tegra/tegra-bpmp-dvfs.h>
|
||||
|
||||
Reference in New Issue
Block a user