From patchwork Tue Nov 3 18:12:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 55947 Delivered-To: patches@linaro.org Received: by 10.112.61.134 with SMTP id p6csp1979503lbr; Tue, 3 Nov 2015 10:12:30 -0800 (PST) X-Received: by 10.28.12.78 with SMTP id 75mr19961742wmm.85.1446574348940; Tue, 03 Nov 2015 10:12:28 -0800 (PST) Return-Path: Received: from mail-wi0-x22a.google.com (mail-wi0-x22a.google.com. [2a00:1450:400c:c05::22a]) by mx.google.com with ESMTPS id bn4si34608121wjb.162.2015.11.03.10.12.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 10:12:28 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c05::22a as permitted sender) client-ip=2a00:1450:400c:c05::22a; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c05::22a as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro_org.20150623.gappssmtp.com Received: by wicfv8 with SMTP id fv8so17268413wic.0 for ; Tue, 03 Nov 2015 10:12:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ojzPD9+bt+lO7csiNzSQOYB7fIdJeO8dYnejSJ/Ly8Q=; b=q5k1qtnCD20mgYR+CQ3LdB2KC8ZfqxsSIbuGFcDbRq0IGOANlv31rodCM2TI6qG02U g0lUj7yn/8iGGuTuw3wUJuNAOx029qTp+vgprv9tU0l4O6lqTKwVkiaFMgFT+6r08tn/ QXya4fzp3XacEQJFPmKBe6oXEisksSACiNweUyulEguCHCgAt5yPC4+CsSQ1q5s9F4lx UYnh0RW886etuwIO61N0oWrIKGm/ArwXiQXJoZ1TJ+BesaadhdjE+Ly+dDDaF0Nuxujf 4Zftcl9Co5cgKN7zLeUq89EsJUCIkjGgB//7JjlIkIEFPOHuI/NOqm9P/Fl7N4Nqpttd g8qQ== 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=ojzPD9+bt+lO7csiNzSQOYB7fIdJeO8dYnejSJ/Ly8Q=; b=CI6sz7t3gnJnvWO0HgS7WxdwLlAS1W5zSA1yJMSbg2FGNMEgvmf4AJJPzUkJ0PdNwI RT87xYCOLhboSu+CxVPuJd9JqJGvJohMI+O+3kDHczNxLeVS3YNLliZxbgRwqN0ZUpHv oSr4vu+UDLnmN/rcHVtM5CdAyDphRio1FRkYg/0cUELPhi1f2TKeT+0hNasn76BTsC1B 7/7kyt4/CMiZ3lMXBRG3DLyXqp25tdVuYFw2i0H4WHXRY33yHNYlRHHPDwiLs8MURStX Ayavl8lXtUxPFGzMBznGTefbSEGhmv+WI/g8lXipd9E9eMCDiRftf0PCdNHmsBR3MrSC R8HA== X-Gm-Message-State: ALoCoQm6neGbzflWIgk5KJl2MNEcxbHj8JCCU2TkSfELTAABuejlHZfIM8xijK1eFCVA2aYMKJ4D X-Received: by 10.194.2.169 with SMTP id 9mr20007251wjv.78.1446574348742; Tue, 03 Nov 2015 10:12:28 -0800 (PST) Return-Path: Received: from new-host-3.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id om1sm28830527wjc.2.2015.11.03.10.12.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Nov 2015 10:12:27 -0800 (PST) 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 v6 2/8] vfio: platform: add capability to register a reset function Date: Tue, 3 Nov 2015 18:12:13 +0000 Message-Id: <1446574339-1843-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446574339-1843-1-git-send-email-eric.auger@linaro.org> References: <1446574339-1843-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 Reviewed-by: Arnd Bergmann --- v4 -> v5: - add Arnd's R-b 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 */