Merge tag 'tpmdd-next-20180108' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm (ebceb1c8) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -13809,9 +13809,10 @@ F: drivers/platform/x86/toshiba-wmi.c
		TPM DEVICE DRIVER
		M: Peter Huewe <peterhuewe@gmx.de>
		M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
		R: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
		R: Jason Gunthorpe <jgg@ziepe.ca>
		L: linux-integrity@vger.kernel.org
		Q: https://patchwork.kernel.org/project/linux-integrity/list/
		W: https://kernsec.org/wiki/index.php/Linux_Kernel_Integrity
		T: git git://git.infradead.org/users/jjs/linux-tpmdd.git
		S: Maintained
		F: drivers/char/tpm/

+1 −0

Original line number	Diff line number	Diff line
		@@ -999,6 +999,7 @@ struct boot_params efi_main(struct efi_config c,

		/* Ask the firmware to clear memory on unclean shutdown */
		efi_enable_reset_attack_mitigation(sys_table);
		efi_retrieve_tpm2_eventlog(sys_table);

		setup_graphics(boot_params);

+0 −13

Original line number	Diff line number	Diff line
		@@ -306,19 +306,6 @@ config HW_RANDOM_POWERNV

		If unsure, say Y.

		config HW_RANDOM_TPM
		tristate "TPM HW Random Number Generator support"
		depends on TCG_TPM
		default HW_RANDOM
		---help---
		This driver provides kernel-side support for the Random Number
		Generator in the Trusted Platform Module

		To compile this driver as a module, choose M here: the
		module will be called tpm-rng.

		If unsure, say Y.

		config HW_RANDOM_HISI
		tristate "Hisilicon Random Number Generator support"
		depends on HW_RANDOM && ARCH_HISI

+0 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ obj-$(CONFIG_HW_RANDOM_NOMADIK) += nomadik-rng.o
		obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o
		obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o
		obj-$(CONFIG_HW_RANDOM_HISI) += hisi-rng.o
		obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
		obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o
		obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o
		obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o

deleted100644 → 0

+0 −50

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 Kent Yoder IBM Corporation
		*
		* HWRNG interfaces to pull RNG data from a TPM
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#include <linux/module.h>
		#include <linux/hw_random.h>
		#include <linux/tpm.h>

		#define MODULE_NAME "tpm-rng"

		static int tpm_rng_read(struct hwrng rng, void data, size_t max, bool wait)
		{
		return tpm_get_random(TPM_ANY_NUM, data, max);
		}

		static struct hwrng tpm_rng = {
		.name = MODULE_NAME,
		.read = tpm_rng_read,
		};

		static int __init rng_init(void)
		{
		return hwrng_register(&tpm_rng);
		}
		module_init(rng_init);

		static void __exit rng_exit(void)
		{
		hwrng_unregister(&tpm_rng);
		}
		module_exit(rng_exit);

		MODULE_LICENSE("GPL v2");
		MODULE_AUTHOR("Kent Yoder <key@linux.vnet.ibm.com>");
		MODULE_DESCRIPTION("RNG driver for TPM devices");