From patchwork Tue May 11 18:07:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 434559 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=-16.8 required=3.0 tests=BAYES_00,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 BEF4BC433ED for ; Tue, 11 May 2021 18:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F7DE616ED for ; Tue, 11 May 2021 18:08:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232199AbhEKSJj (ORCPT ); Tue, 11 May 2021 14:09:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232144AbhEKSJa (ORCPT ); Tue, 11 May 2021 14:09:30 -0400 Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73E36C06174A for ; Tue, 11 May 2021 11:08:23 -0700 (PDT) Received: by mail-qk1-x72e.google.com with SMTP id f29so7428235qka.0 for ; Tue, 11 May 2021 11:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kHxF6L8K7UGYMQtKo4by9VSR3+YoFYHBzQNRgF6jcls=; b=Uk++7S6XxPE6zONdFYOfoSzSv5FU1/6M0TiFHKWIHDbc6QsvsbAG5yQvEWO2lJO3M8 3HIy9zxsg4M1rVbtN7Fg6+DxNr8pApt3DWf0HagQJmX3vWhR1ejuMkZ/HL/4PhDoRaJk 7UCGbpjAbCBpXHWzxZOmAtFyRWQkxNWk2Rwjt+kf3AnByN5RLCW64Eh+kt4LrjPz7BEu SGxVRb6mpNtTUtp5qnRe8ficKKvvsIEfbMrPGCy8KS2epKo+fOt2cY+jBqjMKjI2f0QK /rI5V3OLKnkqOeZR/uqeIe/IaATns89BA00/xd0TAvgHBQjbPxW6DNDiCewlhGXqQPJC 74wg== 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=kHxF6L8K7UGYMQtKo4by9VSR3+YoFYHBzQNRgF6jcls=; b=nXtoxeLX2FZAKYIg44EwB4hI9YbfHcDL64/J62EjkJVMspj5Juww7Zdr7FW8c1EIv6 Rz67LUCVu2J1XOXeCyclp+qEGtiMmWdBLP90Ph7Ya6KVnjDmiFKv4LmL7TjE5K2dgl1J z8PFQ5mw38SR1kO6J+N/nxzMNpj2ZjfjlRVP/7KN42SrZF9+GIihF+kUIQnLM+4zpOv/ 2GDEW27DYuT/2MJ5TwjyKIeSqHsu8uqAYjlUpIEmmzXDJqoAocb2FA4PWyJp78KVrLr+ o+QhHT4ioESc4eh62vfhB9hmiHrtXn68j9ozNtbmdvDVh00Z2UOwa9rTUSZWWsLvgKVL 75+w== X-Gm-Message-State: AOAM530h1TX8TRIPqrodnQ9wfeuVJ2Gl+9cXhhk5qowhcPi2qKfOUCX9 G/er4b4hMPveItpuVzh0AB08yw== X-Google-Smtp-Source: ABdhPJyxXiBq5FGVjuG8DFH8RobC8xPCrjw6GF420gxa1sRYncaTUclKlSEELiBuJAqU2qa34g0GFg== X-Received: by 2002:a05:620a:2115:: with SMTP id l21mr29007196qkl.342.1620756502744; Tue, 11 May 2021 11:08:22 -0700 (PDT) Received: from localhost.localdomain (modemcable068.184-131-66.mc.videotron.ca. [66.131.184.68]) by smtp.gmail.com with ESMTPSA id g5sm17104476qtm.2.2021.05.11.11.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:08:22 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: robert.foss@linaro.org, andrey.konovalov@linaro.org, Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org (open list:QUALCOMM CAMERA SUBSYSTEM DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 13/17] media: camss: vfe-170: fix "VFE halt timeout" error Date: Tue, 11 May 2021 14:07:20 -0400 Message-Id: <20210511180728.23781-14-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20210511180728.23781-1-jonathan@marek.ca> References: <20210511180728.23781-1-jonathan@marek.ca> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This function waits for halt_complete but doesn't do anything to cause it to complete, and always hits the "VFE halt timeout" error. Just delete this code for now. Fixes: 7319cdf189bb ("media: camss: Add support for VFE hardware version Titan 170") Signed-off-by: Jonathan Marek Reviewed-by: Robert Foss --- drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c index 076ca082e107..080eef767d3b 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c @@ -363,17 +363,7 @@ static irqreturn_t vfe_isr(int irq, void *dev) */ static int vfe_halt(struct vfe_device *vfe) { - unsigned long time; - - reinit_completion(&vfe->halt_complete); - - time = wait_for_completion_timeout(&vfe->halt_complete, - msecs_to_jiffies(VFE_HALT_TIMEOUT_MS)); - if (!time) { - dev_err(vfe->camss->dev, "VFE halt timeout\n"); - return -EIO; - } - + /* rely on vfe_disable_output() to stop the VFE */ return 0; }