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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 8E7EBC433ED for ; Tue, 27 Apr 2021 11:16:07 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFE32613E9 for ; Tue, 27 Apr 2021 11:16:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFE32613E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ikjc4XP4HV/plhIM83LzZbga5MLaiJqsEFoqaRBuMKA=; b=eD26YPaFvcfEBcBS9lgz0XZ3x CHwcZ/TQCdtX0Tr87RCB4knmKbFzjVXAV/cSjBZTzNnLkpAaXxnAjkjxoZc1cYTqYbH9W8qDucqZt HRU0qq324nTd0+1jU8HRHq6ItU/a8VbMHMdx1qTeJYwYEW0qCHX+lASNuYdL6XVZmAeQphpUZVv5F Wrdqh9DCmsBAhHYZ2McF41I7pPCes1uOOIYYN9LrJ+EEeBfdJvy/DcoVyqcTayoTRyajwL1/vYE3e UWDlG3fov7Rl8K1N8a0d3b9BMLDZrNv9bgQFjOAocdcnB94QoTe9kTcKAauVZYTZgE/vvORl+HBwQ YPUcFPCjw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lbLh4-001Tjl-CJ; Tue, 27 Apr 2021 11:15:54 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbLgy-001TiW-3T for linux-mediatek@desiato.infradead.org; Tue, 27 Apr 2021 11:15:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4qZsQRsGuCyk4j1C/e+zC2HYXSpPpt7+LRIVR6EvA1Q=; b=QRRdjMYbyB8MfAv5sg0V7a5vaT X4KuGohZnEIImfUO48gD8N3oWjoBQ2wOrEXUXnHtEKsQnsnWndrg/ui+6IdMBocwU24lrOigpCVal 4gKq9iL26eftx28gKZwbIdW4u/LThNScuEYG9b8RR1UmN4PIbyaNID9NoU/ZQ/NR09el/DxvaI03m ESQJOQjMCrh8LwmwM1LHw0k4iDmWT5kYCZsJgZpfl5hyPIpfGQmGqlbTRy2ziLlx01p3A+I9qpgNt JbtisKIQuadkSxrwpG6phYQTk+9XjJbKv2AWfsbyeUyqKSzRh2haSCSULVff8oyylwgfcIBouAX7x Y6Ww+rhg==; Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lbLgt-00Gg9j-2i for linux-mediatek@lists.infradead.org; Tue, 27 Apr 2021 11:15:46 +0000 Received: by mail-pj1-x1036.google.com with SMTP id l10-20020a17090a850ab0290155b06f6267so801595pjn.5 for ; Tue, 27 Apr 2021 04:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4qZsQRsGuCyk4j1C/e+zC2HYXSpPpt7+LRIVR6EvA1Q=; b=MmztzcydDiCmIGZ5rBt4LY8NA386OT8abcppdLkMCrtROeyrELhMc+YEI6p+MbHyqw skitkOULGsK8x+AZwLLnSb46mFvajphr/pzpLnRrnVkBADs881RIBMsjsFebdSzIdka1 wHteEOG6wARXDxF9nYgYratiLYwoewW65fmzc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4qZsQRsGuCyk4j1C/e+zC2HYXSpPpt7+LRIVR6EvA1Q=; b=FGb6ILZ+CuCt2o5hjuGRB3tfRKUTbG/myWGL6yD6Vnnv+o95eBXKm5OLGqmMeCXNT7 DqC3h0EExp4iYNCXdUKiFZV93xKASpHuEfsl2X42hnCSInlBjU35JlpIyq9LvP5SSE8e /6E8Z8JdaVG8B2VdxEJDbVOvHJj3BUjPyqy5nZz8Zhse18IaziYGHu1zOV6pohpAisyC obxnUekN2rqH3QzibjrQD9eNA8M0BI60C13Ov4Cp1fW6SvOAREPdvC9RcofcsmU17ijn 7pBOJlRFSfzEkga1nCPhhUrO0CT0nt5RgbK/TDVVk3yeEmwZFskyZAZjK2WQQAhSbMku Fvcg== X-Gm-Message-State: AOAM533FKAxTe1p9cMIliPqsPS0YEgZaA2M1cegnCXVpo1AP5p5DUj8/ Rsbn+8owRYgOOnai2+OzrRGuIQ== X-Google-Smtp-Source: ABdhPJx1C2iIDlsCOU3glRSJBL8B286p5e+lxgbowpxikjRFr5/iSS83yGB8JZ9mAXiUCoL9ig6FmA== X-Received: by 2002:a17:90b:190d:: with SMTP id mp13mr5060186pjb.156.1619522142415; Tue, 27 Apr 2021 04:15:42 -0700 (PDT) Received: from acourbot.tok.corp.google.com ([2401:fa00:8f:203:b182:d363:32d0:53a2]) by smtp.gmail.com with ESMTPSA id c21sm2347210pfc.165.2021.04.27.04.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Apr 2021 04:15:42 -0700 (PDT) From: Alexandre Courbot To: Tiffany Lin , Andrew-CT Chen , Rob Herring , Yunfei Dong Cc: Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Alexandre Courbot Subject: [PATCH v4 02/15] media: mtk-vcodec: vdec: handle firmware version field Date: Tue, 27 Apr 2021 20:15:13 +0900 Message-Id: <20210427111526.1772293-3-acourbot@chromium.org> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog In-Reply-To: <20210427111526.1772293-1-acourbot@chromium.org> References: <20210427111526.1772293-1-acourbot@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210427_041543_141626_C5CE337D X-CRM114-Status: GOOD ( 20.70 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Firmwares for decoders newer than MT8173 will include an ABI version number in their initialization ack message. Add the capacity to manage it and make initialization fail if the firmware ABI is of a version that we don't support. For MT8173, this ABI version field does not exist ; thus ignore it on this chip. There should only be one firmware version available for it anyway. Signed-off-by: Alexandre Courbot --- .../mtk-vcodec/mtk_vcodec_dec_stateful.c | 1 + .../platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++ .../media/platform/mtk-vcodec/vdec_ipi_msg.h | 5 +++++ .../media/platform/mtk-vcodec/vdec_vpu_if.c | 21 +++++++++++++++++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c index f31f4f94001d..c5538fcfc9a5 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c @@ -640,6 +640,7 @@ static struct vb2_ops mtk_vdec_frame_vb2_ops = { }; const struct mtk_vcodec_dec_pdata mtk_vdec_8173_pdata = { + .chip = MTK_MT8173, .init_vdec_params = mtk_init_vdec_params, .ctrls_setup = mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops = &mtk_vdec_frame_vb2_ops, diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h index 85af0bffc7be..e5b8309785e1 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -321,6 +321,8 @@ enum mtk_chip { * @vdec_framesizes: supported video decoder frame sizes * @num_framesizes: count of video decoder frame sizes * + * @chip: chip this decoder is compatible with + * * @uses_stateless_api: whether the decoder uses the stateless API with requests */ @@ -340,6 +342,8 @@ struct mtk_vcodec_dec_pdata { const struct mtk_codec_framesizes *vdec_framesizes; const int num_framesizes; + enum mtk_chip chip; + bool uses_stateless_api; }; diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h index 47a1c1c0fd04..eb66729fda63 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +++ b/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h @@ -83,12 +83,17 @@ struct vdec_ap_ipi_dec_start { * @status : VPU exeuction result * @ap_inst_addr : AP vcodec_vpu_inst instance address * @vpu_inst_addr : VPU decoder instance address + * @vdec_abi_version: ABI version of the firmware. Kernel can use it to + * ensure that it is compatible with the firmware. + * This field is not valid for MT8173 and must not be + * accessed for this chip. */ struct vdec_vpu_ipi_init_ack { uint32_t msg_id; int32_t status; uint64_t ap_inst_addr; uint32_t vpu_inst_addr; + uint32_t vdec_abi_version; }; #endif diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c index 58b0e6fa8fd2..203089213e67 100644 --- a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c @@ -24,6 +24,22 @@ static void handle_init_ack_msg(const struct vdec_vpu_ipi_init_ack *msg) vpu->inst_addr = msg->vpu_inst_addr; mtk_vcodec_debug(vpu, "- vpu_inst_addr = 0x%x", vpu->inst_addr); + + /* Firmware version field does not exist on MT8173. */ + if (vpu->ctx->dev->vdec_pdata->chip == MTK_MT8173) + return; + + /* Check firmware version. */ + mtk_vcodec_debug(vpu, "firmware version 0x%x\n", msg->vdec_abi_version); + switch (msg->vdec_abi_version) { + case 1: + break; + default: + mtk_vcodec_err(vpu, "unhandled firmware version 0x%x\n", + msg->vdec_abi_version); + vpu->failure = 1; + break; + } } /* @@ -44,6 +60,9 @@ static void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv) mtk_vcodec_debug(vpu, "+ id=%X", msg->msg_id); + vpu->failure = msg->status; + vpu->signaled = 1; + if (msg->status == 0) { switch (msg->msg_id) { case VPU_IPIMSG_DEC_INIT_ACK: @@ -63,8 +82,6 @@ static void vpu_dec_ipi_handler(void *data, unsigned int len, void *priv) } mtk_vcodec_debug(vpu, "- id=%X", msg->msg_id); - vpu->failure = msg->status; - vpu->signaled = 1; } static int vcodec_vpu_send_msg(struct vdec_vpu_inst *vpu, void *msg, int len) -- 2.31.1.498.g6c1eba8ee3d-goog _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek