qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ninad Palsule <ninad@linux.vnet.ibm.com>
To: "Joel Stanley" <joel@jms.id.au>,
	"Cédric Le Goater" <clg@kaod.org>,
	stefanb@linux.ibm.com, ninad@linux.ibm.com
Cc: "Cleber Rosa" <crosa@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	qemu-devel@nongnu.org
Subject: Re: [PATCH] tests/avocado/aspeed: Add TPM TIS I2C test
Date: Tue, 28 Mar 2023 08:25:24 -0500	[thread overview]
Message-ID: <c9f61bb5-9ecb-a134-1111-753a384c3685@linux.vnet.ibm.com> (raw)
In-Reply-To: <20230328120844.190914-1-joel@jms.id.au>


On 3/28/23 7:08 AM, Joel Stanley wrote:
> Add a new buildroot image based test that attaches a TPM emulator to the
> I2C bus and checks for a known PCR0 value for the image that was booted.
>
> Note that this does not tear down swtpm process when qemu execution fails.
> The swtpm process will exit when qemu exits if a connection has been
> made, but if the test errors before connection then the swtpm process
> will still be around.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Ninad Palsule <ninad@linux.ibm.com>
> ---
>   tests/avocado/machine_aspeed.py | 42 +++++++++++++++++++++++++++++++--
>   1 file changed, 40 insertions(+), 2 deletions(-)
>
> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
> index 35723af4ede0..a4485a5c4d4d 100644
> --- a/tests/avocado/machine_aspeed.py
> +++ b/tests/avocado/machine_aspeed.py
> @@ -7,14 +7,18 @@
>   
>   import time
>   import os
> +import tempfile
> +import subprocess
>   
>   from avocado_qemu import QemuSystemTest
>   from avocado_qemu import wait_for_console_pattern
>   from avocado_qemu import exec_command
>   from avocado_qemu import exec_command_and_wait_for_pattern
>   from avocado_qemu import interrupt_interactive_console_until_pattern
> +from avocado_qemu import has_cmd
>   from avocado.utils import archive
>   from avocado import skipIf
> +from avocado import skipUnless
>   
>   
>   class AST1030Machine(QemuSystemTest):
> @@ -132,7 +136,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>   
>           self.do_test_arm_aspeed(image_path)
>   
> -    def do_test_arm_aspeed_buildroot_start(self, image, cpu_id):
> +    def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>           self.require_netdev('user')
>   
>           self.vm.set_console()
> @@ -146,7 +150,7 @@ def do_test_arm_aspeed_buildroot_start(self, image, cpu_id):
>           self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id)
>           self.wait_for_console_pattern('lease of 10.0.2.15')
>           # the line before login:
> -        self.wait_for_console_pattern('Aspeed EVB')
> +        self.wait_for_console_pattern(pattern)
>           time.sleep(0.1)
>           exec_command(self, 'root')
>           time.sleep(0.1)
> @@ -229,6 +233,40 @@ def test_arm_ast2600_evb_buildroot(self):
>                '0000000 ffaa ffff ffff ffff ffff ffff ffff ffff');
>           self.do_test_arm_aspeed_buildroot_poweroff()
>   
> +    @skipUnless(*has_cmd('swtpm'))
> +    def test_arm_ast2600_evb_buildroot_tpm(self):
> +        """
> +        :avocado: tags=arch:arm
> +        :avocado: tags=machine:ast2600-evb
> +        """
> +
> +        image_url = ('https://github.com/legoater/qemu-aspeed-boot/raw/master/'
> +                     'images/ast2600-evb/buildroot-2023.02-tpm/flash.img')
> +        image_hash = ('a46009ae8a5403a0826d607215e731a8c68d27c14c41e55331706b8f9c7bd997')
> +        image_path = self.fetch_asset(image_url, asset_hash=image_hash,
> +                                      algorithm='sha256')
> +
> +        socket = os.path.join(self.vm.sock_dir, 'swtpm-socket')
> +
> +        subprocess.run(['swtpm', 'socket', '-d', '--tpm2',
> +                        '--tpmstate', f'dir={self.vm.temp_dir}',
> +                        '--ctrl', f'type=unixio,path={socket}'])
> +
> +        self.vm.add_args('-chardev', f'socket,id=chrtpm,path={socket}')
> +        self.vm.add_args('-tpmdev', 'emulator,id=tpm0,chardev=chrtpm')
> +        self.vm.add_args('-device',
> +                         'tpm-tis-i2c,tpmdev=tpm0,bus=aspeed.i2c.bus.12,address=0x2e')
> +        self.do_test_arm_aspeed_buildroot_start(image_path, '0xf00', 'Aspeed AST2600 EVB')
> +        exec_command(self, "passw0rd")
> +
> +        exec_command_and_wait_for_pattern(self,
> +            'echo tpm_tis_i2c 0x2e > /sys/bus/i2c/devices/i2c-12/new_device',
> +            'tpm_tis_i2c 12-002e: 2.0 TPM (device-id 0x1, rev-id 1)');
> +        exec_command_and_wait_for_pattern(self,
> +            'cat /sys/class/tpm/tpm0/pcr-sha256/0',
> +            'B804724EA13F52A9072BA87FE8FDCC497DFC9DF9AA15B9088694639C431688E0');
> +
> +        self.do_test_arm_aspeed_buildroot_poweroff()
>   
>   class AST2x00MachineSDK(QemuSystemTest):
>   


  parent reply	other threads:[~2023-03-28 13:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-28 12:08 [PATCH] tests/avocado/aspeed: Add TPM TIS I2C test Joel Stanley
2023-03-28 12:50 ` Stefan Berger
2023-03-28 13:21 ` Cédric Le Goater
2023-03-28 13:42   ` Stefan Berger
2023-03-28 13:25 ` Ninad Palsule [this message]
2023-03-28 14:11 ` Ninad Palsule

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c9f61bb5-9ecb-a134-1111-753a384c3685@linux.vnet.ibm.com \
    --to=ninad@linux.vnet.ibm.com \
    --cc=bleal@redhat.com \
    --cc=clg@kaod.org \
    --cc=crosa@redhat.com \
    --cc=joel@jms.id.au \
    --cc=ninad@linux.ibm.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanb@linux.ibm.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).