| Message ID | 1433185532-17642-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 06/01/2015 03:06 PM, Michael S. Tsirkin wrote: > commit 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab > TPM2 ACPI table support > > was missing a file, so build with iasl fails > (build without iasl works since it uses the generated > hex files). > > Reported-by: "Daniel P. Berrange" <berrange@redhat.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > --- > > Daniel, can you pls confirm this fixes things for me? > I seem to be batting 1000s today ... > > hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 hw/i386/ssdt-tpm-common.dsl > > diff --git a/hw/i386/ssdt-tpm-common.dsl b/hw/i386/ssdt-tpm-common.dsl > new file mode 100644 > index 0000000..9da4970 > --- /dev/null > +++ b/hw/i386/ssdt-tpm-common.dsl > @@ -0,0 +1,36 @@ > +/* > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + > + * You should have received a copy of the GNU General Public License along > + * with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +/* > + * Common parts for TPM 1.2 and TPM 2 (with slight differences for PPI) > + * to be #included > + */ > + > + > + External(\_SB.PCI0.ISA, DeviceObj) > + Scope(\_SB.PCI0.ISA) { > + /* 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) > + IRQNoFlags () {TPM_TIS_IRQ} > + }) > + Method (_STA, 0, NotSerialized) { > + Return (0x0F) > + } > + } > + } > Fixes origin/master build issues for x86_64 target on F21 x86_64 host. Tested-by: John Snow <jsnow@redhat.com>
diff --git a/hw/i386/ssdt-tpm-common.dsl b/hw/i386/ssdt-tpm-common.dsl new file mode 100644 index 0000000..9da4970 --- /dev/null +++ b/hw/i386/ssdt-tpm-common.dsl @@ -0,0 +1,36 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +/* + * Common parts for TPM 1.2 and TPM 2 (with slight differences for PPI) + * to be #included + */ + + + External(\_SB.PCI0.ISA, DeviceObj) + Scope(\_SB.PCI0.ISA) { + /* 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) + IRQNoFlags () {TPM_TIS_IRQ} + }) + Method (_STA, 0, NotSerialized) { + Return (0x0F) + } + } + }
commit 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab TPM2 ACPI table support was missing a file, so build with iasl fails (build without iasl works since it uses the generated hex files). Reported-by: "Daniel P. Berrange" <berrange@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- Daniel, can you pls confirm this fixes things for me? I seem to be batting 1000s today ... hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 hw/i386/ssdt-tpm-common.dsl