Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix no QoS parameters case #225

Merged
merged 1 commit into from
Aug 27, 2024
+22 −9
Merged

Fix no QoS parameters case #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/driver/amdxdna/aie2_debugfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ static ssize_t aie2_dpm_level_set(struct file *file, const char __user *ptr,
return ret;
}

ret = aie2_smu_set_dpm_level(ndev, val, true);
ret = aie2_smu_set_dpm_level(ndev, val);
if (ret) {
XDNA_ERR(ndev->xdna, "Setting dpm_level:%d failed, ret: %d", val, ret);
return ret;
Expand Down
3 changes: 2 additions & 1 deletion src/driver/amdxdna/aie2_pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ static int aie2_set_dpm_level(void *cb_arg, u32 dpm_level)

xdna = hwctx->client->xdna;

ret = aie2_smu_set_dpm_level(xdna->dev_handle, dpm_level, true);
ret = aie2_smu_set_dpm_level(xdna->dev_handle, dpm_level);
if (ret)
XDNA_ERR(xdna, "set dpm level failed, ret %d", ret);

Expand Down Expand Up @@ -589,6 +589,7 @@ static int aie2_init(struct amdxdna_dev *xdna)
}
ndev->total_col = min(aie2_max_col, ndev->metadata.cols);

xrs_cfg.max_dpm_level = SMU_DPM_MAX(ndev);
xrs_cfg.clk_list.num_levels = ndev->priv->smu_npu_dpm_levels;
xrs_cfg.clk_list.cu_clk_list = ndev->priv->smu_npu_dpm_clk_table;
xrs_cfg.sys_eff_factor = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/driver/amdxdna/aie2_pci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ int aie2_smu_set_power_on(struct amdxdna_dev_hdl *ndev);
int aie2_smu_set_power_off(struct amdxdna_dev_hdl *ndev);
int aie2_smu_get_power_state(struct amdxdna_dev_hdl *ndev);
int aie2_smu_get_dpm_level(struct amdxdna_dev_hdl *ndev);
int aie2_smu_set_dpm_level(struct amdxdna_dev_hdl *ndev, u32 dpm_level, bool cache);
int aie2_smu_set_dpm_level(struct amdxdna_dev_hdl *ndev, u32 dpm_level);
void aie2_smu_prepare_s0i3(struct amdxdna_dev_hdl *ndev);

/* aie2_psp.c */
Expand Down
10 changes: 6 additions & 4 deletions src/driver/amdxdna/aie2_smu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ int aie2_smu_get_dpm_level(struct amdxdna_dev_hdl *ndev)
return ndev->smu.curr_dpm_level;
}

int aie2_smu_set_dpm_level(struct amdxdna_dev_hdl *ndev, u32 dpm_level, bool cache)
int aie2_smu_set_dpm_level(struct amdxdna_dev_hdl *ndev, u32 dpm_level)
{
int ret;

Expand All @@ -177,8 +177,10 @@ int aie2_smu_set_dpm_level(struct amdxdna_dev_hdl *ndev, u32 dpm_level, bool cac
else
ret = aie2_smu_set_dpm_level_v1(ndev, dpm_level);

if (!ret & cache)
if (!ret) {
ndev->smu.curr_dpm_level = dpm_level;
XDNA_DBG(ndev->xdna, "The dpm level is set to %d", dpm_level);
}

return ret;
}
Expand Down Expand Up @@ -243,7 +245,7 @@ int aie2_smu_start(struct amdxdna_dev_hdl *ndev)
XDNA_INFO_ONCE(ndev->xdna, "Set %s = %d mhz", smu->h_clock.name, freq_mhz);

if (SMU_DPM_MAX(ndev) > 0) {
ret = aie2_smu_set_dpm_level(ndev, smu->curr_dpm_level, true);
ret = aie2_smu_set_dpm_level(ndev, smu->curr_dpm_level);
if (ret) {
XDNA_ERR(ndev->xdna, "Set dpm level failed, ret %d", ret);
return ret;
Expand All @@ -269,7 +271,7 @@ void aie2_smu_prepare_s0i3(struct amdxdna_dev_hdl *ndev)
XDNA_ERR(ndev->xdna, "Set hclk freq %d mhz failed, ret %d", freq_mhz, ret);

if (SMU_DPM_MAX(ndev) > 0) {
ret = aie2_smu_set_dpm_level(ndev, 0, false);
ret = aie2_smu_set_dpm_level(ndev, 0);
if (ret)
XDNA_ERR(ndev->xdna, "Set dpm level 0 failed, ret %d", ret);
}
Expand Down
13 changes: 11 additions & 2 deletions src/driver/amdxdna/aie2_solver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ static int sanity_check(struct solver_state *xrs, struct alloc_requests *req)
return 0;
}

static bool is_valid_qos_dpm_params(struct aie_qos *rqos)
{
if (rqos->gops > 0 || rqos->fps > 0 || rqos->latency > 0)
return true;

return false;
}

static u32 find_dpm_level(struct solver_state *xrs, struct alloc_requests *req)
{
struct cdo_parts *cdop = &req->cdo;
Expand All @@ -103,8 +111,9 @@ static u32 find_dpm_level(struct solver_state *xrs, struct alloc_requests *req)
struct solver_node *node;
u32 cu_clk_freq, dpm_level;

if (cdop->ncols > xrs->cfg.total_col)
return -EINVAL;
/* If no QoS parameters are passed, set it to the max DPM level */
if (!is_valid_qos_dpm_params(rqos))
return xrs->cfg.max_dpm_level;

/*
* We can find at least one CDOs groups that meet the
Expand Down
1 change: 1 addition & 0 deletions src/driver/amdxdna/aie2_solver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct init_config {
u32 total_col;
u32 sys_eff_factor; /* system efficiency factor */
u32 latency_adj; /* latency adjustment in ms */
u32 max_dpm_level; /* Max dpm level in the system */
struct clk_list_info clk_list; /* List of frequencies available in system */
struct device *dev;
struct xrs_action_ops *actions;
Expand Down