From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 522437081F; Wed, 13 Nov 2024 05:20:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731475259; cv=none; b=OVtGwfhdEbj507/B8eoSBdiZr/cQzM1cTv7yZp5d2lsDOwKrfRQXu2gkUy+AtbyHH7QmP8rGQLer0cxWostZGkzr4Qe7ULa+pAR72Voa2WZYogwG0jzxsBByMAc3C9hJmhSBk8WuJbSiAfa2sb4qT8e2efOd0v5XR5xSwlUGso0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731475259; c=relaxed/simple; bh=gN4rRcxDrGPHvKavNslAgLtmdxF+/JtdbYoSQIePBHA=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=ju9IZC4kcX7Ax769Z7IE8tN720bxfsQGEhmefywyXYHMmvU2jeJkg/vJEcZL42F1aPqZt/tNFyJbbh4ylIB23vocl8cEmwq9LrAdRSeCSJ5Wjx3odIRzGTrhax9QLTe4CYNnExmicxcxSZ3pQrynDXf2J8LGmFp9+V+x6o5wUl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=V68zNOC+; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="V68zNOC+" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4ACMRgZc029778; Wed, 13 Nov 2024 05:20:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= b5cs+BCHpCE3cE4X+9TCFsANt/q4ZoHiJlj8F2C37/w=; b=V68zNOC+UF24Hws0 dMQMoGQrjMz/3BovO6Sy8ZWZ1/sqcCqCH35ABGA52xAqRoV9G1W8RQ8w5mFIg/H0 6v2ew9He0plGR/zY2mDAahxNigysImwlQE8wZx6mNewy0sFRk/nQlHihF6Wcrg08 Hq3QGjKFEbvMbQbXTM2zIasrwnhnBzXNsO7ZYqKtHDhr/PGkzC0lfDwTApZs0Z49 EJ86bIDAxh/XGrJsfv4bLpmdDOu4UV1HaDkOnTEOh3ya1DyBfBT/UPwDVrBwSbsO e7ryY9f7wHIJnDNjZxgmmLUQFu/KObe7CgAkL5aYrJKG1vFzGLL9aLeInGjYD5UY kkaB0g== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 42t0469n8h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Nov 2024 05:20:47 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 4AD5Kkcx007040 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Nov 2024 05:20:46 GMT Received: from [10.50.46.32] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Tue, 12 Nov 2024 21:20:39 -0800 Message-ID: Date: Wed, 13 Nov 2024 10:50:34 +0530 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v5 05/28] media: iris: implement video firmware load/unload Content-Language: en-US To: Bryan O'Donoghue , Vikash Garodia , Abhinav Kumar , "Mauro Carvalho Chehab" , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel CC: Hans Verkuil , Sebastian Fricke , Dmitry Baryshkov , Neil Armstrong , Nicolas Dufresne , =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= , Jianhua Lu , , , , References: <20241105-qcom-video-iris-v5-0-a88e7c220f78@quicinc.com> <20241105-qcom-video-iris-v5-5-a88e7c220f78@quicinc.com> <537ee97b-97d9-4ed8-9e11-eb3489eeff26@linaro.org> From: Dikshita Agarwal In-Reply-To: <537ee97b-97d9-4ed8-9e11-eb3489eeff26@linaro.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: B2EifZqw9pvEWf4ej8V90lvXkxfdZtGD X-Proofpoint-ORIG-GUID: B2EifZqw9pvEWf4ej8V90lvXkxfdZtGD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 spamscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411130046 On 11/11/2024 3:29 PM, Bryan O'Donoghue wrote: > On 05/11/2024 06:55, Dikshita Agarwal wrote: >> Load/unload firmware in memory via mdt loader. Firmware is loaded as >> part of core initialization and unloaded as part of core >> de-initialization. >> >> Signed-off-by: Dikshita Agarwal >> --- >>   drivers/media/platform/qcom/iris/Kconfig           |   2 + >>   drivers/media/platform/qcom/iris/Makefile          |   1 + >>   drivers/media/platform/qcom/iris/iris_core.c       |   8 ++ >>   drivers/media/platform/qcom/iris/iris_firmware.c   | 108 >> +++++++++++++++++++++ >>   drivers/media/platform/qcom/iris/iris_firmware.h   |  14 +++ >>   .../platform/qcom/iris/iris_platform_common.h      |  12 +++ >>   .../platform/qcom/iris/iris_platform_sm8550.c      |  10 ++ >>   7 files changed, 155 insertions(+) >> >> diff --git a/drivers/media/platform/qcom/iris/Kconfig >> b/drivers/media/platform/qcom/iris/Kconfig >> index 8debddec87a5..f92cc7fe9378 100644 >> --- a/drivers/media/platform/qcom/iris/Kconfig >> +++ b/drivers/media/platform/qcom/iris/Kconfig >> @@ -3,6 +3,8 @@ config VIDEO_QCOM_IRIS >>           depends on VIDEO_DEV >>           depends on ARCH_QCOM || COMPILE_TEST >>           select V4L2_MEM2MEM_DEV >> +        select QCOM_MDT_LOADER if ARCH_QCOM >> +        select QCOM_SCM >>           help >>             This is a V4L2 driver for Qualcomm iris video accelerator >>             hardware. It accelerates decoding operations on various >> diff --git a/drivers/media/platform/qcom/iris/Makefile >> b/drivers/media/platform/qcom/iris/Makefile >> index 93711f108a77..6906caa2c481 100644 >> --- a/drivers/media/platform/qcom/iris/Makefile >> +++ b/drivers/media/platform/qcom/iris/Makefile >> @@ -1,4 +1,5 @@ >>   iris-objs += iris_core.o \ >> +             iris_firmware.o \ >>                iris_hfi_gen1_command.o \ >>                iris_hfi_gen2_command.o \ >>                iris_hfi_queue.o \ >> diff --git a/drivers/media/platform/qcom/iris/iris_core.c >> b/drivers/media/platform/qcom/iris/iris_core.c >> index 360a54909ef6..8c7d53c57086 100644 >> --- a/drivers/media/platform/qcom/iris/iris_core.c >> +++ b/drivers/media/platform/qcom/iris/iris_core.c >> @@ -4,11 +4,13 @@ >>    */ >>     #include "iris_core.h" >> +#include "iris_firmware.h" >>   #include "iris_state.h" >>     void iris_core_deinit(struct iris_core *core) >>   { >>       mutex_lock(&core->lock); >> +    iris_fw_unload(core); >>       iris_hfi_queues_deinit(core); >>       core->state = IRIS_CORE_DEINIT; >>       mutex_unlock(&core->lock); >> @@ -33,10 +35,16 @@ int iris_core_init(struct iris_core *core) >>       if (ret) >>           goto error; >>   +    ret = iris_fw_load(core); >> +    if (ret) >> +        goto error_queue_deinit; >> + >>       mutex_unlock(&core->lock); >>         return 0; >>   +error_queue_deinit: >> +    iris_hfi_queues_deinit(core); >>   error: >>       core->state = IRIS_CORE_DEINIT; >>   exit: >> diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c >> b/drivers/media/platform/qcom/iris/iris_firmware.c >> new file mode 100644 >> index 000000000000..58a0f532b862 >> --- /dev/null >> +++ b/drivers/media/platform/qcom/iris/iris_firmware.c >> @@ -0,0 +1,108 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> +/* >> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights >> reserved. >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include "iris_core.h" >> +#include "iris_firmware.h" >> + >> +#define MAX_FIRMWARE_NAME_SIZE    128 >> + >> +static int iris_load_fw_to_memory(struct iris_core *core, const char >> *fw_name) >> +{ >> +    u32 pas_id = core->iris_platform_data->pas_id; >> +    const struct firmware *firmware = NULL; >> +    struct device *dev = core->dev; >> +    struct reserved_mem *rmem; >> +    struct device_node *node; >> +    phys_addr_t mem_phys; >> +    size_t res_size; >> +    ssize_t fw_size; >> +    void *mem_virt; >> +    int ret; >> + >> +    if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4) >> +        return -EINVAL; >> + >> +    node = of_parse_phandle(dev->of_node, "memory-region", 0); >> +    if (!node) >> +        return -EINVAL; >> + >> +    rmem = of_reserved_mem_lookup(node); > > of_node_put(node); > >> +    if (!rmem) { >> +        ret = -EINVAL; > return -EINVAL; >> +        goto err_put_node; > > remove > >> +    } >> + >> +    mem_phys = rmem->base; >> +    res_size = rmem->size; >> + >> +    ret = request_firmware(&firmware, fw_name, dev); >> +    if (ret) >> +        goto err_put_node; > > return ret; > >> + >> +    fw_size = qcom_mdt_get_size(firmware); >> +    if (fw_size < 0 || res_size < (size_t)fw_size) { >> +        ret = -EINVAL; >> +        goto err_release_fw; >> +    } >> + >> +    mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC); >> +    if (!mem_virt) >> +        goto err_release_fw; >> + >> +    ret = qcom_mdt_load(dev, firmware, fw_name, >> +                pas_id, mem_virt, mem_phys, res_size, NULL); >> +    if (ret) >> +        goto err_mem_unmap; >> + >> +    ret = qcom_scm_pas_auth_and_reset(pas_id); >> +    if (ret) >> +        goto err_mem_unmap; >> + >> +    return ret; >> + >> +err_mem_unmap: >> +    memunmap(mem_virt); >> +err_release_fw: >> +    release_firmware(firmware); >> +err_put_node: >> +    of_node_put(node); > > remove Sure, Will make the change. but are we just trying to avoid using "goto" here? Thanks, Dikshita > >> + >> +    return ret; >> +} >> + >> +int iris_fw_load(struct iris_core *core) >> +{ >> +    struct tz_cp_config *cp_config = >> core->iris_platform_data->tz_cp_config_data; >> +    int ret; >> + >> +    ret = iris_load_fw_to_memory(core, core->iris_platform_data->fwname); >> +    if (ret) { >> +        dev_err(core->dev, "firmware download failed\n"); >> +        return -ENOMEM; >> +    } >> + >> +    ret = qcom_scm_mem_protect_video_var(cp_config->cp_start, >> +                         cp_config->cp_size, >> +                         cp_config->cp_nonpixel_start, >> +                         cp_config->cp_nonpixel_size); >> +    if (ret) { >> +        dev_err(core->dev, "protect memory failed\n"); >> +        qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); >> +        return ret; >> +    } >> + >> +    return ret; >> +} >> + >> +int iris_fw_unload(struct iris_core *core) >> +{ >> +    return qcom_scm_pas_shutdown(core->iris_platform_data->pas_id); >> +} >> diff --git a/drivers/media/platform/qcom/iris/iris_firmware.h >> b/drivers/media/platform/qcom/iris/iris_firmware.h >> new file mode 100644 >> index 000000000000..8d4f6b7f75c5 >> --- /dev/null >> +++ b/drivers/media/platform/qcom/iris/iris_firmware.h >> @@ -0,0 +1,14 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> +/* >> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights >> reserved. >> + */ >> + >> +#ifndef _IRIS_FIRMWARE_H_ >> +#define _IRIS_FIRMWARE_H_ >> + >> +struct iris_core; >> + >> +int iris_fw_load(struct iris_core *core); >> +int iris_fw_unload(struct iris_core *core); >> + >> +#endif >> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h >> b/drivers/media/platform/qcom/iris/iris_platform_common.h >> index dac64ec4bf03..04bef37b7b77 100644 >> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h >> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h >> @@ -6,6 +6,8 @@ >>   #ifndef _IRIS_PLATFORM_COMMON_H_ >>   #define _IRIS_PLATFORM_COMMON_H_ >>   +#define IRIS_PAS_ID                9 >> + >>   extern struct iris_platform_data sm8550_data; >>     enum platform_clk_type { >> @@ -19,6 +21,13 @@ struct platform_clk_data { >>       const char *clk_name; >>   }; >>   +struct tz_cp_config { >> +    u32 cp_start; >> +    u32 cp_size; >> +    u32 cp_nonpixel_start; >> +    u32 cp_nonpixel_size; >> +}; >> + >>   struct iris_platform_data { >>       struct iris_inst *(*get_instance)(void); >>       const struct icc_info *icc_tbl; >> @@ -32,6 +41,9 @@ struct iris_platform_data { >>       const char * const *clk_rst_tbl; >>       unsigned int clk_rst_tbl_size; >>       u64 dma_mask; >> +    const char *fwname; >> +    u32 pas_id; >> +    struct tz_cp_config *tz_cp_config_data; >>   }; >>     #endif >> diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c >> b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c >> index 9b305b8e2110..96d9d6e816a0 100644 >> --- a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c >> +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c >> @@ -24,6 +24,13 @@ static const struct platform_clk_data >> sm8550_clk_table[] = { >>       {IRIS_HW_CLK,   "vcodec0_core" }, >>   }; >>   +static struct tz_cp_config tz_cp_config_sm8550 = { >> +    .cp_start = 0, >> +    .cp_size = 0x25800000, >> +    .cp_nonpixel_start = 0x01000000, >> +    .cp_nonpixel_size = 0x24800000, >> +}; >> + >>   struct iris_platform_data sm8550_data = { >>       .get_instance = iris_hfi_gen2_get_instance, >>       .icc_tbl = sm8550_icc_table, >> @@ -37,4 +44,7 @@ struct iris_platform_data sm8550_data = { >>       .clk_tbl = sm8550_clk_table, >>       .clk_tbl_size = ARRAY_SIZE(sm8550_clk_table), >>       .dma_mask = GENMASK(31, 29) - 1, >> +    .fwname = "qcom/vpu/vpu30_p4.mbn", >> +    .pas_id = IRIS_PAS_ID, >> +    .tz_cp_config_data = &tz_cp_config_sm8550, >>   }; >> >