| Message ID | 1535034528-11590-4-git-send-email-vgarodia@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Venus updates - PIL | expand |
On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia <vgarodia@codeaurora.org> wrote: > > Video hardware is mainly comprised of vcodec subsystem and video > control subsystem. Video control has ARM9 which executes the video > firmware instructions whereas vcodec does the video frame processing. > This change adds support to load the video firmware and bring ARM9 > out of reset for platforms which does not have trustzone. > > Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org> > --- > drivers/media/platform/qcom/venus/core.c | 6 +- > drivers/media/platform/qcom/venus/core.h | 7 ++ > drivers/media/platform/qcom/venus/firmware.c | 90 +++++++++++++++++++++++- > drivers/media/platform/qcom/venus/firmware.h | 2 +- > drivers/media/platform/qcom/venus/hfi_venus_io.h | 1 + > 5 files changed, 99 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 75b9785..393994e 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -76,7 +76,7 @@ static void venus_sys_error_handler(struct work_struct *work) > hfi_core_deinit(core, true); > hfi_destroy(core); > mutex_lock(&core->lock); > - venus_shutdown(core->dev); > + venus_shutdown(core); > > pm_runtime_put_sync(core->dev); > > @@ -323,7 +323,7 @@ static int venus_probe(struct platform_device *pdev) > err_core_deinit: > hfi_core_deinit(core, false); > err_venus_shutdown: > - venus_shutdown(dev); > + venus_shutdown(core); > err_runtime_disable: > pm_runtime_set_suspended(dev); > pm_runtime_disable(dev); > @@ -344,7 +344,7 @@ static int venus_remove(struct platform_device *pdev) > WARN_ON(ret); > > hfi_destroy(core); > - venus_shutdown(dev); > + venus_shutdown(core); > of_platform_depopulate(dev); > > pm_runtime_put_sync(dev); > diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h > index dfd5c10..b2cb359 100644 > --- a/drivers/media/platform/qcom/venus/core.h > +++ b/drivers/media/platform/qcom/venus/core.h > @@ -81,6 +81,11 @@ struct venus_caps { > bool valid; /* used only for Venus v1xx */ > }; > > +struct video_firmware { > + struct device *dev; > + struct iommu_domain *iommu_domain; > +}; > + > /** > * struct venus_core - holds core parameters valid for all instances > * > @@ -98,6 +103,7 @@ struct venus_caps { > * @dev: convenience struct device pointer > * @dev_dec: convenience struct device pointer for decoder device > * @dev_enc: convenience struct device pointer for encoder device > + * @fw: a struct for venus firmware info > * @no_tz: a flag that suggests presence of trustzone > * @lock: a lock for this strucure > * @instances: a list_head of all instances > @@ -130,6 +136,7 @@ struct venus_core { > struct device *dev; > struct device *dev_dec; > struct device *dev_enc; > + struct video_firmware fw; Since struct video_firmware is only used here I think you can declare it inline, i.e. struct { struct device *dev; struct iommu_domain *iommu_domain; } fw; This structure is actually a good candidate to hold the firmware memory area start address and size. > bool no_tz; > struct mutex lock; > struct list_head instances; > diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c > index 34224eb..79b3858 100644 > --- a/drivers/media/platform/qcom/venus/firmware.c > +++ b/drivers/media/platform/qcom/venus/firmware.c > @@ -15,9 +15,11 @@ > #include <linux/device.h> > #include <linux/firmware.h> > #include <linux/kernel.h> > +#include <linux/iommu.h> > #include <linux/io.h> > #include <linux/of.h> > #include <linux/of_address.h> > +#include <linux/platform_device.h> > #include <linux/qcom_scm.h> > #include <linux/sizes.h> > #include <linux/soc/qcom/mdt_loader.h> > @@ -120,6 +122,76 @@ static int venus_load_fw(struct venus_core *core, const char *fwname, > return ret; > } > > +static int venus_boot_no_tz(struct venus_core *core, phys_addr_t mem_phys, > + size_t mem_size) After moving the firmware address and size into venus_core you won't need the last two arguments. > +{ > + struct iommu_domain *iommu_dom; > + struct device *dev; > + int ret; > + > + dev = core->fw.dev; > + if (!dev) > + return -EPROBE_DEFER; > + > + iommu_dom = iommu_domain_alloc(&platform_bus_type); > + if (!iommu_dom) { > + dev_err(dev, "Failed to allocate iommu domain\n"); > + return -ENOMEM; > + } > + > + ret = iommu_attach_device(iommu_dom, dev); > + if (ret) { > + dev_err(dev, "could not attach device\n"); > + goto err_attach; > + } I think like the above belongs more in venus_firmware_init() (introduced in patch 4/4) than here. There is no reason to detach/reattach the iommu if we stop the firmware. > + > + ret = iommu_map(iommu_dom, VENUS_FW_START_ADDR, mem_phys, mem_size, > + IOMMU_READ | IOMMU_WRITE | IOMMU_PRIV); > + if (ret) { > + dev_err(dev, "could not map video firmware region\n"); > + goto err_map; > + } Maybe this too? > + > + core->fw.iommu_domain = iommu_dom; > + venus_reset_cpu(core); > + > + return 0; > + > +err_map: > + iommu_detach_device(iommu_dom, dev); > +err_attach: > + iommu_domain_free(iommu_dom); > + return ret; > +} > + > +static int venus_shutdown_no_tz(struct venus_core *core) > +{ > + struct iommu_domain *iommu; > + size_t unmapped; > + u32 reg; > + struct device *dev = core->fw.dev; > + void __iomem *base = core->base; > + > + /* Assert the reset to ARM9 */ > + reg = readl_relaxed(base + WRAPPER_A9SS_SW_RESET); > + reg |= WRAPPER_A9SS_SW_RESET_BIT; > + writel_relaxed(reg, base + WRAPPER_A9SS_SW_RESET); > + > + /* Make sure reset is asserted before the mapping is removed */ > + mb(); > + > + iommu = core->fw.iommu_domain; > + > + unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, VENUS_FW_MEM_SIZE); > + if (unmapped != VENUS_FW_MEM_SIZE) > + dev_err(dev, "failed to unmap firmware\n"); > + > + iommu_detach_device(iommu, dev); > + iommu_domain_free(iommu); Accordingly, this would also be moved into venus_firmware_deinit().
Hi Alex, On 2018-08-24 13:09, Alexandre Courbot wrote: > On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia > <vgarodia@codeaurora.org> wrote: [snip] >> +struct video_firmware { >> + struct device *dev; >> + struct iommu_domain *iommu_domain; >> +}; >> + >> /** >> * struct venus_core - holds core parameters valid for all instances >> * >> @@ -98,6 +103,7 @@ struct venus_caps { >> * @dev: convenience struct device pointer >> * @dev_dec: convenience struct device pointer for decoder device >> * @dev_enc: convenience struct device pointer for encoder device >> + * @fw: a struct for venus firmware info >> * @no_tz: a flag that suggests presence of trustzone >> * @lock: a lock for this strucure >> * @instances: a list_head of all instances >> @@ -130,6 +136,7 @@ struct venus_core { >> struct device *dev; >> struct device *dev_dec; >> struct device *dev_enc; >> + struct video_firmware fw; > > Since struct video_firmware is only used here I think you can declare > it inline, i.e. > > struct { > struct device *dev; > struct iommu_domain *iommu_domain; > } fw; > > This structure is actually a good candidate to hold the firmware > memory area start address and size. I can make it inline. Memory area and size are common parameters populated locally while loading the firmware with or without tz. Firmware struct has info more specific to firmware device. [snip] > >> +{ >> + struct iommu_domain *iommu_dom; >> + struct device *dev; >> + int ret; >> + >> + dev = core->fw.dev; >> + if (!dev) >> + return -EPROBE_DEFER; >> + >> + iommu_dom = iommu_domain_alloc(&platform_bus_type); >> + if (!iommu_dom) { >> + dev_err(dev, "Failed to allocate iommu domain\n"); >> + return -ENOMEM; >> + } >> + >> + ret = iommu_attach_device(iommu_dom, dev); >> + if (ret) { >> + dev_err(dev, "could not attach device\n"); >> + goto err_attach; >> + } > > I think like the above belongs more in venus_firmware_init() > (introduced in patch 4/4) than here. There is no reason to > detach/reattach the iommu if we stop the firmware. Consider the case when we want to reload the firmware during error recovery. Boot and shutdown will be needed in such case without the need to populate the firmware device again. [snip] >> +static int venus_shutdown_no_tz(struct venus_core *core) >> +{ >> + struct iommu_domain *iommu; >> + size_t unmapped; >> + u32 reg; >> + struct device *dev = core->fw.dev; >> + void __iomem *base = core->base; >> + >> + /* Assert the reset to ARM9 */ >> + reg = readl_relaxed(base + WRAPPER_A9SS_SW_RESET); >> + reg |= WRAPPER_A9SS_SW_RESET_BIT; >> + writel_relaxed(reg, base + WRAPPER_A9SS_SW_RESET); >> + >> + /* Make sure reset is asserted before the mapping is removed >> */ >> + mb(); >> + >> + iommu = core->fw.iommu_domain; >> + >> + unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, >> VENUS_FW_MEM_SIZE); >> + if (unmapped != VENUS_FW_MEM_SIZE) >> + dev_err(dev, "failed to unmap firmware\n"); >> + >> + iommu_detach_device(iommu, dev); >> + iommu_domain_free(iommu); > > Accordingly, this would also be moved into venus_firmware_deinit(). Same explanation here as well. Thanks, Vikash
On Fri, Aug 24, 2018 at 9:26 PM Vikash Garodia <vgarodia@codeaurora.org> wrote: > > Hi Alex, > > On 2018-08-24 13:09, Alexandre Courbot wrote: > > On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia > > <vgarodia@codeaurora.org> wrote: > > [snip] > > >> +struct video_firmware { > >> + struct device *dev; > >> + struct iommu_domain *iommu_domain; > >> +}; > >> + > >> /** > >> * struct venus_core - holds core parameters valid for all instances > >> * > >> @@ -98,6 +103,7 @@ struct venus_caps { > >> * @dev: convenience struct device pointer > >> * @dev_dec: convenience struct device pointer for decoder device > >> * @dev_enc: convenience struct device pointer for encoder device > >> + * @fw: a struct for venus firmware info > >> * @no_tz: a flag that suggests presence of trustzone > >> * @lock: a lock for this strucure > >> * @instances: a list_head of all instances > >> @@ -130,6 +136,7 @@ struct venus_core { > >> struct device *dev; > >> struct device *dev_dec; > >> struct device *dev_enc; > >> + struct video_firmware fw; > > > > Since struct video_firmware is only used here I think you can declare > > it inline, i.e. > > > > struct { > > struct device *dev; > > struct iommu_domain *iommu_domain; > > } fw; > > > > This structure is actually a good candidate to hold the firmware > > memory area start address and size. > > I can make it inline. > Memory area and size are common parameters populated > locally while loading the firmware with or without tz. Firmware struct > has > info more specific to firmware device. > > [snip] > > > > >> +{ > >> + struct iommu_domain *iommu_dom; > >> + struct device *dev; > >> + int ret; > >> + > >> + dev = core->fw.dev; > >> + if (!dev) > >> + return -EPROBE_DEFER; > >> + > >> + iommu_dom = iommu_domain_alloc(&platform_bus_type); > >> + if (!iommu_dom) { > >> + dev_err(dev, "Failed to allocate iommu domain\n"); > >> + return -ENOMEM; > >> + } > >> + > >> + ret = iommu_attach_device(iommu_dom, dev); > >> + if (ret) { > >> + dev_err(dev, "could not attach device\n"); > >> + goto err_attach; > >> + } > > > > I think like the above belongs more in venus_firmware_init() > > (introduced in patch 4/4) than here. There is no reason to > > detach/reattach the iommu if we stop the firmware. > > Consider the case when we want to reload the firmware during error > recovery. > Boot and shutdown will be needed in such case without the need to > populate > the firmware device again. Is there a need to reattach the iommu domain in case of an error?
On 2018-08-27 08:36, Alexandre Courbot wrote: > On Fri, Aug 24, 2018 at 9:26 PM Vikash Garodia > <vgarodia@codeaurora.org> wrote: >> >> Hi Alex, >> >> On 2018-08-24 13:09, Alexandre Courbot wrote: >> > On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia >> > <vgarodia@codeaurora.org> wrote: >> >> [snip] >> >> >> +struct video_firmware { >> >> + struct device *dev; >> >> + struct iommu_domain *iommu_domain; >> >> +}; >> >> + >> >> /** >> >> * struct venus_core - holds core parameters valid for all instances >> >> * >> >> @@ -98,6 +103,7 @@ struct venus_caps { >> >> * @dev: convenience struct device pointer >> >> * @dev_dec: convenience struct device pointer for decoder device >> >> * @dev_enc: convenience struct device pointer for encoder device >> >> + * @fw: a struct for venus firmware info >> >> * @no_tz: a flag that suggests presence of trustzone >> >> * @lock: a lock for this strucure >> >> * @instances: a list_head of all instances >> >> @@ -130,6 +136,7 @@ struct venus_core { >> >> struct device *dev; >> >> struct device *dev_dec; >> >> struct device *dev_enc; >> >> + struct video_firmware fw; >> > >> > Since struct video_firmware is only used here I think you can declare >> > it inline, i.e. >> > >> > struct { >> > struct device *dev; >> > struct iommu_domain *iommu_domain; >> > } fw; >> > >> > This structure is actually a good candidate to hold the firmware >> > memory area start address and size. >> >> I can make it inline. >> Memory area and size are common parameters populated >> locally while loading the firmware with or without tz. Firmware struct >> has >> info more specific to firmware device. >> >> [snip] >> >> > >> >> +{ >> >> + struct iommu_domain *iommu_dom; >> >> + struct device *dev; >> >> + int ret; >> >> + >> >> + dev = core->fw.dev; >> >> + if (!dev) >> >> + return -EPROBE_DEFER; >> >> + >> >> + iommu_dom = iommu_domain_alloc(&platform_bus_type); >> >> + if (!iommu_dom) { >> >> + dev_err(dev, "Failed to allocate iommu domain\n"); >> >> + return -ENOMEM; >> >> + } >> >> + >> >> + ret = iommu_attach_device(iommu_dom, dev); >> >> + if (ret) { >> >> + dev_err(dev, "could not attach device\n"); >> >> + goto err_attach; >> >> + } >> > >> > I think like the above belongs more in venus_firmware_init() >> > (introduced in patch 4/4) than here. There is no reason to >> > detach/reattach the iommu if we stop the firmware. >> >> Consider the case when we want to reload the firmware during error >> recovery. >> Boot and shutdown will be needed in such case without the need to >> populate >> the firmware device again. > > Is there a need to reattach the iommu domain in case of an error? re-attach is not needed. We can have alloc/attach in init and detach/free in deinit. map/reset and unmap/reset can continue to remain in boot and shutdown calls. Let me know if this is good, i can repatch the series.
On Mon, Aug 27, 2018 at 9:49 PM Vikash Garodia <vgarodia@codeaurora.org> wrote: > > On 2018-08-27 08:36, Alexandre Courbot wrote: > > On Fri, Aug 24, 2018 at 9:26 PM Vikash Garodia > > <vgarodia@codeaurora.org> wrote: > >> > >> Hi Alex, > >> > >> On 2018-08-24 13:09, Alexandre Courbot wrote: > >> > On Thu, Aug 23, 2018 at 11:29 PM Vikash Garodia > >> > <vgarodia@codeaurora.org> wrote: > >> > >> [snip] > >> > >> >> +struct video_firmware { > >> >> + struct device *dev; > >> >> + struct iommu_domain *iommu_domain; > >> >> +}; > >> >> + > >> >> /** > >> >> * struct venus_core - holds core parameters valid for all instances > >> >> * > >> >> @@ -98,6 +103,7 @@ struct venus_caps { > >> >> * @dev: convenience struct device pointer > >> >> * @dev_dec: convenience struct device pointer for decoder device > >> >> * @dev_enc: convenience struct device pointer for encoder device > >> >> + * @fw: a struct for venus firmware info > >> >> * @no_tz: a flag that suggests presence of trustzone > >> >> * @lock: a lock for this strucure > >> >> * @instances: a list_head of all instances > >> >> @@ -130,6 +136,7 @@ struct venus_core { > >> >> struct device *dev; > >> >> struct device *dev_dec; > >> >> struct device *dev_enc; > >> >> + struct video_firmware fw; > >> > > >> > Since struct video_firmware is only used here I think you can declare > >> > it inline, i.e. > >> > > >> > struct { > >> > struct device *dev; > >> > struct iommu_domain *iommu_domain; > >> > } fw; > >> > > >> > This structure is actually a good candidate to hold the firmware > >> > memory area start address and size. > >> > >> I can make it inline. > >> Memory area and size are common parameters populated > >> locally while loading the firmware with or without tz. Firmware struct > >> has > >> info more specific to firmware device. > >> > >> [snip] > >> > >> > > >> >> +{ > >> >> + struct iommu_domain *iommu_dom; > >> >> + struct device *dev; > >> >> + int ret; > >> >> + > >> >> + dev = core->fw.dev; > >> >> + if (!dev) > >> >> + return -EPROBE_DEFER; > >> >> + > >> >> + iommu_dom = iommu_domain_alloc(&platform_bus_type); > >> >> + if (!iommu_dom) { > >> >> + dev_err(dev, "Failed to allocate iommu domain\n"); > >> >> + return -ENOMEM; > >> >> + } > >> >> + > >> >> + ret = iommu_attach_device(iommu_dom, dev); > >> >> + if (ret) { > >> >> + dev_err(dev, "could not attach device\n"); > >> >> + goto err_attach; > >> >> + } > >> > > >> > I think like the above belongs more in venus_firmware_init() > >> > (introduced in patch 4/4) than here. There is no reason to > >> > detach/reattach the iommu if we stop the firmware. > >> > >> Consider the case when we want to reload the firmware during error > >> recovery. > >> Boot and shutdown will be needed in such case without the need to > >> populate > >> the firmware device again. > > > > Is there a need to reattach the iommu domain in case of an error? > > re-attach is not needed. We can have alloc/attach in init and > detach/free in deinit. > map/reset and unmap/reset can continue to remain in boot and shutdown > calls. Let me > know if this is good, i can repatch the series. Yeah, the idea is to avoid repeating operations that do not need to be. Thanks!
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 75b9785..393994e 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -76,7 +76,7 @@ static void venus_sys_error_handler(struct work_struct *work) hfi_core_deinit(core, true); hfi_destroy(core); mutex_lock(&core->lock); - venus_shutdown(core->dev); + venus_shutdown(core); pm_runtime_put_sync(core->dev); @@ -323,7 +323,7 @@ static int venus_probe(struct platform_device *pdev) err_core_deinit: hfi_core_deinit(core, false); err_venus_shutdown: - venus_shutdown(dev); + venus_shutdown(core); err_runtime_disable: pm_runtime_set_suspended(dev); pm_runtime_disable(dev); @@ -344,7 +344,7 @@ static int venus_remove(struct platform_device *pdev) WARN_ON(ret); hfi_destroy(core); - venus_shutdown(dev); + venus_shutdown(core); of_platform_depopulate(dev); pm_runtime_put_sync(dev); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index dfd5c10..b2cb359 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -81,6 +81,11 @@ struct venus_caps { bool valid; /* used only for Venus v1xx */ }; +struct video_firmware { + struct device *dev; + struct iommu_domain *iommu_domain; +}; + /** * struct venus_core - holds core parameters valid for all instances * @@ -98,6 +103,7 @@ struct venus_caps { * @dev: convenience struct device pointer * @dev_dec: convenience struct device pointer for decoder device * @dev_enc: convenience struct device pointer for encoder device + * @fw: a struct for venus firmware info * @no_tz: a flag that suggests presence of trustzone * @lock: a lock for this strucure * @instances: a list_head of all instances @@ -130,6 +136,7 @@ struct venus_core { struct device *dev; struct device *dev_dec; struct device *dev_enc; + struct video_firmware fw; bool no_tz; struct mutex lock; struct list_head instances; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 34224eb..79b3858 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -15,9 +15,11 @@ #include <linux/device.h> #include <linux/firmware.h> #include <linux/kernel.h> +#include <linux/iommu.h> #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/platform_device.h> #include <linux/qcom_scm.h> #include <linux/sizes.h> #include <linux/soc/qcom/mdt_loader.h> @@ -120,6 +122,76 @@ static int venus_load_fw(struct venus_core *core, const char *fwname, return ret; } +static int venus_boot_no_tz(struct venus_core *core, phys_addr_t mem_phys, + size_t mem_size) +{ + struct iommu_domain *iommu_dom; + struct device *dev; + int ret; + + dev = core->fw.dev; + if (!dev) + return -EPROBE_DEFER; + + iommu_dom = iommu_domain_alloc(&platform_bus_type); + if (!iommu_dom) { + dev_err(dev, "Failed to allocate iommu domain\n"); + return -ENOMEM; + } + + ret = iommu_attach_device(iommu_dom, dev); + if (ret) { + dev_err(dev, "could not attach device\n"); + goto err_attach; + } + + ret = iommu_map(iommu_dom, VENUS_FW_START_ADDR, mem_phys, mem_size, + IOMMU_READ | IOMMU_WRITE | IOMMU_PRIV); + if (ret) { + dev_err(dev, "could not map video firmware region\n"); + goto err_map; + } + + core->fw.iommu_domain = iommu_dom; + venus_reset_cpu(core); + + return 0; + +err_map: + iommu_detach_device(iommu_dom, dev); +err_attach: + iommu_domain_free(iommu_dom); + return ret; +} + +static int venus_shutdown_no_tz(struct venus_core *core) +{ + struct iommu_domain *iommu; + size_t unmapped; + u32 reg; + struct device *dev = core->fw.dev; + void __iomem *base = core->base; + + /* Assert the reset to ARM9 */ + reg = readl_relaxed(base + WRAPPER_A9SS_SW_RESET); + reg |= WRAPPER_A9SS_SW_RESET_BIT; + writel_relaxed(reg, base + WRAPPER_A9SS_SW_RESET); + + /* Make sure reset is asserted before the mapping is removed */ + mb(); + + iommu = core->fw.iommu_domain; + + unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, VENUS_FW_MEM_SIZE); + if (unmapped != VENUS_FW_MEM_SIZE) + dev_err(dev, "failed to unmap firmware\n"); + + iommu_detach_device(iommu, dev); + iommu_domain_free(iommu); + + return 0; +} + int venus_boot(struct venus_core *core) { struct device *dev = core->dev; @@ -137,10 +209,22 @@ int venus_boot(struct venus_core *core) return -EINVAL; } - return qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); + if (core->no_tz) + ret = venus_boot_no_tz(core, mem_phys, mem_size); + else + ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); + + return ret; } -int venus_shutdown(struct device *dev) +int venus_shutdown(struct venus_core *core) { - return qcom_scm_pas_shutdown(VENUS_PAS_ID); + int ret; + + if (core->no_tz) + ret = venus_shutdown_no_tz(core); + else + ret = qcom_scm_pas_shutdown(VENUS_PAS_ID); + + return ret; } diff --git a/drivers/media/platform/qcom/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h index 1343747..f41b615 100644 --- a/drivers/media/platform/qcom/venus/firmware.h +++ b/drivers/media/platform/qcom/venus/firmware.h @@ -17,7 +17,7 @@ struct device; int venus_boot(struct venus_core *core); -int venus_shutdown(struct device *dev); +int venus_shutdown(struct venus_core *core); int venus_set_hw_state(struct venus_core *core, bool suspend); static inline int venus_set_hw_state_suspend(struct venus_core *core) diff --git a/drivers/media/platform/qcom/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h index 483348d..cf63864 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus_io.h +++ b/drivers/media/platform/qcom/venus/hfi_venus_io.h @@ -119,6 +119,7 @@ #define WRAPPER_NP_START_ADDR (WRAPPER_BASE + 0x1030) #define WRAPPER_NP_END_ADDR (WRAPPER_BASE + 0x1034) #define WRAPPER_A9SS_SW_RESET (WRAPPER_BASE + 0x3000) +#define WRAPPER_A9SS_SW_RESET_BIT BIT(4) /* Venus 4xx */ #define WRAPPER_VCODEC0_MMCC_POWER_STATUS (WRAPPER_BASE + 0x90)
Video hardware is mainly comprised of vcodec subsystem and video control subsystem. Video control has ARM9 which executes the video firmware instructions whereas vcodec does the video frame processing. This change adds support to load the video firmware and bring ARM9 out of reset for platforms which does not have trustzone. Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org> --- drivers/media/platform/qcom/venus/core.c | 6 +- drivers/media/platform/qcom/venus/core.h | 7 ++ drivers/media/platform/qcom/venus/firmware.c | 90 +++++++++++++++++++++++- drivers/media/platform/qcom/venus/firmware.h | 2 +- drivers/media/platform/qcom/venus/hfi_venus_io.h | 1 + 5 files changed, 99 insertions(+), 7 deletions(-)