On Thu Aug 27 15:33:32 2026 +0300, Antti Laakso wrote:
> Add ipu7 firmware mapping helpers to handle differences from ipu6.
>
> Signed-off-by: Antti Laakso <[email protected]>
> [Sakari Ailus: Use ipu6_ prefix for ipu7 related global symbols.]
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6.c | 83 +++++++++++++++++++++++++++++++++----
drivers/media/pci/intel/ipu6/ipu6.h | 1 +
2 files changed, 76 insertions(+), 8 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c
b/drivers/media/pci/intel/ipu6/ipu6.c
index 6e1d3b7efa20..817bf54e332a 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -19,6 +19,7 @@
#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <linux/types.h>
+#include <linux/vmalloc.h>
#include <media/ipu-bridge.h>
#include <media/ipu6-pci-table.h>
@@ -27,6 +28,7 @@
#include "ipu6-bus.h"
#include "ipu6-buttress.h"
#include "ipu6-cpd.h"
+#include "ipu6-dma.h"
#include "ipu6-isys.h"
#include "ipu6-mmu.h"
#include "ipu6-platform-buttress-regs.h"
@@ -516,6 +518,58 @@ static int ipu6_map_fw(struct ipu6_device *isp)
return 0;
}
+static int __ipu7_map_fw_non_secure(struct ipu6_device *isp)
+{
+ int ret;
+
+ /*
+ * Allocate and map memory for running the firmware. Not
+ * required in secure mode, in which firmware runs in IMR.
+ */
+ isp->fw_code_region = vmalloc(IPU7_FW_CODE_REGION_SIZE);
+ if (!isp->fw_code_region)
+ return -ENOMEM;
+
+ ret = ipu6_ipu7_cpd_copy_binary(isp->cpd_fw->data, "isys",
+ isp->fw_code_region,
+ &isp->isys->fw_entry);
+ if (ret)
+ return ret;
+
+ ret = ipu6_map_fw_region(isp->isys, isp->fw_code_region,
+ IPU7_FW_CODE_REGION_SIZE, DMA_BIDIRECTIONAL,
+ DMA_ATTR_RESERVE_REGION);
+ if (ret)
+ return ret;
+
+ ret = ipu6_ipu7_cpd_copy_binary(isp->cpd_fw->data, "psys",
+ isp->fw_code_region,
+ &isp->psys->fw_entry);
+ if (ret)
+ return ret;
+
+ return ipu6_map_fw_region(isp->psys, isp->fw_code_region,
+ IPU7_FW_CODE_REGION_SIZE, DMA_BIDIRECTIONAL,
+ DMA_ATTR_RESERVE_REGION);
+}
+
+static int ipu7_map_fw(struct ipu6_device *isp)
+{
+ int ret;
+
+ ret = isp->secure_mode ?
+ ipu6_map_fw_region(isp->psys, isp->cpd_fw->data,
+ isp->cpd_fw->size, DMA_BIDIRECTIONAL, 0) :
+ __ipu7_map_fw_non_secure(isp);
+ if (ret) {
+ dev_err_probe(&isp->pdev->dev, ret,
+ "Failed to init ipu7 firmware region\n");
+ return ret;
+ }
+
+ return 0;
+}
+
static int ipu6_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
const struct ipu6_buttress_ctrl *isys_ctrl, *psys_ctrl;
@@ -525,6 +579,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const
struct pci_device_id *id)
struct ipu6_device *isp;
phys_addr_t phys;
u32 val, version, sku_id;
+ unsigned long dir;
int ret;
isp = devm_kzalloc(dev, sizeof(*isp), GFP_KERNEL);
@@ -660,7 +715,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const
struct pci_device_id *id)
goto out_ipu6_rpm_put;
}
- ret = ipu6_map_fw(isp);
+ ret = IS_IPU7(isp) ? ipu7_map_fw(isp) : ipu6_map_fw(isp);
if (ret)
goto out_ipu6_rpm_put;
@@ -703,16 +758,21 @@ out_free_irq:
out_ipu6_rpm_put:
pm_runtime_put_sync(&isp->psys->auxdev.dev);
out_ipu6_bus_del_devices:
+ dir = IS_IPU7(isp) ? DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
if (!IS_ERR_OR_NULL(isp->psys)) {
ipu6_cpd_free_pkg_dir(isp->psys);
if (isp->psys->fw_sgt.nents)
- ipu6_unmap_fw_region(isp->psys, DMA_TO_DEVICE);
+ ipu6_unmap_fw_region(isp->psys, dir);
}
if (!IS_ERR_OR_NULL(isp->isys)) {
ipu6_cpd_free_pkg_dir(isp->isys);
if (isp->isys->fw_sgt.nents)
- ipu6_unmap_fw_region(isp->isys, DMA_TO_DEVICE);
+ ipu6_unmap_fw_region(isp->isys, dir);
}
+
+ vfree(isp->fw_code_region);
+ isp->fw_code_region = NULL;
+
if (!IS_ERR_OR_NULL(isp->psys) && !IS_ERR_OR_NULL(isp->psys->mmu))
ipu6_mmu_cleanup(isp->psys->mmu);
if (!IS_ERR_OR_NULL(isp->isys) && !IS_ERR_OR_NULL(isp->isys->mmu))
@@ -728,18 +788,23 @@ buttress_exit:
static void ipu6_pci_remove(struct pci_dev *pdev)
{
struct ipu6_device *isp = pci_get_drvdata(pdev);
+ unsigned long dir;
devm_free_irq(&pdev->dev, pdev->irq, isp);
- ipu6_cpd_free_pkg_dir(isp->psys);
- ipu6_unmap_fw_region(isp->psys, DMA_TO_DEVICE);
+ dir = IS_IPU7(isp) ? DMA_BIDIRECTIONAL : DMA_TO_DEVICE;
+ ipu6_cpd_free_pkg_dir(isp->psys);
+ ipu6_unmap_fw_region(isp->psys, dir);
if (isp->isys) {
ipu6_cpd_free_pkg_dir(isp->isys);
if (isp->isys->fw_sgt.nents)
- ipu6_unmap_fw_region(isp->isys, DMA_TO_DEVICE);
+ ipu6_unmap_fw_region(isp->isys, dir);
}
+ vfree(isp->fw_code_region);
+ isp->fw_code_region = NULL;
+
ipu6_buttress_exit(isp);
ipu6_bus_del_devices(pdev);
@@ -749,8 +814,10 @@ static void ipu6_pci_remove(struct pci_dev *pdev)
release_firmware(isp->cpd_fw);
- ipu6_mmu_cleanup(isp->psys->mmu);
- ipu6_mmu_cleanup(isp->isys->mmu);
+ if (isp->psys)
+ ipu6_mmu_cleanup(isp->psys->mmu);
+ if (isp->isys)
+ ipu6_mmu_cleanup(isp->isys->mmu);
}
static void ipu6_pci_reset_prepare(struct pci_dev *pdev)
diff --git a/drivers/media/pci/intel/ipu6/ipu6.h
b/drivers/media/pci/intel/ipu6/ipu6.h
index 6bef45a02c2b..a2992ffe8e3c 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.h
+++ b/drivers/media/pci/intel/ipu6/ipu6.h
@@ -70,6 +70,7 @@ struct ipu6_device {
bool secure_mode;
u8 hw_ver;
bool bus_ready_to_probe;
+ u32 *fw_code_region;
};
#define IPU_PSYS 0
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
