|
 |
29b115 |
From 7d4f2454f95bfc087ad3f2fe3bc4625dcea3568e Mon Sep 17 00:00:00 2001
|
|
|
29b115 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
Date: Fri, 8 Jul 2022 20:49:01 +0200
|
|
|
29b115 |
Subject: [PATCH 06/17] pc-bios/s390-ccw/virtio: Introduce a macro for the DASD
|
|
|
29b115 |
block size
|
|
|
29b115 |
|
|
|
29b115 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
RH-MergeRequest: 106: pc-bios/s390-ccw: Fix boot from disks with 4k sectors that do not have the typical DASD geometry
|
|
|
29b115 |
RH-Commit: [1/10] 71033934e1e9988bcf71362e02665ceb7449009d (thuth/qemu-kvm-cs9)
|
|
|
29b115 |
RH-Bugzilla: 2098077
|
|
|
29b115 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
29b115 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
29b115 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
29b115 |
|
|
|
29b115 |
Bugzilla: http://bugzilla.redhat.com/2098077
|
|
|
29b115 |
|
|
|
29b115 |
commit 1f2c2ee48e87ea743f8e23cc7569dd26c4cf9623
|
|
|
29b115 |
Author: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
Date: Mon Jul 4 13:18:53 2022 +0200
|
|
|
29b115 |
|
|
|
29b115 |
pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size
|
|
|
29b115 |
|
|
|
29b115 |
Use VIRTIO_DASD_DEFAULT_BLOCK_SIZE instead of the magic value 4096.
|
|
|
29b115 |
|
|
|
29b115 |
Message-Id: <20220704111903.62400-3-thuth@redhat.com>
|
|
|
29b115 |
Reviewed-by: Eric Farman <farman@linux.ibm.com>
|
|
|
29b115 |
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
29b115 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
|
|
|
29b115 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
29b115 |
---
|
|
|
29b115 |
pc-bios/s390-ccw/virtio-blkdev.c | 2 +-
|
|
|
29b115 |
pc-bios/s390-ccw/virtio.h | 1 +
|
|
|
29b115 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
29b115 |
|
|
|
29b115 |
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
|
|
|
29b115 |
index 7d35050292..6483307630 100644
|
|
|
29b115 |
--- a/pc-bios/s390-ccw/virtio-blkdev.c
|
|
|
29b115 |
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
|
|
|
29b115 |
@@ -155,7 +155,7 @@ void virtio_assume_eckd(void)
|
|
|
29b115 |
vdev->config.blk.physical_block_exp = 0;
|
|
|
29b115 |
switch (vdev->senseid.cu_model) {
|
|
|
29b115 |
case VIRTIO_ID_BLOCK:
|
|
|
29b115 |
- vdev->config.blk.blk_size = 4096;
|
|
|
29b115 |
+ vdev->config.blk.blk_size = VIRTIO_DASD_DEFAULT_BLOCK_SIZE;
|
|
|
29b115 |
break;
|
|
|
29b115 |
case VIRTIO_ID_SCSI:
|
|
|
29b115 |
vdev->config.blk.blk_size = vdev->scsi_block_size;
|
|
|
29b115 |
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
|
|
|
29b115 |
index 19fceb6495..9e410bde6f 100644
|
|
|
29b115 |
--- a/pc-bios/s390-ccw/virtio.h
|
|
|
29b115 |
+++ b/pc-bios/s390-ccw/virtio.h
|
|
|
29b115 |
@@ -198,6 +198,7 @@ extern int virtio_read_many(ulong sector, void *load_addr, int sec_num);
|
|
|
29b115 |
#define VIRTIO_SECTOR_SIZE 512
|
|
|
29b115 |
#define VIRTIO_ISO_BLOCK_SIZE 2048
|
|
|
29b115 |
#define VIRTIO_SCSI_BLOCK_SIZE 512
|
|
|
29b115 |
+#define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096
|
|
|
29b115 |
|
|
|
29b115 |
static inline ulong virtio_sector_adjust(ulong sector)
|
|
|
29b115 |
{
|
|
|
29b115 |
--
|
|
|
29b115 |
2.31.1
|
|
|
29b115 |
|