Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
c502825f
Commit
c502825f
authored
Nov 30, 2004
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
e0e0b649
3ec98b4c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
10 deletions
+11
-10
arch/i386/kernel/io_apic.c
arch/i386/kernel/io_apic.c
+6
-3
arch/i386/kernel/mpparse.c
arch/i386/kernel/mpparse.c
+2
-4
arch/i386/mach-es7000/es7000plat.c
arch/i386/mach-es7000/es7000plat.c
+1
-1
include/asm-i386/acpi.h
include/asm-i386/acpi.h
+0
-2
include/asm-i386/io_apic.h
include/asm-i386/io_apic.h
+2
-0
No files found.
arch/i386/kernel/io_apic.c
View file @
c502825f
...
...
@@ -42,6 +42,7 @@
#include "io_ports.h"
int
(
*
ioapic_renumber_irq
)(
int
ioapic
,
int
irq
);
atomic_t
irq_mis_count
;
static
spinlock_t
ioapic_lock
=
SPIN_LOCK_UNLOCKED
;
...
...
@@ -1069,11 +1070,13 @@ static int pin_2_irq(int idx, int apic, int pin)
while
(
i
<
apic
)
irq
+=
nr_ioapic_registers
[
i
++
];
irq
+=
pin
;
/*
* For MPS mode, so far only
us
ed by ES7000 platform
* For MPS mode, so far only
need
ed by ES7000 platform
*/
if
(
platform_rename_gsi
)
irq
=
platform_rename_gsi
(
apic
,
irq
);
if
(
ioapic_renumber_irq
)
irq
=
ioapic_renumber_irq
(
apic
,
irq
);
break
;
}
default:
...
...
arch/i386/kernel/mpparse.c
View file @
c502825f
...
...
@@ -808,8 +808,6 @@ void __init find_smp_config (void)
smp_scan_config
(
address
,
0x400
);
}
int
(
*
platform_rename_gsi
)(
int
ioapic
,
int
gsi
);
/* --------------------------------------------------------------------------
ACPI-based MP Configuration
-------------------------------------------------------------------------- */
...
...
@@ -1076,8 +1074,8 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
ioapic_pin
=
gsi
-
mp_ioapic_routing
[
ioapic
].
gsi_base
;
if
(
platform_rename_gsi
)
gsi
=
platform_rename_gsi
(
ioapic
,
gsi
);
if
(
ioapic_renumber_irq
)
gsi
=
ioapic_renumber_irq
(
ioapic
,
gsi
);
/*
* Avoid pin reprogramming. PRTs typically include entries
...
...
arch/i386/mach-es7000/es7000plat.c
View file @
c502825f
...
...
@@ -139,7 +139,7 @@ parse_unisys_oem (char *oemptr, int oem_entries)
}
else
{
printk
(
"
\n
Enabling ES7000 specific features...
\n
"
);
es7000_plat
=
1
;
platform_rename_gsi
=
es7000_rename_gsi
;
ioapic_renumber_irq
=
es7000_rename_gsi
;
}
return
es7000_plat
;
}
...
...
include/asm-i386/acpi.h
View file @
c502825f
...
...
@@ -162,8 +162,6 @@ static inline void check_acpi_pci(void) { }
#endif
extern
int
(
*
platform_rename_gsi
)(
int
ioapic
,
int
gsi
);
#ifdef CONFIG_ACPI_PCI
static
inline
void
acpi_noirq_set
(
void
)
{
acpi_noirq
=
1
;
}
static
inline
void
acpi_disable_pci
(
void
)
...
...
include/asm-i386/io_apic.h
View file @
c502825f
...
...
@@ -202,6 +202,8 @@ extern int io_apic_get_redir_entries (int ioapic);
extern
int
io_apic_set_pci_routing
(
int
ioapic
,
int
pin
,
int
irq
,
int
edge_level
,
int
active_high_low
);
#endif
/*CONFIG_ACPI_BOOT*/
extern
int
(
*
ioapic_renumber_irq
)(
int
ioapic
,
int
irq
);
#else
/* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment