[Xen-changelog] [xen-3.2-testing] hvmloader: Set up any Intel ICH for legacy IDE.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1214582650 -3600
# Node ID 7a39c8d8c8c25aaefdb515e67eec2f4f2c682bbf
# Parent  3303257b7b3c583382a95f03b13388e3203e5967
hvmloader: Set up any Intel ICH for legacy IDE.
Signed-off-by: Li Zhang <li.zhang@xxxxxxxxx>
xen-unstable changeset:   17897:be52424a543ec9f1437056ee3bf429a4c48a4ea9
xen-unstable date:        Fri Jun 27 14:15:11 2008 +0100
---
 tools/firmware/hvmloader/hvmloader.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff -r 3303257b7b3c -r 7a39c8d8c8c2 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Fri Jun 27 17:01:31 2008 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Fri Jun 27 17:04:10 2008 +0100
@@ -228,10 +228,12 @@ static void pci_setup(void)
             pci_writew(devfn, 0x3d, 0x0001);
             break;
         case 0x0101:
-            /* PIIX3 IDE */
-            ASSERT((vendor_id == 0x8086) && (device_id == 0x7010));
-            pci_writew(devfn, 0x40, 0x8000); /* enable IDE0 */
-            pci_writew(devfn, 0x42, 0x8000); /* enable IDE1 */
+            if ( vendor_id == 0x8086 )
+            {
+                /* Intel ICHs since PIIX3: enable IDE legacy mode. */
+                pci_writew(devfn, 0x40, 0x8000); /* enable IDE0 */
+                pci_writew(devfn, 0x42, 0x8000); /* enable IDE1 */
+            }
             /* fall through */
         default:
             /* Default memory mappings. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog