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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 CA95BC3A589 for ; Tue, 20 Aug 2019 07:52:02 +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 9BD682396B for ; Tue, 20 Aug 2019 07:52:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DCZ8Hnk7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ti.com header.i=@ti.com header.b="IfqjHu3d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BD682396B Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.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=eIHdrXAuTmHDQ0KjMjTDUMu3xTZihY+8agRq0QdAGNo=; b=DCZ8Hnk7HWv/F4dKmpoJ+XIHo vQ6B2ng0EXgGPvGM5IkvRCXPpj6gpzVn10JxU0J2tWAavIKiw+m+eEmhIvLawAbSWaeIoTvQ7TZvK FeauU9DrWH3yoTVTFmwoek77RWW6stPcv8MZtjPGtlLTBxx+zLr/QPAhtI63KNq745gTOtt5HDuVR p38LgnwGrpp83sJjkfPFP//UWmdfw+Ih2u626J1S5sVlCAS8/IJM2QFQ16OggSYlpZdUnpcUGTaUO +M/XKYPzFr5hSYKzURb6jVqDlga18lpvYGZMStyjhxVd76qD6tc8FahG0Q3hzHbJlaLlxIJBuSs2k ImRQ1C0SA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hzyvs-0006WH-8m; Tue, 20 Aug 2019 07:51:56 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hzyvo-0006Vy-LM for linux-arm-kernel@lists.infradead.org; Tue, 20 Aug 2019 07:51:54 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x7K7pnev099688; Tue, 20 Aug 2019 02:51:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1566287509; bh=ISX44cpySrnnmOafogvn2VkGYMPOG2t0Hg+hoOVJwk8=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=IfqjHu3dyHjeqPAVl3Tny9X5Kni6yx+bdAWGyIKOFQtnFNG/bg86elyuBzPV5Aoxd 52eqPdWHwXwcWW5oh+PMj2vLKOqwnTSPEnWVlV2E/Eq65jTDw8hOZOowWDwMj80tpc PVrduo7fWyAkg/rWzyfQlv9RaqMiOgcCidULHkcM= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x7K7pnwO125523 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 20 Aug 2019 02:51:49 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 20 Aug 2019 02:51:47 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 20 Aug 2019 02:51:48 -0500 Received: from [127.0.0.1] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id x7K7pjPe088378; Tue, 20 Aug 2019 02:51:46 -0500 Subject: Re: [PATCH 4/8] soc: ti: omap-prm: add support for denying idle for reset clockdomain To: Suman Anna , , , , References: <1565164139-21886-1-git-send-email-t-kristo@ti.com> <1565164139-21886-5-git-send-email-t-kristo@ti.com> <81cda31a-b321-f9b4-2df7-2b6c084b2ec5@ti.com> From: Tero Kristo Message-ID: <34c761e7-65c1-cc42-2b33-513dfbcd8574@ti.com> Date: Tue, 20 Aug 2019 10:51:45 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <81cda31a-b321-f9b4-2df7-2b6c084b2ec5@ti.com> Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190820_005152_784967_B0257806 X-CRM114-Status: GOOD ( 25.70 ) 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: tony@atomide.com, devicetree@vger.kernel.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 20.8.2019 2.16, Suman Anna wrote: > Hi Tero, > > On 8/7/19 2:48 AM, Tero Kristo wrote: >> TI SoCs hardware reset signals require the parent clockdomain to be >> in force wakeup mode while de-asserting the reset, otherwise it may >> never complete. To support this, add pdata hooks to control the >> clockdomain directly. >> >> Signed-off-by: Tero Kristo >> --- >> drivers/soc/ti/omap_prm.c | 32 ++++++++++++++++++++++++++++---- >> include/linux/platform_data/ti-prm.h | 21 +++++++++++++++++++++ >> 2 files changed, 49 insertions(+), 4 deletions(-) >> create mode 100644 include/linux/platform_data/ti-prm.h >> >> diff --git a/drivers/soc/ti/omap_prm.c b/drivers/soc/ti/omap_prm.c >> index d412af3..870515e3 100644 >> --- a/drivers/soc/ti/omap_prm.c >> +++ b/drivers/soc/ti/omap_prm.c >> @@ -16,6 +16,8 @@ >> #include >> #include >> >> +#include >> + >> struct omap_rst_map { >> s8 rst; >> s8 st; >> @@ -24,6 +26,7 @@ struct omap_rst_map { >> struct omap_prm_data { >> u32 base; >> const char *name; >> + const char *clkdm_name; >> u16 pwstctrl; >> u16 pwstst; >> u16 rstctl; >> @@ -40,6 +43,8 @@ struct omap_prm { >> struct omap_reset_data { >> struct reset_controller_dev rcdev; >> struct omap_prm *prm; >> + struct clockdomain *clkdm; >> + struct device *dev; >> }; >> >> #define to_omap_reset_data(p) container_of((p), struct omap_reset_data, rcdev) >> @@ -108,6 +113,8 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, >> int st_bit = id; >> bool has_rstst; >> int timeout = 0; >> + struct ti_prm_platform_data *pdata = dev_get_platdata(reset->dev); >> + int ret = 0; >> >> /* check the current status to avoid de-asserting the line twice */ >> v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); >> @@ -125,13 +132,16 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, >> writel_relaxed(v, reset->prm->base + reset->prm->data->rstst); >> } >> >> + if (pdata->clkdm_deny_idle && reset->clkdm) >> + pdata->clkdm_deny_idle(reset->clkdm); >> + >> /* de-assert the reset control line */ >> v = readl_relaxed(reset->prm->base + reset->prm->data->rstctl); >> v &= ~(1 << id); >> writel_relaxed(v, reset->prm->base + reset->prm->data->rstctl); >> >> if (!has_rstst) >> - return 0; >> + goto exit; >> >> /* wait for the status to be set */ >> while (1) { >> @@ -140,13 +150,19 @@ static int omap_reset_deassert(struct reset_controller_dev *rcdev, >> if (v) >> break; >> timeout++; >> - if (timeout > OMAP_RESET_MAX_WAIT) >> - return -EBUSY; >> + if (timeout > OMAP_RESET_MAX_WAIT) { >> + ret = -EBUSY; >> + goto exit; >> + } >> >> udelay(1); >> } >> >> - return 0; >> +exit: >> + if (pdata->clkdm_allow_idle && reset->clkdm) >> + pdata->clkdm_allow_idle(reset->clkdm); >> + >> + return ret; >> } >> >> static const struct reset_control_ops omap_reset_ops = { >> @@ -159,6 +175,8 @@ static int omap_prm_reset_probe(struct platform_device *pdev, >> struct omap_prm *prm) >> { >> struct omap_reset_data *reset; >> + struct ti_prm_platform_data *pdata = dev_get_platdata(&pdev->dev); > > Please add checks for NULL callbacks. I don't think these are optional > right, so better to check in init rather than during runtime. Granted > you will probably not run into this after patch 8, but would be good to > check and print an error in case pdata quirks is missed out. Hmm ok, this would get rid of the runtime checks which would be slightly cleaner. > >> + char buf[32]; >> >> /* >> * Check if we have resets. If either rstctl or rstst is >> @@ -177,9 +195,15 @@ static int omap_prm_reset_probe(struct platform_device *pdev, >> reset->rcdev.ops = &omap_reset_ops; >> reset->rcdev.of_node = pdev->dev.of_node; >> reset->rcdev.nr_resets = OMAP_MAX_RESETS; >> + reset->dev = &pdev->dev; >> >> reset->prm = prm; >> >> + sprintf(buf, "%s_clkdm", prm->data->clkdm_name ? prm->data->clkdm_name : >> + prm->data->name); >> + >> + reset->clkdm = pdata->clkdm_lookup(buf); > > Not checking return status? clkdm will just end up being NULL in failure, which is fine for rest of the code. I don't think it can be ever NULL though, so I can add a check here for sanity. -Tero > > regards > Suman > >> + >> return devm_reset_controller_register(&pdev->dev, &reset->rcdev); >> } >> >> diff --git a/include/linux/platform_data/ti-prm.h b/include/linux/platform_data/ti-prm.h >> new file mode 100644 >> index 0000000..28154c3 >> --- /dev/null >> +++ b/include/linux/platform_data/ti-prm.h >> @@ -0,0 +1,21 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> +/* >> + * TI PRM (Power & Reset Manager) platform data >> + * >> + * Copyright (C) 2019 Texas Instruments, Inc. >> + * >> + * Tero Kristo >> + */ >> + >> +#ifndef _LINUX_PLATFORM_DATA_TI_PRM_H >> +#define _LINUX_PLATFORM_DATA_TI_PRM_H >> + >> +struct clockdomain; >> + >> +struct ti_prm_platform_data { >> + void (*clkdm_deny_idle)(struct clockdomain *clkdm); >> + void (*clkdm_allow_idle)(struct clockdomain *clkdm); >> + struct clockdomain * (*clkdm_lookup)(const char *name); >> +}; >> + >> +#endif /* _LINUX_PLATFORM_DATA_TI_PRM_H */ >> > -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel