Skip to contentSkip to conversation

x86: Wrap calls to 8259 with CONFIG_I8259_PIC

PATCH New Bin Meng 2 participants 6 messages Nov 30, 2018 – Dec 10, 2018 x86

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH v2 1/2 x86: Wrap calls to 8259 with CONFIG_I8259_PIC

mask_irq(), unmask_irq() and specific_eoi() are provided by the i8259 PIC driver and should be wrapped with CONFIG_I8259_PIC.

---

Changes in v2:
- use if() instead of #if

 arch/x86/lib/interrupts.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
arch/x86/lib/interrupts.c +10 -6
index 297067d..39f8dea 100644
@@ -64,7 +64,8 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
 	irq_handlers[irq].arg = arg;
 	irq_handlers[irq].count = 0;
 
-	unmask_irq(irq);
+	if (CONFIG_IS_ENABLED(I8259_PIC))
+		unmask_irq(irq);
 
 	if (status)
 		enable_interrupts();
@@ -83,7 +84,8 @@ void irq_free_handler(int irq)
 
 	status = disable_interrupts();
 
-	mask_irq(irq);
+	if (CONFIG_IS_ENABLED(I8259_PIC))
+		mask_irq(irq);
 
 	irq_handlers[irq].handler = NULL;
 	irq_handlers[irq].arg = NULL;
@@ -104,14 +106,16 @@ void do_irq(int hw_irq)
 	}
 
 	if (irq_handlers[irq].handler) {
-		mask_irq(irq);
+		if (CONFIG_IS_ENABLED(I8259_PIC))
+			mask_irq(irq);
 
 		irq_handlers[irq].handler(irq_handlers[irq].arg);
 		irq_handlers[irq].count++;
 
-		unmask_irq(irq);
-		specific_eoi(irq);
-
+		if (CONFIG_IS_ENABLED(I8259_PIC)) {
+			unmask_irq(irq);
+			specific_eoi(irq);
+		}
 	} else {
 		if ((irq & 7) != 7) {
 			spurious_irq_cnt++;
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v2 2/2 x86: kconfig: Allow board defconfig file to disable 8259 and APIC

At present the Kconfig options (CONFIG_I8259_PIC and CONFIG_APIC) do not include a prompt message, which makes it impossible to be disabled from a board defconfig file.

---

Changes in v2: None

 arch/x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/Kconfig +2 -2
index 8fc9187..e052093 100644
@@ -729,7 +729,7 @@ config PCIE_ECAM_SIZE
 	  maximum number of PCI buses as defined by the PCI specification.
 
 config I8259_PIC
-	bool
+	bool "Enable Intel 8259 compatible interrupt controller"
 	default y
 	help
 	  Intel 8259 ISA compatible chipset incorporates two 8259 (master and
@@ -737,7 +737,7 @@ config I8259_PIC
 	  the interrupt correctly.
 
 config APIC
-	bool
+	bool "Enable Intel Advanced Programmable Interrupt Controller"
 	default y
 	help
 	  The (A)dvanced (P)rogrammable (I)nterrupt (C)ontroller is responsible
Signature · 1 line
2.7.4
#2 lore raw

PATCH v2 2/2 x86: kconfig: Allow board defconfig file to disable 8259 and APIC

Quoted 5 lines · Bin Meng

At present the Kconfig options (CONFIG_I8259_PIC and CONFIG_APIC) do not include a prompt message, which makes it impossible to be disabled from a board defconfig file.

Quoted 8 lines

---

Changes in v2: None

 arch/x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
author
#3 lore raw

PATCH v2 2/2 x86: kconfig: Allow board defconfig file to disable 8259 and APIC

Quoted 9 lines · Simon Glass
Quoted 7 lines · Bin Meng

At present the Kconfig options (CONFIG_I8259_PIC and CONFIG_APIC) do not include a prompt message, which makes it impossible to be disabled from a board defconfig file.

Quoted 8 lines
Quoted 6 lines

---

Changes in v2: None

 arch/x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied to u-boot-x86, thanks!

#4 lore raw

PATCH v2 1/2 x86: Wrap calls to 8259 with CONFIG_I8259_PIC

In reply to Bin Meng
Quoted 7 lines · Bin Meng

mask_irq(), unmask_irq() and specific_eoi() are provided by the i8259 PIC driver and should be wrapped with CONFIG_I8259_PIC.

Quoted 7 lines

---

Changes in v2:
- use if() instead of #if

 arch/x86/lib/interrupts.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
author
#5 lore raw

PATCH v2 1/2 x86: Wrap calls to 8259 with CONFIG_I8259_PIC

Quoted 11 lines · Simon Glass
Quoted 9 lines · Bin Meng

mask_irq(), unmask_irq() and specific_eoi() are provided by the i8259 PIC driver and should be wrapped with CONFIG_I8259_PIC.

---

Quoted 7 lines
Quoted 5 lines

Changes in v2:
- use if() instead of #if

 arch/x86/lib/interrupts.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

applied to u-boot-x86, thanks!