From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9341AC433DB for ; Tue, 30 Mar 2021 03:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68C496195D for ; Tue, 30 Mar 2021 03:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230323AbhC3D7Z (ORCPT ); Mon, 29 Mar 2021 23:59:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbhC3D7T (ORCPT ); Mon, 29 Mar 2021 23:59:19 -0400 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3ED5C061765 for ; Mon, 29 Mar 2021 20:59:18 -0700 (PDT) Received: by mail-oi1-x22d.google.com with SMTP id i3so15188559oik.7 for ; Mon, 29 Mar 2021 20:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=WP0mHVRfSgD11CnMchrfyBzI0cUHCyMRSuWMrdjjb3E=; b=oS+vHN3g+qSDLxKdVwIPsILJhfllG3VJX86R9Sw/zDirZhoQXi4dTtiOhPAfLPhLPc ZWfsEMsEt6CN3Vwiwb0LqTm+Bw0LRenUPjoTHGbhGtfUqrrxGIFYfASD3LUGZngrJc2n pd31Dqe5Md/jTWneAL6A55QlN4Z11SdyqA5HyaLNkiNsLGGaK6bXao2TFPh1zjGfQzPF 47qP3zpm6AuvjgPqKEMZPaFbxroFe1TUE5YxaRa7NMU4lVIj/Y+5XOWbRdrxo7D2SqJp knYEosz2nG0zpxBvbxWXXSh95gUQjMBpRCjqkFal0mIv1+bcqwKMXymFvhWrliFrBDyE 38BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=WP0mHVRfSgD11CnMchrfyBzI0cUHCyMRSuWMrdjjb3E=; b=qzTjtq+e7oKVTdqygq/tQQcybryTASxLXCzey7a1w/ZJQIHrS/6IeJ4GxPgCD2exPf s0hoEhZoabzseV8/YWOiNvnRxslw94ZxlKD+z/ux1wJJqVtAkIcQibWcDH9LUEZ4+ewg zsREXbigcrJgN1pyVT+1oGY0N3xiYB7lnxzzc9fybiwPXQJWB/xP7HFxeCLE0cBuOmQU UDTg8+twml7td1v9sLPo1Cxv5cMCbOzuZSMjKdDapA+SZz39rwzvssmYXxhwNIHl4LaF Nx+bP3LeqxdoaJNn2BxI5PKgXIk6zscmImkFh0q1TBaLxEDvTXqbHXdXntZ3HJYzdutB dH9w== X-Gm-Message-State: AOAM530yF50EMXIGDKn/1+CVNq1TmeLgEGTy83KU86sa4XSc6TB2+yZe iU+xqWSDUjXg4FDCewQifsHBvA== X-Google-Smtp-Source: ABdhPJwysEdD3KX+W2avFCwryY09gyAZPTrl1omxmSBc+ok+dBpO/+tPGrK5oIdfg1sKUv5kP9EbYg== X-Received: by 2002:a05:6808:94:: with SMTP id s20mr1745468oic.25.1617076757980; Mon, 29 Mar 2021 20:59:17 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id a6sm4804176otq.79.2021.03.29.20.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 20:59:17 -0700 (PDT) Date: Mon, 29 Mar 2021 22:59:15 -0500 From: Bjorn Andersson To: Dikshita Agarwal Cc: linux-media@vger.kernel.org, stanimir.varbanov@linaro.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, vgarodia@codeaurora.org Subject: Re: [PATCH v2] media: venus : hfi: add venus image info into smem Message-ID: References: <1616740405-5085-1-git-send-email-dikshita@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1616740405-5085-1-git-send-email-dikshita@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri 26 Mar 01:33 CDT 2021, Dikshita Agarwal wrote: > Fill fw version info into smem to be printed as part of > soc info. > > Signed-off-by: Dikshita Agarwal > > Changes since v1: > adressed comments from stephen. > removed unwanted code. > --- > drivers/media/platform/qcom/venus/hfi_msgs.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c > index 06a1908..6b6d33c9 100644 > --- a/drivers/media/platform/qcom/venus/hfi_msgs.c > +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > #include > > #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_INDEX_VENUS 14 * 128 14 is the index, 128 is the element size, so this is now an "offset". > + > 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) > { > + size_t smem_blk_sz = 0; You shouldn't need to initialize smem_blk_sz if you check the return value of qcom_smem_get() first. > + u8 *smem_tbl_ptr; > + u8 *img_ver; > int req_bytes; > > 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); 80 chars is just a guideline and this looks prettier if you avoid the line wrap. That said, if you pick shorter names for smem_tbl_ptr and smem_blk_sz you probably even have to worry. > + if ((SMEM_IMG_INDEX_VENUS + VER_STR_SZ) <= smem_blk_sz && > + smem_tbl_ptr) In English you're trying to determine: "did qcom_smem_get() return a valid pointer and is the item's size at least as big as we need". So just write that in C: if (smem_tbl_ptr && smem_blk_sz >= SMEM_IMG_INDEX_VENUS + VER_STR_SZ) > + memcpy(smem_tbl_ptr + SMEM_IMG_INDEX_VENUS, > + img_ver, VER_STR_SZ); Again, please avoid the line wrap... Regards, Bjorn > } > > static void hfi_sys_property_info(struct venus_core *core, > -- > 2.7.4 >