enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/char/tpm/tpm_ppi.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2012-2014 Intel Corporation
3
4
  *
..
..
@@ -9,18 +10,14 @@
9
10
  * Maintained by: <tpmdd-devel@lists.sourceforge.net>
10
11
  *
11
12
  * This file contains implementation of the sysfs interface for PPI.
12
- *
13
- * This program is free software; you can redistribute it and/or
14
- * modify it under the terms of the GNU General Public License
15
- * as published by the Free Software Foundation; version 2
16
- * of the License.
17
13
  */
18
14
 
19
15
 
20
16
 #include <linux/acpi.h>
21
17
 #include "tpm.h"
22
18
 
23
-#define TPM_PPI_REVISION_ID	1
19
+#define TPM_PPI_REVISION_ID_1	1
20
+#define TPM_PPI_REVISION_ID_2	2
24
21
 #define TPM_PPI_FN_VERSION	1
25
22
 #define TPM_PPI_FN_SUBREQ	2
26
23
 #define TPM_PPI_FN_GETREQ	3
..
..
@@ -28,7 +25,7 @@
28
25
 #define TPM_PPI_FN_GETRSP	5
29
26
 #define TPM_PPI_FN_SUBREQ2	7
30
27
 #define TPM_PPI_FN_GETOPR	8
31
-#define PPI_TPM_REQ_MAX		22
28
+#define PPI_TPM_REQ_MAX		101 /* PPI 1.3 for TPM 2 */
32
29
 #define PPI_VS_REQ_START	128
33
30
 #define PPI_VS_REQ_END		255
34
31
 
..
..
@@ -36,14 +33,18 @@
36
33
 	GUID_INIT(0x3DDDFAA6, 0x361B, 0x4EB4,
37
34
 		  0xA4, 0x24, 0x8D, 0x10, 0x08, 0x9D, 0x16, 0x53);
38
35
 
36
+static bool tpm_ppi_req_has_parameter(u64 req)
37
+{
38
+	return req == 23;
39
+}
40
+
39
41
 static inline union acpi_object *
40
42
 tpm_eval_dsm(acpi_handle ppi_handle, int func, acpi_object_type type,
41
-	     union acpi_object *argv4)
43
+	     union acpi_object *argv4, u64 rev)
42
44
 {
43
45
 	BUG_ON(!ppi_handle);
44
46
 	return acpi_evaluate_dsm_typed(ppi_handle, &tpm_ppi_guid,
45
-				       TPM_PPI_REVISION_ID,
46
-				       func, argv4, type);
47
+				       rev, func, argv4, type);
47
48
 }
48
49
 
49
50
 static ssize_t tpm_show_ppi_version(struct device *dev,
..
..
@@ -60,9 +61,14 @@
60
61
 	ssize_t size = -EINVAL;
61
62
 	union acpi_object *obj;
62
63
 	struct tpm_chip *chip = to_tpm_chip(dev);
64
+	u64 rev = TPM_PPI_REVISION_ID_2;
65
+	u64 req;
66
+
67
+	if (strcmp(chip->ppi_version, "1.2") < 0)
68
+		rev = TPM_PPI_REVISION_ID_1;
63
69
 
64
70
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, TPM_PPI_FN_GETREQ,
65
-			   ACPI_TYPE_PACKAGE, NULL);
71
+			   ACPI_TYPE_PACKAGE, NULL, rev);
66
72
 	if (!obj)
67
73
 		return -ENXIO;
68
74
 
..
..
@@ -72,7 +78,23 @@
72
78
 	 * error. The second is pending TPM operation requested by the OS, 0
73
79
 	 * means none and >0 means operation value.
74
80
 	 */
75
-	if (obj->package.count == 2 &&
81
+	if (obj->package.count == 3 &&
82
+	    obj->package.elements[0].type == ACPI_TYPE_INTEGER &&
83
+	    obj->package.elements[1].type == ACPI_TYPE_INTEGER &&
84
+	    obj->package.elements[2].type == ACPI_TYPE_INTEGER) {
85
+		if (obj->package.elements[0].integer.value)
86
+			size = -EFAULT;
87
+		else {
88
+			req = obj->package.elements[1].integer.value;
89
+			if (tpm_ppi_req_has_parameter(req))
90
+				size = scnprintf(buf, PAGE_SIZE,
91
+				    "%llu %llu\n", req,
92
+				    obj->package.elements[2].integer.value);
93
+			else
94
+				size = scnprintf(buf, PAGE_SIZE,
95
+						"%llu\n", req);
96
+		}
97
+	} else if (obj->package.count == 2 &&
76
98
 	    obj->package.elements[0].type == ACPI_TYPE_INTEGER &&
77
99
 	    obj->package.elements[1].type == ACPI_TYPE_INTEGER) {
78
100
 		if (obj->package.elements[0].integer.value)
..
..
@@ -94,9 +116,10 @@
94
116
 	u32 req;
95
117
 	u64 ret;
96
118
 	int func = TPM_PPI_FN_SUBREQ;
97
-	union acpi_object *obj, tmp;
98
-	union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(1, &tmp);
119
+	union acpi_object *obj, tmp[2];
120
+	union acpi_object argv4 = ACPI_INIT_DSM_ARGV4(2, tmp);
99
121
 	struct tpm_chip *chip = to_tpm_chip(dev);
122
+	u64 rev = TPM_PPI_REVISION_ID_1;
100
123
 
101
124
 	/*
102
125
 	 * the function to submit TPM operation request to pre-os environment
..
..
@@ -104,7 +127,7 @@
104
127
 	 * version 1.1
105
128
 	 */
106
129
 	if (acpi_check_dsm(chip->acpi_dev_handle, &tpm_ppi_guid,
107
-			   TPM_PPI_REVISION_ID, 1 << TPM_PPI_FN_SUBREQ2))
130
+			   TPM_PPI_REVISION_ID_1, 1 << TPM_PPI_FN_SUBREQ2))
108
131
 		func = TPM_PPI_FN_SUBREQ2;
