Re: [qemu-s390x] [PATCH v3 01/16] s390 vfio-ccw: Add bootindex property and IPLB data

[Farhan Ali]

On 03/01/2019 01:59 PM, Jason J. Herne wrote:
> Add bootindex property and iplb data for vfio-ccw devices. This allows us to
> forward boot information into the bios for vfio-ccw devices.
>
> Refactor s390_get_ccw_device() to return device type. This prevents us from
> having to use messy casting logic in several places.
>
> Signed-off-by: Jason J. Herne<address@hidden>
> Acked-by: Halil Pasic<address@hidden>
> ---
>   MAINTAINERS                 |  1 +
>   hw/s390x/ipl.c              | 39 +++++++++++++++++++++++++++++++++------
>   hw/s390x/s390-ccw.c         |  9 +++++++++
>   hw/vfio/ccw.c               |  2 +-
>   include/hw/s390x/s390-ccw.h |  1 +
>   include/hw/s390x/vfio-ccw.h | 28 ++++++++++++++++++++++++++++
>   6 files changed, 73 insertions(+), 7 deletions(-)
>   create mode 100644 include/hw/s390x/vfio-ccw.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9a76845..a780916 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1400,6 +1400,7 @@ S: Supported
>   F: hw/vfio/ccw.c
>   F: hw/s390x/s390-ccw.c
>   F: include/hw/s390x/s390-ccw.h
> +F: include/hw/s390x/vfio-ccw.h
>   T: githttps://github.com/cohuck/qemu.git  s390-next
>   L:address@hidden
>   
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 896888b..df891bb 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -19,6 +19,7 @@
>   #include "hw/loader.h"
>   #include "hw/boards.h"
>   #include "hw/s390x/virtio-ccw.h"
> +#include "hw/s390x/vfio-ccw.h"
>   #include "hw/s390x/css.h"
>   #include "hw/s390x/ebcdic.h"
>   #include "ipl.h"
> @@ -305,16 +306,29 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl)
>       *timeout = cpu_to_be32(splash_time);
>   }
>   
> -static CcwDevice *s390_get_ccw_device(DeviceState *dev_st)
> +#define CCW_DEVTYPE_NONE    0x00
> +#define CCW_DEVTYPE_VIRTIO  0x01
> +#define CCW_DEVTYPE_SCSI    0x02
> +#define CCW_DEVTYPE_VFIO    0x03
> +
> +static CcwDevice*s390_get_ccw_device(DeviceState *dev_st, int*  devtype)
>   {
>       CcwDevice *ccw_dev = NULL;
>   
> +    *devtype = CCW_DEVTYPE_NONE;
> +
>       if (dev_st) {
>           VirtioCcwDevice *virtio_ccw_dev = (VirtioCcwDevice *)
>               object_dynamic_cast(OBJECT(qdev_get_parent_bus(dev_st)->parent),
>                                   TYPE_VIRTIO_CCW_DEVICE);
> +        VFIOCCWDevice *vfio_ccw_dev = (VFIOCCWDevice *)
> +            object_dynamic_cast(OBJECT(dev_st), TYPE_VFIO_CCW);
>           if (virtio_ccw_dev) {
>               ccw_dev = CCW_DEVICE(virtio_ccw_dev);
> +            *devtype = CCW_DEVTYPE_VIRTIO;
> +        } else if (vfio_ccw_dev) {
> +            ccw_dev = CCW_DEVICE(vfio_ccw_dev);
> +            *devtype = CCW_DEVTYPE_VFIO;
>           } else {
>               SCSIDevice *sd = (SCSIDevice *)
>                   object_dynamic_cast(OBJECT(dev_st),
> @@ -327,6 +341,7 @@ static CcwDevice *s390_get_ccw_device(DeviceState *dev_st)
>   
>                   ccw_dev = (CcwDevice *)object_dynamic_cast(OBJECT(scsi_ccw),
>                                                              TYPE_CCW_DEVICE);
> +                *devtype = CCW_DEVTYPE_SCSI;
>               }
>           }
>       }
> @@ -337,10 +352,11 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
>   {
>       DeviceState *dev_st;
>       CcwDevice *ccw_dev = NULL;
> +    int devtype;
>   
>       dev_st = get_boot_device(0);
>       if (dev_st) {
> -        ccw_dev = s390_get_ccw_device(dev_st);
> +        ccw_dev = s390_get_ccw_device(dev_st, &devtype);
>       }
>   
>       /*
> @@ -349,8 +365,10 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
>       if (ccw_dev) {
>           SCSIDevice *sd = (SCSIDevice *) object_dynamic_cast(OBJECT(dev_st),
>                                                               TYPE_SCSI_DEVICE);
> +        VirtIONet *vn;
>   
> -        if (sd) {
> +        switch (devtype) {
> +        case CCW_DEVTYPE_SCSI:
>               ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN);
>               ipl->iplb.blk0_len =
>                   cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN - 
> S390_IPLB_HEADER_LEN);
> @@ -360,8 +378,15 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
>               ipl->iplb.scsi.channel = cpu_to_be16(sd->channel);
>               ipl->iplb.scsi.devno = cpu_to_be16(ccw_dev->sch->devno);
>               ipl->iplb.scsi.ssid = ccw_dev->sch->ssid & 3;
> -        } else {
> -            VirtIONet *vn = (VirtIONet *) object_dynamic_cast(OBJECT(dev_st),
> +            break;
> +        case CCW_DEVTYPE_VFIO:
> +            ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
> +            ipl->iplb.pbt = S390_IPL_TYPE_CCW;
> +            ipl->iplb.ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
> +            ipl->iplb.ccw.ssid = ccw_dev->sch->ssid & 3;
> +            break;

Also for vfio-ccw we are not setting the ipl->iplb.blk0_len like we do 
for virtio. Is there a reason?

I know we don't reference the value in the bios for both virtio and vfio.

> +        case CCW_DEVTYPE_VIRTIO:
> +            vn = (VirtIONet *) object_dynamic_cast(OBJECT(dev_st),
>                                                                 
> TYPE_VIRTIO_NET);
>   
>               ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
> @@ -374,6 +399,7 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
>               if (vn) {
>                   ipl->netboot = true;
>               }
> +            break;
>           }