From nobody Tue Dec 16 07:07:00 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 412BE2FBFFC for ; Fri, 4 Jul 2025 12:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751633948; cv=none; b=i65Pk8ski0hJY4u1n98WtT+eLjbC2JAkCnwlt5fLyHk54zYPqQCndpJurKve6Uz/0TP6NBsfNeHSH0iv6ax0cksmGiV36HynMUWWp0g9wmpZOlnjMg92s+4L278OVMMhlwU0fqpDC3fUSBolCpgzK0cSwj9/iQlsC0w5cibPQrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751633948; c=relaxed/simple; bh=HSQrtGe4/Z0TBW+gwH8FOlwHslQisfYTdDaYyI3dFb8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dAEqF8f5NOR3pPKHfH8kwWVMg/4EMUIJPwN3v0Koz6Q+AoHO0FhpjpaHO4mmT6rsxzX8lyNhYJB45qm8IcDj3uSir0H4gkrLDxzpgekyhw2jco2Bb+j1yCqC+GjZXr66ei7QDVeFCk3sV99ijdf0etYESApvAWZUvxSgbdQ80Zo= 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=AWyQhWov; arc=none smtp.client-ip=209.85.128.44 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="AWyQhWov" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-453608ed113so10072605e9.0 for ; Fri, 04 Jul 2025 05:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1751633944; x=1752238744; 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=BMEMEAqg83bufN2QGDWBOgNHkNfUTOyZRf8AHX0Mf9g=; b=AWyQhWovjeK4CkJQanLCf3+cTor+PiwLoyFEiGbBEREs+1IfNvT++A6O/N84IRnjyD p6Y4AvM1KOF2w0euIDlews2/1emcv80hjELuMW1PqOGSGaZep6NY7xCGGPdkMPu8qhY8 9XKmXLjc5OHdOxVAZWe7p9BYSTw2CilZdYUVDv/q3+cu6Xj5GWI1o0Q6qiARpj+5O+R0 gOwq9M+LIJ9Nongg1Uxmq3gcuiSgxEj5JFkskrbsRFZUgjY1n+xZ/WcE7cA9/5ADsqG9 dOyo2ri1+ki8w6KRi1Yml65l83zq9bnFEQ/MRnXJUv63ZiSNQiA2neBtDFZLsv7OL1Sv AmSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751633944; x=1752238744; 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=BMEMEAqg83bufN2QGDWBOgNHkNfUTOyZRf8AHX0Mf9g=; b=OycI+ej24Ap/JUDB20eckT+gfn2+3Ih1/iIRAPSnsRgUg3jFOARGQMPpCRYvF9/Rop 7M2YgQ2PcvjHAftuxg1AErzvSEWsayYvtQ5neWOWlKF2vRzOj/zeds9Koly0kO6Qg+X0 w0XYATVmHogshqA7u3/BAFul1I/9odERGIrY7UbsMHBLmQ32P5pcn3JO+i5qkjSxBWib ajES6pqD0qvCVqOrYSxaAA/t8WEB2SYbd4cbUhGHJ1K7BtXflUFaMUgastPbRkFkvW07 xcvXOIn4vSKAUBaUHymNnG0p8dpdybn0OylwSUVbTS6wd8Y9ln8RXcA2Uhvcy5cGVxzh qMTw== X-Forwarded-Encrypted: i=1; AJvYcCUvk0Rp71s8uhejr/hCHdtgGUWaoSpaaJ7t4SgeALE+z4aU+gIxFeE/VLo3ith79x/0lRmkm4T8L+11DhQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwF088IGhMQlGqszY32fs/v5oZuY5vO23EnUmt8Nk71IiY/1DBL /vdYQHaxKLpQo8K250aQ1pHCn2sIZx0gQPttIKc1mh4dBY9Acp7i4oXS9952NN4yYVFryjaiWg3 oy3z3FOA= X-Gm-Gg: ASbGnctBiFd3cpD6tuEUfGkjtJXTFkeVVjeH6KmeiFrQmecCXKxgIPNK2s6zm70rnYQ EplsaoRG5IzStaj++e/lQhNOaSfdM6tL1IOXV2joqthSSZZpIFnfHZpvUedfbhRUd//91x2fOTh vR/V0qTh/A1kOvR0WyQcHBGDIdnCft0gj7Cw+mEk7SEci07MINZ5YAr+C6ZTPIu/oi6ev/jOYeV bKz7ntf8E+P2Ce4lZTWXcDLR64REoBeqIhy1a4+VhXz4lHIz7TChgg2y++te8iRRQn6+3lGvkIl 7vyDXbgI8sVAo0H2LVFGn0waNhALBEJCmRDA6c5vgAZ+q2+TdBW1ZKk= X-Google-Smtp-Source: AGHT+IHaSluiSjg6ZhGmsBkYXRIG9iwoBZVF5T5tgaWqiOqPiLzLikZKD5mhzB+Wy9gylFEewYJvkA== X-Received: by 2002:a5d:64c3:0:b0:3b2:e07f:757 with SMTP id ffacd0b85a97d-3b4964f5198mr2409455f8f.1.1751633944485; Fri, 04 Jul 2025 05:59:04 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:876:27c7:55ac:40ab]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454a9bcebf7sm56129665e9.21.2025.07.04.05.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 05:59:03 -0700 (PDT) From: Bartosz Golaszewski Date: Fri, 04 Jul 2025 14:58:54 +0200 Subject: [PATCH v4 07/10] gpio: sysfs: don't look up exported lines as class devices 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: <20250704-gpio-sysfs-chip-export-v4-7-9289d8758243@linaro.org> References: <20250704-gpio-sysfs-chip-export-v4-0-9289d8758243@linaro.org> In-Reply-To: <20250704-gpio-sysfs-chip-export-v4-0-9289d8758243@linaro.org> To: Ahmad Fatoum , Kent Gibson , =?utf-8?q?Jan_L=C3=BCbbe?= , Marek Vasut , Geert Uytterhoeven , Linus Walleij , Andy Shevchenko , Bartosz Golaszewski Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4753; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=gFW3JmLsuFySaX3ICt4Hmzv3Y1dJIcjL8tzNr7Vj5fc=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBoZ9ALPECgZHxSOj7PIlfwj6d6B65AXnkb47jub lqMni47QJKJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaGfQCwAKCRARpy6gFHHX cp7HEADCzPIbVzpehNKQDCLf+jLNRs3MrkpbPHsavzLLFI2F9sxsXacNI1pkqRaCTY53Y3N4Kuz oFBUtdRrIFF0I2O75rsl+gjJTAAFXT0i0kLDCLRp1Wix8AZgCCqpESqJgVAVM2LuPTuWSPaxaqn c+4lgvdlDshS5kAl3KgKzQRsAyStCnX7U4H5Vhde8k0b0JWOhqGVpQ8XvZmBT8vzJC6vGsnXSKI fa3/rvBrn2Kt6QxGz28/Sb3mtECdw2ENuVjU83UZd8DuuG5ZnhjtW+WnFeJM/THodXvTCAHHs+q QBWnoA9ckrW41TJFOOT9q6W/FH63UVM5jzWziJG4EVY8nizqeR5DFSs04FuEkDCei6Me7MCYF8h 6pzHqWgiW/sK2tDZ5Z23jV7UunmnLQCNy4kWmndRVKx5DKZ0SutDvA7Lonuii4zzCpvwp5hkR3l nE54gO9ajX8sucK0OcO9i653k73fVt4HWMJrBF/hXgbeW4zGbNVXMM2BgV25LUW1axwwuLbmPb5 Ij8Hc+yriRCSQvxdylzYoPM1A7E2v/CAvcB10EoW7+bMJ3HXcFcBUCjLXEok4cUaD5GGNkqbTD4 Iy12o1KDhEfRhud68dUcq2f2Q5R6A24xREzMMnsp2G6KTido+ffIrE5U77xqIdlc/tzyeu/Xr3Q /Bj4BNdAkE11zCQ== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski In preparation for adding a parallel, per-chip attribute group for exported GPIO lines, stop using class device APIs to refer to it in the code. When unregistering the chip, don't call class_find_device() but instead store exported lines in a linked list inside the GPIO chip data object and look it up there. Reviewed-by: Linus Walleij Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib-sysfs.c | 60 ++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index e10d720ee0adb3b0f6e91eccbf64c33e5700c616..ccc293a4cc5d512947039593170= 61af55fb0dab0 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -42,7 +42,10 @@ enum { }; =20 struct gpiod_data { + struct list_head list; + struct gpio_desc *desc; + struct device *dev; =20 struct mutex mutex; struct kernfs_node *value_kn; @@ -62,6 +65,7 @@ struct gpiod_data { }; =20 struct gpiodev_data { + struct list_head exported_lines; struct gpio_device *gdev; struct device *cdev_id; /* Class device by GPIO device ID */ struct device *cdev_base; /* Class device by GPIO base */ @@ -687,10 +691,10 @@ static void gpiod_attr_init(struct device_attribute *= dev_attr, const char *name, */ int gpiod_export(struct gpio_desc *desc, bool direction_may_change) { + struct gpiodev_data *gdev_data; struct gpiod_data *desc_data; struct gpio_device *gdev; struct attribute **attrs; - struct device *dev; int status; =20 /* can't export until sysfs is available ... */ @@ -751,25 +755,40 @@ int gpiod_export(struct gpio_desc *desc, bool directi= on_may_change) desc_data->class_attr_group.attrs =3D desc_data->class_attrs; desc_data->class_attr_groups[0] =3D &desc_data->class_attr_group; =20 - dev =3D device_create_with_groups(&gpio_class, &gdev->dev, - MKDEV(0, 0), desc_data, - desc_data->class_attr_groups, - "gpio%u", desc_to_gpio(desc)); - if (IS_ERR(dev)) { - status =3D PTR_ERR(dev); + /* + * Note: we need to continue passing desc_data here as there's still + * at least one known user of gpiod_export_link() in the tree. This + * function still uses class_find_device() internally. + */ + desc_data->dev =3D device_create_with_groups(&gpio_class, &gdev->dev, + MKDEV(0, 0), desc_data, + desc_data->class_attr_groups, + "gpio%u", + desc_to_gpio(desc)); + if (IS_ERR(desc_data->dev)) { + status =3D PTR_ERR(desc_data->dev); goto err_free_data; } =20 - desc_data->value_kn =3D sysfs_get_dirent(dev->kobj.sd, "value"); + desc_data->value_kn =3D sysfs_get_dirent(desc_data->dev->kobj.sd, + "value"); if (!desc_data->value_kn) { status =3D -ENODEV; goto err_unregister_device; } =20 + gdev_data =3D gdev_get_data(gdev); + if (!gdev_data) { + status =3D -ENODEV; + goto err_unregister_device; + } + + list_add(&desc_data->list, &gdev_data->exported_lines); + return 0; =20 err_unregister_device: - device_unregister(dev); + device_unregister(desc_data->dev); err_free_data: kfree(desc_data); err_clear_bit: @@ -828,8 +847,9 @@ EXPORT_SYMBOL_GPL(gpiod_export_link); */ void gpiod_unexport(struct gpio_desc *desc) { - struct gpiod_data *desc_data; - struct device *dev; + struct gpiod_data *desc_data =3D NULL; + struct gpiodev_data *gdev_data; + struct gpio_device *gdev; =20 if (!desc) { pr_warn("%s: invalid GPIO\n", __func__); @@ -840,14 +860,22 @@ void gpiod_unexport(struct gpio_desc *desc) if (!test_bit(FLAG_EXPORT, &desc->flags)) return; =20 - dev =3D class_find_device(&gpio_class, NULL, desc, match_export); - if (!dev) + gdev =3D gpiod_to_gpio_device(desc); + gdev_data =3D gdev_get_data(gdev); + if (!gdev_data) return; =20 - desc_data =3D dev_get_drvdata(dev); + list_for_each_entry(desc_data, &gdev_data->exported_lines, list) + if (gpiod_is_equal(desc, desc_data->desc)) + break; + + if (!desc_data) + return; + + list_del(&desc_data->list); clear_bit(FLAG_EXPORT, &desc->flags); sysfs_put(desc_data->value_kn); - device_unregister(dev); + device_unregister(desc_data->dev); =20 /* * Release irq after deregistration to prevent race with @@ -857,7 +885,6 @@ void gpiod_unexport(struct gpio_desc *desc) gpio_sysfs_free_irq(desc_data); } =20 - put_device(dev); mutex_destroy(&desc_data->mutex); kfree(desc_data); } @@ -899,6 +926,7 @@ int gpiochip_sysfs_register(struct gpio_device *gdev) return -ENOMEM; =20 data->gdev =3D gdev; + INIT_LIST_HEAD(&data->exported_lines); =20 guard(mutex)(&sysfs_lock); =20 --=20 2.48.1