sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/tpm: Drop CAR_GLOBAL_MIGRATION support

Browse Source 
Change-Id: I1c09eda6164efb390de4626f52aafba59962f9c4
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37029
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans
2019-11-20 19:51:06 +01:00
committed by Patrick Georgi
parent 344e86bb3b
commit 0ca944b16f
14 changed files with 144 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers/pc80/tpm/tis.c
View File

@@ -31,7 +31,6 @@
#include <device/device.h>
#include <console/console.h>
#include <security/tpm/tis.h>
#include <arch/early_variables.h>
#include <device/pnp.h>
#include "chip.h"
@@ -162,7 +161,7 @@ static const struct vendor_name vendor_names[] = {
* Cached vendor/device ID pair to indicate that the device has been already
* discovered
*/
static u32 vendor_dev_id CAR_GLOBAL;
static u32 vendor_dev_id;
static inline u8 tpm_read_status(int locality)
{
@@ -402,7 +401,7 @@ static u32 tis_probe(void)
u16 vid, did;
int i;
if (car_get_var(vendor_dev_id))
if (vendor_dev_id)
return 0; /* Already probed. */
didvid = tpm_read_did_vid(0);
@@ -411,7 +410,7 @@ static u32 tis_probe(void)
return TPM_DRIVER_ERR;
}
car_set_var(vendor_dev_id, didvid);
vendor_dev_id = didvid;
vid = didvid & 0xffff;
did = (didvid >> 16) & 0xffff;