Commit 6762808f authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/flic: cache the common flic class in a central function 



This avoids tons of conversions when handling interrupts.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180129125623.21729-19-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent c21a6106

hw/intc/s390_flic.c

+12 −1
Original line number Diff line number Diff line
@@ -22,6 +22,17 @@ 
#include "qapi/error.h"

#include "hw/s390x/s390-virtio-ccw.h"



S390FLICStateClass *s390_get_flic_class(S390FLICState *fs)

{

    static S390FLICStateClass *class;



    if (!class) {

        /* we only have one flic device, so this is fine to cache */

        class = S390_FLIC_COMMON_GET_CLASS(fs);

    }

    return class;

}



QEMUS390FLICState *s390_get_qemu_flic(S390FLICState *fs)

{

    static QEMUS390FLICState *flic;
@@ -146,7 +157,7 @@ static int qemu_s390_inject_airq(S390FLICState *fs, uint8_t type, 
                                 uint8_t isc, uint8_t flags)

{

    QEMUS390FLICState *flic = s390_get_qemu_flic(fs);

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);

    bool flag = flags & S390_ADAPTER_SUPPRESSIBLE;

    uint32_t io_int_word = (isc << 27) | IO_INT_WORD_AI;

hw/s390x/css.c

+5 −5
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static int s390_io_adapter_map(AdapterInfo *adapter, uint64_t map_addr, 
                               bool do_map)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    return fsc->io_adapter_map(fs, adapter->adapter_id, map_addr, do_map);

}
@@ -520,7 +520,7 @@ void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable, 
    int ret, isc;

    IoAdapter *adapter;

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    /*

     * Disallow multiple registrations for the same device type.
@@ -566,7 +566,7 @@ static void css_clear_io_interrupt(uint16_t subchannel_id, 
    Error *err = NULL;

    static bool no_clear_irq;

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);

    int r;



    if (unlikely(no_clear_irq)) {
@@ -640,7 +640,7 @@ void css_conditional_io_interrupt(SubchDev *sch) 
int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);

    int r;



    if (env->psw.mask & PSW_MASK_PSTATE) {
@@ -666,7 +666,7 @@ out: 
void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);

    uint32_t io_int_word = (isc << 27) | IO_INT_WORD_AI;

    IoAdapter *adapter = channel_subsys.io_adapters[type][isc];

hw/s390x/virtio-ccw.c

+2 −2
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static int virtio_ccw_setup_irqroutes(VirtioCcwDevice *dev, int nvqs) 
    VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);

    int ret;

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    ret = virtio_ccw_get_mappings(dev);

    if (ret) {
@@ -1129,7 +1129,7 @@ static int virtio_ccw_setup_irqroutes(VirtioCcwDevice *dev, int nvqs) 
static void virtio_ccw_release_irqroutes(VirtioCcwDevice *dev, int nvqs)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    fsc->release_adapter_routes(fs, &dev->routes);

}

include/hw/s390x/s390_flic.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ void s390_flic_init(void); 


S390FLICState *s390_get_flic(void);

QEMUS390FLICState *s390_get_qemu_flic(S390FLICState *fs);

S390FLICStateClass *s390_get_flic_class(S390FLICState *fs);

bool ais_needed(void *opaque);



#endif /* HW_S390_FLIC_H */

target/s390x/interrupt.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void cpu_inject_stop(S390CPU *cpu) 
void s390_sclp_extint(uint32_t parm)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    fsc->inject_service(fs, parm);

}
@@ -143,7 +143,7 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr, 
                       uint32_t io_int_parm, uint32_t io_int_word)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    fsc->inject_io(fs, subchannel_id, subchannel_nr, io_int_parm, io_int_word);

}
@@ -151,7 +151,7 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr, 
void s390_crw_mchk(void)

{

    S390FLICState *fs = s390_get_flic();

    S390FLICStateClass *fsc = S390_FLIC_COMMON_GET_CLASS(fs);

    S390FLICStateClass *fsc = s390_get_flic_class(fs);



    fsc->inject_crw_mchk(fs);

}