From patchwork Fri Mar 12 17:30:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 398677 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1383906jai; Fri, 12 Mar 2021 09:30:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsRTAo33g1O3hh6UStZmpVY+AAtTguzFRVTIkZ+ddHcr+vqng42ZIX6oioIGEu7uTIeB+3 X-Received: by 2002:a05:6402:181a:: with SMTP id g26mr15386064edy.225.1615570234637; Fri, 12 Mar 2021 09:30:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615570234; cv=none; d=google.com; s=arc-20160816; b=FehOQz4DMYYmP2UfcIoysiUHwn3v32YX2wF3uNqWsOv/wW7McwO8iuSGhYxWYIRG+8 Lk8IOtsDWkbu+eJoXoomd1w5qkSs3AzKtI/MCT78VB5J1IZMKCSYagO6iwET1khCsgHo vKPLP6l5Vir8eiLpEyM84tYq2RinTPC1WInvorIc0vxR4LPCetXwi1uaXfoTjMP+CtIP +9u7KzX+Gk++o6+G1RibygWcwC/7XWW/EEXG3y1CfiDaD6vaob/wSsjFrBpySGt8l3YO UsNeN3tw0voW0C6QU9Dw873MBKdpb1ohMwhqDYKdDFhKtusl+KqPyVlUCBW51GppcMBr Nxxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WKTuRup8dPa/K5+GFpnvDSVBJYngatFOEgMROjY7gcc=; b=ehTG7FKfCINT2A8VTM+yF8jSAgR/YS96iODxL25oDbjulK7J1Wlga/CZtgH8hvSeRi GTHj456hLP7gsLddtbeRZWwk1nYbVZs531kmwr/wQ2kCU2mUntv4tJ+yVnXpA4wdgBjH x5g2+yJG/C/6vLyGaS871wkgrGRqv5dA2u9lXGz066+UuuMsIkG7t5KPhg89zX2PvB7M XTBGHt0KYUAvOL1SNT4IubjekwYwBEsogTwGqutFSsFW/E8DH6Op2tJe+f/SGfTVvfLj 8YYOGN6TVBwdltQflY/eMzhNVkEkpvUJk6gguqiPusAtPA7PxP++h5eAfispFPHvyHME moXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b0JTfx0u; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ot6si4540497ejb.337.2021.03.12.09.30.34; Fri, 12 Mar 2021 09:30:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b0JTfx0u; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232881AbhCLR36 (ORCPT + 16 others); Fri, 12 Mar 2021 12:29:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232814AbhCLR3d (ORCPT ); Fri, 12 Mar 2021 12:29:33 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 377A3C061761 for ; Fri, 12 Mar 2021 09:29:33 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id d139-20020a1c1d910000b029010b895cb6f2so15620989wmd.5 for ; Fri, 12 Mar 2021 09:29:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WKTuRup8dPa/K5+GFpnvDSVBJYngatFOEgMROjY7gcc=; b=b0JTfx0uO5qWWjVtsMhOMtSGVIQd2mJGlrzHR4wEgCXwmZvtORgoCayl11gDTbN9ph 1WKmSG8KMO8NG8BiBCphPPLXMiQFIohDpPI7s72ybCQFrcLAkDw0PDNBGE4xVSqHSeBQ YHmIxnxRz9wmhd6iPml/0u1HM/lhfXlOuLYIKWn1OEMfPNTERbAa62NqZqVCJ4tb32wH URF0yQq3IoCDsdSNs11BYkAhNCzUWo3nTOr2JLPjSyjGwBXF7HHAdrGlw88Vhh5x17xE ZGMAjKKy7KZv5tTtDCl712ol3c6ct/1QuxCSH8HmpsF5GjTrbcZ8W8SVkk7FohWxph5y koaQ== 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=WKTuRup8dPa/K5+GFpnvDSVBJYngatFOEgMROjY7gcc=; b=HDTmEGRdk1UknyvfNVEnnqMB5GzfgiYX0GL6E87LUVKfGcwPEzWlR9LRp9FjOH/9BM Xcr872aKAEDfqGfFivfTwTbvJu5d4RRc9SPikcpOCyU/AsuZ3kZgs0XKZaa7EnEkETtG C9XrAvC/F1WvniHz646PSyIVyRuth3aqi0lQ3gR1esWY/+MTuY+nZRD0XM5Vvultn+3F 6wSac/W8Njw1BJA1tizwnFxdu5ElM2caiO04cvdFtvqdjVUzWODdBvdYkX9bApeGNe82 skJ/WTLyYgqaTHSc4JoUkLD1SGCT0tJPsRGvLKktOjcIgS6TirNWlotTqF/aXpvZM+IE oZWw== X-Gm-Message-State: AOAM532nygjrSNHD038zg9jvfYx2/3V9X12JsqkF3KqdnIUVLOPRPRbX Mxd0mgQCggPtZftDVw5a9/LZ1w== X-Received: by 2002:a7b:cc85:: with SMTP id p5mr14274777wma.148.1615570171959; Fri, 12 Mar 2021 09:29:31 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id 18sm2876375wmj.21.2021.03.12.09.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 09:29:31 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH v2 20/25] media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx Date: Fri, 12 Mar 2021 17:30:34 +0000 Message-Id: <20210312173039.1387617-21-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312173039.1387617-1-bryan.odonoghue@linaro.org> References: <20210312173039.1387617-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Dikshita Agarwal Do not toggle the WRAPPER_A9SS_SW_RESET on 6xx. Signed-off-by: Dikshita Agarwal Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/firmware.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.30.1 diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 8c2c68114bbd..227bd3b3f84c 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -53,10 +53,12 @@ int venus_set_hw_state(struct venus_core *core, bool resume) return ret; } - if (resume) + if (resume) { venus_reset_cpu(core); - else - writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET); + } else { + if (!IS_V6(core)) + writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET); + } return 0; }