Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (8b53c765) · Commits · 戴 / test

Documentation/ABI/testing/debugfs-hisi-zip

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/hisi_zip/<bdf>/comp_core[01]/regs
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: Dump of compression cores related debug registers.
		Only available for PF.

		What: /sys/kernel/debug/hisi_zip/<bdf>/decomp_core[0-5]/regs
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: Dump of decompression cores related debug registers.
		Only available for PF.

		What: /sys/kernel/debug/hisi_zip/<bdf>/clear_enable
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: Compression/decompression core debug registers read clear
		control. 1 means enable register read clear, otherwise 0.
		Writing to this file has no functional effect, only enable or
		disable counters clear after reading of these registers.
		Only available for PF.

		What: /sys/kernel/debug/hisi_zip/<bdf>/current_qm
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: One ZIP controller has one PF and multiple VFs, each function
		has a QM. Select the QM which below qm refers to.
		Only available for PF.

		What: /sys/kernel/debug/hisi_zip/<bdf>/qm/qm_regs
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: Dump of QM related debug registers.
		Available for PF and VF in host. VF in guest currently only
		has one debug register.

		What: /sys/kernel/debug/hisi_zip/<bdf>/qm/current_q
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: One QM may contain multiple queues. Select specific queue to
		show its debug registers in above qm_regs.
		Only available for PF.

		What: /sys/kernel/debug/hisi_zip/<bdf>/qm/clear_enable
		Date: Nov 2018
		Contact: linux-crypto@vger.kernel.org
		Description: QM debug registers(qm_regs) read clear control. 1 means enable
		register read clear, otherwise 0.
		Writing to this file has no functional effect, only enable or
		disable counters clear after reading of these registers.
		Only available for PF.

Documentation/crypto/crypto_engine.rst

+1 −0

Original line number	Diff line number	Diff line
		.. SPDX-License-Identifier: GPL-2.0

		Crypto Engine
		=============

Documentation/devicetree/bindings/rng/timeriomem_rng.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ Optional properties:
		which disables using this rng to automatically fill the kernel's
		entropy pool.

		N.B. currently 'reg' must be four bytes wide and aligned
		N.B. currently 'reg' must be at least four bytes wide and 32-bit aligned

		Example:

Documentation/padata.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,10 +16,12 @@ overall control of how tasks are to be run::

		#include <linux/padata.h>

		struct padata_instance padata_alloc(struct workqueue_struct wq,
		struct padata_instance padata_alloc(const char name,
		const struct cpumask *pcpumask,
		const struct cpumask *cbcpumask);

		'name' simply identifies the instance.

		The pcpumask describes which processors will be used to execute work
		submitted to this instance in parallel. The cbcpumask defines which
		processors are allowed to be used as the serialization callback processor.
		@@ -128,8 +130,7 @@ in that CPU mask or about a not running instance.

		Each task submitted to padata_do_parallel() will, in turn, be passed to
		exactly one call to the above-mentioned parallel() function, on one CPU, so
		true parallelism is achieved by submitting multiple tasks. Despite the
		fact that the workqueue is used to make these calls, parallel() is run with
		true parallelism is achieved by submitting multiple tasks. parallel() runs with
		software interrupts disabled and thus cannot sleep. The parallel()
		function gets the padata_priv structure pointer as its lone parameter;
		information about the actual work to be done is probably obtained by using
		@@ -148,7 +149,7 @@ fact with a call to::
		At some point in the future, padata_do_serial() will trigger a call to the
		serial() function in the padata_priv structure. That call will happen on
		the CPU requested in the initial call to padata_do_parallel(); it, too, is
		done through the workqueue, but with local software interrupts disabled.
		run with local software interrupts disabled.
		Note that this call may be deferred for a while since the padata code takes
		pains to ensure that tasks are completed in the order in which they were
		submitted.
		@@ -159,5 +160,4 @@ when a padata instance is no longer needed::
		void padata_free(struct padata_instance *pinst);

		This function will busy-wait while any remaining tasks are completed, so it
		might be best not to call it while there is work outstanding. Shutting
		down the workqueue, if necessary, should be done separately.
		might be best not to call it while there is work outstanding.

MAINTAINERS

+12 −1

Original line number	Diff line number	Diff line
		@@ -7350,6 +7350,17 @@ S: Supported
		F: drivers/scsi/hisi_sas/
		F: Documentation/devicetree/bindings/scsi/hisilicon-sas.txt

		HISILICON QM AND ZIP Controller DRIVER
		M: Zhou Wang <wangzhou1@hisilicon.com>
		L: linux-crypto@vger.kernel.org
		S: Maintained
		F: drivers/crypto/hisilicon/qm.c
		F: drivers/crypto/hisilicon/qm.h
		F: drivers/crypto/hisilicon/sgl.c
		F: drivers/crypto/hisilicon/sgl.h
		F: drivers/crypto/hisilicon/zip/
		F: Documentation/ABI/testing/debugfs-hisi-zip

		HMM - Heterogeneous Memory Management
		M: Jérôme Glisse <jglisse@redhat.com>
		L: linux-mm@kvack.org
		@@ -7703,7 +7714,7 @@ F: drivers/crypto/nx/nx-aes*
		F: drivers/crypto/nx/nx-sha*
		F: drivers/crypto/nx/nx.*
		F: drivers/crypto/nx/nx_csbcpb.h
		F: drivers/crypto/nx/nx_debugfs.h
		F: drivers/crypto/nx/nx_debugfs.c

		IBM Power Linux RAID adapter
		M: Brian King <brking@us.ibm.com>

Admin message