From patchwork Fri Apr 23 05:58:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eizan Miyamoto X-Patchwork-Id: 426514 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 23F7EC433B4 for ; Fri, 23 Apr 2021 05:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E697361452 for ; Fri, 23 Apr 2021 05:59:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240610AbhDWF7t (ORCPT ); Fri, 23 Apr 2021 01:59:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240604AbhDWF7s (ORCPT ); Fri, 23 Apr 2021 01:59:48 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577C4C061574 for ; Thu, 22 Apr 2021 22:59:11 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id 10so24486500pfl.1 for ; Thu, 22 Apr 2021 22:59:11 -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=ClClMMPQd5llgvCW5e48aFgqR6QpKZqnffvVViwFOAk=; b=UXdaegl95comyYbgpDWdVughU2GDaTO9EqsItbp29Ru9gz/EtAs0NMPjdiGH6aqzA1 el3PPqdR/B/lvCW9G3pPfFwxVflEAp6Uc43i0QbG4LS9vC1gBTijiTpfUE89ZOygsSaI n6x1dm3+HGmvlWYev3lzpv9KqnkpLqSCCFFjo= 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=ClClMMPQd5llgvCW5e48aFgqR6QpKZqnffvVViwFOAk=; b=T6T0AARaaipQOoDnauY7v5SMDPhQ4cqep3sBqFfnJpioa/M+baQGFwj/ZKB6+Es2oj yq4Y9PdGaZhF/pvQiB0cKY+InlYxq7cisWC4QYVwS9hAA8/oifTVi07BplepjI3YaHoA IdCnSR8aESWZOsEvzUBFNeTKRjIS1NTFAW4qB71JgX6kJyiW5S9T9mH00eIgmMQBrvR5 S7DKp7fNt+8weYXDu3QfNqqlEKB4DcwGtt89d2f5llGEfgcOgKJyEZUrXUPnKFbHCCG1 8Ly1hs/PGfaMGNB+PbZ4RiMONxZ+Zpt3mmHUjbnTwtii+kZ9ZSXmpXTGPa15r1j+/ynq MVEQ== X-Gm-Message-State: AOAM533CEyHRPkJmiYJvC9jh9Mcqqa0c3B7a9E2JPbWi567Wj4W9YG4D C2VDRrqKZaITs5yI02FdH6sMKQ== X-Google-Smtp-Source: ABdhPJwxGEgFd/VAicrMilXCvY+Sxm9dITxRAirtC5a8Tz9kl7N6sb4CQtkqLXA/FQF2+h+ydDVw0Q== X-Received: by 2002:a63:4c4b:: with SMTP id m11mr2227290pgl.245.1619157550902; Thu, 22 Apr 2021 22:59:10 -0700 (PDT) Received: from localhost ([2401:fa00:9:14:308c:235d:f7a2:53a1]) by smtp.gmail.com with UTF8SMTPSA id i22sm3924003pgj.90.2021.04.22.22.59.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Apr 2021 22:59:10 -0700 (PDT) From: Eizan Miyamoto To: linux-kernel@vger.kernel.org Cc: enric.balletbo@collabora.com, chunkuang.hu@kernel.org, yong.wu@mediatek.com, Eizan Miyamoto , Andrew-CT Chen , Houlong Wei , Matthias Brugger , Mauro Carvalho Chehab , Minghsiu Tsai , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v1 3/4] media: mtk-mdp: don't pm_run_time_get/put for master comp in clock_on Date: Fri, 23 Apr 2021 15:58:40 +1000 Message-Id: <20210423155824.v1.3.Ifd87681955689a08cce4c65e72ee5e8c6d09af95@changeid> X-Mailer: git-send-email 2.31.1.498.g6c1eba8ee3d-goog In-Reply-To: <20210423055842.2490679-1-eizan@chromium.org> References: <20210423055842.2490679-1-eizan@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The original intent of commit 86698b9505bbc ("media: mtk-mdp: convert mtk_mdp_dev.comp array to list") was to create a list to track all the MDP components that needed to have their clocks enabled/disabled when calling mtk_mdp_comp_clock_on/off. However, there was a bug inside mtk_mdp_register_component where the args to a call to list_add were swapped. The result is that only one component was added to mtk_mdp_dev.comp_list because comp_list was instead being repeatedly added to the single element lists headed by each mtk_mdp_comp. The order of the args to list_add in mtk_mdp_register_component was fixed in https://patchwork.kernel.org/patch/11742895/ (Fix Null pointer dereference when calling list_add). Then, as a result of https://patchwork.kernel.org/patch/11530769/ (mtk-mdp: use pm_runtime in MDP component driver) if all the components are added to the component list, the mdp "master" / rdma0 component ends up having pm_runtime_get_sync() called on it twice recursively: rpm_resume+0x694/0x8f8 __pm_runtime_resume+0x7c/0xa0 ***NOTE*** mtk_mdp_comp_clock_on+0x48/0x104 [mtk_mdp] mtk_mdp_pm_resume+0x2c/0x44 [mtk_mdp] pm_generic_runtime_resume+0x34/0x48 __genpd_runtime_resume+0x6c/0x80 genpd_runtime_resume+0x104/0x1ac __rpm_callback+0x120/0x238 rpm_callback+0x34/0x8c rpm_resume+0x7a0/0x8f8 __pm_runtime_resume+0x7c/0xa0 ***NOTE*** mtk_mdp_m2m_start_streaming+0x2c/0x3c [mtk_mdp] (The calls to pm_runtime_get_sync are inlined and correspond to the calls to __pm_runtime_resume). It is not correct to have pm_runtime_get_sync called recursively and the second call will block indefinitely. As a result of all that, this change factors mtk_mdp_comp_clock_on/off into mtk_mdp_comp_power_on/off and moves the calls to pm_runtime_get/put into the power_on/off functions. This change then special-cases the master/rdma0 MDP component and does these things: - the master/rdma0 component is not added to mtk_mdp_dev.comp_list - the master/rdma0 component has its clocks (*but not power*) toggled by mtk_mpd_comp_clock_on/off inside mtk_mdp_clock_on/off. - the other components have their clocks *and* power toggled with mtk_mdp_comp_power_on/off. This change introduces the assumption that mtk_mdp_pm_resume will always be called though a callback from pm_runtime_get_sync made on the master / rdma0 component. Signed-off-by: Eizan Miyamoto --- drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 28 ++++++++++++++----- drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 3 ++ drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 23 ++++++++++----- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c index 84f9c529d74a..d447bfaadef4 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c @@ -53,15 +53,31 @@ static const struct of_device_id mtk_mdp_comp_driver_dt_match[] = { }; MODULE_DEVICE_TABLE(of, mtk_mdp_comp_driver_dt_match); -void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp) +void mtk_mdp_comp_power_on(struct mtk_mdp_comp *comp) { - int i, err; + int err; err = pm_runtime_get_sync(comp->dev); if (err < 0) - dev_err(comp->dev, - "failed to runtime get, err %d.\n", - err); + dev_err(comp->dev, "failed to runtime get, err %d.\n", err); + + mtk_mdp_comp_clock_on(comp); +} + +void mtk_mdp_comp_power_off(struct mtk_mdp_comp *comp) +{ + int err; + + mtk_mdp_comp_clock_off(comp); + + err = pm_runtime_put_sync(comp->dev); + if (err < 0) + dev_err(comp->dev, "failed to runtime put, err %d.\n", err); +} + +void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp) +{ + int i, err; for (i = 0; i < ARRAY_SIZE(comp->clk); i++) { if (IS_ERR(comp->clk[i])) @@ -83,8 +99,6 @@ void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp) continue; clk_disable_unprepare(comp->clk[i]); } - - pm_runtime_put_sync(comp->dev); } static int mtk_mdp_comp_bind(struct device *dev, struct device *master, diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h index 355e226d74fe..7ad9b06bb11b 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h @@ -21,6 +21,9 @@ struct mtk_mdp_comp { int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev); +void mtk_mdp_comp_power_on(struct mtk_mdp_comp *comp); +void mtk_mdp_comp_power_off(struct mtk_mdp_comp *comp); + void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp); void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp); diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index c55bcfe4cbb7..5e71496e2517 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -53,8 +53,15 @@ static void mtk_mdp_clock_on(struct mtk_mdp_dev *mdp) { struct mtk_mdp_comp *comp_node; + /* + * The master / rdma0 component will have pm_runtime_get_sync called + * on it through mtk_mdp_m2m_start_streaming, making it unnecessary to + * have mtk_mdp_comp_power_on called on it. + */ + mtk_mdp_comp_clock_on(&mdp->comp_self); + list_for_each_entry(comp_node, &mdp->comp_list, node) - mtk_mdp_comp_clock_on(comp_node); + mtk_mdp_comp_power_on(comp_node); } static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp) @@ -62,7 +69,14 @@ static void mtk_mdp_clock_off(struct mtk_mdp_dev *mdp) struct mtk_mdp_comp *comp_node; list_for_each_entry(comp_node, &mdp->comp_list, node) - mtk_mdp_comp_clock_off(comp_node); + mtk_mdp_comp_power_off(comp_node); + + /* + * The master / rdma0 component will have pm_runtime_put called + * on it through mtk_mdp_m2m_stop_streaming, making it unnecessary to + * have mtk_mdp_comp_power_off called on it. + */ + mtk_mdp_comp_clock_off(&mdp->comp_self); } static void mtk_mdp_wdt_worker(struct work_struct *work) @@ -101,8 +115,6 @@ static int mtk_mdp_master_bind(struct device *dev) int status; struct mtk_mdp_dev *mdp = dev_get_drvdata(dev); - mtk_mdp_register_component(mdp, &mdp->comp_self); - status = component_bind_all(dev, mdp); if (status) { dev_err(dev, "Failed to bind all components: %d\n", status); @@ -124,8 +136,6 @@ static int mtk_mdp_master_bind(struct device *dev) component_unbind_all(dev, mdp); err_component_bind_all: - mtk_mdp_unregister_component(mdp, &mdp->comp_self); - return status; } @@ -136,7 +146,6 @@ static void mtk_mdp_master_unbind(struct device *dev) pm_runtime_disable(dev); mtk_mdp_unregister_m2m_device(mdp); component_unbind_all(dev, mdp); - mtk_mdp_unregister_component(mdp, &mdp->comp_self); } static const struct component_master_ops mtk_mdp_com_ops = {