From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe46::623]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3286581BCF for ; Thu, 12 Jan 2017 22:21:34 -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=tJI0xwUHvf5r2Kp7IJ3oRJV+ZzpAvwdN2RzeWjS0sjc=; b=072cI0Yv5KkCqgY9LK0T5UAEqTqARoFhi5ENJXMP+mNGv/+KL3WPjTH9Gid9YIAEXb37CzTXt182JdHq/zCI++T/0OOQlN4OAgzt8+0kPb1z/6XonvBswmFJem8CdrQpI8k21thXIJlQI4jI8EZfUkyddcFU/p7/JQuN0ZCpsWQ= 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.829.7; Fri, 13 Jan 2017 06:21:31 +0000 From: Leo Duran To: CC: , , , , , , Leo Duran Date: Fri, 13 Jan 2017 00:21:03 -0600 Message-ID: <1484288463-7109-11-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1484288463-7109-1-git-send-email-leo.duran@amd.com> References: <1484288463-7109-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR14CA0015.namprd14.prod.outlook.com (10.173.227.25) To BN6PR12MB1235.namprd12.prod.outlook.com (10.168.227.21) X-MS-Office365-Filtering-Correlation-Id: 4040499d-e64d-450e-c4d6-08d43b7c6b69 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR12MB1235; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 3:A0imje3H0rLBRIUS8Zh8gNaQvifnYMT6F4XMrBWxQrGaeyUEy+S5vewe43uoqaom7w1klaRbjzOL1Wl36b4Tw/CRVJrVutyzjvG/vZ7z9JV1gb7zzDM6I2UDiOOBawCYjIrJts5woJe8pp2f3cfqOiWNHu+sbjTsJUdGrDk/oP3awd8zlHE6Ak8RSIEGtrIwWsGXVQh1ARDyHz91S6hxEef2nJgmv3S6s6s6n66KNbo0+96xSlleMebDV9zD0xu/nP0Asxv09dK/Inl4sRE5Sw== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 25:H9SO6CG5/oV4aw2SSGFMQUmG9ZX5OmGzW2wmEHMcIwRg8olwWaaP3MkB2r5HdfapjGFNlVWWHt4tND1l/vnEzX9c0VKDoa0LwoRuJd7O9pPAgIhV3erAjzUlIFPLWUINrnVlUrok0p4fYBSS50bVknm/fII/e60HcbLs3Gp4NMtHpk8/uXI7DTyudreeN0I3tbFttP1skOOo9Rpc9zK690yTdRZuTepKdD1HQTOjvArXPziLV9MAE6Obuga2ZV4C9+VxDKHuqn0XR5XKqQzulaZdBAn52qPpJrV6IYPbUPTKuEbeqZpDA992LvR+zSpXpawzPsWVvNXuPVBne/8DjniHLIKd523HkwwaaOwKeDNWJjDm+mpQbXBlJ1+xbppA2FSrkZ/LaAMqLEEqhtIJrHMAkN7V81332x8fQLpghIwQzNcPuipC2kSFw7W2xshiJ2p9Jkl50yRuVrgOcBywF2FespxxuMYK96HUOYM6wa5JkwfxaN5mxTbgKPkXcHY81VJXdkwO16kfCcJpETvN24lIiFGAvkZ/B74mx+x7HmIlm569SE9PGK04fQUBm7cEzK5c4H6VfeJbobKIpgbpoSxssxUe+yDyDpqQdeWjkhbV3+xAvvjhDnJ5o21isjuEZt/JuQHC6n/TYYibZeDWlIGO2tFzgkG9Cjpz57ckASgehgM2+wPf9LZ86K307eMsK23xrJJTpz32f3Ihr8uLV7MNnnfCyJDUXSws9WfYM+VILM9wDlQSNPg55jZJYdSHAe3D+a9hj1wWRXnN0vt2keY2DZwWpMqGbtNcyWCWGxdEjtFouyo0p8Zz+YdzVErgnhRkOEx2WtzTz9aBzpQHFQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 31:t89dw3/+muyzbcQHXypPhNDaUjQhiy9lCgi5kxNwufJNec3O9QbcNRUvF2Hlf2g3A7/dqNGFWGvJZVML3G07wrA3LbFVcXHYbRhfVStOqHXZDxDgx7OKilcSnJ5zTajvKKsZNP2nTiy2gOhGzGRNcjlmMTquOBegimtgZdSjJ6nOZwZWPCZN0L0dEpjCnbOtNHprxT4k8gxTboqe8x0k6ftDRBTPtcdq7tEMPRn7QH8LlRS+x6uHUVU3FBzTmHX9br8mBA42jDl0/i3zUXMuIg==; 20:Jlhy9sawUZY21SJDxGZr9G9/gIyAvWTwTGLSM1dPACkyMbfd4nOmbBSsJQ05HBFQq81xwqZwk/A+O1DQQHmRJA6qR/okNMP8zoySnFX9iZzNUrDnSk53fN1YZ4hqcLXUvgMYXqXD7azz3U4CTe+/+dX09sIvioSxvoZtthPBMKC2OW9NfP4uJdg2b962ToYno2HzdUsDNeNrDD1n3O8TARk7nM8hO3OfKQ9wfDkbBiXTO39AwpJeH3rVyCPi39ykwAKkM612h+hpEWBFmfgJk3rXLqACiJtjGPP68CKoy7iaNMsoT734wU7RlLHugie7U215YRS/plnE+qXwMDR/qT7pK+/HJtYE+NB7PFg2JP3wI7O3cihyi7GA0IOuYPstWwR4j6gAbXTAP1BeTEsiS4LOIWez8CsOM5jqyzg5wiwMnXkM6S9hDvKanPP9N3CKJ3YZbRvAgMTcBsQGDIAPfC7+IIKYsbuaM4hT6HhS5UvylCC1yyYk8OpJQ6RmotDe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123564025)(6072148); SRVR:BN6PR12MB1235; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1235; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 4:GRBsSshgsE4WfJ/s80ji+XLiZYTYQ7J7sp4cA6uL99ZvL8TmE0PPf9D8AWDRQ6i+2hAViYsv9+uMNb6Ku5PLb1J0VHHxoGp0P8ZndLfu6i73j1aBEh6eLh9fMvsV8DZgTvEGHUtsXHBpyJrSPqs6TCeStTivV3nAduXmaQP8hW4//wn/O4AtiBhhrly7h1sYP/VhFAuNthwhibtojSA5ksBu2B1KOBWLTukJaVmRhpJ5KjI39kTsis1ECo3gAcOQ5iP7duMFr28zD7mIY9b2X2yFA81c2M8P/uy9dRKdeZD2m9rGpIB1ZgAq8BB8uTGKiGk8FSEOjAgZetADK7CaNT+fWDwLQT/fZK01xwyhrdM3ryewTISRFlUSpjPKcOvon5dxpA9um3EJlUPKd/7wWqViuH3faEG7vbPlRlYo3xK06fTTj+l4J38gcI3gtsmOgfNbUit9MElbeBFgcN3w6E/UFaTbC+4AfvSth+hZCpL2tAdxjeD0jSf/9FFSFC93jWzaBfefAyZsbOECNEAuYF5uJ9+AAIvOp15syQjRbwhb+fdVWjysPMCPBcLYwqFrV39SowYZTUyl7nzNwOGYV8PRMVpZd1KSkjFJpmNBEjfI7QniL15lIe9oFRhlKs3Kr7lSKsrxAb7o7bARvQp2tDRsy0zdkirZYa+HGSmLf9I= X-Forefront-PRVS: 018632C080 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39860400002)(39840400002)(39850400002)(39410400002)(39450400003)(199003)(189002)(305945005)(86362001)(7736002)(33646002)(4326007)(36756003)(3846002)(6116002)(106356001)(47776003)(81156014)(81166006)(8676002)(189998001)(2906002)(42186005)(50226002)(92566002)(53416004)(15395725005)(66066001)(76176999)(97736004)(105586002)(48376002)(5003940100001)(6306002)(68736007)(50466002)(5660300001)(6486002)(110136003)(50986999)(54906002)(38730400001)(25786008)(2351001)(6916009)(101416001)(6666003)(2950100002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1235; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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:UwlRGz2fDQyeGFrM8UhSLYWrvmT4IzJpzy+tI7uSx?= =?us-ascii?Q?cI1mz56i6Jcv9M2FZCRzwlPZQGkSvuHZk8/NG8ZyqmJ7gKWWhcEgNkpM/Hnj?= =?us-ascii?Q?zR8xJGvc86WQSrCHYTR2BkJBN6fseTAPOw1sZh+8xYoZDtvVPg8X0YCkN0c8?= =?us-ascii?Q?aZCjMnPY72drCchVAf6zPR5HFaFgHsGqQFF1CwFt/gVaq1/7plMJOQGnM6Dk?= =?us-ascii?Q?PPVw83lvGx/gTTqAmYpF6QFdJtXB45oiY7evdLLhCG+eRCGn6NL/yzv2Szr9?= =?us-ascii?Q?YjonmbXOz4FKQqXSVzsM7ISQEftkIV28TDBiMonY2EsTs3yF36MsWeMKuK+E?= =?us-ascii?Q?u5cVzdGm+RQF01E3C+MWWyrYbmcLJoK7i4CL8YLQXE9imncdDPhCak5vNknI?= =?us-ascii?Q?mtcNduEBZtFMlJehz//gdpLT4LpKBH6IlTmuem16qbugG1/LnwK7Z1fHmvnk?= =?us-ascii?Q?4nvePO+z0HDr3+ZJfkfViuypvkk3qYf6rDjCoN7Ibnh18yjQSk+W5IL2HJyL?= =?us-ascii?Q?wrWUwBeCcaSI5uVta0eZirj6tiq2fJqaqW4NjWyD+f83hWT9/YSAwlUbCbKE?= =?us-ascii?Q?uWijhVj2XnqHruMWtSqsDLjKqDEDBRA0fTCjUC80kHrlE1tN4k2q+peFxcv2?= =?us-ascii?Q?bKb/Rj2Nm0MVBImJIBZKuZCtXG3qnX6vK3HtaeVpa7OtUFt3dilu9JXsyxaz?= =?us-ascii?Q?ZGjJJZ4Ex629d2UIDbyfAmMLgejtljnlxaq3Bqso/+1EO6xCY+kDeqX4fskP?= =?us-ascii?Q?nuM3Up/0KZuT7UgiQbbn3djKhhjn982MFpv80h6z0ChQTAMtbP7L9hd2qoOg?= =?us-ascii?Q?cE7nc1iuIaI36Sj5hX4vya9NkI97pTxgMFFYCGL9CclHQeLbFKAT9eCi10dd?= =?us-ascii?Q?DmwSIxdZ+nIOQd3uPzVS45DJumov7TbAKUldTAzOnH4GgdN/nbEKIfxxIduA?= =?us-ascii?Q?eFN3MOrr2roA05O6E1H/KvlGG+kJc29YUxfbGHZVnkkEJ5ZRn5IZzYY/JhC9?= =?us-ascii?Q?WIA6vLDc9/W0ACiDqrHg9BHXD/8RJ2NN3PllihuX5M/FYHMTrdtWHif8CDxE?= =?us-ascii?Q?uig6rygVjy9A4tUKF276udXHUw66PNg3EY42eZxpn2Ddovb/+TQBbZAHK2Bx?= =?us-ascii?Q?3D6iiKRkUA5/e1k9r11CGj1of0uHhaDLqzZUyD6ZBlWRTXNxLr+YHM1dhCog?= =?us-ascii?Q?MrC0o6tKrBGvrp2H9BJJt0WY7vyydU9ZV4/vhhelfzhJAeLN0jTE8z0EUjVp?= =?us-ascii?Q?o2H8Sx8N/JC0eiTyLT+DvvvhAGAhf3AN3I9sjxyYpHqSZvR4TW6iIhbYyZcl?= =?us-ascii?B?UT09?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 6:5mkTWnBPao43vVhtHB2qFPdVR1cADiMr95qhQ47FwqadKV6bK5v+d+PuntHWLUJb4SFI6xDyfPo9iobacPM0J802XwHjtA7+MtfaFGk7A3SShZBb3aq2hedcr/NG/DmYVuQthVdmg9nVtzpcii3KY4wUKoqNf1UUE2fypncwS4aj/3bKVKvcbxg8KMAgaukFirC5llSkRrPNxSaNCU8Pk11XQKXDpOPpraT+wXsQQELCWSwSSCE7pDWQ1ArhiAx1zV0gZSW1FQ2sqPQEsYfBJlO7AmHJH8xzjGVsgND9roFhpN/zdgO6C/fD1nFdxV7zdqIYZSzIf0qtY1Spv/ZDrDrO+qoMc9hHptWo1ZKo44bCHVtcJguQNRTR4GSoXC94q/9ael7SGsNZLx487nmtj6usz8b2Yy73PoBtexxsrpd1qHggDLSlkCgIRxJMLo5gssFC3RthJN3LsCouxt16IQ==; 5:tDYPuNYzf9z1jctlA8PO30HozyCLrZ8tjguuqNZXMcnyP7AxRC1nwTjGS6aMkxiNKelzWThN8ZiIeFv9g+1Lndz056olw1y1IbNtVJbZmVbnyaNe46RryzKVY6Kt7ti61gKcTsmdb6qJwfxBVnuCKmxRGtkHtnKWxYqxs76e0SE=; 24:bqgvLzscoS4kTs0eb+J8M01Qgn41t0NinG5NNo8wrhkyMHq2hyLi08/v572zpkwYKiV4QSx4oDVJV41gbRCO/pyFQeCJ/bOhfjT0HKp+BGo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1235; 7:nTHs/S2Y84rs0ldzqTwwP/Fo7CQ/fDfikTbpDSbjbIM/UZAGQ09RCLuzpHEAV4Pk9mUWy9Gv3jldMQXvMnHCtAgKDsxaUDIsCOr/WsZC22fxKJtD7DjLYXind4WFSCkLOFFfDAaeSpSMXNvVLZREYH7htK422XFqANpjQyD9V7fHekojKdCkSYzWYZOsDEKyuds4JxDUotWWl0h5qUm3ZkY+/3Juz45NRnjlTs2lPIRdRUJ294hdAF7tSl49kRK0DZUHNV5pUMc/EEH4yaabF+kPw/GiZqTe8JYK4hZb63envkKX8eYySWCyVfORCVeWwtiIWzKvPSshrR+eHPRGjFFvplaGZ+BsrmhQeLlbmEv7LzyE/Q0Oni4wRX3Th1jX0vwSkKKG6eBgpMSkh9zMH0pDs13YEshOHm2+Ne9KYD8ftOIY8pIvoV92jqHGdpdEH9sG5PPqMXyzlLCEy4vpkw==; 20:uABCBEZPzB8Kb7oV20U1zlOvfR1GhAsxI05ouiIw7+Z5IdHvzpcgslv+exBXfRwOSv3Q6xKoxAfcDPI3YecRz6ujdtWgoNDZd/w/jbXN0zEzZoku5ImHAr8E2je3ewHmMtcrwLkqW96yfKiZT37jetviXWpMDSf+9gwOL8ckoQqHgmGNYm55l68MS5jWxvEMnomuNfZzEfMZDZtlW/MvybJOfeAHaustBHDN9oaj4Slj2lwqVIWHeWyCYFbPziEZ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2017 06:21:31.8339 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1235 Subject: [PATCH v2 10/10] OvmfPkg: Modify QemuFwCfgLib to use new IoLib class 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, 13 Jan 2017 06:21:34 -0000 Content-Type: text/plain The Fifo routines from the QuemuFwCfgLib library have been ported to the new BaseIoLibIntrinsic (IoLib class) library. Cc: Jordan Justen Cc: Laszlo Ersek 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 | 54 +--------------------- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 7 +-- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf | 7 +-- OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm | 52 --------------------- 5 files changed, 3 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..a228c02 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 Incorporated. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -26,59 +27,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..6894760 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 Incorporated. 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 diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf index c1d6a54..7a96575 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 Incorporated. 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 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