mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-22 17:36:20 +03:00
gpu: nvgpu: update gops.mssnvlink
Introduce HAL function gops.mssnvlink.get_links, this function retrieves the number of nvlinks supported by the chip along with their base addresses. Update ga10b_mssnvlink_init_soc_credits to call mssnvlink.get_links. Jira NVGPU-6641 Change-Id: I4ff857925f126bf41dc83eebc5723403244f66b0 Signed-off-by: Antony Clince Alex <aalex@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2618368 Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
1bcc22ab19
commit
3e7643bb9c
@@ -1678,6 +1678,7 @@ static const struct gops_grmgr ga10b_ops_grmgr = {
|
|||||||
|
|
||||||
#ifdef CONFIG_NVGPU_HAL_NON_FUSA
|
#ifdef CONFIG_NVGPU_HAL_NON_FUSA
|
||||||
static const struct gops_mssnvlink ga10b_ops_mssnvlink = {
|
static const struct gops_mssnvlink ga10b_ops_mssnvlink = {
|
||||||
|
.get_links = ga10b_mssnvlink_get_links,
|
||||||
.init_soc_credits = ga10b_mssnvlink_init_soc_credits
|
.init_soc_credits = ga10b_mssnvlink_init_soc_credits
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
#include <nvgpu/io.h>
|
#include <nvgpu/io.h>
|
||||||
#include <nvgpu/gk20a.h>
|
#include <nvgpu/gk20a.h>
|
||||||
#include <nvgpu/soc.h>
|
#include <nvgpu/soc.h>
|
||||||
|
#include <nvgpu/kmem.h>
|
||||||
|
#include <nvgpu/string.h>
|
||||||
|
|
||||||
#include "mssnvlink_ga10b.h"
|
#include "mssnvlink_ga10b.h"
|
||||||
|
|
||||||
@@ -44,17 +46,30 @@
|
|||||||
#define MSS_NVLINK_INIT_CREDITS 0x00000001U
|
#define MSS_NVLINK_INIT_CREDITS 0x00000001U
|
||||||
#define MSS_NVLINK_FORCE_COH_SNP 0x3U
|
#define MSS_NVLINK_FORCE_COH_SNP 0x3U
|
||||||
|
|
||||||
void ga10b_mssnvlink_init_soc_credits(struct gk20a *g)
|
u32 ga10b_mssnvlink_get_links(struct gk20a *g, u32 **links)
|
||||||
{
|
{
|
||||||
u32 i = 0U;
|
|
||||||
u32 val = MSS_NVLINK_INIT_CREDITS;
|
|
||||||
|
|
||||||
u32 nvlink_base[MSS_NVLINK_INTERNAL_NUM] = {
|
u32 nvlink_base[MSS_NVLINK_INTERNAL_NUM] = {
|
||||||
MSS_NVLINK_1_BASE, MSS_NVLINK_2_BASE, MSS_NVLINK_3_BASE,
|
MSS_NVLINK_1_BASE, MSS_NVLINK_2_BASE, MSS_NVLINK_3_BASE,
|
||||||
MSS_NVLINK_4_BASE, MSS_NVLINK_5_BASE, MSS_NVLINK_6_BASE,
|
MSS_NVLINK_4_BASE, MSS_NVLINK_5_BASE, MSS_NVLINK_6_BASE,
|
||||||
MSS_NVLINK_7_BASE, MSS_NVLINK_8_BASE
|
MSS_NVLINK_7_BASE, MSS_NVLINK_8_BASE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
*links = nvgpu_kzalloc(g, sizeof(nvlink_base));
|
||||||
|
if (*links == NULL) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
nvgpu_memcpy((u8 *)*links, (u8 *)nvlink_base, sizeof(nvlink_base));
|
||||||
|
|
||||||
|
return MSS_NVLINK_INTERNAL_NUM;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ga10b_mssnvlink_init_soc_credits(struct gk20a *g)
|
||||||
|
{
|
||||||
|
u32 i = 0U;
|
||||||
|
u32 val = MSS_NVLINK_INIT_CREDITS;
|
||||||
|
u32 *nvlink_base;
|
||||||
|
u32 num_links;
|
||||||
|
|
||||||
uintptr_t mssnvlink_control[MSS_NVLINK_INTERNAL_NUM];
|
uintptr_t mssnvlink_control[MSS_NVLINK_INTERNAL_NUM];
|
||||||
|
|
||||||
if (nvgpu_platform_is_simulation(g)) {
|
if (nvgpu_platform_is_simulation(g)) {
|
||||||
@@ -68,15 +83,22 @@ void ga10b_mssnvlink_init_soc_credits(struct gk20a *g)
|
|||||||
"nvlink soc credits init done by bpmp on silicon");
|
"nvlink soc credits init done by bpmp on silicon");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* init nvlink soc credits and force snoop */
|
|
||||||
for (i = 0U; i < MSS_NVLINK_INTERNAL_NUM; i++) {
|
num_links = g->ops.mssnvlink.get_links(g, &nvlink_base);
|
||||||
|
if (num_links == 0) {
|
||||||
|
nvgpu_err(g, "num_links = %d, skipping", num_links);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0U; i < num_links; i++) {
|
||||||
mssnvlink_control[i] = nvgpu_io_map(g, nvlink_base[i],
|
mssnvlink_control[i] = nvgpu_io_map(g, nvlink_base[i],
|
||||||
MSS_NVLINK_SIZE);
|
MSS_NVLINK_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* init nvlink soc credits */
|
||||||
nvgpu_log(g, gpu_dbg_info, "init nvlink soc credits");
|
nvgpu_log(g, gpu_dbg_info, "init nvlink soc credits");
|
||||||
|
|
||||||
for (i = 0U; i < MSS_NVLINK_INTERNAL_NUM; i++) {
|
for (i = 0U; i < num_links; i++) {
|
||||||
nvgpu_os_writel(val, (*(mssnvlink_control + i) +
|
nvgpu_os_writel(val, (*(mssnvlink_control + i) +
|
||||||
MSS_NVLINK_GLOBAL_CREDIT_CONTROL_0));
|
MSS_NVLINK_GLOBAL_CREDIT_CONTROL_0));
|
||||||
}
|
}
|
||||||
@@ -87,7 +109,7 @@ void ga10b_mssnvlink_init_soc_credits(struct gk20a *g)
|
|||||||
*/
|
*/
|
||||||
nvgpu_log(g, gpu_dbg_info, "set force snoop");
|
nvgpu_log(g, gpu_dbg_info, "set force snoop");
|
||||||
|
|
||||||
for (i = 0U; i < MSS_NVLINK_INTERNAL_NUM; i++) {
|
for (i = 0U; i < num_links; i++) {
|
||||||
val = nvgpu_os_readl((*(mssnvlink_control + i) +
|
val = nvgpu_os_readl((*(mssnvlink_control + i) +
|
||||||
MSS_NVLINK_MCF_MEMORY_TYPE_CONTROL_0));
|
MSS_NVLINK_MCF_MEMORY_TYPE_CONTROL_0));
|
||||||
val &= ~(MSS_NVLINK_FORCE_COH_SNP);
|
val &= ~(MSS_NVLINK_FORCE_COH_SNP);
|
||||||
@@ -95,4 +117,9 @@ void ga10b_mssnvlink_init_soc_credits(struct gk20a *g)
|
|||||||
nvgpu_os_writel(val, *(mssnvlink_control + i) +
|
nvgpu_os_writel(val, *(mssnvlink_control + i) +
|
||||||
MSS_NVLINK_MCF_MEMORY_TYPE_CONTROL_0);
|
MSS_NVLINK_MCF_MEMORY_TYPE_CONTROL_0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (i = 0U; i < num_links; i++) {
|
||||||
|
nvgpu_io_unmap(g, mssnvlink_control[i], MSS_NVLINK_SIZE);
|
||||||
|
}
|
||||||
|
nvgpu_kfree(g, nvlink_base);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
|
|
||||||
struct gk20a;
|
struct gk20a;
|
||||||
|
|
||||||
|
u32 ga10b_mssnvlink_get_links(struct gk20a *g, u32 **links);
|
||||||
void ga10b_mssnvlink_init_soc_credits(struct gk20a *g);
|
void ga10b_mssnvlink_init_soc_credits(struct gk20a *g);
|
||||||
|
|
||||||
#endif /* NVGPU_MSSNVLINK_GA10B_H */
|
#endif /* NVGPU_MSSNVLINK_GA10B_H */
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ struct gk20a;
|
|||||||
* @see gpu_ops
|
* @see gpu_ops
|
||||||
*/
|
*/
|
||||||
struct gops_mssnvlink {
|
struct gops_mssnvlink {
|
||||||
|
u32 (*get_links)(struct gk20a *g, u32 **links);
|
||||||
void (*init_soc_credits)(struct gk20a *g);
|
void (*init_soc_credits)(struct gk20a *g);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user