From patchwork Mon Feb 17 19:54:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wSVgzTK6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lvpm0HpCz9sRY for ; Tue, 18 Feb 2020 06:55:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729481AbgBQTyo (ORCPT ); Mon, 17 Feb 2020 14:54:44 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37044 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729501AbgBQTym (ORCPT ); Mon, 17 Feb 2020 14:54:42 -0500 Received: by mail-wr1-f68.google.com with SMTP id w15so21212053wru.4 for ; Mon, 17 Feb 2020 11:54:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v6usHAmM/tR1NKSe7ERsXJJ85CdMUxDouW36IMeIpPc=; b=wSVgzTK6HYqnvIH30T0/Plu/iTE9+fXiAC1ZolWfS+DwZfVQb9FKUv/6zIiyKmNora QxYdgNKCdsM3P5dVwwznjeg4kdr3jQ4OAnDdP+fXYwx/umaI2MITR1/ACKA/ajPf8Sr5 xVgP9ZzC4nlgxEPjQPgfIW54a4jlsqOKkt3c6hvpDLsiJu9jnxTqkbRJNrxoY821jQvf XfTTiAdAxMvzHxQ+M7Tc3nGVXv1v9e/8qMwFO1gklj2H2dl3oyjtMs5jCFHgvdldFBLU 5fpSRq9HgEpCChnYJKjMbOcZ+dTLoR69OvHOyqYgwBDx1650LY6DDzhzmfYH3im3/lqq 071w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v6usHAmM/tR1NKSe7ERsXJJ85CdMUxDouW36IMeIpPc=; b=Ev65q2X3KmYAi1CZ+JqMdeJ/MUtGlu+lHyKfXnq1oau3kw6XJNAPoUSsVdYM/tXFDk 2noBC7gvOQp4EXejIInkqWURKZteKMbOUe2xSkQaBvQ40fUESuIiU7LsRGPjBjuprtc8 ruN/1Iepc5q2iNH9E/hLV+P56RJcafW+N9/u3rCKaf/WkoZDZ5jim0kgRg/ohWdRwhop /lgamfntjHSwYLXUc5r9sd3loBtRhpmKo5aykj36gs4Pnj9ZTk8zg7PKV8viLzwmfN37 tcgRUkbgdeRreod82/GYvO9fhZI80KEBuHrt5RhnFko1DjzuafVXO7x8Azp85B6Q6PSd leKw== X-Gm-Message-State: APjAAAWNV8Huo8o/0xce74rG8wslKHHREeXOz0IkyQfMgSs59aPUagfC FLmG453xx1GbuXJYp5txgBOToQ== X-Google-Smtp-Source: APXvYqzN+aH7ss4CRCso05uviGcmNd0mlhFjxAFlhCrMb02hfYJnGZDhWu8xq8nlz/swjAqd5cmjRA== X-Received: by 2002:a5d:68cf:: with SMTP id p15mr22981757wrw.31.1581969280760; Mon, 17 Feb 2020 11:54:40 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:40 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 1/6] gpiolib: use kref in gpio_desc Date: Mon, 17 Feb 2020 20:54:30 +0100 Message-Id: <20200217195435.9309-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski GPIO descriptors are freed by consumers using gpiod_put(). The name of this function suggests some reference counting is going on but it's not true. Use kref to actually introduce reference counting for gpio_desc objects. Add a corresponding gpiod_get() helper for increasing the reference count. This doesn't change anything for already existing (correct) drivers but allows us to keep track of GPIO descs used by multiple users. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 26 +++++++++++++++++++++++--- drivers/gpio/gpiolib.h | 1 + include/linux/gpio/consumer.h | 1 + 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 4d0106ceeba7..1f781cb97437 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2798,6 +2798,8 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label) goto done; } + kref_init(&desc->ref); + if (chip->request) { /* chip->request may sleep */ spin_unlock_irqrestore(&gpio_lock, flags); @@ -2933,6 +2935,13 @@ void gpiod_free(struct gpio_desc *desc) } } +static void gpiod_free_kref(struct kref *ref) +{ + struct gpio_desc *desc = container_of(ref, struct gpio_desc, ref); + + gpiod_free(desc); +} + /** * gpiochip_is_requested - return string iff signal was requested * @chip: controller managing the signal @@ -5067,18 +5076,29 @@ struct gpio_descs *__must_check gpiod_get_array_optional(struct device *dev, EXPORT_SYMBOL_GPL(gpiod_get_array_optional); /** - * gpiod_put - dispose of a GPIO descriptor - * @desc: GPIO descriptor to dispose of + * gpiod_put - decrease the reference count of a GPIO descriptor + * @desc: GPIO descriptor to unref * * No descriptor can be used after gpiod_put() has been called on it. */ void gpiod_put(struct gpio_desc *desc) { if (desc) - gpiod_free(desc); + kref_put(&desc->ref, gpiod_free_kref); } EXPORT_SYMBOL_GPL(gpiod_put); +/** + * gpiod_ref - increase the reference count of a GPIO descriptor + * @desc: GPIO descriptor to reference + */ +void gpiod_ref(struct gpio_desc *desc) +{ + if (desc) + kref_get(&desc->ref); +} +EXPORT_SYMBOL_GPL(gpiod_ref); + /** * gpiod_put_array - dispose of multiple GPIO descriptors * @descs: struct gpio_descs containing an array of descriptors diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index 3e0aab2945d8..51a92c43dd55 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -119,6 +119,7 @@ struct gpio_desc { const char *label; /* Name of the GPIO */ const char *name; + struct kref ref; }; int gpiod_request(struct gpio_desc *desc, const char *label); diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index bf2d017dd7b7..b12bbd511c6e 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -81,6 +81,7 @@ struct gpio_descs *__must_check gpiod_get_array(struct device *dev, struct gpio_descs *__must_check gpiod_get_array_optional(struct device *dev, const char *con_id, enum gpiod_flags flags); +void gpiod_ref(struct gpio_desc *desc); void gpiod_put(struct gpio_desc *desc); void gpiod_put_array(struct gpio_descs *descs); From patchwork Mon Feb 17 19:54:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239548 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=gs3t2/Ty; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lvpl4D5cz9sSJ for ; Tue, 18 Feb 2020 06:55:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729646AbgBQTyp (ORCPT ); Mon, 17 Feb 2020 14:54:45 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36240 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727332AbgBQTyn (ORCPT ); Mon, 17 Feb 2020 14:54:43 -0500 Received: by mail-wm1-f66.google.com with SMTP id p17so552030wma.1 for ; Mon, 17 Feb 2020 11:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BYR9M1clfYHE1v0ARZeaLz8iyf2HR4xKCefQlA8DsFQ=; b=gs3t2/TyF6gF+0zoSvNHpJqpWvhb+OJTbYK+Rimp36zPn+Um3KJI7jU6an+eaF7C1g 6bsumWdRMHjnuu8oDRtMjAmZNmF/iEZdH8FIQIDkZW0GoN1Ni5mJC/WdxAzKosceidc9 3KClzAWGMg9kM5UDMuCWqhF7Qya3RyFEi9tCZUhzudbH0PYxgQ3+LYPEgQWWA0OT+UrJ m1VtSJwQTkRE3jKrGldEeOzw/QHMImAEvgHNLITBFtM2+0TDCPKaWMdEZYXRfI/sL2nI lN+tYgD7vqesBkEHp6/BgDbCgcnE/c3uLWTbIAheHZ0gGv4fYRQ6leWLrsVe6x72HxBB RkHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BYR9M1clfYHE1v0ARZeaLz8iyf2HR4xKCefQlA8DsFQ=; b=EOxGaDwv7/qtifAPgZbHdJa1tw1N5Hsv51D8IhUh/G5ovjsb3WaaOpoxh+YC5q7Nm2 RL++mMBwhSU6G2o13KspT24+jve3SC27mrvHkDisetfCDC4grmuzz6r7MUvSogrqBIpl iFK7QCcwJyg/13LkLrHyGnob//DG0b2WuMGTHp45efobZYNI7NM1HZJ8PpXCj6opeHb1 UMyfEljgpfYXN2oWtZXPEngpSrhb7pTMGb8MLN3RTfA2dRc8EXJaG+s+3MqgkaRewzQt rhpbKaePlLrG8T+uhu3GWeNm3ld7rxtcBWnFZUSLTwahEuF7+mgfn7AkpSLHlZLoOQYp 991w== X-Gm-Message-State: APjAAAVeB/oURMcJlOU2o+3HN0mbRLkZ991luldKCHNY/gG8l0iN6QQa HCvytHeQ01DBDUQVIIpNx3kQyA== X-Google-Smtp-Source: APXvYqzCRYEvCvyjC143+OuW9Wo/mGyHqbMmxdGTb0RSKx1nDwE2TWGL9MQamtoIoyVcxmyNjrfDjg== X-Received: by 2002:a1c:a553:: with SMTP id o80mr598696wme.94.1581969282023; Mon, 17 Feb 2020 11:54:42 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:41 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 2/6] nvmem: fix memory leak in error path Date: Mon, 17 Feb 2020 20:54:31 +0100 Message-Id: <20200217195435.9309-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski We need to remove the ida mapping when returning from nvmem_register() with an error. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ef326f243f36..b0be03d5f240 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -353,7 +353,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) - return ERR_CAST(nvmem->wp_gpio); + goto err_ida_remove; kref_init(&nvmem->refcnt); @@ -430,6 +430,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev); +err_ida_remove: + ida_simple_remove(&nvmem_ida, nvmem->id); return ERR_PTR(rval); } From patchwork Mon Feb 17 19:54:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=C5yJlQ0z; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lvpl1MQnz9sRt for ; Tue, 18 Feb 2020 06:55:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729659AbgBQTzJ (ORCPT ); Mon, 17 Feb 2020 14:55:09 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:32834 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729612AbgBQTyp (ORCPT ); Mon, 17 Feb 2020 14:54:45 -0500 Received: by mail-wr1-f65.google.com with SMTP id u6so21269460wrt.0 for ; Mon, 17 Feb 2020 11:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vEpSrHnokxwmZhdlJaP1Fdj4KHCY0aOhXmKsmIiSb2c=; b=C5yJlQ0zN1DNoCE7vAWDdzDh2oF7j6+dHO2XT/eCYXi5m1+IVxogqmWGWqAIkmMr6c xLaTQXqKC38T1ujrVcOPc0yJ4T/o/jeILhkKJF+Yo4RVk06ZRRlBjZuZBofXxN7NWhNY qpvtrLYWbrJXIN0eIwevBaYdSJClurdxLzTVDg0Hyj30k+GG9YkpiA9oGsHEJL4jeQ64 x9T0DGwG7EahJlYYqbUbeTkglnXadRnup3TzBOI5MOgliIQDip85hI9rT2Y2h62PrxoQ bdI3q7CEUGk9wGzK2GcYWqGuBvSmrWWO05nhc3BghDKd0Jn0z9PYh3hXVfQyVHKDsUOZ DGlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vEpSrHnokxwmZhdlJaP1Fdj4KHCY0aOhXmKsmIiSb2c=; b=eER4eUK4QOtW8pLXU6cfrWPXoix1jKYwuNYuWoNk8ceDijKnLbyNxSx5iEJo6oLiDN 45iHT4ZxbCiJ8QPjj4euYlu7XiptzcpbdZM6ALy5SsH7pBs0krP5HrUax6570xqPEr8X lxd2WZ+wo0Nv/owEywplzEK0RZDhI9luXMpGY8UuBezkHgQCwYZClXDdrL03AzS3YwFK vhPWlGbu+9a7Ct2RLohLuxAN9qviIaS47iFXo0vX2ChGra28MYwMxr8+YnIKdUfJkvEk epmRZ9QLIOLNzs6wzcZF/FGWTnsDsoPFuwPP+RQPNKWgObNqTKATmCsuWL3bYJ6vFXRR Zt8A== X-Gm-Message-State: APjAAAUQ4pz6R10e+8M37vLN6x5KNnUIbqa5QLC59tlFySl3huNTwZvG 3oNvI2Uekw6s9RK9Ym4ZetaLmA== X-Google-Smtp-Source: APXvYqy8+uEI+AwlMQIFLWh4NY+e2ujZPYaJBH3XEz62f0FrxkWwIiIuYgEVBfnvWw1JglwM/pIyJw== X-Received: by 2002:a5d:610c:: with SMTP id v12mr22642217wrt.88.1581969283249; Mon, 17 Feb 2020 11:54:43 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:42 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 3/6] nvmem: remove a stray newline in nvmem_register() Date: Mon, 17 Feb 2020 20:54:32 +0100 Message-Id: <20200217195435.9309-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski Two newlines are unnecessary - remove one. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b0be03d5f240..12e2991cdeef 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -355,7 +355,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (IS_ERR(nvmem->wp_gpio)) goto err_ida_remove; - kref_init(&nvmem->refcnt); INIT_LIST_HEAD(&nvmem->cells); From patchwork Mon Feb 17 19:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=AfUrW2gb; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lvpk4klcz9sRY for ; Tue, 18 Feb 2020 06:55:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729612AbgBQTzJ (ORCPT ); Mon, 17 Feb 2020 14:55:09 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38921 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729618AbgBQTyp (ORCPT ); Mon, 17 Feb 2020 14:54:45 -0500 Received: by mail-wr1-f68.google.com with SMTP id y11so21192761wrt.6 for ; Mon, 17 Feb 2020 11:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ibj9ygukPb9JYTU3mvyTkp2n0e9w9M7BBgYCc3RsiE0=; b=AfUrW2gbRewzH09iwIz4mOgbGI6xRBf9V9DBjRYX99k7rC43NLrIJeL6iJOtP29bzB XCOotyERZgjri2cgQbwB4/Xo+gvADjygCIZtn+ulJDnkKEj4NAwMK5r1IX0RYRQSwLve 7kxRgQI6sHIb0PzQ5N8S/BuHDaQ4vkSwMm5wASgU/fuzdt7pY6b52pbEA92AZc/sI+0A mcwUlZB5A/LUknqRjE0c/UFaDX4boKsYsSjzLplgC/LBi17NNk5lWG11u5m0oBrTCoe4 WLUWqiiC1tiNhiMhs3bf0+mvd9Hd6ZQemDM8+sGDb5uKBs9miGLRl065Hzb1zNdfuAIY XrwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ibj9ygukPb9JYTU3mvyTkp2n0e9w9M7BBgYCc3RsiE0=; b=Xt7SG4l4I/iykWupaQDS/48xnOtvAWjHYjZd3UQGw2zZ2pMSnngHPe/Fmo4DIxlFZp 4BZGl93GZNxnd+0+oZ9oRVTRqi+HfrNtTv+nZAkEyKA4IMIWqbkk1O+FenFmCqwNnNMe /KoJkZ+HgGn3c/96H7Gi2DsiHa5609TUjJWFx2QSFroxuylLO/8ugZS/Hr48zwbrrqmx IvFw/0JSePZu/bgzyFPSXP1Vs8GDsE+VyCMfCVuYaQAfyE7HagVA8D+jKEK9oVjlSpbO T9iWMwzNsLfSbz967qWy90EM2kfbrx6qiL7igg0zQRqEjJ3hKv+FDjPrjZcDv5NSn30E /2fA== X-Gm-Message-State: APjAAAUzY2EppXGc5gwKQas8qd1xyz6Unrk8kUyLNGjDEgRavaSMTpoU KL1kTn2tuv6ERQPioNXdY+Xh/A== X-Google-Smtp-Source: APXvYqwlWIo4hBNxAnsgARfbUQqYYsyWocS3dL48hvcsR9M5AfzTmKuPqXmaiVFdJ0j+MGV16uBXqg== X-Received: by 2002:adf:93c1:: with SMTP id 59mr24275455wrp.399.1581969284441; Mon, 17 Feb 2020 11:54:44 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:43 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 4/6] nvmem: add a newline for readability Date: Mon, 17 Feb 2020 20:54:33 +0100 Message-Id: <20200217195435.9309-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski Visibly separate the GPIO request from the previous operation in the code with a newline. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 12e2991cdeef..07af9edea9cf 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -347,6 +347,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) kfree(nvmem); return ERR_PTR(rval); } + if (config->wp_gpio) nvmem->wp_gpio = config->wp_gpio; else From patchwork Mon Feb 17 19:54:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=C4pRCrEH; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48LvpL3ZkPz9sRY for ; Tue, 18 Feb 2020 06:54:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729717AbgBQTyt (ORCPT ); Mon, 17 Feb 2020 14:54:49 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34026 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729698AbgBQTyr (ORCPT ); Mon, 17 Feb 2020 14:54:47 -0500 Received: by mail-wr1-f66.google.com with SMTP id n10so19261918wrm.1 for ; Mon, 17 Feb 2020 11:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eHHf1AZ6awg6rJEgh/8j8fVolWpvz1BWWO6jH4U66VQ=; b=C4pRCrEHMcQUiX8lZV0P4XL69BR8YUU9PP6rWhgtMHuCoWh/myi3b5qfmjy9WocIpy DHXBPE8EkUFoOzl9PF+6uf2tZwZGfXt2V+zbIxPIu22QBXucp7J94F+E/Sqg8h7eFSMn oQcwixYdX5y01EO75gA+W7p+/slUA7SGbkYZdkvQR87JLbK6Ryiuvj4bWMojUz8wKoy1 rtL6f/xWlzAcPDAbbDh3V9S9udsvuiHLrmP67RLX+JSdFrX0XrkNN0caJY1jLFMH2oKd ek1MynhYu75OejfO1p8clQEfwu48CBL+4xHOiEgQrkgq9sb2JqloRuzL4+ZTVchmKoxs bRKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eHHf1AZ6awg6rJEgh/8j8fVolWpvz1BWWO6jH4U66VQ=; b=d/FCk6nh9IVzFI+0i6XELhnKcwBwE5czRfZ27Wv0lE+jgx896lsR1y6LUBB7Z6WiBM TcECpMqxAI8kCWW0es0b6JMrX1mIBfAniDYJ5OmhBF0KAc+4Z7b+yIHIsqnhAH3TutHe UQgwupCNev3J8PKa+Fun1zmPEFeEqLeWnrEdxux8Vm8p0kazITdehusqjUFPAdpL6Lrm m6tsE4RVjUJUU2tpvp9bBnLqqZNq/igzywgT4ZP2DrQvW/xu8tn2QwoZksXLPnxebc2w FEQw+wauhRCLEe2aeB/Bvnws3dPrkJ/aqwJ/1i0ckiP/xB+07i3uxEf3jlqEppno4C9L ILCg== X-Gm-Message-State: APjAAAU9yOK4qi9fa+pANTqcGkEAE9o5oGSMYcS/Poi65k7jUv+4yM50 1Ltc3zxzXpWUHUfmmrq9wZ+cA4KINW0= X-Google-Smtp-Source: APXvYqycds3+uTkCmmj1bwhdP3qSWBf6e5zvFgV9quta8k08gJuuEtpvCJRiNDNb8sCWbK7ForeUcA== X-Received: by 2002:adf:f3d1:: with SMTP id g17mr22826005wrp.378.1581969285841; Mon, 17 Feb 2020 11:54:45 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:45 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, geert@linux-m68k.org, Bartosz Golaszewski Subject: [PATCH 5/6] nvmem: release the write-protect pin Date: Mon, 17 Feb 2020 20:54:34 +0100 Message-Id: <20200217195435.9309-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Khouloud Touil Put the write-protect GPIO descriptor in nvmem_release() and in the error path in nvmem_register(). Fixes: 2a127da461a9 ("nvmem: add support for the write-protect pin") Reported-by: geert@linux-m68k.org Signed-off-by: Khouloud Touil [Bartosz: - also put the gpio in error path in nvmem_register(), - tweak the commit message: the GPIO is not auto-released] Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 07af9edea9cf..096c7bae9e74 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -72,6 +72,7 @@ static void nvmem_release(struct device *dev) struct nvmem_device *nvmem = to_nvmem_device(dev); ida_simple_remove(&nvmem_ida, nvmem->id); + gpiod_put(nvmem->wp_gpio); kfree(nvmem); } @@ -430,6 +431,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev); + gpiod_put(nvmem->wp_gpio); err_ida_remove: ida_simple_remove(&nvmem_ida, nvmem->id); From patchwork Mon Feb 17 19:54:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1239545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Wp87GGdF; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Lvpb2GtPz9sSG for ; Tue, 18 Feb 2020 06:55:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729733AbgBQTys (ORCPT ); Mon, 17 Feb 2020 14:54:48 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:32847 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729717AbgBQTys (ORCPT ); Mon, 17 Feb 2020 14:54:48 -0500 Received: by mail-wr1-f68.google.com with SMTP id u6so21269671wrt.0 for ; Mon, 17 Feb 2020 11:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nG7/CsSYEjJAJuvHDKY3X2jyLTeRabTAHO5K7wLe+ss=; b=Wp87GGdFrmFk3U/BZkSkkgGt/sjUYCkspxOgsVivKDbqdAWSJuc3rEaXm43AIwdpUh 93/5GDxj8IWKuwTuMovC/U8+voqHbS69hKMSu8CWLA0CSi6JoeNJ2YECnBskVhYxIcuY ZKQHYTBWYwuoGihOTyTMlODqMi6EPmIWLgE4JHAosyiowDpZhg5NH6f/vkb65poh/z9u hKL5WylgKaKh07RqdR6+KOAHoEG4fqK7qxMzODPuA8luvcm/YUTmbNdv4/lIs1SHGUB8 xYuDDXwvN5DxbizuG5kcpyNG3m0ZKrI8wgnhhnhK+rvLpiUfoDOzVYsR4InsqRGAFxNU sZyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nG7/CsSYEjJAJuvHDKY3X2jyLTeRabTAHO5K7wLe+ss=; b=LP7K1/6zI9PtmVBENER4xDKMyoWgUqDTtR1zO4ogdMNSDAXQvZzwRwsh5es9oXERe/ 3paQtg+QZxTBjmkghzxm3GlDw6LAlGnFN+I8BsPQCFqEyOjG/qkrkLakElCgKynv+a2t MlnTQKXmJe99ux0Dmt2OgFDxihr+ArpXXauWyGcK6bFakPhb2vwuFJhgY+BdHNKMMu6y wd3RD8zWf4HPqirILQZ7zsHjJZRPjAV4vdrDqvzIW99jF205zPJuf2aWtbr0t9JPL0su QIyoosocU8lv28hmn46gJIDYiGZh8cQUsnqc9U8tZtPY3Z3cb1F71d3kZ5eBdXhDbX21 50Ew== X-Gm-Message-State: APjAAAWKkLwDR2Ht7Q+J+FhNsV0hA3Gx80QL1pIlVIt2KNyrkGIdxchC ybNyfuZ/3h8rNCEZYzDTDOscr4ssM+I= X-Google-Smtp-Source: APXvYqyDRdQYeKWizyeEAiB+mDqqQRWrstWkrMThxrx53IRWtzydHMBCpPOCbtyEP6VXja+uLFHrtA== X-Received: by 2002:a5d:510f:: with SMTP id s15mr23606937wrt.408.1581969287003; Mon, 17 Feb 2020 11:54:47 -0800 (PST) Received: from debian-brgl.local (8.165.185.81.rev.sfr.net. [81.185.165.8]) by smtp.gmail.com with ESMTPSA id v5sm2679469wrv.86.2020.02.17.11.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 11:54:46 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 6/6] nvmem: increase the reference count of a gpio passed over config Date: Mon, 17 Feb 2020 20:54:35 +0100 Message-Id: <20200217195435.9309-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217195435.9309-1-brgl@bgdev.pl> References: <20200217195435.9309-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Bartosz Golaszewski We can obtain the write-protect GPIO in nvmem_register() by requesting it ourselves or by storing the gpio_desc passed in nvmem_config. In the latter case we need to increase the reference count so that it gets freed correctly. Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 096c7bae9e74..b7b1e3194453 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -349,11 +349,13 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) return ERR_PTR(rval); } - if (config->wp_gpio) + if (config->wp_gpio) { nvmem->wp_gpio = config->wp_gpio; - else + gpiod_ref(config->wp_gpio); + } else { nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); + } if (IS_ERR(nvmem->wp_gpio)) goto err_ida_remove;