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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 C3F34C33CA2 for ; Thu, 9 Jan 2020 14:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C25E206ED for ; Thu, 9 Jan 2020 14:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731528AbgAIOIy (ORCPT ); Thu, 9 Jan 2020 09:08:54 -0500 Received: from foss.arm.com ([217.140.110.172]:59810 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728406AbgAIOIy (ORCPT ); Thu, 9 Jan 2020 09:08:54 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E6011FB; Thu, 9 Jan 2020 06:08:53 -0800 (PST) Received: from [10.1.27.38] (unknown [10.1.27.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34AA63F534; Thu, 9 Jan 2020 06:08:49 -0800 (PST) Subject: Re: [PATCH v2 5/7] drm/panfrost: Add support for multiple power domain support To: Nicolas Boichat , Rob Herring Cc: Mark Rutland , devicetree@vger.kernel.org, Tomeu Vizoso , David Airlie , linux-kernel@vger.kernel.org, Liam Girdwood , dri-devel@lists.freedesktop.org, Mark Brown , linux-mediatek@lists.infradead.org, Alyssa Rosenzweig , hsinyi@chromium.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org References: <20200108052337.65916-1-drinkcat@chromium.org> <20200108052337.65916-6-drinkcat@chromium.org> From: Steven Price Message-ID: Date: Thu, 9 Jan 2020 14:08:48 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200108052337.65916-6-drinkcat@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/01/2020 05:23, Nicolas Boichat wrote: > When there is a single power domain per device, the core will > ensure the power domains are all switched on. > > However, when there are multiple ones, as in MT8183 Bifrost GPU, > we need to handle them in driver code. > > > Signed-off-by: Nicolas Boichat > --- > > The downstream driver we use on chromeos-4.19 currently uses 2 > additional devices in device tree to accomodate for this [1], but > I believe this solution is cleaner. I'm not sure what is best, but it seems odd to encode this into the Panfrost driver itself - it doesn't have any knowledge of what to do with these power domains. The naming of the domains looks suspiciously like someone thought that e.g. only half of the cores could be powered, but it doesn't look like that was implemented in the chromeos driver linked and anyway that is *meant* to be automatic in the hardware! (I.e. if you only power up one cores in one core stack then the PDC should only enable the power domain for that set of cores). Steve > > [1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#31 > > drivers/gpu/drm/panfrost/panfrost_device.c | 87 ++++++++++++++++++++-- > drivers/gpu/drm/panfrost/panfrost_device.h | 4 + > 2 files changed, 83 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > index a0b0a6fef8b4e63..c6e9e059de94a4d 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > > #include "panfrost_device.h" > @@ -131,6 +132,67 @@ static void panfrost_regulator_fini(struct panfrost_device *pfdev) > regulator_disable(pfdev->regulator_sram); > } > > +static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(pfdev->pm_domain_devs); i++) { > + if (!pfdev->pm_domain_devs[i]) > + break; > + > + if (pfdev->pm_domain_links[i]) > + device_link_del(pfdev->pm_domain_links[i]); > + > + dev_pm_domain_detach(pfdev->pm_domain_devs[i], true); > + } > +} > + > +static int panfrost_pm_domain_init(struct panfrost_device *pfdev) > +{ > + int err; > + int i, num_domains; > + > + num_domains = of_count_phandle_with_args(pfdev->dev->of_node, > + "power-domains", > + "#power-domain-cells"); > + /* Single domains are handled by the core. */ > + if (num_domains < 2) > + return 0; > + > + if (num_domains > ARRAY_SIZE(pfdev->pm_domain_devs)) { > + dev_err(pfdev->dev, "Too many pm-domains: %d\n", num_domains); > + return -EINVAL; > + } > + > + for (i = 0; i < num_domains; i++) { > + pfdev->pm_domain_devs[i] = > + dev_pm_domain_attach_by_id(pfdev->dev, i); > + if (IS_ERR(pfdev->pm_domain_devs[i])) { > + err = PTR_ERR(pfdev->pm_domain_devs[i]); > + pfdev->pm_domain_devs[i] = NULL; > + dev_err(pfdev->dev, > + "failed to get pm-domain %d: %d\n", i, err); > + goto err; > + } > + > + pfdev->pm_domain_links[i] = device_link_add(pfdev->dev, > + pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | > + DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); > + if (!pfdev->pm_domain_links[i]) { > + dev_err(pfdev->pm_domain_devs[i], > + "adding device link failed!\n"); > + err = -ENODEV; > + goto err; > + } > + } > + > + return 0; > + > +err: > + panfrost_pm_domain_fini(pfdev); > + return err; > +} > + > int panfrost_device_init(struct panfrost_device *pfdev) > { > int err; > @@ -161,37 +223,45 @@ int panfrost_device_init(struct panfrost_device *pfdev) > goto err_out1; > } > > + err = panfrost_pm_domain_init(pfdev); > + if (err) { > + dev_err(pfdev->dev, "pm_domain init failed %d\n", err); > + goto err_out2; > + } > + > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > if (IS_ERR(pfdev->iomem)) { > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > err = PTR_ERR(pfdev->iomem); > - goto err_out2; > + goto err_out3; > } > > err = panfrost_gpu_init(pfdev); > if (err) > - goto err_out2; > + goto err_out3; > > err = panfrost_mmu_init(pfdev); > if (err) > - goto err_out3; > + goto err_out4; > > err = panfrost_job_init(pfdev); > if (err) > - goto err_out4; > + goto err_out5; > > err = panfrost_perfcnt_init(pfdev); > if (err) > - goto err_out5; > + goto err_out6; > > return 0; > -err_out5: > +err_out6: > panfrost_job_fini(pfdev); > -err_out4: > +err_out5: > panfrost_mmu_fini(pfdev); > -err_out3: > +err_out4: > panfrost_gpu_fini(pfdev); > +err_out3: > + panfrost_pm_domain_fini(pfdev); > err_out2: > panfrost_reset_fini(pfdev); > err_out1: > @@ -208,6 +278,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > panfrost_mmu_fini(pfdev); > panfrost_gpu_fini(pfdev); > panfrost_reset_fini(pfdev); > + panfrost_pm_domain_fini(pfdev); > panfrost_regulator_fini(pfdev); > panfrost_clk_fini(pfdev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h > index a124334d69e7e93..92d471676fc7823 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.h > +++ b/drivers/gpu/drm/panfrost/panfrost_device.h > @@ -19,6 +19,7 @@ struct panfrost_job; > struct panfrost_perfcnt; > > #define NUM_JOB_SLOTS 3 > +#define MAX_PM_DOMAINS 3 > > struct panfrost_features { > u16 id; > @@ -62,6 +63,9 @@ struct panfrost_device { > struct regulator *regulator; > struct regulator *regulator_sram; > struct reset_control *rstc; > + /* pm_domains for devices with more than one. */ > + struct device *pm_domain_devs[MAX_PM_DOMAINS]; > + struct device_link *pm_domain_links[MAX_PM_DOMAINS]; > > struct panfrost_features features; > > 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,USER_AGENT_SANE_1 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 0CD15C33CA1 for ; Thu, 9 Jan 2020 14:09:14 +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 D32F82067D for ; Thu, 9 Jan 2020 14:09:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rdnT1TrY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D32F82067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RuRpNBqEGo+5P5TmrC7qD7Hd5hbT4qWoPTEHfzY8DhU=; b=rdnT1TrYzFESUnuAEErkqetkX SEqtnpOKZ8yUtKraI2Gnqgl2rdRm0KMF6uefOA7srH2KWQfo2g0qmQ1pZxII6hWr4rHFTPjnwWbpo JWWCZDgvg0xr/c8awZVkz5oSMJXyk/nPoZUJBkb+MQMJNojf59BJLlL6N6yoLkJ8fkfEzd5iHtTI7 lK7UgxKPrY0ese+ZK8CFVNN7c1pUFbON2mVL5GtIoQnMkdktGyU15p4wFHe04YQrhstUYd6AgtsUb dQha5p5EeesPMtOSiwJ1y4kfUwwbOKcfaiZK6CtzNdIbVuJR26RqBrwJ1A9ooUVGk7cT0ZctbMbBM pMUTRS7aQ==; 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 1ipYUi-0008JX-8W; Thu, 09 Jan 2020 14:09:04 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipYUX-0008Ak-Uw; Thu, 09 Jan 2020 14:08:55 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E6011FB; Thu, 9 Jan 2020 06:08:53 -0800 (PST) Received: from [10.1.27.38] (unknown [10.1.27.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34AA63F534; Thu, 9 Jan 2020 06:08:49 -0800 (PST) Subject: Re: [PATCH v2 5/7] drm/panfrost: Add support for multiple power domain support To: Nicolas Boichat , Rob Herring References: <20200108052337.65916-1-drinkcat@chromium.org> <20200108052337.65916-6-drinkcat@chromium.org> From: Steven Price Message-ID: Date: Thu, 9 Jan 2020 14:08:48 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200108052337.65916-6-drinkcat@chromium.org> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200109_060854_083319_F98B477B X-CRM114-Status: GOOD ( 25.31 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Tomeu Vizoso , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Liam Girdwood , Mark Brown , linux-mediatek@lists.infradead.org, Alyssa Rosenzweig , hsinyi@chromium.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On 08/01/2020 05:23, Nicolas Boichat wrote: > When there is a single power domain per device, the core will > ensure the power domains are all switched on. > > However, when there are multiple ones, as in MT8183 Bifrost GPU, > we need to handle them in driver code. > > > Signed-off-by: Nicolas Boichat > --- > > The downstream driver we use on chromeos-4.19 currently uses 2 > additional devices in device tree to accomodate for this [1], but > I believe this solution is cleaner. I'm not sure what is best, but it seems odd to encode this into the Panfrost driver itself - it doesn't have any knowledge of what to do with these power domains. The naming of the domains looks suspiciously like someone thought that e.g. only half of the cores could be powered, but it doesn't look like that was implemented in the chromeos driver linked and anyway that is *meant* to be automatic in the hardware! (I.e. if you only power up one cores in one core stack then the PDC should only enable the power domain for that set of cores). Steve > > [1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#31 > > drivers/gpu/drm/panfrost/panfrost_device.c | 87 ++++++++++++++++++++-- > drivers/gpu/drm/panfrost/panfrost_device.h | 4 + > 2 files changed, 83 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > index a0b0a6fef8b4e63..c6e9e059de94a4d 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > > #include "panfrost_device.h" > @@ -131,6 +132,67 @@ static void panfrost_regulator_fini(struct panfrost_device *pfdev) > regulator_disable(pfdev->regulator_sram); > } > > +static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(pfdev->pm_domain_devs); i++) { > + if (!pfdev->pm_domain_devs[i]) > + break; > + > + if (pfdev->pm_domain_links[i]) > + device_link_del(pfdev->pm_domain_links[i]); > + > + dev_pm_domain_detach(pfdev->pm_domain_devs[i], true); > + } > +} > + > +static int panfrost_pm_domain_init(struct panfrost_device *pfdev) > +{ > + int err; > + int i, num_domains; > + > + num_domains = of_count_phandle_with_args(pfdev->dev->of_node, > + "power-domains", > + "#power-domain-cells"); > + /* Single domains are handled by the core. */ > + if (num_domains < 2) > + return 0; > + > + if (num_domains > ARRAY_SIZE(pfdev->pm_domain_devs)) { > + dev_err(pfdev->dev, "Too many pm-domains: %d\n", num_domains); > + return -EINVAL; > + } > + > + for (i = 0; i < num_domains; i++) { > + pfdev->pm_domain_devs[i] = > + dev_pm_domain_attach_by_id(pfdev->dev, i); > + if (IS_ERR(pfdev->pm_domain_devs[i])) { > + err = PTR_ERR(pfdev->pm_domain_devs[i]); > + pfdev->pm_domain_devs[i] = NULL; > + dev_err(pfdev->dev, > + "failed to get pm-domain %d: %d\n", i, err); > + goto err; > + } > + > + pfdev->pm_domain_links[i] = device_link_add(pfdev->dev, > + pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | > + DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); > + if (!pfdev->pm_domain_links[i]) { > + dev_err(pfdev->pm_domain_devs[i], > + "adding device link failed!\n"); > + err = -ENODEV; > + goto err; > + } > + } > + > + return 0; > + > +err: > + panfrost_pm_domain_fini(pfdev); > + return err; > +} > + > int panfrost_device_init(struct panfrost_device *pfdev) > { > int err; > @@ -161,37 +223,45 @@ int panfrost_device_init(struct panfrost_device *pfdev) > goto err_out1; > } > > + err = panfrost_pm_domain_init(pfdev); > + if (err) { > + dev_err(pfdev->dev, "pm_domain init failed %d\n", err); > + goto err_out2; > + } > + > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > if (IS_ERR(pfdev->iomem)) { > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > err = PTR_ERR(pfdev->iomem); > - goto err_out2; > + goto err_out3; > } > > err = panfrost_gpu_init(pfdev); > if (err) > - goto err_out2; > + goto err_out3; > > err = panfrost_mmu_init(pfdev); > if (err) > - goto err_out3; > + goto err_out4; > > err = panfrost_job_init(pfdev); > if (err) > - goto err_out4; > + goto err_out5; > > err = panfrost_perfcnt_init(pfdev); > if (err) > - goto err_out5; > + goto err_out6; > > return 0; > -err_out5: > +err_out6: > panfrost_job_fini(pfdev); > -err_out4: > +err_out5: > panfrost_mmu_fini(pfdev); > -err_out3: > +err_out4: > panfrost_gpu_fini(pfdev); > +err_out3: > + panfrost_pm_domain_fini(pfdev); > err_out2: > panfrost_reset_fini(pfdev); > err_out1: > @@ -208,6 +278,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > panfrost_mmu_fini(pfdev); > panfrost_gpu_fini(pfdev); > panfrost_reset_fini(pfdev); > + panfrost_pm_domain_fini(pfdev); > panfrost_regulator_fini(pfdev); > panfrost_clk_fini(pfdev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h > index a124334d69e7e93..92d471676fc7823 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.h > +++ b/drivers/gpu/drm/panfrost/panfrost_device.h > @@ -19,6 +19,7 @@ struct panfrost_job; > struct panfrost_perfcnt; > > #define NUM_JOB_SLOTS 3 > +#define MAX_PM_DOMAINS 3 > > struct panfrost_features { > u16 id; > @@ -62,6 +63,9 @@ struct panfrost_device { > struct regulator *regulator; > struct regulator *regulator_sram; > struct reset_control *rstc; > + /* pm_domains for devices with more than one. */ > + struct device *pm_domain_devs[MAX_PM_DOMAINS]; > + struct device_link *pm_domain_links[MAX_PM_DOMAINS]; > > struct panfrost_features features; > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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,USER_AGENT_SANE_1 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 06781C282DD for ; Thu, 9 Jan 2020 14:08:58 +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 CBF7D2067D for ; Thu, 9 Jan 2020 14:08:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CL6UuzKV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBF7D2067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=v/c849wOimF1MsJPtqXI0upXQKbNm9Q6EDh2F9OvaIU=; b=CL6UuzKVNJwz24fKVrBbjfoa+ UfFTNpnMSIjhIJKnysGGHncwZzFZkgn9kOdW3ezhwOcumsSQTAV2Kze8z6LfEQ2wuIIKZKCA8D/+m oyV1ijmxAuLfpbIsgjON2mTRyzrDZcDEtkXJnGtEdLPsvRMCXw+3Anywxio7t59bU4zXF1Oe21bvS QaIHbBT8HfGUkQZKLTlX06aA+3SpO3lPFX8FLYe1FokDPGZFpHjx6KzfbeTFwBzMBW3i22mzvm3EL //u0lzAP+WAfajwJP+Pge8C3kAPF5LzJxcoEnvjAWiIxnkB6g8ZYE5HTPI9scUQTDtJQXNCwy1V2B WiT89xy6Q==; 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 1ipYUb-0008BG-BY; Thu, 09 Jan 2020 14:08:57 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipYUX-0008Ak-Uw; Thu, 09 Jan 2020 14:08:55 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E6011FB; Thu, 9 Jan 2020 06:08:53 -0800 (PST) Received: from [10.1.27.38] (unknown [10.1.27.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34AA63F534; Thu, 9 Jan 2020 06:08:49 -0800 (PST) Subject: Re: [PATCH v2 5/7] drm/panfrost: Add support for multiple power domain support To: Nicolas Boichat , Rob Herring References: <20200108052337.65916-1-drinkcat@chromium.org> <20200108052337.65916-6-drinkcat@chromium.org> From: Steven Price Message-ID: Date: Thu, 9 Jan 2020 14:08:48 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200108052337.65916-6-drinkcat@chromium.org> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200109_060854_083319_F98B477B X-CRM114-Status: GOOD ( 25.31 ) 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: Mark Rutland , devicetree@vger.kernel.org, Tomeu Vizoso , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Liam Girdwood , Mark Brown , linux-mediatek@lists.infradead.org, Alyssa Rosenzweig , hsinyi@chromium.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 08/01/2020 05:23, Nicolas Boichat wrote: > When there is a single power domain per device, the core will > ensure the power domains are all switched on. > > However, when there are multiple ones, as in MT8183 Bifrost GPU, > we need to handle them in driver code. > > > Signed-off-by: Nicolas Boichat > --- > > The downstream driver we use on chromeos-4.19 currently uses 2 > additional devices in device tree to accomodate for this [1], but > I believe this solution is cleaner. I'm not sure what is best, but it seems odd to encode this into the Panfrost driver itself - it doesn't have any knowledge of what to do with these power domains. The naming of the domains looks suspiciously like someone thought that e.g. only half of the cores could be powered, but it doesn't look like that was implemented in the chromeos driver linked and anyway that is *meant* to be automatic in the hardware! (I.e. if you only power up one cores in one core stack then the PDC should only enable the power domain for that set of cores). Steve > > [1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#31 > > drivers/gpu/drm/panfrost/panfrost_device.c | 87 ++++++++++++++++++++-- > drivers/gpu/drm/panfrost/panfrost_device.h | 4 + > 2 files changed, 83 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > index a0b0a6fef8b4e63..c6e9e059de94a4d 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > > #include "panfrost_device.h" > @@ -131,6 +132,67 @@ static void panfrost_regulator_fini(struct panfrost_device *pfdev) > regulator_disable(pfdev->regulator_sram); > } > > +static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(pfdev->pm_domain_devs); i++) { > + if (!pfdev->pm_domain_devs[i]) > + break; > + > + if (pfdev->pm_domain_links[i]) > + device_link_del(pfdev->pm_domain_links[i]); > + > + dev_pm_domain_detach(pfdev->pm_domain_devs[i], true); > + } > +} > + > +static int panfrost_pm_domain_init(struct panfrost_device *pfdev) > +{ > + int err; > + int i, num_domains; > + > + num_domains = of_count_phandle_with_args(pfdev->dev->of_node, > + "power-domains", > + "#power-domain-cells"); > + /* Single domains are handled by the core. */ > + if (num_domains < 2) > + return 0; > + > + if (num_domains > ARRAY_SIZE(pfdev->pm_domain_devs)) { > + dev_err(pfdev->dev, "Too many pm-domains: %d\n", num_domains); > + return -EINVAL; > + } > + > + for (i = 0; i < num_domains; i++) { > + pfdev->pm_domain_devs[i] = > + dev_pm_domain_attach_by_id(pfdev->dev, i); > + if (IS_ERR(pfdev->pm_domain_devs[i])) { > + err = PTR_ERR(pfdev->pm_domain_devs[i]); > + pfdev->pm_domain_devs[i] = NULL; > + dev_err(pfdev->dev, > + "failed to get pm-domain %d: %d\n", i, err); > + goto err; > + } > + > + pfdev->pm_domain_links[i] = device_link_add(pfdev->dev, > + pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | > + DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); > + if (!pfdev->pm_domain_links[i]) { > + dev_err(pfdev->pm_domain_devs[i], > + "adding device link failed!\n"); > + err = -ENODEV; > + goto err; > + } > + } > + > + return 0; > + > +err: > + panfrost_pm_domain_fini(pfdev); > + return err; > +} > + > int panfrost_device_init(struct panfrost_device *pfdev) > { > int err; > @@ -161,37 +223,45 @@ int panfrost_device_init(struct panfrost_device *pfdev) > goto err_out1; > } > > + err = panfrost_pm_domain_init(pfdev); > + if (err) { > + dev_err(pfdev->dev, "pm_domain init failed %d\n", err); > + goto err_out2; > + } > + > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > if (IS_ERR(pfdev->iomem)) { > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > err = PTR_ERR(pfdev->iomem); > - goto err_out2; > + goto err_out3; > } > > err = panfrost_gpu_init(pfdev); > if (err) > - goto err_out2; > + goto err_out3; > > err = panfrost_mmu_init(pfdev); > if (err) > - goto err_out3; > + goto err_out4; > > err = panfrost_job_init(pfdev); > if (err) > - goto err_out4; > + goto err_out5; > > err = panfrost_perfcnt_init(pfdev); > if (err) > - goto err_out5; > + goto err_out6; > > return 0; > -err_out5: > +err_out6: > panfrost_job_fini(pfdev); > -err_out4: > +err_out5: > panfrost_mmu_fini(pfdev); > -err_out3: > +err_out4: > panfrost_gpu_fini(pfdev); > +err_out3: > + panfrost_pm_domain_fini(pfdev); > err_out2: > panfrost_reset_fini(pfdev); > err_out1: > @@ -208,6 +278,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > panfrost_mmu_fini(pfdev); > panfrost_gpu_fini(pfdev); > panfrost_reset_fini(pfdev); > + panfrost_pm_domain_fini(pfdev); > panfrost_regulator_fini(pfdev); > panfrost_clk_fini(pfdev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h > index a124334d69e7e93..92d471676fc7823 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.h > +++ b/drivers/gpu/drm/panfrost/panfrost_device.h > @@ -19,6 +19,7 @@ struct panfrost_job; > struct panfrost_perfcnt; > > #define NUM_JOB_SLOTS 3 > +#define MAX_PM_DOMAINS 3 > > struct panfrost_features { > u16 id; > @@ -62,6 +63,9 @@ struct panfrost_device { > struct regulator *regulator; > struct regulator *regulator_sram; > struct reset_control *rstc; > + /* pm_domains for devices with more than one. */ > + struct device *pm_domain_devs[MAX_PM_DOMAINS]; > + struct device_link *pm_domain_links[MAX_PM_DOMAINS]; > > struct panfrost_features features; > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 CF98FC33CA1 for ; Thu, 9 Jan 2020 14:08:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 ACEB42067D for ; Thu, 9 Jan 2020 14:08:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACEB42067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F8D36E429; Thu, 9 Jan 2020 14:08:55 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id B1F1F6E429 for ; Thu, 9 Jan 2020 14:08:53 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3E6011FB; Thu, 9 Jan 2020 06:08:53 -0800 (PST) Received: from [10.1.27.38] (unknown [10.1.27.38]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34AA63F534; Thu, 9 Jan 2020 06:08:49 -0800 (PST) Subject: Re: [PATCH v2 5/7] drm/panfrost: Add support for multiple power domain support To: Nicolas Boichat , Rob Herring References: <20200108052337.65916-1-drinkcat@chromium.org> <20200108052337.65916-6-drinkcat@chromium.org> From: Steven Price Message-ID: Date: Thu, 9 Jan 2020 14:08:48 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200108052337.65916-6-drinkcat@chromium.org> Content-Language: en-GB X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Tomeu Vizoso , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Liam Girdwood , Mark Brown , linux-mediatek@lists.infradead.org, Alyssa Rosenzweig , hsinyi@chromium.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 08/01/2020 05:23, Nicolas Boichat wrote: > When there is a single power domain per device, the core will > ensure the power domains are all switched on. > > However, when there are multiple ones, as in MT8183 Bifrost GPU, > we need to handle them in driver code. > > > Signed-off-by: Nicolas Boichat > --- > > The downstream driver we use on chromeos-4.19 currently uses 2 > additional devices in device tree to accomodate for this [1], but > I believe this solution is cleaner. I'm not sure what is best, but it seems odd to encode this into the Panfrost driver itself - it doesn't have any knowledge of what to do with these power domains. The naming of the domains looks suspiciously like someone thought that e.g. only half of the cores could be powered, but it doesn't look like that was implemented in the chromeos driver linked and anyway that is *meant* to be automatic in the hardware! (I.e. if you only power up one cores in one core stack then the PDC should only enable the power domain for that set of cores). Steve > > [1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#31 > > drivers/gpu/drm/panfrost/panfrost_device.c | 87 ++++++++++++++++++++-- > drivers/gpu/drm/panfrost/panfrost_device.h | 4 + > 2 files changed, 83 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > index a0b0a6fef8b4e63..c6e9e059de94a4d 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > > #include "panfrost_device.h" > @@ -131,6 +132,67 @@ static void panfrost_regulator_fini(struct panfrost_device *pfdev) > regulator_disable(pfdev->regulator_sram); > } > > +static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(pfdev->pm_domain_devs); i++) { > + if (!pfdev->pm_domain_devs[i]) > + break; > + > + if (pfdev->pm_domain_links[i]) > + device_link_del(pfdev->pm_domain_links[i]); > + > + dev_pm_domain_detach(pfdev->pm_domain_devs[i], true); > + } > +} > + > +static int panfrost_pm_domain_init(struct panfrost_device *pfdev) > +{ > + int err; > + int i, num_domains; > + > + num_domains = of_count_phandle_with_args(pfdev->dev->of_node, > + "power-domains", > + "#power-domain-cells"); > + /* Single domains are handled by the core. */ > + if (num_domains < 2) > + return 0; > + > + if (num_domains > ARRAY_SIZE(pfdev->pm_domain_devs)) { > + dev_err(pfdev->dev, "Too many pm-domains: %d\n", num_domains); > + return -EINVAL; > + } > + > + for (i = 0; i < num_domains; i++) { > + pfdev->pm_domain_devs[i] = > + dev_pm_domain_attach_by_id(pfdev->dev, i); > + if (IS_ERR(pfdev->pm_domain_devs[i])) { > + err = PTR_ERR(pfdev->pm_domain_devs[i]); > + pfdev->pm_domain_devs[i] = NULL; > + dev_err(pfdev->dev, > + "failed to get pm-domain %d: %d\n", i, err); > + goto err; > + } > + > + pfdev->pm_domain_links[i] = device_link_add(pfdev->dev, > + pfdev->pm_domain_devs[i], DL_FLAG_PM_RUNTIME | > + DL_FLAG_STATELESS | DL_FLAG_RPM_ACTIVE); > + if (!pfdev->pm_domain_links[i]) { > + dev_err(pfdev->pm_domain_devs[i], > + "adding device link failed!\n"); > + err = -ENODEV; > + goto err; > + } > + } > + > + return 0; > + > +err: > + panfrost_pm_domain_fini(pfdev); > + return err; > +} > + > int panfrost_device_init(struct panfrost_device *pfdev) > { > int err; > @@ -161,37 +223,45 @@ int panfrost_device_init(struct panfrost_device *pfdev) > goto err_out1; > } > > + err = panfrost_pm_domain_init(pfdev); > + if (err) { > + dev_err(pfdev->dev, "pm_domain init failed %d\n", err); > + goto err_out2; > + } > + > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > if (IS_ERR(pfdev->iomem)) { > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > err = PTR_ERR(pfdev->iomem); > - goto err_out2; > + goto err_out3; > } > > err = panfrost_gpu_init(pfdev); > if (err) > - goto err_out2; > + goto err_out3; > > err = panfrost_mmu_init(pfdev); > if (err) > - goto err_out3; > + goto err_out4; > > err = panfrost_job_init(pfdev); > if (err) > - goto err_out4; > + goto err_out5; > > err = panfrost_perfcnt_init(pfdev); > if (err) > - goto err_out5; > + goto err_out6; > > return 0; > -err_out5: > +err_out6: > panfrost_job_fini(pfdev); > -err_out4: > +err_out5: > panfrost_mmu_fini(pfdev); > -err_out3: > +err_out4: > panfrost_gpu_fini(pfdev); > +err_out3: > + panfrost_pm_domain_fini(pfdev); > err_out2: > panfrost_reset_fini(pfdev); > err_out1: > @@ -208,6 +278,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > panfrost_mmu_fini(pfdev); > panfrost_gpu_fini(pfdev); > panfrost_reset_fini(pfdev); > + panfrost_pm_domain_fini(pfdev); > panfrost_regulator_fini(pfdev); > panfrost_clk_fini(pfdev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h > index a124334d69e7e93..92d471676fc7823 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.h > +++ b/drivers/gpu/drm/panfrost/panfrost_device.h > @@ -19,6 +19,7 @@ struct panfrost_job; > struct panfrost_perfcnt; > > #define NUM_JOB_SLOTS 3 > +#define MAX_PM_DOMAINS 3 > > struct panfrost_features { > u16 id; > @@ -62,6 +63,9 @@ struct panfrost_device { > struct regulator *regulator; > struct regulator *regulator_sram; > struct reset_control *rstc; > + /* pm_domains for devices with more than one. */ > + struct device *pm_domain_devs[MAX_PM_DOMAINS]; > + struct device_link *pm_domain_links[MAX_PM_DOMAINS]; > > struct panfrost_features features; > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel