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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF519C77B6F for ; Thu, 13 Apr 2023 23:08:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230192AbjDMXI3 (ORCPT ); Thu, 13 Apr 2023 19:08:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229676AbjDMXI0 (ORCPT ); Thu, 13 Apr 2023 19:08:26 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 465BC1BC8 for ; Thu, 13 Apr 2023 16:08:24 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id h37so4403760lfv.0 for ; Thu, 13 Apr 2023 16:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681427302; x=1684019302; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=637H74vWxZ4gX2iKNFYbz5JBcFfkn6d8GocnTsloh8Q=; b=rbKxrjUIAd+X6KwrltL/MkHLE8BgLyCoCvfZZGTIemi37itMcS2npcI2b2HDXXk7Ec ClfsiYCq/4DsihWiPuII+L2VA2mIwvasHklODifyBVJC60EZ5q4dkK3bvUmRKehBllZh 8eWmBPT4cz3MKFUfcyBi07WN4D6rWO6fFSDKeVxD7YHw1O31Fhvc6oboUwiBOv5v3I3v yj50Zv8l1V96LC52wkvKR+TN2nWLAU6/lX5a06mJHBSa0Iz7O1+E2WjB9+0Ymxh4edzr UoGMHCam3xcbn9gHW8NkY2U9/qGgC+NLcKzJjPFsXBvLwl8GA9ZtFUWaafO3q+pNFS7Y 7g9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681427302; x=1684019302; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=637H74vWxZ4gX2iKNFYbz5JBcFfkn6d8GocnTsloh8Q=; b=Nx9l+mBJRBT2cKE3IoVCGlVy1FQkiS+jw2FYvxD2ek9ldAf/16SuUO7iKswho8cNKP l/QsgsUS/lF71ziOJTuRv8+iH8zHeQhwwkDUli6PElUahJ27qbYNHfpq9EefeuPXlEFt Htru+0gkwHtnsZeb9iRLqbepgrEzLh4eo736D9UU58n39Iup+hGFX6T1TAMAPyrKVAXY eKR4TEdUm6XkibCeZ50G6ZtiFVGIifyBEBVNRjXgrvfesKJcM5wU8eGjaF5L+s0yDwx+ AabBdfqotOruK9Cwo9/oqVmxOMsQUleWkbTfYHwEACFL6p9p0vewX2k0SksHyOja4k2x s1Eg== X-Gm-Message-State: AAQBX9e3lTSxAV0aVhZgs9jWf3ixzSNjIYduZmVTE5NwlQiLkwCqnWzz 24o03B69Ok5FsHYCPpvxm8veGQ== X-Google-Smtp-Source: AKy350YwG1c79czrZM93aUuBkouQbuFKALrb9AUFJ2Ijplaa2Nm71Bmdzzw7+aXidzhWbr/IiqLOVQ== X-Received: by 2002:ac2:4c92:0:b0:4e9:6097:add3 with SMTP id d18-20020ac24c92000000b004e96097add3mr1510914lfl.61.1681427302536; Thu, 13 Apr 2023 16:08:22 -0700 (PDT) Received: from [192.168.1.101] (abyl123.neoplus.adsl.tpnet.pl. [83.9.31.123]) by smtp.gmail.com with ESMTPSA id r6-20020ac252a6000000b004ec6252aa37sm499499lfm.116.2023.04.13.16.08.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Apr 2023 16:08:22 -0700 (PDT) Message-ID: <546d7fa4-cdb9-7d1f-98e5-065a7706ee56@linaro.org> Date: Fri, 14 Apr 2023 01:08:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH v2 1/3] venus: add firmware version based check Content-Language: en-US From: Konrad Dybcio To: Stanimir Varbanov , Dikshita Agarwal , linux-media@vger.kernel.org, quic_vgarodia@quicinc.com, agross@kernel.org, andersson@kernel.org, mchehab@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Viswanath Boma References: <1680848758-3947-1-git-send-email-quic_dikshita@quicinc.com> <1680848758-3947-2-git-send-email-quic_dikshita@quicinc.com> <6c3002ad-ff78-8818-0e68-a151d33b0fca@gmail.com> <0b5d967d-b6f5-ed1e-1878-160d6e645f02@linaro.org> <89fc0a9c-0eee-44c4-52a4-bfa0009b9cce@linaro.org> In-Reply-To: <89fc0a9c-0eee-44c4-52a4-bfa0009b9cce@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14.04.2023 01:01, Konrad Dybcio wrote: > > > On 11.04.2023 12:59, Konrad Dybcio wrote: >> >> >> On 9.04.2023 07:18, Stanimir Varbanov wrote: >>> Hi Dikshita, >>> >>> Thanks for the patch. >>> >>> On 7.04.23 г. 9:25 ч., Dikshita Agarwal wrote: >>>> Add firmware version based checks to enable/disable >>>> features for different SOCs. >>>> >>>> Signed-off-by: Dikshita Agarwal >>>> Signed-off-by: Vikash Garodia >>>> Signed-off-by: Viswanath Boma >>>> Tested-by: Nathan Hebert >>>> --- >>>>   drivers/media/platform/qcom/venus/core.h     | 20 ++++++++++++++++++++ >>>>   drivers/media/platform/qcom/venus/hfi_msgs.c | 11 +++++++++-- >>>>   2 files changed, 29 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h >>>> index 32551c2..9d1e4b2 100644 >>>> --- a/drivers/media/platform/qcom/venus/core.h >>>> +++ b/drivers/media/platform/qcom/venus/core.h >>>> @@ -202,6 +202,11 @@ struct venus_core { >>>>       unsigned int core0_usage_count; >>>>       unsigned int core1_usage_count; >>>>       struct dentry *root; >>>> +    struct venus_img_version { >>>> +        u32 major; >>>> +        u32 minor; >>>> +        u32 rev; >>>> +    } venus_ver; >>>>   }; >>>>     struct vdec_controls { >>>> @@ -500,4 +505,19 @@ venus_caps_by_codec(struct venus_core *core, u32 codec, u32 domain) >>>>       return NULL; >>>>   } >>>>   +static inline int >>>> +is_fw_rev_or_newer(struct venus_core *core, u32 vmajor, u32 vminor, u32 vrev) >>>> +{ >>>> +    return ((core)->venus_ver.major == vmajor && >>>> +        (core)->venus_ver.minor == vminor && >>>> +        (core)->venus_ver.rev >= vrev); >>>> +} >>>> + >>>> +static inline int >>>> +is_fw_rev_or_older(struct venus_core *core, u32 vmajor, u32 vminor, u32 vrev) >>>> +{ >>>> +    return ((core)->venus_ver.major == vmajor && >>>> +        (core)->venus_ver.minor == vminor && >>>> +        (core)->venus_ver.rev <= vrev); >>>> +} >>> >>> IMO those two should return bool >>> >>>>   #endif >>>> diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c >>>> index df96db3..07ac0fc 100644 >>>> --- a/drivers/media/platform/qcom/venus/hfi_msgs.c >>>> +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c >>>> @@ -248,9 +248,10 @@ static void hfi_sys_init_done(struct venus_core *core, struct venus_inst *inst, >>>>   } >>>>     static void >>>> -sys_get_prop_image_version(struct device *dev, >>>> +sys_get_prop_image_version(struct venus_core *core, >>>>                  struct hfi_msg_sys_property_info_pkt *pkt) >>>>   { >>>> +    struct device *dev = core->dev; >>>>       u8 *smem_tbl_ptr; >>>>       u8 *img_ver; >>>>       int req_bytes; >>>> @@ -263,6 +264,12 @@ sys_get_prop_image_version(struct device *dev, >>>>           return; >>>>         img_ver = pkt->data; >>>> +    if (IS_V4(core)) >>>> +        sscanf(img_ver, "14:VIDEO.VE.%u.%u-%u-PROD", >>>> +               &core->venus_ver.major, &core->venus_ver.minor, &core->venus_ver.rev); >>>> +    else if (IS_V6(core)) >>>> +        sscanf(img_ver, "14:VIDEO.VPU.%u.%u-%u-PROD", >>>> +               &core->venus_ver.major, &core->venus_ver.minor, &core->venus_ver.rev); >>>>   >>> >>> what about if IS_V1? >> Whooops, I missed that in my review as well... >> >> Looks like the 8916 and 8996 FWs fall under the VIDEO.VE case >> as well, that's the QC_VERSION_STRING they have.. > On top of that, my 8350 fw reports: > > F/W version: 14:video-firmware.1.0-3fb5add1d3ac96f8f74facd537845a6ceb5a99e4 FWIW this cryptic version also needs fdata.device_addr = 0 (for reference - failling to do so will never stop the video stream polling) Konrad > > Konrad >> >> Perhaps this could be an >> >> if (IS_V6) >> .. >> else >> .. >> >> Konrad >>> >>>>       dev_dbg(dev, VDBGL "F/W version: %s\n", img_ver); >>> >>> this will crash for v1. >>> >>>>   @@ -286,7 +293,7 @@ static void hfi_sys_property_info(struct venus_core *core, >>>>         switch (pkt->property) { >>>>       case HFI_PROPERTY_SYS_IMAGE_VERSION: >>>> -        sys_get_prop_image_version(dev, pkt); >>>> +        sys_get_prop_image_version(core, pkt); >>>>           break; >>>>       default: >>>>           dev_dbg(dev, VDBGL "unknown property data\n"); >>>