Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[qemu.git] / pc-bios / s390-ccw / virtio.c

diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 5b9e1dc1076cfe7c40fe2802aceba638b320f536..57ff1b07ee9229f597aec23fcd1c1ae2ebdb5f6b 100644 (file)
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -11,27 +11,29 @@
 #include "s390-ccw.h"
 #include "virtio.h"
 
 #include "s390-ccw.h"
 #include "virtio.h"
 

-struct vring block;
+static struct vring block;
+
+static char chsc_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));

 
 static long kvm_hypercall(unsigned long nr, unsigned long param1,
                           unsigned long param2)
 {
 
 static long kvm_hypercall(unsigned long nr, unsigned long param1,
                           unsigned long param2)
 {

-       register ulong r_nr asm("1") = nr;
-       register ulong r_param1 asm("2") = param1;
-       register ulong r_param2 asm("3") = param2;
-       register long retval asm("2");
+    register ulong r_nr asm("1") = nr;
+    register ulong r_param1 asm("2") = param1;
+    register ulong r_param2 asm("3") = param2;
+    register long retval asm("2");

 
 

-       asm volatile ("diag 2,4,0x500"
-                     : "=d" (retval)
-                     : "d" (r_nr), "0" (r_param1), "r"(r_param2)
-                     : "memory", "cc");
+    asm volatile ("diag 2,4,0x500"
+                  : "=d" (retval)
+                  : "d" (r_nr), "0" (r_param1), "r"(r_param2)
+                  : "memory", "cc");

 
 

-       return retval;
+    return retval;

 }
 
 static void virtio_notify(struct subchannel_id schid)
 {
 }
 
 static void virtio_notify(struct subchannel_id schid)
 {

-    kvm_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY, *(u32*)&schid, 0);
+    kvm_hypercall(KVM_S390_VIRTIO_CCW_NOTIFY, *(u32 *)&schid, 0);

 }
 
 /***********************************************
 }
 
 /***********************************************


@@ -114,8 +116,15 @@ static void vring_init(struct vring *vr, unsigned int num, void *p,
     vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1)
                 & ~(align - 1));
 
     vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1)
                 & ~(align - 1));
 

+    /* Zero out all relevant field */
+    vr->avail->flags = 0;
+    vr->avail->idx = 0;
+

     /* We're running with interrupts off anyways, so don't bother */
     vr->used->flags = VRING_USED_F_NO_NOTIFY;
     /* We're running with interrupts off anyways, so don't bother */
     vr->used->flags = VRING_USED_F_NO_NOTIFY;

+    vr->used->idx = 0;
+    vr->used_idx = 0;
+    vr->next_idx = 0;

 
     debug_print_addr("init vr", vr);
 }
 
     debug_print_addr("init vr", vr);
 }


@@ -143,8 +152,6 @@ static void vring_send_buf(struct vring *vr, void *p, int len, int flags)
     if (!(flags & VRING_DESC_F_NEXT)) {
         vr->avail->idx++;
     }
     if (!(flags & VRING_DESC_F_NEXT)) {
         vr->avail->idx++;
     }

-
-    vr->used->idx = vr->next_idx;

 }
 
 static u64 get_clock(void)
 }
 
 static u64 get_clock(void)


@@ -173,7 +180,8 @@ static int vring_wait_reply(struct vring *vr, int timeout)
     struct subchannel_id schid = vr->schid;
     int r = 0;
 
     struct subchannel_id schid = vr->schid;
     int r = 0;
 

