forked from Minki/linux
62dfd912ab
Problem: When IMA and VTPM are both enabled in kernel config,
kernel hangs during bootup on LE OS.
Why?: IMA calls tpm_pcr_read() which results in tpm_ibmvtpm_send
and tpm_ibmtpm_recv getting called. A trace showed that
tpm_ibmtpm_recv was hanging.
Resolution: tpm_ibmtpm_recv was hanging because tpm_ibmvtpm_send
was sending CRQ message that probably did not make much sense
to phype because of Endianness. The fix below sends correctly
converted CRQ for LE. This was not caught before because it
seems IMA is not enabled by default in kernel config and
IMA exercises this particular code path in vtpm.
Tested with IMA and VTPM enabled in kernel config and VTPM
enabled on both a BE OS and a LE OS ppc64 lpar. This exercised
CRQ and TPM command code paths in vtpm.
Patch is against Peter's tpmdd tree on github which included
Vicky's previous vtpm le patches.
Signed-off-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org> # eb71f8a5e3: "Added Little Endian support to vtpm module"
Cc: <stable@vger.kernel.org>
Reviewed-by: Ashley Lai <ashley@ahsleylai.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
77 lines
1.9 KiB
C
77 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2012 IBM Corporation
|
|
*
|
|
* Author: Ashley Lai <ashleydlai@gmail.com>
|
|
*
|
|
* Maintained by: <tpmdd-devel@lists.sourceforge.net>
|
|
*
|
|
* Device driver for TCG/TCPA TPM (trusted platform module).
|
|
* Specifications at www.trustedcomputinggroup.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
*/
|
|
|
|
#ifndef __TPM_IBMVTPM_H__
|
|
#define __TPM_IBMVTPM_H__
|
|
|
|
/* vTPM Message Format 1 */
|
|
struct ibmvtpm_crq {
|
|
u8 valid;
|
|
u8 msg;
|
|
__be16 len;
|
|
__be32 data;
|
|
__be64 reserved;
|
|
} __attribute__((packed, aligned(8)));
|
|
|
|
struct ibmvtpm_crq_queue {
|
|
struct ibmvtpm_crq *crq_addr;
|
|
u32 index;
|
|
u32 num_entry;
|
|
};
|
|
|
|
struct ibmvtpm_dev {
|
|
struct device *dev;
|
|
struct vio_dev *vdev;
|
|
struct ibmvtpm_crq_queue crq_queue;
|
|
dma_addr_t crq_dma_handle;
|
|
u32 rtce_size;
|
|
void __iomem *rtce_buf;
|
|
dma_addr_t rtce_dma_handle;
|
|
spinlock_t rtce_lock;
|
|
wait_queue_head_t wq;
|
|
u16 res_len;
|
|
u32 vtpm_version;
|
|
};
|
|
|
|
#define CRQ_RES_BUF_SIZE PAGE_SIZE
|
|
|
|
/* Initialize CRQ */
|
|
#define INIT_CRQ_CMD 0xC001000000000000LL /* Init cmd */
|
|
#define INIT_CRQ_COMP_CMD 0xC002000000000000LL /* Init complete cmd */
|
|
#define INIT_CRQ_RES 0x01 /* Init respond */
|
|
#define INIT_CRQ_COMP_RES 0x02 /* Init complete respond */
|
|
#define VALID_INIT_CRQ 0xC0 /* Valid command for init crq */
|
|
|
|
/* vTPM CRQ response is the message type | 0x80 */
|
|
#define VTPM_MSG_RES 0x80
|
|
#define IBMVTPM_VALID_CMD 0x80
|
|
|
|
/* vTPM CRQ message types */
|
|
#define VTPM_GET_VERSION 0x01
|
|
#define VTPM_GET_VERSION_RES (0x01 | VTPM_MSG_RES)
|
|
|
|
#define VTPM_TPM_COMMAND 0x02
|
|
#define VTPM_TPM_COMMAND_RES (0x02 | VTPM_MSG_RES)
|
|
|
|
#define VTPM_GET_RTCE_BUFFER_SIZE 0x03
|
|
#define VTPM_GET_RTCE_BUFFER_SIZE_RES (0x03 | VTPM_MSG_RES)
|
|
|
|
#define VTPM_PREPARE_TO_SUSPEND 0x04
|
|
#define VTPM_PREPARE_TO_SUSPEND_RES (0x04 | VTPM_MSG_RES)
|
|
|
|
#endif
|