[PULL,07/11] sysemu: tpm: Add a stub function for TPM_IS_CRB

Commit Message

Alex Williamson May 6, 2022, 8:48 p.m. UTC

From: Eric Auger <[e-mail]>

In a subsequent patch, VFIO will need to recognize if
a memory region owner is a TPM CRB device. Hence VFIO
needs to use TPM_IS_CRB() even if CONFIG_TPM is unset. So
let's add a stub function.

Signed-off-by: Eric Auger <[e-mail]>
Suggested-by: Cornelia Huck <[e-mail]>
Reviewed-by: Stefan Berger <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: Alex Williamson <[e-mail]>
---
 include/sysemu/tpm.h |    6 ++++++
 1 file changed, 6 insertions(+)

Comments

Stefan Berger May 19, 2022, 12:46 a.m. UTC | #1

On 5/6/22 16:48, Alex Williamson wrote:
> From: Eric Auger <[e-mail]>
> 
> In a subsequent patch, VFIO will need to recognize if
> a memory region owner is a TPM CRB device. Hence VFIO
> needs to use TPM_IS_CRB() even if CONFIG_TPM is unset. So
> let's add a stub function.
> 
> Signed-off-by: Eric Auger <[e-mail]>
> Suggested-by: Cornelia Huck <[e-mail]>
> Reviewed-by: Stefan Berger <[e-mail]>

Oops, a typo here: linnux -> linux

Alex Williamson May 19, 2022, 1:17 a.m. UTC | #2

On Wed, 18 May 2022 20:46:02 -0400
Stefan Berger <[e-mail]> wrote:

> On 5/6/22 16:48, Alex Williamson wrote:
> > From: Eric Auger <[e-mail]>
> > 
> > In a subsequent patch, VFIO will need to recognize if
> > a memory region owner is a TPM CRB device. Hence VFIO
> > needs to use TPM_IS_CRB() even if CONFIG_TPM is unset. So
> > let's add a stub function.
> > 
> > Signed-off-by: Eric Auger <[e-mail]>
> > Suggested-by: Cornelia Huck <[e-mail]>
> > Reviewed-by: Stefan Berger <[e-mail]>  
> 
> Oops, a typo here: linnux -> linux

Yup, sorry, didn't notice until it was too late, but that was as
provided by you:

https://lore.kernel.org/all/[e-mail]/

Thanks,

Alex

Stefan Berger May 19, 2022, 1:31 a.m. UTC | #3

On 5/18/22 21:17, Alex Williamson wrote:
> On Wed, 18 May 2022 20:46:02 -0400
> Stefan Berger <[e-mail]> wrote:
> 
>> On 5/6/22 16:48, Alex Williamson wrote:
>>> From: Eric Auger <[e-mail]>
>>>
>>> In a subsequent patch, VFIO will need to recognize if
>>> a memory region owner is a TPM CRB device. Hence VFIO
>>> needs to use TPM_IS_CRB() even if CONFIG_TPM is unset. So
>>> let's add a stub function.
>>>
>>> Signed-off-by: Eric Auger <[e-mail]>
>>> Suggested-by: Cornelia Huck <[e-mail]>
>>> Reviewed-by: Stefan Berger <[e-mail]>
>>
>> Oops, a typo here: linnux -> linux
> 
> Yup, sorry, didn't notice until it was too late, but that was as
> provided by you:

I know...

> 
> https://lore.kernel.org/all/[e-mail]/
> 
> Thanks,
> 
> Alex
>

Patch

diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 68b2206463c5..fb40e30ff60e 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -80,6 +80,12 @@  static inline TPMVersion tpm_get_version(TPMIf *ti)
 #define tpm_init()  (0)
 #define tpm_cleanup()
 
+/* needed for an alignment check in non-tpm code */
+static inline Object *TPM_IS_CRB(Object *obj)
+{
+     return NULL;
+}
+
 #endif /* CONFIG_TPM */
 
 #endif /* QEMU_TPM_H */