From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe42::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D45DE819C5 for ; Thu, 5 Jan 2017 12:46:33 -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=f542NHX/CrCPgp1WK3U04sUVUg7hd5xqlMPvsvz7hto=; b=sV8pIsCV9FjnjPC2aPE6KOTNwTAtYqAhnCWGPpY6SxhDDuWb5GdY/m5BFtu7kd6904iMoDeVvvPrT+/oFTcuWciak+rQbuWPtaAv/TfZ2ytpxA90KMFTJuZ9s+/T47UsbEilacp+hqas5uHB/TN+2Qq4VfbdXUdiawijOAufcGU= 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 BN6PR12MB1236.namprd12.prod.outlook.com (10.168.227.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 20:46:31 +0000 From: Leo Duran To: CC: , , , , , , , , , , , , Leo Duran Date: Thu, 5 Jan 2017 14:46:14 -0600 Message-ID: <1483649174-14011-5-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483649174-14011-1-git-send-email-leo.duran@amd.com> References: <1483649174-14011-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BLUPR0301CA0019.namprd03.prod.outlook.com (10.162.113.157) To BN6PR12MB1236.namprd12.prod.outlook.com (10.168.227.22) X-MS-Office365-Filtering-Correlation-Id: d0390db7-8f15-46b7-45a0-08d435abeeaf X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR12MB1236; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 3:/QLKFEaOOoR7X2y9e1M+CFDFQ0ayeqS8kOUSBVj2rbpvXvX9MwECkEaLUNKoqM+ENnkAX3sY1hnFKTDAtxWHH6PEtnPszTaTWRfqf4qwbL9tk1gV/pNCPniCUeiBTXKU/dl4nK2bkyrrkrBDxaLB1iYaqpzyGolz0fozRdelUdcvAQCTe5MryillAQJEjKSy13lzQkWKlyQMa1hgfeS0cVNkju7HEihQFqcW/wi8jWiO8n45TpvqLsU3i17Xk/zJljmtCW0UbVDbMeexTGn9Xg== X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 25:au1O7DE3XzFxyN4kpDtrRDSZLqHXwOHpHcB6Ru/HH2fEYHhPuEYp2E8auWeIWux0foXozfu1JNBYvKTu3LFrqAjKwdLI9cXuj+SaUMiWssFudOl88wjwOSNJ1PfOYsc+hbCk7cFgjNVssvwRc0rGR9wzZP8x7QcFLDUFDykyYq/B2nq0abJPXHaiDw1h4+VFL1HNH+au0ZOsBOi934Sl0Iqadtvy0bUmMLFfHrOK2K7h2YuSQwwed5zge6EMJFqkkKtstlClpq7sKKjYCBHC6LsbzFhQD1qproJPxNa6C6VNbIlfVKDQ/xo1idHEjhBNJV8WgVRreuhSz1SJJx2gAT6zs9a0E1HcqfoQXrX+VZyqm6sToFmtrngpFLmm0Q1WpRV0WsIULIdl9pIRuGn5S5+07QGFR8y7Bb3ZWaAVT5MbcXVg6jbZPKO7tJGicSmWDeI960BtWCGwaKWmk2+yWzH7nR7+iXeRqApFMGIns+Lkf2Xhzx9cGzJCt4J41Zss9m0TlwzAgX1dMOw1nvqp8TIXoqrNFj/BUkK4sgOnAhp2gAP5RBG7pMv3joXAP5U/ePiXNC2Nf97If54JF75ex3hShMPlc1B3/DleXQab9pyPEUndtti4b3mI17kcN/v4yn4TJ8kzMseu4opugSV/x+bUtEpMDFOTpY1sm/pe+Op9B3Qq3zBqGSuukfDvNgJNep0i7Fhe9aQ2Q5gjL4NRd+Sd/RNhPyUj5BOACa+Qq4hf6MFUBgf4XFjMEspG5gYGFDDOUQlYAR+crOWrun+YA3dQwHWnbqmqV4pEfr5AyNfedPwFtmH8oMlfija8UgxM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 31:Eohu9Rpz29V9l4zyz4v1Rirwn/BYWHcf3S0rhklizg82yDsGKjh8xUcxPj0oEJazEjMoDDBL9z/r8u5uGe0U+euHA1Fj8My1tklXwtIN7pkPl7R5xqTlLCqvlFfmckODAkR533tm8i8O8HSdZ/6Kbhm4DZx8qvxSSm5lfN7sOP+ZCXDvu1bA3RuGZv66G+v1F5grcUQHpQSi6MkRprh1sM28emom+SNivjkfbLC8+np4GGqFXdFqvm0QMxa5MvkX; 20:U48Ndgt6zdTuDSqKC3HrSZpG+VBZP9aLsopnFbUefW5I8Y0kt9sKArrlh6SoVZDEg1z+kp8ZaFFHmcpWhFK8Ae/ycE4hilujQ8LmiOd6eFHGQg2rkkpdA3uLjKlMUAPbDhisVQnZqMJsPDFFLXW5ygXj5Er4FstTp9f3TVdHjrjNMQX4iP5tQVb7weNUFt42L5KLpafTzN7nUflFZ10sD7RFuMoHzwFn8oB5Z+gioUaXyje9cwdEajGX9LvokOzeyt8Nipx8UtQNxK4Nb7NQ0HHsk2r0xNqCI6Q3e9HQcMkEHr34w6vBEYizkuh/YrGeC7D4+hyr+rupK4h5wD0WZz4/nsGILnis27mOl5lgrDkIFv75rk4BV3RB/SZO0zZIU4v0nsZYBEn8QUdRyPRmtyopL0Bnb/vbcPFhsFS/2I+sF8f+coxxPBC7kK0zGw+XGNxbDpIqKCyIr7Mkv3NRhR4aDoeIsvtJOjCALD3qiEpiGVZjgOuOcq1rdJw7Zs8f 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:BN6PR12MB1236; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1236; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 4:foU/SsOu2M2MsBB9hbwc3jP0MMluVkZMrZlNLnhI2j5gKPQv5qcNzGK4Xvy5iwx/ffmnsMa7UkoxWIZZxAy1eUzfIiAXQ8x472+O6Gx1ChMhBRYTA06cqJV5it5fZksxm6OtMPX66+eUbMCj7es2002caTr0Wcb4QLQtqULKPBRIEpLn33uFhd71JvrirTFwQP7kE4vJmzVuLI4UASZ//eLtB7Xnw96DtPfPGyM6nBUnGoNxYmhp+KJA25eZ8z4mFxwZnlNvtPGIZTAfGTJPaulmvxFeXBr5CuwCkzTtC7BzxtbYaBLfw5YQLE5+DZuTN7yfK12vYcQRJNDdJHO5/L9k0MhA0vrgVDC3s2PA9n72eaWolZIyGHNsKWnT6m1SCsDb6zLDh+vWBDkED/vNx1hiwB3NsQ5XJvK9orDTBl3CfadRlbZchlxQjj35RGgreUaqbcHt38uwiOeHPCwgAfea/X3rAFbpSEPyvysH7DYB0FbLCYeQCulv7myU8O5bawRQTYSVPNuGevpiwwsFSA4puwsL9wx7UUiBUn2omZNq+PGaOwm+af0qSb6UB24eRcBjgPpqf150tOhOGHQ7PjY4Kb1OdzP0wEqhkiZIFkgf1GQThRhXOAmCnAZ5Jp7y X-Forefront-PRVS: 0178184651 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(199003)(189002)(105586002)(2351001)(106356001)(5660300001)(6916009)(50466002)(6486002)(86362001)(48376002)(68736007)(76176999)(42186005)(50226002)(50986999)(53416004)(110136003)(33646002)(2950100002)(6666003)(8676002)(101416001)(81156014)(47776003)(81166006)(4326007)(7416002)(66066001)(6306002)(15395725005)(38730400001)(54906002)(2906002)(92566002)(189998001)(7736002)(36756003)(305945005)(5003940100001)(97736004)(3846002)(25786008)(6116002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1236; 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; BN6PR12MB1236; 23:Wq0x+aOv10fwGQxyHIQkfgVE7ihKnLp4D3p3p9low?= =?us-ascii?Q?289k0L6WiK1SioKzyuBhTK1BLRIH8BZX++MeGil/mshkN+S5FFj2vczyx8h4?= =?us-ascii?Q?TDrJ3HLmMr4iY81bPYvnxrgf53MEjuAFu3btj8Z7de5mBmX9upk5ZOZeASPK?= =?us-ascii?Q?g0cbsZDphOJqBT4PV/bVIguuq5BWKFhcuUnwpdk8eOnyCv0J/GSNYhB4nUgv?= =?us-ascii?Q?o1WMJOjZ/vUIwlkM9X15i/LPyJsgbVjokYZ6NSKxemouvFRxzzKV8bYF1tMG?= =?us-ascii?Q?/Zew2TYWgXh4cDvDgmos3bKv3dA53G0MnekwcpQXPOTpR21r3r7IvwZGtTN6?= =?us-ascii?Q?1c/LbpYuymVNXOPpaiTrq49YEeXOPM6sVePIf25j+7xEf3+aFkikuuN+q8lm?= =?us-ascii?Q?jfdhhR5rav8gahUPBVofwO8HazR4oYziyOWQM9w8IghNWJ2v3nvxSuU9erfk?= =?us-ascii?Q?KfQ2zkHuSB+mkxhrIbJQ6UI6Y6PYc00A9+vPj87/dHYApTDWfYFhBhgkHEZp?= =?us-ascii?Q?eGtsEnfkro80oxNpQ1IJbDxsi7uCqbFP/pyZPb13frwWJ5rj2WG6TKtXu2lU?= =?us-ascii?Q?zAVbVSlHaILNpN5i1eFI9aaT8JU81D7rOEEgohur3C9VlijGFZ4TeBPRfv8z?= =?us-ascii?Q?D/gT3P5Mld5Otroc4EkzgzwTDPVgnhuWpyV+UKrB6TFP8j97E3qy4LrQ+Ggm?= =?us-ascii?Q?XODCNS1b2C8BlSfeSRkwdIYp87/OD80wWydhuFyXpucno8bchrlYxSj6bbg7?= =?us-ascii?Q?sRV0YRUjwMLv+sHC0Od/VXgkQiat1UIBOeAEonkQx3E7U6I3UIuGAgc+r7cX?= =?us-ascii?Q?5Jl0kgy7byYrcDTTxnI2GCcZeatHYuKwVTZBDASNUQIalJ9wR3cj4A2fCfJl?= =?us-ascii?Q?auIZ8jQNHgbobmMF8EB/rvzKduzsRPvRgeQ6460r1cQwoieGR+dxEIHI7gId?= =?us-ascii?Q?6L4PZfiMBwjv7I2QpGVrp3K4xguZNuLrPXIYJu0XHyqIVFMmsCWV9Oac6HOU?= =?us-ascii?Q?raczJJoTrxwkssJjkKKDMNgVL/DshH73Z/megNrTub8FunGyYb6O0qK/wbo0?= =?us-ascii?Q?VQqL+t+LhH7MDR10YMhg6/Z/wnQ40htKsMvVEoZByJ2DVNvz0pWC3mRZNzSE?= =?us-ascii?Q?SVxqU0UjWzmTICI+GKuwaOxEzgHSQ/Qk77kDGKiPu5MQ9zT2MK+zKEvDlgdQ?= =?us-ascii?Q?zwBLO8DhCuyvdAmq77ellAqtpXJT4vt+nhUEShaEYtga5Syo+aKdJVxmSjJ/?= =?us-ascii?Q?Ep4XpuoFHzQq6MPuClO5SlPSO1EocAKlFxcF9JAT4uQ1yMGOuaaKGI4Une5Y?= =?us-ascii?Q?pPzzj1N6n4q2HIsLaNQU38=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 6:KTc+P8UQG3DvARS+vrfUpuk3aBqi0J20APYmsxLa8a8nXHpDpvIUAtQXSJ4ore0+9OnA8eKrZvNb+3FQ5PwFuGgYa41wBREz9QPvQer/NC10dCAK9w44XY+fXMhXFS0/ZSqeH5MT1aTTKhyKQEqbgNAlKzFMB0YbCp7hsfHBH/18lP3Mp/Rrrl69WoUIyjypFdosRyn49JMFyPpCHBQRU7fIiPLJQ+lDsODFq93CF2+P35DbaozW+b8jnTdonF1PbD8wx3v+TRvFJSmuf700nzkOFooxuZQnBhn8uiicYd0leATy1QLdu3qzSD9Uh0ETw3DkRrRrwMuJwf7dK9lboVf42C3Rk3RszDSczY02lzTHCzN1rnl2lp+G30KEfoq1c69klJj8u1haWeabtF1bWB8ErspkWOcBEKV6IfNWgWP0J1W2WLYxWk6hYtehb/tvvQmDrmPcc7LpR+f7yUQqFg==; 5:jI2wUeosXAQJGg73cTP5H7jf//YLb0ngT/qVIz16DCsrpe9wHJXuTWxRZ/7NwsV6hs62AD3FIROsgWRRBmIZZSZ38LiFxxThuqb1lGK1NoaeWYiE0yYcVWTB7u6Fns3Ni2AfXC07CR4nC5Hkk62Nqdbr1iD3i7n39eemhEaVTn8=; 24:wSxdLwZlydCII1WPdqKID/7gd4t2vE37Uu0lsx+3gNC57bTRIGyn6Nm4wSjGnz9uXyvYCpEpV1VZaTp4E95QzOOmqiRPwkNbHN8uKXAZ7L8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1236; 7:iK8CQ/oHFg/Mtf0xk6sjIB/TkCC/kXIt0n7+KoxVqdudwL76H591RJUYiRkAgTFPwIBqZnKNZ0MUcMUFAKbd6aTnkMY49Um17BhInC2JSlSd4AjEnrnM4bzIXpyPhMAQ+OEBh3MjdK1h51tEcEwpxUuMpk9OXrtc8HdquEp7kciucZFjhny/eoPLXfdHrb8yIF1ITZXKDxQfJ6B9bJ3WinUL0+Lk2I1/7DoVMSgsst6eLSAQ5CY3fmREHSKl4IZs3NW+GqaHFeHatJBUe97JI49VqZ8aC/dFtBckZygZagVBgc02e8kfMY4TWGuAs90GCcHSmIit0HSFVV0Cti28rioBq3WLNbSAosX+yeNciJxaHhk0lrLbloKEbgMb7qpoQG6zdkYsEk6yBCCqxfIv5RXFPRN5k/irHBiUOXiNz6Z9kfWQCaolHktKUWhS36/UBgbeUwM/z/aOz90CG54ZMQ==; 20:Zj3ihGdcsIvUGjClVWYVlDcA9upJPFx07NWinXh9k7indJh1YDgErtjveMGN/Yp+gLFUtLan9KA1rtWifCFC4SQZPTkNIupP/ciigzF8cQZgopyG74N4l3QoImTbwkBSFvOMQvLYlr5VSmtr/MYoOGWrP9tMc/Wj1TArC33jRQ92gN5IJIU4cBpS/eVulW/iNVrpK4nOSdtdD/5sJgYZcxAJbxYi6M/LTOm6b/bLEQjX5cf3/dmzosE7sEMnWjL9 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2017 20:46:31.8700 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1236 Subject: [PATCH v2 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 20:46:34 -0000 Content-Type: text/plain From: Brijesh Singh Contributed-under: TianoCore Contribution Agreement 1.0 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