From patchwork Fri Feb 25 16:17:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12760531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8FF56C4332F for ; Fri, 25 Feb 2022 16:19:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=peF6kdP3bfbuhgJodWrhI3KXGiIureAIZ6IRFlbvw1Y=; b=d64oFuC5hmKpDZ VOILGaxjaXgikyDHbawITPsuW6OCTPtFSFTIw6igrNufmB8/Gr6UzufMmeI3HDKvE/5fSu/ipsnba 90wH7gA67w1YbmKVZymelxo+ZVkHmlIfbgqMafgA6kH63QR3+e4li4a7dAoj4FWMIfEZUZZJ7BFHR nNP1luu4o+VQILJSZsUJrwckQYq0HZ2atg36kL+L9XUPlWd8mv/JS+2iDNuB26MvwaK9dfeRrTvLA KYdhjp5jqaJa485pxRD6Om4JDkzhfqHmsMFcDaAWTt2Zhi0iHMS+Luw0QPLvL0mMON2yNdUywRT99 DWups8p8KqjzMJn2GROQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNdI5-005rpV-V6; Fri, 25 Feb 2022 16:17:58 +0000 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNdI3-005roH-3N for linux-arm-kernel@lists.infradead.org; Fri, 25 Feb 2022 16:17:56 +0000 Received: by mail-io1-xd2e.google.com with SMTP id c23so7063876ioi.4 for ; Fri, 25 Feb 2022 08:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BxmQ2SPW8vIpZXI+C7y1LPYYljU/FZQdxhiSd4nteEE=; b=nd5+6GuoSVy/CnCSsiicvc7SE8av31Xtq8uGa/jv8LgI0QGQeBgIdOeuKynmSvbklD T+/PQ4KRENFcC84sOGs3hgp5wufjzYKzGy2j5+3hl9TIc+jVmEQOik8IAKsMvpkdgxLy KN1ZHuOhkyqHshLqW+QYFCzo4g/Q3KWMwEoSHNN/YQ9VI6p8jsTPSQ5JCJ4nLNUSDnY8 7mkMiUc9y5YCnvMeGBf/tqWoiwcZ20NTkm5iBxp+VLVlHhY2CD13V/jbqh92AACj10TO wwU3dxcojq5oZqD84nz1NcjEftddoVA7a+u2DB8KaECt4RGXT1OlQft92Zo2LEtYXm2O rblQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BxmQ2SPW8vIpZXI+C7y1LPYYljU/FZQdxhiSd4nteEE=; b=K9qPpBWZrkFYhC09KhAmEUodOLdZoWNt5AjgM/SPxhmNGdpjThBJA2wXggh4s/6UL4 BXmPdgPA2i2xJg3z6Gnx3attFIyAUhstDrgti4R4cqvLlevZ7GmQET9Kp+3qkP1J7i1c AJkgtk5uPEmOCrzcKY6QFd3EdnfyZjPf8LauGRgLqsQLCoVy/1hGgen0DuvBCzblw37e yEPXpKo4fH9zo+vim+ww+j+yTLytGVaRgQWJSbnMvV1lqSVY2wFutkKSMBCTtCfvNgEt lkMX31u/ksUXBXoXCsp2OQYFMFG/vyOKfl/05f8wdGIeSUlxE39JB42sUj0JlHHMvwyT 7RTQ== X-Gm-Message-State: AOAM530iD/m/lSyoalexVKq11pCO1gGursTPwh3tdmagsSTE2TR8zLId QDbVJ7I9TrKK0iez19cLQCJRD3RfhBGgTw== X-Google-Smtp-Source: ABdhPJwSp6IXoNCgZs8r3RMMnUj6+cAERAjy+foY7d2psuExz/mlUcLViGmUZJe9z5wg39iJhYkDqA== X-Received: by 2002:a05:6602:1616:b0:641:6dbd:502d with SMTP id x22-20020a056602161600b006416dbd502dmr6016005iow.195.1645805871627; Fri, 25 Feb 2022 08:17:51 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:5b80:a4b8:a089:497a]) by smtp.gmail.com with ESMTPSA id v2-20020a92c802000000b002c1ed616004sm1852132iln.82.2022.02.25.08.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 08:17:50 -0800 (PST) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Lucas Stach , linux-kernel@vger.kernel.org Subject: [PATCH] soc: imx: imx8m-blk-ctrl: Fix IMX8MN_DISPBLK_PD_ISI hang Date: Fri, 25 Feb 2022 10:17:41 -0600 Message-Id: <20220225161741.395505-1-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220225_081755_163509_3C65C2CB X-CRM114-Status: UNSURE ( 9.09 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When attempting to communicate with the ISI, the system hangs. Through trial and error, it appears removing the two root clocks fixes the issues. Since IMX8MN_DISPBLK_PD_ISI enables the pgc_dispmix, and pgc_dispmix enables those same root clocks, it should be safe. Fixes: 7f511d514e8c ("soc: imx: imx8m-blk-ctrl: add i.MX8MN DISP blk-ctrl") Signed-off-by: Adam Ford diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c index 122f9c884b38..cacf379aef80 100644 --- a/drivers/soc/imx/imx8m-blk-ctrl.c +++ b/drivers/soc/imx/imx8m-blk-ctrl.c @@ -574,9 +574,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mn_disp_blk_ctl_domain_data[] }, [IMX8MN_DISPBLK_PD_ISI] = { .name = "dispblk-isi", - .clk_names = (const char *[]){ "disp_axi", "disp_apb", "disp_axi_root", - "disp_apb_root"}, - .num_clks = 4, + .clk_names = (const char *[]){ "disp_axi", "disp_apb" }, + .num_clks = 2, .gpc_name = "isi", .rst_mask = BIT(6) | BIT(7), .clk_mask = BIT(6) | BIT(7),