From nobody Fri Oct 3 21:39:40 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 37F2D2D5C6F for ; Mon, 25 Aug 2025 09:49:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756115347; cv=none; b=tWVZvTxOI8e/tbexGgo0uMkDOphdc+jhx/HrVets7HeUUkzk9GyVRGBlE5iLh4mmGGAvWYIJWPG7p+Ae+bHUjVbsDskC/uvmTchdZl8KvGK+mKzorCmUNP4ebSfe1VGqROlcvrZsM47/H8GVrtThIxhPEW9rF/ImLB89waYGIDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756115347; c=relaxed/simple; bh=XQaqdc0ktGejmmosFBqHjv8XgXq7TD5YtWkDbZc/RV0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iexHKudj82+wS6BVkTW/v8ST7V6TIZz9apBC88kIjRH1zUOZN5/P/paVUKNALdK5CYdN7cvlkqw/vQWFmMgRu6J1OZqXCyCfKXltQEtXaDuWCuPjOIdLMrre2Umcy02pktOlQTu4/WpLlu8jWEllM6HlfVp+8oPPiLEeGlY8FJo= 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=CoUc3fsV; arc=none smtp.client-ip=209.85.128.50 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="CoUc3fsV" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-45a1b05a59fso32869245e9.1 for ; Mon, 25 Aug 2025 02:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1756115343; x=1756720143; 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=r3Pd+f1W3JQ+RXDpdyFAaWwHwzHpzCLOKtOb/pgFbgs=; b=CoUc3fsVJsoMVguFJarG3Jaba92ON72FGn2QcxLN9SbJ7eWSYDOuGkuxFM6vbECjhX +K4HLwjBWJiDu6HaY658a7Kze2p09kKYA0xmxodQlhjRZOKAPTse4jgjxFEzXe65nEV2 6S6PNvmE2WfyPL+uokTFWewNBnukNnDelDRIO2uA3OKtpXm5raR584CsunUUD0TuMM6/ Yj/KMeB5kdWihZkLgn6eT9sy2Xhv28VDKGz8nxT+P5RshZx8A+VlOlkagcvCYgatD3zD te5WUpJcD3xaFtmGu4jKY279VJFzkUrZYtWte3saFv96L2IYbROhUHsaYvHpU7Co500I khnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756115343; x=1756720143; 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=r3Pd+f1W3JQ+RXDpdyFAaWwHwzHpzCLOKtOb/pgFbgs=; b=d1XFOIXhgbTQwdv134cbaWw7QUsopqvGEETL7lZYLCmbEx/E/lzRc2sRY05lMI/tpm mKCnAnWrQQWhGqa3SvozOxXPjpDK9ibjQttEAfVfXqes/cUvJVSXh3nWRqAjSfJnWtOG af+nopHIQ+Qgj1UqAnnzJCOUltj0l/jiOmrvPn/bq34WZyhVpCi6P7HIPZizW8iypWc4 OzZOLOg8MF+O+LIjKZ0eKwJLVPNOlYW1QFrGjRAcUzqMCq0m2F9eoH2Z/EBYXPdwWN26 Q3wNl9ZZ+Koy45EQ3WpR6mi2XDCt60OcJrFMoQV2lbjgB5wXYV1VMnjAJ+LRlTg/dtot 2Dzg== X-Forwarded-Encrypted: i=1; AJvYcCUQ9gOh/7paIJ1QMWrwJAiNjrCEszkKZinqi6j+gvsA8WydZ98bS5Bmfq8D3oFMKdLuVQFwYErlftFPBKY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6TZArrpvuXMvmsaNK6fZ0rHTumqRH45+DTK1nhLhfJcOX9ox5 zzUtjmF8bMSAPiCKkO5nL6dv2IDE5KFOzWBg5JxfddCqupTdhHKWFFyDl4MFFoU6Wko= X-Gm-Gg: ASbGncv9+SIVuBB/a4MgKkTJT2yEDqm6y8H1vXPr+OZMaOgHasXCcBu1OOIEWV10514 vcrVR5oaTDqQX8fzzYW1i2LKQWBhIKG39/V48M7823SJCc2O1QPDeUx2DjIH3EllLNDYu70MDI5 xYRQ/FXMMqmq55OEKDQr/iwyX8H0xj+F6TEOmysMq29r1qCiwlPvcy1v6PZcmdzPJFGjfr0t6/Z XgvDyMW5bcQxdxwb6OBcC97s+CdQ7mTx3GxHx/gStxHnSTuzMUCrDH/8p2w2eoxGleIPC9Muzfz kM7WIH/rB+zMxNGnREVNap3RPQyZaGFcpAWyZUFc28jLcZID4SyAj/QP5usJ5uNiYnvggwsSEtH 3/1r4YJZER5qoz5hPEg== X-Google-Smtp-Source: AGHT+IF+DGK7ah98d14Q5J3T1B+5aP3g73ZZMrERf7ASzZkA8tqeaNAu5LBRINhnoLPrv7wp1bRzuw== X-Received: by 2002:a05:6000:24c3:b0:3b8:d901:fa33 with SMTP id ffacd0b85a97d-3c5dcc0777amr10149165f8f.42.1756115343472; Mon, 25 Aug 2025 02:49:03 -0700 (PDT) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:ef52:fc8d:34ad:9bfe]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c711bb1e3asm10877449f8f.57.2025.08.25.02.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 02:49:02 -0700 (PDT) From: Bartosz Golaszewski Date: Mon, 25 Aug 2025 11:48:53 +0200 Subject: [PATCH RESEND 12/14] gpio: grgpio: use new generic GPIO chip API 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: <20250825-gpio-mmio-gpio-conv-v1-12-356b4b1d5110@linaro.org> References: <20250825-gpio-mmio-gpio-conv-v1-0-356b4b1d5110@linaro.org> In-Reply-To: <20250825-gpio-mmio-gpio-conv-v1-0-356b4b1d5110@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Yinbo Zhu , Hoan Tran , Manivannan Sadhasivam , Yang Shen Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7995; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=AGhvI8vG5SGj9cxXM06eRQt9v1ofBIcmVl22/TTQOT4=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBorDGA9kgZKs4xdDRJcuUH/c6fDnvRy2++EFeeH BLsDoydZRSJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaKwxgAAKCRARpy6gFHHX cl0wEACkbnVrJ7x5Ll/WAAt1ahr6Mj8tuq5YzD7ax3FC6HC4CvaZ6WH/SO/ryTLaakUgwKh3j7N fO6l5uFW/wcVU6prgm1r2D2E1oqitoecvCXLhZC0VAfh4ObP+4w1Fhxdb9A9I7LbFoG4C664OJV cyCTS+m0GQJBdbplb5e6OYlaXR8sR+2avVJUCud8fyGapgpX4V/aCMEg5zZGS4W1l7F0HSD3dYz T15xIr4wwVOlPY0nJea7yuf+Z1iV0Wa3gc1KwcYr9jsZzxCl8pLeHK3WV8zZ+EQvLMjzxcX1MLU Nvu0n5R7PgGbDoGLaA61I/ZMO/+CU1HCFOin34RQRAByZ4hlEJt0W2d8WIAqU7oBbixLJnj+wwV k2CiHst9w3fOMQ5itLFjIbXQn4cSKshlOY7N5MmkqN+PVSuouHdeZlOenr7aUBlGxTUbd765l5a IEfCnuVl2zEqwji8aeb2IUIe89qR5amnHDCgcYcIA1Xs2lZInlSgI14GOBT9PouQsvcmrAGM/rG ctVqqUrYD3L+Els1XqQiXtdYGmnZkjPN94CjBQosv449aDZxGgVSrjb7+Y1yTZeIxhV4R7Nu8OD puAoBZX9YhLg8JhZRoR2ubcndD5V8tlFRtHjHYfi/NjnTF3GKI46+u4zFCBkdfw/aJgfY9lrMxA EkZE+UGaqA8mVBw== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Convert the driver to using the new generic GPIO chip interfaces from linux/gpio/generic.h. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-grgpio.c | 87 +++++++++++++++++++++++-------------------= ---- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index f3f8bab62f94cefb69d31d76b961ab2d346df49e..3b77fad00749cd5218268b267b5= 848515c6a26fc 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ struct grgpio_lirq { }; =20 struct grgpio_priv { - struct gpio_chip gc; + struct gpio_generic_chip chip; void __iomem *regs; struct device *dev; =20 @@ -91,13 +92,12 @@ struct grgpio_priv { static void grgpio_set_imask(struct grgpio_priv *priv, unsigned int offset, int val) { - struct gpio_chip *gc =3D &priv->gc; - if (val) priv->imask |=3D BIT(offset); else priv->imask &=3D ~BIT(offset); - gc->write_reg(priv->regs + GRGPIO_IMASK, priv->imask); + + gpio_generic_write_reg(&priv->chip, priv->regs + GRGPIO_IMASK, priv->imas= k); } =20 static int grgpio_to_irq(struct gpio_chip *gc, unsigned offset) @@ -118,7 +118,6 @@ static int grgpio_to_irq(struct gpio_chip *gc, unsigned= offset) static int grgpio_irq_set_type(struct irq_data *d, unsigned int type) { struct grgpio_priv *priv =3D irq_data_get_irq_chip_data(d); - unsigned long flags; u32 mask =3D BIT(d->hwirq); u32 ipol; u32 iedge; @@ -146,15 +145,13 @@ static int grgpio_irq_set_type(struct irq_data *d, un= signed int type) return -EINVAL; } =20 - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + guard(gpio_generic_lock_irqsave)(&priv->chip); =20 - ipol =3D priv->gc.read_reg(priv->regs + GRGPIO_IPOL) & ~mask; - iedge =3D priv->gc.read_reg(priv->regs + GRGPIO_IEDGE) & ~mask; + ipol =3D gpio_generic_read_reg(&priv->chip, priv->regs + GRGPIO_IPOL) & ~= mask; + iedge =3D gpio_generic_read_reg(&priv->chip, priv->regs + GRGPIO_IEDGE) &= ~mask; =20 - priv->gc.write_reg(priv->regs + GRGPIO_IPOL, ipol | pol); - priv->gc.write_reg(priv->regs + GRGPIO_IEDGE, iedge | edge); - - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); + gpio_generic_write_reg(&priv->chip, priv->regs + GRGPIO_IPOL, ipol | pol); + gpio_generic_write_reg(&priv->chip, priv->regs + GRGPIO_IEDGE, iedge | ed= ge); =20 return 0; } @@ -163,29 +160,23 @@ static void grgpio_irq_mask(struct irq_data *d) { struct grgpio_priv *priv =3D irq_data_get_irq_chip_data(d); int offset =3D d->hwirq; - unsigned long flags; =20 - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + scoped_guard(gpio_generic_lock_irqsave, &priv->chip) + grgpio_set_imask(priv, offset, 0); =20 - grgpio_set_imask(priv, offset, 0); - - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); - - gpiochip_disable_irq(&priv->gc, d->hwirq); + gpiochip_disable_irq(&priv->chip.gc, d->hwirq); } =20 static void grgpio_irq_unmask(struct irq_data *d) { struct grgpio_priv *priv =3D irq_data_get_irq_chip_data(d); int offset =3D d->hwirq; - unsigned long flags; =20 - gpiochip_enable_irq(&priv->gc, d->hwirq); - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + gpiochip_enable_irq(&priv->chip.gc, d->hwirq); + + guard(gpio_generic_lock_irqsave)(&priv->chip); =20 grgpio_set_imask(priv, offset, 1); - - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); } =20 static const struct irq_chip grgpio_irq_chip =3D { @@ -200,12 +191,11 @@ static const struct irq_chip grgpio_irq_chip =3D { static irqreturn_t grgpio_irq_handler(int irq, void *dev) { struct grgpio_priv *priv =3D dev; - int ngpio =3D priv->gc.ngpio; - unsigned long flags; + int ngpio =3D priv->chip.gc.ngpio; int i; int match =3D 0; =20 - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + guard(gpio_generic_lock_irqsave)(&priv->chip); =20 /* * For each gpio line, call its interrupt handler if it its underlying @@ -221,8 +211,6 @@ static irqreturn_t grgpio_irq_handler(int irq, void *de= v) } } =20 - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); - if (!match) dev_warn(priv->dev, "No gpio line matched irq %d\n", irq); =20 @@ -253,13 +241,18 @@ static int grgpio_irq_map(struct irq_domain *d, unsig= ned int irq, dev_dbg(priv->dev, "Mapping irq %d for gpio line %d\n", irq, offset); =20 - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_lock_irqsave(&priv->chip, flags); =20 /* Request underlying irq if not already requested */ lirq->irq =3D irq; uirq =3D &priv->uirqs[lirq->index]; if (uirq->refcnt =3D=3D 0) { - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); + /* + * FIXME: This is not how locking works at all, you can't just + * release the lock for a moment to do something that can't + * sleep... + */ + gpio_generic_chip_unlock_irqrestore(&priv->chip, flags); ret =3D request_irq(uirq->uirq, grgpio_irq_handler, 0, dev_name(priv->dev), priv); if (ret) { @@ -268,11 +261,11 @@ static int grgpio_irq_map(struct irq_domain *d, unsig= ned int irq, uirq->uirq); return ret; } - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_lock_irqsave(&priv->chip, flags); } uirq->refcnt++; =20 - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_unlock_irqrestore(&priv->chip, flags); =20 /* Setup irq */ irq_set_chip_data(irq, priv); @@ -290,13 +283,13 @@ static void grgpio_irq_unmap(struct irq_domain *d, un= signed int irq) struct grgpio_lirq *lirq; struct grgpio_uirq *uirq; unsigned long flags; - int ngpio =3D priv->gc.ngpio; + int ngpio =3D priv->chip.gc.ngpio; int i; =20 irq_set_chip_and_handler(irq, NULL, NULL); irq_set_chip_data(irq, NULL); =20 - raw_spin_lock_irqsave(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_lock_irqsave(&priv->chip, flags); =20 /* Free underlying irq if last user unmapped */ index =3D -1; @@ -315,13 +308,13 @@ static void grgpio_irq_unmap(struct irq_domain *d, un= signed int irq) uirq =3D &priv->uirqs[lirq->index]; uirq->refcnt--; if (uirq->refcnt =3D=3D 0) { - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_unlock_irqrestore(&priv->chip, flags); free_irq(uirq->uirq, priv); return; } } =20 - raw_spin_unlock_irqrestore(&priv->gc.bgpio_lock, flags); + gpio_generic_chip_unlock_irqrestore(&priv->chip, flags); } =20 static void grgpio_irq_domain_remove(void *data) @@ -341,6 +334,7 @@ static const struct irq_domain_ops grgpio_irq_domain_op= s =3D { static int grgpio_probe(struct platform_device *ofdev) { struct device_node *np =3D ofdev->dev.of_node; + struct gpio_generic_chip_config config; struct device *dev =3D &ofdev->dev; void __iomem *regs; struct gpio_chip *gc; @@ -359,17 +353,24 @@ static int grgpio_probe(struct platform_device *ofdev) if (IS_ERR(regs)) return PTR_ERR(regs); =20 - gc =3D &priv->gc; - err =3D bgpio_init(gc, dev, 4, regs + GRGPIO_DATA, - regs + GRGPIO_OUTPUT, NULL, regs + GRGPIO_DIR, NULL, - BGPIOF_BIG_ENDIAN_BYTE_ORDER); + config =3D (typeof(config)){ + .dev =3D dev, + .sz =3D 4, + .dat =3D regs + GRGPIO_DATA, + .set =3D regs + GRGPIO_OUTPUT, + .dirout =3D regs + GRGPIO_DIR, + .flags =3D BGPIOF_BIG_ENDIAN_BYTE_ORDER, + }; + + gc =3D &priv->chip.gc; + err =3D gpio_generic_chip_init(&priv->chip, &config); if (err) { - dev_err(dev, "bgpio_init() failed\n"); + dev_err(dev, "failed to initialize the generic GPIO chip\n"); return err; } =20 priv->regs =3D regs; - priv->imask =3D gc->read_reg(regs + GRGPIO_IMASK); + priv->imask =3D gpio_generic_read_reg(&priv->chip, regs + GRGPIO_IMASK); priv->dev =3D dev; =20 gc->owner =3D THIS_MODULE; --=20 2.48.1