lkml.org 
[lkml]   [2004]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] 2.6.5- es7000 subarch update
Date
From
Hi Andrew,
I am re-submitting the patch for ES7000. It only contains changes that ES7000 subarch-specific and allow the system to boot.
The IRQ override portion has transformed into a separate patch by Len Brown which corrects the problem properly. Thanks to Len and also to Zwane, and Andrew who helped resolve this issue for systems like ES7000 that rely on this code.

Regards,
--Natalie

-------------------------------------------------------------------------------------------------------------------

diff -Naur linux6.5/arch/i386/mach-es7000/es7000.c linux265/arch/i386/mach-es7000/es7000.c
--- linux6.5/arch/i386/mach-es7000/es7000.c 2004-04-04 18:22:39.000000000 -0400
+++ linux265/arch/i386/mach-es7000/es7000.c 2004-04-14 23:08:42.000000000 -0400
@@ -83,6 +83,7 @@
host = (struct mip_reg *)val;
host_reg = __va(host);
val = MIP_RD_LO(mi->mip_reg);
+ mip_port = MIP_PORT(mi->mip_info);
mip_addr = val;
mip = (struct mip_reg *)val;
mip_reg = __va(mip);
diff -Naur linux6.5/arch/i386/mach-es7000/es7000.h linux265/arch/i386/mach-es7000/es7000.h
--- linux6.5/arch/i386/mach-es7000/es7000.h 2004-04-04 18:22:39.000000000 -0400
+++ linux265/arch/i386/mach-es7000/es7000.h 2004-04-14 23:10:51.000000000 -0400
@@ -30,6 +30,7 @@
#define MIP_BUSY 1
#define MIP_SPIN 0xf0000
#define MIP_VALID 0x0100000000000000
+#define MIP_PORT(VALUE) ((VALUE >> 32) & 0xffff)

#define MIP_RD_LO(VALUE) (VALUE & 0xffffffff)

diff -Naur linux6.5/include/asm-i386/mach-es7000/mach_apic.h linux265/include/asm-i386/mach-es7000/mach_apic.h
--- linux6.5/include/asm-i386/mach-es7000/mach_apic.h 2004-04-04 18:22:46.000000000 -0400
+++ linux265/include/asm-i386/mach-es7000/mach_apic.h 2004-04-14 23:05:24.000000000 -0400
@@ -39,7 +39,7 @@
#endif

#define APIC_BROADCAST_ID (0xff)
-#define NO_IOAPIC_CHECK (0)
+#define NO_IOAPIC_CHECK (1)

static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
{
@@ -169,7 +169,11 @@
num_bits_set = cpus_weight_const(cpumask);
/* Return id to all */
if (num_bits_set == NR_CPUS)
+#if defined CONFIG_ES7000_CLUSTERED_APIC
return 0xFF;
+#else
+ return cpu_to_logical_apicid(0);
+#endif
/*
* The cpus in the mask must all be on the apic cluster. If are not
* on the same apicid cluster return default value of TARGET_CPUS.
@@ -182,7 +186,11 @@
if (apicid_cluster(apicid) !=
apicid_cluster(new_apicid)){
printk ("%s: Not a valid mask!\n",__FUNCTION__);
+#if defined CONFIG_ES7000_CLUSTERED_APIC
return 0xFF;
+#else
+ return cpu_to_logical_apicid(0);
+#endif
}
apicid = new_apicid;
cpus_found++;
----------------------------------------------------------------------------------------------------------------
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:02    [W:0.243 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site