From patchwork Wed Mar 2 22:50:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 8485701 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C13BC0554 for ; Wed, 2 Mar 2016 21:58:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34C772022A for ; Wed, 2 Mar 2016 21:58:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2822220373 for ; Wed, 2 Mar 2016 21:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932519AbcCBV6V (ORCPT ); Wed, 2 Mar 2016 16:58:21 -0500 Received: from g4t3426.houston.hp.com ([15.201.208.54]:42587 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932517AbcCBV6V (ORCPT ); Wed, 2 Mar 2016 16:58:21 -0500 Received: from g9t2301.houston.hp.com (g9t2301.houston.hp.com [16.216.185.78]) by g4t3426.houston.hp.com (Postfix) with ESMTP id 40E274A; Wed, 2 Mar 2016 21:58:20 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g9t2301.houston.hp.com (Postfix) with ESMTP id 8AB5D63; Wed, 2 Mar 2016 21:58:19 +0000 (UTC) From: Toshi Kani To: mingo@kernel.org, bp@suse.de, dan.j.williams@intel.com, rjw@rjwysocki.net, akpm@linux-foundation.org Cc: linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Toshi Kani Subject: [PATCH v2 3/4] resource: Add device-managed insert/remove_resource() Date: Wed, 2 Mar 2016 15:50:55 -0700 Message-Id: <1456959056-12316-4-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456959056-12316-1-git-send-email-toshi.kani@hpe.com> References: <1456959056-12316-1-git-send-email-toshi.kani@hpe.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP insert_resource() and remove_resouce() are called by producers of resources, such as FW modules and bus drivers. These modules may be implemented as loadable modules. Add device-managed implementaions of insert_resource() and remove_resouce() functions. Signed-off-by: Toshi Kani Cc: Ingo Molnar Cc: Borislav Petkov Cc: Andrew Morton Cc: Dan Williams --- include/linux/ioport.h | 5 +++ kernel/resource.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 8017b8b..3580038 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -259,6 +259,11 @@ extern struct resource * __devm_request_region(struct device *dev, extern void __devm_release_region(struct device *dev, struct resource *parent, resource_size_t start, resource_size_t n); + +extern int devm_insert_resource(struct device *dev, struct resource *root, + struct resource *new); +extern void devm_remove_resource(struct device *dev, struct resource *old); + extern int iomem_map_sanity_check(resource_size_t addr, unsigned long size); extern int iomem_is_exclusive(u64 addr); diff --git a/kernel/resource.c b/kernel/resource.c index effb6ee..b1a3394 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1449,6 +1449,75 @@ void __devm_release_region(struct device *dev, struct resource *parent, EXPORT_SYMBOL(__devm_release_region); /* + * Remove function for devm_insert_resource() and devm_remove_resource(). + */ +static void devm_resource_remove(struct device *dev, void *ptr) +{ + struct resource **r = ptr; + + remove_resource(*r); +} + +/** + * devm_insert_resource() - insert an I/O or memory resource + * @dev: device for which to produce the resource + * @root: root of the resource tree + * @new: descriptor of the new resource + * + * This is a device-managed version of insert_resource(). There is usually + * no need to release resources requested by this function explicitly since + * that will be taken care of when the device is unbound from its bus driver. + * If for some reason the resource needs to be released explicitly, because + * of ordering issues for example, bus drivers must call devm_remove_resource() + * rather than the regular remove_resource(). + * + * devm_insert_resource() is intended for producers of resources, such as + * FW modules and bus drivers. + * + * Returns 0 on success or a negative error code on failure. + */ +int devm_insert_resource(struct device *dev, struct resource *root, + struct resource *new) +{ + struct resource **ptr; + int ret; + + ptr = devres_alloc(devm_resource_remove, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + *ptr = new; + + ret = insert_resource(root, new); + if (ret) { + dev_err(dev, "unable to insert resource: %pR (%d)\n", new, ret); + devres_free(ptr); + return -EBUSY; + } + + devres_add(dev, ptr); + return 0; +} +EXPORT_SYMBOL_GPL(devm_insert_resource); + +/** + * devm_remove_resource() - remove a previously inserted resource + * @dev: device for which to remove the resource + * @old: descriptor of the resource + * + * Remove a resource previously inserted using devm_insert_resource(). + * + * devm_remove_resource() is intended for producers of resources, such as + * FW modules and bus drivers. + */ +void devm_remove_resource(struct device *dev, struct resource *old) +{ + WARN_ON(devres_release(dev, devm_resource_remove, devm_resource_match, + old)); +} +EXPORT_SYMBOL_GPL(devm_remove_resource); + +/* * Called from init/main.c to reserve IO ports. */ #define MAXRESERVE 4