leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vTPM: fix searching for the right vTPM node in device tree

Browse Source 
Replace all occurrences of '/ibm,vtpm' with '/vdevice/vtpm',
as only the latter is guanranteed to be available for the client OS.
The '/ibm,vtpm' node should only be used by Open Firmware, which
is susceptible to changes.

Signed-off-by: Hon Ching(Vicky) Lo <honclo@linux.vnet.ibm.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
This commit is contained in:
Hon Ching \(Vicky\) Lo
2015-10-07 20:11:52 -04:00
committed by Peter Huewe
parent 89adb83c5a
commit 2f82e98265
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/prom_init.c
View File

@@ -1430,12 +1430,12 @@ static void __init prom_instantiate_sml(void)
prom_debug("prom_instantiate_sml: start...\n"); prom_debug("prom_instantiate_sml: start...\n");
ibmvtpm_node = call_prom("finddevice", 1, 1, ADDR("/ibm,vtpm")); ibmvtpm_node = call_prom("finddevice", 1, 1, ADDR("/vdevice/vtpm"));
prom_debug("ibmvtpm_node: %x\n", ibmvtpm_node); prom_debug("ibmvtpm_node: %x\n", ibmvtpm_node);
if (!PHANDLE_VALID(ibmvtpm_node)) if (!PHANDLE_VALID(ibmvtpm_node))
return; return;
ibmvtpm_inst = call_prom("open", 1, 1, ADDR("/ibm,vtpm")); ibmvtpm_inst = call_prom("open", 1, 1, ADDR("/vdevice/vtpm"));
if (!IHANDLE_VALID(ibmvtpm_inst)) { if (!IHANDLE_VALID(ibmvtpm_inst)) {
prom_printf("opening vtpm package failed (%x)\n", ibmvtpm_inst); prom_printf("opening vtpm package failed (%x)\n", ibmvtpm_inst);
return; return;
@@ -1464,9 +1464,9 @@ static void __init prom_instantiate_sml(void)
reserve_mem(base, size); reserve_mem(base, size);
prom_setprop(ibmvtpm_node, "/ibm,vtpm", "linux,sml-base", prom_setprop(ibmvtpm_node, "/vdevice/vtpm", "linux,sml-base",
&base, sizeof(base)); &base, sizeof(base));
prom_setprop(ibmvtpm_node, "/ibm,vtpm", "linux,sml-size", prom_setprop(ibmvtpm_node, "/vdevice/vtpm", "linux,sml-size",
&size, sizeof(size)); &size, sizeof(size));
prom_debug("sml base = 0x%x\n", base); prom_debug("sml base = 0x%x\n", base);

2
drivers/char/tpm/tpm_of.c
View File

@@ -31,7 +31,7 @@ int read_log(struct tpm_bios_log *log)
return -EFAULT; return -EFAULT;
} }
np = of_find_node_by_name(NULL, "ibm,vtpm"); np = of_find_node_by_name(NULL, "vtpm");
if (!np) { if (!np) {
pr_err("%s: ERROR - IBMVTPM not supported\n", __func__); pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
return -ENODEV; return -ENODEV;