From patchwork Mon May 16 02:13:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9097881 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 B4A549F1C3 for ; Mon, 16 May 2016 02:14:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B67B520149 for ; Mon, 16 May 2016 02:14:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CFD47201FE for ; Mon, 16 May 2016 02:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337AbcEPCOM (ORCPT ); Sun, 15 May 2016 22:14:12 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40895 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752615AbcEPCOJ (ORCPT ); Sun, 15 May 2016 22:14:09 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9A586613CE; Mon, 16 May 2016 02:14:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6A0086134F; Mon, 16 May 2016 02:14:06 +0000 (UTC) From: Sinan Kaya To: kvm@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org, jcm@redhat.com, eric.auger@linaro.org Cc: linux-acpi@vger.kernel.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Baptiste Reynal , Alex Williamson , linux-kernel@vger.kernel.org Subject: [PATCH V5 5/6] vfio: platform: call _RST method when using ACPI Date: Sun, 15 May 2016 22:13:38 -0400 Message-Id: <1463364819-477-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1463364819-477-1-git-send-email-okaya@codeaurora.org> References: <1463364819-477-1-git-send-email-okaya@codeaurora.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The device tree code checks for the presence of a reset driver and calls the of_reset function pointer by looking up the reset driver as a module. ACPI defines _RST method to perform device level reset. After the _RST method is executed, the OS can resume using the device. This patch checks the presence of _RST method and calls the _RST method when reset is requested. Signed-off-by: Sinan Kaya --- drivers/vfio/platform/vfio_platform_common.c | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index d859d3b..095d5b7 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -73,21 +73,59 @@ int vfio_platform_acpi_probe(struct vfio_platform_device *vdev, } return 0; } + +static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev) +{ + struct device *dev = vdev->device; + acpi_handle handle = ACPI_HANDLE(dev); + acpi_status acpi_ret; + unsigned long long val; + + acpi_ret = acpi_evaluate_integer(handle, "_RST", NULL, &val); + if (ACPI_FAILURE(acpi_ret)) + return -EINVAL; + + return 0; +} + +static bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev) +{ + struct device *dev = vdev->device; + acpi_handle handle = ACPI_HANDLE(dev); + + return acpi_has_method(handle, "_RST"); +} #else int vfio_platform_acpi_probe(struct vfio_platform_device *vdev, struct device *dev) { return -EINVAL; } + +static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev) +{ + return -EINVAL; +} + +static bool vfio_platform_acpi_has_reset(struct vfio_platform_device *vdev) +{ + return false; +} #endif static bool vfio_platform_has_reset(struct vfio_platform_device *vdev) { + if (vdev->acpihid) + return vfio_platform_acpi_has_reset(vdev); + return vdev->of_reset ? true : false; } static void vfio_platform_get_reset(struct vfio_platform_device *vdev) { + if (vdev->acpihid) + return; + vdev->of_reset = vfio_platform_lookup_reset(vdev->compat, &vdev->reset_module); if (!vdev->of_reset) { @@ -99,6 +137,9 @@ static void vfio_platform_get_reset(struct vfio_platform_device *vdev) static void vfio_platform_put_reset(struct vfio_platform_device *vdev) { + if (vdev->acpihid) + return; + if (vdev->of_reset) module_put(vdev->reset_module); } @@ -177,6 +218,9 @@ static int vfio_platform_call_reset(struct vfio_platform_device *vdev) dev_info(vdev->device, "reset\n"); vdev->of_reset(vdev); return 0; + } else if (vdev->acpihid) { + dev_info(vdev->device, "reset\n"); + return vfio_platform_acpi_call_reset(vdev); } dev_warn(vdev->device, "no reset function found!\n");