From patchwork Thu May 7 14:27:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6358831 Return-Path: X-Original-To: patchwork-linux-arm@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 7F6BB9F1C2 for ; Thu, 7 May 2015 14:34:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC8EE20221 for ; Thu, 7 May 2015 14:34:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 106A82021F for ; Thu, 7 May 2015 14:34:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YqMpU-0004K1-Cq; Thu, 07 May 2015 14:31:12 +0000 Received: from mail-wg0-f47.google.com ([74.125.82.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YqMoy-00040f-IP for linux-arm-kernel@lists.infradead.org; Thu, 07 May 2015 14:30:41 +0000 Received: by wgic8 with SMTP id c8so18940429wgi.1 for ; Thu, 07 May 2015 07:30:18 -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=3Gq/jVuR0EcSDVqAeOjjewDC96u66pgUdVJAGxkPzVk=; b=UGAAUTdscrpAqTO70EpB4OamCucow2TehK12iSJHEEfPtlCtwQ2QfoskOgpcyrdraI t3i8mBjeYEiN7l8WRb+f7wztHK+zz1jWQIQsKsNDv4Z3knMQSmZ1+hDXUChqG7kAKJOe v2/wByb+AEQYZRW2aTpIN2SFLqCj4szmG6IeCvAibyZMA3efEdi8mTzXfcMfi8lDEPSh m9sg/mC+BckxLVCHebOi3auKdEriNwy5zJj6QXtU39Q4ac8Kq1EbFECpPiyzCBAg/n2g H+S41lGOA+CBoiUUZgOD/zD8+QilhJdDTUNqCLN2Ez6OKo4EFxBuE3CF2Cu1Srh/xRFg OtKQ== X-Gm-Message-State: ALoCoQlVH9UCsTUNPThA+uPMnrFnyU78tK3sSgZtzvqW6w/UWUjkrhbDXSXX5Rg075ej5Ky5CbSH X-Received: by 10.194.61.82 with SMTP id n18mr7705964wjr.35.1431009018243; Thu, 07 May 2015 07:30:18 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id z12sm3704874wjw.39.2015.05.07.07.30.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 May 2015 07:30:17 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com Subject: [PATCH 2/5] VFIO: platform: add get_device callback Date: Thu, 7 May 2015 16:27:20 +0200 Message-Id: <1431008843-28411-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> References: <1431008843-28411-1-git-send-email-eric.auger@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150507_073040_852984_7FFC2B9D X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: -0.7 (/) Cc: Bharat.Bhushan@freescale.com, agraf@suse.de, linux-kernel@vger.kernel.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 It is needed to introduce a new callback enabling to retrieve the struct device* from the vfio_platform_device. Implementation depends on the underlying device, platform or amba. This will be used to retrieve the compatibility string of the device. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_amba.c | 9 +++++++++ drivers/vfio/platform/vfio_platform.c | 10 ++++++++++ drivers/vfio/platform/vfio_platform_private.h | 1 + 3 files changed, 20 insertions(+) diff --git a/drivers/vfio/platform/vfio_amba.c b/drivers/vfio/platform/vfio_amba.c index ff0331f..fd68115 100644 --- a/drivers/vfio/platform/vfio_amba.c +++ b/drivers/vfio/platform/vfio_amba.c @@ -48,6 +48,14 @@ static int get_amba_irq(struct vfio_platform_device *vdev, int i) return ret ? ret : -ENXIO; } +static struct device *vfio_amba_get_device(struct vfio_platform_device *vdev) +{ + struct amba_device *pdev = (struct amba_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) { struct vfio_platform_device *vdev; @@ -67,6 +75,7 @@ static int vfio_amba_probe(struct amba_device *adev, const struct amba_id *id) vdev->flags = VFIO_DEVICE_FLAGS_AMBA; vdev->get_resource = get_amba_resource; vdev->get_irq = get_amba_irq; + vdev->get_device = vfio_amba_get_device; ret = vfio_platform_probe_common(vdev, &adev->dev); if (ret) { diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c index cef645c..c025d76 100644 --- a/drivers/vfio/platform/vfio_platform.c +++ b/drivers/vfio/platform/vfio_platform.c @@ -51,6 +51,15 @@ static int get_platform_irq(struct vfio_platform_device *vdev, int i) return platform_get_irq(pdev, i); } +static struct device *vfio_platform_get_device( + struct vfio_platform_device *vdev) +{ + struct platform_device *pdev = (struct platform_device *) vdev->opaque; + struct device *dev = &pdev->dev; + + return dev; +} + static int vfio_platform_probe(struct platform_device *pdev) { struct vfio_platform_device *vdev; @@ -65,6 +74,7 @@ static int vfio_platform_probe(struct platform_device *pdev) vdev->flags = VFIO_DEVICE_FLAGS_PLATFORM; vdev->get_resource = get_platform_resource; vdev->get_irq = get_platform_irq; + vdev->get_device = vfio_platform_get_device; ret = vfio_platform_probe_common(vdev, &pdev->dev); if (ret) diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index da2d60b..68909a4 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -67,6 +67,7 @@ struct vfio_platform_device { struct resource* (*get_resource)(struct vfio_platform_device *vdev, int i); int (*get_irq)(struct vfio_platform_device *vdev, int i); + struct device *(*get_device)(struct vfio_platform_device *vdev); }; typedef int (*vfio_platform_reset_fn_t)(struct vfio_platform_device *vdev);