From: Dikshita Agarwal via B4 Relay <devnull+quic_dikshita.quicinc.com@kernel.org>
To: 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: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Dikshita Agarwal <quic_dikshita@quicinc.com>
Subject: [PATCH v3 07/29] media: iris: implement video firmware load/unload
Date: Tue, 27 Aug 2024 15:35:32 +0530 [thread overview]
Message-ID: <20240827-iris_v3-v3-7-c5fdbbe65e70@quicinc.com> (raw)
In-Reply-To: <20240827-iris_v3-v3-0-c5fdbbe65e70@quicinc.com>
From: Dikshita Agarwal <quic_dikshita@quicinc.com>
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 | 146 +++++++++++++++++++++
drivers/media/platform/qcom/iris/iris_firmware.h | 14 ++
.../platform/qcom/iris/iris_platform_common.h | 12 ++
.../platform/qcom/iris/iris_platform_sm8250.c | 10 ++
.../platform/qcom/iris/iris_platform_sm8550.c | 10 ++
8 files changed, 203 insertions(+)
diff --git a/drivers/media/platform/qcom/iris/Kconfig b/drivers/media/platform/qcom/iris/Kconfig
index 4b757bb8adf3..ea518760c65c 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 48d54e53a576..ddd4c994a0b9 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..55bbcc798f4c
--- /dev/null
+++ b/drivers/media/platform/qcom/iris/iris_firmware.c
@@ -0,0 +1,146 @@
+// 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_protect_cp_mem(struct iris_core *core)
+{
+ struct tz_cp_config *cp_config;
+ int ret;
+
+ cp_config = core->iris_platform_data->tz_cp_config_data;
+
+ 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, "failed to protect memory(%d)\n", ret);
+
+ return ret;
+}
+
+static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
+{
+ const struct firmware *firmware = NULL;
+ struct device_node *node = NULL;
+ struct reserved_mem *rmem;
+ phys_addr_t mem_phys = 0;
+ void *mem_virt = NULL;
+ size_t res_size = 0;
+ ssize_t fw_size = 0;
+ struct device *dev;
+ int pas_id = 0;
+ int ret;
+
+ if (!fw_name || !(*fw_name) || !core)
+ return -EINVAL;
+
+ dev = core->dev;
+
+ if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4)
+ return -EINVAL;
+
+ pas_id = core->iris_platform_data->pas_id;
+
+ node = of_parse_phandle(dev->of_node, "memory-region", 0);
+ if (!node)
+ return -EINVAL;
+
+ rmem = of_reserved_mem_lookup(node);
+ if (!rmem) {
+ ret = -EINVAL;
+ goto err_put_node;
+ }
+
+ mem_phys = rmem->base;
+ res_size = rmem->size;
+
+ ret = request_firmware(&firmware, fw_name, dev);
+ if (ret) {
+ dev_err(core->dev, "failed to request fw \"%s\", error %d\n",
+ fw_name, ret);
+ goto err_put_node;
+ }
+
+ fw_size = qcom_mdt_get_size(firmware);
+ if (fw_size < 0 || res_size < (size_t)fw_size) {
+ ret = -EINVAL;
+ dev_err(core->dev, "out of bound fw image fw size: %ld, res_size: %lu\n",
+ fw_size, res_size);
+ goto err_release_fw;
+ }
+
+ mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC);
+ if (!mem_virt) {
+ dev_err(core->dev, "failed to remap fw memory phys %pa[p]\n",
+ &mem_phys);
+ goto err_release_fw;
+ }
+
+ ret = qcom_mdt_load(dev, firmware, fw_name,
+ pas_id, mem_virt, mem_phys, res_size, NULL);
+ if (ret) {
+ dev_err(core->dev, "error %d loading fw \"%s\"\n",
+ ret, fw_name);
+ goto err_mem_unmap;
+ }
+ ret = qcom_scm_pas_auth_and_reset(pas_id);
+ if (ret) {
+ dev_err(core->dev, "error %d authenticating fw \"%s\"\n",
+ ret, fw_name);
+ 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);
+ return ret;
+}
+
+int iris_fw_load(struct iris_core *core)
+{
+ 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 = iris_protect_cp_mem(core);
+ 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)
+{
+ int ret;
+
+ ret = qcom_scm_pas_shutdown(core->iris_platform_data->pas_id);
+ if (ret)
+ dev_err(core->dev, "firmware unload failed with ret %d\n", ret);
+
+ return ret;
+}
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 5287fdf913bc..9c919367f9d7 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;
extern struct iris_platform_data sm8250_data;
@@ -20,6 +22,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;
@@ -33,6 +42,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_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
index 664cb2b359a3..36bcb1b851ed 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c
@@ -25,6 +25,13 @@ static const struct platform_clk_data sm8250_clk_table[] = {
{IRIS_HW_CLK, "vcodec0_core" },
};
+static struct tz_cp_config tz_cp_config_sm8250 = {
+ .cp_start = 0,
+ .cp_size = 0x25800000,
+ .cp_nonpixel_start = 0x01000000,
+ .cp_nonpixel_size = 0x24800000,
+};
+
struct iris_platform_data sm8250_data = {
.get_instance = iris_hfi_gen1_get_instance,
.icc_tbl = sm8250_icc_table,
@@ -38,4 +45,7 @@ struct iris_platform_data sm8250_data = {
.clk_tbl = sm8250_clk_table,
.clk_tbl_size = ARRAY_SIZE(sm8250_clk_table),
.dma_mask = GENMASK(31, 29) - 1,
+ .fwname = "qcom/vpu/vpu20_p4.mbn",
+ .pas_id = IRIS_PAS_ID,
+ .tz_cp_config_data = &tz_cp_config_sm8250,
};
diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
index 0db832b099ac..1bb34c3e6e18 100644
--- a/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
+++ b/drivers/media/platform/qcom/iris/iris_platform_sm8550.c
@@ -25,6 +25,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,
@@ -38,4 +45,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,
};
--
2.34.1
next prev parent reply other threads:[~2024-08-27 10:06 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 10:05 [PATCH v3 00/29] Qualcomm iris video decoder driver Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 01/29] dt-bindings: media: Add sm8550 dt schema Dikshita Agarwal via B4 Relay
2024-08-27 10:42 ` Krzysztof Kozlowski
2024-09-05 5:41 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 02/29] media: MAINTAINERS: Add Qualcomm Iris video accelerator driver Dikshita Agarwal via B4 Relay
2024-08-27 10:42 ` Krzysztof Kozlowski
2024-09-05 5:47 ` Dikshita Agarwal
2024-09-05 10:10 ` Dmitry Baryshkov
2024-09-05 11:02 ` Dikshita Agarwal
2024-09-05 11:02 ` Dmitry Baryshkov
2024-09-05 11:14 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 03/29] media: iris: add platform driver for iris video device Dikshita Agarwal via B4 Relay
2024-08-27 14:08 ` Bryan O'Donoghue
2024-08-29 9:13 ` Dmitry Baryshkov
2024-08-29 9:36 ` Bryan O'Donoghue
2024-09-05 6:12 ` Dikshita Agarwal
2024-09-05 6:15 ` Dikshita Agarwal
2024-09-05 10:11 ` Dmitry Baryshkov
2024-09-05 10:59 ` Dikshita Agarwal
2024-09-05 11:07 ` Dmitry Baryshkov
2024-09-05 11:13 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 04/29] media: iris: initialize power resources Dikshita Agarwal via B4 Relay
2024-08-27 10:51 ` Krzysztof Kozlowski
2024-09-05 11:53 ` Dikshita Agarwal
2024-09-05 11:57 ` Krzysztof Kozlowski
2024-09-06 11:21 ` Vikash Garodia
2024-09-06 12:04 ` Krzysztof Kozlowski
2024-09-06 19:47 ` Vikash Garodia
2024-09-07 9:07 ` Krzysztof Kozlowski
2024-08-27 10:05 ` [PATCH v3 05/29] media: iris: implement iris v4l2 file ops Dikshita Agarwal via B4 Relay
2024-09-06 19:05 ` Markus Elfring
2024-09-07 8:52 ` Markus Elfring
2024-08-27 10:05 ` [PATCH v3 06/29] media: iris: introduce iris core state management with shared queues Dikshita Agarwal via B4 Relay
2024-08-28 2:38 ` kernel test robot
2024-08-27 10:05 ` Dikshita Agarwal via B4 Relay [this message]
2024-08-27 23:13 ` [PATCH v3 07/29] media: iris: implement video firmware load/unload kernel test robot
2024-08-31 13:18 ` Bryan O'Donoghue
2024-09-02 0:04 ` Dmitry Baryshkov
2024-09-05 6:17 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 08/29] media: iris: implement boot sequence of the firmware Dikshita Agarwal via B4 Relay
2024-09-05 12:34 ` Bryan O'Donoghue
2024-09-06 11:27 ` Vikash Garodia
2024-08-27 10:05 ` [PATCH v3 09/29] media: iris: introduce Host firmware interface with necessary hooks Dikshita Agarwal via B4 Relay
2024-09-05 12:36 ` Bryan O'Donoghue
2024-09-24 9:13 ` Dikshita Agarwal
2024-09-05 13:10 ` Bryan O'Donoghue
2024-09-06 13:31 ` Vikash Garodia
2024-08-27 10:05 ` [PATCH v3 10/29] media: iris: implement power management Dikshita Agarwal via B4 Relay
2024-09-05 13:23 ` Bryan O'Donoghue
2024-09-05 13:46 ` Krzysztof Kozlowski
2024-09-24 8:38 ` Dikshita Agarwal
2024-09-24 8:36 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 11/29] media: iris: implement reqbuf ioctl with vb2_queue_setup Dikshita Agarwal via B4 Relay
2024-09-06 12:50 ` Bryan O'Donoghue
2024-09-06 13:05 ` Bryan O'Donoghue
2024-09-26 10:47 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 12/29] media: iris: implement s_fmt, g_fmt and try_fmt ioctls Dikshita Agarwal via B4 Relay
2024-09-24 14:41 ` Bryan O'Donoghue
2024-09-26 10:49 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 13/29] media: iris: implement g_selection ioctl Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 14/29] media: iris: implement enum_fmt and enum_frameintervals ioctls Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 15/29] media: iris: implement subscribe_event and unsubscribe_event ioctls Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 16/29] media: iris: implement iris v4l2_ctrl_ops and prepare capabilities Dikshita Agarwal via B4 Relay
2024-08-29 9:33 ` Dmitry Baryshkov
2024-10-01 13:01 ` Vedang Nagar
2024-10-06 16:46 ` Dmitry Baryshkov
2024-08-27 10:05 ` [PATCH v3 17/29] media: iris: implement query_cap, query_ctrl and query_menu ioctls Dikshita Agarwal via B4 Relay
2024-09-24 14:49 ` Bryan O'Donoghue
2024-09-26 10:50 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 18/29] media: iris: implement vb2 streaming ops Dikshita Agarwal via B4 Relay
2024-08-28 0:26 ` kernel test robot
2024-08-27 10:05 ` [PATCH v3 19/29] media: iris: implement set properties to firmware during streamon Dikshita Agarwal via B4 Relay
2024-09-24 15:09 ` Bryan O'Donoghue
2024-08-27 10:05 ` [PATCH v3 20/29] media: iris: subscribe parameters and properties to firmware for hfi_gen2 Dikshita Agarwal via B4 Relay
2024-09-24 15:16 ` Bryan O'Donoghue
2024-09-26 10:55 ` Dikshita Agarwal
2024-08-27 10:05 ` [PATCH v3 21/29] media: iris: allocate, initialize and queue internal buffers Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 22/29] media: iris: implement vb2 ops for buf_queue and firmware response Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 23/29] media: iris: add support for dynamic resolution change Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 24/29] media: iris: handle streamoff/on from client in " Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 25/29] media: iris: add support for drain sequence Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 26/29] media: iris: add check whether the video session is supported or not Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 27/29] media: iris: implement power scaling for vpu2 and vpu3 Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 28/29] media: iris: add allow checks for v4l2 ioctls Dikshita Agarwal via B4 Relay
2024-08-27 10:05 ` [PATCH v3 29/29] media: iris: add check to allow sub states transitions Dikshita Agarwal via B4 Relay
2024-08-27 13:41 ` [PATCH v3 00/29] Qualcomm iris video decoder driver neil.armstrong
2024-09-24 9:13 ` Dikshita Agarwal
2024-10-01 13:28 ` Neil Armstrong
2024-08-31 15:18 ` Bryan O'Donoghue
2024-09-02 0:02 ` Dmitry Baryshkov
2024-09-06 14:19 ` Nicolas Dufresne
2024-09-06 19:26 ` Vikash Garodia
2024-09-06 16:28 ` Abhinav Kumar
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=20240827-iris_v3-v3-7-c5fdbbe65e70@quicinc.com \
--to=devnull+quic_dikshita.quicinc.com@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--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=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=robh@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).