From patchwork Thu Feb 12 11:19:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 44628 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 88C312151D for ; Thu, 12 Feb 2015 11:21:49 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf1684889wiw.0 for ; Thu, 12 Feb 2015 03:21:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=z6u7Wru2w0VhydBx6wvYq1gwFb0BxdASNypMYTm88DY=; b=RTcTYXGWGemH803GbwYKYowPylglo6reHosjpWk5TpDSAiFgQnPpVCW87GDvSrhUDe Ija8bjETYPny6aGq1Nl644FMbAFsK8IP/+0t6wMjsxmBCnFFMewpHtFaCdZ1651TuzM/ P3lI5TbWL8IPdLwNcy2bGCm4V9P1Gcz5GlyS07oZ26JvinUtME3Ubedrfo0T33jvzNhy mxHVsTsJ2g29taC+G/f/nyI3ah1p5QyUA/sb8/U4LU1R3ag28/7cvD6JaY938i1NwvIb svOZbAs0gU2g0LPVlCU5oPJxKQRp7Ooies88d54gP6Bzr2KsBf+68uCFnQzUgR7Umcrw gzFQ== X-Gm-Message-State: ALoCoQlEC01Ku3stMWlpP17osShGNjO0Woluw/3I32EWDu8InF1FLE/Z6caijclckBE6jXBYi0KD X-Received: by 10.180.81.34 with SMTP id w2mr405041wix.2.1423740108802; Thu, 12 Feb 2015 03:21:48 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.162 with SMTP id f2ls182467lam.5.gmail; Thu, 12 Feb 2015 03:21:48 -0800 (PST) X-Received: by 10.112.110.103 with SMTP id hz7mr2858031lbb.62.1423740108477; Thu, 12 Feb 2015 03:21:48 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id ln3si2636514lac.168.2015.02.12.03.21.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Feb 2015 03:21:48 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id z11so8884000lbi.5 for ; Thu, 12 Feb 2015 03:21:48 -0800 (PST) X-Received: by 10.112.167.36 with SMTP id zl4mr2955581lbb.32.1423740108376; Thu, 12 Feb 2015 03:21:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp378920lbj; Thu, 12 Feb 2015 03:21:47 -0800 (PST) X-Received: by 10.42.106.203 with SMTP id a11mr7948905icp.2.1423740098096; Thu, 12 Feb 2015 03:21:38 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id r2si3926272icq.67.2015.02.12.03.21.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 12 Feb 2015 03:21:38 -0800 (PST) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YLrpq-0000yb-AB; Thu, 12 Feb 2015 11:21:30 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YLrpp-0000yV-S9 for edk2-devel@lists.sourceforge.net; Thu, 12 Feb 2015 11:21:29 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.175 as permitted sender) client-ip=209.85.192.175; envelope-from=ard.biesheuvel@linaro.org; helo=mail-pd0-f175.google.com; Received: from mail-pd0-f175.google.com ([209.85.192.175]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YLrpo-0004lJ-Fe for edk2-devel@lists.sourceforge.net; Thu, 12 Feb 2015 11:21:29 +0000 Received: by pdev10 with SMTP id v10so11345433pde.7 for ; Thu, 12 Feb 2015 03:21:22 -0800 (PST) X-Received: by 10.68.69.40 with SMTP id b8mr5711972pbu.88.1423740082813; Thu, 12 Feb 2015 03:21:22 -0800 (PST) Received: from ards-macbook-pro.local ([210.177.145.249]) by mx.google.com with ESMTPSA id n4sm3554887pdl.12.2015.02.12.03.21.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Feb 2015 03:21:22 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, olivier.martin@arm.com, lersek@redhat.com, roy.franz@linaro.org, leif.lindholm@linaro.org, stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, anthony.perard@citrix.com, xen-devel@lists.xen.org, julien.grall@linaro.org, jordan.l.justen@intel.com, michael.d.kinney@intel.com, feng.tian@intel.com Date: Thu, 12 Feb 2015 19:19:19 +0800 Message-Id: <1423739961-5945-28-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423739961-5945-1-git-send-email-ard.biesheuvel@linaro.org> References: <1423739961-5945-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YLrpo-0004lJ-Fe Subject: [edk2] [PATCH v4 27/29] ArmVirtualizationPkg: add XenIoMmioLib X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This adds a XenIoMmioLib declaration and implementation that can be invoked to install the XENIO_PROTOCOL and a corresponding grant table address on a EFI handle. Contributed-under: TianoCore Contribution Agreement 1.0 Reviewed-by: Laszlo Ersek Signed-off-by: Ard Biesheuvel --- OvmfPkg/Include/Library/XenIoMmioLib.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf | 39 ++++++++++++++++++++++++++++++ OvmfPkg/OvmfPkg.dec | 4 ++++ 4 files changed, 273 insertions(+) diff --git a/OvmfPkg/Include/Library/XenIoMmioLib.h b/OvmfPkg/Include/Library/XenIoMmioLib.h new file mode 100644 index 000000000000..3986c72c574e --- /dev/null +++ b/OvmfPkg/Include/Library/XenIoMmioLib.h @@ -0,0 +1,64 @@ +/** @file +* Manage XenBus device path and I/O handles +* +* Copyright (c) 2015, Linaro Ltd. All rights reserved.
+* +* This program and the accompanying materials are +* licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* +**/ + +#ifndef _XENIO_MMIO_DEVICE_LIB_H_ +#define _XENIO_MMIO_DEVICE_LIB_H_ + +/** + + Install the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols on + the handle pointed to by @Handle, or on a new handle if it points to + NULL + + @param Handle Pointer to the handle to install the protocols + on, may point to a NULL handle. + + @param GrantTableAddress The address of the Xen grant table + + @retval EFI_SUCCESS Protocols were installed successfully + + @retval EFI_OUT_OF_RESOURCES The function failed to allocate memory required + by the XenIo MMIO and device path protocols + + @return Status code returned by the boot service + InstallMultipleProtocolInterfaces () + +**/ +EFI_STATUS +XenIoMmioInstall ( + IN OUT EFI_HANDLE *Handle, + IN EFI_PHYSICAL_ADDRESS GrantTableAddress + ); + + +/** + + Uninstall the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols + + @param Handle Handle onto which the protocols have been installed + earlier by XenIoMmioInstall () + + @retval EFI_SUCCESS Protocols were uninstalled successfully + + @return Status code returned by the boot service + UninstallMultipleProtocolInterfaces () + +**/ +EFI_STATUS +XenIoMmioUninstall ( + IN EFI_HANDLE Handle + ); + +#endif diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c new file mode 100644 index 000000000000..c710e85865c3 --- /dev/null +++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c @@ -0,0 +1,166 @@ +/** @file +* Manage XenBus device path and I/O handles +* +* Copyright (c) 2015, Linaro Ltd. All rights reserved.
+* +* This program and the accompanying materials are +* licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* +**/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#pragma pack (1) +typedef struct { + VENDOR_DEVICE_PATH Vendor; + EFI_PHYSICAL_ADDRESS GrantTableAddress; + EFI_DEVICE_PATH_PROTOCOL End; +} XENBUS_ROOT_DEVICE_PATH; +#pragma pack () + +STATIC CONST XENBUS_ROOT_DEVICE_PATH mXenBusRootDevicePathTemplate = { + { + { + HARDWARE_DEVICE_PATH, + HW_VENDOR_DP, + { sizeof (VENDOR_DEVICE_PATH) + sizeof (EFI_PHYSICAL_ADDRESS), 0 } + }, + XENBUS_ROOT_DEVICE_GUID, + }, + 0, + { + END_DEVICE_PATH_TYPE, + END_ENTIRE_DEVICE_PATH_SUBTYPE, + { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } + } +}; + +/** + + Install the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols on + the handle pointed to by @Handle, or on a new handle if it points to + NULL + + @param Handle Pointer to the handle to install the protocols + on, may point to a NULL handle. + + @param GrantTableAddress The address of the Xen grant table + + @retval EFI_SUCCESS Protocols were installed successfully + + @retval EFI_OUT_OF_RESOURCES The function failed to allocate memory required + by the XenIo MMIO and device path protocols + + @return Status code returned by the boot service + InstallMultipleProtocolInterfaces () + +**/ +EFI_STATUS +XenIoMmioInstall ( + IN OUT EFI_HANDLE *Handle, + IN EFI_PHYSICAL_ADDRESS GrantTableAddress + ) +{ + EFI_STATUS Status; + XENIO_PROTOCOL *XenIo; + XENBUS_ROOT_DEVICE_PATH *XenBusDevicePath; + EFI_HANDLE OutHandle; + + ASSERT (Handle != NULL); + + OutHandle = *Handle; + + XenIo = AllocateZeroPool (sizeof *XenIo); + if (!XenIo) { + return EFI_OUT_OF_RESOURCES; + } + XenIo->GrantTableAddress = GrantTableAddress; + + XenBusDevicePath = AllocateCopyPool (sizeof *XenBusDevicePath, + &mXenBusRootDevicePathTemplate); + if (!XenBusDevicePath) { + DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__)); + Status = EFI_OUT_OF_RESOURCES; + goto FreeXenIo; + } + XenBusDevicePath->GrantTableAddress = GrantTableAddress; + + Status = gBS->InstallMultipleProtocolInterfaces (&OutHandle, + &gEfiDevicePathProtocolGuid, XenBusDevicePath, + &gXenIoProtocolGuid, XenIo, + NULL); + if (!EFI_ERROR (Status)) { + *Handle = OutHandle; + return EFI_SUCCESS; + } + + DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH and " + "XENIO_PROTOCOL protocols on handle %p (Status == %r)\n", + __FUNCTION__, OutHandle, Status)); + + FreePool (XenBusDevicePath); + +FreeXenIo: + FreePool (XenIo); + return Status; +} + +/** + + Uninstall the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols + + @param Handle Handle onto which the protocols have been installed + earlier by XenIoMmioInstall () + + @retval EFI_SUCCESS Protocols were uninstalled successfully + + @return Status code returned by the boot service + UninstallMultipleProtocolInterfaces () + +**/ +EFI_STATUS +XenIoMmioUninstall ( + IN EFI_HANDLE Handle + ) +{ + EFI_STATUS Status; + VOID *XenIo; + VOID *XenBusDevicePath; + + XenBusDevicePath = NULL; + gBS->OpenProtocol (Handle, &gEfiDevicePathProtocolGuid, &XenBusDevicePath, + NULL, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); + + XenIo = NULL; + gBS->OpenProtocol (Handle, &gXenIoProtocolGuid, &XenIo, + NULL, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); + + Status = gBS->UninstallMultipleProtocolInterfaces (Handle, + &gEfiDevicePathProtocolGuid, XenBusDevicePath, + &gXenIoProtocolGuid, XenIo, + NULL); + + if (EFI_ERROR (Status)) { + return Status; + } + + FreePool (XenBusDevicePath); + FreePool (XenIo); + + return EFI_SUCCESS; +} diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf new file mode 100644 index 000000000000..16cc4530355e --- /dev/null +++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf @@ -0,0 +1,39 @@ +## @file +# Manage XenBus device path and I/O handles +# +# Copyright (c) 2015, Linaro Ltd. All rights reserved.
+# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php. +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +# +## + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = XenIoMmioLib + FILE_GUID = de9bdc19-8434-47bb-be3c-7f28f2101fd0 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + LIBRARY_CLASS = XenIoMmioLib + +[Sources] + XenIoMmioLib.c + +[Packages] + MdePkg/MdePkg.dec + OvmfPkg/OvmfPkg.dec + +[LibraryClasses] + BaseMemoryLib + +[Guids] + gXenBusRootDeviceGuid + +[Protocols] + gEfiDevicePathProtocolGuid + gXenIoProtocolGuid diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index d61600225919..4cb70dc98e79 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -48,6 +48,10 @@ # XenHypercallLib|Include/Library/XenHypercallLib.h + ## @libraryclass Manage XenBus device path and I/O handles + # + XenIoMmioLib|Include/Library/XenIoMmioLib.h + [Guids] gUefiOvmfPkgTokenSpaceGuid = {0x93bb96af, 0xb9f2, 0x4eb8, {0x94, 0x62, 0xe0, 0xba, 0x74, 0x56, 0x42, 0x36}} gEfiXenInfoGuid = {0xd3b46f3b, 0xd441, 0x1244, {0x9a, 0x12, 0x0, 0x12, 0x27, 0x3f, 0xc1, 0x4d}}