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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 92D94C433E0 for ; Fri, 7 Aug 2020 21:30:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 529EF2224D for ; Fri, 7 Aug 2020 21:30:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kHFrwOCm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727891AbgHGVaJ (ORCPT ); Fri, 7 Aug 2020 17:30:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727831AbgHGV3y (ORCPT ); Fri, 7 Aug 2020 17:29:54 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E880C061A2D for ; Fri, 7 Aug 2020 14:29:53 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id o23so3507546ejr.1 for ; Fri, 07 Aug 2020 14:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fDDWZstNpjGOtdGZCLFEkYVcrKkQad8l/sIeiWx0PNA=; b=kHFrwOCm6+H+Lg18Azi6wrn6sp7VnwHKw1qI4a4DgR+2tVfsZWWKguiTnjvT//xN5m +s9DfRDsLw8w887oSLClL8uUsRIm2zFWNFSWNKeboOq3831NZe/9N+n5q54bwRWTy6RP PhMZZMCgFwBpUwFvhCUk94uzEWzm1PLiMKV38= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fDDWZstNpjGOtdGZCLFEkYVcrKkQad8l/sIeiWx0PNA=; b=CUawkqeqNh7CqJ1FpRN0RaA8osxpeXASY/ivJ7JpqWcU3aKxZEJeMCmg31oHlBhfia kImIq3DcB3En1UfKo9JLduR0NXtjPkzbyHDxNzBrytnlXPAuXzQzqvUVzrilB5e+fvCD 6XQ+TwAGIqg0n/l/XkorVXlLEYhgdMSW0M7TiGWZJR6Qq4VVS5fuWyQ+tU55nGyD8Fdy bpV37iUjYEjit3housIMBTEc6A5Bf4ZRtKht/2akE3NdYQ4seXOwdrMSivbKFQQcprzj r3TsBvSBuovdFidTVn6H/TbWBO+dqf01v/d2MqIB4LPawQTJ8N4w/jM4DF6HC+j9Pztp jPFw== X-Gm-Message-State: AOAM5338Za8AX+l2WKUSHv0VcxIXOnbHoH4dkFxBfZ44SgzT7CEIB7i5 ci4EM/LO4+Xt0VkjepVKqXi9kdtdGCc= X-Google-Smtp-Source: ABdhPJy42kcYlw30MFe5Ox0ifmsYOXWd0Rm1TwaviYYfKu9DRbYJCE3MRPup5A8tTbRCLwr4CKgs5g== X-Received: by 2002:a17:906:4f8f:: with SMTP id o15mr10977663eju.220.1596835791824; Fri, 07 Aug 2020 14:29:51 -0700 (PDT) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com. [209.85.128.50]) by smtp.gmail.com with ESMTPSA id ch24sm6514256ejb.7.2020.08.07.14.29.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 07 Aug 2020 14:29:51 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id f18so9455477wmc.0 for ; Fri, 07 Aug 2020 14:29:51 -0700 (PDT) X-Received: by 2002:a7b:cb50:: with SMTP id v16mr10118993wmj.11.1596835790795; Fri, 07 Aug 2020 14:29:50 -0700 (PDT) MIME-Version: 1.0 References: <20200730114632.6717-1-stanimir.varbanov@linaro.org> <20200730114632.6717-4-stanimir.varbanov@linaro.org> In-Reply-To: <20200730114632.6717-4-stanimir.varbanov@linaro.org> From: Fritz Koenig Date: Fri, 7 Aug 2020 14:29:38 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 3/3] venus: Add new interface queues reinit To: Stanimir Varbanov Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 30, 2020 at 4:47 AM Stanimir Varbanov wrote: > > Presently the recovery mechanism is using two hfi functions > to destroy and create interface queues. For the purpose of > recovery we don't need to free and allocate the memory used > for interface message queues, that's why we introduce new > function which just reinit the queues. Also this will give > to the recovery procedure one less reason to fail (if for > some reason we couldn't allocate memory). > > Signed-off-by: Stanimir Varbanov > --- > drivers/media/platform/qcom/venus/core.c | 3 +- > drivers/media/platform/qcom/venus/hfi.c | 5 ++ > drivers/media/platform/qcom/venus/hfi.h | 1 + > drivers/media/platform/qcom/venus/hfi_venus.c | 51 +++++++++++++++++++ > drivers/media/platform/qcom/venus/hfi_venus.h | 1 + > 5 files changed, 59 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 46f6e34d435a..eda8f35425df 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -72,8 +72,7 @@ static void venus_sys_error_handler(struct work_struct *work) > while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0])) > usleep_range(1000, 1500); > > - hfi_destroy(core); > - ret |= hfi_create(core, &venus_core_ops); > + hfi_reinit(core); > > pm_runtime_get_sync(core->dev); > > diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c > index a211eb93e0f9..a59022adb14c 100644 > --- a/drivers/media/platform/qcom/venus/hfi.c > +++ b/drivers/media/platform/qcom/venus/hfi.c > @@ -517,3 +517,8 @@ void hfi_destroy(struct venus_core *core) > { > venus_hfi_destroy(core); > } > + > +void hfi_reinit(struct venus_core *core) > +{ > + venus_hfi_queues_reinit(core); > +} > diff --git a/drivers/media/platform/qcom/venus/hfi.h b/drivers/media/platform/qcom/venus/hfi.h > index 62c315291484..f25d412d6553 100644 > --- a/drivers/media/platform/qcom/venus/hfi.h > +++ b/drivers/media/platform/qcom/venus/hfi.h > @@ -145,6 +145,7 @@ struct hfi_ops { > > int hfi_create(struct venus_core *core, const struct hfi_core_ops *ops); > void hfi_destroy(struct venus_core *core); > +void hfi_reinit(struct venus_core *core); > > int hfi_core_init(struct venus_core *core); > int hfi_core_deinit(struct venus_core *core, bool blocking); > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > index 3392fd177d22..90067cd8c892 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > @@ -1603,3 +1603,54 @@ int venus_hfi_create(struct venus_core *core) > core->ops = NULL; > return ret; > } > + > +void venus_hfi_queues_reinit(struct venus_core *core) > +{ > + struct venus_hfi_device *hdev = to_hfi_priv(core); > + struct hfi_queue_table_header *tbl_hdr; > + struct iface_queue *queue; > + struct hfi_sfr *sfr; > + unsigned int i; > + > + mutex_lock(&hdev->lock); > + > + for (i = 0; i < IFACEQ_NUM; i++) { > + queue = &hdev->queues[i]; > + queue->qhdr = > + IFACEQ_GET_QHDR_START_ADDR(hdev->ifaceq_table.kva, i); > + > + venus_set_qhdr_defaults(queue->qhdr); > + > + queue->qhdr->start_addr = queue->qmem.da; > + > + if (i == IFACEQ_CMD_IDX) > + queue->qhdr->type |= HFI_HOST_TO_CTRL_CMD_Q; > + else if (i == IFACEQ_MSG_IDX) > + queue->qhdr->type |= HFI_CTRL_TO_HOST_MSG_Q; > + else if (i == IFACEQ_DBG_IDX) > + queue->qhdr->type |= HFI_CTRL_TO_HOST_DBG_Q; > + } > + > + tbl_hdr = hdev->ifaceq_table.kva; > + tbl_hdr->version = 0; > + tbl_hdr->size = IFACEQ_TABLE_SIZE; > + tbl_hdr->qhdr0_offset = sizeof(struct hfi_queue_table_header); > + tbl_hdr->qhdr_size = sizeof(struct hfi_queue_header); > + tbl_hdr->num_q = IFACEQ_NUM; > + tbl_hdr->num_active_q = IFACEQ_NUM; > + > + /* > + * Set receive request to zero on debug queue as there is no > + * need of interrupt from video hardware for debug messages > + */ > + queue = &hdev->queues[IFACEQ_DBG_IDX]; > + queue->qhdr->rx_req = 0; > + > + sfr = hdev->sfr.kva; > + sfr->buf_size = ALIGNED_SFR_SIZE; > + > + /* ensure table and queue header structs are settled in memory */ > + wmb(); > + > + mutex_unlock(&hdev->lock); > +} > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.h b/drivers/media/platform/qcom/venus/hfi_venus.h > index 57154832090e..1b656ef2bf07 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.h > +++ b/drivers/media/platform/qcom/venus/hfi_venus.h > @@ -10,5 +10,6 @@ struct venus_core; > > void venus_hfi_destroy(struct venus_core *core); > int venus_hfi_create(struct venus_core *core); > +void venus_hfi_queues_reinit(struct venus_core *core); > > #endif > -- > 2.17.1 > Reviewed-by: Fritz Koenig