55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
|
From 49c493991c8cb9779022ffe3f1b2ac980f07852c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Thu, 20 Dec 2018 10:26:07 +0000
|
||
|
|
Subject: [PATCH 1/3] board-qemu/slof/vio-vscsi: Scan up to 64 SCSI IDs
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <1545301567-8565-2-git-send-email-thuth@redhat.com>
|
||
|
|
Patchwork-id: 83706
|
||
|
|
O-Subject: [RHEL8 SLOF PATCH 1/1] board-qemu/slof/vio-vscsi: Scan up to 64 SCSI IDs
|
||
|
|
Bugzilla: 1655649
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
||
|
|
RH-Acked-by: Serhii Popovych <spopovyc@redhat.com>
|
||
|
|
|
||
|
|
QEMU supports up the 64 SCSI IDs on the vscsi "bus", see the string
|
||
|
|
"max_target = 63" in the source file hw/scsi/spapr_vscsi.c of QEMU.
|
||
|
|
However, SLOF currently only checks the first 9 IDs on the vscsi adaptor,
|
||
|
|
so when you try to boot from a CD-ROM like this, the boot fails:
|
||
|
|
|
||
|
|
qemu-system-ppc64 ... -device spapr-vscsi,id=scsi0,reg=0x2000 \
|
||
|
|
-drive file=/path/to/cdrom.iso,format=raw,if=none,id=dr1,readonly=on \
|
||
|
|
-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=63,lun=1,drive=dr1,id=scd1
|
||
|
|
|
||
|
|
Thus let's change the amount of IDs that we scan in SLOF to 64, too, to
|
||
|
|
match the ID range that QEMU provides.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
||
|
|
(cherry picked from commit cad96808d130bcc1fc36741cbedaaa3f8215e6c4)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
board-qemu/slof/vio-vscsi.fs | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/board-qemu/slof/vio-vscsi.fs b/board-qemu/slof/vio-vscsi.fs
|
||
|
|
index f2d4c6f..be11b69 100644
|
||
|
|
--- a/board-qemu/slof/vio-vscsi.fs
|
||
|
|
+++ b/board-qemu/slof/vio-vscsi.fs
|
||
|
|
@@ -507,9 +507,9 @@ TRUE VALUE first-time-init?
|
||
|
|
10000 \ Larger value seem to have problems with some CDROMs
|
||
|
|
;
|
||
|
|
|
||
|
|
-8 CONSTANT #dev
|
||
|
|
+\ Report the amount of supported SCSI IDs - QEMU uses "max_target = 63"
|
||
|
|
: dev-max-target ( -- #max-target )
|
||
|
|
- #dev
|
||
|
|
+ 40
|
||
|
|
;
|
||
|
|
|
||
|
|
" scsi-probe-helpers.fs" included
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|