Re: [RFC v2 4/6] tpm: Separate TPM_TIS and TPM_TIS_ISA configs

[Auger Eric]

Hi Philippe,

On 2/14/20 8:03 PM, Philippe Mathieu-Daudé wrote:
> On 2/14/20 7:37 PM, Eric Auger wrote:
>> Let's separate the compilation of tpm_tis_common.c from
>> the compilation of tpm_tis_isa.c
>>
>> The common part will be also compiled along with the
>> tpm_tis_sysbus device.
>>
>> Signed-off-by: Eric Auger <address@hidden>
>> ---
>>   default-configs/i386-softmmu.mak | 2 +-
>>   hw/i386/Kconfig                  | 2 +-
>>   hw/tpm/Kconfig                   | 7 ++++++-
>>   hw/tpm/Makefile.objs             | 3 ++-
>>   tests/qtest/Makefile.include     | 4 ++--
>>   5 files changed, 12 insertions(+), 6 deletions(-)
>>
>> diff --git a/default-configs/i386-softmmu.mak
>> b/default-configs/i386-softmmu.mak
>> index 4cc64dafa2..84d1a2487c 100644
>> --- a/default-configs/i386-softmmu.mak
>> +++ b/default-configs/i386-softmmu.mak
>> @@ -20,7 +20,7 @@
>>   #CONFIG_SGA=n
>>   #CONFIG_TEST_DEVICES=n
>>   #CONFIG_TPM_CRB=n
>> -#CONFIG_TPM_TIS=n
>> +#CONFIG_TPM_TIS_ISA=n
>>   #CONFIG_VTD=n
>>     # Boards:
>> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
>> index cdc851598c..c93f32f657 100644
>> --- a/hw/i386/Kconfig
>> +++ b/hw/i386/Kconfig
>> @@ -20,7 +20,7 @@ config PC
>>       imply SGA
>>       imply TEST_DEVICES
>>       imply TPM_CRB
>> -    imply TPM_TIS
>> +    imply TPM_TIS_ISA
>>       imply VGA_PCI
>>       imply VIRTIO_VGA
>>       select FDC
>> diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig
>> index 9e67d990e8..686f8206bb 100644
>> --- a/hw/tpm/Kconfig
>> +++ b/hw/tpm/Kconfig
>> @@ -2,9 +2,14 @@ config TPMDEV
>>       bool
>>       depends on TPM
>>   -config TPM_TIS
>> +config TPM_TIS_ISA
>>       bool
>>       depends on TPM && ISA_BUS
> 
> Maybe you can relax to "depends on ISA_BUS" ...

No I am forced to keep it to pass
make docker-test-mingw@fedora

Otherwise I get:
make: *** No rule to make target 'x86_64-softmmu/config-devices.mak',
needed by 'config-all-devices.mak'.  Stop.
Traceback (most recent call last):

As we discussed earlier with mingw configure sets TPM to false.


> 
>> +    select TPM_TIS
>> +
>> +config TPM_TIS
>> +    bool
>> +    depends on TPM
> 
> ... since TPM_TIS depends on TPM.
> 
>>       select TPMDEV
>>     config TPM_CRB
>> diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs
>> index fcc4c2f27c..3ef2036cca 100644
>> --- a/hw/tpm/Makefile.objs
>> +++ b/hw/tpm/Makefile.objs
>> @@ -1,6 +1,7 @@
>>   common-obj-$(CONFIG_TPM) += tpm_util.o
>>   obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) += tpm_ppi.o
>> -common-obj-$(CONFIG_TPM_TIS) += tpm_tis_isa.o tpm_tis_common.o
>> +common-obj-$(CONFIG_TPM_TIS_ISA) += tpm_tis_isa.o
>> +common-obj-$(CONFIG_TPM_TIS) += tpm_tis_common.o
>>   common-obj-$(CONFIG_TPM_CRB) += tpm_crb.o
>>   common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
>>   common-obj-$(CONFIG_TPM_EMULATOR) += tpm_emulator.o
>> diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
>> index eb0f23b108..33dd3c89cc 100644
>> --- a/tests/qtest/Makefile.include
>> +++ b/tests/qtest/Makefile.include
>> @@ -54,8 +54,8 @@ check-qtest-i386-y += q35-test
>>   check-qtest-i386-y += vmgenid-test
>>   check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-swtpm-test
>>   check-qtest-i386-$(CONFIG_TPM_CRB) += tpm-crb-test
>> -check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-swtpm-test
>> -check-qtest-i386-$(CONFIG_TPM_TIS) += tpm-tis-test
>> +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-swtpm-test
>> +check-qtest-i386-$(CONFIG_TPM_TIS_ISA) += tpm-tis-test
>>   check-qtest-i386-$(CONFIG_SLIRP) += test-netfilter
>>   check-qtest-i386-$(CONFIG_POSIX) += test-filter-mirror
>>   check-qtest-i386-$(CONFIG_RTL8139_PCI) += test-filter-redirector
>>
> 
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Thanks!

Eric
>