-    while (vr->used->idx == vr->next_idx) {
+    /* Wait until the used index has moved. */
+    while (vr->used->idx == vr->used_idx) {

         vring_notify(schid);
         if (timeout && (get_second() >= target_second)) {
             r = 1;
         vring_notify(schid);
         if (timeout && (get_second() >= target_second)) {
             r = 1;


@@ -182,6 +190,7 @@ static int vring_wait_reply(struct vring *vr, int timeout)
         yield();
     }
 
         yield();
     }
 

+    vr->used_idx = vr->used->idx;

     vr->next_idx = 0;
     vr->desc[0].len = 0;
     vr->desc[0].flags = 0;
     vr->next_idx = 0;
     vr->desc[0].len = 0;
     vr->desc[0].flags = 0;


@@ -193,7 +202,7 @@ static int vring_wait_reply(struct vring *vr, int timeout)
  *               Virtio block                  *
  ***********************************************/
 
  *               Virtio block                  *
  ***********************************************/
 

-static int virtio_read_many(ulong sector, void *load_addr, int sec_num)
+int virtio_read_many(ulong sector, void *load_addr, int sec_num)

 {
     struct virtio_blk_outhdr out_hdr;
     u8 status;
 {
     struct virtio_blk_outhdr out_hdr;
     u8 status;


@@ -202,12 +211,12 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num)
     /* Tell the host we want to read */
     out_hdr.type = VIRTIO_BLK_T_IN;
     out_hdr.ioprio = 99;
     /* Tell the host we want to read */
     out_hdr.type = VIRTIO_BLK_T_IN;
     out_hdr.ioprio = 99;

-    out_hdr.sector = sector;
+    out_hdr.sector = virtio_sector_adjust(sector);

 
     vring_send_buf(&block, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
 
     /* This is where we want to receive data */
 
     vring_send_buf(&block, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
 
     /* This is where we want to receive data */

-    vring_send_buf(&block, load_addr, SECTOR_SIZE * sec_num,
+    vring_send_buf(&block, load_addr, virtio_get_block_size() * sec_num,

                    VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
                    VRING_DESC_F_NEXT);
 
                    VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
                    VRING_DESC_F_NEXT);
 


@@ -227,24 +236,24 @@ static int virtio_read_many(ulong sector, void *load_addr, int sec_num)
 }
 
 unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
 }
 
 unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,

-                                ulong subchan_id, void *load_addr)
+                                 ulong subchan_id, void *load_addr)

 {
     u8 status;
     int sec = rec_list1;
 {
     u8 status;
     int sec = rec_list1;

-    int sec_num = (((rec_list2 >> 32)+ 1) & 0xffff);
+    int sec_num = ((rec_list2 >> 32) & 0xffff) + 1;

     int sec_len = rec_list2 >> 48;
     ulong addr = (ulong)load_addr;
 
     int sec_len = rec_list2 >> 48;
     ulong addr = (ulong)load_addr;
 

-    if (sec_len != SECTOR_SIZE) {
+    if (sec_len != virtio_get_block_size()) {

         return -1;
     }
 
     sclp_print(".");
         return -1;
     }
 
     sclp_print(".");

-    status = virtio_read_many(sec, (void*)addr, sec_num);
+    status = virtio_read_many(sec, (void *)addr, sec_num);

     if (status) {
         virtio_panic("I/O Error");
     }
     if (status) {
         virtio_panic("I/O Error");
     }

-    addr += sec_num * SECTOR_SIZE;
+    addr += sec_num * virtio_get_block_size();

 
     return addr;
 }
 
     return addr;
 }


@@ -254,21 +263,126 @@ int virtio_read(ulong sector, void *load_addr)
     return virtio_read_many(sector, load_addr, 1);
 }
 
     return virtio_read_many(sector, load_addr, 1);
 }
 

