Skip to contentSkip to conversation

Enabling MSI for Microblaze

PATCH Applied Michal Simek 2 participants 4 messages Oct 25, 2019

Subsystems (9)
Arm (32-bit) PowerPC PCI MIPS +5 more subsystems
lore
Share & tools
lore
#0 lore raw

v2 cover Enabling MSI for Microblaze

Hi,

these two patches come from discussion with Christoph, Bjorn, Palmer and Waiman. The first patch was suggestion by Christoph here
https://lore.kernel.org/linux-riscv/[email protected]/
The second part was discussed
https://lore.kernel.org/linux-pci/mhng-5d9bcb53-225e-441f-86cc-b335624b3e7c@palmer-si-x1e/
and
https://lore.kernel.org/linux-pci/[email protected]/

Thanks,
Michal

Changes in v2:
- Fix typo in commit message s/expect/except/ - Reported-by: Masahiro

Michal Simek (1):
asm-generic: Make msi.h a mandatory include/asm header

Palmer Dabbelt (1):
pci: Default to PCI_MSI_IRQ_DOMAIN

 arch/arc/include/asm/Kbuild     | 1 -
 arch/arm/include/asm/Kbuild     | 1 -
 arch/arm64/include/asm/Kbuild   | 1 -
 arch/mips/include/asm/Kbuild    | 1 -
 arch/powerpc/include/asm/Kbuild | 1 -
 arch/riscv/include/asm/Kbuild   | 1 -
 arch/sparc/include/asm/Kbuild   | 1 -
 drivers/pci/Kconfig             | 2 +-
 include/asm-generic/Kbuild      | 1 +
 9 files changed, 2 insertions(+), 8 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/2 asm-generic: Make msi.h a mandatory include/asm header

msi.h is generic for all architectures except of x86 which has own version. Enabling MSI by including msi.h to architecture Kbuild is just additional step which doesn't need to be done.
The patch was created based on request to enable MSI for Microblaze.

---

Changes in v2:
- Fix typo in commit message s/expect/except/ - Reported-by: Masahiro

https://lore.kernel.org/linux-riscv/[email protected]/

---
 arch/arc/include/asm/Kbuild     | 1 -
 arch/arm/include/asm/Kbuild     | 1 -
 arch/arm64/include/asm/Kbuild   | 1 -
 arch/mips/include/asm/Kbuild    | 1 -
 arch/powerpc/include/asm/Kbuild | 1 -
 arch/riscv/include/asm/Kbuild   | 1 -
 arch/sparc/include/asm/Kbuild   | 1 -
 include/asm-generic/Kbuild      | 1 +
 8 files changed, 1 insertion(+), 7 deletions(-)
arch/arc/include/asm/Kbuild +0 -1
index 393d4f5e1450..1b505694691e 100644
@@ -17,7 +17,6 @@ generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
 generic-y += mmiowb.h
-generic-y += msi.h
 generic-y += parport.h
 generic-y += percpu.h
 generic-y += preempt.h
arch/arm/include/asm/Kbuild +0 -1
index 68ca86f85eb7..fa579b23b4df 100644
@@ -12,7 +12,6 @@ generic-y += local.h
 generic-y += local64.h
 generic-y += mm-arch-hooks.h
 generic-y += mmiowb.h
-generic-y += msi.h
 generic-y += parport.h
 generic-y += preempt.h
 generic-y += seccomp.h
arch/arm64/include/asm/Kbuild +0 -1
index 98a5405c8558..bd23f87d6c55 100644
@@ -16,7 +16,6 @@ generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
 generic-y += mmiowb.h
-generic-y += msi.h
 generic-y += qrwlock.h
 generic-y += qspinlock.h
 generic-y += serial.h
arch/mips/include/asm/Kbuild +0 -1
index c8b595c60910..61b0fc2026e6 100644
@@ -13,7 +13,6 @@ generic-y += irq_work.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
-generic-y += msi.h
 generic-y += parport.h
 generic-y += percpu.h
 generic-y += preempt.h
