lkml.org 
[lkml]   [2023]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v3 06/17] media: venus: hfi_venus: Sanitize venus_boot_core() per-VPU-version
From


On 5/18/2023 2:44 AM, Konrad Dybcio wrote:
> The current assumption of IS_V6 is overgeneralized. Adjust the logic
> to take the VPU hardware version into account.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
> drivers/media/platform/qcom/venus/hfi_venus.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c
> index 8fc8f46dc390..5af24e98caf0 100644
> --- a/drivers/media/platform/qcom/venus/hfi_venus.c
> +++ b/drivers/media/platform/qcom/venus/hfi_venus.c
> @@ -447,19 +447,20 @@ static int venus_boot_core(struct venus_hfi_device *hdev)
> {
> struct device *dev = hdev->core->dev;
> static const unsigned int max_tries = 100;
> - u32 ctrl_status = 0, mask_val;
> + u32 ctrl_status = 0, mask_val = 0;
> unsigned int count = 0;
> void __iomem *cpu_cs_base = hdev->core->cpu_cs_base;
> void __iomem *wrapper_base = hdev->core->wrapper_base;
> int ret = 0;
>
> - if (IS_V6(hdev->core)) {
> + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) {
> mask_val = readl(wrapper_base + WRAPPER_INTR_MASK);
> mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 |
> WRAPPER_INTR_MASK_A2HCPU_MASK);
> } else {
> mask_val = WRAPPER_INTR_MASK_A2HVCODEC_MASK;
> }
> +
> writel(mask_val, wrapper_base + WRAPPER_INTR_MASK);
> writel(1, cpu_cs_base + CPU_CS_SCIACMDARG3);
>
> @@ -479,10 +480,11 @@ static int venus_boot_core(struct venus_hfi_device *hdev)
> if (count >= max_tries)
> ret = -ETIMEDOUT;
>
> - if (IS_V6(hdev->core)) {
> + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core))
> writel(0x1, cpu_cs_base + CPU_CS_H2XSOFTINTEN_V6);
> +
> + if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core))
> writel(0x0, cpu_cs_base + CPU_CS_X2RPMH_V6);
> - }
above two if conditions can be combined.

Thanks,
Dikshita
>
> return ret;
> }
>

\
 
 \ /
  Last update: 2023-05-26 08:20    [W:0.253 / U:0.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site