From patchwork Fri Mar 28 15:15:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 14032213 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 C9C05C36011 for ; Fri, 28 Mar 2025 15:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tSsT7QLwFrGtJXgYzLTDttFLB1HtTy9nHcX9oWhHWK8=; b=N0DZR1LfkFW1CKa/I/GBoNT40t rnrt9WmqgJHqdXdEENd1OjKI7pWS9TmxMsy6rI8XlAhhN4UwGCrnpvapfXgGm53e6ldkLb2sH7gEa P7xW41ZS4ugJGDLMdV5qqwKRru7W4Rynx+P3GcpUaDT76hOpfVuoZR7cy6aVNmxqgu8GD9ANPczvO uCjlIrRURAPkiacsJnxGyHcTZPXWOAj+KmxJYH98/pUaiFxzZropjJSqk+PJxPG+Ys2QhGZMXWxuF znxZL8BjK97/nXR7m1Mn7tgy4vU6T0RHLDD8DEondJo6FgdQ4OiJKCCuqDSxvrGfmSe8HaUB4G4Cx m1/wtjEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1tyC2I-0000000DpAY-1Z35; Fri, 28 Mar 2025 15:54:22 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1tyBQa-0000000Djkc-1KKP for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 15:15:26 +0000 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5ed1ac116e3so3864609a12.3 for ; Fri, 28 Mar 2025 08:15:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743174923; x=1743779723; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tSsT7QLwFrGtJXgYzLTDttFLB1HtTy9nHcX9oWhHWK8=; b=vNMgoBmU6EVPLnqZhYyNa7AWKXbqAM522IKGDdx41QAYvhjlUpwnZh2hBYH8BaL8BF pWPnmcTL1iRIVsP5rb1V3LDfZdbwHisG6sqw2hd31KCmCWiSK/VVqaKf6o0UKC4+bgMa 4sUHjmMakbKvQrigYtAWV2r8eMEXBHwizon9x/9heiyyD1vWipLVP9Y6abrg59/XPxu9 jZ+0i7rCPSJoHyzF8SxwF1YlA254wt3cPXjavb9BDmCcc1xGkBE8a5tmRbtMzbW8r3LW U+z4T2RIM1u4ye+14jX0qWDoQweaiVfS+7fh3tyTSwRzIjvuSQH+dDc3ZJDQ9bAtWMHP jX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743174923; x=1743779723; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tSsT7QLwFrGtJXgYzLTDttFLB1HtTy9nHcX9oWhHWK8=; b=kKLrDHD4tflzUOcN7bWdXws/bysRbkETdERCSFGyte1JpwVePglG+CpPW+ZYfgf+AP 5lho/m8ySLi3+uKUvMM9vyiIbRiYakiVCXIy7b/F6Xh5+aAyz2jZA4XdjdWg9dDTzbG5 /yc52roSXi0Ti9AoFnh7rxWd6mT/Sma+ZJTZt614w3eMQbshMU7BjP01qSI4O0fEwvWQ NiFjI31ApWxJZc67cKhB/O6zyeEbzGvf/Q2HQ8JjPY1iCRC9GYm0cv54ALJ4t7+/cHVS dN8Rugk8gZlnlNJCyyAxvd4uFKAWetfYieCJzF+OGRze7F5WwPYscXCmqKlO929AuN+b eTEw== X-Forwarded-Encrypted: i=1; AJvYcCUx1/+C+0PTDia1Lsqgxw+DXYfjG5KOqS4QSCD1FIITfa2eKj35jB4Q9wgC6+hN5tjleRzcNeNX7yMc8h+bq+pY@lists.infradead.org X-Gm-Message-State: AOJu0Yzllx6LkBueogKy7rl9d+WA8aHUEU1VS6xxDKtlOFNDzgO52AO5 PGCKAuYcxNpf72BK6KZgmFJSuzxJo/V6v6rv/Urj7PPZgJPOqMWR4XXzQtbuDUM= X-Gm-Gg: ASbGncvkFNzCMqoQGjMTcPSPFRNmHut+v3mVpFyceXHXep76aEIJ6URCgkHuTJZnmtj l/rljgvjRZMLHR9OFo1sAPWPBovHRsWyrGJlWr2IhhArFiODKXIHCeVt7dXV5zEUKbaNrrVpWE5 GA01oGJSPr4lkCrKHB+ICmIFgirnhApFvEHd1OtwbmCYRb/DZ3f8n3GGPGKU5MI+YqAgJ2bLsLs QsMD9Ou/cNTA/59N7zCelUyB4YXWAAONhzF/G/GU7wQPzQ4EJoeqeeaO+bRdLnRWvKeGL4L+B+s uMGK36lctyfAt7fL8R2gDG4o/+CPrQaIYgXZsFk4gYNjONck6sKvolV0UEL9NOxcSMPuSVXI5In RLID3VmKN8pKhJq5lf86CBtdfeSz1 X-Google-Smtp-Source: AGHT+IEWPzD/U+QVIvLgLhOsjJHdSVScC1Inq2Efi46czBnZaUtFyAtnrEbdytwYUOnTSrDbDskAIw== X-Received: by 2002:a17:907:868c:b0:ac4:169:3664 with SMTP id a640c23a62f3a-ac6faf04132mr673143566b.33.1743174922634; Fri, 28 Mar 2025 08:15:22 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac71927b742sm178789266b.65.2025.03.28.08.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 08:15:22 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Fri, 28 Mar 2025 15:15:21 +0000 Subject: [PATCH v4 3/3] power: reset: syscon-reboot: add gs101-specific reset MIME-Version: 1.0 Message-Id: <20250328-syscon-reboot-reset-mode-v4-3-77ba57703ace@linaro.org> References: <20250328-syscon-reboot-reset-mode-v4-0-77ba57703ace@linaro.org> In-Reply-To: <20250328-syscon-reboot-reset-mode-v4-0-77ba57703ace@linaro.org> To: Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar Cc: Peter Griffin , Tudor Ambarus , Will McVicker , kernel-team@android.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250328_081524_376603_F9040703 X-CRM114-Status: GOOD ( 21.18 ) 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 Linux supports a couple different reset modes, but this driver here doesn't distinguish between them and issues the same syscon register write irrespective of the reset mode requested by the kernel. Since DTs should not encode register writes (see e.g. [1]), update this driver to support different reset modes based on DT compatible match. At the same time, add support for Google GS101, which does support cold, hard, warm, and soft. As an example why this is useful, other than properly supporting the Linux reboot= kernel command line option or sysfs entry, this change allows gs101-platforms to default to a more secure cold-reset, but also to warm-reset in case RAM contents needs to be retained across the reset. Link: https://lore.kernel.org/all/20250227132644.GA1924628-robh@kernel.org/ [1] Signed-off-by: André Draszik --- drivers/power/reset/syscon-reboot.c | 98 +++++++++++++++++++++++++++++-------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c index d623d77e657e4c233d8ae88bb099bee13c48a9ef..2e2cf5f62d733c7c07110f3052583607e25afd5d 100644 --- a/drivers/power/reset/syscon-reboot.c +++ b/drivers/power/reset/syscon-reboot.c @@ -14,11 +14,24 @@ #include #include -struct syscon_reboot_context { - struct regmap *map; +struct reboot_mode_bits { u32 offset; - u32 value; u32 mask; + u32 value; + bool valid; +}; + +struct reboot_data { + struct reboot_mode_bits mode_bits[REBOOT_SOFT + 1]; + struct reboot_mode_bits catchall; +}; + +struct syscon_reboot_context { + struct regmap *map; + + const struct reboot_data *rd; /* from of match data, if any */ + struct reboot_mode_bits catchall; /* from DT */ + struct notifier_block restart_handler; }; @@ -28,9 +41,21 @@ static int syscon_restart_handle(struct notifier_block *this, struct syscon_reboot_context *ctx = container_of(this, struct syscon_reboot_context, restart_handler); + const struct reboot_mode_bits *mode_bits; + + if (ctx->rd) { + if (mode < ARRAY_SIZE(ctx->rd->mode_bits) && + ctx->rd->mode_bits[mode].valid) + mode_bits = &ctx->rd->mode_bits[mode]; + else + mode_bits = &ctx->rd->catchall; + } else { + mode_bits = &ctx->catchall; + } /* Issue the reboot */ - regmap_update_bits(ctx->map, ctx->offset, ctx->mask, ctx->value); + regmap_update_bits(ctx->map, mode_bits->offset, mode_bits->mask, + mode_bits->value); mdelay(1000); @@ -42,7 +67,6 @@ static int syscon_reboot_probe(struct platform_device *pdev) { struct syscon_reboot_context *ctx; struct device *dev = &pdev->dev; - int mask_err, value_err; int priority; int err; @@ -60,24 +84,33 @@ static int syscon_reboot_probe(struct platform_device *pdev) if (of_property_read_s32(pdev->dev.of_node, "priority", &priority)) priority = 192; - if (of_property_read_u32(pdev->dev.of_node, "offset", &ctx->offset)) - if (of_property_read_u32(pdev->dev.of_node, "reg", &ctx->offset)) - return -EINVAL; + ctx->rd = of_device_get_match_data(dev); + if (!ctx->rd) { + int mask_err, value_err; - value_err = of_property_read_u32(pdev->dev.of_node, "value", &ctx->value); - mask_err = of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask); - if (value_err && mask_err) { - dev_err(dev, "unable to read 'value' and 'mask'"); - return -EINVAL; - } + if (of_property_read_u32(pdev->dev.of_node, "offset", + &ctx->catchall.offset) && + of_property_read_u32(pdev->dev.of_node, "reg", + &ctx->catchall.offset)) + return -EINVAL; - if (value_err) { - /* support old binding */ - ctx->value = ctx->mask; - ctx->mask = 0xFFFFFFFF; - } else if (mask_err) { - /* support value without mask*/ - ctx->mask = 0xFFFFFFFF; + value_err = of_property_read_u32(pdev->dev.of_node, "value", + &ctx->catchall.value); + mask_err = of_property_read_u32(pdev->dev.of_node, "mask", + &ctx->catchall.mask); + if (value_err && mask_err) { + dev_err(dev, "unable to read 'value' and 'mask'"); + return -EINVAL; + } + + if (value_err) { + /* support old binding */ + ctx->catchall.value = ctx->catchall.mask; + ctx->catchall.mask = 0xFFFFFFFF; + } else if (mask_err) { + /* support value without mask */ + ctx->catchall.mask = 0xFFFFFFFF; + } } ctx->restart_handler.notifier_call = syscon_restart_handle; @@ -89,7 +122,30 @@ static int syscon_reboot_probe(struct platform_device *pdev) return err; } +static const struct reboot_data gs101_reboot_data = { + .mode_bits = { + [REBOOT_WARM] = { + .offset = 0x3a00, /* SYSTEM_CONFIGURATION */ + .mask = 0x00000002, /* SWRESET_SYSTEM */ + .value = 0x00000002, + .valid = true, + }, + [REBOOT_SOFT] = { + .offset = 0x3a00, /* SYSTEM_CONFIGURATION */ + .mask = 0x00000002, /* SWRESET_SYSTEM */ + .value = 0x00000002, + .valid = true, + }, + }, + .catchall = { + .offset = 0x3e9c, /* PAD_CTRL_PWR_HOLD */ + .mask = 0x00000100, + .value = 0x00000000, + }, +}; + static const struct of_device_id syscon_reboot_of_match[] = { + { .compatible = "google,gs101-reboot", .data = &gs101_reboot_data }, { .compatible = "syscon-reboot" }, {} };