From patchwork Fri Oct 23 15:47:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 55495 Delivered-To: patches@linaro.org Received: by 10.55.75.214 with SMTP id y205csp1169907qka; Fri, 23 Oct 2015 08:48:32 -0700 (PDT) X-Received: by 10.180.91.198 with SMTP id cg6mr5417064wib.78.1445615256011; Fri, 23 Oct 2015 08:47:36 -0700 (PDT) Return-Path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com. [209.85.212.176]) by mx.google.com with ESMTPS id y6si5776808wiv.50.2015.10.23.08.47.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2015 08:47:35 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.176 as permitted sender) smtp.mailfrom=eric.auger@linaro.org Received: by wicll6 with SMTP id ll6so37339875wic.1 for ; Fri, 23 Oct 2015 08:47:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qksOVYCR28QBfhJ5zswgae4Is0Zg9rRRQ7RRrNHjj+Q=; b=HZ6rDuFZaKVwAThcat04yZ2ZEyUPUo9KUBZ6Ug/vBhzpCHUzeOc104QldlsROqryhL snrTDyuGHE720RQfdgUwawWwXDNR/SEO2oTgESYoFY5ikPM7F66XpX41sgnBKYlWO1XE e3z6HrUbpWAG9DhKTqoNUFzbocEB9R+pXetM4U5u9iLPErq9tIBC3I6JCvRdfCuc80cb JpxOcXNXvDLnF/P2Lxab6v583sxx2mkBb2eIjt9KsHmNDh3rAoCncWLoiQNeB+Z9hX0b sRoHVv/U5taf9PjFUIoST7GllVTFWiS24/h0xGzFs3vruUoJhNZbdWigHqCIHCG88XFH ovtQ== X-Gm-Message-State: ALoCoQk4ijVpt4b8AMroUJd0XsH5H3Jjf3JycsvcodO/4pupvHiFhlkEcfojNW8qEB8t8DIhvhwn X-Received: by 10.180.211.35 with SMTP id mz3mr5126314wic.93.1445615255780; Fri, 23 Oct 2015 08:47:35 -0700 (PDT) Return-Path: Received: from gnx2579.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id i3sm3388471wij.9.2015.10.23.08.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2015 08:47:34 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: christoffer.dall@linaro.org, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v4 2/7] vfio: platform: add capability to register a reset function Date: Fri, 23 Oct 2015 17:47:20 +0200 Message-Id: <1445615245-31124-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445615245-31124-1-git-send-email-eric.auger@linaro.org> References: <1445615245-31124-1-git-send-email-eric.auger@linaro.org> In preparation for subsequent changes in reset function lookup, lets introduce a dynamic list of reset combos (compat string, reset module, reset function). The list can be populated/voided with vfio_platform_register/unregister_reset. Those are not yet used in this patch. Signed-off-by: Eric Auger --- v3 -> v4: - __vfio_platform_register_reset does not return any value anymore - vfio_platform_unregister_reset also takes the reset function pointer as parameter v2 -> v3: - use goto out to have a single mutex_unlock - implement vfio_platform_register_reset as a macro (suggested by Arnd) - move reset_node struct declaration back to vfio_platform_private.h - vfio_platform_unregister_reset does not return any value anymore v1 -> v2: - reset_list becomes static - vfio_platform_register/unregister_reset take a const char * as compat - fix node leak - add reset_lock to protect the reset list manipulation - move vfio_platform_reset_node declaration in vfio_platform_common.c --- drivers/vfio/platform/vfio_platform_common.c | 27 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 20 ++++++++++++++++++++ 2 files changed, 47 insertions(+) -- 1.9.1 diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 184e9d2..3b7e52c 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -27,6 +27,7 @@ #define DRIVER_AUTHOR "Antonios Motakis " #define DRIVER_DESC "VFIO platform base module" +static LIST_HEAD(reset_list); static DEFINE_MUTEX(driver_lock); static const struct vfio_platform_reset_combo reset_lookup_table[] = { @@ -578,6 +579,32 @@ struct vfio_platform_device *vfio_platform_remove_common(struct device *dev) } EXPORT_SYMBOL_GPL(vfio_platform_remove_common); +void __vfio_platform_register_reset(struct vfio_platform_reset_node *node) +{ + mutex_lock(&driver_lock); + list_add(&node->link, &reset_list); + mutex_unlock(&driver_lock); +} +EXPORT_SYMBOL_GPL(__vfio_platform_register_reset); + +void vfio_platform_unregister_reset(const char *compat, + vfio_platform_reset_fn_t fn) +{ + struct vfio_platform_reset_node *iter, *temp; + + mutex_lock(&driver_lock); + list_for_each_entry_safe(iter, temp, &reset_list, link) { + if (!strcmp(iter->compat, compat) && (iter->reset == fn)) { + list_del(&iter->link); + break; + } + } + + mutex_unlock(&driver_lock); + +} +EXPORT_SYMBOL_GPL(vfio_platform_unregister_reset); + MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR(DRIVER_AUTHOR); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 7128690..c563940 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -71,6 +71,15 @@ struct vfio_platform_device { int (*reset)(struct vfio_platform_device *vdev); }; +typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev); + +struct vfio_platform_reset_node { + struct list_head link; + char *compat; + struct module *owner; + vfio_platform_reset_fn_t reset; +}; + struct vfio_platform_reset_combo { const char *compat; const char *reset_function_name; @@ -90,4 +99,15 @@ extern int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev, unsigned start, unsigned count, void *data); +extern void __vfio_platform_register_reset(struct vfio_platform_reset_node *n); +extern void vfio_platform_unregister_reset(const char *compat, + vfio_platform_reset_fn_t fn); +#define vfio_platform_register_reset(__compat, __reset) \ +static struct vfio_platform_reset_node __reset ## _node = { \ + .owner = THIS_MODULE, \ + .compat = __compat, \ + .reset = __reset, \ +}; \ +__vfio_platform_register_reset(&__reset ## _node) + #endif /* VFIO_PLATFORM_PRIVATE_H */