alpha 2.4.11-pre3: fix pc164 srm interrupts
Quoted 1 line
From Jay Estabrook:
(1) The PC164 broken interupt mask hack was only applied to the MILO interrupt handler, and not the SRM interrupt handler.
(2) SRM sometimes mis-identifies a PC164 as an EB164, which results in our interrupt fixes not being installed. Fix this by noticing that an EB164 is never an EV56.
r~
arch/alpha/kernel/setup.c +18 -9
@@ -85,7 +93,7 @@ unsigned char aux_device_present = 0xaa;static struct alpha_machine_vector *get_sysvec (long ,long ,long );static struct alpha_machine_vector *get_sysvec_byname (const char *); -static void get_sysnames (long ,long ,char **,char **); +static void get_sysnames (long ,long ,long ,char **,char **);static char command_line[COMMAND_LINE_SIZE ];char saved_command_line[COMMAND_LINE_SIZE ];
@@ -537,14 +545,14 @@ setup_arch(char **cmdline_p)/* * Indentify and reconfigure for the current system. */ + cpu = (struct percpu_struct *)((char *)hwrpb + hwrpb->processor_offset); +get_sysnames (hwrpb->sys_type, hwrpb->sys_variation, - &type_name, &var_name); + cpu->type, &type_name, &var_name);if (*var_name =='0' ) var_name ="" ;if (!vec) { - cpu = (struct percpu_struct *) - ((char *)hwrpb + hwrpb->processor_offset); vec =get_sysvec (hwrpb->sys_type, hwrpb->sys_variation, cpu->type); }
@@ -801,6 +809,8 @@ get_sysvec(long type, long variation, lo/* Member ID is a bit-field. */ long member = (variation >>10 ) &0x3f ; + cpu &=0xffffffff ;/* make it usable */ +switch (type) {case ST_DEC_ALCOR :if (member <N (alcor_indices))
@@ -809,6 +819,10 @@ get_sysvec(long type, long variation, locase ST_DEC_EB164 :if (member <N (eb164_indices)) vec = eb164_vecs[eb164_indices[member]]; +/* PC164 may show as EB164 variation with EV56 CPU, +but, since no true EB164 had anything but EV5... */ +if (vec == &eb164_mv && cpu ==EV56_CPU ) + vec = &pc164_mv;break ;case ST_DEC_EB64P :if (member <N (eb64p_indices))
@@ -827,21 +841,18 @@ get_sysvec(long type, long variation, lo vec = tsunami_vecs[tsunami_indices[member]];break ;case ST_DEC_1000 : - cpu &=0xffffffff ;if (cpu ==EV5_CPU || cpu ==EV56_CPU ) vec = &mikasa_primo_mv;else vec = &mikasa_mv;break ;case ST_DEC_NORITAKE : - cpu &=0xffffffff ;if (cpu ==EV5_CPU || cpu ==EV56_CPU ) vec = &noritake_primo_mv;else vec = &noritake_mv;break ;case ST_DEC_2100_A500 : - cpu &=0xffffffff ;if (cpu ==EV5_CPU || cpu ==EV56_CPU ) vec = &sable_gamma_mv;else
@@ -905,7 +916,7 @@ get_sysvec_byname(const char *name) }static void -get_sysnames (long type,long variation, +get_sysnames (long type,long variation,long cpu,char **type_name,char **variation_name) {long member;
@@ -938,12 +949,18 @@ get_sysnames(long type, long variation, member = (variation >>10 ) &0x3f ;/* member ID is a bit-field */ + cpu &=0xffffffff ;/* make it usable */ +switch (type) {/* select by family */ default :/* default to variation "0" for now */ break ;case ST_DEC_EB164 :if (member <N (eb164_indices)) *variation_name = eb164_names[eb164_indices[member]]; +/* PC164 may show as EB164 variation, but with EV56 CPU, +so, since no true EB164 had anything but EV5... */ +if (eb164_indices[member] ==0 && cpu ==EV56_CPU ) + *variation_name = eb164_names[1 ];/* make it PC164 */ break ;case ST_DEC_ALCOR :if (member <N (alcor_indices))
@@ -1054,7 +1071,7 @@ int get_cpuinfo(char *buffer) cpu_name = cpu_names[cpu_index];get_sysnames (hwrpb->sys_type, hwrpb->sys_variation, - &systype_name, &sysvariation_name); + cpu->type, &systype_name, &sysvariation_name); nr_processors =get_nr_processors (cpu, hwrpb->nr_processors);
arch/alpha/kernel/sys_cabriolet.c +36 -18
84 lines not on this page · raw message