OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390x/css: update css_adapter_interrupt

Browse Source 
Let's use the new inject_airq callback of flic to inject adapter
interrupts. For kvm case, if the kernel flic doesn't support the new
interface, the irq routine remains unchanged. For non-kvm case,
qemu-flic handles the suppression process.

Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Signed-off-by: Fei Li <sherrylf@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Yi Min Zhao 2017-02-17 15:26:48 +08:00 committed by Christian Borntraeger
parent 2283f4d67a
commit 25a08b8ded
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/s390x/css.c
View File

@ -547,12 +547,26 @@ out:
return r; return r;
} }
void css_adapter_interrupt(uint8_t isc) void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc)
{ {
S390FLICState *fs = s390_get_flic();
S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);
uint32_t io_int_word = (isc << 27) | IO_INT_WORD_AI; uint32_t io_int_word = (isc << 27) | IO_INT_WORD_AI;
IoAdapter *adapter = channel_subsys.io_adapters[type][isc];
if (!adapter) {
return;
}
trace_css_adapter_interrupt(isc); trace_css_adapter_interrupt(isc);
s390_io_interrupt(0, 0, 0, io_int_word); if (fs->ais_supported) {
if (fsc->inject_airq(fs, type, isc, adapter->flags)) {
error_report("Failed to inject airq with AIS supported");
exit(1);
}
} else {
s390_io_interrupt(0, 0, 0, io_int_word);
}
} }
static void sch_handle_clear_func(SubchDev *sch) static void sch_handle_clear_func(SubchDev *sch)

2
hw/s390x/s390-pci-bus.c
View File

@ -504,7 +504,7 @@ static void s390_msi_ctrl_write(void *opaque, hwaddr addr, uint64_t data,
0x80 >> ((ind_bit + vec) % 8)); 0x80 >> ((ind_bit + vec) % 8));
if (!set_ind_atomic(pbdev->routes.adapter.summary_addr + sum_bit / 8, if (!set_ind_atomic(pbdev->routes.adapter.summary_addr + sum_bit / 8,
0x80 >> (sum_bit % 8))) { 0x80 >> (sum_bit % 8))) {
css_adapter_interrupt(pbdev->isc); css_adapter_interrupt(CSS_IO_ADAPTER_PCI, pbdev->isc);
} }
} }

2
hw/s390x/virtio-ccw.c
View File

@ -1074,7 +1074,7 @@ static void virtio_ccw_notify(DeviceState *d, uint16_t vector)
0x80 >> ((ind_bit + vector) % 8)); 0x80 >> ((ind_bit + vector) % 8));
if (!virtio_set_ind_atomic(sch, dev->summary_indicator->addr, if (!virtio_set_ind_atomic(sch, dev->summary_indicator->addr,
0x01)) { 0x01)) {
css_adapter_interrupt(dev->thinint_isc); css_adapter_interrupt(CSS_IO_ADAPTER_VIRTIO, dev->thinint_isc);
} }
} else { } else {
indicators = address_space_ldq(&address_space_memory, indicators = address_space_ldq(&address_space_memory,

2
include/hw/s390x/css.h
View File

@ -155,7 +155,6 @@ void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,
void css_generate_chp_crws(uint8_t cssid, uint8_t chpid); void css_generate_chp_crws(uint8_t cssid, uint8_t chpid);
void css_generate_css_crws(uint8_t cssid); void css_generate_css_crws(uint8_t cssid);
void css_clear_sei_pending(void); void css_clear_sei_pending(void);
void css_adapter_interrupt(uint8_t isc);
int s390_ccw_cmd_request(ORB *orb, SCSW *scsw, void *data); int s390_ccw_cmd_request(ORB *orb, SCSW *scsw, void *data);
int do_subchannel_work_virtual(SubchDev *sub, ORB *orb); int do_subchannel_work_virtual(SubchDev *sub, ORB *orb);
int do_subchannel_work_passthrough(SubchDev *sub, ORB *orb); int do_subchannel_work_passthrough(SubchDev *sub, ORB *orb);
@ -166,6 +165,7 @@ typedef enum {
CSS_IO_ADAPTER_TYPE_NUMS, CSS_IO_ADAPTER_TYPE_NUMS,
} CssIoAdapterType; } CssIoAdapterType;
void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc);
int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode); int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode);
uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc); uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc);
void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable, void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable,