Hi Heinrich,
On Sun, 28 Nov 2021 at 12:56, Heinrich Schuchardt heinrich.schuchardt@canonical.com wrote:
- add description how to add RNG device
- for a disk specify format=raw to avoid a warning
- fix a typo
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
doc/board/emulation/qemu-arm.rst | 9 +++++++-- drivers/tpm/tpm2_tis_mmio.c | 5 ++++- 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/doc/board/emulation/qemu-arm.rst b/doc/board/emulation/qemu-arm.rst index 584ef0a7e1..7c24e29410 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -65,7 +65,8 @@ can be enabled with the following command line parameters:
To add a Serial ATA disk via an Intel ICH9 AHCI controller, pass e.g.::
-drive if=none,file=disk.img,id=mydisk -device ich9-ahci,id=ahci -device ide-drive,drive=mydisk,bus=ahci.0
- -drive if=none,file=disk.img,format=raw,id=mydisk \
- -device ich9-ahci,id=ahci -device ide-drive,drive=mydisk,bus=ahci.0
- To add an Intel E1000 network adapter, pass e.g.::
@@ -75,10 +76,14 @@ can be enabled with the following command line parameters:
-device usb-ehci,id=ehci-- To add a NVMe disk, pass e.g.:: +- To add an NVMe disk, pass e.g.::
-drive if=none,file=disk.img,id=mydisk -device nvme,drive=mydisk,serial=foo+- To add a random number generator, pass e.g.::
- -device virtio-rng-pci
These have been tested in QEMU 2.9.0 but should work in at least 2.5.0 as well.
Enabling TPMv2 support diff --git a/drivers/tpm/tpm2_tis_mmio.c b/drivers/tpm/tpm2_tis_mmio.c index 9cedff2225..f04aab2e6e 100644 --- a/drivers/tpm/tpm2_tis_mmio.c +++ b/drivers/tpm/tpm2_tis_mmio.c @@ -118,10 +118,13 @@ iounmap: static int tpm_tis_remove(struct udevice *dev) { struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev);
int ret;ret = tpm_tis_cleanup(dev); iounmap(drv_data->iobase);
return tpm_tis_cleanup(dev);
return ret;}
Do you want me to pull this obvious bug fix along with the documentation? I can reword the commit message to mention that this actually fixes a bug.
static const struct tpm_ops tpm_tis_ops = {
2.32.0
Reviewed-by: Ilias Apalodimas ilias.apalodimas@linaro.org