From patchwork Fri Mar 23 11:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10304285 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 3EBCB60386 for ; Fri, 23 Mar 2018 11:49:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BC9228A24 for ; Fri, 23 Mar 2018 11:49:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D84128DD4; Fri, 23 Mar 2018 11:49:19 +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 74A8C28A24 for ; Fri, 23 Mar 2018 11:49:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751963AbeCWLtR (ORCPT ); Fri, 23 Mar 2018 07:49:17 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:51005 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754563AbeCWLrQ (ORCPT ); Fri, 23 Mar 2018 07:47:16 -0400 Received: by mail-wm0-f66.google.com with SMTP id i75so3036160wmf.0 for ; Fri, 23 Mar 2018 04:47:15 -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=G76I1TYpHH9xSFI8ivsy2Z0pyiuvQYa8uBsYaKJtc+Q=; b=UN8RebawliBZxryRuICQfDZx7t5HTPzr72ptayrOPymwURfkb4NgdcI8LqdFjmA/Kl O9m6Migr1anSBeKiaojV5ujgHSh1krLCSRCYtpultd9m6z0/CwQJcVJVYMH0aFBVAiS8 FQQ9N/rTOr7K0+udC2EOFNUp+U6bX6Vb6/EzMIfUgS3dQMarR8Wy4MBC7CBGJyYwE0ka oQ9LxFv3X76mVW36TWBJ90fL/DieDPxcxpmwuPPkL+hgTqDAkUdrd5nrcoueDoNgJ0LD 776/2Dv4vJHfKhm/uYyOI78N/z6XboNQljNJmosggYO3hmZpdDuNqac0eWI53PCPpdN/ l7dw== 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=G76I1TYpHH9xSFI8ivsy2Z0pyiuvQYa8uBsYaKJtc+Q=; b=E5cyH/bFBWq1dX+FXIZtnyqUt/0jd6Kj5798Tc7KxEVjlXy2ltaTfmAGZjx3Ao7S+E yiwQFXaeMJtIguaMJaqbPRcRqfL8vgv7p93HGsZZVKfGHWUdogpcJ+F0TfAFtNQ6TfNb KnuwPzM7gmV+CJ3T+3j5SzvA+Mg+JhfQ2CTiVVRUc23XePxtoLCNP2Xaf772IgPuihiQ rd/Fj4d6+j0UTBxwbPd/zfLaPoW0sDoTV5iEM758+BRvflZ2CiIKjcz2dCZ0GORMOe4O kCr+YgutCqOoQ1m3EK+wR6rt+Bgp63OwWQFJnRiziGwcryEtDR9dse1Jbo4M26aJZfMJ AG0Q== X-Gm-Message-State: AElRT7FsCecSPqWSTcLv88hdQoQ9NwfEDyceUEjNJ1Bqsx+0L3iB6PoV aVZRkuQQUg5jPQ6WFQIIEIE3Pg== X-Google-Smtp-Source: AG47ELv2pJaByClODsiVs7TXy0coBXhDuvHkc2AaJFd6Qnetv73SwXcHP5EP4o9Wa9Ol/+B0yFO3fQ== X-Received: by 10.28.48.70 with SMTP id w67mr8126545wmw.47.1521805634819; Fri, 23 Mar 2018 04:47:14 -0700 (PDT) Received: from brgl-bgdev.lan (LFbn-1-7086-217.w90-116.abo.wanadoo.fr. [90.116.254.217]) by smtp.gmail.com with ESMTPSA id m71sm9394843wmd.6.2018.03.23.04.47.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Mar 2018 04:47:14 -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 v3 1/8] reset: modify the way reset lookup works for board files Date: Fri, 23 Mar 2018 12:47:02 +0100 Message-Id: <20180323114709.20330-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180323114709.20330-1-brgl@bgdev.pl> References: <20180323114709.20330-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 | 38 +++++++++++++++++++++++++++++++------- include/linux/reset-controller.h | 12 +++++++----- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 06fa4907afc4..f4a29c046995 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -153,12 +153,10 @@ 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 * @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, - struct reset_control_lookup *lookup, +void reset_controller_add_lookup(struct reset_control_lookup *lookup, unsigned int num_entries) { struct reset_control_lookup *entry; @@ -168,13 +166,12 @@ void reset_controller_add_lookup(struct reset_controller_dev *rcdev, for (i = 0; i < num_entries; i++) { entry = &lookup[i]; - if (!entry->dev_id) { - pr_warn("%s(): reset lookup entry has no dev_id, skipping\n", + if (!entry->dev_id || !entry->provider) { + pr_warn("%s(): reset lookup entry badly specified, skipping\n", __func__); continue; } - entry->rcdev = rcdev; list_add_tail(&entry->list, &reset_lookup_list); } mutex_unlock(&reset_lookup_mutex); @@ -526,11 +523,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 +563,15 @@ __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); + mutex_unlock(&reset_lookup_mutex); + /* Reset provider may not be ready yet. */ + return -EPROBE_DEFER; + } + + 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..c870acaa2e07 100644 --- a/include/linux/reset-controller.h +++ b/include/linux/reset-controller.h @@ -30,21 +30,22 @@ 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; }; -#define RESET_LOOKUP(_dev_id, _con_id, _index) \ +#define RESET_LOOKUP(_provider, _dev_id, _con_id, _index) \ { \ + .provider = _provider, \ .dev_id = _dev_id, \ .con_id = _con_id, \ .index = _index, \ @@ -57,6 +58,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 +70,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,8 +85,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, - struct reset_control_lookup *lookup, +void reset_controller_add_lookup(struct reset_control_lookup *lookup, unsigned int num_entries); #endif