From nobody Mon Feb 9 23:42:52 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 857B847BCEE for ; Thu, 8 Jan 2026 14:23:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767882197; cv=none; b=YvI6gdygh95d9a3qUhHl+cFp77+fBf+AooSY29q1KmS6Ij/dVUXlDABtzaJLOSnPevZRcPC6+v+uLVu2LZLxdJuMIuVydtfFKcjTwsC3HSN+5bwHkp2thQLPHZcwkrtmkoM6gKxqEgQAYJd0A+Z/XQOJBYuAtHETGtZY2tYyFnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767882197; c=relaxed/simple; bh=f5ClC5mG4GcVXz7wL0WuqoU4Bj74MmSUh43rHPKY8Oc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UF0j52cmWZ3COOFLEAgHoztx3uy7FFZXRJ5wXMjMKa+0tjbWQdiy4E6sId0T89WWKgTVMZIoFZA4W/PGSWwJ1U8lQCAs3FHwbh2uDW8WmgwbIR079iuAooZio+QwvOA2TvAN7d7R2SnxyqzEOUoRrGNNpb0o6vzkwtx8NgJDcT0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=mjAvEt3D; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="mjAvEt3D" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7aab061e7cbso3461747b3a.1 for ; Thu, 08 Jan 2026 06:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1767882194; x=1768486994; darn=vger.kernel.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=ek4+J5z7iMVE3UoqqZLSFX17x8G5Wc4n/tfTFWI/PHI=; b=mjAvEt3DTBxDyiHj68LVnwoeaLsSN7yFZzG4WOyEbXrZ8H48N6uxKr0TsI09bqnv9F 7nWQKQkdG/28IQcyQOwcUhX9YNoLlLkHiP3E58eFg7m3x0c6NJQ+hFwqXUmdU/Bq4J5V ENfCfOPIfDhs2ts5Q47iB7uZUxTIJOBxGGqhG4U5js1kQGGUT3+IlKdgUWhTmDpWCJvT kgaZahHLTePyIznLaA7OpQvqznZ2k5irqTImxyIvq6besZs/hBcFasHAbITma8nm0ybo w8HJtjnwnJgtKskLB/JDhI2D7dtoxXoPai0vu1/kGd7kWYJuaPBS2+vUnaC9udsWFEfK WWng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767882194; x=1768486994; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ek4+J5z7iMVE3UoqqZLSFX17x8G5Wc4n/tfTFWI/PHI=; b=vhWaiQU8HgrPOHR6XOo+2on5pJIMDeqNalkjOViXRglR+4lyL3RHBrwmKuyiEUVAY7 GeQIRVMNWnaKSq+o+hmMtMqzRgde16iykoX69Mi2rTwDH9jpVMEIP/b0vfmwSiqqsk1s Pp2QGUSVvJE6qN33Kqo5eG9eaimxWcU+t/nnLSBq0ZOpoKvVHumfIkr7zv3N1JXSwKyB ZNB0/bfu+8wPJEXksK8nkW8dCt+ncbq0kjnxk1NiimbQFZbkaMTwbZYci9D1FHUhh9FF rl1Ri4AkwoMfzy+Hv84hTstClHEg06Id3p7vRQhhrRrqe9cuXzW7hv6aRN30Av6bvQua dzHw== X-Forwarded-Encrypted: i=1; AJvYcCVXThjfuXvUyLySmCgWzuOYW4o7eR33VFqLcqVyadrtrWRuJYC8vqyn+AxQnh7jfMelGTRhBIx0LIu2RXc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2tc7ZxMljLGe8EugzeQiFlu8onOOLLO7AM8dq7ug8VDZeJSsX DBKN9SLHBKD8wYPyrDgl5B4J1WJH5TwXuvUbHBRgcM6Mv7XNxqlc9r6zafZWSPirXLZVCQWXMz0 7GS0iuVuhmhbC X-Gm-Gg: AY/fxX7FknbPVmUXS8LXKrhBbbXSxj8klWATwHDjlL2cVyE64dYpAnOsY3ZUxKqKkds dQIZWcAQZPE7RolYMu3Kguve4pfVl6IMS2pws2bKcg+Zjtp3mGvxnQSJAMjBh49SKlFbxaVwIq+ sIdSrT46eWl6KvDnAq+ELaMsmPM29keZsfxfsbty5RqEOici2uG2zW4b9IUoXOKHFJ7ULkQwbhR Vwm+PXhcw0zm4nT6at53Nyf6TJ+R/KaGkEUz1TfdKYjhKRYLNuHAsL8NIDts+5zHMKislo3RTcZ TBEwAGS8ElgGWHUGQmGuvmII6nkMx888zbMwxcHANbNlw7sbjb814yQzdYihaFLEY9dH6d8fJnu Y//gvr+CG8MyLtKHl7uRwm9G1rpYeuApD5xu2imQKV2Vyk9n8Jzsdgbn3+QuExUZX8Hb/sDGmcv bOQrw4ldvULV4e/VeDHAr72jQVlgE+Ekk= X-Google-Smtp-Source: AGHT+IHhXo6q1QuygWc5cKoTIJxec9jU2FLWFkfZShEs9ltY9Su5Z9NN5no1InJoRxaTlcTFJckmoQ== X-Received: by 2002:a05:6a00:218d:b0:81b:ad74:80c2 with SMTP id d2e1a72fcca58-81bad7482b2mr5683577b3a.28.1767882194137; Thu, 08 Jan 2026 06:23:14 -0800 (PST) Received: from [127.0.1.1] ([2a12:a305:4::40df]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-819c59e7c16sm7927906b3a.53.2026.01.08.06.23.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jan 2026 06:23:13 -0800 (PST) From: Guodong Xu Date: Thu, 08 Jan 2026 22:22:16 +0800 Subject: [PATCH v2 3/4] reset: spacemit: Extract common K1 reset code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260108-k3-reset-v2-3-457df235efe9@riscstar.com> References: <20260108-k3-reset-v2-0-457df235efe9@riscstar.com> In-Reply-To: <20260108-k3-reset-v2-0-457df235efe9@riscstar.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Yixun Lan , Haylen Chu Cc: Alex Elder , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, Guodong Xu X-Mailer: b4 0.14.2 Extract the common reset controller code from the K1 driver into separate reset-spacemit-common.{c,h} files to prepare for additional SpacemiT SoCs that share the same reset controller architecture. The common code includes handlers for reset assert and deassert operations and probing for auxiliary bus devices. Changes during extraction: - Module ownership: Use dev->driver->owner instead of THIS_MODULE in spacemit_reset_controller_register() to correctly reference the calling driver's module. - Rename spacemit_reset_ids to spacemit_k1_reset_ids. - Define new namespace "RESET_SPACEMIT" for the exported common functions (spacemit_reset_probe) and update K1 driver to import it. This prepares for additional SpacemiT SoCs (K3) that share the same reset controller architecture. Signed-off-by: Guodong Xu Reviewed-by: Alex Elder --- v2: Use dev->driver->owner for the reset controller owner instead of THIS_MODULE to fix the module reference counting issue pointed out by Krzysztof Kozlowski. --- drivers/reset/spacemit/Kconfig | 17 +++- drivers/reset/spacemit/Makefile | 2 + drivers/reset/spacemit/reset-spacemit-common.c | 77 ++++++++++++++++++ drivers/reset/spacemit/reset-spacemit-common.h | 42 ++++++++++ drivers/reset/spacemit/reset-spacemit-k1.c | 107 +++------------------= ---- 5 files changed, 144 insertions(+), 101 deletions(-) diff --git a/drivers/reset/spacemit/Kconfig b/drivers/reset/spacemit/Kconfig index 552884e8b72afeb05cdb9b6565ad8e7fd32f990b..56a4858b30e136296e1f9c85b7b= 13ccee91fe7b4 100644 --- a/drivers/reset/spacemit/Kconfig +++ b/drivers/reset/spacemit/Kconfig @@ -1,10 +1,20 @@ # SPDX-License-Identifier: GPL-2.0-only =20 -config RESET_SPACEMIT_K1 - tristate "SpacemiT K1 reset driver" +menu "Reset support for SpacemiT platforms" depends on ARCH_SPACEMIT || COMPILE_TEST - depends on SPACEMIT_K1_CCU + +config RESET_SPACEMIT_COMMON + tristate select AUXILIARY_BUS + help + Common reset controller infrastructure for SpacemiT SoCs. + This provides shared code and helper functions used by + reset drivers for various SpacemiT SoC families. + +config RESET_SPACEMIT_K1 + tristate "Support for SpacemiT K1 SoC" + depends on SPACEMIT_K1_CCU + select RESET_SPACEMIT_COMMON default SPACEMIT_K1_CCU help Support for reset controller in SpacemiT K1 SoC. @@ -12,3 +22,4 @@ config RESET_SPACEMIT_K1 unit (CCU) driver to provide reset control functionality for various peripherals and subsystems in the SoC. =20 +endmenu diff --git a/drivers/reset/spacemit/Makefile b/drivers/reset/spacemit/Makef= ile index de7e358c74fd7b0fac3ec2c18d985331af64fcbb..fecda9f211b24a54707b3f425b9= 325be1f2f7738 100644 --- a/drivers/reset/spacemit/Makefile +++ b/drivers/reset/spacemit/Makefile @@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_RESET_SPACEMIT_COMMON) +=3D reset-spacemit-common.o + obj-$(CONFIG_RESET_SPACEMIT_K1) +=3D reset-spacemit-k1.o =20 diff --git a/drivers/reset/spacemit/reset-spacemit-common.c b/drivers/reset= /spacemit/reset-spacemit-common.c new file mode 100644 index 0000000000000000000000000000000000000000..0626633a5e7db6e31be4ed36505= b15291eb186b1 --- /dev/null +++ b/drivers/reset/spacemit/reset-spacemit-common.c @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* SpacemiT reset controller driver - common implementation */ + +#include +#include +#include + +#include + +#include "reset-spacemit-common.h" + +static int spacemit_reset_update(struct reset_controller_dev *rcdev, + unsigned long id, bool assert) +{ + struct ccu_reset_controller *controller; + const struct ccu_reset_data *data; + u32 mask; + u32 val; + + controller =3D container_of(rcdev, struct ccu_reset_controller, rcdev); + data =3D &controller->data->reset_data[id]; + mask =3D data->assert_mask | data->deassert_mask; + val =3D assert ? data->assert_mask : data->deassert_mask; + + return regmap_update_bits(controller->regmap, data->offset, mask, val); +} + +static int spacemit_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, true); +} + +static int spacemit_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, false); +} + +static const struct reset_control_ops spacemit_reset_control_ops =3D { + .assert =3D spacemit_reset_assert, + .deassert =3D spacemit_reset_deassert, +}; + +static int spacemit_reset_controller_register(struct device *dev, + struct ccu_reset_controller *controller) +{ + struct reset_controller_dev *rcdev =3D &controller->rcdev; + + rcdev->ops =3D &spacemit_reset_control_ops; + rcdev->owner =3D dev->driver->owner; + rcdev->of_node =3D dev->of_node; + rcdev->nr_resets =3D controller->data->count; + + return devm_reset_controller_register(dev, &controller->rcdev); +} + +int spacemit_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct spacemit_ccu_adev *rdev =3D to_spacemit_ccu_adev(adev); + struct ccu_reset_controller *controller; + struct device *dev =3D &adev->dev; + + controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + if (!controller) + return -ENOMEM; + controller->data =3D (const struct ccu_reset_controller_data *)id->driver= _data; + controller->regmap =3D rdev->regmap; + + return spacemit_reset_controller_register(dev, controller); +} +EXPORT_SYMBOL_NS_GPL(spacemit_reset_probe, "RESET_SPACEMIT"); + +MODULE_DESCRIPTION("SpacemiT reset controller driver - common code"); +MODULE_LICENSE("GPL"); diff --git a/drivers/reset/spacemit/reset-spacemit-common.h b/drivers/reset= /spacemit/reset-spacemit-common.h new file mode 100644 index 0000000000000000000000000000000000000000..ffaf2f86eb39df72b079095b3f5= da3622e132c8d --- /dev/null +++ b/drivers/reset/spacemit/reset-spacemit-common.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * SpacemiT reset controller driver - common definitions + */ + +#ifndef _RESET_SPACEMIT_COMMON_H_ +#define _RESET_SPACEMIT_COMMON_H_ + +#include +#include +#include +#include + +struct ccu_reset_data { + u32 offset; + u32 assert_mask; + u32 deassert_mask; +}; + +struct ccu_reset_controller_data { + const struct ccu_reset_data *reset_data; /* array */ + size_t count; +}; + +struct ccu_reset_controller { + struct reset_controller_dev rcdev; + const struct ccu_reset_controller_data *data; + struct regmap *regmap; +}; + +#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ + { \ + .offset =3D (_offset), \ + .assert_mask =3D (_assert_mask), \ + .deassert_mask =3D (_deassert_mask), \ + } + +/* Common probe function */ +int spacemit_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id); + +#endif /* _RESET_SPACEMIT_COMMON_H_ */ diff --git a/drivers/reset/spacemit/reset-spacemit-k1.c b/drivers/reset/spa= cemit/reset-spacemit-k1.c index cc7fd1f8750d422f3d8f96367ae259f38418c44b..8f3b5329ea5f627ab454e15bf48= 5b155c9f48ca5 100644 --- a/drivers/reset/spacemit/reset-spacemit-k1.c +++ b/drivers/reset/spacemit/reset-spacemit-k1.c @@ -1,41 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only =20 -/* SpacemiT reset controller driver */ +/* SpacemiT K1 reset controller driver */ =20 -#include -#include -#include #include -#include -#include -#include =20 -#include #include +#include =20 -struct ccu_reset_data { - u32 offset; - u32 assert_mask; - u32 deassert_mask; -}; - -struct ccu_reset_controller_data { - const struct ccu_reset_data *reset_data; /* array */ - size_t count; -}; - -struct ccu_reset_controller { - struct reset_controller_dev rcdev; - const struct ccu_reset_controller_data *data; - struct regmap *regmap; -}; - -#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ - { \ - .offset =3D (_offset), \ - .assert_mask =3D (_assert_mask), \ - .deassert_mask =3D (_deassert_mask), \ - } +#include "reset-spacemit-common.h" =20 static const struct ccu_reset_data k1_mpmu_resets[] =3D { [RESET_WDT] =3D RESET_DATA(MPMU_WDTPCR, BIT(2), 0), @@ -214,91 +186,30 @@ static const struct ccu_reset_controller_data k1_apbc= 2_reset_data =3D { .count =3D ARRAY_SIZE(k1_apbc2_resets), }; =20 -static int spacemit_reset_update(struct reset_controller_dev *rcdev, - unsigned long id, bool assert) -{ - struct ccu_reset_controller *controller; - const struct ccu_reset_data *data; - u32 mask; - u32 val; - - controller =3D container_of(rcdev, struct ccu_reset_controller, rcdev); - data =3D &controller->data->reset_data[id]; - mask =3D data->assert_mask | data->deassert_mask; - val =3D assert ? data->assert_mask : data->deassert_mask; - - return regmap_update_bits(controller->regmap, data->offset, mask, val); -} - -static int spacemit_reset_assert(struct reset_controller_dev *rcdev, - unsigned long id) -{ - return spacemit_reset_update(rcdev, id, true); -} - -static int spacemit_reset_deassert(struct reset_controller_dev *rcdev, - unsigned long id) -{ - return spacemit_reset_update(rcdev, id, false); -} - -static const struct reset_control_ops spacemit_reset_control_ops =3D { - .assert =3D spacemit_reset_assert, - .deassert =3D spacemit_reset_deassert, -}; - -static int spacemit_reset_controller_register(struct device *dev, - struct ccu_reset_controller *controller) -{ - struct reset_controller_dev *rcdev =3D &controller->rcdev; - - rcdev->ops =3D &spacemit_reset_control_ops; - rcdev->owner =3D THIS_MODULE; - rcdev->of_node =3D dev->of_node; - rcdev->nr_resets =3D controller->data->count; - - return devm_reset_controller_register(dev, &controller->rcdev); -} - -static int spacemit_reset_probe(struct auxiliary_device *adev, - const struct auxiliary_device_id *id) -{ - struct spacemit_ccu_adev *rdev =3D to_spacemit_ccu_adev(adev); - struct ccu_reset_controller *controller; - struct device *dev =3D &adev->dev; - - controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); - if (!controller) - return -ENOMEM; - controller->data =3D (const struct ccu_reset_controller_data *)id->driver= _data; - controller->regmap =3D rdev->regmap; - - return spacemit_reset_controller_register(dev, controller); -} - #define K1_AUX_DEV_ID(_unit) \ { \ .name =3D "spacemit_ccu.k1-" #_unit "-reset", \ .driver_data =3D (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ } =20 -static const struct auxiliary_device_id spacemit_reset_ids[] =3D { +static const struct auxiliary_device_id spacemit_k1_reset_ids[] =3D { K1_AUX_DEV_ID(mpmu), K1_AUX_DEV_ID(apbc), K1_AUX_DEV_ID(apmu), K1_AUX_DEV_ID(rcpu), K1_AUX_DEV_ID(rcpu2), K1_AUX_DEV_ID(apbc2), - { }, + { /* sentinel */ } }; -MODULE_DEVICE_TABLE(auxiliary, spacemit_reset_ids); +MODULE_DEVICE_TABLE(auxiliary, spacemit_k1_reset_ids); =20 static struct auxiliary_driver spacemit_k1_reset_driver =3D { .probe =3D spacemit_reset_probe, - .id_table =3D spacemit_reset_ids, + .id_table =3D spacemit_k1_reset_ids, }; module_auxiliary_driver(spacemit_k1_reset_driver); =20 +MODULE_IMPORT_NS("RESET_SPACEMIT"); MODULE_AUTHOR("Alex Elder "); -MODULE_DESCRIPTION("SpacemiT reset controller driver"); +MODULE_DESCRIPTION("SpacemiT K1 reset controller driver"); MODULE_LICENSE("GPL"); --=20 2.43.0