tests: request access to locality 0 before sending command

Message ID 1523900897-6630-1-git-send-email-stefanb@linux.vnet.ibm.com
State New
Headers show
Series
  • tests: request access to locality 0 before sending command
Related show

Commit Message

Stefan Berger April 16, 2018, 5:48 p.m.
Recent changes to the CRB code now require that access to locality 0
be requested before the locality can be used for sending a command.
This patch adds the request to access the locality.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 tests/tpm-util.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Marc-André Lureau April 17, 2018, 9:08 a.m. | #1
Hi

On Mon, Apr 16, 2018 at 7:48 PM, Stefan Berger
<stefanb@linux.vnet.ibm.com> wrote:
> Recent changes to the CRB code now require that access to locality 0
> be requested before the locality can be used for sending a command.
> This patch adds the request to access the locality.
>
> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> ---
>  tests/tpm-util.c | 2 ++

The patch fails to apply, tpm-util is added with your upcoming "tpm:
Add test cases that use the external swtpm with CRB interface" patch,
I guess it could be squashed there (I confirm it fixes the test)


tpm-crb-test.c isn't affected, because you changed it in "tests: Tests
more flags of the CRB interface" already


>  1 file changed, 2 insertions(+)
>
> diff --git a/tests/tpm-util.c b/tests/tpm-util.c
> index 4967a4e..6910503 100644
> --- a/tests/tpm-util.c
> +++ b/tests/tpm-util.c
> @@ -25,6 +25,8 @@ void tpm_util_crb_transfer(QTestState *s,
>      uint64_t caddr = qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_LADDR);
>      uint64_t raddr = qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_RSP_ADDR);
>
> +    qtest_writeb(s, TPM_CRB_ADDR_BASE + A_CRB_LOC_CTRL, 1);
> +
>      qtest_memwrite(s, caddr, req, req_size);
>
>      uint32_t sts, start = 1;
> --
> 2.5.5
>
Stefan Berger April 17, 2018, 10:41 a.m. | #2
On 04/17/2018 05:08 AM, Marc-André Lureau wrote:
> Hi
>
> On Mon, Apr 16, 2018 at 7:48 PM, Stefan Berger
> <stefanb@linux.vnet.ibm.com> wrote:
>> Recent changes to the CRB code now require that access to locality 0
>> be requested before the locality can be used for sending a command.
>> This patch adds the request to access the locality.
>>
>> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
>> ---
>>   tests/tpm-util.c | 2 ++
> The patch fails to apply, tpm-util is added with your upcoming "tpm:
> Add test cases that use the external swtpm with CRB interface" patch,
> I guess it could be squashed there (I confirm it fixes the test)
>
>
> tpm-crb-test.c isn't affected, because you changed it in "tests: Tests
> more flags of the CRB interface" already

Right, wrong branch. Everything is good on 'git tip'.

Patch

diff --git a/tests/tpm-util.c b/tests/tpm-util.c
index 4967a4e..6910503 100644
--- a/tests/tpm-util.c
+++ b/tests/tpm-util.c
@@ -25,6 +25,8 @@  void tpm_util_crb_transfer(QTestState *s,
     uint64_t caddr = qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_LADDR);
     uint64_t raddr = qtest_readq(s, TPM_CRB_ADDR_BASE + A_CRB_CTRL_RSP_ADDR);
 
+    qtest_writeb(s, TPM_CRB_ADDR_BASE + A_CRB_LOC_CTRL, 1);
+
     qtest_memwrite(s, caddr, req, req_size);
 
     uint32_t sts, start = 1;