Message ID | 20150601173958.GI13155@redhat.com |
---|---|
State | New |
Headers | show |
On 06/01/2015 01:39 PM, Daniel P. Berrange wrote: > On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: >> On 1 June 2015 at 13:22, Michael S. Tsirkin <mst@redhat.com> wrote: >>> The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: >>> >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) >>> >>> are available in the git repository at: >>> >>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream >>> >>> for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: >>> >>> vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) >>> >>> Changes from v1: >>> adding two TPM files that I forgot to commit >>> added a couple of patches that became ready since the pull request >>> >>> ---------------------------------------------------------------- >>> pc, pci, tpm, virtio, vhost enhancements and fixes >>> >>> A bunch of cleanups and fixes all over the place, >>> enhancements in TPM, virtio and vhost. >>> >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>> >> Applied, thanks. > This appears to have broken the build for me > > CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig > /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory > compilation terminated. > /home/berrange/src/virt/qemu-new/hw/i386/Makefile.objs:20: recipe for target 'hw/i386/ssdt-tpm.hex' failed > make[1]: *** [hw/i386/ssdt-tpm.hex] Error 1 > Makefile:173: recipe for target 'subdir-x86_64-softmmu' failed > make: *** [subdir-x86_64-softmmu] Error 2 > > > I believe this is caused by Yes, it is broken. The patches for ssdt-tpm-common.dsl must have gotten lost somewhere. It was still here: http://lists.nongnu.org/archive/html/qemu-devel/2015-06/msg00165.html hw/i386/Makefile.objs | 2 +- hw/i386/acpi-build.c | 38 ++++++++++++-- hw/i386/acpi-defs.h | 18 +++++++ >hw/i386/ssdt-tpm-common.dsl | 36 +++++++++++++ hw/i386/ssdt-tpm.dsl | 16 +----- hw/i386/ssdt-tpm.hex.generated | 26 +++++++--- hw/i386/ssdt-tpm2.dsl | 29 +++++++++++ hw/i386/ssdt-tpm2.hex.generated | 109 ++++++++++++++++++++++++++++++++++++++++ hw/tpm/tpm_tis.c | 11 ++++ include/hw/acpi/tpm.h | 5 ++ include/sysemu/tpm.h | 11 +++- I'll repost the missing file(s) asap. Stefan
"Daniel P. Berrange" <berrange@redhat.com> writes: > On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: >> On 1 June 2015 at 13:22, Michael S. Tsirkin <mst@redhat.com> wrote: >> > The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: >> > >> > Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) >> > >> > are available in the git repository at: >> > >> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream >> > >> > for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: >> > >> > vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) >> > >> > Changes from v1: >> > adding two TPM files that I forgot to commit >> > added a couple of patches that became ready since the pull request >> > >> > ---------------------------------------------------------------- >> > pc, pci, tpm, virtio, vhost enhancements and fixes >> > >> > A bunch of cleanups and fixes all over the place, >> > enhancements in TPM, virtio and vhost. >> > >> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> > >> >> Applied, thanks. > > This appears to have broken the build for me > > CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig > /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory > compilation terminated. > /home/berrange/src/virt/qemu-new/hw/i386/Makefile.objs:20: recipe for target 'hw/i386/ssdt-tpm.hex' failed > make[1]: *** [hw/i386/ssdt-tpm.hex] Error 1 > Makefile:173: recipe for target 'subdir-x86_64-softmmu' failed > make: *** [subdir-x86_64-softmmu] Error 2 [...] Workaround: configure --iasl=/bin/false
On Mon, 01 Jun 2015 19:42:55 -0400 Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > On 06/01/2015 01:39 PM, Daniel P. Berrange wrote: > > On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: > >> On 1 June 2015 at 13:22, Michael S. Tsirkin <mst@redhat.com> wrote: > >>> The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: > >>> > >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) > >>> > >>> are available in the git repository at: > >>> > >>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > >>> > >>> for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: > >>> > >>> vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) > >>> > >>> Changes from v1: > >>> adding two TPM files that I forgot to commit > >>> added a couple of patches that became ready since the pull request > >>> > >>> ---------------------------------------------------------------- > >>> pc, pci, tpm, virtio, vhost enhancements and fixes > >>> > >>> A bunch of cleanups and fixes all over the place, > >>> enhancements in TPM, virtio and vhost. > >>> > >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > >>> > >> Applied, thanks. > > This appears to have broken the build for me > > > > CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig > > /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory If you have used conversion to AML API example I've provided nothing would be lost. > > compilation terminated. > > /home/berrange/src/virt/qemu-new/hw/i386/Makefile.objs:20: recipe for target 'hw/i386/ssdt-tpm.hex' failed > > make[1]: *** [hw/i386/ssdt-tpm.hex] Error 1 > > Makefile:173: recipe for target 'subdir-x86_64-softmmu' failed > > make: *** [subdir-x86_64-softmmu] Error 2 > > > > > > I believe this is caused by > > Yes, it is broken. The patches for ssdt-tpm-common.dsl must have gotten > lost somewhere. > > It was still here: > > http://lists.nongnu.org/archive/html/qemu-devel/2015-06/msg00165.html > > > hw/i386/Makefile.objs | 2 +- > hw/i386/acpi-build.c | 38 ++++++++++++-- > hw/i386/acpi-defs.h | 18 +++++++ > >hw/i386/ssdt-tpm-common.dsl | 36 +++++++++++++ > hw/i386/ssdt-tpm.dsl | 16 +----- > hw/i386/ssdt-tpm.hex.generated | 26 +++++++--- > hw/i386/ssdt-tpm2.dsl | 29 +++++++++++ > hw/i386/ssdt-tpm2.hex.generated | 109 > ++++++++++++++++++++++++++++++++++++++++ > hw/tpm/tpm_tis.c | 11 ++++ > include/hw/acpi/tpm.h | 5 ++ > include/sysemu/tpm.h | 11 +++- > > > I'll repost the missing file(s) asap. > > Stefan > > > g
On 06/02/2015 10:53 AM, Igor Mammedov wrote: > On Mon, 01 Jun 2015 19:42:55 -0400 > Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > >> On 06/01/2015 01:39 PM, Daniel P. Berrange wrote: >>> On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: >>>> On 1 June 2015 at 13:22, Michael S. Tsirkin <mst@redhat.com> wrote: >>>>> The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: >>>>> >>>>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) >>>>> >>>>> are available in the git repository at: >>>>> >>>>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream >>>>> >>>>> for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: >>>>> >>>>> vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) >>>>> >>>>> Changes from v1: >>>>> adding two TPM files that I forgot to commit >>>>> added a couple of patches that became ready since the pull request >>>>> >>>>> ---------------------------------------------------------------- >>>>> pc, pci, tpm, virtio, vhost enhancements and fixes >>>>> >>>>> A bunch of cleanups and fixes all over the place, >>>>> enhancements in TPM, virtio and vhost. >>>>> >>>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >>>>> >>>> Applied, thanks. >>> This appears to have broken the build for me >>> >>> CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig >>> /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory > If you have used conversion to AML API example I've provided nothing would be lost. A hunk of a posted patch got lost ... Stefan
On Tue, Jun 02, 2015 at 04:53:27PM +0200, Igor Mammedov wrote: > On Mon, 01 Jun 2015 19:42:55 -0400 > Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > > > On 06/01/2015 01:39 PM, Daniel P. Berrange wrote: > > > On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: > > >> On 1 June 2015 at 13:22, Michael S. Tsirkin <mst@redhat.com> wrote: > > >>> The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: > > >>> > > >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) > > >>> > > >>> are available in the git repository at: > > >>> > > >>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > >>> > > >>> for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: > > >>> > > >>> vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) > > >>> > > >>> Changes from v1: > > >>> adding two TPM files that I forgot to commit > > >>> added a couple of patches that became ready since the pull request > > >>> > > >>> ---------------------------------------------------------------- > > >>> pc, pci, tpm, virtio, vhost enhancements and fixes > > >>> > > >>> A bunch of cleanups and fixes all over the place, > > >>> enhancements in TPM, virtio and vhost. > > >>> > > >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > >>> > > >> Applied, thanks. > > > This appears to have broken the build for me > > > > > > CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig > > > /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory > If you have used conversion to AML API example I've provided nothing would be lost. Can you post a patch doing the conversion? If you do, I'll apply it. > > > compilation terminated. > > > /home/berrange/src/virt/qemu-new/hw/i386/Makefile.objs:20: recipe for target 'hw/i386/ssdt-tpm.hex' failed > > > make[1]: *** [hw/i386/ssdt-tpm.hex] Error 1 > > > Makefile:173: recipe for target 'subdir-x86_64-softmmu' failed > > > make: *** [subdir-x86_64-softmmu] Error 2 > > > > > > > > > I believe this is caused by > > > > Yes, it is broken. The patches for ssdt-tpm-common.dsl must have gotten > > lost somewhere. > > > > It was still here: > > > > http://lists.nongnu.org/archive/html/qemu-devel/2015-06/msg00165.html > > > > > > hw/i386/Makefile.objs | 2 +- > > hw/i386/acpi-build.c | 38 ++++++++++++-- > > hw/i386/acpi-defs.h | 18 +++++++ > > >hw/i386/ssdt-tpm-common.dsl | 36 +++++++++++++ > > hw/i386/ssdt-tpm.dsl | 16 +----- > > hw/i386/ssdt-tpm.hex.generated | 26 +++++++--- > > hw/i386/ssdt-tpm2.dsl | 29 +++++++++++ > > hw/i386/ssdt-tpm2.hex.generated | 109 > > ++++++++++++++++++++++++++++++++++++++++ > > hw/tpm/tpm_tis.c | 11 ++++ > > include/hw/acpi/tpm.h | 5 ++ > > include/sysemu/tpm.h | 11 +++- > > > > > > I'll repost the missing file(s) asap. > > > > Stefan > > > > > > > > g
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" }