Skip to contentSkip to conversation

Rewrite i386 interrupt handling

PATCH New Graeme Russ 2 participants 2 messages Feb 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 4/7 Rewrite i386 interrupt handling

Rewrite interrupt handling functionality for the i386 port. Separated functionality into separate CPU and Architecture components.

---
It appears as if the i386 interrupt handler functionality was intended to allow multiple handlers to be installed for a given interrupt. Unfortunately, this functionality was not fully implemented and also had the problem that irq_free_handler() does not allow the passing of the handler function pointer and therefore could never be used to free specific handlers that had been installed for a given IRQ.

There were also various issues with array bounds not being fully tested

I had two objectives in mind for the new implementation:
1) Keep the implementation as similar as possible to existing implementations. To that end, I have used the leon2/3 implementations as the reference
2) Seperate CPU and Architecture specific elements. All specific i386 interrupt functionality is now in cpu/i386/ with the high level API and architecture specific code in lib_i386. Functionality specific to the PC/AT architecture (i.e. cascaded i8259 PICs) has been further split out into an individual file to allow for the implementation of the PIC architecture of the SC520 CPU (supports more IRQs)

---
 cpu/i386/Makefile              |    2 
 cpu/i386/cpu.c                 |    4 
 cpu/i386/exceptions.c          |  229 ++++++++++++++++++++++
 cpu/i386/interrupts.c          |  422 ----------------------------------------
 include/asm-i386/interrupt.h   |   48 ++++-
 include/asm-i386/u-boot-i386.h |    6 +
 include/configs/eNET.h         |    4 
 include/configs/sc520_cdp.h    |    2 
 include/configs/sc520_spunk.h  |    2 
 lib_i386/Makefile              |    2 
 lib_i386/interrupts.c          |  159 +++++++++++++++
 lib_i386/pcat_interrupts.c     |  165 ++++++++++++++++
 12 files changed, 623 insertions(+), 422 deletions(-)
 create mode 100644 cpu/i386/exceptions.c
 create mode 100644 lib_i386/interrupts.c
 create mode 100644 lib_i386/pcat_interrupts.c
cpu/i386/Makefile +1 -1
index 761c4f6..f72cd6e 100644
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(CPU).a
 
 START	= start.o start16.o resetvec.o
-COBJS	= serial.o interrupts.o cpu.o timer.o
+COBJS	= serial.o interrupts.o exceptions.o cpu.o timer.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
cpu/i386/cpu.c +4 -0
index b9af5f8..d91e33b 100644
@@ -46,6 +46,10 @@ int cpu_init(void)
 	     "orl  $0x22, %eax\n" \
 	     "movl %eax, %cr0\n" );
 
+	/* Initialize core interrupt and exception functionality of CPU */
+	cpu_init_interrupts ();
+	cpu_init_exceptions ();
+
 	return 0;
 }
 
cpu/i386/exceptions.c new file +229 -0

229 lines not on this page · raw message

cpu/i386/interrupts.c +4 -418

464 lines not on this page · raw message

include/asm-i386/interrupt.h +46 -2

59 lines not on this page · raw message

include/asm-i386/u-boot-i386.h +6 -0
index 12d10a7..9a60cac 100644
@@ -45,6 +45,12 @@ extern ulong i386boot_bios_size;    /* size of BIOS emulation code */
 int cpu_init(void);
 int timer_init(void);
 
+/* cpu/.../interrupts.c */
+int cpu_init_interrupts(void);
+
+/* cpu/.../exceptions.c */
+int cpu_init_exceptions(void);
+
 /* board/.../... */
 int board_init(void);
 int dram_init(void);
include/configs/eNET.h +3 -1
index 2ae79d8..84e1aef 100644
@@ -90,7 +90,7 @@
 #define CONFIG_CMD_RUN		/* run command in env variable	*/
 #define CONFIG_CMD_SETGETDCR	/* DCR support on 4xx		*/
 #define CONFIG_CMD_XIMG		/* Load part of Multi Image	*/
-#undef CONFIG_CMD_IRQ		/* IRQ Information		*/
+#define CONFIG_CMD_IRQ		/* IRQ Information		*/
 
 #define CONFIG_BOOTDELAY		15
 #define CONFIG_BOOTARGS			"root=/dev/mtdblock0 console=ttyS0,9600"
@@ -148,6 +148,8 @@
 #undef  CONFIG_SYS_TSC_TIMER			/* use the Pentium TSC timers */
 #define CONFIG_SYS_USE_SIO_UART		0       /* prefer the uarts on the SIO to those
 					 * in the SC520 on the CDP */