arch/powerpc/include/asm/Kbuild +0 -1
index 64870c7be4a3..17726f2e46de 100644
@@ -10,4 +10,3 @@ generic-y += local64.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
 generic-y += vtime.h
-generic-y += msi.h
arch/riscv/include/asm/Kbuild +0 -1
index 16970f246860..1efaeddf1e4b 100644
@@ -22,7 +22,6 @@ generic-y += kvm_para.h
 generic-y += local.h
 generic-y += local64.h
 generic-y += mm-arch-hooks.h
-generic-y += msi.h
 generic-y += percpu.h
 generic-y += preempt.h
 generic-y += sections.h
arch/sparc/include/asm/Kbuild +0 -1
index b6212164847b..62de2eb2773d 100644
@@ -18,7 +18,6 @@ generic-y += mcs_spinlock.h
 generic-y += mm-arch-hooks.h
 generic-y += mmiowb.h
 generic-y += module.h
-generic-y += msi.h
 generic-y += preempt.h
 generic-y += serial.h
 generic-y += trace_clock.h
include/asm-generic/Kbuild +1 -0
index adff14fcb8e4..ddfee1bd9dc1 100644
@@ -4,4 +4,5 @@
 # (This file is not included when SRCARCH=um since UML borrows several
 # asm headers from the host architecutre.)
 
+mandatory-y += msi.h
 mandatory-y += simd.h
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/2 pci: Default to PCI_MSI_IRQ_DOMAIN

In reply to Michal Simek

From: Palmer Dabbelt <[email protected]>

As far as I can tell, the only reason there was an architecture whitelist for PCI_MSI_IRQ_DOMAIN is because it requires msi.h. I've built this for all the architectures that play nice with make.cross, but I haven't boot tested it anywhere.

---

Changes in v2: None

Origin patch here:
https://lore.kernel.org/linux-pci/[email protected]/

---
 drivers/pci/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/Kconfig +1 -1
index a304f5ea11b9..77c1428cd945 100644
@@ -52,7 +52,7 @@ config PCI_MSI
 	   If you don't know what to do here, say Y.
 
 config PCI_MSI_IRQ_DOMAIN
-	def_bool ARC || ARM || ARM64 || X86 || RISCV
+	def_bool y
 	depends on PCI_MSI
 	select GENERIC_MSI_IRQ_DOMAIN
 
Signature · 1 line
2.17.1
#3 lore raw
In reply to Michal Simek
Quoted 22 lines · Michal Simek

Hi,

these two patches come from discussion with Christoph, Bjorn, Palmer and Waiman. The first patch was suggestion by Christoph here
https://lore.kernel.org/linux-riscv/[email protected]/
The second part was discussed
https://lore.kernel.org/linux-pci/mhng-5d9bcb53-225e-441f-86cc-b335624b3e7c@palmer-si-x1e/
and
https://lore.kernel.org/linux-pci/[email protected]/

Thanks,
Michal

Changes in v2:
- Fix typo in commit message s/expect/except/ - Reported-by: Masahiro

Michal Simek (1):
asm-generic: Make msi.h a mandatory include/asm header

Palmer Dabbelt (1):
pci: Default to PCI_MSI_IRQ_DOMAIN

Quoted 10 lines
 arch/arc/include/asm/Kbuild     | 1 -
 arch/arm/include/asm/Kbuild     | 1 -
 arch/arm64/include/asm/Kbuild   | 1 -
 arch/mips/include/asm/Kbuild    | 1 -
 arch/powerpc/include/asm/Kbuild | 1 -
 arch/riscv/include/asm/Kbuild   | 1 -
 arch/sparc/include/asm/Kbuild   | 1 -
 drivers/pci/Kconfig             | 2 +-
 include/asm-generic/Kbuild      | 1 +
 9 files changed, 2 insertions(+), 8 deletions(-)

I applied these to pci/msi for v5.5, thanks!