Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp5684544rwb; Mon, 5 Dec 2022 02:39:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JFOmc1tkLRhX4jgxzRoNX2THmCt+F5Fhtja8aI8hPKIBLN40zIL9zDzKr6PKa/KLY/zu7 X-Received: by 2002:a17:90b:30c6:b0:219:11ae:265f with SMTP id hi6-20020a17090b30c600b0021911ae265fmr49532483pjb.194.1670236742264; Mon, 05 Dec 2022 02:39:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670236742; cv=none; d=google.com; s=arc-20160816; b=tjK83RomwCARWPwqhk6G0i9/CVsZbkpslBjLO+3y/HbB6pIlKl0o/y8ZabZpgVx/Bz grRqXFlCXAhBmR6nn6mLX6bNN9pZLCenVa5TxCM/LCiPhoVKgH+gqRa7ThAW3m4w/o88 Sj5qfMeAvGZo30zZp9SZ8JeynN6/A9nXNbb1X75552Y/nxxaHzfrTjEzqt9SJHMuP29G ZkIwnuigpos+WrU/jFaPL8/h98mPCBQytG1VfbskH0BL+vSWhc/zpyV2rQLEehBInMKE 8/wXAOzXXfBnHmRveMmf12e5iEyK7slftnY9/vCe9SQiXlxEf8CMLk8Wzwec5GwdqDm8 1gPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=nOS35xCNfjwyVvZeiW7RruHd6Fjl0+YKGL/Za9qwxeY=; b=uSfsbCSvHacQkBERN6YtRpYPnD+jLQzCVJnxz+DZ7SVkDAvnD3V8IYnTrlAvQAZlOF QtFCaqYlCUrB8kMhiUl0wAlTpeluJ0KbNIKZMKFvWE8UodapsWWxqLHN8hHLbVLfn5UC 6IYFYb9XC4ctwolLx0tPjZEnpgimNCxzTxQSQDk+bpH728RkX1lXjvWfIOrAyAgol5Ui f/I6VGChywLad4oINDnPP1+EdEoSCFr0xM4XKTpr8qEJJ4rEdAuzMEnF0I8S4plb6lq6 UTTM51wF/A0Ncoa78QAybPhz7jTCBCoZpTLVozTpafRq8hnp5cavosoPQob2AilQBDvB i0ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=m5sgsXXt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a17090ace8100b002192566b3e3si16713397pju.146.2022.12.05.02.38.51; Mon, 05 Dec 2022 02:39:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=m5sgsXXt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230465AbiLEKJV (ORCPT + 82 others); Mon, 5 Dec 2022 05:09:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229985AbiLEKJT (ORCPT ); Mon, 5 Dec 2022 05:09:19 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E90F2183AA for ; Mon, 5 Dec 2022 02:09:17 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sendonly@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id DF71242137; Mon, 5 Dec 2022 10:09:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1670234956; bh=/lyXjIyUIb+1pgEaMmUwZNYl0uV1GrDjGWI2beTmvj0=; h=From:To:Cc:Subject:Date; b=m5sgsXXtSrqefqkY+9rLDHCdHtIuKLYn/OuPT+lybjBXgnPgK4kP9ZReDUcpmDmoS c1/7bQzBphZxXoYjhy/8FMOxpVooUeVACX4o7mCPZ+jfRJoYUMoptCKE8bSspRqQn1 G9qJxD3f1sHwP9JbMmaV7DvbMf5WgxYWa+MN/2dyc7ECMe+53CxF/L/2RgEH2evwAh T5erlbKK2tLu4HcbSoBGNiFfR7wnLb2/RGpWWc/zbZOx/+gzTXbCkQg+HSehHcZAEV AeoMO8Mz2cYYR6HWiPgNT6HcU0IK0G7PvYZ/XaA8t2Az8Gi6KSVAGqqZjwgAZRYE23 QlU6oP/9NfpVg== From: Hector Martin To: Joerg Roedel , Will Deacon , Robin Murphy Cc: Sven Peter , Alyssa Rosenzweig , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hector Martin Subject: [PATCH] iommu: dart: Add suspend/resume support Date: Mon, 5 Dec 2022 19:09:07 +0900 Message-Id: <20221205100907.10230-1-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We need to save/restore the TCR/TTBR registers, since they are lost on power gate. Signed-off-by: Hector Martin --- drivers/iommu/apple-dart.c | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c index 4f4a323be0d0..ed524765ad87 100644 --- a/drivers/iommu/apple-dart.c +++ b/drivers/iommu/apple-dart.c @@ -121,6 +121,9 @@ struct apple_dart { struct iommu_group *sid2group[DART_MAX_STREAMS]; struct iommu_device iommu; + + u32 save_tcr[DART_MAX_STREAMS]; + u32 save_ttbr[DART_MAX_STREAMS][DART_MAX_TTBR]; }; /* @@ -932,6 +935,50 @@ static const struct apple_dart_hw apple_dart_hw_t6000 = { .fmt = APPLE_DART2, }; +#ifdef CONFIG_PM_SLEEP +static int apple_dart_suspend(struct device *dev) +{ + struct apple_dart *dart = dev_get_drvdata(dev); + unsigned int sid, idx; + + for (sid = 0; sid < DART_MAX_STREAMS; sid++) { + dart->save_tcr[sid] = readl_relaxed(dart->regs + DART_TCR(sid)); + for (idx = 0; idx < DART_MAX_TTBR; idx++) + dart->save_ttbr[sid][idx] = + readl_relaxed(dart->regs + DART_TTBR(sid, idx)); + } + + return 0; +} + +static int apple_dart_resume(struct device *dev) +{ + struct apple_dart *dart = dev_get_drvdata(dev); + unsigned int sid, idx; + int ret; + + ret = apple_dart_hw_reset(dart); + if (ret) { + dev_err(dev, "Failed to reset DART on resume\n"); + return ret; + } + + for (sid = 0; sid < DART_MAX_STREAMS; sid++) { + for (idx = 0; idx < DART_MAX_TTBR; idx++) + writel_relaxed(dart->save_ttbr[sid][idx], + dart->regs + DART_TTBR(sid, idx)); + writel_relaxed(dart->save_tcr[sid], dart->regs + DART_TCR(sid)); + } + + return 0; +} + +static const struct dev_pm_ops apple_dart_pm_ops = { + .suspend = apple_dart_suspend, + .resume = apple_dart_resume, +}; +#endif + static const struct of_device_id apple_dart_of_match[] = { { .compatible = "apple,t8103-dart", .data = &apple_dart_hw_t8103 }, { .compatible = "apple,t6000-dart", .data = &apple_dart_hw_t6000 }, @@ -944,6 +991,9 @@ static struct platform_driver apple_dart_driver = { .name = "apple-dart", .of_match_table = apple_dart_of_match, .suppress_bind_attrs = true, +#ifdef CONFIG_PM_SLEEP + .pm = &apple_dart_pm_ops, +#endif }, .probe = apple_dart_probe, .remove = apple_dart_remove, -- 2.35.1