From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe41::62d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BA8AB81A10 for ; Fri, 6 Jan 2017 08:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8tqnZD0Y5iWDVsSoUbzqbxyN0OVZzUMOzGZpkBodu9g=; b=3mOmJr0Ca+hXAg1EqemBi+qvbQClotu7e8OaU+tb85UOCmALmWFeB63+n61nPeMVAMCM0aQWM8y3GgSoDiJPGQGziOcehYVzGQAX8LjCBFI1thYHdfL1K6Fue+N34QsKiKKUR1ffIQh/D/z90OhaFIPqMzGrttQI7YtNvlWseHY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by BN6PR12MB1235.namprd12.prod.outlook.com (10.168.227.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Fri, 6 Jan 2017 16:25:47 +0000 From: Leo Duran To: CC: , , , , , , , , , , , , Leo Duran Date: Fri, 6 Jan 2017 10:24:59 -0600 Message-ID: <1483719899-16125-10-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483719899-16125-1-git-send-email-leo.duran@amd.com> References: <1483719899-16125-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BY2PR1001CA0066.namprd10.prod.outlook.com (10.164.163.34) To BN6PR12MB1235.namprd12.prod.outlook.com (10.168.227.21) X-MS-Office365-Filtering-Correlation-Id: d0d5bcfe-f2b0-49b7-7598-08d43650aca9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR12MB1235; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 3:XK2FY5RvWHAo7Gjmf4WcwA8JJ9k9nCrUOxcq8lVmevDjufm94Vcc3b7BBZqBVHdMayWyjxk1K2YBExqPRVINYGlu0CGSG1JVGvkKkv0AU/DLhsto1qVF95kY5vIYq5rZBU/tioh5gWunz0QXdF7n7h6SCOuCK5sLvlvmLdqoX/9pZv4VIM2MzwQYQiA6oUxGPhvXxV693nXID4dFe3P3HL7chrvBBIXv3ld1PuhT1qOqVwrLUcvXC7NiaoZ+C0KshOzZPL9qXuCoWR8rd+BZOA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 25:aCLXF1hCHFJCh6/8sOw8UYxE9SSLskOZDgM0s7i+YiVcfLiEM2qUCWE+gXD2CQJmBwG4ORlnTfskte0zF4pxhDhWBvR8Y8L8k7A0Tq5FN5MR+K9k3dra40LJdQscUEAnTvqHv28Yw++e5gwaqqNHKQNBRsIPNyncUDixc1OTlUFEdQ075dnW1pxp5jqVIgHJvvQ6Ot7+4Uk2gzLns4WOR0bLtwpN16LDUC3Eoi4cZMT2YO1bnWZukIvdV0iI/lLOcrFaCGRtJFGUMQltom96vYBqhMyvHiBMheG9J1FM2tL5YY05ixPGed2uYfxBUtcfrGvnGDCxtUX9i2TxXDPNKsZlOIbx840++tujphLj8ERG21rjjK7+KEkjbE75t8r7p8XqUJTzEL27HA0yOqf4RZdmjPdf6qHwZc+MJmUfrXZiCgyFC1hxa18Tw+p+sDd9PTL62GMu9Xmc+Gn/rdgCcYferbzkdLIszpOwSpm7gKry3YhpJJUnofNbZkG6Fteu2yBI4mWLlemb1/nsP4fcUJhAK5L5qRyBOpXsyx+Bpt1QNY9+yUkWqqjF8kTNXmu16JW7k1xxzjY+9G3ui7oga9q8gJO8Gu1bFX8sZ+tokPGZiun8Oj40KGyIxPcaMal+k2DIkYo5vtkBXusvYD1mTFnen0ph+XXR5SpAeOTTi4PTXCrh6/OiFlaq7MJTHH3q4SXWWu7fRTB+e6csWe6e+EDidcyryXSBhFzojPGv6Tb5uGnWGnBTBKaSURYRq8sMWV4chtT0opr/TF44OkIFzhUEqrbjg7nbF2AYvMawH/pmeyNIPC2rX6uwB5OouhPn X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 31:VQxUAZcxgKm4xtymgvJjouZq6k7vnyMjqXxWNItDGWE8AxXdHsWm8M6V0H2WBDlPcPt9XFsBCtnqtGH/b5R7l0jtYw4+CIqNAcXFca1JBSW1Z+kXCMdD16NydbGciopG+xfy23wrIGezYOgP8ZMbOvtdZ0piArHVi6Yj4vUC5dzRcKHg9gf3P0yEzOE4M+hR0Rhe97VH76TlYXhyApz3Es7CNGQJ7HoIh7RuqPKEa3Bxc8St59F9Wxn33vmemEpGyZUWwKlKFR8WpA1YqVRvMg==; 20:ReJdEy+obmORqEOz3h3hYZjCOTLv3eNRn2NuH7MrKKJpUvEoSOGSjajCtt718So/2rt5zH/KWsB2ygBpyY1Ayzg5fbIHDkX27MrWI9uVRtnfuy2v6T/h8koZQ070N0oH3yfZpzkJ/QE58BC6cPIufERr07XZOUhJGJQKNvuCQT5Q2kqyo4b/TYCsEatPOz41Mm3zsy5YntXRF0jC1WaqEGrWu0Xn/iOaM9gy6v954Zpi5jRe+69fwV6Y1Ej7AwLV8LnrCOP25VkQPRgB6gluZzFB4Db2njcwP45IY2ZGD7FTfxGal9dwm/Ydiau8YKZmao3gS7zbdn7QH+Q3xIa/Tx8Xe4qGsp4jxkU1H/yTaPxAHmaWdQHQ1zuDtq0K1i5Ov8EzvkUZe6E9O2jkSa24oIX/wdtrvgjhBLTR6VAQ6BRJRnFav06RzPg0dBvuXprM1SUu+k7EpoGWumoFBoZrH+hazbIprc6OFWqcm63ALc9yD2OI8ss1yv5y/BkeAmxa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148); SRVR:BN6PR12MB1235; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1235; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 4:AbrtTDT/flaYLNISoX+Zs5Z1HHBkX4oOmtiuaRbl05dMqtplOtgnbwJAgZ3kJpX9UzUvzqvQetaK7f1ZrFOh6Vba/IgeqjwYKml7VhV0dOevNq/kg8bo0NjWJBXsY2+9bX1s8QzvvHKLF6jOL7IiR9zUhI6k1I1B+GC8YobKqPaQiuOOieIVqcVtVkURW0XPCUtJtvb5p1Lg9ioQDZcsbuEn6rIT/+5lMDIWJTruAij+9UMfjlNTpDiLie0nB+H/ILAh0vBDwOJwWfPIcxN6Hnu1zDZiPhJASfgxAhAyKaLT5HBx31vJ0M5N/WzyuR+MZn7l7M19v8lNxBc8l5pQsDE4KpzvJIYM5oukGjF3K+4e9Yt5pGxh3r8Y+D1GiAQsXAETCdudoWyD2oT3OFLLl8iomkayTB2Xo6LWT+dcp2i0a3G+Nc5gshwVv4BOoa1TVwLMNQkkzdycvWchWA6fHsaLVvVWbf/6dLRnH7MgGiUUpNvxtdX5VVtehBhZDhReEbS0IsHHCJV4+7i7RUlLdzOymF9SFsCy/aGWdIs+YvMKXGZy/HxqrtZndZn0YArduvGWBihgqdTmdCQOTxrE3JG/78xxDKAcJVCDhUF5Nk0v53X90WP0JqXQCTpiYKgT X-Forefront-PRVS: 01792087B6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6029001)(7916002)(39450400003)(39850400002)(39860400002)(39410400002)(39840400002)(189002)(199003)(54906002)(6306002)(33646002)(6486002)(6116002)(97736004)(2906002)(42186005)(68736007)(7736002)(66066001)(36756003)(53416004)(50226002)(76176999)(2950100002)(110136003)(50986999)(6916009)(92566002)(5003940100001)(189998001)(101416001)(81166006)(47776003)(15395725005)(4326007)(5660300001)(2351001)(6666003)(81156014)(106356001)(86362001)(305945005)(8676002)(38730400001)(50466002)(3846002)(25786008)(7416002)(48376002)(105586002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1235; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1235; 23:eadEecje8zZ6VkcjpNNNHta3lcRvUOYxvR0XyFL/M?= =?us-ascii?Q?xyCjd3k0uCG0MyPTOHZYyyoWaqK1YfsHiGUoVT4L5scXMCDAmy5Ty53i73l4?= =?us-ascii?Q?tCajGCY7tEwoXijbjoiLKxDMUd0EthPFeEtKNJGo/Rapp4k6GfucecKSyqIC?= =?us-ascii?Q?C6piKjYu5/Ue0dsi8AicW/DTGRG6wQPU9W6VMpDnqWxqbRpNTitBL/Y3v50T?= =?us-ascii?Q?S4Imady6WaaWnwOYzqV8f/MB38bLXxSfGwZcehmnsecf8JHTXu9wb7HznaAB?= =?us-ascii?Q?C85ZGuCoSQXsI0Yb1ZesmaR6HUgixbuZ1VahL/ol17hhxyy9nN3IsBzSOU6P?= =?us-ascii?Q?LiQJYJ5EiFr58HYndYRE04fh1PjqIPz1zREgUcoUTxamHfVlC3OYxtMA/MKl?= =?us-ascii?Q?r2w/vnqhYfjJB7GZbjOSD5xAOECakHefmGf8IQjb8a0hm/PTX0yDCxhOibBg?= =?us-ascii?Q?EtMNN3v5LgpLWV9fITqOo4lmI/gtRQ+WNRb7Htp0ESBT9rpz6ZtVoU4GZ1Nm?= =?us-ascii?Q?/KzkoD/QtT0qErlind3qwicG8KAR6SAqS2Ps4C2S/n12UU+gTIkkY5e6MhT4?= =?us-ascii?Q?roxahhkmS6j620nKVjf5TNRPKr1UNj7F7z0j11kGjcDaz29bjEV0VlDn2K1b?= =?us-ascii?Q?by/Cha01g9QPJ6/FKvde+6QZPXkFlQnZqVMwNvFS3KvtLPg1zopBQoa1W6eK?= =?us-ascii?Q?gzOTQQJ0BFe+Z/bcYrtHiX6DREQIXGa87pAAi+yukbC6MCfMoiJJJ7OhYSZD?= =?us-ascii?Q?HqwBjgZi4preTiSDw1szHVJBvvLhv9fv1BwltbO2Lq7Tv/E4pimWYOz0XE3F?= =?us-ascii?Q?q4ATp03dhUh77F6xhPv/5ZS/pOb4lBXowZUPDIsUPslI4wjvN5iTCyNJQRUw?= =?us-ascii?Q?A9XNqnF5VMuPky6U3JVlYtHC9Cdha9bXTKYcN5bZhwiMSqVc+HzGlZ9KjGGZ?= =?us-ascii?Q?JdFS6MSCbQ6E/tz++mVwa9YO5YiFqihQ5GqpFh5WGrR8kioBCskFtqnPr6bR?= =?us-ascii?Q?t+edhWHcrzaH4NnqJsSIXEzYaur+5Rqn0rEw7Ntg21cVMRQY1Mjrpeqh/Rkg?= =?us-ascii?Q?YUcqp8IWwfoD2+rB9OAZf9YD3M0CApC8kzs44shUwfIBoJKaBw4epESJ14xc?= =?us-ascii?Q?UUjOSNZRJCY/Wbn53zHOeqY+IJB2uPwYDY2rmGtliyJ3T4XnuPSRWHLzQO32?= =?us-ascii?Q?895mIT+Ru6JF01FZUGHweGFic1zt7RyUdqlzil0hX7PA5zFfMKidQhrcpnQL?= =?us-ascii?Q?4zdVLBEnFH2un3tRpB6b7m0JQIJr4ICtzF34F2JErEvyCTFzLg7DJvCIE2W+?= =?us-ascii?Q?EvN4XFpmS93+uL5rEtuKdA=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 6:9Rojf9f52oMxLash/7BrhTsPFhZUEgmFkEi/w3+vq9N3QsB+oz7LvxK136wDPq4jNdUF10pQejS/Y2k4PHRMShZ4vGQPDjpS4Yalv+Uh/2tuE6XgCl83dPM++ZrJlWMnq9w59rFye4uhCaHxgktE9XZNzVXN8KW5k4CdHKTMoiZxKgfg4w6dMAKp+lJ2LSRhB/Hw1/ulwHBR3vNhLzh7aeXgpVwmbsL0kETMQ6WEsHzOTK9CpUjBL9XTpl5SyFMUtWnfJA1S8/GVJxtXRg5dYE6uU42x+vbXA+tOEXMKBBshCq2N4LKYwIrLRYKU3n43m4MAAa+MCBATkSapgQHPbzO/aYm89ycMod9VDYFXI15DLigloc6whqtT1kx6RoHn3JsJQ7DM8cO9Tn6SBeeVYd2Fov18mIYnbgb1gYhWf6MX7bP4DSqZxXx/3wuf2XnvjBKPPD3erNghMWscGB+5jw==; 5:Hc4mYjfJGmXOezPxD9ZFRzpf3GpAhIb5aLBC2pyn3Kb5iZXi/CGkv507bQ89OWrScy/i6mtkUoy0MrZWpIjELnj3dFVQBpWmQDhKg9k0D+mkfwr7CsEWPiYP3fV69/2ZMQPwHSTewkWi/7pHxYTvUA==; 24:I49glCBe+kaJs4T8ABENa95mvIvtVjijBvq/P6MzL407a7L2Qc5O2u0wKDYJl3vgLt7qWRZzRllH2QoLQoJ+3Wkhns2gg6QxLllftZtkv0Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 7:oSVDOo+B9dQ4HRIL32tJ8A8FYiIcyYsD6fNdjNBphCnUZinMlHD4XSSYQf2swNoshn3LsaqIB+M6nMZAWt3HM1bZSEvtozFpTpOemk82wd+H57BE+glB/eK64E1T3edmr6vdc/VR+PyRX8W/Ymyl64Vaagh4taBjO6g3v+4DZ4urg/5mTDpSrLq83TOSrCUN72EFZbiHv/Z8JqN2pEKDgSrw8jISeI2JaHtPjK48o6PIj4UA2FjBriDzKWEsFUdvSm6CkMzf/MsF0VLZpH8ApAezxdwN7+9UhfoHLxGuOUAMID/0VrJtvvaxCYjSaV0soGJ1uDojAC955PLt5oCcBLtPq4mDks7R1vc+KNTJ8fOJaEwKflbVCbPPlKck0R1/9zR6QnXa0FbcTM7eCSSthwInYNNuYE6BbGdzsrRnLr9g1h+6VoP0cd1LpvcB9pgiUab2d4lDvgIsqpfE7OHk3A==; 20:gYrc7VSTVTpkOzvqJdQQ9B0upAj5bgtb+K7bXvtCEW6/yToFSAFmfIiyk3vfAW1uwkAWLGrlNDauOcyr2/Wnr1HmJKOnUJqrdz9gW07xavh1Wxa3Mii4N6a9JXH+w2fKdxhk4Y0aXlMxPJ3arTY5z/dlm0LeGHTw1csbFLHUvobk7MJHehGlA+P9ZeqMmK7xMuey6X4pX4uomPBxyQ9brJk4hJYOEIATaUC5fHueetvAeGhuWa8SiJlbG86GTGcM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2017 16:25:47.1158 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1235 Subject: [PATCH v4 9/9] Modify QemuFwCfgLib to use new BaseIoFifoLib library. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2017 16:25:53 -0000 Content-Type: text/plain From: Brijesh Singh Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Signed-off-by: Leo Duran --- OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm | 55 ----------------------- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 55 +---------------------- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 8 +--- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf | 8 +--- OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm | 52 --------------------- 5 files changed, 6 insertions(+), 172 deletions(-) delete mode 100644 OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm delete mode 100644 OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm deleted file mode 100644 index faa22e9..0000000 --- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm +++ /dev/null @@ -1,55 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2013, Intel Corporation. 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. -; -;------------------------------------------------------------------------------ - - SECTION .text - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo8) -ASM_PFX(IoReadFifo8): - - mov dx, [esp + 4] - mov ecx, [esp + 8] - push edi - mov edi, [esp + 16] -rep insb - pop edi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, -; IN UINTN Size, -; IN VOID *Buffer -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo8) -ASM_PFX(IoWriteFifo8): - - mov dx, [esp + 4] - mov ecx, [esp + 8] - push esi - mov esi, [esp + 16] -rep outsb - pop esi - ret - diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c index 0bbf121..d2f7fc6 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -2,6 +2,7 @@ Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
Copyright (C) 2013, Red Hat, Inc. + Copyright (c) 2017, AMD Inc. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -18,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -26,59 +28,6 @@ /** - Reads an 8-bit I/O port fifo into a block of memory. - - Reads the 8-bit I/O fifo port specified by Port. - - The port is read Count times, and the read data is - stored in the provided Buffer. - - This function must guarantee that all I/O read and write operations are - serialized. - - If 8-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to read. - @param Count The number of times to read I/O port. - @param Buffer The buffer to store the read data into. - -**/ -VOID -EFIAPI -IoReadFifo8 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - -/** - Writes an 8-bit I/O port fifo from a block of memory. - - Writes the 8-bit I/O fifo port specified by Port. - - The port is written Count times, and the data are obtained - from the provided Buffer. - - This function must guarantee that all I/O read and write operations are - serialized. - - If 8-bit I/O port operations are not supported, then ASSERT(). - - @param Port The I/O port to read. - @param Count The number of times to read I/O port. - @param Buffer The buffer to store the read data into. - -**/ -VOID -EFIAPI -IoWriteFifo8 ( - IN UINTN Port, - IN UINTN Count, - OUT VOID *Buffer - ); - - -/** Selects a firmware configuration item for reading. Following this call, any data read from this item will start from diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf index 66ac778..e48c639 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -4,6 +4,7 @@ # # Copyright (C) 2013, Red Hat, Inc. # Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Inc. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -36,12 +37,6 @@ [Sources] QemuFwCfgLib.c QemuFwCfgPeiDxe.c -[Sources.IA32] - Ia32/IoLibExAsm.nasm - -[Sources.X64] - X64/IoLibExAsm.nasm - [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec @@ -51,5 +46,6 @@ [LibraryClasses] BaseMemoryLib DebugLib IoLib + IoFifoLib MemoryAllocationLib diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf index c1d6a54..6275ba9 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf @@ -4,6 +4,7 @@ # # Copyright (C) 2013, Red Hat, Inc. # Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Inc. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -34,12 +35,6 @@ [Sources] QemuFwCfgLib.c QemuFwCfgSec.c -[Sources.IA32] - Ia32/IoLibExAsm.nasm - -[Sources.X64] - X64/IoLibExAsm.nasm - [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec @@ -49,5 +44,6 @@ [LibraryClasses] BaseMemoryLib DebugLib IoLib + IoFifoLib MemoryAllocationLib diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm deleted file mode 100644 index f1078f2..0000000 --- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm +++ /dev/null @@ -1,52 +0,0 @@ -;------------------------------------------------------------------------------ -; -; Copyright (c) 2006 - 2013, Intel Corporation. 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. -; -;------------------------------------------------------------------------------ - - DEFAULT REL - SECTION .text - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoReadFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoReadFifo8) -ASM_PFX(IoReadFifo8): - - xchg rcx, rdx - xchg rdi, r8 ; rdi: buffer address; r8: save rdi -rep insb - mov rdi, r8 ; restore rdi - ret - -;------------------------------------------------------------------------------ -; VOID -; EFIAPI -; IoWriteFifo8 ( -; IN UINTN Port, // rcx -; IN UINTN Size, // rdx -; IN VOID *Buffer // r8 -; ); -;------------------------------------------------------------------------------ -global ASM_PFX(IoWriteFifo8) -ASM_PFX(IoWriteFifo8): - - xchg rcx, rdx - xchg rsi, r8 ; rdi: buffer address; r8: save rdi -rep outsb - mov rsi, r8 ; restore rdi - ret - -- 1.9.1