From patchwork Wed Sep 5 09:57:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10588711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE15813BB for ; Wed, 5 Sep 2018 10:05:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3022299A3 for ; Wed, 5 Sep 2018 10:05:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A320E299CA; Wed, 5 Sep 2018 10:05:35 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2F5E299A3 for ; Wed, 5 Sep 2018 10:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ocnRbA2bf/cZl5e9qUZNp7eU2Dsk1kGIbD5XBPtpmPc=; b=Y59mR592JX2yAzqA6Z5ShXod1e VPbCBDI348iT+/SxSMXtXFSNYd1UffcgHQ3HcGoXv3rbdDIuYep27qAGXMhSHMV00qnOCJpc27wpJ QCf9zu0AUsZA4L4uX/UJnQrj45LoeA83zHc0Nzz3jvXfGuGOYSFRjj2fIQa+qNUSozsVjDZ0DWDo3 YbXS97gdFUy6aLBJ3ELHoZcOQ0ZElvD7CaZ4aknyYoS4M03Rm6bFNLB7Q5J3+47O36BlsSFh3KnvJ sbkP+5+tzX2z3qBkX3JksW7+EZm2ORu1Va8QEsaczKA0R762tyZYgZXwUwFsjzDLfZdLedGziT54M TOzbt1FQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxUgh-0000Cd-GQ; Wed, 05 Sep 2018 10:05:27 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxUZv-0003Ud-Ag for linux-arm-kernel@lists.infradead.org; Wed, 05 Sep 2018 09:58:29 +0000 Received: by mail-wm0-x244.google.com with SMTP id y139-v6so7259429wmc.2 for ; Wed, 05 Sep 2018 02:58:16 -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=fMftZWrQBIalsIbPmpTJQIjNIX58zZmJ2I3AfPo/uy8=; b=OX/FY9L7q4y5aFzrt9Y8LRlw6xAbQqeoVameJhBUtC31erQvFyDq3NlJOqnVB+wAVe WORCHJ7nqIAJ81IqqTQnkUz3xvhXkyKEW7UM9Lny8XArpCQnb9CodjAarU0hWxxq4FLa +EDDp5gS9AJpcp526MfR5K4Lkpv79MtEEB3+0BrM9MixHeWNp5iQGaePPQgtMnRS0ata 7vmeoOlaQtWPcIJw1GlyJEVbF72EShPoUb6ipojpWEae3POH8QE2ov3xVb21F7+i4k46 W6pWVSfTlBRawax2hIBVcIXxxKa/Cxzo82ZTY+ADjIajBIATc6La8OhPnmna0X1TFhDC aqCw== 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=fMftZWrQBIalsIbPmpTJQIjNIX58zZmJ2I3AfPo/uy8=; b=TIAUpwARA2wayC22yuHsjfCFGeejJu8T3B8jJbUsmXL67LhcqGbffufXjpuIXvDxj9 kFoSz66TQEzWa14YgFDFXm74ytr/x6T1Hxs9pfDTeTfhw8RXXjiMzub3DEJOfe/DnZ0S dOob1s2gFm6V0SNq0V3+nRkAmr4HGOr3GbUGu6A9xdG5F/RAsL9bKU+5RO6OgUwzbmme kwEE3Hf4orSttBLZn5i4L/WOvVuuQj7LgbDj49kCif+JpZt3nc1WQo11rlYp4ODuy8UM 3f+bpTuAS4s/ZbjD7qYQ/pErKxLbLEgDXH8Aa7mtxeCK/O1ae7YmZf2ukqwQEaByHtYK 6y4w== X-Gm-Message-State: APzg51CFNm34TTIC8eJak9bnbTy28g1TwxGmEDyltgWRzQN9uWC8gmoV zfLKP9iqXkyHd0jd3yedmnl7Hg== X-Google-Smtp-Source: ANB0VdansAl2rjNg46PcnkRbhtChF/wJ1E4wXg7jxbvK1WbqZSMtqGtVUqafwi6tBiLbA/wS+bFKmQ== X-Received: by 2002:a1c:6386:: with SMTP id x128-v6mr11055581wmb.104.1536141495459; Wed, 05 Sep 2018 02:58:15 -0700 (PDT) Received: from brgl-bgdev.baylibre.local (AStLambert-681-1-33-235.w90-86.abo.wanadoo.fr. [90.86.152.235]) by smtp.gmail.com with ESMTPSA id l12-v6sm2127815wrv.29.2018.09.05.02.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 02:58:14 -0700 (PDT) From: Bartosz Golaszewski To: Srinivas Kandagatla , Joachim Eastwood , "David S . Miller" , Mauro Carvalho Chehab , Greg Kroah-Hartman , Andrew Morton , Arnd Bergmann , Jonathan Corbet , Sekhar Nori , Kevin Hilman , David Lechner , Boris Brezillon , Andrew Lunn , Alban Bedel , Maxime Ripard Subject: [PATCH 09/13] nvmem: add support for cell info Date: Wed, 5 Sep 2018 11:57:34 +0200 Message-Id: <20180905095738.26406-10-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180905095738.26406-1-brgl@bgdev.pl> References: <20180905095738.26406-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180905_025827_470701_1EEDA776 X-CRM114-Status: GOOD ( 23.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bartosz Golaszewski Add new structs and routines allowing users to define nvmem cells from machine code. This global list of entries is parsed when a provider is registered and cells are associated with the relevant nvmem_device struct. A possible improvement for the future is to allow users to register cell tables after the nvmem provider has been registered by updating the cell list at each call to nvmem_(add|del)_cell_table(). Signed-off-by: Bartosz Golaszewski --- MAINTAINERS | 1 + drivers/nvmem/core.c | 97 ++++++++++++++++++++++++++++++++++- include/linux/nvmem-machine.h | 41 +++++++++++++++ 3 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 include/linux/nvmem-machine.h diff --git a/MAINTAINERS b/MAINTAINERS index 9ad052aeac39..a520924bf0a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10391,6 +10391,7 @@ F: drivers/nvmem/ F: Documentation/devicetree/bindings/nvmem/ F: Documentation/ABI/stable/sysfs-bus-nvmem F: include/linux/nvmem-consumer.h +F: include/linux/nvmem-machine.h F: include/linux/nvmem-provider.h NXP SGTL5000 DRIVER diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 17307015905a..854baa0559a1 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,9 @@ struct nvmem_cell { static DEFINE_MUTEX(nvmem_mutex); static DEFINE_IDA(nvmem_ida); +static DEFINE_MUTEX(nvmem_cell_mutex); +static LIST_HEAD(nvmem_cell_tables); + static BLOCKING_NOTIFIER_HEAD(nvmem_notifier); #ifdef CONFIG_DEBUG_LOCK_ALLOC @@ -341,6 +345,66 @@ static int nvmem_setup_compat(struct nvmem_device *nvmem, return 0; } +static struct nvmem_cell * +nvmem_cell_from_cell_info(struct nvmem_device *nvmem, + struct nvmem_cell_info *info) +{ + struct nvmem_cell *cell; + + cell = kzalloc(sizeof(*cell), GFP_KERNEL); + if (!cell) + return ERR_PTR(-ENOMEM); + + cell->nvmem = nvmem; + cell->offset = info->offset; + cell->bytes = info->bytes; + cell->name = info->name; + cell->bit_offset = info->bit_offset; + cell->nbits = info->nbits; + + if (cell->nbits) + cell->bytes = DIV_ROUND_UP(cell->nbits + cell->bit_offset, + BITS_PER_BYTE); + + if (!IS_ALIGNED(cell->offset, nvmem->stride)) { + dev_err(&nvmem->dev, + "cell %s unaligned to nvmem stride %d\n", + cell->name, nvmem->stride); + kfree(cell); + return ERR_PTR(-EINVAL); + } + + return cell; +} + +static int nvmem_add_cells_from_list(struct nvmem_device *nvmem) +{ + struct nvmem_cell_table *table; + struct nvmem_cell_info *info; + struct nvmem_cell *cell; + int rval = 0, i; + + mutex_lock(&nvmem_cell_mutex); + list_for_each_entry(table, &nvmem_cell_tables, node) { + if (strcmp(nvmem_dev_name(nvmem), table->nvmem_name) == 0) { + for (i = 0; i < table->ncells; i++) { + info = &table->cells[i]; + cell = nvmem_cell_from_cell_info(nvmem, info); + if (IS_ERR(cell)) { + rval = PTR_ERR(cell); + goto out; + } + + nvmem_cell_add(cell); + } + } + } + +out: + mutex_unlock(&nvmem_cell_mutex); + return rval; +} + /** * nvmem_register_notifier() - Register a notifier block for nvmem events. * @@ -447,13 +511,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) } INIT_LIST_HEAD(&nvmem->cells); + rval = nvmem_add_cells_from_list(nvmem); + if (rval) + goto err_teardown_compat; rval = blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); if (rval) - goto err_teardown_compat; + goto err_remove_cells; return nvmem; +err_remove_cells: + nvmem_device_remove_all_cells(nvmem); err_teardown_compat: if (config->compat) device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); @@ -1179,6 +1248,32 @@ int nvmem_device_write(struct nvmem_device *nvmem, } EXPORT_SYMBOL_GPL(nvmem_device_write); +/** + * nvmem_add_cell_table() - register a table of cell info entries + * + * @table: table of cell info entries + */ +void nvmem_add_cell_table(struct nvmem_cell_table *table) +{ + mutex_lock(&nvmem_cell_mutex); + list_add_tail(&table->node, &nvmem_cell_tables); + mutex_unlock(&nvmem_cell_mutex); +} +EXPORT_SYMBOL_GPL(nvmem_add_cell_table); + +/** + * nvmem_del_cell_table() - remove a previously registered cell info table + * + * @table: table of cell info entries + */ +void nvmem_del_cell_table(struct nvmem_cell_table *table) +{ + mutex_lock(&nvmem_cell_mutex); + list_del(&table->node); + mutex_unlock(&nvmem_cell_mutex); +} +EXPORT_SYMBOL_GPL(nvmem_del_cell_table); + /** * nvmem_dev_name() - Get the name of a given nvmem device. * diff --git a/include/linux/nvmem-machine.h b/include/linux/nvmem-machine.h new file mode 100644 index 000000000000..1e199dfaacab --- /dev/null +++ b/include/linux/nvmem-machine.h @@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * nvmem framework machine code bindings + * + * Copyright (C) 2018 Bartosz Golaszewski + */ + +#ifndef _LINUX_NVMEM_MACHINE_H +#define _LINUX_NVMEM_MACHINE_H + +#include +#include + +struct nvmem_cell_info { + const char *name; + unsigned int offset; + unsigned int bytes; + unsigned int bit_offset; + unsigned int nbits; +}; + +struct nvmem_cell_table { + const char *nvmem_name; + struct nvmem_cell_info *cells; + size_t ncells; + struct list_head node; +}; + +#if IS_ENABLED(CONFIG_NVMEM) + +void nvmem_add_cell_table(struct nvmem_cell_table *table); +void nvmem_del_cell_table(struct nvmem_cell_table *table); + +#else /* CONFIG_NVMEM */ + +static inline void nvmem_add_cell_table(struct nvmem_cell_table *table) {} +static inline void nvmem_del_cell_table(struct nvmem_cell_table *table) {} + +#endif /* CONFIG_NVMEM */ + +#endif /* ifndef _LINUX_NVMEM_MACHINE_H */