From 6d49f0f26aefbdba1bab6ebae4c6940960dabf08 Mon Sep 17 00:00:00 2001
From: Chenli Wei <chenli.wei@intel.com>
Date: Fri, 14 Jan 2022 18:39:54 +0800
Subject: [PATCH] dm:add UID parameter for acpidev_pt

Now the acpidev_pt module only use the hid to check the device,it can't
work well if there are more then one instance.

So this patch add UID to identify same type device to fix these issue.

Tracked-On: #6690
Acked-by: Wang, Yu1 <yu1.wang@intel.com>
Signed-off-by: Chenli Wei <chenli.wei@linux.intel.com>
---
 devicemodel/hw/platform/tpm/tpm.c | 39 ++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/devicemodel/hw/platform/tpm/tpm.c b/devicemodel/hw/platform/tpm/tpm.c
index b2fd2c367..10aea9be7 100644
--- a/devicemodel/hw/platform/tpm/tpm.c
+++ b/devicemodel/hw/platform/tpm/tpm.c
@@ -74,11 +74,22 @@ static int is_tpm2_eventlog_supported(struct acpi_table_tpm2 *tpm2)
 	return ((tpm2->header.length == 76) && tpm2->lasa && tpm2->laml);
 }
 
-static int is_hid_tpm2_device(char *hid)
+static int is_hid_tpm2_device(char *opts)
 {
 	int ret;
 	struct acpi_dev_pt_ops *ops = &pt_acpi_dev;
-	ret = get_more_acpi_dev_info(hid, 0, ops);
+	uint32_t uid = 0;
+	char *devopts, *hid, *vtopts;
+
+	if (!opts || !*opts)
+		return false;
+
+	devopts = vtopts = strdup(opts);
+	hid = strsep(&vtopts, ",");
+	uid = (vtopts != NULL) ? atoi(vtopts) : 0;
+
+	ret = get_more_acpi_dev_info(hid, uid, ops);
+	free(devopts);
 	if (ret)
 		return false;
 	return (strstr(ops->modalias, "MSFT0101") != NULL);
@@ -92,23 +103,39 @@ static int is_hid_tpm2_device(char *hid)
  * @pre: hid should be a valid HID of the TPM2 device being passed-through.
  * @pre: tpm2dev != NULL
  */
-static int init_tpm2_pt(char *hid, struct mmio_dev *tpm2dev)
+static int init_tpm2_pt(char *opts, struct mmio_dev *tpm2dev)
 {
 	int err = 0;
 	uint64_t tpm2_buffer_hpa, tpm2_buffer_size;
 	uint32_t base = 0;
 	struct acpi_table_tpm2 tpm2 = { 0 };
+	char *devopts, *vtopts;
 
-	/* TODO: Currently we did not validate if the hid is a valid one.
+	/* TODO: Currently we did not validate if the opts is a valid one.
 	 * We trust it to be valid as specifying --acpidev_pt is regarded
 	 * as root user operation.
 	 */
-	if (!hid || !*hid)
+	if (!opts || !*opts) {
 		return -EINVAL;
+	}
+
+	devopts = strdup(opts);
+	vtopts = strstr(devopts,",");
+
+	/* Check whether user set the uid to identify same hid devices for
+	 * several instances.
+	 */
+	if (vtopts != NULL ){
+		vtopts[0] = ':';
+	}
 
 	/* parse /proc/iomem to find the address and size of tpm buffer */
-	if (!get_mmio_hpa_resource(hid, &tpm2_buffer_hpa, &tpm2_buffer_size))
+	if (!get_mmio_hpa_resource(devopts, &tpm2_buffer_hpa, &tpm2_buffer_size)) {
+		free(devopts);
 		return -ENODEV;
+	}
+
+	free(devopts);
 
 	err = read_sysfs_tpm2_table(&tpm2);
 	if (err)