2005-10-03 18:14:43

by Protasevich, Natalie

Subject: [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(-)

diff -puN arch/i386/mach-es7000/es7000.h~es7000_plat_update arch/i386/mach-es7000/es7000.h
--- linux-2.6.14-rc2-mm2/arch/i386/mach-es7000/es7000.h~es7000_plat_update 2005-10-02 15:06:09.523620888 -0700
+++ linux-2.6.14-rc2-mm2-root/arch/i386/mach-es7000/es7000.h 2005-10-02 15:10:22.708130992 -0700
@@ -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);
diff -puN arch/i386/mach-es7000/es7000plat.c~es7000_plat_update arch/i386/mach-es7000/es7000plat.c
--- linux-2.6.14-rc2-mm2/arch/i386/mach-es7000/es7000plat.c~es7000_plat_update 2005-10-02 15:06:09.558615568 -0700
+++ linux-2.6.14-rc2-mm2-root/arch/i386/mach-es7000/es7000plat.c 2005-10-02 15:11:18.916586008 -0700
@@ -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.
diff -puN include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update include/asm-i386/mach-es7000/mach_mpparse.h
--- linux-2.6.14-rc2-mm2/include/asm-i386/mach-es7000/mach_mpparse.h~es7000_plat_update 2005-10-02 15:06:09.594610096 -0700
+++ linux-2.6.14-rc2-mm2-root/include/asm-i386/mach-es7000/mach_mpparse.h 2005-10-02 15:11:41.029224376 -0700
@@ -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)
_

2005-10-03 18:32:12

by Zwane Mwaikambo

Subject: Re: [patch 1/1] ES7000 platform update (i386)

Hello Natalie,

On Sun, 2 Oct 2005 [email protected] wrote:

> @@ -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

2005-10-03 18:35:14

by Protasevich, Natalie

Subject: RE: [patch 1/1] ES7000 platform update (i386)

> From: Zwane Mwaikambo [mailto:[email protected]]
> Sent: Monday, October 03, 2005 12:38 PM
> To: Protasevich, Natalie
> Cc: [email protected]; [email protected]; [email protected]
> Subject: Re: [patch 1/1] ES7000 platform update (i386)
>
> Hello Natalie,
>
> On Sun, 2 Oct 2005 [email protected] wrote:
>
> > @@ -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
>

Sure, good idea :) I will do that.
Thanks,
--Natalie