Skip to content

Commit 31f0200

Browse files
committed
Merge tag 'char-misc-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes/removals from Greg KH: "Here's some small fixes for 5.10-rc2 and a big driver removal. The fixes are for some reported issues in the interconnect and coresight drivers, nothing major. The "big" driver removal is the MIC drivers have been asked to be removed as the hardware never shipped and Intel no longer wants to maintain something that no one can use. This is welcomed by many as the DMA usage of these drivers was "interesting" and the security people were starting to question some issues that were starting to be found in the codebase. Note, one of the subsystems for this driver, the "VOP" code, will probably come back in future kernel versions as it was looking to potentially solve some PCIe virtualization issues that a number of other vendors were wanting to solve. But as-is, this codebase didn't work for anyone else so no actual functionality is being removed. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: coresight: cti: Initialize dynamic sysfs attributes coresight: Fix uninitialised pointer bug in etm_setup_aux() coresight: add module license misc: mic: remove the MIC drivers interconnect: qcom: use icc_sync state for sm8[12]50 interconnect: qcom: Ensure that the floor bandwidth value is enforced interconnect: qcom: sc7180: Init BCMs before creating the nodes interconnect: qcom: sdm845: Init BCMs before creating the nodes interconnect: Aggregate before setting initial bandwidth interconnect: qcom: sdm845: Enable keepalive for the MM1 BCM
2 parents 9c75b68 + d1b35d6 commit 31f0200

95 files changed

Lines changed: 34 additions & 26793 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/misc-devices/mic/index.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

Documentation/misc-devices/mic/mic_overview.rst

Lines changed: 0 additions & 85 deletions
This file was deleted.

Documentation/misc-devices/mic/scif_overview.rst

Lines changed: 0 additions & 108 deletions
This file was deleted.

MAINTAINERS

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8972,22 +8972,6 @@ S: Supported
89728972
W: https://01.org/linux-acpi
89738973
F: drivers/platform/x86/intel_menlow.c
89748974

8975-
INTEL MIC DRIVERS (mic)
8976-
M: Sudeep Dutt <sudeep.dutt@intel.com>
8977-
M: Ashutosh Dixit <ashutosh.dixit@intel.com>
8978-
S: Supported
8979-
W: https://github.com/sudeepdutt/mic
8980-
W: http://software.intel.com/en-us/mic-developer
8981-
F: Documentation/misc-devices/mic/
8982-
F: drivers/dma/mic_x100_dma.c
8983-
F: drivers/dma/mic_x100_dma.h
8984-
F: drivers/misc/mic/
8985-
F: include/linux/mic_bus.h
8986-
F: include/linux/scif.h
8987-
F: include/uapi/linux/mic_common.h
8988-
F: include/uapi/linux/mic_ioctl.h
8989-
F: include/uapi/linux/scif_ioctl.h
8990-
89918975
INTEL P-Unit IPC DRIVER
89928976
M: Zha Qipeng <qipeng.zha@intel.com>
89938977
L: platform-driver-x86@vger.kernel.org

drivers/dma/Kconfig

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -318,24 +318,6 @@ config INTEL_IOP_ADMA
318318
help
319319
Enable support for the Intel(R) IOP Series RAID engines.
320320

321-
config INTEL_MIC_X100_DMA
322-
tristate "Intel MIC X100 DMA Driver"
323-
depends on 64BIT && X86 && INTEL_MIC_BUS
324-
select DMA_ENGINE
325-
help
326-
This enables DMA support for the Intel Many Integrated Core
327-
(MIC) family of PCIe form factor coprocessor X100 devices that
328-
run a 64 bit Linux OS. This driver will be used by both MIC
329-
host and card drivers.
330-
331-
If you are building host kernel with a MIC device or a card
332-
kernel for a MIC device, then say M (recommended) or Y, else
333-
say N. If unsure say N.
334-
335-
More information about the Intel MIC family as well as the Linux
336-
OS and tools for MIC to use with this driver are available from
337-
<http://software.intel.com/en-us/mic-developer>.
338-
339321
config K3_DMA
340322
tristate "Hisilicon K3 DMA support"
341323
depends on ARCH_HI3xxx || ARCH_HISI || COMPILE_TEST

drivers/dma/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ obj-$(CONFIG_INTEL_IDMA64) += idma64.o
4444
obj-$(CONFIG_INTEL_IOATDMA) += ioat/
4545
obj-$(CONFIG_INTEL_IDXD) += idxd/
4646
obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
47-
obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
4847
obj-$(CONFIG_K3_DMA) += k3dma.o
4948
obj-$(CONFIG_LPC18XX_DMAMUX) += lpc18xx-dmamux.o
5049
obj-$(CONFIG_MILBEAUT_HDMAC) += milbeaut-hdmac.o

0 commit comments

Comments
 (0)