projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
x86
/
lib
/
interrupts.c
diff --git
a/arch/x86/lib/interrupts.c
b/arch/x86/lib/interrupts.c
index 6bb22d25e8d8edd69f880abb2469ed6b6232e750..a81e4291105ec583279bb5908e97395ca685fbf0 100644
(file)
--- a/
arch/x86/lib/interrupts.c
+++ b/
arch/x86/lib/interrupts.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2009
* Graeme Russ, <graeme.russ@gmail.com>
/*
* (C) Copyright 2009
* Graeme Russ, <graeme.russ@gmail.com>
@@
-16,8
+17,6
@@
*
* (C) Copyright 2001
* Josh Huber, Mission Critical Linux, Inc, <huber@mclx.com>
*
* (C) Copyright 2001
* Josh Huber, Mission Critical Linux, Inc, <huber@mclx.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-31,15
+30,19
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <command.h>
+#include <irq_func.h>
#include <asm/interrupt.h>
#include <asm/interrupt.h>
+#if !CONFIG_IS_ENABLED(X86_64)
+
struct irq_action {
interrupt_handler_t *handler;
void *arg;
unsigned int count;
};
struct irq_action {
interrupt_handler_t *handler;
void *arg;
unsigned int count;
};
-static struct irq_action irq_handlers[
CONFIG_
SYS_NUM_IRQS] = { {0} };
+static struct irq_action irq_handlers[SYS_NUM_IRQS] = { {0} };
static int spurious_irq_cnt;
static int spurious_irq;
static int spurious_irq_cnt;
static int spurious_irq;
@@
-47,7
+50,7
@@
void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
{
int status;
{
int status;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("irq_install_handler: bad irq number %d\n", irq);
return;
}
printf("irq_install_handler: bad irq number %d\n", irq);
return;
}
@@
-63,7
+66,8
@@
void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
irq_handlers[irq].arg = arg;
irq_handlers[irq].count = 0;
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();
if (status)
enable_interrupts();
@@
-75,14
+79,15
@@
void irq_free_handler(int irq)
{
int status;
{
int status;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("irq_free_handler: bad irq number %d\n", irq);
return;
}
status = disable_interrupts();
printf("irq_free_handler: bad irq number %d\n", irq);
return;
}
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;
irq_handlers[irq].handler = NULL;
irq_handlers[irq].arg = NULL;
@@
-97,20
+102,22
@@
void do_irq(int hw_irq)
{
int irq = hw_irq - 0x20;
{
int irq = hw_irq - 0x20;
- if (irq < 0 || irq >=
CONFIG_
SYS_NUM_IRQS) {
+ if (irq < 0 || irq >= SYS_NUM_IRQS) {
printf("do_irq: bad irq number %d\n", irq);
return;
}
if (irq_handlers[irq].handler) {
printf("do_irq: bad irq number %d\n", irq);
return;
}
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++;
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++;
} else {
if ((irq & 7) != 7) {
spurious_irq_cnt++;
@@
-118,10
+125,12
@@
void do_irq(int hw_irq)
}
}
}
}
}
}
+#endif
#if defined(CONFIG_CMD_IRQ)
#if defined(CONFIG_CMD_IRQ)
-int do_irqinfo(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+int do_irqinfo(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
{
+#if !CONFIG_IS_ENABLED(X86_64)
int irq;
printf("Spurious IRQ: %u, last unknown IRQ: %d\n",
int irq;
printf("Spurious IRQ: %u, last unknown IRQ: %d\n",
@@
-130,7
+139,7
@@
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf("Interrupt-Information:\n");
printf("Nr Routine Arg Count\n");
printf("Interrupt-Information:\n");
printf("Nr Routine Arg Count\n");
- for (irq = 0; irq <
= CONFIG_
SYS_NUM_IRQS; irq++) {
+ for (irq = 0; irq <
SYS_NUM_IRQS; irq++) {
if (irq_handlers[irq].handler != NULL) {
printf("%02d %08lx %08lx %d\n",
irq,
if (irq_handlers[irq].handler != NULL) {
printf("%02d %08lx %08lx %d\n",
irq,
@@
-139,6
+148,7
@@
int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
irq_handlers[irq].count);
}
}
irq_handlers[irq].count);
}
}
+#endif
return 0;
}
return 0;
}