109
132
 
110
133
 	/*
..
..
@@ -113,20 +136,29 @@
113
136
 	 * string/package type. For PPI version 1.0 and 1.1, use buffer type
114
137
 	 * for compatibility, and use package type since 1.2 according to spec.
115
138
 	 */
116
-	if (strcmp(chip->ppi_version, "1.2") < 0) {
139
+	if (strcmp(chip->ppi_version, "1.3") == 0) {
140
+		if (sscanf(buf, "%llu %llu", &tmp[0].integer.value,
141
+			   &tmp[1].integer.value) != 2)
142
+			goto ppi12;
143
+		rev = TPM_PPI_REVISION_ID_2;
144
+		tmp[0].type = ACPI_TYPE_INTEGER;
145
+		tmp[1].type = ACPI_TYPE_INTEGER;
146
+	} else if (strcmp(chip->ppi_version, "1.2") < 0) {
117
147
 		if (sscanf(buf, "%d", &req) != 1)
118
148
 			return -EINVAL;
119
149
 		argv4.type = ACPI_TYPE_BUFFER;
120
150
 		argv4.buffer.length = sizeof(req);
121
151
 		argv4.buffer.pointer = (u8 *)&req;
122
152
 	} else {
123
-		tmp.type = ACPI_TYPE_INTEGER;
124
-		if (sscanf(buf, "%llu", &tmp.integer.value) != 1)
153
+ppi12:
154
+		argv4.package.count = 1;
155
+		tmp[0].type = ACPI_TYPE_INTEGER;
156
+		if (sscanf(buf, "%llu", &tmp[0].integer.value) != 1)
125
157
 			return -EINVAL;
126
158
 	}
127
159
 
128
160
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, func, ACPI_TYPE_INTEGER,
129
-			   &argv4);
161
+			   &argv4, rev);
130
162
 	if (!obj) {
131
163
 		return -ENXIO;
132
164
 	} else {
..
..
@@ -170,7 +202,7 @@
170
202
 	if (strcmp(chip->ppi_version, "1.2") < 0)
171
203
 		obj = &tmp;
172
204
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, TPM_PPI_FN_GETACT,
173
-			   ACPI_TYPE_INTEGER, obj);
205
+			   ACPI_TYPE_INTEGER, obj, TPM_PPI_REVISION_ID_1);
174
206
 	if (!obj) {
175
207
 		return -ENXIO;
176
208
 	} else {
..
..
@@ -196,7 +228,7 @@
196
228
 	struct tpm_chip *chip = to_tpm_chip(dev);
197
229
 
198
230
 	obj = tpm_eval_dsm(chip->acpi_dev_handle, TPM_PPI_FN_GETRSP,
199
-			   ACPI_TYPE_PACKAGE, NULL);
231
+			   ACPI_TYPE_PACKAGE, NULL, TPM_PPI_REVISION_ID_1);
200
232
 	if (!obj)
201
233
 		return -ENXIO;
202
234
 
..
..
@@ -264,7 +296,7 @@
264
296
 		"User not required",
265
297
 	};
266
298
 
267
-	if (!acpi_check_dsm(dev_handle, &tpm_ppi_guid, TPM_PPI_REVISION_ID,
299
+	if (!acpi_check_dsm(dev_handle, &tpm_ppi_guid, TPM_PPI_REVISION_ID_1,
268
300
 			    1 << TPM_PPI_FN_GETOPR))
269
301
 		return -EPERM;
270
302
 
..
..
@@ -272,7 +304,8 @@
272
304
 	for (i = start; i <= end; i++) {
273
305
 		tmp.integer.value = i;
274
306
 		obj = tpm_eval_dsm(dev_handle, TPM_PPI_FN_GETOPR,
275
-				   ACPI_TYPE_INTEGER, &argv);
307
+				   ACPI_TYPE_INTEGER, &argv,
308
+				   TPM_PPI_REVISION_ID_1);
276
309
 		if (!obj) {
277
310
 			return -ENOMEM;
278
311
 		} else {
..
..
@@ -338,12 +371,13 @@
338
371
 		return;
339
372
 
340
373
 	if (!acpi_check_dsm(chip->acpi_dev_handle, &tpm_ppi_guid,
341
-			    TPM_PPI_REVISION_ID, 1 << TPM_PPI_FN_VERSION))
374
+			    TPM_PPI_REVISION_ID_1, 1 << TPM_PPI_FN_VERSION))
342
375
 		return;
343
376
 
344
377
 	/* Cache PPI version string. */
345
378
 	obj = acpi_evaluate_dsm_typed(chip->acpi_dev_handle, &tpm_ppi_guid,
346
-				      TPM_PPI_REVISION_ID, TPM_PPI_FN_VERSION,
379
+				      TPM_PPI_REVISION_ID_1,
380
+				      TPM_PPI_FN_VERSION,
347
381
 				      NULL, ACPI_TYPE_STRING);
348
382
 	if (obj) {
349
383
 		strlcpy(chip->ppi_version, obj->string.pointer,