From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: Dikshita Agarwal <quic_dikshita@quicinc.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: "Hans Verkuil" <hverkuil@xs4all.nl>,
"Sebastian Fricke" <sebastian.fricke@collabora.com>,
"Dmitry Baryshkov" <dmitry.baryshkov@linaro.org>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Nicolas Dufresne" <nicolas@ndufresne.ca>,
"Uwe Kleine-König" <u.kleine-koenig@baylibre.com>,
"Jianhua Lu" <lujianhua000@gmail.com>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 05/28] media: iris: implement video firmware load/unload
Date: Mon, 11 Nov 2024 09:59:07 +0000 [thread overview]
Message-ID: <537ee97b-97d9-4ed8-9e11-eb3489eeff26@linaro.org> (raw)
In-Reply-To: <20241105-qcom-video-iris-v5-5-a88e7c220f78@quicinc.com>
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 <quic_dikshita@quicinc.com>
> ---
> 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 <linux/firmware.h>
> +#include <linux/firmware/qcom/qcom_scm.h>
> +#include <linux/of_address.h>
> +#include <linux/of_reserved_mem.h>
> +#include <linux/soc/qcom/mdt_loader.h>
> +
> +#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
> +
> + 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,
> };
>
next prev parent reply other threads:[~2024-11-11 9:59 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-05 6:55 [PATCH v5 00/28] Qualcomm iris video decoder driver Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 01/28] dt-bindings: media: Add video support for QCOM SM8550 SoC Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 02/28] media: iris: add platform driver for iris video device Dikshita Agarwal
2024-11-09 17:32 ` Bryan O'Donoghue
2024-11-13 5:07 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 03/28] media: iris: implement iris v4l2 file ops Dikshita Agarwal
2024-11-10 3:10 ` Bryan O'Donoghue
2024-11-13 5:15 ` Dikshita Agarwal
2024-11-10 3:11 ` Bryan O'Donoghue
2024-11-05 6:55 ` [PATCH v5 04/28] media: iris: introduce iris core state management with shared queues Dikshita Agarwal
2024-11-10 21:37 ` Bryan O'Donoghue
2024-11-14 7:01 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 05/28] media: iris: implement video firmware load/unload Dikshita Agarwal
2024-11-11 9:59 ` Bryan O'Donoghue [this message]
2024-11-13 5:20 ` Dikshita Agarwal
2024-11-13 15:56 ` Bryan O'Donoghue
2024-11-14 5:47 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 06/28] media: iris: implement boot sequence of the firmware Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 07/28] imedia: iris: introduce host firmware interface with necessary hooks Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 08/28] media: iris: implement power management Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 09/28] media: iris: implement reqbuf ioctl with vb2_queue_setup Dikshita Agarwal
2024-11-12 9:50 ` Hans Verkuil
2024-11-13 6:19 ` Dikshita Agarwal
2024-11-13 7:48 ` Hans Verkuil
2024-11-13 9:00 ` Dikshita Agarwal
2024-11-13 9:22 ` Hans Verkuil
2024-11-13 10:32 ` Dikshita Agarwal
2024-11-13 11:15 ` Hans Verkuil
2024-11-13 11:20 ` Dikshita Agarwal
2024-11-13 12:14 ` Hans Verkuil
2024-11-13 12:44 ` Dikshita Agarwal
2024-11-13 12:50 ` Hans Verkuil
2024-11-13 13:05 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 10/28] media: iris: implement s_fmt, g_fmt and try_fmt ioctls Dikshita Agarwal
2024-11-12 10:18 ` Hans Verkuil
2024-11-13 5:25 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 11/28] media: iris: implement g_selection ioctl Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 12/28] media: iris: implement enum_fmt and enum_frameintervals ioctls Dikshita Agarwal
2024-11-12 10:23 ` Hans Verkuil
2024-11-13 5:27 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 13/28] media: iris: implement subscribe_event and unsubscribe_event ioctls Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 14/28] media: iris: implement iris v4l2_ctrl_ops Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 15/28] media: iris: implement query_cap ioctl Dikshita Agarwal
2024-11-12 10:24 ` Hans Verkuil
2024-11-13 5:27 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 16/28] media: iris: implement vb2 streaming ops Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 17/28] media: iris: implement set properties to firmware during streamon Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 18/28] media: iris: subscribe parameters and properties to firmware for hfi_gen2 Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 19/28] media: iris: allocate, initialize and queue internal buffers Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 20/28] media: iris: implement vb2 ops for buf_queue and firmware response Dikshita Agarwal
2024-11-12 10:49 ` Hans Verkuil
2024-11-13 5:30 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 21/28] media: iris: add support for dynamic resolution change Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 22/28] media: iris: handle streamoff/on from client in " Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 23/28] media: iris: add support for drain sequence Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 24/28] media: iris: add check whether the video session is supported or not Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 25/28] media: iris: implement power scaling for vpu2 and vpu3 Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 26/28] media: iris: add check to allow sub states transitions Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 27/28] media: iris: enable video driver probe of SM8250 SoC Dikshita Agarwal
2024-11-05 14:22 ` Jianhua Lu
2024-11-05 14:34 ` Jianhua Lu
2024-11-13 6:40 ` Dikshita Agarwal
2024-11-05 6:55 ` [PATCH v5 28/28] media: MAINTAINERS: add Qualcomm iris video accelerator driver Dikshita Agarwal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=537ee97b-97d9-4ed8-9e11-eb3489eeff26@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lujianhua000@gmail.com \
--cc=mchehab@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=nicolas@ndufresne.ca \
--cc=p.zabel@pengutronix.de \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=robh@kernel.org \
--cc=sebastian.fricke@collabora.com \
--cc=u.kleine-koenig@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox