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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 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 05AF6C41621 for ; Tue, 24 Mar 2020 12:56:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 CBE14208C3 for ; Tue, 24 Mar 2020 12:56:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bCjEWDe8"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="fu+Yy7CI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBE14208C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2Kxo5Cl2WQcomlftuujZc5h2tGbuEnkZsKQ7BUrqn38=; b=bCjEWDe8LdHASn wWgi40IfItfiSzNzrn571dQInMAIibOaaDaioE08qn7MtxonjK/Ey/t1r3MujiluT6pLX+d7F/mRW QU4UScyB8xHFXB1+TKdjrQEEaRfzWlRwxyCD8PCCCLFerV4NswPfW28HEG2geSAoKyZNGwMh6fVT8 VI2Hrdqy9w0IvgZfzBqbqiAQLATB97JM6zER8iqp8DaMmWsybRJatnrgbn9OkCMpVEOLcTA2I1htZ K9YhlKDZOOVm5vhp9tS2BJyTxlgW3d89rBCwQUUsunELe5IzXnE12TvokFjLh2hCpxgJisXuGBN0V l45ZgjWne0DVfuQbQi1Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGj6Y-0005yT-Bg; Tue, 24 Mar 2020 12:56:26 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGj6W-0005y1-4e; Tue, 24 Mar 2020 12:56:25 +0000 X-UUID: 9afae080985e435ea3294473d703d4d7-20200324 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=ik4urh0s9/sTZNn7i7tAqN7eathzuR+7EqLI9vueugY=; b=fu+Yy7CI4h1f5rxfvRKCQ5QJ5dfNiAccwbs5lldVLq3gsoF3Cs3kXaTjE/w5ViQnMQFA8jYCnYMGqX6DpKAgJjtuATgFiewPB3wbxu/QogHhJmSGXom7fTSPGM0qlJjGAOHd1urNQJrgPA1YnZikwpj5qs2k9hqMPS7G8vWbh9w=; X-UUID: 9afae080985e435ea3294473d703d4d7-20200324 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 671653240; Tue, 24 Mar 2020 04:56:22 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Mar 2020 05:56:20 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Mar 2020 20:56:16 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 24 Mar 2020 20:56:16 +0800 Message-ID: <1585054582.6276.24.camel@mhfsdcap03> Subject: Re: [PATCH] media: mtk-vpu: load vpu firmware from the new location From: gtk_ruiwang To: Hans Verkuil Date: Tue, 24 Mar 2020 20:56:22 +0800 In-Reply-To: <396021fd-ec2e-1ec1-602e-08b9393c5ae9@xs4all.nl> References: <20200322075745.6133-1-gtk_ruiwang@mediatek.com> <396021fd-ec2e-1ec1-602e-08b9393c5ae9@xs4all.nl> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: C39E2D690E3AA5905C6E84713D6ABD87D4D1C41A2322D8E148CE3102567C89072000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200324_055624_192112_31E026AB X-CRM114-Status: GOOD ( 18.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew-CT Chen , Maoguang Meng , srv_heupstream@mediatek.com, Alexandre Courbot , Erin Lo , linux-kernel@vger.kernel.org, Houlong Wei , Tomasz Figa , Sj Huang , linux-mediatek@lists.infradead.org, Matthias Brugger , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dear Hans, Patch V2 has sent, thanks a lot. Sincerely Regards On Tue, 2020-03-24 at 13:20 +0100, Hans Verkuil wrote: > On 3/22/20 8:57 AM, gtk_ruiwang@mediatek.com wrote: > > From: gtk_ruiwang > > > > mt8173 VPU firmware has been moved to a sub-folder of > > linux-firmware, so load vpu-fw from the new location first, > > if it fails, then from the old one. > > > > Signed-off-by: Rui Wang > > Hmm, I'm getting this from checkpatch.pl --strict: > > WARNING: Missing Signed-off-by: line by nominal patch author 'gtk_ruiwang ' > > Rather than sending this from 'gtk_ruiwang@mediatek.com', can you send this from > 'Rui Wang '? > > Then the two are the same. > > Regards, > > Hans > > > --- > > drivers/media/platform/mtk-vpu/mtk_vpu.c | 16 +++++++++++++--- > > 1 file changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c > > index a768707abb94..89274842e07b 100644 > > --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c > > +++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c > > @@ -46,6 +46,8 @@ > > /* binary firmware name */ > > #define VPU_P_FW "vpu_p.bin" > > #define VPU_D_FW "vpu_d.bin" > > +#define VPU_P_FW_NEW "mediatek/mt8173/vpu_p.bin" > > +#define VPU_D_FW_NEW "mediatek/mt8173/vpu_d.bin" > > > > #define VPU_RESET 0x0 > > #define VPU_TCM_CFG 0x0008 > > @@ -477,16 +479,24 @@ static int load_requested_vpu(struct mtk_vpu *vpu, > > size_t tcm_size = fw_type ? VPU_DTCM_SIZE : VPU_PTCM_SIZE; > > size_t fw_size = fw_type ? VPU_D_FW_SIZE : VPU_P_FW_SIZE; > > char *fw_name = fw_type ? VPU_D_FW : VPU_P_FW; > > + char *fw_new_name = fw_type ? VPU_D_FW_NEW : VPU_P_FW_NEW; > > const struct firmware *vpu_fw; > > size_t dl_size = 0; > > size_t extra_fw_size = 0; > > void *dest; > > int ret; > > > > - ret = request_firmware(&vpu_fw, fw_name, vpu->dev); > > + ret = request_firmware(&vpu_fw, fw_new_name, vpu->dev); > > if (ret < 0) { > > - dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, ret); > > - return ret; > > + dev_info(vpu->dev, "Failed to load %s, %d, retry\n", > > + fw_new_name, ret); > > + > > + ret = request_firmware(&vpu_fw, fw_name, vpu->dev); > > + if (ret < 0) { > > + dev_err(vpu->dev, "Failed to load %s, %d\n", fw_name, > > + ret); > > + return ret; > > + } > > } > > dl_size = vpu_fw->size; > > if (dl_size > fw_size) { > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel