ES7000 platform update (i386)

PATCH In review [email protected] 2 participants 2 messages Oct 3, 2005

Share & tools

[email protected]

author

2005-10-03 18:14 UTC #0 lore raw

PATCH 1/1 ES7000 platform update (i386)

This is platform code update for ES7000:
disables IRQ overrides for the recent ES7000 (Rascal/Zorro), cleans up the compile warning.
The patch only affects the ES7000 subach.

Signed-off-by <[email protected]>

---

 arch/i386/mach-es7000/es7000.h              |    2 +-
 arch/i386/mach-es7000/es7000plat.c          |    5 ++++-
 include/asm-i386/mach-es7000/mach_mpparse.h |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

arch/i386/mach-es7000/es7000.h renamed from arch/i386/mach-es7000/es7000.h~es7000_plat_update +1 -1

diff -puN arch/i386/mach-es7000/es7000.h~es7000_plat_update arch/i386/mach-es7000/es7000.h
@@ -106,6 +106,6 @@ struct mip_reg {
 
 extern int parse_unisys_oem (char *oemptr);
 extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
-extern void setup_unisys ();
+extern void setup_unisys(void);
 extern int es7000_start_cpu(int cpu, unsigned long eip);
 extern void es7000_sw_apic(void);

arch/i386/mach-es7000/es7000plat.c renamed from arch/i386/mach-es7000/es7000plat.c~es7000_plat_update +4 -1

diff -puN arch/i386/mach-es7000/es7000plat.c~es7000_plat_update arch/i386/mach-es7000/es7000plat.c
@@ -62,6 +62,9 @@ static unsigned int base;
 static int
 es7000_rename_gsi(int ioapic, int gsi)
 {
+	if (es7000_plat == 2)
+		return gsi;
+
 	if (!base) {
 		int i;
 		for (i = 0; i < nr_ioapics; i++)

@@ -76,7 +79,7 @@ es7000_rename_gsi(int ioapic, int gsi)
 #endif	/* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
 
 void __init
-setup_unisys ()
+setup_unisys(void)
 {
 	/*
 	 * Determine the generation of the ES7000 currently running.

include/asm-i386/mach-es7000/mach_mpparse.h renamed from include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update +1 -1

diff -puN include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update include/asm-i386/mach-es7000/mach_mpparse.h
@@ -16,7 +16,7 @@ static inline void mpc_oem_pci_bus(struc
 
 extern int parse_unisys_oem (char *oemptr);
 extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
-extern void setup_unisys();
+extern void setup_unisys(void);
 
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
 		char *productid)

Zwane Mwaikambo

2005-10-03 18:32 UTC #1 lore raw

Hello Natalie,

arch/i386/mach-es7000/es7000plat.c static unsigned int base; · line 66

Quoted 6 lines · On Sun, 2 Oct 2005 [email protected] wrote:

arch/i386/mach-es7000/es7000plat.c renamed from arch/i386/mach-es7000/es7000plat.c~es7000_plat_update +2 -0
@@ -62,6 +62,9 @@ static unsigned int base;
 static int
 es7000_rename_gsi(int ioapic, int gsi)
 {
+	if (es7000_plat == 2)
+		return gsi;

Could you #define that number to something so you can immediately tell its Rascal/Zorro?

Thanks,
Zwane