From: Ninad Palsule <ninad@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: Ninad Palsule <ninad@linux.ibm.com>,
joel@jms.id.au, andrew@aj.id.au, stefanb@linux.ibm.com,
clg@kaod.org
Subject: [PATCH 2/3] TPM TIS: Add support for TPM devices over I2C bus
Date: Wed, 22 Mar 2023 22:01:18 -0500 [thread overview]
Message-ID: <20230323030119.2113570-3-ninad@linux.ibm.com> (raw)
In-Reply-To: <20230323030119.2113570-1-ninad@linux.ibm.com>
Qemu already supports devices attached to ISA and sysbus. This drop adds
support for the I2C bus attached TPM devices.
This commit includes changes for the common code.
- Added support for the new checksum registers which are required for
the I2C support. The checksum calculation is handled in the qemu
common code.
- Added wrapper function for read and write data so that I2C code can
call it without MMIO interface.
Signed-off-by: Ninad Palsule <ninad@linux.ibm.com>
---
V2:
Incorporated Stephen's comments.
- Removed checksum enable and checksum get registers.
- Added checksum calculation function which can be called from
i2c layer.
---
hw/tpm/tpm_tis.h | 3 +++
hw/tpm/tpm_tis_common.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
index f6b5872ba6..6f29a508dd 100644
--- a/hw/tpm/tpm_tis.h
+++ b/hw/tpm/tpm_tis.h
@@ -86,5 +86,8 @@ int tpm_tis_pre_save(TPMState *s);
void tpm_tis_reset(TPMState *s);
enum TPMVersion tpm_tis_get_tpm_version(TPMState *s);
void tpm_tis_request_completed(TPMState *s, int ret);
+uint32_t tpm_tis_read_data(TPMState *s, hwaddr addr, unsigned size);
+void tpm_tis_write_data(TPMState *s, hwaddr addr, uint64_t val, uint32_t size);
+uint16_t tpm_tis_get_checksum(TPMState *s);
#endif /* TPM_TPM_TIS_H */
diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
index 503be2a541..b1acde74cb 100644
--- a/hw/tpm/tpm_tis_common.c
+++ b/hw/tpm/tpm_tis_common.c
@@ -26,6 +26,8 @@
#include "hw/irq.h"
#include "hw/isa/isa.h"
#include "qapi/error.h"
+#include "qemu/bswap.h"
+#include "qemu/crc-ccitt.h"
#include "qemu/module.h"
#include "hw/acpi/tpm.h"
@@ -447,6 +449,27 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr,
return val;
}
+/*
+ * A wrapper read function so that it can be directly called without
+ * mmio.
+ */
+uint32_t tpm_tis_read_data(TPMState *s, hwaddr addr, unsigned size)
+{
+ return tpm_tis_mmio_read(s, addr, size);
+}
+
+/*
+ * Calculate current data buffer checksum
+ */
+uint16_t tpm_tis_get_checksum(TPMState *s)
+{
+ uint16_t val = 0xffff;
+
+ val = cpu_to_be16(crc_ccitt(0, s->buffer, s->rw_offset));
+
+ return val;
+}
+
/*
* Write a value to a register of the TIS interface
* See specs pages 33-63 for description of the registers
@@ -767,6 +790,15 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr addr,
}
}
+/*
+ * A wrapper write function so that it can be directly called without
+ * mmio.
+ */
+void tpm_tis_write_data(TPMState *s, hwaddr addr, uint64_t val, uint32_t size)
+{
+ tpm_tis_mmio_write(s, addr, val, size);
+}
+
const MemoryRegionOps tpm_tis_memory_ops = {
.read = tpm_tis_mmio_read,
.write = tpm_tis_mmio_write,
--
2.37.2
next prev parent reply other threads:[~2023-03-23 3:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 3:01 [PATCH 0/3] Add support for TPM devices over I2C bus Ninad Palsule
2023-03-23 3:01 ` [PATCH 1/3] docs: " Ninad Palsule
2023-03-23 7:49 ` Cédric Le Goater
2023-03-23 22:11 ` Ninad Palsule
2023-03-24 3:23 ` Ninad Palsule
2023-03-24 5:11 ` Ninad Palsule
2023-03-24 8:01 ` Cédric Le Goater
2023-03-24 12:50 ` Ninad Palsule
2023-03-23 3:01 ` Ninad Palsule [this message]
2023-03-23 7:44 ` [PATCH 2/3] TPM TIS: " Cédric Le Goater
2023-03-23 15:35 ` Ninad Palsule
2023-03-23 3:01 ` [PATCH 3/3] New I2C: " Ninad Palsule
2023-03-23 8:37 ` Cédric Le Goater
2023-03-23 22:32 ` Ninad Palsule
2023-03-24 8:06 ` Cédric Le Goater
2023-03-23 12:18 ` Stefan Berger
2023-03-23 20:07 ` Ninad Palsule
2023-03-23 7:23 ` [PATCH 0/3] " Cédric Le Goater
2023-03-23 22:35 ` 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=20230323030119.2113570-3-ninad@linux.ibm.com \
--to=ninad@linux.ibm.com \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=joel@jms.id.au \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.ibm.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).