From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 65F71819D0 for ; Thu, 5 Jan 2017 13:49:45 -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=h76FKQPRx0rjQRsVZtkcKGvnzx/uklMQkYwdlXuMIak=; b=jSQJ0wIcbpe8FZ+mRaM1R/H1rT2YhDKjXAoyATFV6bMD7K+fqw2YdqepWn7tLkkg9cmjMGqT2V0s0OzTG1t5rNDdGyK/LKgBOLkqaWT/hZ6Y1o0XFKM9mSK4HQF/j8KN/2Dols5V3emhYttcsxE0RskGSIySCnl26xvdPbdw9z8= 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 DM5PR12MB1243.namprd12.prod.outlook.com (10.168.237.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Thu, 5 Jan 2017 21:49:42 +0000 From: Leo Duran To: CC: , , , , , , , , , , , , Leo Duran Date: Thu, 5 Jan 2017 15:49:25 -0600 Message-ID: <1483652965-14357-5-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483652965-14357-1-git-send-email-leo.duran@amd.com> References: <1483652965-14357-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR14CA0005.namprd14.prod.outlook.com (10.173.227.15) To DM5PR12MB1243.namprd12.prod.outlook.com (10.168.237.22) X-MS-Office365-Filtering-Correlation-Id: 1802ab45-889a-42d3-c2fe-08d435b4c243 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR12MB1243; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 3:W74vQkiyqdwRtxET7ZsVQ9wHfYyw+hEJziz5QLojjbyUR8nO/hK2iVhp/AnxRAMntmbG1cHUCVKe3R9RSNVlOHjVno1fTj8Rcqn6mDcC+r2pA8IOyeT9tmynsZrKYxWZl9QXuKpUxcyQeX0iAnb/jmYvhLbA9dqtZV8v06yMm6o91Jo0G9Lm+jigD1Uk46vYusVKKgLngFPrtCwsgLLraJjMPUC98LcYzsjnCkm5JAfncIwug0NcwW2KSdJwLsu7gLl6UoXBKyKsq5PbcxNXCQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 25:wovyZqPs9l4JEVmsSF/WabPBrF1Nf1MvIIXsVVZL7ZR5MFbyr+4pFqXbcJlaNENEwhNPnb/gfvApKaBwCOHvzJFaRWyARJqMYOrVAhSWFAs4/zCF3xkej/oG3Rrw48uN00nlstVS0ULbXpiVRMqeCvcxhrQwsFSyIFzpKCkuJ1wTB8p925iQnHc8chaMHbO91hQpzUmX5ENR5e4/CJe3xqpKhj2rA/Y1uCxq2Dmqv0isZVsERSZwl6d524XsEoEBCYIKZm3g7AzkakALmbPJoaa8hEm33PCAN/BCUo/s+JCVOUeDS1DwL7W29f/GNn41hpGwBSJhikTOd8hhBfAGQQXhdCawEohsNhlUBvIjlTw612JCcEc5vxLMrk455pIiPGROaRpG41zV/c2M8OOEJcZB4H54RdgvbDIbZeVPvQ60gQ23niMJoe06MT20IzUzLldzFyide+g7iSHaofrC8YCBC2JT6n17OqF+nsOdSTpDo6n2GIRBHIEupqmuSRkSb1Vl4QIo8mT6SOv+vSkDtOQdeUdMOzQ5KMRszdbDTPhWczruSyUaOAoDqO7CUac7xpckDOpbnJQ9XNEYJzEpLi0dcmuEJdgp/RlcHih4VuKElpAn9bDDDidNfre0FhpoBLbboZz/NVtlJYt0aXOSIYmS5lJoGNgPexJ53UkNM8dz+QuvnxW66AZQs+/gQmDINmwvK2rsi0QsGN7Nhlh3ul+RX6hdTrxhoyoGPjOE6q5+vLMROFYzQs8SrhAmAAjLLzFzhpKug8agsLlOgP14cFyHeZYQIQBfEiXwLmiDjdqmM8GxPOZ6bW/MUGPWKNe8 X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 31:m9qy5urCjlJ8Wx6CBFdkMtMpsVV7lQxgr0VuMNqW43jneCBeXt848E/iVnntJTI2Qgsg2hkFYaSXUN49MqFAcYfaLzgjjXNZhZwquHk8mwd7nCxPgxs3bf9x4eWG0+zPLVT29QL8X8+HbmxjR1lcGtgHTpoTpkSiHFnWMOk5FYxEDyPmP77JS1sWjsU4SuI9/tGi305ZpfB2dbshvO9JJvGvUtYp6scJ1jTWilDXWM99yuUjQOMZkocPbS4fTzye; 20:ic28dQBFDtTWbQ4yNk+8rGqX9wLTcAXTYSW1nozOSDI3edQB6NNdfKuqYph4jGVJWsxbfPadPGmFNAjnQfDo+Uoq6gO77rFyR47rDCG4aJsPvWK3MAO2sKS1VcNlCagxF90tzV/e3F5nUxSlRoIaqqI3pCoJscTcj6yV1QKYuWoAgXrq7mgAcGoFgBacl31xLcUW/eNmTg2YnJxhJTPGH9oiDfAvBu7dFSM3vCxOSdykHBCcBS9kImeGmMP7BrKgSah6+awFSRJlcE3KmcA7H0aBNARwtbhD4vBtmFcad/2DwEMOnsHtI9aR8nbzJWYc9xF0J6XjLzJPh4duznVoEDsAjxjacg/Q6/ciBN5P1lFbJ0fo25rc2vP8W/0U7faa5Mau3MF1ARGnxzLGtpYFQuN1Mq4iKVHnqULqf+SSNZH8FP00Q2MGak/7ctOgGFUYq5l6W2F/4AVMeG6gnEFmRsokulp6eoQoaexeJqNdnd8kUI/5TJXvzfoAOlS66Sz8 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:DM5PR12MB1243; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1243; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 4:wwpKZvwHTsTrYEVifB00INp3rCkNXA7rm+t6VzNAI7nhBpd+bqc7gI8xSnAPKTYM2iS5kw2Bnce2v+F4wmUSshEya4JLpfRuL6oJOvvFkFh4J336DUckHrjJEOD8+1sAXQA/mcsgUmZdQ1N9mj5E1VxA45RbtzEfb6chMlG0c0KDkhcV/TDvRR5pMBStuzV26hkd05kRIsHUmC54pVlIYLueBMBwO2Ji1spY4to+P8Oi2I/t7uaMrpT0k2HY8wSSXFKB3VxygbOC5JhmJdTcUoQ6ZrWX3BdpREb2oJ+vnYXOJArzkFHAajNKKsZXmw4kJSoI+7gEHNtsqOGWsayhY9zNoozu0wPooH9lfdJb8OJO2lLNza0RCj/kA66Vsz7+densSP57/xvLj+EzTstU0GOlBTRRzbVzgknvmGMq8AQkKM4p9XdbeClp28TYArggLw64bXhfJFoWKkRzGXLA0HgLuzUJgzGNqQ8Kf68fGeFfy/9Go76De+qvJJFnSbwLjopEx9WwrEA8mggnpMXH2y1nZgmHDUCNKma//FHZtxm54x5lVXdhXnV/UYg/jNLD5KMiCQ76Rxks7EHV/5A4tcP1PkxW6KK5b/jjvQ5cDNRXQZ2jNkNPg53CNTvY6Tb2 X-Forefront-PRVS: 0178184651 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(189002)(199003)(5003940100001)(8676002)(15395725005)(50226002)(105586002)(92566002)(6666003)(42186005)(25786008)(54906002)(68736007)(189998001)(53416004)(3846002)(305945005)(106356001)(4326007)(7416002)(36756003)(86362001)(50986999)(6486002)(33646002)(76176999)(81166006)(48376002)(50466002)(2351001)(6116002)(38730400001)(6916009)(6306002)(47776003)(66066001)(5660300001)(2906002)(2950100002)(81156014)(110136003)(101416001)(97736004)(7736002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1243; 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; DM5PR12MB1243; 23:UtpPWvtzCrQUq0+kDRAdYSeKe4ZJ9S8edNfYorvFa?= =?us-ascii?Q?uYaX1ifQAPkz/Bnbjn8EGGJ5D4o0EqPMhFJj61jAMmJiakcoX1fJ971KSCNd?= =?us-ascii?Q?3rkxryR1dTQIHIdzv+8Rg/6B1034FdWNAbG77EywFqKVp00SV9AVO05wjw7D?= =?us-ascii?Q?kH2aQG7/SiYzn+NWVe5jDyO6rKwjgzwuQGzhdO61S5UQgdBV7sVv+xZF9E6a?= =?us-ascii?Q?nGz7R0Z2F9DfzipE7TDm0DGPzrojIUpcm9C7rNth5ftoPSsQkW5PkjAkZE5c?= =?us-ascii?Q?DTxqGtMghrxVi8W6ej5GqeRwWk9uBTWrLBlbLQdT/F1qqfZo7z+JRX4wSyKJ?= =?us-ascii?Q?ey2YphkLN+kIW5ZC9HI2cPpurEH092Yq0yTU1rr0TSz5CrXo7gbVxtjQe8jf?= =?us-ascii?Q?KLxDUxkh95EmreLoBUhUR9De9W9LMyOvxzcG25q2VaelU87pyb0/CE2AkAdI?= =?us-ascii?Q?d4vILdWVo5sVe/LoCnyR3GtgDuacYADd0r7O8mt21ik4gsPUhfgruJrqlqfF?= =?us-ascii?Q?wdELUhn4aYVSGn66YklY5e5BLEWitGjK8upDabmYCZ+l5KDmXJY00t/jCH0s?= =?us-ascii?Q?ajQIVFTLfgIkPSz1IZ7L07e3g7PcHPL9r/UI52WJLDQnjbRgmf5nXmqZ5TjX?= =?us-ascii?Q?5HQWQR/GtW3KhH+vR1QbjJGXwdFivihlYJFevKk245C+I8fFFXFs8tatg70R?= =?us-ascii?Q?HRoxnbHYntydEzFtP3SQ2RGTss6wdX/wDsomQPZ5MrdRx9YqA0N/eaNLzRVn?= =?us-ascii?Q?fFKbYFo+HrkRTws3kL4urSTgmqp9zEKBi1CXhzeDl8L7cvIz6vyEZM3Z8PWS?= =?us-ascii?Q?IVI/nHG+JD6XfhouuYBCbfOWbcmJn48P+0G96pVy6yIDwlr2xKd7sB61F0X4?= =?us-ascii?Q?1dE8k/sP6kNFU630TxPUIn/qf7NXi61YfehShNjFFG67Fu9K7pPRNE5CCSX7?= =?us-ascii?Q?HjmVqn3sAeuxS8ZuhemfPEdymZ5q37m4Nq0GuX4nNiK7dZfzi7HzG4cVxAO6?= =?us-ascii?Q?GcuFfGfWvlwk5KQM2y+Fu+hWxSoDhDENW3OgAa8VnRIxzh8q0MmxvwOrcnbH?= =?us-ascii?Q?WvryYs9zR5SoF/+lvGBRJG2slKSQrAJqd4SQbNVJM0wE3GH7I8ULL9OUnzdX?= =?us-ascii?Q?oNRlEdMHyNimhP1Px3Z6SgUHxeprZ3Z7KQQb7++kmvK5ILZy/tK7s/WgZ+88?= =?us-ascii?Q?Ae9B5q0OvkYRzx2IfSYhyGtHpuLk1ONX4wVFCn2lRTRpJogoarB6GUJkshrC?= =?us-ascii?Q?Nguh4IMrjjnXW2zwjI/KIl0yZ9us2bfwAOuYJH8q0N6Ut6Rzc3Yp8OOaQR+Q?= =?us-ascii?Q?vGG2JWMoAuSGUf4arG3JIE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 6:oX7SvP0SHI+yEdWZ5RlW427KS3Yqkfaq1Npd/2k3mqhvXeaJrOKUVWHGQ8tmiMKuGQyi6Ye6T60p7uFWhvKpZX9Itd3+hIFtU9GA+vW2fTtQQKgfjQYVuZurj/5UDx0ZzDR+5WrPzuc5b7t7Ghdp25pZfKdboxp+ZO3rB6TwAUSpUsQ6p8AXo5HUQL4n7aopeWOwY6AlVxpIT4kP7JlcVIgaf/FG+Ts5/CvVTIa6QQKvJJdvz46N2uTpVgeB6+jNNG2MF/EoMrsEQcb0+TjPv6JLEGv6JT5vOx40YENS55uKiKgdJvI8ivGl9phsBoYVs06ICh3A6VO73srW1uAKcrSgRQrte4d3xyz3RaD73qGDeC4nNqCPDM3qBpviLpEsWuwHYiZ0KVooWZlfrsJanqDG0wkaU4VhfTFTgu8M2C/a/cRvqJNVHvh+5u6Hd3iUn0ka1pZZ/+e4iSBmOQZW6A==; 5:z1mCFDY4uP4/8BJEVyGIUwtx7oHyndi2yzOZVJNH/3sC84GDkM6RFuinMkp/yxS/HjCYJp3SgAHGbapjRNHQHgV8J/ftTnPUuSUU4jmDgL/Cd9Awtp2M7Qe5D0zDtHNGu0spCK4Jqk7/0bUPGDNokA==; 24:Dw7pfEukPB/ZYHK0fuH7zzwYd2oM7VvCq9pt/mwk+J98LV+CQinL11/y7VvE9rhG0L8dHZLyLy6dCfsoOZKwMeDQgUiAPVqVxl7XgGZvwQQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1243; 7:EbTAdR0Jm5XhoeXhGsGD3ARNEYHqZwB1PPqYekzaY+r8W0Oi5e6FJlYVb+fctI6htQskX3YmMylwLFLNfEq0JGtxrc4Lce4olLopDoYKQV3oEf4Q9Du95A2qfk9nXM2+iQ4QJVlyhBCysdhR3IQvYp4fpsJ3J65NmLY4Lm3rnLZEhFVURPKEFujXw4/dU2Gt2Dhd1RLno0Uv48WkqusUlKS/F2ookSUmCb9mitsdoqL7VqOU1Z6tj/Kqth4TCo/en8y5923nmsevf4Ol+7Ny9fjRnaVbyw/yjyfirzq/zrGuf/W8Bl2n7IRlUiRSEnadyDcm9AaLzKfto2948OErXPSFNIRThx5JBubgm1Lk0voPWPRhTjD6kd86VuQL9bUeMxgi0WEYutbEAIonFx3ncaj8K1HViJzKUW69GEMp0qLbv/oI8LdFHemklHeTB1HRAgJZ22aDlDOKHMx1FSyjpA==; 20:DJT/yeZrnQ+cq8Mmp/0KBvprSUmyy3tqVd++nhZbI77wWsxE/vUTlwXmCCi6xUJbpUZ5ePhYnv2Ij1yC76EQ97FsfgtPwDOx26C5DZhfG5er/tQYhKY6RtgdSFvtFmIeTONN8ApgAoVSRBAEoBYhzeTw0fYcBAaPmrMjg+Z2Fs6s3E7UPQFJdyH0F7z6LOmvSXoL8Bj8l+ZgDc828utAjii7tk2MfRHVw9NBDBFgQ41NJF3xta6E3rEQwSUTnkaI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2017 21:49:42.1386 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1243 Subject: [PATCH v3 4/4] 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: Thu, 05 Jan 2017 21:49:45 -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 | 54 +--------------------- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 8 +--- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf | 8 +--- OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm | 52 --------------------- 5 files changed, 5 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..68fbade 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 @@ -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..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