Commit ef99b3ee authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



pc build fix

My last pull breaks build on systems with iasl.
Fix this up.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Mon Jun  1 20:41:08 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  acpi: add missing ssdt

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b821cbe2 9e472263

hw/i386/ssdt-tpm-common.dsl

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * 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)

            }

        }

    }