Re: [Qemu-devel] [PULL 48/57] TPM2 ACPI table support

[Stefan Berger]

On 06/04/2015 09:57 AM, Igor Mammedov wrote:
> On Sun, 31 May 2015 20:37:28 +0200
> "Michael S. Tsirkin" <address@hidden> wrote:
>
> > From: Stefan Berger <address@hidden>
> [...]
> > diff --git a/hw/i386/ssdt-tpm.dsl b/hw/i386/ssdt-tpm.dsl
> > index 75d9691..d81478c 100644
> > --- a/hw/i386/ssdt-tpm.dsl
> > +++ b/hw/i386/ssdt-tpm.dsl
> > @@ -25,19 +25,5 @@ DefinitionBlock (
> >       0x1                 // OEM Revision
> >       )
> >   {
> > -    Scope(\_SB) {
> > -        /* TPM with emulated TPM TIS interface */
> > -        Device (TPM) {
> > -            Name (_HID, EisaID ("PNP0C31"))
> > -            Name (_CRS, ResourceTemplate ()
> > -            {
> > -                Memory32Fixed (ReadWrite, TPM_TIS_ADDR_BASE,
> > TPM_TIS_ADDR_SIZE)
> > -                // older Linux tpm_tis drivers do not work with IRQ
> > -                //IRQNoFlags () {TPM_TIS_IRQ}
> > -            })
> > -            Method (_STA, 0, NotSerialized) {
> > -                Return (0x0F)
> > -            }
> > -        }
> > -    }
> > +#include "ssdt-tpm-common.dsl"
> Stefan,
>
> Original TPM had IRQNoFlags commented out but looking at current master
>
> hw/i386/ssdt-tpm.dsl:
> ...
> {
> #include "ssdt-tpm-common.dsl"
> }
>
> hw/i386/ssdt-tpm-common.dsl:
> ...
> * Common parts for TPM 1.2 and TPM 2 (with slight differences for PPI)
> ...
>          Device (TPM) {
>              Name (_HID, EisaID ("PNP0C31"))
>              Name (_CRS, ResourceTemplate ()
>              {
>                  Memory32Fixed (ReadWrite, TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE)
>                  IRQNoFlags () {TPM_TIS_IRQ}
>              })
> and TMP2 template includes the same ssdt-tpm-common.dsl so cited
> difference in comment above is gone now which makes TPM and TPM2
> the same.
> Was it intended change or we have introduced a bug?

This was an intended change. Once the physical presence interface code 
is added, there will be a difference between the two.