From nobody Tue Feb 10 04:02:59 2026 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4509D19B3DA for ; Tue, 13 Aug 2024 12:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; cv=none; b=h6I11Zo7GHWlGtNO8mbHTvqFkamvjnjO50/jUvS7AIOHygnyCl3VB59V7LwXSz5/Q+p+tNsfniTM8VMshimFLXEXo6SQ6AyAQI0crDmDu0vkqykBN+GSQrsR76EegusmjV+QzgcA+SBbyEqIm+urxV65+6I1zClVlJXsYlN8R7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; c=relaxed/simple; bh=jH7TrqthPbyuatpm9k3mnNi3VlOKWR/v7KyFH3wuPGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mqttpc5XqjD2YDVLOCmezW1xvx+cAhpnh4mOpATxgOpwV8vunUbF+4RXbnmS1PcDwWRCL3Gx/grQf+G2ZdoM0sQzY/0Vh0VRQwGQG7bfxtDf7XTgb1/8jGmwHuJR4B6DLXF7FH7AmvzOM88dOOV96PV1gbk791wQ4NTfoOYtKEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=fDvvYQh+; arc=none smtp.client-ip=209.85.210.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fDvvYQh+" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-70943713472so2149890a34.2 for ; Tue, 13 Aug 2024 05:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551236; x=1724156036; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tbox2ZoitlY78mZ2yFdlFoyXWXf8v8pDSpmA621vz/E=; b=fDvvYQh+g7IkDt64D6KWdNujPXX001pS8SBuLzJjCJZiKkIZx4McB+OVlTdt3DZzeB kRrUq1Mw+cmm1q8s2ywwXAMLNKm3lpu2dnFA6lJ0I2gtxNEsCBhQYkRCrXqZtb6JnSZk 02tCQzypa0MFgeFkhMnI6ZZ35CSS7Jx4zz7vo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551236; x=1724156036; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tbox2ZoitlY78mZ2yFdlFoyXWXf8v8pDSpmA621vz/E=; b=Uvh1ks10BY4bLQuv6vR8NEQUhY5IVCQ9YCAFrwD1omdYALNCLKw1l2dl/zSQkV/HZW Kb5MHzWcwUlmQ67nosnpvPvFNHQrlYGcgT+lF/ejIIQSALoO+GLoO2cOvHEQRIEw89tU vTtQCMiiul8dDSh0mGyjQXjXvmiFelWUtvWBnGyIeUQwa3v0a5WPX7PDFIoAYJTBR/yO Rc59TmIdnJT1fjOaK5+2STY9xElXmGMZPV6H9biMA82R3QO31xyuAwQv/t1L1zYrpr4H xCkcGZ5EGuzSstJiDGgKKVD5a9ihmwxcGCA+wHdbwizbvSQ3FtCOJ9LVpuV6L+OP+BDl 0Twg== X-Forwarded-Encrypted: i=1; AJvYcCUTTiRYN63o0koyLkMsotUPYuyGqUR3JRSfMDQdd9ueYoHeX6DzQ65IVtHPR/YHTQr52ejZpZG56DqiB6UPGwkbNJjJhQvKjYpmzSuV X-Gm-Message-State: AOJu0Yw6w/0KSFER/48S6V8KchDxUEmBkqJziMfIY8Jj7gCuEwAFx0PL oUU93XwJ0wpPhYYLhNYcNlVKhGMO9ladeHbWL6iZ0LV74mrW72gQL0A2/6/9HA== X-Google-Smtp-Source: AGHT+IGgXIJUCN4cjOUkGFgon+WiB2P8zLnuNtMLuoWTLxNw2YXdYtwoDqVO1oPdH1blkel8OnEpNw== X-Received: by 2002:a05:6358:e4a4:b0:1af:1105:49b7 with SMTP id e5c5f4694b2df-1b19d2f4c8fmr402139355d.30.1723551236049; Tue, 13 Aug 2024 05:13:56 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:55 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:53 +0000 Subject: [PATCH 6/6] media: meson: vdec: hevc: Refactor vdec_hevc_start and vdec_hevc_stop Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-6-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Make a new function __vdec_hevc_start(), that does all the initialization, except the clock initialization for G12A and SM1. Factor out all the stop logic, except the clk_disable_unprepare(), to a new function __vdec_hevc_stop. This allows vdec_hevc_start() to explicitly celan-out the clock during the error-path. The following smatch warnings are fixed: drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'c= ore->vdec_hevc_clk' from clk_prepare_enable() not released on lines: 227. drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'c= ore->vdec_hevcf_clk' from clk_prepare_enable() not released on lines: 227. Signed-off-by: Ricardo Ribalda --- drivers/staging/media/meson/vdec/vdec_hevc.c | 43 +++++++++++++++++++++---= ---- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_hevc.c b/drivers/staging= /media/meson/vdec/vdec_hevc.c index afced435c907..1939c47def58 100644 --- a/drivers/staging/media/meson/vdec/vdec_hevc.c +++ b/drivers/staging/media/meson/vdec/vdec_hevc.c @@ -110,7 +110,7 @@ static u32 vdec_hevc_vififo_level(struct amvdec_session= *sess) return readl_relaxed(sess->core->dos_base + HEVC_STREAM_LEVEL); } =20 -static int vdec_hevc_stop(struct amvdec_session *sess) +static void __vdec_hevc_stop(struct amvdec_session *sess) { struct amvdec_core *core =3D sess->core; struct amvdec_codec_ops *codec_ops =3D sess->fmt_out->codec_ops; @@ -142,6 +142,13 @@ static int vdec_hevc_stop(struct amvdec_session *sess) else regmap_update_bits(core->regmap_ao, AO_RTI_GEN_PWR_SLEEP0, GEN_PWR_VDEC_HEVC, GEN_PWR_VDEC_HEVC); +} + +static int vdec_hevc_stop(struct amvdec_session *sess) +{ + struct amvdec_core *core =3D sess->core; + + __vdec_hevc_stop(sess); =20 clk_disable_unprepare(core->vdec_hevc_clk); if (core->platform->revision =3D=3D VDEC_REVISION_G12A || @@ -151,20 +158,12 @@ static int vdec_hevc_stop(struct amvdec_session *sess) return 0; } =20 -static int vdec_hevc_start(struct amvdec_session *sess) +static int __vdec_hevc_start(struct amvdec_session *sess) { int ret; struct amvdec_core *core =3D sess->core; struct amvdec_codec_ops *codec_ops =3D sess->fmt_out->codec_ops; =20 - if (core->platform->revision =3D=3D VDEC_REVISION_G12A || - core->platform->revision =3D=3D VDEC_REVISION_SM1) { - clk_set_rate(core->vdec_hevcf_clk, 666666666); - ret =3D clk_prepare_enable(core->vdec_hevcf_clk); - if (ret) - return ret; - } - clk_set_rate(core->vdec_hevc_clk, 666666666); ret =3D clk_prepare_enable(core->vdec_hevc_clk); if (ret) { @@ -223,10 +222,32 @@ static int vdec_hevc_start(struct amvdec_session *ses= s) return 0; =20 stop: - vdec_hevc_stop(sess); + __vdec_hevc_stop(sess); + clk_disable_unprepare(core->vdec_hevc_clk); return ret; } =20 +static int vdec_hevc_start(struct amvdec_session *sess) +{ + struct amvdec_core *core =3D sess->core; + int ret; + + if (core->platform->revision =3D=3D VDEC_REVISION_G12A || + core->platform->revision =3D=3D VDEC_REVISION_SM1) { + clk_set_rate(core->vdec_hevcf_clk, 666666666); + ret =3D clk_prepare_enable(core->vdec_hevcf_clk); + if (ret) + return ret; + + ret =3D __vdec_hevc_start(sess); + if (ret) + clk_disable_unprepare(core->vdec_hevcf_clk); + return ret; + } + + return __vdec_hevc_start(sess); +} + struct amvdec_ops vdec_hevc_ops =3D { .start =3D vdec_hevc_start, .stop =3D vdec_hevc_stop, --=20 2.46.0.76.ge559c4bf1a-goog