From patchwork Thu Apr 18 15:51:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitor Soares X-Patchwork-Id: 13635031 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 8A3E1C4345F for ; Thu, 18 Apr 2024 15:52:24 +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=8brlWOPiI3qyElPZwPVMtfI6S4ByXLT0L0DioPKG/4M=; b=pIyXiJD9ALaiHI HIjYgHc+Ew+zWvFe/CwNYIanIQVCYiOrBHXCk48N1yr6RkczNysLnxSEQaB1RY4WOdZDbzO7E0/xC bDEokbfj+f85vCBtxH87iIthwOUOxEVZsnEFuF/+I2WE2pUPoMYnWpXVUjiK2SD4xEUD3P6zfN3rB Uui6/pYd5aD6hAHPBk7VX9X15wcrJd8vofxSbM43kp6Yjqm56Cf6PVDcqX/CANfsqiffL/xyfERSl mKkkDQdqfLtTPl1XcKYySXaIkFTBfKkoiR0xg3h3KEI6UOW+criQbjRqqTenklK3lbe7FfbWaA7AA jaRRkBJJ3Px5DFTQbUDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxU3Z-00000002tJM-07BS; Thu, 18 Apr 2024 15:52:13 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxU3W-00000002tIU-0g4L for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 15:52:11 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-418c2bf2f90so6285775e9.1 for ; Thu, 18 Apr 2024 08:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713455526; x=1714060326; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=WPBZ9ExHuwu+bu/mp1K2y+evtVoXz/i7anIOf+mTPDM=; b=RCBO7CAno2xiNF/HUHsLoxB7f8wIHeGFcSOyluhtbD7Y2KG2eYBVCkaUjjgOciFTi2 65k3QaGvpxTrD9d6Il/1SYopgIN6dbOOuId6OqLWJzjt9jHbRnOibBEWWFtF4rYlnoAR HFQoS/r/M8u7mg7atSsLY79+mcvoQR9QabJVqNPU77pkIfnOjxNDeTz7j4bBeC65pnxJ 2E8Ze33RN1eW/jBxSxwD4iCzpMAVTeKpPB2IeXNkN89VsPWNhXDgO+gmGFBUx0IM5zqn iqQGMF1zSSGcK4lF1goYppYv+veRTF5hkHRPhfLBSLJ7WzrzZIcj8soqFLOLhEwlKCPN LdOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713455526; x=1714060326; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WPBZ9ExHuwu+bu/mp1K2y+evtVoXz/i7anIOf+mTPDM=; b=GmYkWn7dvNqUAFQldujRnb/kM1Gm44STSzLqFy9OQeqvL3hj8RLUaSmzUMn4g/If2p tMTyO6mMwRIyNXldKLV1CHIwFVH9uYD+0t1JW1+AoXFytwkLnYlmhCcXZYh5hiV4pu6S wbD2vDZdGkR0SGFUn4y1OnctTOhAlNaSqomZUZaaw/WrlKsGGXH5RsVAPRSqh+mPjmBE QJnqAOP+O2OqlG7Gp7T5/4fv0lPo7putteXIGRNzHwah6tn1nN7nM93PgdgLLKQ6JqRJ lrwD+IZIbgzoceiBXTZBK7eH5CVJ3tJ+ttZ+6vASJrjaV+PoAXh8K4GiJwXNGGyM4Tsu tkEw== X-Forwarded-Encrypted: i=1; AJvYcCXflfgPR+YaN/ndOc/JeVrokRnqKZvaj6BKkckn63prgGrbRFcGXoWgRFsV5sCHrjbccQgDYZmp4szdD5res4BysGI64dJj+b8vfbtkTNhCYLpVjBA= X-Gm-Message-State: AOJu0Yxb1npqeRz4sDbmDmGzPc60lKyKS3g/1fQrJkK8Fx9hgE8rgfJ3 7YrLy+rVzLvUDtqFSD/+en0EozDqIDKhUtvchZj6/Z+b4W5M4PRs X-Google-Smtp-Source: AGHT+IFSm2+nTTTBh/s5wnJ18wP/8/m9M0ecQsavX8QpbNXPEQlYhBTSMGaOPCVh/XJ7vaSK6GL7IQ== X-Received: by 2002:a05:600c:4e09:b0:418:f219:6e22 with SMTP id b9-20020a05600c4e0900b00418f2196e22mr1182984wmq.11.1713455526019; Thu, 18 Apr 2024 08:52:06 -0700 (PDT) Received: from vitor-nb.. ([2001:8a0:e622:f700:cffe:40a8:31d4:2e61]) by smtp.gmail.com with ESMTPSA id o30-20020adfa11e000000b00341b7d5054bsm2168202wro.72.2024.04.18.08.52.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 08:52:05 -0700 (PDT) From: Vitor Soares To: Ulf Hansson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: Vitor Soares , linux-pm@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ivitro@gmail.com, stable@vger.kernel.org, Lucas Stach Subject: [PATCH v1] pmdomain: imx8m-blk-ctrl: fix suspend/resume order Date: Thu, 18 Apr 2024 16:51:51 +0100 Message-Id: <20240418155151.355133-1-ivitro@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-20240418_085210_295567_5EC03AF0 X-CRM114-Status: GOOD ( 16.45 ) 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 From: Vitor Soares During the probe, the genpd power_dev is added to the dpm_list after blk_ctrl due to its parent/child relationship. Making the blk_ctrl suspend after and resume before the genpd power_dev. As a consequence, the system hangs when resuming the VPU due to the power domain dependency. To ensure the proper suspend/resume order, add a device link betweem blk_ctrl and genpd power_dev. It guarantees genpd power_dev is suspended after and resumed before blk-ctrl. Cc: Closes: https://lore.kernel.org/all/fccbb040330a706a4f7b34875db1d896a0bf81c8.camel@gmail.com/ Link: https://lore.kernel.org/all/20240409085802.290439-1-ivitro@gmail.com/ Fixes: 2684ac05a8c4 ("soc: imx: add i.MX8M blk-ctrl driver") Suggested-by: Lucas Stach Signed-off-by: Vitor Soares Reviewed-by: Lucas Stach --- This is a new patch, but is a follow-up of: https://lore.kernel.org/all/20240409085802.290439-1-ivitro@gmail.com/ As suggested by Lucas, we are addressing this PM issue in the imx8m-blk-ctrl driver instead of in the imx8mm.dtsi. drivers/pmdomain/imx/imx8m-blk-ctrl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/pmdomain/imx/imx8m-blk-ctrl.c b/drivers/pmdomain/imx/imx8m-blk-ctrl.c index ca942d7929c2..cd0d2296080d 100644 --- a/drivers/pmdomain/imx/imx8m-blk-ctrl.c +++ b/drivers/pmdomain/imx/imx8m-blk-ctrl.c @@ -283,6 +283,20 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev) goto cleanup_pds; } + /* + * Enforce suspend/resume ordering by making genpd power_dev a + * provider of blk-ctrl. Genpd power_dev is suspended after and + * resumed before blk-ctrl. + */ + if (!device_link_add(dev, domain->power_dev, DL_FLAG_STATELESS)) { + ret = -EINVAL; + dev_err_probe(dev, ret, + "failed to link to %s\n", data->name); + pm_genpd_remove(&domain->genpd); + dev_pm_domain_detach(domain->power_dev, true); + goto cleanup_pds; + } + /* * We use runtime PM to trigger power on/off of the upstream GPC * domain, as a strict hierarchical parent/child power domain @@ -324,6 +338,7 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev) of_genpd_del_provider(dev->of_node); cleanup_pds: for (i--; i >= 0; i--) { + device_link_remove(dev, bc->domains[i].power_dev); pm_genpd_remove(&bc->domains[i].genpd); dev_pm_domain_detach(bc->domains[i].power_dev, true); } @@ -343,6 +358,7 @@ static void imx8m_blk_ctrl_remove(struct platform_device *pdev) for (i = 0; bc->onecell_data.num_domains; i++) { struct imx8m_blk_ctrl_domain *domain = &bc->domains[i]; + device_link_remove(&pdev->dev, domain->power_dev); pm_genpd_remove(&domain->genpd); dev_pm_domain_detach(domain->power_dev, true); }