All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
@ 2019-01-25 21:00 Stefan Berger
  2019-01-28 14:45 ` Igor Mammedov
  2019-01-29  8:05 ` Igor Mammedov
  0 siblings, 2 replies; 10+ messages in thread
From: Stefan Berger @ 2019-01-25 21:00 UTC (permalink / raw)
  To: qemu-devel; +Cc: marcandre.lureau, imammedo, mst, Stefan Berger

This patch makes the a TPM 2.0 with TIS interface available under the
HID 'MSF0101'. This is supported by Linux and also Windows now
recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 hw/i386/acpi-build.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 2e21a31f82..f51225b4a7 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
             build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
 
             if (TPM_IS_TIS(tpm)) {
-                dev = aml_device("ISA.TPM");
-                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
+                if (misc->tpm_version == TPM_VERSION_2_0) {
+                    dev = aml_device("TPM");
+                    aml_append(dev, aml_name_decl("_HID",
+                                                  aml_string("MSFT0101")));
+                } else {
+                    dev = aml_device("ISA.TPM");
+                    aml_append(dev, aml_name_decl("_HID",
+                                                  aml_eisaid("PNP0C31")));
+                }
+
                 aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
                 crs = aml_resource_template();
                 aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-25 21:00 [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101 Stefan Berger
@ 2019-01-28 14:45 ` Igor Mammedov
  2019-01-28 15:15   ` Michael S. Tsirkin
  2019-01-28 16:14   ` Stefan Berger
  2019-01-29  8:05 ` Igor Mammedov
  1 sibling, 2 replies; 10+ messages in thread
From: Igor Mammedov @ 2019-01-28 14:45 UTC (permalink / raw)
  To: Stefan Berger; +Cc: qemu-devel, marcandre.lureau, mst

On Fri, 25 Jan 2019 16:00:58 -0500
Stefan Berger <stefanb@linux.ibm.com> wrote:

> This patch makes the a TPM 2.0 with TIS interface available under the
> HID 'MSF0101'. This is supported by Linux and also Windows now
MSF0101 is relatively recent addition to Linux,
are there in wild (old) kernels that worked with PNP0C31 but won't work
with MSF0101?

> recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
>  hw/i386/acpi-build.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2e21a31f82..f51225b4a7 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
>  
>              if (TPM_IS_TIS(tpm)) {
> -                dev = aml_device("ISA.TPM");
> -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> +                if (misc->tpm_version == TPM_VERSION_2_0) {
> +                    dev = aml_device("TPM");
> +                    aml_append(dev, aml_name_decl("_HID",
> +                                                  aml_string("MSFT0101")));
> +                } else {
> +                    dev = aml_device("ISA.TPM");
> +                    aml_append(dev, aml_name_decl("_HID",
> +                                                  aml_eisaid("PNP0C31")));
> +                }
> +
>                  aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
>                  crs = aml_resource_template();
>                  aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 14:45 ` Igor Mammedov
@ 2019-01-28 15:15   ` Michael S. Tsirkin
  2019-01-28 15:40     ` Igor Mammedov
  2019-01-28 16:14   ` Stefan Berger
  1 sibling, 1 reply; 10+ messages in thread
From: Michael S. Tsirkin @ 2019-01-28 15:15 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: Stefan Berger, qemu-devel, marcandre.lureau

On Mon, Jan 28, 2019 at 03:45:53PM +0100, Igor Mammedov wrote:
> On Fri, 25 Jan 2019 16:00:58 -0500
> Stefan Berger <stefanb@linux.ibm.com> wrote:
> 
> > This patch makes the a TPM 2.0 with TIS interface available under the
> > HID 'MSF0101'. This is supported by Linux and also Windows now
> MSF0101 is relatively recent addition to Linux,
> are there in wild (old) kernels that worked with PNP0C31 but won't work
> with MSF0101?

Well what would you do? You either have TPM 2.0 or you don't.
If you have a 2.0 backend you need to expose it as 2.0
to the frontend right?

> > recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
> > 
> > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > ---
> >  hw/i386/acpi-build.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> > 
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index 2e21a31f82..f51225b4a7 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> >              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
> >  
> >              if (TPM_IS_TIS(tpm)) {
> > -                dev = aml_device("ISA.TPM");
> > -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> > +                if (misc->tpm_version == TPM_VERSION_2_0) {
> > +                    dev = aml_device("TPM");
> > +                    aml_append(dev, aml_name_decl("_HID",
> > +                                                  aml_string("MSFT0101")));
> > +                } else {
> > +                    dev = aml_device("ISA.TPM");
> > +                    aml_append(dev, aml_name_decl("_HID",
> > +                                                  aml_eisaid("PNP0C31")));
> > +                }
> > +
> >                  aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> >                  crs = aml_resource_template();
> >                  aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 15:15   ` Michael S. Tsirkin
@ 2019-01-28 15:40     ` Igor Mammedov
  2019-01-28 15:56       ` Michael S. Tsirkin
  0 siblings, 1 reply; 10+ messages in thread
From: Igor Mammedov @ 2019-01-28 15:40 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Stefan Berger, qemu-devel, marcandre.lureau

On Mon, 28 Jan 2019 10:15:55 -0500
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Mon, Jan 28, 2019 at 03:45:53PM +0100, Igor Mammedov wrote:
> > On Fri, 25 Jan 2019 16:00:58 -0500
> > Stefan Berger <stefanb@linux.ibm.com> wrote:
> >   
> > > This patch makes the a TPM 2.0 with TIS interface available under the
> > > HID 'MSF0101'. This is supported by Linux and also Windows now  
> > MSF0101 is relatively recent addition to Linux,
> > are there in wild (old) kernels that worked with PNP0C31 but won't work
> > with MSF0101?  
> 
> Well what would you do? You either have TPM 2.0 or you don't.
> If you have a 2.0 backend you need to expose it as 2.0
> to the frontend right?
I wasn't clear enough, question is:
If there are kernels where TPM2 worked with PNP0C31 and without MSF0101 support?

 
> > > recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
> > > 
> > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > ---
> > >  hw/i386/acpi-build.c | 12 ++++++++++--
> > >  1 file changed, 10 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > > index 2e21a31f82..f51225b4a7 100644
> > > --- a/hw/i386/acpi-build.c
> > > +++ b/hw/i386/acpi-build.c
> > > @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> > >              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
> > >  
> > >              if (TPM_IS_TIS(tpm)) {
> > > -                dev = aml_device("ISA.TPM");
> > > -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> > > +                if (misc->tpm_version == TPM_VERSION_2_0) {
> > > +                    dev = aml_device("TPM");
> > > +                    aml_append(dev, aml_name_decl("_HID",
> > > +                                                  aml_string("MSFT0101")));
> > > +                } else {
> > > +                    dev = aml_device("ISA.TPM");
> > > +                    aml_append(dev, aml_name_decl("_HID",
> > > +                                                  aml_eisaid("PNP0C31")));
> > > +                }
> > > +
> > >                  aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > >                  crs = aml_resource_template();
> > >                  aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,  

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 15:40     ` Igor Mammedov
@ 2019-01-28 15:56       ` Michael S. Tsirkin
  0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2019-01-28 15:56 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: Stefan Berger, qemu-devel, marcandre.lureau

On Mon, Jan 28, 2019 at 04:40:46PM +0100, Igor Mammedov wrote:
> On Mon, 28 Jan 2019 10:15:55 -0500
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> 
> > On Mon, Jan 28, 2019 at 03:45:53PM +0100, Igor Mammedov wrote:
> > > On Fri, 25 Jan 2019 16:00:58 -0500
> > > Stefan Berger <stefanb@linux.ibm.com> wrote:
> > >   
> > > > This patch makes the a TPM 2.0 with TIS interface available under the
> > > > HID 'MSF0101'. This is supported by Linux and also Windows now  
> > > MSF0101 is relatively recent addition to Linux,
> > > are there in wild (old) kernels that worked with PNP0C31 but won't work
> > > with MSF0101?  
> > 
> > Well what would you do? You either have TPM 2.0 or you don't.
> > If you have a 2.0 backend you need to expose it as 2.0
> > to the frontend right?
> I wasn't clear enough, question is:
> If there are kernels where TPM2 worked with PNP0C31 and without MSF0101 support?

As far as I can see TPM 2.0 support was added by

commit 30fc8d138e9123f374a3c3867e7c7c5cd4004941
Author: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date:   Fri Dec 12 11:46:39 2014 -0800

    tpm: TPM 2.0 CRB Interface

this seems to already use MSF0101.


I guess the answer is no.

>  
> > > > recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
> > > > 
> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > > ---
> > > >  hw/i386/acpi-build.c | 12 ++++++++++--
> > > >  1 file changed, 10 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > > > index 2e21a31f82..f51225b4a7 100644
> > > > --- a/hw/i386/acpi-build.c
> > > > +++ b/hw/i386/acpi-build.c
> > > > @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> > > >              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
> > > >  
> > > >              if (TPM_IS_TIS(tpm)) {
> > > > -                dev = aml_device("ISA.TPM");
> > > > -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> > > > +                if (misc->tpm_version == TPM_VERSION_2_0) {
> > > > +                    dev = aml_device("TPM");
> > > > +                    aml_append(dev, aml_name_decl("_HID",
> > > > +                                                  aml_string("MSFT0101")));
> > > > +                } else {
> > > > +                    dev = aml_device("ISA.TPM");
> > > > +                    aml_append(dev, aml_name_decl("_HID",
> > > > +                                                  aml_eisaid("PNP0C31")));
> > > > +                }
> > > > +
> > > >                  aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
> > > >                  crs = aml_resource_template();
> > > >                  aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,  

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 14:45 ` Igor Mammedov
  2019-01-28 15:15   ` Michael S. Tsirkin
@ 2019-01-28 16:14   ` Stefan Berger
  2019-01-28 17:19     ` Stefan Berger
  1 sibling, 1 reply; 10+ messages in thread
From: Stefan Berger @ 2019-01-28 16:14 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, marcandre.lureau, mst

On 1/28/19 9:45 AM, Igor Mammedov wrote:
> On Fri, 25 Jan 2019 16:00:58 -0500
> Stefan Berger <stefanb@linux.ibm.com> wrote:
>
>> This patch makes the a TPM 2.0 with TIS interface available under the
>> HID 'MSF0101'. This is supported by Linux and also Windows now
> MSF0101 is relatively recent addition to Linux,
> are there in wild (old) kernels that worked with PNP0C31 but won't work
> with MSF0101?


Linux 4.3.4 and later references this HID here: 
https://elixir.bootlin.com/linux/v4.3.4/source/drivers/char/tpm/tpm_tis.c 
. I don't see it before that. A 3.10 kernel works with this patch as well.


>
>> recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
>>
>> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>> ---
>>   hw/i386/acpi-build.c | 12 ++++++++++--
>>   1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
>> index 2e21a31f82..f51225b4a7 100644
>> --- a/hw/i386/acpi-build.c
>> +++ b/hw/i386/acpi-build.c
>> @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>>               build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
>>   
>>               if (TPM_IS_TIS(tpm)) {
>> -                dev = aml_device("ISA.TPM");
>> -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
>> +                if (misc->tpm_version == TPM_VERSION_2_0) {
>> +                    dev = aml_device("TPM");
>> +                    aml_append(dev, aml_name_decl("_HID",
>> +                                                  aml_string("MSFT0101")));
>> +                } else {
>> +                    dev = aml_device("ISA.TPM");
>> +                    aml_append(dev, aml_name_decl("_HID",
>> +                                                  aml_eisaid("PNP0C31")));
>> +                }
>> +
>>                   aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
>>                   crs = aml_resource_template();
>>                   aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 16:14   ` Stefan Berger
@ 2019-01-28 17:19     ` Stefan Berger
  2019-01-28 17:49       ` Michael S. Tsirkin
  0 siblings, 1 reply; 10+ messages in thread
From: Stefan Berger @ 2019-01-28 17:19 UTC (permalink / raw)
  To: Igor Mammedov; +Cc: qemu-devel, marcandre.lureau, mst

On 1/28/19 11:14 AM, Stefan Berger wrote:
> On 1/28/19 9:45 AM, Igor Mammedov wrote:
>> On Fri, 25 Jan 2019 16:00:58 -0500
>> Stefan Berger <stefanb@linux.ibm.com> wrote:
>>
>>> This patch makes the a TPM 2.0 with TIS interface available under the
>>> HID 'MSF0101'. This is supported by Linux and also Windows now
>> MSF0101 is relatively recent addition to Linux,
>> are there in wild (old) kernels that worked with PNP0C31 but won't work
>> with MSF0101?
>
>
> Linux 4.3.4 and later references this HID here: 
> https://elixir.bootlin.com/linux/v4.3.4/source/drivers/char/tpm/tpm_tis.c 
> . I don't see it before that. A 3.10 kernel works with this patch as 
> well.


... that 3.10 kernel from el7 has been patched, though.

    Stefan

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 17:19     ` Stefan Berger
@ 2019-01-28 17:49       ` Michael S. Tsirkin
  2019-01-28 21:53         ` Stefan Berger
  0 siblings, 1 reply; 10+ messages in thread
From: Michael S. Tsirkin @ 2019-01-28 17:49 UTC (permalink / raw)
  To: Stefan Berger; +Cc: Igor Mammedov, qemu-devel, marcandre.lureau

On Mon, Jan 28, 2019 at 12:19:37PM -0500, Stefan Berger wrote:
> On 1/28/19 11:14 AM, Stefan Berger wrote:
> > On 1/28/19 9:45 AM, Igor Mammedov wrote:
> > > On Fri, 25 Jan 2019 16:00:58 -0500
> > > Stefan Berger <stefanb@linux.ibm.com> wrote:
> > > 
> > > > This patch makes the a TPM 2.0 with TIS interface available under the
> > > > HID 'MSF0101'. This is supported by Linux and also Windows now
> > > MSF0101 is relatively recent addition to Linux,
> > > are there in wild (old) kernels that worked with PNP0C31 but won't work
> > > with MSF0101?
> > 
> > 
> > Linux 4.3.4 and later references this HID here:
> > https://elixir.bootlin.com/linux/v4.3.4/source/drivers/char/tpm/tpm_tis.c
> > . I don't see it before that. A 3.10 kernel works with this patch as
> > well.
> 
> 
> ... that 3.10 kernel from el7 has been patched, though.
> 
>    Stefan

.. and supports the new HID.

-- 
MST

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-28 17:49       ` Michael S. Tsirkin
@ 2019-01-28 21:53         ` Stefan Berger
  0 siblings, 0 replies; 10+ messages in thread
From: Stefan Berger @ 2019-01-28 21:53 UTC (permalink / raw)
  To: Michael S. Tsirkin; +Cc: Igor Mammedov, qemu-devel, marcandre.lureau

On 1/28/19 12:49 PM, Michael S. Tsirkin wrote:
> On Mon, Jan 28, 2019 at 12:19:37PM -0500, Stefan Berger wrote:
>> On 1/28/19 11:14 AM, Stefan Berger wrote:
>>> On 1/28/19 9:45 AM, Igor Mammedov wrote:
>>>> On Fri, 25 Jan 2019 16:00:58 -0500
>>>> Stefan Berger <stefanb@linux.ibm.com> wrote:
>>>>
>>>>> This patch makes the a TPM 2.0 with TIS interface available under the
>>>>> HID 'MSF0101'. This is supported by Linux and also Windows now
>>>> MSF0101 is relatively recent addition to Linux,
>>>> are there in wild (old) kernels that worked with PNP0C31 but won't work
>>>> with MSF0101?
>>>
>>> Linux 4.3.4 and later references this HID here:
>>> https://elixir.bootlin.com/linux/v4.3.4/source/drivers/char/tpm/tpm_tis.c
>>> . I don't see it before that. A 3.10 kernel works with this patch as
>>> well.
>>
>> ... that 3.10 kernel from el7 has been patched, though.
>>
>>     Stefan
> .. and supports the new HID.
>
And this spec here also speaks for it: 
https://trustedcomputinggroup.org/wp-content/uploads/PC-ClientSpecific_Platform_Profile_for_TPM_2p0_Systems_v51.pdf

See chapter 8.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101
  2019-01-25 21:00 [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101 Stefan Berger
  2019-01-28 14:45 ` Igor Mammedov
@ 2019-01-29  8:05 ` Igor Mammedov
  1 sibling, 0 replies; 10+ messages in thread
From: Igor Mammedov @ 2019-01-29  8:05 UTC (permalink / raw)
  To: Stefan Berger; +Cc: qemu-devel, marcandre.lureau, mst

On Fri, 25 Jan 2019 16:00:58 -0500
Stefan Berger <stefanb@linux.ibm.com> wrote:

> This patch makes the a TPM 2.0 with TIS interface available under the
> HID 'MSF0101'. This is supported by Linux and also Windows now
> recognizes the TPM 2.0 with TIS interface. Leave the TPM 1.2 as before.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/i386/acpi-build.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2e21a31f82..f51225b4a7 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
>              build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
>  
>              if (TPM_IS_TIS(tpm)) {
> -                dev = aml_device("ISA.TPM");
> -                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));
> +                if (misc->tpm_version == TPM_VERSION_2_0) {
> +                    dev = aml_device("TPM");
> +                    aml_append(dev, aml_name_decl("_HID",
> +                                                  aml_string("MSFT0101")));
> +                } else {
> +                    dev = aml_device("ISA.TPM");
> +                    aml_append(dev, aml_name_decl("_HID",
> +                                                  aml_eisaid("PNP0C31")));
> +                }
> +
>                  aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));
>                  crs = aml_resource_template();
>                  aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-01-29  8:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-25 21:00 [Qemu-devel] [PATCH] acpi: Make TPM 2.0 with TIS available as MSFT0101 Stefan Berger
2019-01-28 14:45 ` Igor Mammedov
2019-01-28 15:15   ` Michael S. Tsirkin
2019-01-28 15:40     ` Igor Mammedov
2019-01-28 15:56       ` Michael S. Tsirkin
2019-01-28 16:14   ` Stefan Berger
2019-01-28 17:19     ` Stefan Berger
2019-01-28 17:49       ` Michael S. Tsirkin
2019-01-28 21:53         ` Stefan Berger
2019-01-29  8:05 ` Igor Mammedov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.