+static VirtioBlkConfig blk_cfg = {};
+static bool guessed_disk_nature;
+
+bool virtio_guessed_disk_nature(void)
+{
+    return guessed_disk_nature;
+}
+
+void virtio_assume_scsi(void)
+{
+    guessed_disk_nature = true;
+    blk_cfg.blk_size = 512;
+    blk_cfg.physical_block_exp = 0;
+}
+
+void virtio_assume_eckd(void)
+{
+    guessed_disk_nature = true;
+    blk_cfg.blk_size = 4096;
+    blk_cfg.physical_block_exp = 0;
+
+    /* this must be here to calculate code segment position */
+    blk_cfg.geometry.heads = 15;
+    blk_cfg.geometry.sectors = 12;
+}
+
+bool virtio_disk_is_scsi(void)
+{
+    if (guessed_disk_nature) {
+        return (virtio_get_block_size()  == 512);
+    }
+    return (blk_cfg.geometry.heads == 255)
+        && (blk_cfg.geometry.sectors == 63)
+        && (virtio_get_block_size()  == 512);
+}
+
+/*
+ * Other supported value pairs, if any, would need to be added here.
+ * Note: head count is always 15.
+ */
+static inline u8 virtio_eckd_sectors_for_block_size(int size)
+{
+    switch (size) {
+    case 512:
+        return 49;
+    case 1024:
+        return 33;
+    case 2048:
+        return 21;
+    case 4096:
+        return 12;
+    }
+    return 0;
+}
+
+bool virtio_disk_is_eckd(void)
+{
+    const int block_size = virtio_get_block_size();
+
+    if (guessed_disk_nature) {
+        return (block_size  == 4096);
+    }
+    return (blk_cfg.geometry.heads == 15)
+        && (blk_cfg.geometry.sectors ==
+            virtio_eckd_sectors_for_block_size(block_size));
+}
+
+bool virtio_ipl_disk_is_valid(void)
+{
+    return virtio_disk_is_scsi() || virtio_disk_is_eckd();
+}
+
+int virtio_get_block_size(void)
+{
+    return blk_cfg.blk_size << blk_cfg.physical_block_exp;
+}
+
+uint8_t virtio_get_heads(void)
+{
+    return blk_cfg.geometry.heads;
+}
+
+uint8_t virtio_get_sectors(void)
+{
+    return blk_cfg.geometry.sectors;
+}
+
+uint64_t virtio_get_blocks(void)
+{
+    return blk_cfg.capacity /
+           (virtio_get_block_size() / VIRTIO_SECTOR_SIZE);
+}
+

 void virtio_setup_block(struct subchannel_id schid)
 {
     struct vq_info_block info;
     struct vq_config_block config = {};
 
 void virtio_setup_block(struct subchannel_id schid)
 {
     struct vq_info_block info;
     struct vq_config_block config = {};
 

+    blk_cfg.blk_size = 0; /* mark "illegal" - setup started... */
+    guessed_disk_nature = false;
+

     virtio_reset(schid);
 
     virtio_reset(schid);
 

+    /*
+     * Skipping CCW_CMD_READ_FEAT. We're not doing anything fancy, and
+     * we'll just stop dead anyway if anything does not work like we
+     * expect it.
+     */
+

     config.index = 0;
     if (run_ccw(schid, CCW_CMD_READ_VQ_CONF, &config, sizeof(config))) {
     config.index = 0;
     if (run_ccw(schid, CCW_CMD_READ_VQ_CONF, &config, sizeof(config))) {

+        virtio_panic("Could not get block device VQ configuration\n");
+    }
+    if (run_ccw(schid, CCW_CMD_READ_CONF, &blk_cfg, sizeof(blk_cfg))) {

         virtio_panic("Could not get block device configuration\n");
     }
         virtio_panic("Could not get block device configuration\n");
     }

-    vring_init(&block, config.num, (void*)(100 * 1024 * 1024),
+    vring_init(&block, config.num, ring_area,

                KVM_S390_VIRTIO_RING_ALIGN);
 
                KVM_S390_VIRTIO_RING_ALIGN);
 

-    info.queue = (100ULL * 1024ULL* 1024ULL);
+    info.queue = (unsigned long long) ring_area;

     info.align = KVM_S390_VIRTIO_RING_ALIGN;
     info.index = 0;
     info.num = config.num;
     info.align = KVM_S390_VIRTIO_RING_ALIGN;
     info.index = 0;
     info.num = config.num;


@@ -277,6 +391,12 @@ void virtio_setup_block(struct subchannel_id schid)
     if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {
         virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK);
     }
     if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {
         virtio_set_status(schid, VIRTIO_CONFIG_S_DRIVER_OK);
     }

+
+    if (!virtio_ipl_disk_is_valid()) {
+        /* make sure all getters but blocksize return 0 for invalid IPL disk */
+        memset(&blk_cfg, 0, sizeof(blk_cfg));
+        virtio_assume_scsi();
+    }

 }
 
 bool virtio_is_blk(struct subchannel_id schid)
 }
 
 bool virtio_is_blk(struct subchannel_id schid)


@@ -296,3 +416,19 @@ bool virtio_is_blk(struct subchannel_id schid)
     return true;
 }
 
     return true;
 }
 

+int enable_mss_facility(void)
+{
+    int ret;
+    struct chsc_area_sda *sda_area = (struct chsc_area_sda *) chsc_page;
+
+    memset(sda_area, 0, PAGE_SIZE);
+    sda_area->request.length = 0x0400;
+    sda_area->request.code = 0x0031;
+    sda_area->operation_code = 0x2;
+
+    ret = chsc(sda_area);
+    if ((ret == 0) && (sda_area->response.code == 0x0001)) {
+        return 0;
+    }
+    return -EIO;
+}