* [2.6 PATCH]
@ 2003-09-18 2:32 James Cleverdon
0 siblings, 0 replies; 2+ messages in thread
From: James Cleverdon @ 2003-09-18 2:32 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, Martin J. Bligh
[-- Attachment #1: Type: text/plain, Size: 5122 bytes --]
32-way IBM x445s will have I/O xAPICs with IDs greater than 0xF (0x8 to 0xE
isn't enough). This breaks the code in setup_ioapic_ids_from_mpc. However,
the entire unique ID check is unnecessary. Only I/O APICs using the serial
APIC bus need the unique numbers. Those sending messages through the system
bus simply don't use them.
diff -pru linux-2.6.0-test5/arch/i386/kernel/io_apic.c
u5/arch/i386/kernel/io_apic.c
--- linux-2.6.0-test5/arch/i386/kernel/io_apic.c 2003-09-11 12:08:14.000000000
-0700
+++ u5/arch/i386/kernel/io_apic.c 2003-09-15 18:43:02.000000000 -0700
@@ -1653,6 +1653,10 @@ static void __init setup_ioapic_ids_from
mp_ioapics[apic].mpc_apicid = reg_00.bits.ID;
}
+ /* Don't check I/O APIC IDs for some xAPIC systems. They have
+ * no meaning without the serial APIC bus. */
+ if (NO_IOAPIC_CHECK)
+ continue;
/*
* Sanity check, is the ID really free? Every APIC in a
* system must have a unique ID or we get lots of nice
diff -pru linux-2.6.0-test5/include/asm-i386/genapic.h
u5/include/asm-i386/genapic.h
--- linux-2.6.0-test5/include/asm-i386/genapic.h 2003-09-08 12:50:07.000000000
-0700
+++ u5/include/asm-i386/genapic.h 2003-09-15 18:39:09.000000000 -0700
@@ -30,6 +30,7 @@ struct genapic {
unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
unsigned long (*check_apicid_present)(int apicid);
int no_balance_irq;
+ int no_ioapic_check;
void (*init_apic_ldr)(void);
physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);
@@ -77,6 +78,7 @@ struct genapic {
.int_dest_mode = INT_DEST_MODE, \
.apic_broadcast_id = APIC_BROADCAST_ID, \
.no_balance_irq = NO_BALANCE_IRQ, \
+ .no_ioapic_check = NO_IOAPIC_CHECK, \
APICFUNC(apic_id_registered), \
APICFUNC(target_cpus), \
APICFUNC(check_apicid_used), \
diff -pru linux-2.6.0-test5/include/asm-i386/mach-bigsmp/mach_apic.h
u5/include/asm-i386/mach-bigsmp/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-bigsmp/mach_apic.h 2003-09-08
12:50:29.000000000 -0700
+++ u5/include/asm-i386/mach-bigsmp/mach_apic.h 2003-09-15 18:39:09.000000000
-0700
@@ -14,6 +14,8 @@
#define NO_BALANCE_IRQ (1)
#define esr_disable (1)
+#define NO_IOAPIC_CHECK (0)
+
static inline int apic_id_registered(void)
{
return (1);
diff -pru linux-2.6.0-test5/include/asm-i386/mach-default/mach_apic.h
u5/include/asm-i386/mach-default/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-default/mach_apic.h 2003-09-08
12:50:48.000000000 -0700
+++ u5/include/asm-i386/mach-default/mach_apic.h 2003-09-15 18:39:09.000000000
-0700
@@ -18,6 +18,8 @@ static inline cpumask_t target_cpus(void
#define NO_BALANCE_IRQ (0)
#define esr_disable (0)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
diff -pru linux-2.6.0-test5/include/asm-i386/mach-generic/mach_apic.h
u5/include/asm-i386/mach-generic/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-generic/mach_apic.h 2003-09-08
12:50:01.000000000 -0700
+++ u5/include/asm-i386/mach-generic/mach_apic.h 2003-09-15 18:39:09.000000000
-0700
@@ -5,6 +5,7 @@
#define esr_disable (genapic->esr_disable)
#define NO_BALANCE_IRQ (genapic->no_balance_irq)
+#define NO_IOAPIC_CHECK (genapic->no_ioapic_check)
#define APIC_BROADCAST_ID (genapic->apic_broadcast_id)
#define INT_DELIVERY_MODE (genapic->int_delivery_mode)
#define INT_DEST_MODE (genapic->int_dest_mode)
diff -pru linux-2.6.0-test5/include/asm-i386/mach-numaq/mach_apic.h
u5/include/asm-i386/mach-numaq/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-numaq/mach_apic.h 2003-09-08
12:50:02.000000000 -0700
+++ u5/include/asm-i386/mach-numaq/mach_apic.h 2003-09-15 18:39:09.000000000
-0700
@@ -17,6 +17,8 @@ static inline cpumask_t target_cpus(void
#define NO_BALANCE_IRQ (1)
#define esr_disable (1)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
diff -pru linux-2.6.0-test5/include/asm-i386/mach-summit/mach_apic.h
u5/include/asm-i386/mach-summit/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-summit/mach_apic.h 2003-09-11
16:48:00.000000000 -0700
+++ u5/include/asm-i386/mach-summit/mach_apic.h 2003-09-15 18:40:53.000000000
-0700
@@ -7,6 +7,8 @@
#define esr_disable (1)
#define NO_BALANCE_IRQ (0)
+#define NO_IOAPIC_CHECK (1) /* Don't check I/O APIC ID for xAPIC */
+
/* In clustered mode, the high nibble of APIC ID is a cluster number.
* The low nibble is a 4-bit bitmap. */
#define XAPIC_DEST_CPUS_SHIFT 4
diff -pru linux-2.6.0-test5/include/asm-i386/mach-visws/mach_apic.h
u5/include/asm-i386/mach-visws/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-visws/mach_apic.h 2003-09-08
12:49:51.000000000 -0700
+++ u5/include/asm-i386/mach-visws/mach_apic.h 2003-09-15 18:39:09.000000000
-0700
@@ -8,6 +8,8 @@
#define no_balance_irq (0)
#define esr_disable (0)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
[-- Attachment #2: x445_no_io_xapic_check_2003-09-17_2.6.0-test5 --]
[-- Type: text/x-diff, Size: 4760 bytes --]
diff -pru linux-2.6.0-test5/arch/i386/kernel/io_apic.c u5/arch/i386/kernel/io_apic.c
--- linux-2.6.0-test5/arch/i386/kernel/io_apic.c 2003-09-11 12:08:14.000000000 -0700
+++ u5/arch/i386/kernel/io_apic.c 2003-09-15 18:43:02.000000000 -0700
@@ -1653,6 +1653,10 @@ static void __init setup_ioapic_ids_from
mp_ioapics[apic].mpc_apicid = reg_00.bits.ID;
}
+ /* Don't check I/O APIC IDs for some xAPIC systems. They have
+ * no meaning without the serial APIC bus. */
+ if (NO_IOAPIC_CHECK)
+ continue;
/*
* Sanity check, is the ID really free? Every APIC in a
* system must have a unique ID or we get lots of nice
diff -pru linux-2.6.0-test5/include/asm-i386/genapic.h u5/include/asm-i386/genapic.h
--- linux-2.6.0-test5/include/asm-i386/genapic.h 2003-09-08 12:50:07.000000000 -0700
+++ u5/include/asm-i386/genapic.h 2003-09-15 18:39:09.000000000 -0700
@@ -30,6 +30,7 @@ struct genapic {
unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
unsigned long (*check_apicid_present)(int apicid);
int no_balance_irq;
+ int no_ioapic_check;
void (*init_apic_ldr)(void);
physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);
@@ -77,6 +78,7 @@ struct genapic {
.int_dest_mode = INT_DEST_MODE, \
.apic_broadcast_id = APIC_BROADCAST_ID, \
.no_balance_irq = NO_BALANCE_IRQ, \
+ .no_ioapic_check = NO_IOAPIC_CHECK, \
APICFUNC(apic_id_registered), \
APICFUNC(target_cpus), \
APICFUNC(check_apicid_used), \
diff -pru linux-2.6.0-test5/include/asm-i386/mach-bigsmp/mach_apic.h u5/include/asm-i386/mach-bigsmp/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-bigsmp/mach_apic.h 2003-09-08 12:50:29.000000000 -0700
+++ u5/include/asm-i386/mach-bigsmp/mach_apic.h 2003-09-15 18:39:09.000000000 -0700
@@ -14,6 +14,8 @@
#define NO_BALANCE_IRQ (1)
#define esr_disable (1)
+#define NO_IOAPIC_CHECK (0)
+
static inline int apic_id_registered(void)
{
return (1);
diff -pru linux-2.6.0-test5/include/asm-i386/mach-default/mach_apic.h u5/include/asm-i386/mach-default/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-default/mach_apic.h 2003-09-08 12:50:48.000000000 -0700
+++ u5/include/asm-i386/mach-default/mach_apic.h 2003-09-15 18:39:09.000000000 -0700
@@ -18,6 +18,8 @@ static inline cpumask_t target_cpus(void
#define NO_BALANCE_IRQ (0)
#define esr_disable (0)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
diff -pru linux-2.6.0-test5/include/asm-i386/mach-generic/mach_apic.h u5/include/asm-i386/mach-generic/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-generic/mach_apic.h 2003-09-08 12:50:01.000000000 -0700
+++ u5/include/asm-i386/mach-generic/mach_apic.h 2003-09-15 18:39:09.000000000 -0700
@@ -5,6 +5,7 @@
#define esr_disable (genapic->esr_disable)
#define NO_BALANCE_IRQ (genapic->no_balance_irq)
+#define NO_IOAPIC_CHECK (genapic->no_ioapic_check)
#define APIC_BROADCAST_ID (genapic->apic_broadcast_id)
#define INT_DELIVERY_MODE (genapic->int_delivery_mode)
#define INT_DEST_MODE (genapic->int_dest_mode)
diff -pru linux-2.6.0-test5/include/asm-i386/mach-numaq/mach_apic.h u5/include/asm-i386/mach-numaq/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-numaq/mach_apic.h 2003-09-08 12:50:02.000000000 -0700
+++ u5/include/asm-i386/mach-numaq/mach_apic.h 2003-09-15 18:39:09.000000000 -0700
@@ -17,6 +17,8 @@ static inline cpumask_t target_cpus(void
#define NO_BALANCE_IRQ (1)
#define esr_disable (1)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */
diff -pru linux-2.6.0-test5/include/asm-i386/mach-summit/mach_apic.h u5/include/asm-i386/mach-summit/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-summit/mach_apic.h 2003-09-11 16:48:00.000000000 -0700
+++ u5/include/asm-i386/mach-summit/mach_apic.h 2003-09-15 18:40:53.000000000 -0700
@@ -7,6 +7,8 @@
#define esr_disable (1)
#define NO_BALANCE_IRQ (0)
+#define NO_IOAPIC_CHECK (1) /* Don't check I/O APIC ID for xAPIC */
+
/* In clustered mode, the high nibble of APIC ID is a cluster number.
* The low nibble is a 4-bit bitmap. */
#define XAPIC_DEST_CPUS_SHIFT 4
diff -pru linux-2.6.0-test5/include/asm-i386/mach-visws/mach_apic.h u5/include/asm-i386/mach-visws/mach_apic.h
--- linux-2.6.0-test5/include/asm-i386/mach-visws/mach_apic.h 2003-09-08 12:49:51.000000000 -0700
+++ u5/include/asm-i386/mach-visws/mach_apic.h 2003-09-15 18:39:09.000000000 -0700
@@ -8,6 +8,8 @@
#define no_balance_irq (0)
#define esr_disable (0)
+#define NO_IOAPIC_CHECK (0)
+
#define INT_DELIVERY_MODE dest_LowestPrio
#define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */
^ permalink raw reply [flat|nested] 2+ messages in thread
* [2.6 patch]
@ 2005-07-02 21:48 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2005-07-02 21:48 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel, zippel
This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
I've Cc'ed Roman because I might have missed a more elegant solution.
--- linux-2.6.13-rc1-mm1-full/net/ipv4/Kconfig.old 2005-07-02 20:07:25.000000000 +0200
+++ linux-2.6.13-rc1-mm1-full/net/ipv4/Kconfig 2005-07-02 20:13:05.000000000 +0200
@@ -58,8 +58,9 @@
depends on IP_ADVANCED_ROUTER
default IP_FIB_HASH
-config IP_FIB_HASH
+config ASK_IP_FIB_HASH
bool "FIB_HASH"
+ select IP_FIB_HASH
---help---
Current FIB is very proven and good enough for most users.
@@ -84,12 +85,9 @@
endchoice
-# If the user does not enable advanced routing, he gets the safe
-# default of the fib-hash algorithm.
config IP_FIB_HASH
bool
- depends on !IP_ADVANCED_ROUTER
- default y
+ default y if !IP_ADVANCED_ROUTER
config IP_MULTIPLE_TABLES
bool "IP: policy routing"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-07-02 21:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-07-02 21:48 [2.6 patch] Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2003-09-18 2:32 [2.6 PATCH] James Cleverdon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox