From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 3326C2F3608 for ; Mon, 3 Nov 2025 09:35:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762162557; cv=none; b=OKXJ71cDE4WEtZ4wvDai0PLNdkOecd8cZCboBsEAkjzSmuAbxQhpVRTArxFnFvBiNkazsTdto1xrWYQA+4tbtY+rRG6jhw5nfUoaqcyrKjCLgChHr1QBPLrsQ5hOyUiKgmibhZ2dKVW9EHDqovXyQW+sG846fTpd2rxmm6gb+Qk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762162557; c=relaxed/simple; bh=LVirDKugKBwbbhccPkhESHv27V21xLYG8l1u0h8U634=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CitKzM8uD9ZKNKouaa3aJOXpwCAi+U2a7TZvTFvcPPen1bgBzKtfvb30gYPQzekBeRE8BGTw4hqlfBjzuGUTPe1+YbFbU0i9YOcM7Yi1/PBofYo6cfq81K9Ky8PDtplW6YYGfBiW1RuF6HxnKyOmJwn3zeQ9bdeTAaMfRngolJI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=WbyEUyYH; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="WbyEUyYH" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-47728f914a4so20687235e9.1 for ; Mon, 03 Nov 2025 01:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1762162554; x=1762767354; 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=Ccx+aLo9kBZlyDoxwdiUlxqcXIUYEmsoX9N+IulSngU=; b=WbyEUyYHMKr84mMD70rTZjLf3j6Lh6q35Gh/9YxOdly6LhgPDOAuJ+X0K8t1VkgvNX taduIJ3t8ujN/ZPD90NWCMqKI2WPnVUFF8am9GyJQpozlGFkwAUrxGzl3ubdmvRDWKRF U4SLxZeyws8LUZ48aAghIVvjAAVG89GNjT+K49RP/d538SYoOhlcChG0oEio7sxuHono 8DY1rfF6PWWj5yMZhUpviXlOJSIctORwrf0TgPRxAnZqsEc2Am64Kfw7ddhKqNfsnpAd PZnXv/BHXp2SfGlFdN9pyShL/1FExajUFve/2GfQV5+sr+3SNnepQ8bdnUuT5AAWbQYg uGuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762162554; x=1762767354; 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=Ccx+aLo9kBZlyDoxwdiUlxqcXIUYEmsoX9N+IulSngU=; b=HxkJcumEXwuBeBFk67ZKawL6x+Z2413QOMsXGxv+scYE2NYUw12knla//P/ROSEFZw Yz7HfMHM4ItipULOpU3y2ID7reOSChueMuEHxLiRHx4roP4xXpDKZ/f+igND1jfG2tgY 79fXTnLupjYOjR2mwmUDof+tEbjd+RnO8PjTgIMwC7jfwK8vsCo2hATet4lR/QoXtMKJ tjXAHf7egFcYSM7hHX48bUjW4f2B24CwYRMe+0kya4XNFWpOnjTFrUEBxp6EatSMcEes DVIMCtLCjQr/JKrcJrcMt9KO6EqDK0OZ515qjYAdeMuFa+qzKfMPuKLfHW64WxIkHXd1 cJng== X-Gm-Message-State: AOJu0YzpEN5k65vVm8SPzCn3qfkzsx/djE5/flNQ2ZAxsaWLJDqyM6Uz +SHRpsd0lcPkRajBgXZgYLBbkD+rF1bd9XHdMaRKCxwilZJhYHElH08lKqGacwul3qQ= X-Gm-Gg: ASbGnct/xgoQDki/jwKJ/feIwhRcSZ6rQIQf5u9hhY3/B60JKXHdfL8qWzYqT4RgkpF RBjGbMVCfl2HDROQzsUdibbvS3RLwGee1dgZZcuu08s5hGoMIzrbFVOoVu46t55nEpaB0dMMGqR AcTSG0ug7jykVVcq5jCIeoNipaDI9hkgJaf2f3oCAIR81WGhUvfEPKbKVrAlIXDj1pSkmoDbGiO P0oUR8WhoMiLUfTjbuIUtSxmWDDsEeqR9A48DV5p64lF5RnyauHC/LWVfP7rpNGYqtab8WUDP4V X9nKoDVrV7VD3gIgbV78g2W3S3sNSD53La060/wI9ukIqOCbeP31irFaw9oA/rXarzwZt/IwYJ/ WJ4odlRBw5SYllW1je0Rzfz3fJ5z+vhfjhdnJFWTkk9jdNOnhMPURrajOFXi31kYPO5OyGBPC9H uYwctS X-Google-Smtp-Source: AGHT+IG+c9TBxrNO8Rhcga0cjbgIHbzYpexTcWraDC03lZYlbHD8b28uw8YTYq3tgyvQ6c0CGDmtaQ== X-Received: by 2002:a05:600c:3e07:b0:471:a96:d1b6 with SMTP id 5b1f17b1804b1-4773b1f9db7mr85016295e9.7.1762162554470; Mon, 03 Nov 2025 01:35:54 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:e6eb:2a19:143f:b127]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4773c4ac5d6sm147285675e9.8.2025.11.03.01.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Nov 2025 01:35:53 -0800 (PST) From: Bartosz Golaszewski Date: Mon, 03 Nov 2025 10:35:30 +0100 Subject: [PATCH v4 10/10] reset: gpio: use software nodes to setup the GPIO lookup Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251103-reset-gpios-swnodes-v4-10-6461800b6775@linaro.org> References: <20251103-reset-gpios-swnodes-v4-0-6461800b6775@linaro.org> In-Reply-To: <20251103-reset-gpios-swnodes-v4-0-6461800b6775@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich , Philipp Zabel , Krzysztof Kozlowski Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7164; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=zGQChOLYdShQxCyhFrgghwt6h1bOoSffKyYTaLJagTw=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBpCHdmkfkiw+TPahVB/J5Ozb3L+OfwnbkEAaAM8 jTvH0EnPOmJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaQh3ZgAKCRARpy6gFHHX ct08EACxza1Nitcc8hYrFjP4g8/IEkDBsLvHarp0JA2folddmog9HvZ+5ikQyAfCGA0QNJPGcwh wO3i/Qoe7yClroNovCJpbq4u5qhaXhhy7L9uvYekvU7ythdhwPP7mquZhP2oxBLXKgi6WdFmDTy O0Ag+0NMjhGHRCGnGASBJJ+LIhS2Ub9KwLxWQ1NznREdIMvSCRPNRkc3BUTLS4WvCipGf6OozKZ h9lK5HPErNsanQ55jm9twkdV7VPIU5mUBUFiSmLcbZTsYDTGQPZxDeq9ryizMtY1mlHnBBgWqsy DudImTzWMoEjPg/Cr+ovz07GFjG5hqIF0HSoHU0pXW+BJ1WTfZV9uAHWmlWsdQM4Xw6v3+cfrMu n7OisPGEys+O380l+82SLvRU3rbBXm2yeSvlmOrpA6vDXrL44wSLXwWAn62zR6qgquNmkA9Il+B yaEpBjODGUFTWd2Sb8fYz60lzzKT0IpWfyw0VfCW7WyNJpHzjdLuYcQdOrCKQBevz87KfRCPBYP fBZZbKva6K1RO6MN8xgeA+AkQYpfIc4n7yPdjaw+XQXVisYS1DE4TIZMvIfB+qwmsZJe2dAgH4Z aah7PYXttCW5fv7QERqORVou/+Y8g9Vm+H1kczeVtjhFV509pxETDA+Sua3tYkV+o/tJ7b7+RNg uRGLDCgqYkxB/Sw== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski GPIO machine lookup is a nice mechanism for associating GPIOs with consumers if we don't know what kind of device the GPIO provider is or when it will become available. However in the case of the reset-gpio, we are already holding a reference to the device and so can reference its firmware node. Let's setup a software node that references the relevant GPIO and attach it to the auxiliary device we're creating. Reviewed-by: Philipp Zabel Acked-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/reset/core.c | 132 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 78 insertions(+), 54 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index fcf1c24086e565015b0956fdd40334274a1edb00..770d82ed7978f1006882908d92526fc6d8be3299 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -77,10 +78,12 @@ struct reset_control_array { /** * struct reset_gpio_lookup - lookup key for ad-hoc created reset-gpio devices * @of_args: phandle to the reset controller with all the args like GPIO number + * @swnode: Software node containing the reference to the GPIO provider * @list: list entry for the reset_gpio_lookup_list */ struct reset_gpio_lookup { struct of_phandle_args of_args; + struct fwnode_handle *swnode; struct list_head list; }; @@ -822,52 +825,45 @@ static void __reset_control_put_internal(struct reset_control *rstc) kref_put(&rstc->refcnt, __reset_control_release); } -static int __reset_add_reset_gpio_lookup(struct gpio_device *gdev, int id, - struct device_node *np, - unsigned int gpio, - unsigned int of_flags) +static void reset_gpio_aux_device_release(struct device *dev) { - unsigned int lookup_flags; - const char *label_tmp; + struct auxiliary_device *adev = to_auxiliary_dev(dev); - /* - * Later we map GPIO flags between OF and Linux, however not all - * constants from include/dt-bindings/gpio/gpio.h and - * include/linux/gpio/machine.h match each other. - */ - if (of_flags > GPIO_ACTIVE_LOW) { - pr_err("reset-gpio code does not support GPIO flags %u for GPIO %u\n", - of_flags, gpio); - return -EINVAL; + kfree(adev); +} + +static int reset_add_gpio_aux_device(struct device *parent, + struct fwnode_handle *swnode, + int id, void *pdata) +{ + struct auxiliary_device *adev; + int ret; + + adev = kzalloc(sizeof(*adev), GFP_KERNEL); + if (!adev) + return -ENOMEM; + + adev->id = id; + adev->name = "gpio"; + adev->dev.parent = parent; + adev->dev.platform_data = pdata; + adev->dev.release = reset_gpio_aux_device_release; + device_set_node(&adev->dev, swnode); + + ret = auxiliary_device_init(adev); + if (ret) { + kfree(adev); + return ret; } - label_tmp = gpio_device_get_label(gdev); - if (!label_tmp) - return -EINVAL; + ret = __auxiliary_device_add(adev, "reset"); + if (ret) { + auxiliary_device_uninit(adev); + kfree(adev); + return ret; + } - char *label __free(kfree) = kstrdup(label_tmp, GFP_KERNEL); - if (!label) - return -ENOMEM; - - /* Size: one lookup entry plus sentinel */ - struct gpiod_lookup_table *lookup __free(kfree) = kzalloc(struct_size(lookup, table, 2), - GFP_KERNEL); - if (!lookup) - return -ENOMEM; - - lookup->dev_id = kasprintf(GFP_KERNEL, "reset.gpio.%d", id); - if (!lookup->dev_id) - return -ENOMEM; - - lookup_flags = GPIO_PERSISTENT; - lookup_flags |= of_flags & GPIO_ACTIVE_LOW; - lookup->table[0] = GPIO_LOOKUP(no_free_ptr(label), gpio, "reset", - lookup_flags); - - /* Not freed on success, because it is persisent subsystem data. */ - gpiod_add_lookup_table(no_free_ptr(lookup)); - - return 0; + return ret; } /* @@ -875,9 +871,11 @@ static int __reset_add_reset_gpio_lookup(struct gpio_device *gdev, int id, */ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) { + struct property_entry properties[] = { {}, {} }; struct reset_gpio_lookup *rgpio_dev; - struct auxiliary_device *adev; - int id, ret; + unsigned int offset, of_flags; + struct device *parent; + int id, ret, lflags; /* * Currently only #gpio-cells=2 is supported with the meaning of: @@ -895,6 +893,23 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) */ lockdep_assert_not_held(&reset_list_mutex); + offset = args->args[0]; + of_flags = args->args[1]; + + /* + * Later we map GPIO flags between OF and Linux, however not all + * constants from include/dt-bindings/gpio/gpio.h and + * include/linux/gpio/machine.h match each other. + * + * FIXME: Find a better way of translating OF flags to GPIO lookup + * flags. + */ + if (of_flags > GPIO_ACTIVE_LOW) { + pr_err("reset-gpio code does not support GPIO flags %u for GPIO %u\n", + of_flags, offset); + return -EINVAL; + } + struct gpio_device *gdev __free(gpio_device_put) = gpio_device_find_by_fwnode(of_fwnode_handle(args->np)); if (!gdev) @@ -909,6 +924,13 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) } } + lflags = GPIO_PERSISTENT | (of_flags & GPIO_ACTIVE_LOW); + parent = gpio_device_to_device(gdev); + + properties[0] = PROPERTY_ENTRY_GPIO_FWNODE("reset-gpios", + parent->fwnode, + offset, lflags); + id = ida_alloc(&reset_gpio_ida, GFP_KERNEL); if (id < 0) return id; @@ -920,11 +942,6 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) goto err_ida_free; } - ret = __reset_add_reset_gpio_lookup(gdev, id, args->np, args->args[0], - args->args[1]); - if (ret < 0) - goto err_kfree; - rgpio_dev->of_args = *args; /* * We keep the device_node reference, but of_args.np is put at the end @@ -932,19 +949,26 @@ static int __reset_add_reset_gpio_device(const struct of_phandle_args *args) * Hold reference as long as rgpio_dev memory is valid. */ of_node_get(rgpio_dev->of_args.np); - adev = auxiliary_device_create(gpio_device_to_device(gdev), "reset", - "gpio", &rgpio_dev->of_args, id); - ret = PTR_ERR_OR_ZERO(adev); + + rgpio_dev->swnode = fwnode_create_software_node(properties, NULL); + if (IS_ERR(rgpio_dev->swnode)) { + ret = PTR_ERR(rgpio_dev->swnode); + goto err_put_of_node; + } + + ret = reset_add_gpio_aux_device(parent, rgpio_dev->swnode, id, + &rgpio_dev->of_args); if (ret) - goto err_put; + goto err_del_swnode; list_add(&rgpio_dev->list, &reset_gpio_lookup_list); return 0; -err_put: +err_del_swnode: + fwnode_remove_software_node(rgpio_dev->swnode); +err_put_of_node: of_node_put(rgpio_dev->of_args.np); -err_kfree: kfree(rgpio_dev); err_ida_free: ida_free(&reset_gpio_ida, id); -- 2.51.0