Skip to contentSkip to conversation

stm/intel_th: Updates for v4.4

PATCH Superseded Alexander Shishkin 1 participant 6 messages Nov 25, 2015

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Alexander Shishkin

author maintainer
#0 lore raw

v2 cover stm/intel_th: Updates for v4.4

Hi Greg,

Since [1] hasn't yet found its way to char-misc tree, I'm re-sending it with a few additions, namely: there is one more Kconfig fix from Arnd and two PCI IDs that I'm hoping we could also include in this cycle. Based on char-misc-linus.

[1] http://marc.info/?l=linux-kernel&m=144706387705997

Alexander Shishkin (2):
intel_th: pci: Add Apollo Lake SOC support
intel_th: pci: Add Broxton SOC support

Arnd Bergmann (1):
stm: select CONFIG_SRCU

Geert Uytterhoeven (2):
stm class: Hide STM-specific options if STM is disabled
intel_th: INTEL_TH should depend on HAS_DMA

 drivers/hwtracing/intel_th/Kconfig |  1 +
 drivers/hwtracing/intel_th/pci.c   | 10 ++++++++++
 drivers/hwtracing/stm/Kconfig      |  5 +++++
 3 files changed, 16 insertions(+)
Signature · 1 line
2.6.2
author maintainer
#1 lore raw

PATCH v2 1/5 stm class: Hide STM-specific options if STM is disabled

From: Geert Uytterhoeven <[email protected]>

If STM=n, it doesn't make sense to ask about STM_DUMMY and STM_SOURCE_CONSOLE support, which are not even built when enabled anyway. Hence hide these options if STM=n.

---
 drivers/hwtracing/stm/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)
drivers/hwtracing/stm/Kconfig +4 -0
index 83e9f591a5..4c13762f2b 100644
@@ -8,6 +8,8 @@ config STM
 
 	  Say Y here to enable System Trace Module device support.
 
+if STM
+
 config STM_DUMMY
 	tristate "Dummy STM driver"
 	help
@@ -24,3 +26,5 @@ config STM_SOURCE_CONSOLE
 
 	  If you want to send kernel console messages over STM devices,
 	  say Y.
+
+endif
Signature · 1 line
2.6.2
author maintainer
#3 lore raw

PATCH v2 3/5 stm: select CONFIG_SRCU

In reply to Alexander Shishkin

From: Arnd Bergmann <[email protected]>

The newly added STM code uses SRCU, but does not ensure that this code is part of the kernel:

drivers/built-in.o: In function `stm_source_link_show':
include/linux/srcu.h:221: undefined reference to __srcu_read_lock' include/linux/srcu.h:238: undefined reference to __srcu_read_unlock' drivers/built-in.o: In function `stm_source_link_drop':
include/linux/srcu.h:221: undefined reference to __srcu_read_lock' include/linux/srcu.h:238: undefined reference to __srcu_read_unlock'

This adds a Kconfig 'select' statement like all the other SRCU using drivers have.

Fixes 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
---
 drivers/hwtracing/stm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/hwtracing/stm/Kconfig +1 -0
index 4c13762f2b..e0ac753955 100644
@@ -1,6 +1,7 @@
 config STM
 	tristate "System Trace Module devices"
 	select CONFIGFS_FS
+	select SRCU
 	help
 	  A System Trace Module (STM) is a device exporting data in System
 	  Trace Protocol (STP) format as defined by MIPI STP standards.
Signature · 1 line
2.6.2
author maintainer
#5 lore raw

PATCH v2 5/5 intel_th: pci: Add Broxton SOC support

In reply to Alexander Shishkin

This adds Intel(R) Trace Hub PCI ID for Broxton SOC.

---
 drivers/hwtracing/intel_th/pci.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
index b5760730e1..09017073d7 100644
@@ -72,6 +72,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a8e),
 		.driver_data = (kernel_ulong_t)0,
 	},
+	{
+		/* Broxton */
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0a80),
+		.driver_data = (kernel_ulong_t)0,
+	},
 	{ 0 },
 };
 
Signature · 1 line
2.6.2
author maintainer
#4 lore raw

PATCH v2 4/5 intel_th: pci: Add Apollo Lake SOC support

In reply to Alexander Shishkin

This adds Intel(R) Trace Hub PCI ID for Apollo Lake SOC.

---
 drivers/hwtracing/intel_th/pci.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
index 641e879360..b5760730e1 100644
@@ -67,6 +67,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa126),
 		.driver_data = (kernel_ulong_t)0,
 	},
+	{
+		/* Apollo Lake */
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a8e),
+		.driver_data = (kernel_ulong_t)0,
+	},
 	{ 0 },
 };
 
Signature · 1 line
2.6.2
author maintainer
#2 lore raw

PATCH v2 2/5 intel_th: INTEL_TH should depend on HAS_DMA

In reply to Alexander Shishkin

From: Geert Uytterhoeven <[email protected]>

If NO_DMA=y:

ERROR: "dma_free_coherent" [drivers/hwtracing/intel_th/intel_th_msu.ko] undefined!
ERROR: "dma_alloc_coherent" [drivers/hwtracing/intel_th/intel_th_msu.ko] undefined!
ERROR: "dma_supported" [drivers/hwtracing/intel_th/intel_th.ko] undefined!

Add a dependency on HAS_DMA to fix this.

---
 drivers/hwtracing/intel_th/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/hwtracing/intel_th/Kconfig +1 -0
index b7a9073d96..90b0844093 100644
@@ -1,5 +1,6 @@
 config INTEL_TH
 	tristate "Intel(R) Trace Hub controller"
+	depends on HAS_DMA
 	help
 	  Intel(R) Trace Hub (TH) is a set of hardware blocks (subdevices) that
 	  produce, switch and output trace data from multiple hardware and
Signature · 1 line
2.6.2