+#define CONFIG_SYS_PCAT_INTERRUPTS
+#define CONFIG_SYS_NUM_IRQS		16
 
 /*-----------------------------------------------------------------------
  * Memory organization
include/configs/sc520_cdp.h +2 -0
index cb0de42..19e5889 100644
@@ -53,6 +53,8 @@
 #undef  CONFIG_SYS_TSC_TIMER                   /* use the Pentium TSC timers */
 #define  CONFIG_SYS_USE_SIO_UART       0       /* prefer the uarts on the SIO to those
 					 * in the SC520 on the CDP */
+#define CONFIG_SYS_PCAT_INTERRUPTS
+#define CONFIG_SYS_NUM_IRQS		16
 
 #define CONFIG_SYS_STACK_SIZE          0x8000  /* Size of bootloader stack */
 
include/configs/sc520_spunk.h +2 -0
index 3e86184..20481bd 100644
@@ -49,6 +49,8 @@
 #undef  CONFIG_SYS_SC520_TIMER                 /* use SC520 swtimers */
 #define CONFIG_SYS_GENERIC_TIMER       1       /* use the i8254 PIT timers */
 #undef  CONFIG_SYS_TSC_TIMER                   /* use the Pentium TSC timers */
+#define CONFIG_SYS_PCAT_INTERRUPTS
+#define CONFIG_SYS_NUM_IRQS		16
 
 #define CONFIG_SYS_STACK_SIZE          0x8000  /* Size of bootloader stack */
 
lib_i386/Makefile +2 -0
index 4fbcd08..fb4184b 100644
@@ -38,6 +38,8 @@ COBJS-y	+= realmode.o
 COBJS-y	+= video_bios.o
 COBJS-y	+= video.o
 COBJS-y	+= zimage.o
+COBJS-y	+= interrupts.o
+COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
 
 SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
lib_i386/interrupts.c new file +159 -0

159 lines not on this page · raw message

lib_i386/pcat_interrupts.c new file +165 -0

165 lines not on this page · raw message

#1 lore raw

PATCH 4/7 Rewrite i386 interrupt handling

Dear Graeme Russ,

Quoted 40 lines · In message <[email protected]> you wrote:

Rewrite interrupt handling functionality for the i386 port. Separated functionality into separate CPU and Architecture components.

---
It appears as if the i386 interrupt handler functionality was intended to allow multiple handlers to be installed for a given interrupt. Unfortunately, this functionality was not fully implemented and also had the problem that irq_free_handler() does not allow the passing of the handler function pointer and therefore could never be used to free specific handlers that had been installed for a given IRQ.

There were also various issues with array bounds not being fully tested

I had two objectives in mind for the new implementation:
1) Keep the implementation as similar as possible to existing implementations. To that end, I have used the leon2/3 implementations as the reference
2) Seperate CPU and Architecture specific elements. All specific i386 interrupt functionality is now in cpu/i386/ with the high level API and architecture specific code in lib_i386. Functionality specific to the PC/AT architecture (i.e. cascaded i8259 PICs) has been further split out into an individual file to allow for the implementation of the PIC architecture of the SC520 CPU (supports more IRQs)
---
cpu/i386/Makefile | 2 =

cpu/i386/cpu.c | 4 =

 cpu/i386/exceptions.c          |  229 ++++++++++++++++++++++
 cpu/i386/interrupts.c          |  422 ------------------------------------=
----
 include/asm-i386/interrupt.h   |   48 ++++-
 include/asm-i386/u-boot-i386.h |    6 +

include/configs/eNET.h | 4 =

include/configs/sc520_cdp.h | 2 =

include/configs/sc520_spunk.h | 2 =

Quoted 8 lines

lib_i386/Makefile | 2 =

 lib_i386/interrupts.c          |  159 +++++++++++++++
 lib_i386/pcat_interrupts.c     |  165 ++++++++++++++++
 12 files changed, 623 insertions(+), 422 deletions(-)
 create mode 100644 cpu/i386/exceptions.c
 create mode 100644 lib_i386/interrupts.c
 create mode 100644 lib_i386/pcat_interrupts.c

Applied to "next" branch. Thanks.

Note that I decided to include your comment into the commit message - I think it is pretty useful to explain the change.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Unix is like a toll road on which you have to stop every 50  feet  to
pay another nickel. But hey! You only feel 5 cents poorer each time.
                 - Larry Wall in <[email protected]>