Fill fw version info into smem to be printed as part of
soc info.
Signed-off-by: Dikshita Agarwal <[email protected]>
Reported-by: kernel test robot <[email protected]>
change since v3:
added dependency on QCOM_SMEM (Stephen)
---
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/qcom/venus/hfi_msgs.c | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index fd1831e..9c75e88 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -543,7 +543,7 @@ config VIDEO_TI_VPE_DEBUG
config VIDEO_QCOM_VENUS
tristate "Qualcomm Venus V4L2 encoder/decoder driver"
- depends on VIDEO_DEV && VIDEO_V4L2
+ depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
select QCOM_MDT_LOADER if ARCH_QCOM
select QCOM_SCM if ARCH_QCOM
diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c
index 06a1908..74cfc4f 100644
--- a/drivers/media/platform/qcom/venus/hfi_msgs.c
+++ b/drivers/media/platform/qcom/venus/hfi_msgs.c
@@ -6,6 +6,7 @@
#include <linux/hash.h>
#include <linux/list.h>
#include <linux/slab.h>
+#include <linux/soc/qcom/smem.h>
#include <media/videobuf2-v4l2.h>
#include "core.h"
@@ -14,6 +15,10 @@
#include "hfi_msgs.h"
#include "hfi_parser.h"
+#define SMEM_IMG_VER_TBL 469
+#define VER_STR_SZ 128
+#define SMEM_IMG_OFFSET_VENUS (14 * 128)
+
static void event_seq_changed(struct venus_core *core, struct venus_inst *inst,
struct hfi_msg_event_notify_pkt *pkt)
{
@@ -239,15 +244,27 @@ static void
sys_get_prop_image_version(struct device *dev,
struct hfi_msg_sys_property_info_pkt *pkt)
{
+ u8 *smem_tbl_ptr;
+ u8 *img_ver;
int req_bytes;
+ size_t smem_blk_sz;
req_bytes = pkt->hdr.size - sizeof(*pkt);
- if (req_bytes < 128 || !pkt->data[1] || pkt->num_properties > 1)
+ if (req_bytes < VER_STR_SZ || !pkt->data[1] || pkt->num_properties > 1)
/* bad packet */
return;
- dev_dbg(dev, VDBGL "F/W version: %s\n", (u8 *)&pkt->data[1]);
+ img_ver = (u8 *)&pkt->data[1];
+
+ dev_dbg(dev, VDBGL "F/W version: %s\n", img_ver);
+
+ smem_tbl_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY,
+ SMEM_IMG_VER_TBL, &smem_blk_sz);
+ if (smem_tbl_ptr &&
+ smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ)
+ memcpy(smem_tbl_ptr + SMEM_IMG_OFFSET_VENUS,
+ img_ver, VER_STR_SZ);
}
static void hfi_sys_property_info(struct venus_core *core,
--
2.7.4
On Fri 09 Apr 06:46 CDT 2021, Dikshita Agarwal wrote:
> Fill fw version info into smem to be printed as part of
> soc info.
>
> Signed-off-by: Dikshita Agarwal <[email protected]>
> Reported-by: kernel test robot <[email protected]>
Why/how did kernel test robot tell you that you should write the
firmware version in SMEM?
>
> change since v3:
> added dependency on QCOM_SMEM (Stephen)
> ---
> drivers/media/platform/Kconfig | 2 +-
> drivers/media/platform/qcom/venus/hfi_msgs.c | 21 +++++++++++++++++++--
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index fd1831e..9c75e88 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -543,7 +543,7 @@ config VIDEO_TI_VPE_DEBUG
>
> config VIDEO_QCOM_VENUS
> tristate "Qualcomm Venus V4L2 encoder/decoder driver"
> - depends on VIDEO_DEV && VIDEO_V4L2
> + depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
> depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
> select QCOM_MDT_LOADER if ARCH_QCOM
> select QCOM_SCM if ARCH_QCOM
> diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c
> index 06a1908..74cfc4f 100644
> --- a/drivers/media/platform/qcom/venus/hfi_msgs.c
> +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c
> @@ -6,6 +6,7 @@
> #include <linux/hash.h>
> #include <linux/list.h>
> #include <linux/slab.h>
> +#include <linux/soc/qcom/smem.h>
> #include <media/videobuf2-v4l2.h>
>
> #include "core.h"
> @@ -14,6 +15,10 @@
> #include "hfi_msgs.h"
> #include "hfi_parser.h"
>
> +#define SMEM_IMG_VER_TBL 469
> +#define VER_STR_SZ 128
> +#define SMEM_IMG_OFFSET_VENUS (14 * 128)
> +
> static void event_seq_changed(struct venus_core *core, struct venus_inst *inst,
> struct hfi_msg_event_notify_pkt *pkt)
> {
> @@ -239,15 +244,27 @@ static void
> sys_get_prop_image_version(struct device *dev,
> struct hfi_msg_sys_property_info_pkt *pkt)
> {
> + u8 *smem_tbl_ptr;
> + u8 *img_ver;
> int req_bytes;
> + size_t smem_blk_sz;
>
> req_bytes = pkt->hdr.size - sizeof(*pkt);
>
> - if (req_bytes < 128 || !pkt->data[1] || pkt->num_properties > 1)
> + if (req_bytes < VER_STR_SZ || !pkt->data[1] || pkt->num_properties > 1)
> /* bad packet */
> return;
>
> - dev_dbg(dev, VDBGL "F/W version: %s\n", (u8 *)&pkt->data[1]);
> + img_ver = (u8 *)&pkt->data[1];
> +
> + dev_dbg(dev, VDBGL "F/W version: %s\n", img_ver);
> +
> + smem_tbl_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY,
> + SMEM_IMG_VER_TBL, &smem_blk_sz);
> + if (smem_tbl_ptr &&
> + smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ)
> + memcpy(smem_tbl_ptr + SMEM_IMG_OFFSET_VENUS,
> + img_ver, VER_STR_SZ);
I think you should unwrap lines, the conditional isn't even more than 80
chars...
Apart from these nits I think the patch looks good.
Regards,
Bjorn
> }
>
> static void hfi_sys_property_info(struct venus_core *core,
> --
> 2.7.4
>
Quoting Dikshita Agarwal (2021-04-09 04:46:19)
> Fill fw version info into smem to be printed as part of
> soc info.
>
> Signed-off-by: Dikshita Agarwal <[email protected]>
> Reported-by: kernel test robot <[email protected]>
>
> change since v3:
> added dependency on QCOM_SMEM (Stephen)
> ---
Reviewed-by: Stephen Boyd <[email protected]>