Hi Stefan,
On 6/17/20 4:22 PM, Stefan Berger wrote:
> From: Stefan Berger <[email protected]>
>
> Implement get_irqnum() as part of the TPMIfClass to get the assigned IRQ
> number or TPM_IRQ_DISABLED (~0) in case IRQs cannot be used.
>
> Signed-off-by: Stefan Berger <[email protected]>
> Reviewed-by: Marc-André Lureau <[email protected]>
> Message-id: [email protected]
Reviewed-by: Eric Auger <[email protected]>
Thanks
Eric
> ---
> hw/tpm/tpm_tis_isa.c | 9 +++++++++
> hw/tpm/tpm_tis_sysbus.c | 9 +++++++++
> include/sysemu/tpm.h | 12 ++++++++++++
> 3 files changed, 30 insertions(+)
>
> diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
> index 30ba37079d..ed6d422f05 100644
> --- a/hw/tpm/tpm_tis_isa.c
> +++ b/hw/tpm/tpm_tis_isa.c
> @@ -80,6 +80,14 @@ static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf
> *ti)
> return tpm_tis_get_tpm_version(s);
> }
>
> +static int8_t tpm_tis_isa_get_irqnum(TPMIf *ti)
> +{
> + TPMStateISA *isadev = TPM_TIS_ISA(ti);
> + TPMState *s = &isadev->state;
> +
> + return s->irq_num;
> +}
> +
> static void tpm_tis_isa_reset(DeviceState *dev)
> {
> TPMStateISA *isadev = TPM_TIS_ISA(dev);
> @@ -148,6 +156,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass,
> void *data)
> dc->reset = tpm_tis_isa_reset;
> tc->request_completed = tpm_tis_isa_request_completed;
> tc->get_version = tpm_tis_isa_get_tpm_version;
> + tc->get_irqnum = tpm_tis_isa_get_irqnum;
> }
>
> static const TypeInfo tpm_tis_isa_info = {
> diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
> index eced1fc843..86b3988be5 100644
> --- a/hw/tpm/tpm_tis_sysbus.c
> +++ b/hw/tpm/tpm_tis_sysbus.c
> @@ -80,6 +80,14 @@ static enum TPMVersion
> tpm_tis_sysbus_get_tpm_version(TPMIf *ti)
> return tpm_tis_get_tpm_version(s);
> }
>
> +static int8_t tpm_tis_sysbus_get_irqnum(TPMIf *ti)
> +{
> + TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(ti);
> + TPMState *s = &sbdev->state;
> +
> + return s->irq_num;
> +}
> +
> static void tpm_tis_sysbus_reset(DeviceState *dev)
> {
> TPMStateSysBus *sbdev = TPM_TIS_SYSBUS(dev);
> @@ -137,6 +145,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass,
> void *data)
> dc->reset = tpm_tis_sysbus_reset;
> tc->request_completed = tpm_tis_sysbus_request_completed;
> tc->get_version = tpm_tis_sysbus_get_tpm_version;
> + tc->get_irqnum = tpm_tis_sysbus_get_irqnum;
> }
>
> static const TypeInfo tpm_tis_sysbus_info = {
> diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
> index 03fb25941c..7ebe9f7ef0 100644
> --- a/include/sysemu/tpm.h
> +++ b/include/sysemu/tpm.h
> @@ -25,6 +25,8 @@ typedef enum TPMVersion {
> TPM_VERSION_2_0 = 2,
> } TPMVersion;
>
> +#define TPM_IRQ_DISABLED ~0
> +
> #define TYPE_TPM_IF "tpm-if"
> #define TPM_IF_CLASS(klass) \
> OBJECT_CLASS_CHECK(TPMIfClass, (klass), TYPE_TPM_IF)
> @@ -41,6 +43,7 @@ typedef struct TPMIfClass {
> enum TpmModel model;
> void (*request_completed)(TPMIf *obj, int ret);
> enum TPMVersion (*get_version)(TPMIf *obj);
> + int8_t (*get_irqnum)(TPMIf *obj);
> } TPMIfClass;
>
> #define TYPE_TPM_TIS_ISA "tpm-tis"
> @@ -74,4 +77,13 @@ static inline TPMVersion tpm_get_version(TPMIf *ti)
> return TPM_IF_GET_CLASS(ti)->get_version(ti);
> }
>
> +static inline int8_t tpm_get_irqnum(TPMIf *ti)
> +{
> + if (!ti || !TPM_IF_GET_CLASS(ti)->get_irqnum) {
> + return TPM_IRQ_DISABLED;
> + }
> +
> + return TPM_IF_GET_CLASS(ti)->get_irqnum(ti);
> +}
> +
> #endif /* QEMU_TPM_H */
>
