diff mbox

tpm: Add missing common TPM SSDT file

Message ID 1433205175-1255386-1-git-send-email-stefanb@linux.vnet.ibm.com
State New
Headers show

Commit Message

Stefan Berger June 2, 2015, 12:32 a.m. UTC
This patch adds the missing common SSDT TPM file.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 hw/i386/ssdt-tpm-common.dsl | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 hw/i386/ssdt-tpm-common.dsl

Comments

Michael S. Tsirkin June 2, 2015, 6:48 a.m. UTC | #1
On Mon, Jun 01, 2015 at 08:32:55PM -0400, Stefan Berger wrote:
> This patch adds the missing common SSDT TPM file.
> 
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

I posted this too. But we really should just get rid of all this: we
have already removed most ASL code except for the DSDT.

> ---
>  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)
> +            }
> +        }
> +    }
> -- 
> 1.9.3
Stefan Berger June 2, 2015, 1:14 p.m. UTC | #2
On 06/02/2015 02:48 AM, Michael S. Tsirkin wrote:
> On Mon, Jun 01, 2015 at 08:32:55PM -0400, Stefan Berger wrote:
>> This patch adds the missing common SSDT TPM file.
>>
>> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> I posted this too. But we really should just get rid of all this: we
> have already removed most ASL code except for the DSDT.

Yes, I will do that. Though for reviewing I think ASL is still easier to 
understand.

   Stefan
Michael S. Tsirkin June 2, 2015, 1:22 p.m. UTC | #3
On Tue, Jun 02, 2015 at 09:14:29AM -0400, Stefan Berger wrote:
> On 06/02/2015 02:48 AM, Michael S. Tsirkin wrote:
> >On Mon, Jun 01, 2015 at 08:32:55PM -0400, Stefan Berger wrote:
> >>This patch adds the missing common SSDT TPM file.
> >>
> >>Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> >I posted this too. But we really should just get rid of all this: we
> >have already removed most ASL code except for the DSDT.
> 
> Yes, I will do that. Though for reviewing I think ASL is still easier to
> understand.
> 
>   Stefan

A bit, but once you get into more trickery, like you do with ifdefs
with QEMU-external TPM, it becomes less clear.
Stefan Berger June 2, 2015, 1:23 p.m. UTC | #4
On 06/02/2015 09:22 AM, Michael S. Tsirkin wrote:
> On Tue, Jun 02, 2015 at 09:14:29AM -0400, Stefan Berger wrote:
>> On 06/02/2015 02:48 AM, Michael S. Tsirkin wrote:
>>> On Mon, Jun 01, 2015 at 08:32:55PM -0400, Stefan Berger wrote:
>>>> This patch adds the missing common SSDT TPM file.
>>>>
>>>> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
>>> I posted this too. But we really should just get rid of all this: we
>>> have already removed most ASL code except for the DSDT.
>> Yes, I will do that. Though for reviewing I think ASL is still easier to
>> understand.
>>
>>    Stefan
> A bit, but once you get into more trickery, like you do with ifdefs
> with QEMU-external TPM, it becomes less clear.
>

Those won't go away and will turn into case statements in C...

     stefan
Michael S. Tsirkin June 2, 2015, 1:31 p.m. UTC | #5
On Tue, Jun 02, 2015 at 09:23:35AM -0400, Stefan Berger wrote:
> On 06/02/2015 09:22 AM, Michael S. Tsirkin wrote:
> >On Tue, Jun 02, 2015 at 09:14:29AM -0400, Stefan Berger wrote:
> >>On 06/02/2015 02:48 AM, Michael S. Tsirkin wrote:
> >>>On Mon, Jun 01, 2015 at 08:32:55PM -0400, Stefan Berger wrote:
> >>>>This patch adds the missing common SSDT TPM file.
> >>>>
> >>>>Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> >>>I posted this too. But we really should just get rid of all this: we
> >>>have already removed most ASL code except for the DSDT.
> >>Yes, I will do that. Though for reviewing I think ASL is still easier to
> >>understand.
> >>
> >>   Stefan
> >A bit, but once you get into more trickery, like you do with ifdefs
> >with QEMU-external TPM, it becomes less clear.
> >
> 
> Those won't go away and will turn into case statements in C...
> 
>     stefan

Absolutely but case statements are easier to follow
than ifdef tricks.
diff mbox

Patch

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)
+            }
+        }
+    }