From patchwork Wed Mar 21 12:08:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10299299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C2FA1602B3 for ; Wed, 21 Mar 2018 12:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C13B929831 for ; Wed, 21 Mar 2018 12:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5C2729837; Wed, 21 Mar 2018 12:10:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 393AB29831 for ; Wed, 21 Mar 2018 12:10:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751717AbeCUMKP (ORCPT ); Wed, 21 Mar 2018 08:10:15 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:52476 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553AbeCUMI0 (ORCPT ); Wed, 21 Mar 2018 08:08:26 -0400 Received: by mail-wm0-f65.google.com with SMTP id l9so9284638wmh.2 for ; Wed, 21 Mar 2018 05:08:26 -0700 (PDT) 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; bh=Q1G+VWjRAg8MmH0POYq0VvvthGxnpZtMQzOyxoKM1dU=; b=kLaQ8OBw5h9eg/8glMfZrEtufub4hdKOtItgc7jIQAjKN9P13AJOao2RP+qbeoHdS8 OSDTQUmhcjDdeeOuDjaG2DazKHZlWLi2WhwyJaqkkkxIbTY/PmG8cgfhNKsSCaZIzWba jxjxIEHZRxI8v/5t35Jp+W58P+l1S6vNxk74LZMN1jo20zx7laK3htlGQsbDpLi0LyHC d6DSPpDNDYOJuq+S/GaxEsXFXJCb/zEKk8f5PC34VD2LWpuh7QUoLEorYlnQf/dR7LFv ULVkxWjz9YkVhjARE93mxgDJvp7b5Ht8vz6CjcDjvUFLHMN9X3xTsDKAX2lpxL1/lPnD KHVQ== 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; bh=Q1G+VWjRAg8MmH0POYq0VvvthGxnpZtMQzOyxoKM1dU=; b=S1rF46TRyLMU9lQuvDi/slr8u6UBsWxU/mmZih5PF7rh/CfsbofUT/ge6aUtkFYXVE mYCpvtiL1UxZ+pRWPDDHNHBNkMh6hXPuwCKADNvC2SuFgjGacCna2cmOLU1ze2KmYujq FejnE/fZwVVr6hEaR2GIL8364CtMgIBgNRBRF2mGA6ryhnZhe2Lty1HQNPp4sJi/JW99 nU20hRYUnKbjndbFJqwL578L9xxlmwOxjjbvffQHI7nalbhlu1aHMfHm7R4XrHlcCPFq ca+CJzodHzPJx0uganHABTyNamNmiynOro/nS/aYSuongfO114/wc96mOehcqxlM0eNg Fxmw== X-Gm-Message-State: AElRT7GedIIDfEFr5kuK1V+DBkPh3lejEEpHF9gPR3U8gvi/+u4JfdFB kpBO/8lWlKhfY+BcJEuTHWfGWQ== X-Google-Smtp-Source: AG47ELvJ5j0b5F3s/MYXcg9UfvEDDiwO+sMdPEYbX9/cldOfhS3Ad2KvCn/urhU3/wU9Beb988JFAw== X-Received: by 10.28.230.68 with SMTP id d65mr2705475wmh.13.1521634105488; Wed, 21 Mar 2018 05:08:25 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-NIC-1-208-99.w2-15.abo.wanadoo.fr. [2.15.55.99]) by smtp.gmail.com with ESMTPSA id 69sm3871018wmp.36.2018.03.21.05.08.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 05:08:24 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Rob Herring , Mark Rutland , Russell King , David Lechner , Michael Turquette , Stephen Boyd , Ohad Ben-Cohen , Bjorn Andersson , Philipp Zabel Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-remoteproc@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 1/8] reset: modify the way reset lookup works for board files Date: Wed, 21 Mar 2018 13:08:00 +0100 Message-Id: <20180321120807.18032-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180321120807.18032-1-brgl@bgdev.pl> References: <20180321120807.18032-1-brgl@bgdev.pl> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Commit 7af1bb19f1d7 ("reset: add support for non-DT systems") introduced reset control lookup mechanism for boards that still use board files. The routine used to register lookup entries takes the corresponding reset_controlled_dev structure as argument. It's been determined however that for the first user of this new interface - davinci psc driver - it will be easier to register the lookup entries using the reset controller device name. This patch changes the way lookup entries are added. Signed-off-by: Bartosz Golaszewski --- drivers/reset/core.c | 33 +++++++++++++++++++++++++++++---- include/linux/reset-controller.h | 8 +++++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 06fa4907afc4..f37048e55336 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -153,11 +153,11 @@ EXPORT_SYMBOL_GPL(devm_reset_controller_register); /** * reset_controller_add_lookup - register a set of lookup entries - * @rcdev: initialized reset controller device owning the reset line + * @provider: name of the reset controller provider * @lookup: array of reset lookup entries * @num_entries: number of entries in the lookup array */ -void reset_controller_add_lookup(struct reset_controller_dev *rcdev, +void reset_controller_add_lookup(const char *provider, struct reset_control_lookup *lookup, unsigned int num_entries) { @@ -174,7 +174,7 @@ void reset_controller_add_lookup(struct reset_controller_dev *rcdev, continue; } - entry->rcdev = rcdev; + entry->provider = provider; list_add_tail(&entry->list, &reset_lookup_list); } mutex_unlock(&reset_lookup_mutex); @@ -526,11 +526,30 @@ struct reset_control *__of_reset_control_get(struct device_node *node, } EXPORT_SYMBOL_GPL(__of_reset_control_get); +static struct reset_controller_dev * +__reset_controller_by_name(const char *name) +{ + struct reset_controller_dev *rcdev; + + lockdep_assert_held(&reset_list_mutex); + + list_for_each_entry(rcdev, &reset_controller_list, list) { + if (!rcdev->dev) + continue; + + if (!strcmp(name, dev_name(rcdev->dev))) + return rcdev; + } + + return NULL; +} + static struct reset_control * __reset_control_get_from_lookup(struct device *dev, const char *con_id, bool shared, bool optional) { const struct reset_control_lookup *lookup; + struct reset_controller_dev *rcdev; const char *dev_id = dev_name(dev); struct reset_control *rstc = NULL; @@ -547,7 +566,13 @@ __reset_control_get_from_lookup(struct device *dev, const char *con_id, ((con_id && lookup->con_id) && !strcmp(con_id, lookup->con_id))) { mutex_lock(&reset_list_mutex); - rstc = __reset_control_get_internal(lookup->rcdev, + rcdev = __reset_controller_by_name(lookup->provider); + if (!rcdev) { + mutex_unlock(&reset_list_mutex); + continue; + } + + rstc = __reset_control_get_internal(rcdev, lookup->index, shared); mutex_unlock(&reset_list_mutex); diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h index 25698f6c1fae..1a6c25d825d3 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -30,14 +30,14 @@ struct of_phandle_args; * struct reset_control_lookup - represents a single lookup entry * * @list: internal list of all reset lookup entries - * @rcdev: reset controller device controlling this reset line + * @provider: name of the reset controller device controlling this reset line * @index: ID of the reset controller in the reset controller device * @dev_id: name of the device associated with this reset line * @con_id name of the reset line (can be NULL) */ struct reset_control_lookup { struct list_head list; - struct reset_controller_dev *rcdev; + const char *provider; unsigned int index; const char *dev_id; const char *con_id; @@ -57,6 +57,7 @@ struct reset_control_lookup { * @owner: kernel module of the reset controller driver * @list: internal list of reset controller devices * @reset_control_head: head of internal list of requested reset controls + * @dev: corresponding driver model device struct * @of_node: corresponding device tree node as phandle target * @of_reset_n_cells: number of cells in reset line specifiers * @of_xlate: translation function to translate from specifier as found in the @@ -68,6 +69,7 @@ struct reset_controller_dev { struct module *owner; struct list_head list; struct list_head reset_control_head; + struct device *dev; struct device_node *of_node; int of_reset_n_cells; int (*of_xlate)(struct reset_controller_dev *rcdev, @@ -82,7 +84,7 @@ struct device; int devm_reset_controller_register(struct device *dev, struct reset_controller_dev *rcdev); -void reset_controller_add_lookup(struct reset_controller_dev *rcdev, +void reset_controller_add_lookup(const char *provider, struct reset_control_lookup *lookup, unsigned int num_entries);