From nobody Wed Feb 11 02:09:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47627+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47627+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1568916401; cv=none; d=zoho.com; s=zohoarc; b=JMyRfVl7IVETh4TAGXuXkZK4SO8r/h19sHIqDn7f59BDnjPvbl4/XmWMDDIN2SxmMgyaiNiis/ylm4aXSMdQbzCh7cnvOKeO2H7E5y+0ViI+q+YsiDrK6uiv9DNwJgugQpnRGBOYpdrE+asJrRQm2jXqd83UJuoYzmkEDI6lEwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568916401; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=XLSiMliNBGEDkCcNOfLcIRNNhfXcg0C2X1FuBr1xQU0=; b=VrfdqpvhUWqNkPSD8FZQnPtVyLCPTP7K8AaNf2sOI9HzHX9rPgj97SCO9m+Tljx1DVfTyp6LVA00h8yglBaKxO7KiErqmdXrPYws7tH2mN+cwZNodqnh+y9QIImDOsx6BF+JL2GFRw0GPmx7mQRmyRcyWT9HXYkOv6/b1xTmO1M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47627+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568916401165676.5305642369717; Thu, 19 Sep 2019 11:06:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id iFDJYY1788612xy2RNqxNJzG; Thu, 19 Sep 2019 11:06:40 -0700 X-Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Thu, 19 Sep 2019 11:06:39 -0700 X-Received: by mail-wm1-f67.google.com with SMTP id b24so5023167wmj.5 for ; Thu, 19 Sep 2019 11:06:38 -0700 (PDT) X-Gm-Message-State: zEUkeDLM2oysPcR6fZpnyg1Nx1787277AA= X-Google-Smtp-Source: APXvYqxtKBrVTq0RBC10Rr7Q7O847Al37tjrlcWGWDwWcIupaKTHAfB1gf3fpEWH0FnZ66CPJnoNug== X-Received: by 2002:a1c:7fcc:: with SMTP id a195mr4011690wmd.27.1568916395634; Thu, 19 Sep 2019 11:06:35 -0700 (PDT) X-Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id d9sm16389769wrc.44.2019.09.19.11.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 11:06:34 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Anthony Perard , Julien Grall , David Woodhouse Subject: [edk2-devel] [PATCH 6/7] OvmfPkg: strip trailing whitespace Date: Thu, 19 Sep 2019 19:06:24 +0100 Message-Id: <20190919180625.29150-7-leif.lindholm@linaro.org> In-Reply-To: <20190919180625.29150-1-leif.lindholm@linaro.org> References: <20190919180625.29150-1-leif.lindholm@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,leif.lindholm@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568916400; bh=APXO+kOShSO2nrNEJZxPSbGx+0BxMcav+rS1QWbgpM8=; h=Cc:Date:From:Reply-To:Subject:To; b=an9UM6uxDWmuVCCUtdZqUvlgGZ/2L35NCf0dDu2q2EQESZ1YH0c959gEoIeZvIoSS1R w3p6G0D+FY5FtNsuQeBVNcmUWaNueF9YI7zNu2R00B0UjpmvnREqNx5tEQJx73P5mjiIq dehVmjuGzN1yvoph1CuyG2x7q1gku7pEAZI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: David Woodhouse Signed-off-by: Leif Lindholm --- OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c | 4 ++-- OvmfPkg/AcpiPlatformDxe/Xen.c | 8 ++++---- OvmfPkg/AcpiTables/Facs.aslc | 6 +++--- OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.Vfr | 18 +++++++++= --------- OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h | 4 ++-- OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h | 4 ++-- OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h | 4 ++-- OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h | 2 +- OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h | 2 +- OvmfPkg/Include/IndustryStandard/Xen/io/ring.h | 34 +++++++++= ++++++++----------------- OvmfPkg/Include/IndustryStandard/Xen/memory.h | 4 ++-- OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h | 4 ++-- OvmfPkg/Include/IndustryStandard/Xen/xen.h | 10 +++++----- OvmfPkg/Include/Register/QemuSmramSaveStateMap.h | 2 +- OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c | 12 ++++++---= --- OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 2 +- OvmfPkg/Library/LockBoxLib/LockBoxLib.c | 2 +- OvmfPkg/Library/LockBoxLib/LockBoxLib.h | 2 +- OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.c | 4 ++-- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 2 +- OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c | 2 +- OvmfPkg/PlatformPei/Xen.c | 2 +- OvmfPkg/SataControllerDxe/ComponentName.c | 6 +++--- OvmfPkg/SataControllerDxe/SataController.c | 214 +++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++++++++++++++++++++++----------------------------------------------------= ------------------------------------------------------- OvmfPkg/SataControllerDxe/SataController.h | 208 +++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++++++++++++++-------------------------------------------------------= ------------------------------------------------- OvmfPkg/SataControllerDxe/SataControllerDxe.inf | 6 +++--- OvmfPkg/Sec/SecMain.c | 34 +++++++++= ++++++++----------------- 27 files changed, 301 insertions(+), 301 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/AcpiPlatformD= xe/AcpiPlatform.c index 2b529d58a15c..f872d91aea72 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.c @@ -124,7 +124,7 @@ LocateFvInstanceWithTables ( =20 =20 /** - Find ACPI tables in an FV and install them.=20 + Find ACPI tables in an FV and install them. =20 This is now a fall-back path. Normally, we will search for tables provid= ed by the VMM first. @@ -132,7 +132,7 @@ LocateFvInstanceWithTables ( If that fails, we use this function to load the ACPI tables from an FV. = The sources for the FV based tables is located under OvmfPkg/AcpiTables. =20 - @param AcpiTable Protocol instance pointer =20 + @param AcpiTable Protocol instance pointer =20 **/ EFI_STATUS diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/AcpiPlatformDxe/Xen.c index f80dfe1a57cf..289ef971c4b8 100644 --- a/OvmfPkg/AcpiPlatformDxe/Xen.c +++ b/OvmfPkg/AcpiPlatformDxe/Xen.c @@ -6,7 +6,7 @@ =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 -**/=20 +**/ =20 #include "AcpiPlatform.h" #include @@ -151,12 +151,12 @@ InstallXenTables ( } =20 // - // If XSDT table is find, just install its tables.=20 + // If XSDT table is find, just install its tables. // Otherwise, try to find and install the RSDT tables. // if (XenAcpiRsdpStructurePtr->XsdtAddress) { // - // Retrieve the addresses of XSDT and=20 + // Retrieve the addresses of XSDT and // calculate the number of its table entries. // Xsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) @@ -212,7 +212,7 @@ InstallXenTables ( Rsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *) (UINTN) XenAcpiRsdpStructurePtr->RsdtAddress; NumberOfTableEntries =3D (Rsdt->Length - - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) /=20 + sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof (UINT32); =20 // diff --git a/OvmfPkg/AcpiTables/Facs.aslc b/OvmfPkg/AcpiTables/Facs.aslc index 159dd81373e3..56f86c1ca4fd 100644 --- a/OvmfPkg/AcpiTables/Facs.aslc +++ b/OvmfPkg/AcpiTables/Facs.aslc @@ -1,10 +1,10 @@ /** @file FACS Table - =20 + Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 -**/=20 +**/ =20 #include =20 @@ -70,7 +70,7 @@ ReferenceAcpiTable ( ) { // - // Reference the table being generated to prevent the optimizer from rem= oving the=20 + // Reference the table being generated to prevent the optimizer from rem= oving the // data structure from the exeutable // return (VOID*)&FACS; diff --git a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.Vfr b/Ov= mfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.Vfr index c879ca551fa0..2b03820d3869 100644 --- a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.Vfr +++ b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiVfr.Vfr @@ -1,10 +1,10 @@ ///** @file -// =20 +// // Browser formset. -// =20 +// // Copyright (c) 2015, Intel Corporation. All rights reserved.
// SPDX-License-Identifier: BSD-2-Clause-Patent -// =20 +// //**/ =20 #include "LegacyBootMaintUiVfr.h" @@ -15,15 +15,15 @@ formset title =3D STRING_TOKEN(STR_LEGACY_BOOT_PROMPT), help =3D STRING_TOKEN(STR_LEGACY_BOOT_HELP), classguid =3D EFI_IFR_BOOT_MAINTENANCE_GUID, - =20 + varstore LEGACY_BOOT_NV_DATA, varid =3D VARSTORE_ID_LEGACY_BOOT, name =3D LegacyBootData, guid =3D LEGACY_BOOT_OPTION_FORMSET_GUID; - =20 + form formid =3D LEGACY_BOOT_FORM_ID, title =3D STRING_TOKEN(STR_LEGACY_BOOT_PROMPT); - =20 + goto LEGACY_ORDER_CHANGE_FORM_ID, prompt =3D STRING_TOKEN(STR_FORM_FLOPPY_BOOT_TITLE), help =3D STRING_TOKEN(STR_FORM_FLOPPY_BOOT_HELP), @@ -53,15 +53,15 @@ formset help =3D STRING_TOKEN(STR_FORM_BEV_BOOT_HELP), flags =3D INTERACTIVE, key =3D FORM_BEV_BOOT_ID; - =20 + endform; =20 form formid =3D LEGACY_ORDER_CHANGE_FORM_ID, title =3D STRING_TOKEN(STR_ORDER_CHANGE_PROMPT); - =20 + label FORM_BOOT_LEGACY_DEVICE_ID; label FORM_BOOT_LEGACY_LABEL_END; - =20 + endform; =20 endformset; diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h b/O= vmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h index 86378fba9b34..0314877f0b8a 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * xen-x86_32.h - *=20 + * * Guest OS interface to x86 32-bit Xen. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2004-2007, K A Fraser diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h b/O= vmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h index 9dc92d02ce6c..c8f54c5746de 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * xen-x86_64.h - *=20 + * * Guest OS interface to x86 64-bit Xen. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2004-2006, K A Fraser diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h b/OvmfPkg/= Include/IndustryStandard/Xen/arch-x86/xen.h index ed69f9241485..3c07c59f3831 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * arch-x86/xen.h - *=20 + * * Guest OS interface to x86 Xen. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2004-2006, K A Fraser diff --git a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h b/OvmfPkg/In= clude/IndustryStandard/Xen/hvm/params.h index 3b94435c9f8d..15aa93e2f52b 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h @@ -103,7 +103,7 @@ */ #define HVM_PARAM_ACPI_IOPORTS_LOCATION 19 =20 -/* Enable blocking memory events, async or sync (pause vcpu until response= )=20 +/* Enable blocking memory events, async or sync (pause vcpu until response) * onchangeonly indicates messages only on a change of value */ #define HVM_PARAM_MEMORY_EVENT_CR0 20 #define HVM_PARAM_MEMORY_EVENT_CR3 21 diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h b/OvmfPkg/= Include/IndustryStandard/Xen/io/protocols.h index 0c48e7693787..4303d37c30be 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h @@ -1,6 +1,6 @@ /*************************************************************************= ***** * protocols.h - *=20 + * * SPDX-License-Identifier: MIT */ =20 diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h b/OvmfPkg/Inclu= de/IndustryStandard/Xen/io/ring.h index c770ade40785..2fa5d20ca0fa 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h @@ -1,6 +1,6 @@ /*************************************************************************= ***** * ring.h - *=20 + * * Shared producer-consumer ring macros. * * SPDX-License-Identifier: MIT @@ -31,7 +31,7 @@ typedef UINT32 RING_IDX; /* * Calculate size of a shared ring, given the total available space for the * ring and indexes (_sz), and the name tag of the request/response struct= ure. - * A ring contains as many entries as will fit, rounded down to the neares= t=20 + * A ring contains as many entries as will fit, rounded down to the nearest * power of two (so we can mask with (size-1) to loop around). */ #define __CONST_RING_SIZE(_s, _sz) \ @@ -45,7 +45,7 @@ typedef UINT32 RING_IDX; =20 /* * Macros to make the correct C datatypes for a new kind of ring. - *=20 + * * To make a new ring datatype, you need to have two message structures, * let's say request_t, and response_t already defined. * @@ -55,7 +55,7 @@ typedef UINT32 RING_IDX; * * These expand out to give you a set of types, as you can see below. * The most important of these are: - *=20 + * * mytag_sring_t - The shared ring. * mytag_front_ring_t - The 'front' half of the ring. * mytag_back_ring_t - The 'back' half of the ring. @@ -123,15 +123,15 @@ typedef struct __name##_back_ring __name##_back_ring_t =20 /* * Macros for manipulating rings. - *=20 - * FRONT_RING_whatever works on the "front end" of a ring: here=20 + * + * FRONT_RING_whatever works on the "front end" of a ring: here * requests are pushed on to the ring and responses taken off it. - *=20 - * BACK_RING_whatever works on the "back end" of a ring: here=20 + * + * BACK_RING_whatever works on the "back end" of a ring: here * requests are taken off the ring and responses put on. - *=20 - * N.B. these macros do NO INTERLOCKS OR FLOW CONTROL.=20 - * This is OK in 1-for-1 request-response situations where the=20 + * + * N.B. these macros do NO INTERLOCKS OR FLOW CONTROL. + * This is OK in 1-for-1 request-response situations where the * requestor (front end) never has more than RING_SIZE()-1 * outstanding requests. */ @@ -219,26 +219,26 @@ typedef struct __name##_back_ring __name##_back_ring_t =20 /* * Notification hold-off (req_event and rsp_event): - *=20 + * * When queueing requests or responses on a shared ring, it may not always= be * necessary to notify the remote end. For example, if requests are in fli= ght * in a backend, the front may be able to queue further requests without * notifying the back (if the back checks for new requests when it queues * responses). - *=20 + * * When enqueuing requests or responses: - *=20 + * * Use RING_PUSH_{REQUESTS,RESPONSES}_AND_CHECK_NOTIFY(). The second argu= ment * is a boolean return value. True indicates that the receiver requires an * asynchronous notification. - *=20 + * * After dequeuing requests or responses (before sleeping the connection): - *=20 + * * Use RING_FINAL_CHECK_FOR_REQUESTS() or RING_FINAL_CHECK_FOR_RESPONSES(= ). * The second argument is a boolean return value. True indicates that the= re * are pending messages on the ring (i.e., the connection should not be p= ut * to sleep). - *=20 + * * These macros will set the req_event/rsp_event field to trigger a * notification on the very next message that is enqueued. If you want to * create batches of work (i.e., only receive a notification after several diff --git a/OvmfPkg/Include/IndustryStandard/Xen/memory.h b/OvmfPkg/Includ= e/IndustryStandard/Xen/memory.h index 4a33a26d4eba..54ee4b465417 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/memory.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/memory.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * memory.h - *=20 + * * Memory reservation and information. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2005, Keir Fraser diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h b/OvmfPkg/In= clude/IndustryStandard/Xen/xen-compat.h index 99d5a5dc0419..c77049f7964e 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * xen-compat.h - *=20 + * * Guest OS interface to Xen. Compatibility layer. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2006, Christian Limpach diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/I= ndustryStandard/Xen/xen.h index eccc1ad6251a..e55d93263285 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h @@ -1,8 +1,8 @@ /*************************************************************************= ***** * xen.h - *=20 + * * Guest OS interface to Xen. - *=20 + * * SPDX-License-Identifier: MIT * * Copyright (c) 2004, K A Fraser @@ -203,7 +203,7 @@ typedef struct vcpu_time_info vcpu_time_info_t; struct vcpu_info { /* * 'evtchn_upcall_pending' is written non-zero by Xen to indicate - * a pending notification for a particular VCPU. It is then cleared=20 + * a pending notification for a particular VCPU. It is then cleared * by the guest OS /before/ checking for pending work, thus avoiding * a set-and-check race. Note that the mask is only accessed by Xen * on the CPU that is currently hosting the VCPU. This means that the @@ -266,7 +266,7 @@ struct shared_info { * 3. Virtual interrupts ('events'). A domain can bind an event-chann= el * port to a virtual interrupt source, such as the virtual-timer * device or the emergency console. - *=20 + * * Event channels are addressed by a "port index". Each channel is * associated with two bits of information: * 1. PENDING -- notifies the domain that there is a pending notifica= tion @@ -277,7 +277,7 @@ struct shared_info { * becomes pending while the channel is masked then the 'edge' is = lost * (i.e., when the channel is unmasked, the guest must manually ha= ndle * pending notifications as no upcall will be scheduled by Xen). - *=20 + * * To expedite scanning of pending notifications, any 0->1 pending * transition on an unmasked channel causes a corresponding bit in a * per-vcpu selector word to be set. Each bit in the selector covers a diff --git a/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h b/OvmfPkg/Inc= lude/Register/QemuSmramSaveStateMap.h index 45db759092a4..40cf63c3e60b 100644 --- a/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h +++ b/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h @@ -1,7 +1,7 @@ /** @file SMRAM Save State Map Definitions. =20 -SMRAM Save State Map definitions based on contents of the=20 +SMRAM Save State Map definitions based on contents of the Intel(R) 64 and IA-32 Architectures Software Developer's Manual Volume 3C, Section 34.4 SMRAM Volume 3C, Section 34.5 SMI Handler Execution Environment diff --git a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c b/OvmfPkg/Library/= DxePciLibI440FxQ35/PciLib.c index bc64a63c78a7..49bdfdf65043 100644 --- a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c +++ b/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c @@ -39,19 +39,19 @@ InitializeConfigAccessMethod ( } =20 /** - Registers a PCI device so PCI configuration registers may be accessed af= ter=20 + Registers a PCI device so PCI configuration registers may be accessed af= ter SetVirtualAddressMap(). - =20 - Registers the PCI device specified by Address so all the PCI configurati= on registers=20 + + Registers the PCI device specified by Address so all the PCI configurati= on registers associated with that PCI device may be accessed after SetVirtualAddressM= ap() is called. - =20 + If Address > 0x0FFFFFFF, then ASSERT(). =20 @param Address The address that encodes the PCI Bus, Device, Function a= nd Register. - =20 + @retval RETURN_SUCCESS The PCI device was registered for runti= me access. - @retval RETURN_UNSUPPORTED An attempt was made to call this functi= on=20 + @retval RETURN_UNSUPPORTED An attempt was made to call this functi= on after ExitBootServices(). @retval RETURN_UNSUPPORTED The resources required to access the PC= I device at runtime could not be mapped. diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/Lock= BoxLib/LockBoxDxe.c index a42a7a6248eb..b28ad4d2dba7 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c @@ -24,7 +24,7 @@ =20 @param MemoryType Memory type of memory to allocate. @param Size Size of memory to allocate. - =20 + @return Allocated address for output. =20 **/ diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/Lock= BoxLib/LockBoxLib.c index bc40a4b3bb8e..1f36b5cc06b5 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c @@ -48,7 +48,7 @@ LockBoxLibInitialize ( StartOfEntries =3D ((LOCK_BOX_ENTRY *) (mLockBoxGlobal + 1)); NumEntries =3D ((PcdGet32 (PcdOvmfLockBoxStorageSize) - sizeof (LOCK_BOX= _GLOBAL)) / sizeof (LOCK_BOX_ENTRY)); - EndOfEntries =3D StartOfEntries + NumEntries; =20 + EndOfEntries =3D StartOfEntries + NumEntries; if (mLockBoxGlobal->Signature !=3D LOCK_BOX_GLOBAL_SIGNATURE) { // // Note: This code depends on the lock box being cleared in early diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.h b/OvmfPkg/Library/Lock= BoxLib/LockBoxLib.h index 80b4998d5eb6..d654ea63987b 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.h +++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.h @@ -1,5 +1,5 @@ /** @file - =20 + Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent diff --git a/OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.c b/OvmfPk= g/Library/PlatformSecureLib/PlatformSecureLib.c index 206b90866957..734d30213cb1 100644 --- a/OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.c +++ b/OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.c @@ -10,7 +10,7 @@ /** =20 This function provides a platform-specific method to detect whether the = platform - is operating by a physically present user.=20 + is operating by a physically present user. =20 Programmatic changing of platform security policy (such as disable Secur= e Boot, or switch between Standard/Custom Secure Boot mode) MUST NOT be possible= during @@ -19,7 +19,7 @@ =20 NOTE THAT: This function cannot depend on any EFI Variable Service since= they are not available when this function is called in AuthenticateVariable drive= r. - =20 + @retval TRUE The platform is operated by a physically present use= r. @retval FALSE The platform is NOT operated by a physically present= user. =20 diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgLib.c index a80ceeaa8a99..4d2c43cb8fd7 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -22,7 +22,7 @@ =20 /** Selects a firmware configuration item for reading. - =20 + Following this call, any data read from this item will start from the beginning of the configuration item's data. =20 diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c b/OvmfPkg/Library/= XenIoMmioLib/XenIoMmioLib.c index 35a4a082334a..154e4fdeb71c 100644 --- a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c +++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c @@ -102,7 +102,7 @@ XenIoMmioInstall ( *Handle =3D OutHandle; return EFI_SUCCESS; } - =20 + DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH and " "XENIO_PROTOCOL protocols on handle %p (Status =3D=3D %r)\n", __FUNCTION__, OutHandle, Status)); diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c index 3e15b32a73bf..0904c654f149 100644 --- a/OvmfPkg/PlatformPei/Xen.c +++ b/OvmfPkg/PlatformPei/Xen.c @@ -64,7 +64,7 @@ XenGetE820Map ( =20 /** Connects to the Hypervisor. -=20 + @param XenLeaf CPUID index used to connect. =20 @return EFI_STATUS diff --git a/OvmfPkg/SataControllerDxe/ComponentName.c b/OvmfPkg/SataContro= llerDxe/ComponentName.c index 09d0e0325c2b..320dca382a1d 100644 --- a/OvmfPkg/SataControllerDxe/ComponentName.c +++ b/OvmfPkg/SataControllerDxe/ComponentName.c @@ -66,7 +66,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mS= ataControllerController @param DriverName A pointer to the Unicode string to return. This U= nicode string is the name of the driver specified by This in the= language specified by Language. - =20 + @retval EFI_SUCCESS The Unicode string for the Driver specifie= d by This and the language specified by Language was= returned in DriverName. @@ -94,7 +94,7 @@ SataControllerComponentNameGetDriverName ( =20 /** Retrieves a Unicode string that is the user readable name of the control= ler - that is being managed by an UEFI Driver. =20 + that is being managed by an UEFI Driver. =20 @param This A pointer to the EFI_COMPONENT_NAME_PROTOC= OL instance. @param ControllerHandle The handle of a controller that the driver= specified by @@ -117,7 +117,7 @@ SataControllerComponentNameGetDriverName ( ControllerHandle and ChildHandle in the la= nguage specified by Language from the point of vi= ew of the driver specified by This. - =20 + @retval EFI_SUCCESS The Unicode string for the user readable n= ame in the language specified by Language for the dri= ver specified by This was returned in DriverNa= me. diff --git a/OvmfPkg/SataControllerDxe/SataController.c b/OvmfPkg/SataContr= ollerDxe/SataController.c index 8d6a6bbb2286..313bfab1bea5 100644 --- a/OvmfPkg/SataControllerDxe/SataController.c +++ b/OvmfPkg/SataControllerDxe/SataController.c @@ -39,7 +39,7 @@ AhciReadReg ( UINT32 Data; =20 ASSERT (PciIo !=3D NULL); - =20 + Data =3D 0; =20 PciIo->Mem.Read ( @@ -265,9 +265,9 @@ CalculateBestUdmaMode ( /** The Entry Point of module. It follows the standard UEFI driver model. =20 - @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. =20 + @param[in] ImageHandle The firmware allocated handle for the EFI imag= e. @param[in] SystemTable A pointer to the EFI System Table. - =20 + @retval EFI_SUCCESS The entry point is executed successfully. @retval other Some error occurs when executing this entry point. =20 @@ -361,7 +361,7 @@ SataControllerSupported ( } =20 /** - This routine is called right after the .Supported() called and=20 + This routine is called right after the .Supported() called and Start this driver on ControllerHandle. =20 @param This Protocol instance pointer. @@ -680,34 +680,34 @@ FlatDeviceIndex ( // /** Returns the information about the specified IDE channel. - =20 + This function can be used to obtain information about a particular IDE c= hannel. - The driver entity uses this information during the enumeration process.=20 - =20 - If Enabled is set to FALSE, the driver entity will not scan the channel.= Note=20 + The driver entity uses this information during the enumeration process. + + If Enabled is set to FALSE, the driver entity will not scan the channel.= Note that it will not prevent an operating system driver from scanning the ch= annel. - =20 - For most of today's controllers, MaxDevices will either be 1 or 2. For S= ATA=20 - controllers, this value will always be 1. SATA configurations can contai= n SATA=20 + + For most of today's controllers, MaxDevices will either be 1 or 2. For S= ATA + controllers, this value will always be 1. SATA configurations can contai= n SATA port multipliers. SATA port multipliers behave like SATA bridges and can= support - up to 16 devices on the other side. If a SATA port out of the IDE contro= ller=20 - is connected to a port multiplier, MaxDevices will be set to the number = of SATA=20 - devices that the port multiplier supports. Because today's port multipli= ers=20 - support up to fifteen SATA devices, this number can be as large as fifte= en. The IDE =20 - bus driver is required to scan for the presence of port multipliers behi= nd an SATA=20 - controller and enumerate up to MaxDevices number of devices behind the p= ort=20 - multiplier. =20 - =20 - In this context, the devices behind a port multiplier constitute a chann= el. =20 - =20 + up to 16 devices on the other side. If a SATA port out of the IDE contro= ller + is connected to a port multiplier, MaxDevices will be set to the number = of SATA + devices that the port multiplier supports. Because today's port multipli= ers + support up to fifteen SATA devices, this number can be as large as fifte= en. The IDE + bus driver is required to scan for the presence of port multipliers behi= nd an SATA + controller and enumerate up to MaxDevices number of devices behind the p= ort + multiplier. + + In this context, the devices behind a port multiplier constitute a chann= el. + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROT= OCOL instance. @param[in] Channel Zero-based channel number. - @param[out] Enabled TRUE if this channel is enabled. Disabled chan= nels=20 + @param[out] Enabled TRUE if this channel is enabled. Disabled chan= nels are not scanned to see if any devices are prese= nt. @param[out] MaxDevices The maximum number of IDE devices that the bus = driver - can expect on this channel. For the ATA/ATAPI=20 - specification, version 6, this number will eith= er be=20 - one or two. For Serial ATA (SATA) configuration= s with a=20 + can expect on this channel. For the ATA/ATAPI + specification, version 6, this number will eith= er be + one or two. For Serial ATA (SATA) configuration= s with a port multiplier, this number can be as large as= fifteen. =20 @retval EFI_SUCCESS Information was returned without any err= ors. @@ -740,13 +740,13 @@ IdeInitGetChannelInfo ( /** The notifications from the driver entity that it is about to enter a cer= tain phase of the IDE channel enumeration process. - =20 - This function can be used to notify the IDE controller driver to perform=20 - specific actions, including any chipset-specific initialization, so that= the=20 - chipset is ready to enter the next phase. Seven notification points are = defined=20 - at this time.=20 - =20 - More synchronization points may be added as required in the future. =20 + + This function can be used to notify the IDE controller driver to perform + specific actions, including any chipset-specific initialization, so that= the + chipset is ready to enter the next phase. Seven notification points are = defined + at this time. + + More synchronization points may be added as required in the future. =20 @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL= instance. @param[in] Phase The phase during enumeration. @@ -755,9 +755,9 @@ IdeInitGetChannelInfo ( @retval EFI_SUCCESS The notification was accepted without an= y errors. @retval EFI_UNSUPPORTED Phase is not supported. @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). - @retval EFI_NOT_READY This phase cannot be entered at this tim= e; for=20 - example, an attempt was made to enter a = Phase=20 - without having entered one or more previ= ous=20 + @retval EFI_NOT_READY This phase cannot be entered at this tim= e; for + example, an attempt was made to enter a = Phase + without having entered one or more previ= ous Phase. =20 **/ @@ -775,32 +775,32 @@ IdeInitNotifyPhase ( /** Submits the device information to the IDE controller driver. =20 - This function is used by the driver entity to pass detailed information = about=20 - a particular device to the IDE controller driver. The driver entity obta= ins=20 + This function is used by the driver entity to pass detailed information = about + a particular device to the IDE controller driver. The driver entity obta= ins this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. Ide= ntifyData - is the pointer to the response data buffer. The IdentifyData buffer is o= wned=20 - by the driver entity, and the IDE controller driver must make a local co= py=20 - of the entire buffer or parts of the buffer as needed. The original Iden= tifyData=20 + is the pointer to the response data buffer. The IdentifyData buffer is o= wned + by the driver entity, and the IDE controller driver must make a local co= py + of the entire buffer or parts of the buffer as needed. The original Iden= tifyData buffer pointer may not be valid when - =20 + - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a lat= er point. - =20 - The IDE controller driver may consult various fields of EFI_IDENTIFY_DAT= A to=20 - compute the optimum mode for the device. These fields are not limited to= the=20 - timing information. For example, an implementation of the IDE controller= driver=20 - may examine the vendor and type/mode field to match known bad drives. =20 - =20 - The driver entity may submit drive information in any order, as long as = it=20 - submits information for all the devices belonging to the enumeration gro= up=20 + + The IDE controller driver may consult various fields of EFI_IDENTIFY_DAT= A to + compute the optimum mode for the device. These fields are not limited to= the + timing information. For example, an implementation of the IDE controller= driver + may examine the vendor and type/mode field to match known bad drives. + + The driver entity may submit drive information in any order, as long as = it + submits information for all the devices belonging to the enumeration gro= up before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for an= y device in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INI= T_PROTOCOL.SubmitData() - should be called with IdentifyData set to NULL. The IDE controller driv= er may=20 - not have any other mechanism to know whether a device is present or not.= Therefore,=20 - setting IdentifyData to NULL does not constitute an error condition.=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once fo= r a=20 - given (Channel, Device) pair. =20 - =20 + should be called with IdentifyData set to NULL. The IDE controller driv= er may + not have any other mechanism to know whether a device is present or not.= Therefore, + setting IdentifyData to NULL does not constitute an error condition. + EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once fo= r a + given (Channel, Device) pair. + @param[in] This A pointer to the EFI_IDE_CONTROLLER_INIT_PROTO= COL instance. @param[in] Channel Zero-based channel number. @param[in] Device Zero-based device number on the Channel. @@ -853,31 +853,31 @@ IdeInitSubmitData ( /** Disqualifies specific modes for an IDE device. =20 - This function allows the driver entity or other drivers (such as platfor= m=20 + This function allows the driver entity or other drivers (such as platform drivers) to reject certain timing modes and request the IDE controller d= river - to recalculate modes. This function allows the driver entity and the IDE=20 - controller driver to negotiate the timings on a per-device basis. This f= unction=20 - is useful in the case of drives that lie about their capabilities. An ex= ample=20 - is when the IDE device fails to accept the timing modes that are calcula= ted=20 + to recalculate modes. This function allows the driver entity and the IDE + controller driver to negotiate the timings on a per-device basis. This f= unction + is useful in the case of drives that lie about their capabilities. An ex= ample + is when the IDE device fails to accept the timing modes that are calcula= ted by the IDE controller driver based on the response to the Identify Drive= command. =20 - If the driver entity does not want to limit the ATA timing modes and lea= ve that=20 - decision to the IDE controller driver, it can either not call this funct= ion for=20 - the given device or call this function and set the Valid flag to FALSE f= or all=20 + If the driver entity does not want to limit the ATA timing modes and lea= ve that + decision to the IDE controller driver, it can either not call this funct= ion for + the given device or call this function and set the Valid flag to FALSE f= or all modes that are listed in EFI_ATA_COLLECTIVE_MODE. - =20 - The driver entity may disqualify modes for a device in any order and any= number=20 + + The driver entity may disqualify modes for a device in any order and any= number of times. - =20 - This function can be called multiple times to invalidate multiple modes = of the=20 - same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the A= TA/ATAPI=20 - specification for more information on PIO modes. =20 - =20 + + This function can be called multiple times to invalidate multiple modes = of the + same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the A= TA/ATAPI + specification for more information on PIO modes. + For Serial ATA (SATA) controllers, this member function can be used to d= isqualify a higher transfer rate mode on a given channel. For example, a platform = driver - may inform the IDE controller driver to not use second-generation (Gen2)= speeds=20 + may inform the IDE controller driver to not use second-generation (Gen2)= speeds for a certain SATA drive. - =20 + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCO= L instance. @param[in] Channel The zero-based channel number. @param[in] Device The zero-based device number on the Channel. @@ -888,7 +888,7 @@ IdeInitSubmitData ( @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). @retval EFI_INVALID_PARAMETER Device is invalid. @retval EFI_INVALID_PARAMETER IdentifyData is NULL. - =20 + **/ EFI_STATUS EFIAPI @@ -928,39 +928,39 @@ IdeInitDisqualifyMode ( Returns the information about the optimum modes for the specified IDE de= vice. =20 This function is used by the driver entity to obtain the optimum ATA mod= es for - a specific device. The IDE controller driver takes into account the fol= lowing=20 + a specific device. The IDE controller driver takes into account the fol= lowing while calculating the mode: - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitDa= ta() - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMo= de() =20 - The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.S= ubmitData()=20 - for all the devices that belong to an enumeration group before calling=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the s= ame group. =20 - =20 - The IDE controller driver will use controller- and possibly platform-spe= cific=20 - algorithms to arrive at SupportedModes. The IDE controller may base its=20 - decision on user preferences and other considerations as well. This func= tion=20 - may be called multiple times because the driver entity may renegotiate t= he mode=20 + The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.S= ubmitData() + for all the devices that belong to an enumeration group before calling + EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the s= ame group. + + The IDE controller driver will use controller- and possibly platform-spe= cific + algorithms to arrive at SupportedModes. The IDE controller may base its + decision on user preferences and other considerations as well. This func= tion + may be called multiple times because the driver entity may renegotiate t= he mode with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.Di= squalifyMode(). - =20 - The driver entity may collect timing information for various devices in = any=20 + + The driver entity may collect timing information for various devices in = any order. The driver entity is responsible for making sure that all the dep= endencies - are satisfied. For example, the SupportedModes information for device A = that=20 - was previously returned may become stale after a call to=20 + are satisfied. For example, the SupportedModes information for device A = that + was previously returned may become stale after a call to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B. - =20 - The buffer SupportedModes is allocated by the callee because the caller = does=20 - not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE= _MODE=20 - is defined in a way that allows for future extensibility and can be of v= ariable=20 - length. This memory pool should be deallocated by the caller when it is = no=20 - longer necessary. =20 - =20 - The IDE controller driver for a Serial ATA (SATA) controller can use thi= s=20 - member function to force a lower speed (first-generation [Gen1] speeds o= n a=20 - second-generation [Gen2]-capable hardware). The IDE controller driver c= an=20 - also allow the driver entity to stay with the speed that has been negoti= ated=20 + + The buffer SupportedModes is allocated by the callee because the caller = does + not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE= _MODE + is defined in a way that allows for future extensibility and can be of v= ariable + length. This memory pool should be deallocated by the caller when it is = no + longer necessary. + + The IDE controller driver for a Serial ATA (SATA) controller can use this + member function to force a lower speed (first-generation [Gen1] speeds o= n a + second-generation [Gen2]-capable hardware). The IDE controller driver c= an + also allow the driver entity to stay with the speed that has been negoti= ated by the physical layer. - =20 + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_= PROTOCOL instance. @param[in] Channel A zero-based channel number. @param[in] Device A zero-based device number on the Channel. @@ -968,13 +968,13 @@ IdeInitDisqualifyMode ( =20 @retval EFI_SUCCESS SupportedModes was returned. @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). - @retval EFI_INVALID_PARAMETER Device is invalid.=20 + @retval EFI_INVALID_PARAMETER Device is invalid. @retval EFI_INVALID_PARAMETER SupportedModes is NULL. - @retval EFI_NOT_READY Modes cannot be calculated due to a lack= of=20 - data. This error may happen if=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitD= ata()=20 - and EFI_IDE_CONTROLLER_INIT_PROTOCOL.Dis= qualifyData()=20 - were not called for at least one drive i= n the=20 + @retval EFI_NOT_READY Modes cannot be calculated due to a lack= of + data. This error may happen if + EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitD= ata() + and EFI_IDE_CONTROLLER_INIT_PROTOCOL.Dis= qualifyData() + were not called for at least one drive i= n the same enumeration group. =20 **/ @@ -1061,9 +1061,9 @@ IdeInitCalculateMode ( Commands the IDE controller driver to program the IDE controller hardware so that the specified device can operate at the specified mode. =20 - This function is used by the driver entity to instruct the IDE controlle= r=20 - driver to program the IDE controller hardware to the specified modes. Th= is=20 - function can be called only once for a particular device. For a Serial A= TA=20 + This function is used by the driver entity to instruct the IDE controller + driver to program the IDE controller hardware to the specified modes. Th= is + function can be called only once for a particular device. For a Serial A= TA (SATA) Advanced Host Controller Interface (AHCI) controller, no controll= er- specific programming may be required. =20 diff --git a/OvmfPkg/SataControllerDxe/SataController.h b/OvmfPkg/SataContr= ollerDxe/SataController.h index e8044e870d8e..4ef7f56e2249 100644 --- a/OvmfPkg/SataControllerDxe/SataController.h +++ b/OvmfPkg/SataControllerDxe/SataController.h @@ -132,7 +132,7 @@ SataControllerSupported ( ; =20 /** - This routine is called right after the .Supported() called and=20 + This routine is called right after the .Supported() called and Start this driver on ControllerHandle. =20 @param This Protocol instance pointer. @@ -181,34 +181,34 @@ SataControllerStop ( // /** Returns the information about the specified IDE channel. - =20 + This function can be used to obtain information about a particular IDE c= hannel. - The driver entity uses this information during the enumeration process.=20 - =20 - If Enabled is set to FALSE, the driver entity will not scan the channel.= Note=20 + The driver entity uses this information during the enumeration process. + + If Enabled is set to FALSE, the driver entity will not scan the channel.= Note that it will not prevent an operating system driver from scanning the ch= annel. - =20 - For most of today's controllers, MaxDevices will either be 1 or 2. For S= ATA=20 - controllers, this value will always be 1. SATA configurations can contai= n SATA=20 + + For most of today's controllers, MaxDevices will either be 1 or 2. For S= ATA + controllers, this value will always be 1. SATA configurations can contai= n SATA port multipliers. SATA port multipliers behave like SATA bridges and can= support - up to 16 devices on the other side. If a SATA port out of the IDE contro= ller=20 - is connected to a port multiplier, MaxDevices will be set to the number = of SATA=20 - devices that the port multiplier supports. Because today's port multipli= ers=20 - support up to fifteen SATA devices, this number can be as large as fifte= en. The IDE =20 - bus driver is required to scan for the presence of port multipliers behi= nd an SATA=20 - controller and enumerate up to MaxDevices number of devices behind the p= ort=20 - multiplier. =20 - =20 - In this context, the devices behind a port multiplier constitute a chann= el. =20 - =20 + up to 16 devices on the other side. If a SATA port out of the IDE contro= ller + is connected to a port multiplier, MaxDevices will be set to the number = of SATA + devices that the port multiplier supports. Because today's port multipli= ers + support up to fifteen SATA devices, this number can be as large as fifte= en. The IDE + bus driver is required to scan for the presence of port multipliers behi= nd an SATA + controller and enumerate up to MaxDevices number of devices behind the p= ort + multiplier. + + In this context, the devices behind a port multiplier constitute a chann= el. + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROT= OCOL instance. @param[in] Channel Zero-based channel number. - @param[out] Enabled TRUE if this channel is enabled. Disabled chan= nels=20 + @param[out] Enabled TRUE if this channel is enabled. Disabled chan= nels are not scanned to see if any devices are prese= nt. @param[out] MaxDevices The maximum number of IDE devices that the bus = driver - can expect on this channel. For the ATA/ATAPI=20 - specification, version 6, this number will eith= er be=20 - one or two. For Serial ATA (SATA) configuration= s with a=20 + can expect on this channel. For the ATA/ATAPI + specification, version 6, this number will eith= er be + one or two. For Serial ATA (SATA) configuration= s with a port multiplier, this number can be as large as= fifteen. =20 @retval EFI_SUCCESS Information was returned without any err= ors. @@ -228,13 +228,13 @@ IdeInitGetChannelInfo ( /** The notifications from the driver entity that it is about to enter a cer= tain phase of the IDE channel enumeration process. - =20 - This function can be used to notify the IDE controller driver to perform=20 - specific actions, including any chipset-specific initialization, so that= the=20 - chipset is ready to enter the next phase. Seven notification points are = defined=20 - at this time.=20 - =20 - More synchronization points may be added as required in the future. =20 + + This function can be used to notify the IDE controller driver to perform + specific actions, including any chipset-specific initialization, so that= the + chipset is ready to enter the next phase. Seven notification points are = defined + at this time. + + More synchronization points may be added as required in the future. =20 @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCOL= instance. @param[in] Phase The phase during enumeration. @@ -243,9 +243,9 @@ IdeInitGetChannelInfo ( @retval EFI_SUCCESS The notification was accepted without an= y errors. @retval EFI_UNSUPPORTED Phase is not supported. @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). - @retval EFI_NOT_READY This phase cannot be entered at this tim= e; for=20 - example, an attempt was made to enter a = Phase=20 - without having entered one or more previ= ous=20 + @retval EFI_NOT_READY This phase cannot be entered at this tim= e; for + example, an attempt was made to enter a = Phase + without having entered one or more previ= ous Phase. =20 **/ @@ -261,32 +261,32 @@ IdeInitNotifyPhase ( /** Submits the device information to the IDE controller driver. =20 - This function is used by the driver entity to pass detailed information = about=20 - a particular device to the IDE controller driver. The driver entity obta= ins=20 + This function is used by the driver entity to pass detailed information = about + a particular device to the IDE controller driver. The driver entity obta= ins this information by issuing an ATA or ATAPI IDENTIFY_DEVICE command. Ide= ntifyData - is the pointer to the response data buffer. The IdentifyData buffer is o= wned=20 - by the driver entity, and the IDE controller driver must make a local co= py=20 - of the entire buffer or parts of the buffer as needed. The original Iden= tifyData=20 + is the pointer to the response data buffer. The IdentifyData buffer is o= wned + by the driver entity, and the IDE controller driver must make a local co= py + of the entire buffer or parts of the buffer as needed. The original Iden= tifyData buffer pointer may not be valid when - =20 + - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() or - EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() is called at a lat= er point. - =20 - The IDE controller driver may consult various fields of EFI_IDENTIFY_DAT= A to=20 - compute the optimum mode for the device. These fields are not limited to= the=20 - timing information. For example, an implementation of the IDE controller= driver=20 - may examine the vendor and type/mode field to match known bad drives. =20 - =20 - The driver entity may submit drive information in any order, as long as = it=20 - submits information for all the devices belonging to the enumeration gro= up=20 + + The IDE controller driver may consult various fields of EFI_IDENTIFY_DAT= A to + compute the optimum mode for the device. These fields are not limited to= the + timing information. For example, an implementation of the IDE controller= driver + may examine the vendor and type/mode field to match known bad drives. + + The driver entity may submit drive information in any order, as long as = it + submits information for all the devices belonging to the enumeration gro= up before EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() is called for an= y device in that enumeration group. If a device is absent, EFI_IDE_CONTROLLER_INI= T_PROTOCOL.SubmitData() - should be called with IdentifyData set to NULL. The IDE controller driv= er may=20 - not have any other mechanism to know whether a device is present or not.= Therefore,=20 - setting IdentifyData to NULL does not constitute an error condition.=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once fo= r a=20 - given (Channel, Device) pair. =20 - =20 + should be called with IdentifyData set to NULL. The IDE controller driv= er may + not have any other mechanism to know whether a device is present or not.= Therefore, + setting IdentifyData to NULL does not constitute an error condition. + EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitData() can be called only once fo= r a + given (Channel, Device) pair. + @param[in] This A pointer to the EFI_IDE_CONTROLLER_INIT_PROTO= COL instance. @param[in] Channel Zero-based channel number. @param[in] Device Zero-based device number on the Channel. @@ -310,31 +310,31 @@ IdeInitSubmitData ( /** Disqualifies specific modes for an IDE device. =20 - This function allows the driver entity or other drivers (such as platfor= m=20 + This function allows the driver entity or other drivers (such as platform drivers) to reject certain timing modes and request the IDE controller d= river - to recalculate modes. This function allows the driver entity and the IDE=20 - controller driver to negotiate the timings on a per-device basis. This f= unction=20 - is useful in the case of drives that lie about their capabilities. An ex= ample=20 - is when the IDE device fails to accept the timing modes that are calcula= ted=20 + to recalculate modes. This function allows the driver entity and the IDE + controller driver to negotiate the timings on a per-device basis. This f= unction + is useful in the case of drives that lie about their capabilities. An ex= ample + is when the IDE device fails to accept the timing modes that are calcula= ted by the IDE controller driver based on the response to the Identify Drive= command. =20 - If the driver entity does not want to limit the ATA timing modes and lea= ve that=20 - decision to the IDE controller driver, it can either not call this funct= ion for=20 - the given device or call this function and set the Valid flag to FALSE f= or all=20 + If the driver entity does not want to limit the ATA timing modes and lea= ve that + decision to the IDE controller driver, it can either not call this funct= ion for + the given device or call this function and set the Valid flag to FALSE f= or all modes that are listed in EFI_ATA_COLLECTIVE_MODE. - =20 - The driver entity may disqualify modes for a device in any order and any= number=20 + + The driver entity may disqualify modes for a device in any order and any= number of times. - =20 - This function can be called multiple times to invalidate multiple modes = of the=20 - same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the A= TA/ATAPI=20 - specification for more information on PIO modes. =20 - =20 + + This function can be called multiple times to invalidate multiple modes = of the + same type (e.g., Programmed Input/Output [PIO] modes 3 and 4). See the A= TA/ATAPI + specification for more information on PIO modes. + For Serial ATA (SATA) controllers, this member function can be used to d= isqualify a higher transfer rate mode on a given channel. For example, a platform = driver - may inform the IDE controller driver to not use second-generation (Gen2)= speeds=20 + may inform the IDE controller driver to not use second-generation (Gen2)= speeds for a certain SATA drive. - =20 + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_PROTOCO= L instance. @param[in] Channel The zero-based channel number. @param[in] Device The zero-based device number on the Channel. @@ -345,7 +345,7 @@ IdeInitSubmitData ( @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). @retval EFI_INVALID_PARAMETER Device is invalid. @retval EFI_INVALID_PARAMETER IdentifyData is NULL. - =20 + **/ EFI_STATUS EFIAPI @@ -361,39 +361,39 @@ IdeInitDisqualifyMode ( Returns the information about the optimum modes for the specified IDE de= vice. =20 This function is used by the driver entity to obtain the optimum ATA mod= es for - a specific device. The IDE controller driver takes into account the fol= lowing=20 + a specific device. The IDE controller driver takes into account the fol= lowing while calculating the mode: - The IdentifyData inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitDa= ta() - The BadModes inputs to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMo= de() =20 - The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.S= ubmitData()=20 - for all the devices that belong to an enumeration group before calling=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the s= ame group. =20 - =20 - The IDE controller driver will use controller- and possibly platform-spe= cific=20 - algorithms to arrive at SupportedModes. The IDE controller may base its=20 - decision on user preferences and other considerations as well. This func= tion=20 - may be called multiple times because the driver entity may renegotiate t= he mode=20 + The driver entity is required to call EFI_IDE_CONTROLLER_INIT_PROTOCOL.S= ubmitData() + for all the devices that belong to an enumeration group before calling + EFI_IDE_CONTROLLER_INIT_PROTOCOL.CalculateMode() for any device in the s= ame group. + + The IDE controller driver will use controller- and possibly platform-spe= cific + algorithms to arrive at SupportedModes. The IDE controller may base its + decision on user preferences and other considerations as well. This func= tion + may be called multiple times because the driver entity may renegotiate t= he mode with the IDE controller driver using EFI_IDE_CONTROLLER_INIT_PROTOCOL.Di= squalifyMode(). - =20 - The driver entity may collect timing information for various devices in = any=20 + + The driver entity may collect timing information for various devices in = any order. The driver entity is responsible for making sure that all the dep= endencies - are satisfied. For example, the SupportedModes information for device A = that=20 - was previously returned may become stale after a call to=20 + are satisfied. For example, the SupportedModes information for device A = that + was previously returned may become stale after a call to EFI_IDE_CONTROLLER_INIT_PROTOCOL.DisqualifyMode() for device B. - =20 - The buffer SupportedModes is allocated by the callee because the caller = does=20 - not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE= _MODE=20 - is defined in a way that allows for future extensibility and can be of v= ariable=20 - length. This memory pool should be deallocated by the caller when it is = no=20 - longer necessary. =20 - =20 - The IDE controller driver for a Serial ATA (SATA) controller can use thi= s=20 - member function to force a lower speed (first-generation [Gen1] speeds o= n a=20 - second-generation [Gen2]-capable hardware). The IDE controller driver c= an=20 - also allow the driver entity to stay with the speed that has been negoti= ated=20 + + The buffer SupportedModes is allocated by the callee because the caller = does + not necessarily know the size of the buffer. The type EFI_ATA_COLLECTIVE= _MODE + is defined in a way that allows for future extensibility and can be of v= ariable + length. This memory pool should be deallocated by the caller when it is = no + longer necessary. + + The IDE controller driver for a Serial ATA (SATA) controller can use this + member function to force a lower speed (first-generation [Gen1] speeds o= n a + second-generation [Gen2]-capable hardware). The IDE controller driver c= an + also allow the driver entity to stay with the speed that has been negoti= ated by the physical layer. - =20 + @param[in] This The pointer to the EFI_IDE_CONTROLLER_INIT_= PROTOCOL instance. @param[in] Channel A zero-based channel number. @param[in] Device A zero-based device number on the Channel. @@ -401,13 +401,13 @@ IdeInitDisqualifyMode ( =20 @retval EFI_SUCCESS SupportedModes was returned. @retval EFI_INVALID_PARAMETER Channel is invalid (Channel >=3D Channel= Count). - @retval EFI_INVALID_PARAMETER Device is invalid.=20 + @retval EFI_INVALID_PARAMETER Device is invalid. @retval EFI_INVALID_PARAMETER SupportedModes is NULL. - @retval EFI_NOT_READY Modes cannot be calculated due to a lack= of=20 - data. This error may happen if=20 - EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitD= ata()=20 - and EFI_IDE_CONTROLLER_INIT_PROTOCOL.Dis= qualifyData()=20 - were not called for at least one drive i= n the=20 + @retval EFI_NOT_READY Modes cannot be calculated due to a lack= of + data. This error may happen if + EFI_IDE_CONTROLLER_INIT_PROTOCOL.SubmitD= ata() + and EFI_IDE_CONTROLLER_INIT_PROTOCOL.Dis= qualifyData() + were not called for at least one drive i= n the same enumeration group. =20 **/ @@ -425,9 +425,9 @@ IdeInitCalculateMode ( Commands the IDE controller driver to program the IDE controller hardware so that the specified device can operate at the specified mode. =20 - This function is used by the driver entity to instruct the IDE controlle= r=20 - driver to program the IDE controller hardware to the specified modes. Th= is=20 - function can be called only once for a particular device. For a Serial A= TA=20 + This function is used by the driver entity to instruct the IDE controller + driver to program the IDE controller hardware to the specified modes. Th= is + function can be called only once for a particular device. For a Serial A= TA (SATA) Advanced Host Controller Interface (AHCI) controller, no controll= er- specific programming may be required. =20 diff --git a/OvmfPkg/SataControllerDxe/SataControllerDxe.inf b/OvmfPkg/Sata= ControllerDxe/SataControllerDxe.inf index fbfe7145b043..2bc416971b79 100644 --- a/OvmfPkg/SataControllerDxe/SataControllerDxe.inf +++ b/OvmfPkg/SataControllerDxe/SataControllerDxe.inf @@ -1,10 +1,10 @@ ## @file -# =20 +# # Component description file for the Sata Controller driver. # # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent -# =20 +# ## =20 [Defines] @@ -39,5 +39,5 @@ [LibraryClasses] UefiBootServicesTableLib =20 [Protocols] - gEfiPciIoProtocolGuid =20 + gEfiPciIoProtocolGuid gEfiIdeControllerInitProtocolGuid diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index 3914355cd17b..bae9764577f0 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -51,7 +51,7 @@ TemporaryRamMigration ( =20 // // -// =20 +// EFI_PEI_TEMPORARY_RAM_SUPPORT_PPI mTemporaryRamSupportPpi =3D { TemporaryRamMigration }; @@ -74,7 +74,7 @@ IA32_IDT_GATE_DESCRIPTOR mIdtEntryTemplate =3D { 0x0, // Reserved_0 IA32_IDT_GATE_TYPE_INTERRUPT_32, // GateType 0xffff // OffsetHigh - } =20 + } }; =20 /** @@ -685,7 +685,7 @@ FindAndReportEntryPoints ( ASSERT_EFI_ERROR (Status); =20 FindPeiCoreImageBase (BootFirmwareVolumePtr, &PeiCoreImageBase); - =20 + ZeroMem ((VOID *) &ImageContext, sizeof (PE_COFF_LOADER_IMAGE_CONTEXT)); // // Report SEC Core debug information when remote debug is enabled @@ -753,7 +753,7 @@ SecCoreStartupWithStack ( =20 // // Initialize IDT - // =20 + // IdtTableInStack.PeiService =3D NULL; for (Index =3D 0; Index < SEC_IDT_ENTRY_COUNT; Index ++) { CopyMem (&IdtTableInStack.IdtTable[Index], &mIdtEntryTemplate, sizeof = (mIdtEntryTemplate)); @@ -814,13 +814,13 @@ SecCoreStartupWithStack ( // InitializeApicTimer (0, MAX_UINT32, TRUE, 5); DisableApicTimerInterrupt (); - =20 + // // Initialize Debug Agent to support source level debug in SEC/PEI phase= s before memory ready. // InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, &SecCoreData, SecStar= tupPhase2); } - =20 + /** Caller provided function to be invoked at the end of InitializeDebugAgen= t(). =20 @@ -840,9 +840,9 @@ SecStartupPhase2( EFI_SEC_PEI_HAND_OFF *SecCoreData; EFI_FIRMWARE_VOLUME_HEADER *BootFv; EFI_PEI_CORE_ENTRY_POINT PeiCoreEntryPoint; - =20 + SecCoreData =3D (EFI_SEC_PEI_HAND_OFF *) Context; - =20 + // // Find PEI Core entry point. It will report SEC and Pei Core debug info= rmation if remote debug // is enabled. @@ -856,7 +856,7 @@ SecStartupPhase2( // Transfer the control to the PEI core // (*PeiCoreEntryPoint) (SecCoreData, (EFI_PEI_PPI_DESCRIPTOR *)&mPrivateDi= spatchTable); - =20 + // // If we get here then the PEI Core returned, which is not recoverable. // @@ -881,23 +881,23 @@ TemporaryRamMigration ( DEBUG_AGENT_CONTEXT_POSTMEM_SEC DebugAgentContext; BOOLEAN OldStatus; BASE_LIBRARY_JUMP_BUFFER JumpBuffer; - =20 + DEBUG ((EFI_D_INFO, "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n", TemporaryMemoryBase, PermanentMemoryBase, (UINT64)CopySize )); - =20 + OldHeap =3D (VOID*)(UINTN)TemporaryMemoryBase; NewHeap =3D (VOID*)((UINTN)PermanentMemoryBase + (CopySize >> 1)); - =20 + OldStack =3D (VOID*)((UINTN)TemporaryMemoryBase + (CopySize >> 1)); NewStack =3D (VOID*)(UINTN)PermanentMemoryBase; =20 DebugAgentContext.HeapMigrateOffset =3D (UINTN)NewHeap - (UINTN)OldHeap; DebugAgentContext.StackMigrateOffset =3D (UINTN)NewStack - (UINTN)OldSta= ck; - =20 + OldStatus =3D SaveAndSetDebugTimerInterrupt (FALSE); InitializeDebugAgent (DEBUG_AGENT_INIT_POSTMEM_SEC, (VOID *) &DebugAgent= Context, NULL); =20 @@ -910,7 +910,7 @@ TemporaryRamMigration ( // Migrate Stack // CopyMem (NewStack, OldStack, CopySize >> 1); - =20 + // // Rebase IDT table in permanent memory // @@ -921,16 +921,16 @@ TemporaryRamMigration ( =20 // // Use SetJump()/LongJump() to switch to a new stack. - //=20 + // if (SetJump (&JumpBuffer) =3D=3D 0) { #if defined (MDE_CPU_IA32) JumpBuffer.Esp =3D JumpBuffer.Esp + DebugAgentContext.StackMigrateOffs= et; JumpBuffer.Ebp =3D JumpBuffer.Ebp + DebugAgentContext.StackMigrateOffs= et; -#endif =20 +#endif #if defined (MDE_CPU_X64) JumpBuffer.Rsp =3D JumpBuffer.Rsp + DebugAgentContext.StackMigrateOffs= et; JumpBuffer.Rbp =3D JumpBuffer.Rbp + DebugAgentContext.StackMigrateOffs= et; -#endif =20 +#endif LongJump (&JumpBuffer, (UINTN)-1); } =20 --=20 2.20.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47627): https://edk2.groups.io/g/devel/message/47627 Mute This Topic: https://groups.io/mt/34202575/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-