Skip to content

PENDING: media: iris: update MDT PAS load call for new API #413

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

Open
gouravk-qualcomm wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+2 −11
Open

PENDING: media: iris: update MDT PAS load call for new API #413

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
13 changes: 2 additions & 11 deletions drivers/media/platform/qcom/iris/iris_firmware.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
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)
Expand Down Expand Up @@ -66,22 +65,16 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
goto err_release_fw;
}

mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC);
if (!mem_virt) {
ret = -ENOMEM;
goto err_release_fw;
}

ret = qcom_mdt_pas_load(ctx, firmware, fw_name, NULL);
qcom_scm_pas_metadata_release(ctx);
if (ret)
goto err_mem_unmap;
goto err_release_fw;

if (core->fw.iommu_domain) {
ret = iommu_map(core->fw.iommu_domain, 0, mem_phys, res_size,
IOMMU_READ | IOMMU_WRITE | IOMMU_PRIV, GFP_KERNEL);
if (ret)
goto err_mem_unmap;
goto err_release_fw;
}

ret = qcom_scm_pas_prepare_and_auth_reset(ctx);
Expand All @@ -94,8 +87,6 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)

err_iommu_unmap:
iommu_unmap(core->fw.iommu_domain, 0, res_size);
err_mem_unmap:
memunmap(mem_virt);
err_release_fw:
release_firmware(firmware);

Expand Down