From patchwork Tue Nov 3 18:12:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 7546161 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 92F599F2F7 for ; Tue, 3 Nov 2015 18:14:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6C8B20717 for ; Tue, 3 Nov 2015 18:14:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B222E204D6 for ; Tue, 3 Nov 2015 18:14:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755820AbbKCSOM (ORCPT ); Tue, 3 Nov 2015 13:14:12 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:37149 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755817AbbKCSMe (ORCPT ); Tue, 3 Nov 2015 13:12:34 -0500 Received: by wicfv8 with SMTP id fv8so17269600wic.0 for ; Tue, 03 Nov 2015 10:12:33 -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=NH6A1ghj1g05g5CwpfKe1ICLYf2OjeUugPiL71Gv/Uc=; b=AXPTJYhpU6umQ9uFu2QemzilfODabun75Nqs1iwznzjWfzKzaPMQYvSRKfU3eXOm7l Qf7QYgdjjSHhHdNjj7BmIvMPvgcAzJlP+ZEzTQtaR5oeYSF4+6FnnH19eMV0yVpuBzZi /e2mFbHGI6IURGunTGFi06C8xIU3ShUMnfuPUpgmbIqfuzxkcHGbEWAOrwzPsxX8ucBT ZnwoaJDKVcBMKiyGuTDnoSAi3j9sKHPYQ6mVByPNMIFFBOEPUcJbGY2jsZysBmkU+6Ks /lEloTxi5yo2xvq1AdiK4C+lDr7taqdtAqRWIOzCR3fp2+YTNIP3ksujzRRCS+EvQpED UH/w== 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=NH6A1ghj1g05g5CwpfKe1ICLYf2OjeUugPiL71Gv/Uc=; b=dHQGGIpcIskqn4LRx+91wA8zsmDjRAD1M5j/nzMsnJDr4GiCqQHp5ahfFps8NJIaUx oNmATBxOVnnEyAERTeOFH2Y9t1/bgg/BKY/OJjb26V44AIRaQ6Eh5KL0Put4E9FC+xiS Qi0Vfen2FGEl5MlnHKmDGWymas/zKFjAhx+cCBj05g2FnJBhNnLgezKomwa0YpbjeSSr RYhLt9/7CEP/v2bePeVdTXedogJ+Ow3rtMNy+78+8Jr+0V8EsNqV71ZfQvgJcSfPcUYz tduWFZM775f6h+0b7CTiMuV4v6oKDcEBnTcTKpLFsIp9gsT4yHao87N+Tg/iBQNynfA/ HHzg== X-Gm-Message-State: ALoCoQmKXP+8VYly346SeyYSZhDf9Hy+1lxIv6wkPNOFXW82uzQfbD9rlXwkNwptRMujzXUVBe7e X-Received: by 10.194.84.4 with SMTP id u4mr30898577wjy.149.1446574353202; Tue, 03 Nov 2015 10:12:33 -0800 (PST) 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.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Nov 2015 10:12:32 -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 5/8] vfio: platform: add compat in vfio_platform_device Date: Tue, 3 Nov 2015 18:12:16 +0000 Message-Id: <1446574339-1843-6-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> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Let's retrieve the compatibility string on probe and store it in the vfio_platform_device struct Signed-off-by: Eric Auger --- v2 -> v3: - populate compat after vdev check --- drivers/vfio/platform/vfio_platform_common.c | 15 ++++++++------- drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 3b7e52c..f2d41a0 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -41,16 +41,11 @@ static const struct vfio_platform_reset_combo reset_lookup_table[] = { static void vfio_platform_get_reset(struct vfio_platform_device *vdev, struct device *dev) { - const char *compat; int (*reset)(struct vfio_platform_device *); - int ret, i; - - ret = device_property_read_string(dev, "compatible", &compat); - if (ret) - return; + int i; for (i = 0 ; i < ARRAY_SIZE(reset_lookup_table); i++) { - if (!strcmp(reset_lookup_table[i].compat, compat)) { + if (!strcmp(reset_lookup_table[i].compat, vdev->compat)) { request_module(reset_lookup_table[i].module_name); reset = __symbol_get( reset_lookup_table[i].reset_function_name); @@ -544,6 +539,12 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, if (!vdev) return -EINVAL; + ret = device_property_read_string(dev, "compatible", &vdev->compat); + if (ret) { + pr_err("VFIO: cannot retrieve compat for %s\n", vdev->name); + return -EINVAL; + } + group = iommu_group_get(dev); if (!group) { pr_err("VFIO: No IOMMU group for device %s\n", vdev->name); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index fd262be..415310f 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -57,6 +57,7 @@ struct vfio_platform_device { int refcnt; struct mutex igate; struct module *parent_module; + const char *compat; /* * These fields should be filled by the bus specific binder