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

s390x/kvm: factor out build_channel_report_mcic() into cpu.h 



We'll need it later on in two places. Refactor it to just indicate the
validity bits. While at it, introduce a define for the used CR14 bit (we'll
also need later on).

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20171208160207.26494-2-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 864c2512

target/s390x/cpu.h

+23 −0
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ extern const struct VMStateDescription vmstate_s390_cpu; 
#define CR0_CPU_TIMER_SC        0x0000000000000400ULL

#define CR0_SERVICE_SC          0x0000000000000200ULL



/* Control register 14 bits */

#define CR14_CHANNEL_REPORT_SC  0x0000000010000000ULL



/* MMU */

#define MMU_PRIMARY_IDX         0

#define MMU_SECONDARY_IDX       1
@@ -674,6 +677,26 @@ struct sysib_322 { 
#define MCIC_VB_CT 0x0000000000020000ULL

#define MCIC_VB_CC 0x0000000000010000ULL



static inline uint64_t s390_build_validity_mcic(void)

{

    uint64_t mcic;



    /*

     * Indicate all validity bits (no damage) only. Other bits have to be

     * added by the caller. (storage errors, subclasses and subclass modifiers)

     */

    mcic = MCIC_VB_WP | MCIC_VB_MS | MCIC_VB_PM | MCIC_VB_IA | MCIC_VB_FP |

           MCIC_VB_GR | MCIC_VB_CR | MCIC_VB_ST | MCIC_VB_AR | MCIC_VB_PR |

           MCIC_VB_FC | MCIC_VB_CT | MCIC_VB_CC;

    if (s390_has_feat(S390_FEAT_VECTOR)) {

        mcic |= MCIC_VB_VR;

    }

    if (s390_has_feat(S390_FEAT_GUARDED_STORAGE)) {

        mcic |= MCIC_VB_GS;

    }

    return mcic;

}





/* cpu.c */

int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low);

target/s390x/kvm.c

+2 −23
Original line number Diff line number Diff line
@@ -1852,33 +1852,12 @@ void kvm_s390_io_interrupt(uint16_t subchannel_id, 
    kvm_s390_floating_interrupt(&irq);

}



static uint64_t build_channel_report_mcic(void)

{

    uint64_t mcic;



    /* subclass: indicate channel report pending */

    mcic = MCIC_SC_CP |

    /* subclass modifiers: none */

    /* storage errors: none */

    /* validity bits: no damage */

        MCIC_VB_WP | MCIC_VB_MS | MCIC_VB_PM | MCIC_VB_IA | MCIC_VB_FP |

        MCIC_VB_GR | MCIC_VB_CR | MCIC_VB_ST | MCIC_VB_AR | MCIC_VB_PR |

        MCIC_VB_FC | MCIC_VB_CT | MCIC_VB_CC;

    if (s390_has_feat(S390_FEAT_VECTOR)) {

        mcic |= MCIC_VB_VR;

    }

    if (s390_has_feat(S390_FEAT_GUARDED_STORAGE)) {

        mcic |= MCIC_VB_GS;

    }

    return mcic;

}



void kvm_s390_crw_mchk(void)

{

    struct kvm_s390_irq irq = {

        .type = KVM_S390_MCHK,

        .u.mchk.cr14 = 1 << 28,

        .u.mchk.mcic = build_channel_report_mcic(),

        .u.mchk.cr14 = CR14_CHANNEL_REPORT_SC,

        .u.mchk.mcic = s390_build_validity_mcic() | MCIC_SC_CP,

    };

    kvm_s390_floating_interrupt(&irq);

}