| Message ID | 1477962314-26763-2-git-send-email-tomas.winkler@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 01, 2016 at 03:05:13AM +0200, Tomas Winkler wrote: > Place kdoc just above tpm_pcr_extend so it can be parsed > correctly. > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko > --- > drivers/char/tpm/tpm-interface.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index cb0e57ee053d..d496a6b26a45 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -731,6 +731,14 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) > } > EXPORT_SYMBOL_GPL(tpm_pcr_read); > > +#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) > +#define EXTEND_PCR_RESULT_SIZE 34 > +static const struct tpm_input_header pcrextend_header = { > + .tag = TPM_TAG_RQU_COMMAND, > + .length = cpu_to_be32(34), > + .ordinal = TPM_ORD_PCR_EXTEND > +}; > + > /** > * tpm_pcr_extend - extend pcr value with hash > * @chip_num: tpm idx # or AN& > @@ -741,14 +749,6 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); > * isn't, protect against the chip disappearing, by incrementing > * the module usage count. > */ > -#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) > -#define EXTEND_PCR_RESULT_SIZE 34 > -static const struct tpm_input_header pcrextend_header = { > - .tag = TPM_TAG_RQU_COMMAND, > - .length = cpu_to_be32(34), > - .ordinal = TPM_ORD_PCR_EXTEND > -}; > - > int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) > { > struct tpm_cmd_t cmd; > -- > 2.7.4 > ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi
On Wed, Nov 02, 2016 at 04:02:20AM -0600, Jarkko Sakkinen wrote: > On Tue, Nov 01, 2016 at 03:05:13AM +0200, Tomas Winkler wrote: > > Place kdoc just above tpm_pcr_extend so it can be parsed > > correctly. > > > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> I applied this although I edited the short description (stripped away "/tpm-interface". /Jarkko > > /Jarkko > > > --- > > drivers/char/tpm/tpm-interface.c | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > > index cb0e57ee053d..d496a6b26a45 100644 > > --- a/drivers/char/tpm/tpm-interface.c > > +++ b/drivers/char/tpm/tpm-interface.c > > @@ -731,6 +731,14 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) > > } > > EXPORT_SYMBOL_GPL(tpm_pcr_read); > > > > +#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) > > +#define EXTEND_PCR_RESULT_SIZE 34 > > +static const struct tpm_input_header pcrextend_header = { > > + .tag = TPM_TAG_RQU_COMMAND, > > + .length = cpu_to_be32(34), > > + .ordinal = TPM_ORD_PCR_EXTEND > > +}; > > + > > /** > > * tpm_pcr_extend - extend pcr value with hash > > * @chip_num: tpm idx # or AN& > > @@ -741,14 +749,6 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); > > * isn't, protect against the chip disappearing, by incrementing > > * the module usage count. > > */ > > -#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) > > -#define EXTEND_PCR_RESULT_SIZE 34 > > -static const struct tpm_input_header pcrextend_header = { > > - .tag = TPM_TAG_RQU_COMMAND, > > - .length = cpu_to_be32(34), > > - .ordinal = TPM_ORD_PCR_EXTEND > > -}; > > - > > int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) > > { > > struct tpm_cmd_t cmd; > > -- > > 2.7.4 > > ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index cb0e57ee053d..d496a6b26a45 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -731,6 +731,14 @@ int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) } EXPORT_SYMBOL_GPL(tpm_pcr_read); +#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) +#define EXTEND_PCR_RESULT_SIZE 34 +static const struct tpm_input_header pcrextend_header = { + .tag = TPM_TAG_RQU_COMMAND, + .length = cpu_to_be32(34), + .ordinal = TPM_ORD_PCR_EXTEND +}; + /** * tpm_pcr_extend - extend pcr value with hash * @chip_num: tpm idx # or AN& @@ -741,14 +749,6 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); * isn't, protect against the chip disappearing, by incrementing * the module usage count. */ -#define TPM_ORD_PCR_EXTEND cpu_to_be32(20) -#define EXTEND_PCR_RESULT_SIZE 34 -static const struct tpm_input_header pcrextend_header = { - .tag = TPM_TAG_RQU_COMMAND, - .length = cpu_to_be32(34), - .ordinal = TPM_ORD_PCR_EXTEND -}; - int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) { struct tpm_cmd_t cmd;
Place kdoc just above tpm_pcr_extend so it can be parsed correctly. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- drivers/char/tpm/tpm-interface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)