leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm: cr50: Release locality on exit

Browse Source 
At present the cr50 driver claims the locality and does not release it for
Linux. This causes problems. Fix this by tracking what is claimed, and
adding a 'remove' method.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2020-04-08 16:57:22 -06:00 committed by Bin Meng
parent b14ccfcf09
commit 79b7ade5b5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/tpm/cr50_i2c.c
View File

@ -206,7 +206,7 @@ static int release_locality(struct udevice *dev, int force)
cr50_i2c_write(dev, addr, &buf, 1); cr50_i2c_write(dev, addr, &buf, 1);
} }
priv->locality = 0; priv->locality = -1;
return 0; return 0;
} }
@ -499,6 +499,7 @@ static int process_reset(struct udevice *dev)
static int claim_locality(struct udevice *dev, int loc) static int claim_locality(struct udevice *dev, int loc)
{ {
const u8 mask = TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY; const u8 mask = TPM_ACCESS_VALID | TPM_ACCESS_ACTIVE_LOCALITY;
struct cr50_priv *priv = dev_get_priv(dev);
u8 access; u8 access;
int ret; int ret;
@ -525,6 +526,7 @@ static int claim_locality(struct udevice *dev, int loc)
return -EPERM; return -EPERM;
} }
log_info("Claimed locality %d\n", loc); log_info("Claimed locality %d\n", loc);
priv->locality = loc;
return 0; return 0;
} }
@ -559,7 +561,11 @@ static int cr50_i2c_open(struct udevice *dev)
static int cr50_i2c_cleanup(struct udevice *dev) static int cr50_i2c_cleanup(struct udevice *dev)
{ {
release_locality(dev, 1); struct cr50_priv *priv = dev_get_priv(dev);
printf("%s: cleanup %d\n", __func__, priv->locality);
if (priv->locality != -1)
release_locality(dev, 1);
return 0; return 0;
} }
@ -631,6 +637,7 @@ static int cr50_i2c_probe(struct udevice *dev)
return log_msg_ret("vendor-id", -EXDEV); return log_msg_ret("vendor-id", -EXDEV);
} }
priv->vendor = vendor; priv->vendor = vendor;
priv->locality = -1;
return 0; return 0;
} }
@ -655,5 +662,7 @@ U_BOOT_DRIVER(cr50_i2c) = {
.ops = &cr50_i2c_ops, .ops = &cr50_i2c_ops,
.ofdata_to_platdata = cr50_i2c_ofdata_to_platdata, .ofdata_to_platdata = cr50_i2c_ofdata_to_platdata,
.probe = cr50_i2c_probe, .probe = cr50_i2c_probe,
.remove = cr50_i2c_cleanup,
.priv_auto_alloc_size = sizeof(struct cr50_priv), .priv_auto_alloc_size = sizeof(struct cr50_priv),
.flags = DM_FLAG_OS_PREPARE,
}; };