From nobody Fri Dec 19 13:50:55 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2A2F21D59D for ; Mon, 17 Feb 2025 14:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802525; cv=none; b=mbYaftLcFRQ+F4ywwzQuBtI2mExCQgLKUOA0FHfWxSGwDB/10KoMuamVTuI5xJDuhw7R/CILpZe6dq7q/brD5lYyEmqY717dGSiO9M0QczSPbnZGVQoor8DzM7vS5B93zk94CrZLaZ5T/ukAWcwwYg/TBfvmammFeNRv+9/CBn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802525; c=relaxed/simple; bh=rEnR6g5dONAt30j589RxgJPlKFdaeKR/MdU4AsEK4Sg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jlPsp54JyIfnf4XQ2JBQ4Kv7mCd6DdRAYUvLNVy1RCEGfW509b1t19A//GrqrvQMgtpx74lBOoC6WS6idvksPuSFF+Nas6X8eWkt+KNp9Wjq+VINyCAta0WJStINTTEfH25TqFdNeRuA3FoGmP7HaNEvyN/ZQpKS40CtjWkibn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=Xi2inA43; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="Xi2inA43" Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4BA6E3F164 for ; Mon, 17 Feb 2025 14:28:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1739802513; bh=YWbOsm+CZ0rP8EEsqBCFAU6ijhi7ERtYl/4TbSEKuvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xi2inA437d+n6yMq1bKW+E1Et8lECJdTkHTKAkdJBEGWMROdbjute6lHCX+PgZo1V JyPsxH4oNUL6UDi+KBVWbgO0QZrsCUxaZz1/c8dM2NblcQ7X2qn5myDInKlO1FMogg QeKMpA5AfyzCEvyWzs0qDKaIBjUlPmsl/gk/d86F9ef0lWnE2MJm1tKG4vZlUT9WD3 MVhgmy2FtScHg0vWCOVPTGQwhbBPgzCTML8OsZ2Ap+1yYFW/o3fz5czlZ8nhwNu7HR VmPjlA6tWdJTWsWsHyJodg07ZCulKnEgdBY8IZnQagGWtRWUGtmbXEcMxieJenR1+Z MZAOHrYnMpXzQ== Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-220ff7d7b67so52237625ad.2 for ; Mon, 17 Feb 2025 06:28:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739802512; x=1740407312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YWbOsm+CZ0rP8EEsqBCFAU6ijhi7ERtYl/4TbSEKuvk=; b=XL6+a7ZvkluWlQ7GA7nnltSPphbC5dhFcR9m4zoMOy9TawlBe1rhOnCAgFeXP60hn5 j5Oa9NQe29ivowpwd0yUT7PW8PAbC4UczsZwRfl57tnklq3vLvffSvjwLxCfy61wNALd 28rkgTCQwZQ4kJ3lRuhY+x2iRqwzqgWOzB0qtitSpH7+1vwKsBXNXXuxEXauLJ782vZu WToxIp03RdxE8MnKlCNMg8gZYKFyR+yLUBM8313Mnl5k39ULSSDiZkk0CVV0jR2vWKcE zfA7QTH1IXGdoyyZryp/+fxxbcx8/QoQEezXrqeABAjAqocxVnbrNCSa47hp6Q21QdBk NhQw== X-Forwarded-Encrypted: i=1; AJvYcCUNzh7rmKZ8CuWChpKyl/o9TPspp5E490f9oiQfTEVNayjg44FNHBGfaEXzlRgGpArtppfUeSbzZBMc8Mw=@vger.kernel.org X-Gm-Message-State: AOJu0YzvSsv0sb2YmQ++5z9d4WlMRkCPxpYUB0tfTCIM8rWt3a5mNG4+ oi4xR6UbDBHG8NGDiqJt/YgG5tdUfY7Gopmd67629Vq131AUDA/UldRtP8Bg2b8wh8yzIpaTofs bk417+5eIsW3SuYv0cxk7mFDlgLWjsNY82l8AxAYCy5q84rPGOK+n9E1qm6K7/on8UZq/nbAkRa 8YOA== X-Gm-Gg: ASbGnct6CZuK7eW2Gi8BQeC+sN+te41+9oB0YfCgRnTzRLASy54iGldLILOET2Be5tV PRmanChG/j5fwKC3yPBbZymKBy6eKEdxJLgmmU90sUNOGzO5AaOsZdyEiw0cEIhwAXGEtUoRVnX hzlR7bqKtMU9Ebm2Y4WusQrTLi/k7ECpSKwuNk3RLEEdAvV51I5sinv45w8phwtilXKIgMRdJcD GnaUTguDW1AZcZUlVZGZ/DCcsDH6JcJMmcb61mfkbVjugdMiUDpSJ01o/aesUMa8sgayVzO6mG2 rELMFQjTcdDswXepd6Nzkhw= X-Received: by 2002:a17:902:e88a:b0:220:cd13:d0ec with SMTP id d9443c01a7336-221040cf8admr180261635ad.48.1739802511900; Mon, 17 Feb 2025 06:28:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfZIRJAzO+xxCEyVz/n4jHiqUmLNlcKx8CpuXtume9GjbD9zD5G5cZZIXe92Y7wYgNUOjqnA== X-Received: by 2002:a17:902:e88a:b0:220:cd13:d0ec with SMTP id d9443c01a7336-221040cf8admr180261235ad.48.1739802511583; Mon, 17 Feb 2025 06:28:31 -0800 (PST) Received: from localhost.localdomain ([240f:74:7be:1:a6da:1fd8:6ba3:4cf3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55916c7sm72237735ad.243.2025.02.17.06.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 06:28:31 -0800 (PST) From: Koichiro Den To: linux-gpio@vger.kernel.org Cc: brgl@bgdev.pl, geert+renesas@glider.be, linus.walleij@linaro.org, maciej.borzecki@canonical.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] gpio: pseudo: common helper functions for pseudo gpio devices Date: Mon, 17 Feb 2025 23:27:56 +0900 Message-ID: <20250217142758.540601-2-koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250217142758.540601-1-koichiro.den@canonical.com> References: <20250217142758.540601-1-koichiro.den@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Both gpio-sim and gpio-virtuser share a mechanism to instantiate a platform device and wait synchronously for probe completion. With gpio-aggregator adopting the same approach in a later commit for its configfs interface, it's time to factor out the common code. Add gpio-pseudo.[ch] to house helper functions used by all the pseudo GPIO device implementations. No functional change. Signed-off-by: Koichiro Den --- drivers/gpio/Kconfig | 4 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-pseudo.c | 86 ++++++++++++++++++++++++++++++++++++++ drivers/gpio/gpio-pseudo.h | 24 +++++++++++ 4 files changed, 115 insertions(+) create mode 100644 drivers/gpio/gpio-pseudo.c create mode 100644 drivers/gpio/gpio-pseudo.h diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 56c1f30ac195..1e2c95e03a95 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1863,6 +1863,10 @@ config GPIO_MPSSE =20 endmenu =20 +# This symbol is selected by some pseudo gpio device implementations +config GPIO_PSEUDO + bool + menu "Virtual GPIO drivers" =20 config GPIO_AGGREGATOR diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index af3ba4d81b58..5eb54147a1ab 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -136,6 +136,7 @@ obj-$(CONFIG_GPIO_PISOSR) +=3D gpio-pisosr.o obj-$(CONFIG_GPIO_PL061) +=3D gpio-pl061.o obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) +=3D gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_POLARFIRE_SOC) +=3D gpio-mpfs.o +obj-$(CONFIG_GPIO_PSEUDO) +=3D gpio-pseudo.o obj-$(CONFIG_GPIO_PXA) +=3D gpio-pxa.o obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) +=3D gpio-raspberrypi-exp.o obj-$(CONFIG_GPIO_RC5T583) +=3D gpio-rc5t583.o diff --git a/drivers/gpio/gpio-pseudo.c b/drivers/gpio/gpio-pseudo.c new file mode 100644 index 000000000000..6e3da05440d8 --- /dev/null +++ b/drivers/gpio/gpio-pseudo.c @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Helper functions for Pseudo GPIOs + * + * Copyright 2025 Canonical Ltd. + */ + +#include "gpio-pseudo.h" + +static int pseudo_gpio_notifier_call(struct notifier_block *nb, + unsigned long action, + void *data) +{ + struct pseudo_gpio_common *common; + struct device *dev =3D data; + + common =3D container_of(nb, struct pseudo_gpio_common, bus_notifier); + if (!device_match_name(dev, common->name)) + return NOTIFY_DONE; + + switch (action) { + case BUS_NOTIFY_BOUND_DRIVER: + common->driver_bound =3D true; + break; + case BUS_NOTIFY_DRIVER_NOT_BOUND: + common->driver_bound =3D false; + break; + default: + return NOTIFY_DONE; + } + + complete(&common->probe_completion); + return NOTIFY_OK; +} + +void pseudo_gpio_init(struct pseudo_gpio_common *common) +{ + memset(common, 0, sizeof(*common)); + init_completion(&common->probe_completion); + common->bus_notifier.notifier_call =3D pseudo_gpio_notifier_call; +} +EXPORT_SYMBOL_GPL(pseudo_gpio_init); + +int pseudo_gpio_register(struct pseudo_gpio_common *common, + struct platform_device_info *pdevinfo) +{ + struct platform_device *pdev; + char *name; + + name =3D kasprintf(GFP_KERNEL, "%s.%u", pdevinfo->name, pdevinfo->id); + if (!name) + return -ENOMEM; + + common->driver_bound =3D false; + common->name =3D name; + reinit_completion(&common->probe_completion); + bus_register_notifier(&platform_bus_type, &common->bus_notifier); + + pdev =3D platform_device_register_full(pdevinfo); + if (IS_ERR(pdev)) { + bus_unregister_notifier(&platform_bus_type, &common->bus_notifier); + kfree(common->name); + return PTR_ERR(pdev); + } + + wait_for_completion(&common->probe_completion); + bus_unregister_notifier(&platform_bus_type, &common->bus_notifier); + + if (!common->driver_bound) { + platform_device_unregister(pdev); + kfree(common->name); + return -ENXIO; + } + + common->pdev =3D pdev; + return 0; +} +EXPORT_SYMBOL_GPL(pseudo_gpio_register); + +void pseudo_gpio_unregister(struct pseudo_gpio_common *common) +{ + platform_device_unregister(common->pdev); + kfree(common->name); + common->pdev =3D NULL; +} +EXPORT_SYMBOL_GPL(pseudo_gpio_unregister); diff --git a/drivers/gpio/gpio-pseudo.h b/drivers/gpio/gpio-pseudo.h new file mode 100644 index 000000000000..093112b6cce5 --- /dev/null +++ b/drivers/gpio/gpio-pseudo.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef GPIO_PSEUDO_H +#define GPIO_PSEUDO_H + +#include +#include + +struct pseudo_gpio_common { + struct platform_device *pdev; + const char *name; + + /* Synchronize with probe */ + struct notifier_block bus_notifier; + struct completion probe_completion; + bool driver_bound; +}; + +void pseudo_gpio_init(struct pseudo_gpio_common *common); +int pseudo_gpio_register(struct pseudo_gpio_common *common, + struct platform_device_info *pdevinfo); +void pseudo_gpio_unregister(struct pseudo_gpio_common *common); + +#endif /* GPIO_PSEUDO_H */ --=20 2.45.2 From nobody Fri Dec 19 13:50:55 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6139522069E for ; Mon, 17 Feb 2025 14:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802526; cv=none; b=eqatYFcmeOFmx3BL7uofKN6HjdqD9Fo0lSKSGA0w74UMUj1OkntmpiRqLiDiUIDf18mmkRddreI8akh+PtyRgQmD7ruvOiJztpABbzrm/P8sftB8eNFa7ERYplwJSjOxenAvns5l9s5JHQnd7INllxvGCvuC6FTKYHjTNyBkafE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802526; c=relaxed/simple; bh=QAOA908gNel3y1R7ETsRu2jzdhf2WxIWOfoFCHcP9qo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ErFCr4rlCRQL8ybGlVbNyPhbwOR/M8gcJ7zQ8F6I/BKqfv33iBIWpkFYW6b2JfJQn24by612zbl3a2FcvSlAbou0iAmPaAEpFrX6R/+hU2M/QBiEoCjE+beVO96AcI2bD6Mu4BcY3ZAXsORF5EzOZXfo3HmtryAeAfQd7x+uZaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=vqpNbX0E; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="vqpNbX0E" Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4FCA63F87A for ; Mon, 17 Feb 2025 14:28:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1739802516; bh=N0Kj1d8MdTe6Cku6k8Y4hSRN1wAEicDaX3HkzkoJuyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vqpNbX0EXF3dfHvlUf6RHWbVQokG1i9p5dJJNybC4tcmSyJFGUzMe2CxQPM+cFZ9A n5Uv7KSt/EJ3i1FTGYtqoRYquE41OHrOX+YrWhwWFxg1QVMw+OcCGdNkSim+3SQ2I9 FloTz/JEsCxSy6tEWAumKSZKjLlk0Z3qsaK1Zf9usOfF4zqEoW3UxM6kitebWhYtZq RDClP1mUe0/0K4zd/e7/rhUmXWaahp+pu1TNTO86UM/tiMf9g1gYRQhItH4Vvy3HbU MtnbRxMR1yWDV3PvQTLRChFlGQtJ4fQtuRh0jP2/OAIch87yqnL1VcQ/fupOIPkjW0 V06Kt9j1Q7AVg== Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-22119b07d52so22046715ad.1 for ; Mon, 17 Feb 2025 06:28:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739802515; x=1740407315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N0Kj1d8MdTe6Cku6k8Y4hSRN1wAEicDaX3HkzkoJuyo=; b=Hb4PYde9hWOzAwgkkF4VwrwbecONmRWOBX+fGeUHxiNhU5L1f+8wxR/W7lUZYMdmb8 25HQP2WL9dAEO9B5d1bOBnPzDXv/cz8dNfNhCDgDxzt2QgupStK3Fv306XJvUmHu5eEz EZLNOoLxI9KoMgg218cMY664kVIRK06x6Du2dHhTm/u7fkxLEe81XKQK9mmJJhks90cd hZHQKhLBAKvW7uWdCc2AL7o5LUf7EdNJlUMbSIoFDO8HZN2gxxAIKig3KVD8PR4y5h+y z8HHOjdypgw4Us41tLEK4AoNy6VG2wLwFajS4Ez3jliMkxKGXADOGO1ZlFC6xru595Vw iHaQ== X-Forwarded-Encrypted: i=1; AJvYcCV2qB9P/VZWN9KyZx3c8PBaRx6azIG5Ur3oyimG7wM0OCTcgF0TJprVTpzUS6aVVF4CXHRCLNtUZQupNBE=@vger.kernel.org X-Gm-Message-State: AOJu0YyW3KB1OCW+B05+RUZoaTG9w41JqyxpMReowdEkzEb3uMz3eTcA Pf5NV3K6DJ6AXNOEe3Zl1oJoLcCx0a+3JUezRfpwvsAuAghmcGDuDbVbaO/98QvHH2iMrxNnMPx y9o8yK/JZOA+DZvjeOJNHUzN5JmDukkV6Opq4qtRsHMGPx4TbE/JdVsYnw0ymxmcCNMxe3jY3FD 0hZw== X-Gm-Gg: ASbGncuWOepjypSoovrFAUXlDVrvsqrDOqRwMhGrkqs9SFhdZ/E1MVSRy/NQ/H+w7Vd WddvMqZ6ML0Y2sTuEulc/ebZoSDhR7MmRFQ9vwhYLp6St18/CQ5qF4BgbSU1/90IUILtoUUowUW 73RdxrqzsRy//flnd/bNZ3FSNRC/HL2GMQ9zEbS/s1ZSIKBCwszaRMtsAl+gBPqo841IcgFwgV6 zmui1sWxXcqgzvhTd5QsIIeNkLBM4RkNl+BrSGfv8mYSZUzC7kn3NV5nYzXBwhFQB6kpEGfsxr2 yWP7fHA/FFQRhOyCO71KG9k= X-Received: by 2002:a17:902:db0c:b0:215:9bc2:42ec with SMTP id d9443c01a7336-221040cf223mr132238855ad.47.1739802514816; Mon, 17 Feb 2025 06:28:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IG5xd3Qyn15GPhq2F9COyGUha2ugih5t2tEudHBsZMRrSSf0N606HwzeDlINRsrUnYXl5l86A== X-Received: by 2002:a17:902:db0c:b0:215:9bc2:42ec with SMTP id d9443c01a7336-221040cf223mr132238595ad.47.1739802514474; Mon, 17 Feb 2025 06:28:34 -0800 (PST) Received: from localhost.localdomain ([240f:74:7be:1:a6da:1fd8:6ba3:4cf3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55916c7sm72237735ad.243.2025.02.17.06.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 06:28:34 -0800 (PST) From: Koichiro Den To: linux-gpio@vger.kernel.org Cc: brgl@bgdev.pl, geert+renesas@glider.be, linus.walleij@linaro.org, maciej.borzecki@canonical.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] gpio: sim: convert to use gpio-pseudo utilities Date: Mon, 17 Feb 2025 23:27:57 +0900 Message-ID: <20250217142758.540601-3-koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250217142758.540601-1-koichiro.den@canonical.com> References: <20250217142758.540601-1-koichiro.den@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update gpio-sim to use the new gpio-pseudo helper functions for synchronized platform device creation, reducing code duplication. No functional change. Signed-off-by: Koichiro Den --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-sim.c | 84 ++++++----------------------------------- 2 files changed, 13 insertions(+), 72 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 1e2c95e03a95..c482e3494bac 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1913,6 +1913,7 @@ config GPIO_SIM tristate "GPIO Simulator Module" select IRQ_SIM select CONFIGFS_FS + select GPIO_PSEUDO help This enables the GPIO simulator - a configfs-based GPIO testing driver. diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c index a086087ada17..45dbf16bee12 100644 --- a/drivers/gpio/gpio-sim.c +++ b/drivers/gpio/gpio-sim.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,8 @@ #include #include =20 +#include "gpio-pseudo.h" + #define GPIO_SIM_NGPIO_MAX 1024 #define GPIO_SIM_PROP_MAX 4 /* Max 3 properties + sentinel. */ #define GPIO_SIM_NUM_ATTRS 3 /* value, pull and sentinel */ @@ -541,14 +542,9 @@ static struct platform_driver gpio_sim_driver =3D { }; =20 struct gpio_sim_device { + struct pseudo_gpio_common common; struct config_group group; =20 - /* - * If pdev is NULL, the device is 'pending' (waiting for configuration). - * Once the pointer is assigned, the device has been created and the - * item is 'live'. - */ - struct platform_device *pdev; int id; =20 /* @@ -562,46 +558,11 @@ struct gpio_sim_device { */ struct mutex lock; =20 - /* - * This is used to synchronously wait for the driver's probe to complete - * and notify the user-space about any errors. - */ - struct notifier_block bus_notifier; - struct completion probe_completion; - bool driver_bound; - struct gpiod_hog *hogs; =20 struct list_head bank_list; }; =20 -/* This is called with dev->lock already taken. */ -static int gpio_sim_bus_notifier_call(struct notifier_block *nb, - unsigned long action, void *data) -{ - struct gpio_sim_device *simdev =3D container_of(nb, - struct gpio_sim_device, - bus_notifier); - struct device *dev =3D data; - char devname[32]; - - snprintf(devname, sizeof(devname), "gpio-sim.%u", simdev->id); - - if (!device_match_name(dev, devname)) - return NOTIFY_DONE; - - if (action =3D=3D BUS_NOTIFY_BOUND_DRIVER) - simdev->driver_bound =3D true; - else if (action =3D=3D BUS_NOTIFY_DRIVER_NOT_BOUND) - simdev->driver_bound =3D false; - else - return NOTIFY_DONE; - - complete(&simdev->probe_completion); - - return NOTIFY_OK; -} - static struct gpio_sim_device *to_gpio_sim_device(struct config_item *item) { struct config_group *group =3D to_config_group(item); @@ -708,7 +669,7 @@ static bool gpio_sim_device_is_live(struct gpio_sim_dev= ice *dev) { lockdep_assert_held(&dev->lock); =20 - return !!dev->pdev; + return !!dev->common.pdev; } =20 static char *gpio_sim_strdup_trimmed(const char *str, size_t count) @@ -730,7 +691,7 @@ static ssize_t gpio_sim_device_config_dev_name_show(str= uct config_item *item, =20 guard(mutex)(&dev->lock); =20 - pdev =3D dev->pdev; + pdev =3D dev->common.pdev; if (pdev) return sprintf(page, "%s\n", dev_name(&pdev->dev)); =20 @@ -939,7 +900,6 @@ static int gpio_sim_device_activate(struct gpio_sim_dev= ice *dev) { struct platform_device_info pdevinfo; struct fwnode_handle *swnode; - struct platform_device *pdev; struct gpio_sim_bank *bank; int ret; =20 @@ -981,31 +941,13 @@ static int gpio_sim_device_activate(struct gpio_sim_d= evice *dev) pdevinfo.fwnode =3D swnode; pdevinfo.id =3D dev->id; =20 - reinit_completion(&dev->probe_completion); - dev->driver_bound =3D false; - bus_register_notifier(&platform_bus_type, &dev->bus_notifier); - - pdev =3D platform_device_register_full(&pdevinfo); - if (IS_ERR(pdev)) { - bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier); - gpio_sim_remove_hogs(dev); - gpio_sim_remove_swnode_recursive(swnode); - return PTR_ERR(pdev); - } - - wait_for_completion(&dev->probe_completion); - bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier); - - if (!dev->driver_bound) { - /* Probe failed, check kernel log. */ - platform_device_unregister(pdev); + ret =3D pseudo_gpio_register(&dev->common, &pdevinfo); + if (ret) { gpio_sim_remove_hogs(dev); gpio_sim_remove_swnode_recursive(swnode); - return -ENXIO; + return ret; } =20 - dev->pdev =3D pdev; - return 0; } =20 @@ -1015,11 +957,10 @@ static void gpio_sim_device_deactivate(struct gpio_s= im_device *dev) =20 lockdep_assert_held(&dev->lock); =20 - swnode =3D dev_fwnode(&dev->pdev->dev); - platform_device_unregister(dev->pdev); + swnode =3D dev_fwnode(&dev->common.pdev->dev); + pseudo_gpio_unregister(&dev->common); gpio_sim_remove_hogs(dev); gpio_sim_remove_swnode_recursive(swnode); - dev->pdev =3D NULL; } =20 static void @@ -1117,7 +1058,7 @@ static ssize_t gpio_sim_bank_config_chip_name_show(st= ruct config_item *item, guard(mutex)(&dev->lock); =20 if (gpio_sim_device_is_live(dev)) - return device_for_each_child(&dev->pdev->dev, &ctx, + return device_for_each_child(&dev->common.pdev->dev, &ctx, gpio_sim_emit_chip_name); =20 return sprintf(page, "none\n"); @@ -1558,8 +1499,7 @@ gpio_sim_config_make_device_group(struct config_group= *group, const char *name) mutex_init(&dev->lock); INIT_LIST_HEAD(&dev->bank_list); =20 - dev->bus_notifier.notifier_call =3D gpio_sim_bus_notifier_call; - init_completion(&dev->probe_completion); + pseudo_gpio_init(&dev->common); =20 return &no_free_ptr(dev)->group; } --=20 2.45.2 From nobody Fri Dec 19 13:50:55 2025 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A92B22068E for ; Mon, 17 Feb 2025 14:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802525; cv=none; b=R0ftZ6z6CpVeRLY7+yYJBFX0gFsO4AMXJKdhALNYGoyDzp+SpB0DvoK5tgDp/TFZLlCSGj+lYNS5nQ3+ztTPhLKwm4DLnTIVtOR9lY6N55cIFM4l4U4EJNFyv7h4MWmHGXqYczpj4f1sI0mKdtVu/FpYieNqeehtxUi0f5Fl7Xk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739802525; c=relaxed/simple; bh=kgTHhR4YUfUQvLTcLHSzDC9nY3pfgiRlMVx62VhpKuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VcYEva4HncoISKFc2b1tlUHx7zVGBOah3/Yb2Hrz0/NQ0TDgLC51yfdl/xd1UnXaQ0jYCNayMglUSlKVV6o3oSzwywST0HHMJA1hJugCYr7IQffdt2KaShvJIi744zSFOZpsXsfP4ZUGHEE5oNuvMenHA0ZxdtYfJGKnAU2jBpA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=kb90MKhK; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="kb90MKhK" Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 85D0D3F880 for ; Mon, 17 Feb 2025 14:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1739802520; bh=ejmbjvPRmedRPsWRD+UddjAoJvDsol1360tkb/DZqGw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kb90MKhK+WhvhhswF/4a24OUY6Xkh+iL0t0CMOkHD97+juu2OY85dYAlSrFYj8YXA z3l8dsaAtYbCBC8CviNWknPk6z8B5W8EvvUJGpi1DNrrvxgxHwb2eyQ50awtNlVqmW BRIUAgTw7JgCUqbgGqTnP4RM79EEVp8h0WyG66fNPTQvcJpqqvWOKjQ/iOqxjll7Qd RnzsF+ZPuTrm0ptIJ5xBedHRXOy/oFiRRqwqZ4YTLyCtM8V88UYTUYb+2aHCkCi46s VSbWWmZ+uAgwZkV7qmJ5dRj48FP3rZbXEDxyoflkVC3JKS534jF9VXPIvtspH9LeFA TH+KOAH6dnZjA== Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-22101839788so50124605ad.3 for ; Mon, 17 Feb 2025 06:28:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739802518; x=1740407318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ejmbjvPRmedRPsWRD+UddjAoJvDsol1360tkb/DZqGw=; b=ScuG1Be9cY9Hq++xC7zLvqwME79xySY2t5KD8BY2+uakRnJ3wC6LZt0mE3acw7dU6a iuFEz6zNQ3mrIwkCSxmklWlzZgPgodEHKhtMQXk9xK4bqWurjgE2eQy0ClwY6r8TLIzu ZUpw3+v9cAz6i7VGrikxZ0Q1cfojyVtpZAgsB+Cw6eP7I9q4Iow/jxKtpZKnspiqPnTS uWeOVilWjHbKbKQOons2IzX9qDWvxmJXhlGAAjWjncX8lbcCpFg/ozbZe6EGS2dlW6q5 BFpfGFJgWe1GS6oOinQvDvnCqbVhrzY+bnXoZiCouZPTXK+tgjzcHKuBfeb1DMdCVjyz Z5AQ== X-Forwarded-Encrypted: i=1; AJvYcCV7e9nU3YfmTz/tibwmE8ys/YLnqtluFc2Qi3HgKvXC3CpFJPe4dznG5ki6D23vb4F4TuSMqBQJqMfDPc8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9lEa6+gJbjMMOR9JbhVqxEyrlMDqlIDNrsOxznlGIBgaD4AvD NMwDqT1lHsSJhM55QyYk65vWHT75y+5kNifdZQB8DbW+jTPtLRbWSD9Wy7kJGUxcyBeyUOzs7S1 Qsz19KJ7iq7kpKzzvlIVoZV7n/mPPANFYTn6mVHnzhXM/Ofb4y4b3D2152OS8FW16I10tbBkUU8 vd4GvBj5Bypg== X-Gm-Gg: ASbGncs5psb7Bpv2t8T63ETqfPrYgOkhX8Lb2Oh0Sd6skY4fhfBDTzAb8qxY3S3wmQk sg58+9Q9IeJo2qism3ONaa48GqL1RA1vQNL6/mZQTgLQXfshEVqeoH988iSF/SGW4g40eIVhS/U wmWmGLxEdkXm4WRU6jOz0tEpRHw+mzHIYeZ0Neis+Et8oNNCtoL8JQ3kXpdiUn/UoNNtcgySLS/ OCF6ysNNFcZ7fG+wRpmYRwcDX9IeGcr3uSBc0HxSR1+EmmZ8+FVWUVHPLSmtIOL9mPxCMUGjBdR +ceD9teJFGbOTLikLs1go+g= X-Received: by 2002:a17:902:f612:b0:21f:9c7:2d2e with SMTP id d9443c01a7336-221040bdb68mr172681185ad.40.1739802517930; Mon, 17 Feb 2025 06:28:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHOgk8p2bSJvuLs/oEyFap3MbF7dqcx6MlSiZYeTYQTftD3iALVIhnHNeIrILA8yaAsNNn1Bg== X-Received: by 2002:a17:902:f612:b0:21f:9c7:2d2e with SMTP id d9443c01a7336-221040bdb68mr172680895ad.40.1739802517600; Mon, 17 Feb 2025 06:28:37 -0800 (PST) Received: from localhost.localdomain ([240f:74:7be:1:a6da:1fd8:6ba3:4cf3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d55916c7sm72237735ad.243.2025.02.17.06.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 06:28:37 -0800 (PST) From: Koichiro Den To: linux-gpio@vger.kernel.org Cc: brgl@bgdev.pl, geert+renesas@glider.be, linus.walleij@linaro.org, maciej.borzecki@canonical.com, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] gpio: virtuser: convert to use gpio-pseudo utilities Date: Mon, 17 Feb 2025 23:27:58 +0900 Message-ID: <20250217142758.540601-4-koichiro.den@canonical.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250217142758.540601-1-koichiro.den@canonical.com> References: <20250217142758.540601-1-koichiro.den@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update gpio-virtuser to use the new gpio-pseudo helper functions for synchronized platform device creation, reducing code duplication. No functional change. Signed-off-by: Koichiro Den --- drivers/gpio/Kconfig | 1 + drivers/gpio/gpio-virtuser.c | 73 +++++------------------------------- 2 files changed, 11 insertions(+), 63 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index c482e3494bac..d8fede07149f 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1942,6 +1942,7 @@ config GPIO_VIRTUSER select DEBUG_FS select CONFIGFS_FS select IRQ_WORK + select GPIO_PSEUDO help Say Y here to enable the configurable, configfs-based virtual GPIO consumer testing driver. diff --git a/drivers/gpio/gpio-virtuser.c b/drivers/gpio/gpio-virtuser.c index e89f299f2140..a825edc6fbc5 100644 --- a/drivers/gpio/gpio-virtuser.c +++ b/drivers/gpio/gpio-virtuser.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,8 @@ #include #include =20 +#include "gpio-pseudo.h" + #define GPIO_VIRTUSER_NAME_BUF_LEN 32 =20 static DEFINE_IDA(gpio_virtuser_ida); @@ -973,49 +974,17 @@ static struct platform_driver gpio_virtuser_driver = =3D { }; =20 struct gpio_virtuser_device { + struct pseudo_gpio_common common; struct config_group group; =20 - struct platform_device *pdev; int id; struct mutex lock; =20 - struct notifier_block bus_notifier; - struct completion probe_completion; - bool driver_bound; - struct gpiod_lookup_table *lookup_table; =20 struct list_head lookup_list; }; =20 -static int gpio_virtuser_bus_notifier_call(struct notifier_block *nb, - unsigned long action, void *data) -{ - struct gpio_virtuser_device *vdev; - struct device *dev =3D data; - char devname[32]; - - vdev =3D container_of(nb, struct gpio_virtuser_device, bus_notifier); - snprintf(devname, sizeof(devname), "gpio-virtuser.%d", vdev->id); - - if (!device_match_name(dev, devname)) - return NOTIFY_DONE; - - switch (action) { - case BUS_NOTIFY_BOUND_DRIVER: - vdev->driver_bound =3D true; - break; - case BUS_NOTIFY_DRIVER_NOT_BOUND: - vdev->driver_bound =3D false; - break; - default: - return NOTIFY_DONE; - } - - complete(&vdev->probe_completion); - return NOTIFY_OK; -} - static struct gpio_virtuser_device * to_gpio_virtuser_device(struct config_item *item) { @@ -1029,7 +998,7 @@ gpio_virtuser_device_is_live(struct gpio_virtuser_devi= ce *dev) { lockdep_assert_held(&dev->lock); =20 - return !!dev->pdev; + return !!dev->common.pdev; } =20 struct gpio_virtuser_lookup { @@ -1369,7 +1338,7 @@ gpio_virtuser_device_config_dev_name_show(struct conf= ig_item *item, =20 guard(mutex)(&dev->lock); =20 - pdev =3D dev->pdev; + pdev =3D dev->common.pdev; if (pdev) return sprintf(page, "%s\n", dev_name(&pdev->dev)); =20 @@ -1478,7 +1447,6 @@ gpio_virtuser_device_activate(struct gpio_virtuser_de= vice *dev) { struct platform_device_info pdevinfo; struct fwnode_handle *swnode; - struct platform_device *pdev; int ret; =20 lockdep_assert_held(&dev->lock); @@ -1499,31 +1467,12 @@ gpio_virtuser_device_activate(struct gpio_virtuser_= device *dev) if (ret) goto err_remove_swnode; =20 - reinit_completion(&dev->probe_completion); - dev->driver_bound =3D false; - bus_register_notifier(&platform_bus_type, &dev->bus_notifier); - - pdev =3D platform_device_register_full(&pdevinfo); - if (IS_ERR(pdev)) { - ret =3D PTR_ERR(pdev); - bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier); + ret =3D pseudo_gpio_register(&dev->common, &pdevinfo); + if (ret) goto err_remove_lookup_table; - } - - wait_for_completion(&dev->probe_completion); - bus_unregister_notifier(&platform_bus_type, &dev->bus_notifier); - - if (!dev->driver_bound) { - ret =3D -ENXIO; - goto err_unregister_pdev; - } - - dev->pdev =3D pdev; =20 return 0; =20 -err_unregister_pdev: - platform_device_unregister(pdev); err_remove_lookup_table: gpio_virtuser_remove_lookup_table(dev); err_remove_swnode: @@ -1539,11 +1488,10 @@ gpio_virtuser_device_deactivate(struct gpio_virtuse= r_device *dev) =20 lockdep_assert_held(&dev->lock); =20 - swnode =3D dev_fwnode(&dev->pdev->dev); - platform_device_unregister(dev->pdev); + swnode =3D dev_fwnode(&dev->common.pdev->dev); + pseudo_gpio_unregister(&dev->common); gpio_virtuser_remove_lookup_table(dev); fwnode_remove_software_node(swnode); - dev->pdev =3D NULL; } =20 static void @@ -1772,8 +1720,7 @@ gpio_virtuser_config_make_device_group(struct config_= group *group, &gpio_virtuser_device_config_group_type); mutex_init(&dev->lock); INIT_LIST_HEAD(&dev->lookup_list); - dev->bus_notifier.notifier_call =3D gpio_virtuser_bus_notifier_call; - init_completion(&dev->probe_completion); + pseudo_gpio_init(&dev->common); =20 return &no_free_ptr(dev)->group; } --=20 2.45.2