Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / arch / ppc / platforms / prep_setup.c
index 99acd51..e86f615 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  arch/ppc/platforms/setup.c
- *
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
  *  Modified by Cort Dougan (cort@cs.nmt.edu)
 #include <asm/pci-bridge.h>
 #include <asm/todc.h>
 
+/* prep registers for L2 */
+#define CACHECRBA       0x80000823      /* Cache configuration register address */
+#define L2CACHE_MASK   0x03    /* Mask for 2 L2 Cache bits */
+#define L2CACHE_512KB  0x00    /* 512KB */
+#define L2CACHE_256KB  0x01    /* 256KB */
+#define L2CACHE_1MB    0x02    /* 1MB */
+#define L2CACHE_NONE   0x03    /* NONE */
+#define L2CACHE_PARITY  0x08    /* Mask for L2 Cache Parity Protected bit */
+
 TODC_ALLOC();
 
-unsigned char ucSystemType;
 unsigned char ucBoardRev;
 unsigned char ucBoardRevMaj, ucBoardRevMin;
 
@@ -79,6 +85,7 @@ extern void prep_find_bridges(void);
 
 int _prep_type;
 
+extern void prep_residual_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi);
 extern void prep_sandalfoot_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi);
 extern void prep_thinkpad_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi);
 extern void prep_carolina_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi);
@@ -88,9 +95,6 @@ extern void prep_tiger1_setup_pci(char *irq_edge_mask_lo, char *irq_edge_mask_hi
 #define cached_21      (((char *)(ppc_cached_irq_mask))[3])
 #define cached_A1      (((char *)(ppc_cached_irq_mask))[2])
 
-/* for the mac fs */
-dev_t boot_dev;
-
 #ifdef CONFIG_SOUND_CS4232
 long ppc_cs4232_dma, ppc_cs4232_dma2;
 #endif
@@ -172,7 +176,7 @@ prep_carolina_enable_l2(void)
 }
 
 /* cpuinfo code common to all IBM PReP */
-static void __prep
+static void
 prep_ibm_cpuinfo(struct seq_file *m)
 {
        unsigned int equip_reg = inb(PREP_IBM_EQUIPMENT);
@@ -193,9 +197,8 @@ prep_ibm_cpuinfo(struct seq_file *m)
                seq_printf(m, "bad");
        seq_printf(m, "\n");
 
-#ifdef CONFIG_PREP_RESIDUAL
        /* print info about SIMMs */
-       if (res->ResidualLength != 0) {
+       if (have_residual_data) {
                int i;
                seq_printf(m, "simms\t\t: ");
                for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
@@ -207,10 +210,16 @@ prep_ibm_cpuinfo(struct seq_file *m)
                }
                seq_printf(m, "\n");
        }
-#endif
 }
 
-static int __prep
+static int
+prep_gen_cpuinfo(struct seq_file *m)
+{
+       prep_ibm_cpuinfo(m);
+       return 0;
+}
+
+static int
 prep_sandalfoot_cpuinfo(struct seq_file *m)
 {
        unsigned int equip_reg = inb(PREP_IBM_EQUIPMENT);
@@ -237,7 +246,7 @@ prep_sandalfoot_cpuinfo(struct seq_file *m)
        return 0;
 }
 
-static int __prep
+static int
 prep_thinkpad_cpuinfo(struct seq_file *m)
 {
        unsigned int equip_reg = inb(PREP_IBM_EQUIPMENT);
@@ -308,7 +317,7 @@ prep_thinkpad_cpuinfo(struct seq_file *m)
        return 0;
 }
 
-static int __prep
+static int
 prep_carolina_cpuinfo(struct seq_file *m)
 {
        unsigned int equip_reg = inb(PREP_IBM_EQUIPMENT);
@@ -344,7 +353,7 @@ prep_carolina_cpuinfo(struct seq_file *m)
        return 0;
 }
 
-static int __prep
+static int
 prep_tiger1_cpuinfo(struct seq_file *m)
 {
        unsigned int l2_reg = inb(PREP_IBM_L2INFO);
@@ -387,7 +396,7 @@ prep_tiger1_cpuinfo(struct seq_file *m)
 
 
 /* Used by all Motorola PReP */
-static int __prep
+static int
 prep_mot_cpuinfo(struct seq_file *m)
 {
        unsigned int cachew = *((unsigned char *)CACHECRBA);
@@ -431,9 +440,8 @@ prep_mot_cpuinfo(struct seq_file *m)
        }
 
 no_l2:
-#ifdef CONFIG_PREP_RESIDUAL
        /* print info about SIMMs */
-       if (res->ResidualLength != 0) {
+       if (have_residual_data) {
                int i;
                seq_printf(m, "simms\t\t: ");
                for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
@@ -445,18 +453,11 @@ no_l2:
                }
                seq_printf(m, "\n");
        }
-#endif
 
        return 0;
 }
 
-static void __prep
-prep_tiger1_progress(char *msg, unsigned short code)
-{
-       outw(code, PREP_IBM_DISP);
-}
-
-static void __prep
+static void
 prep_restart(char *cmd)
 {
 #define PREP_SP92      0x92    /* Special Port 92 */
@@ -475,7 +476,7 @@ prep_restart(char *cmd)
 #undef PREP_SP92
 }
 
-static void __prep
+static void
 prep_halt(void)
 {
        local_irq_disable(); /* no interrupts */
@@ -490,7 +491,7 @@ prep_halt(void)
 /* Carrera is the power manager in the Thinkpads. Unfortunately not much is
  * known about it, so we can't power down.
  */
-static void __prep
+static void
 prep_carrera_poweroff(void)
 {
        prep_halt();
@@ -503,7 +504,7 @@ prep_carrera_poweroff(void)
  * somewhat in the IBM Carolina Technical Specification.
  * -Hollis
  */
-static void __prep
+static void
 utah_sig87c750_setbit(unsigned int bytenum, unsigned int bitnum, int value)
 {
        /*
@@ -541,7 +542,7 @@ utah_sig87c750_setbit(unsigned int bytenum, unsigned int bitnum, int value)
        udelay(100);                            /* important: let controller recover */
 }
 
-static void __prep
+static void
 prep_sig750_poweroff(void)
 {
        /* tweak the power manager found in most IBM PRePs (except Thinkpads) */
@@ -556,19 +557,17 @@ prep_sig750_poweroff(void)
        /* not reached */
 }
 
-static int __prep
+static int
 prep_show_percpuinfo(struct seq_file *m, int i)
 {
        /* PREP's without residual data will give incorrect values here */
        seq_printf(m, "clock\t\t: ");
-#ifdef CONFIG_PREP_RESIDUAL
-       if (res->ResidualLength)
+       if (have_residual_data)
                seq_printf(m, "%ldMHz\n",
                           (res->VitalProductData.ProcessorHz > 1024) ?
                           res->VitalProductData.ProcessorHz / 1000000 :
                           res->VitalProductData.ProcessorHz);
        else
-#endif /* CONFIG_PREP_RESIDUAL */
                seq_printf(m, "???\n");
 
        return 0;
@@ -598,9 +597,10 @@ static void __init prep_init_sound(void)
         * Get the needed resource informations from residual data.
         *
         */
-#ifdef CONFIG_PREP_RESIDUAL
-       audiodevice = residual_find_device(~0, NULL, MultimediaController,
-                       AudioController, -1, 0);
+       if (have_residual_data)
+               audiodevice = residual_find_device(~0, NULL,
+                               MultimediaController, AudioController, -1, 0);
+
        if (audiodevice != NULL) {
                PnP_TAG_PACKET *pkt;
 
@@ -613,7 +613,6 @@ static void __init prep_init_sound(void)
                if (pkt != NULL)
                        ppc_cs4232_dma2 = masktoint(pkt->S5_Pack.DMAMask);
        }
-#endif
 
        /*
         * These are the PReP specs' defaults for the cs4231.  We use these
@@ -649,13 +648,14 @@ static void __init prep_init_sound(void)
 static void __init
 prep_init_vesa(void)
 {
-#if defined(CONFIG_PREP_RESIDUAL) && \
-       (defined(CONFIG_FB_VGA16) || defined(CONFIG_FB_VGA_16_MODULE) || \
+#if     (defined(CONFIG_FB_VGA16) || defined(CONFIG_FB_VGA16_MODULE) || \
         defined(CONFIG_FB_VESA))
-       PPC_DEVICE *vgadev;
+       PPC_DEVICE *vgadev = NULL;
+
+       if (have_residual_data)
+               vgadev = residual_find_device(~0, NULL, DisplayController,
+                                                       SVGAController, -1, 0);
 
-       vgadev = residual_find_device(~0, NULL, DisplayController, SVGAController,
-                                                                       -1, 0);
        if (vgadev != NULL) {
                PnP_TAG_PACKET *pkt;
 
@@ -680,7 +680,112 @@ prep_init_vesa(void)
                        }
                }
        }
-#endif /* CONFIG_PREP_RESIDUAL */
+#endif
+}
+
+/*
+ * Set DBAT 2 to access 0x80000000 so early progress messages will work
+ */
+static __inline__ void
+prep_set_bat(void)
+{
+       /* wait for all outstanding memory access to complete */
+       mb();
+
+       /* setup DBATs */
+       mtspr(SPRN_DBAT2U, 0x80001ffe);
+       mtspr(SPRN_DBAT2L, 0x8000002a);
+
+       /* wait for updates */
+       mb();
+}
+
+/*
+ * IBM 3-digit status LED
+ */
+static unsigned int ibm_statusled_base;
+
+static void
+ibm_statusled_progress(char *s, unsigned short hex);
+
+static int
+ibm_statusled_panic(struct notifier_block *dummy1, unsigned long dummy2,
+                   void * dummy3)
+{
+       ibm_statusled_progress(NULL, 0x505); /* SOS */
+       return NOTIFY_DONE;
+}
+
+static struct notifier_block ibm_statusled_block = {
+       ibm_statusled_panic,
+       NULL,
+       INT_MAX /* try to do it first */
+};
+
+static void
+ibm_statusled_progress(char *s, unsigned short hex)
+{
+       static int notifier_installed;
+       /*
+        * Progress uses 4 digits and we have only 3.  So, we map 0xffff to
+        * 0xfff for display switch off.  Out of range values are mapped to
+        * 0xeff, as I'm told 0xf00 and above are reserved for hardware codes.
+        * Install the panic notifier when the display is first switched off.
+        */
+       if (hex == 0xffff) {
+               hex = 0xfff;
+               if (!notifier_installed) {
+                       ++notifier_installed;
+                       atomic_notifier_chain_register(&panic_notifier_list,
+                                               &ibm_statusled_block);
+               }
+       }
+       else
+               if (hex > 0xfff)
+                       hex = 0xeff;
+
+       mb();
+       outw(hex, ibm_statusled_base);
+}
+
+static void __init
+ibm_statusled_init(void)
+{
+       /*
+        * The IBM 3-digit LED display is specified in the residual data
+        * as an operator panel device, type "System Status LED".  Find
+        * that device and determine its address.  We validate all the
+        * other parameters on the off-chance another, similar device
+        * exists.
+        */
+       if (have_residual_data) {
+               PPC_DEVICE *led;
+               PnP_TAG_PACKET *pkt;
+
+               led = residual_find_device(~0, NULL, SystemPeripheral,
+                                          OperatorPanel, SystemStatusLED, 0);
+               if (!led)
+                       return;
+
+               pkt = PnP_find_packet((unsigned char *)
+                      &res->DevicePnPHeap[led->AllocatedOffset], S8_Packet, 0);
+               if (!pkt)
+                       return;
+
+               if (pkt->S8_Pack.IOInfo != ISAAddr16bit)
+                       return;
+               if (*(unsigned short *)pkt->S8_Pack.RangeMin !=
+                   *(unsigned short *)pkt->S8_Pack.RangeMax)
+                       return;
+               if (pkt->S8_Pack.IOAlign != 2)
+                       return;
+               if (pkt->S8_Pack.IONum != 2)
+                       return;
+
+               ibm_statusled_base = ld_le16((unsigned short *)
+                                            (pkt->S8_Pack.RangeMin));
+               ppc_md.progress = ibm_statusled_progress;
+       }
 }
 
 static void __init
@@ -706,7 +811,7 @@ prep_setup_arch(void)
        {
        case _PREP_IBM:
                reg = inb(PREP_IBM_PLANAR);
-               printk(KERN_INFO "IBM planar ID: %08x", reg);
+               printk(KERN_INFO "IBM planar ID: %02x", reg);
                switch (reg) {
                        case PREP_IBM_SANDALFOOT:
                                prep_gen_enable_l2();
@@ -721,7 +826,16 @@ prep_setup_arch(void)
                                ppc_md.show_cpuinfo = prep_thinkpad_cpuinfo;
                                break;
                        default:
-                               printk(" -- unknown! Assuming Carolina");
+                               if (have_residual_data) {
+                                       prep_gen_enable_l2();
+                                       setup_ibm_pci = prep_residual_setup_pci;
+                                       ppc_md.power_off = prep_halt;
+                                       ppc_md.show_cpuinfo = prep_gen_cpuinfo;
+                                       break;
+                               }
+                               else
+                                       printk(" - unknown! Assuming Carolina");
+                                       /* fall through */
                        case PREP_IBM_CAROLINA_IDE_0:
                        case PREP_IBM_CAROLINA_IDE_1:
                        case PREP_IBM_CAROLINA_IDE_2:
@@ -745,7 +859,6 @@ prep_setup_arch(void)
                                setup_ibm_pci = prep_tiger1_setup_pci;
                                ppc_md.power_off = prep_sig750_poweroff;
                                ppc_md.show_cpuinfo = prep_tiger1_cpuinfo;
-                               ppc_md.progress = prep_tiger1_progress;
                                break;
                }
                printk("\n");
@@ -808,8 +921,6 @@ prep_setup_arch(void)
        /* vgacon.c needs to know where we mapped IO memory in io_block_mapping() */
        vgacon_remap_base = 0xf0000000;
        conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
-       conswitchp = &dummy_con;
 #endif
 }
 
@@ -821,38 +932,25 @@ prep_setup_arch(void)
 static void __init
 prep_calibrate_decr(void)
 {
-#ifdef CONFIG_PREP_RESIDUAL
-       unsigned long freq, divisor = 4;
-
-       if ( res->VitalProductData.ProcessorBusHz ) {
-               freq = res->VitalProductData.ProcessorBusHz;
-               printk("time_init: decrementer frequency = %lu.%.6lu MHz\n",
-                               (freq/divisor)/1000000,
-                               (freq/divisor)%1000000);
-               tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000);
-               tb_ticks_per_jiffy = freq / HZ / divisor;
-       } else
-#endif
-               todc_calibrate_decr();
-}
-
-static unsigned int __prep
-prep_irq_canonicalize(u_int irq)
-{
-       if (irq == 2)
-       {
-               return 9;
+       if (have_residual_data) {
+               unsigned long freq, divisor = 4;
+
+               if ( res->VitalProductData.ProcessorBusHz ) {
+                       freq = res->VitalProductData.ProcessorBusHz;
+                       printk("time_init: decrementer frequency = %lu.%.6lu MHz\n",
+                                       (freq/divisor)/1000000,
+                                       (freq/divisor)%1000000);
+                       tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000);
+                       tb_ticks_per_jiffy = freq / HZ / divisor;
+               }
        }
        else
-       {
-               return irq;
-       }
+               todc_calibrate_decr();
 }
 
 static void __init
 prep_init_IRQ(void)
 {
-       int i;
        unsigned int pci_viddid, pci_did;
 
        if (OpenPIC_Addr != NULL) {
@@ -861,8 +959,12 @@ prep_init_IRQ(void)
                openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
                                       i8259_irq);
        }
-       for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
-               irq_desc[i].handler = &i8259_pic;
+
+       if (have_residual_data) {
+               i8259_init(residual_isapic_addr(), 0);
+               return;
+       }
+
        /* If we have a Raven PCI bridge or a Hawk PCI bridge / Memory
         * controller, we poll (as they have a different int-ack address). */
        early_read_config_dword(NULL, 0, 0, PCI_VENDOR_ID, &pci_viddid);
@@ -870,18 +972,18 @@ prep_init_IRQ(void)
        if (((pci_viddid & 0xffff) == PCI_VENDOR_ID_MOTOROLA)
                        && ((pci_did == PCI_DEVICE_ID_MOTOROLA_RAVEN)
                                || (pci_did == PCI_DEVICE_ID_MOTOROLA_HAWK)))
-               i8259_init(0);
+               i8259_init(0, 0);
        else
                /* PCI interrupt ack address given in section 6.1.8 of the
                 * PReP specification. */
-               i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);
+               i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR, 0);
 }
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 /*
  * IDE stuff.
  */
-static int __prep
+static int
 prep_ide_default_irq(unsigned long base)
 {
        switch (base) {
@@ -895,7 +997,7 @@ prep_ide_default_irq(unsigned long base)
        }
 }
 
-static unsigned long __prep
+static unsigned long
 prep_ide_default_io_base(int index)
 {
        switch (index) {
@@ -940,7 +1042,7 @@ smp_prep_setup_cpu(int cpu_nr)
                do_openpic_setup_cpu();
 }
 
-static struct smp_ops_t prep_smp_ops __prepdata = {
+static struct smp_ops_t prep_smp_ops = {
        smp_openpic_message_pass,
        smp_prep_probe,
        smp_prep_kick_cpu,
@@ -965,15 +1067,13 @@ prep_map_io(void)
 static int __init
 prep_request_io(void)
 {
-       if (_machine == _MACH_prep) {
 #ifdef CONFIG_NVRAM
-               request_region(PREP_NVRAM_AS0, 0x8, "nvram");
+       request_region(PREP_NVRAM_AS0, 0x8, "nvram");
 #endif
-               request_region(0x00,0x20,"dma1");
-               request_region(0x40,0x20,"timer");
-               request_region(0x80,0x10,"dma page reg");
-               request_region(0xc0,0x20,"dma2");
-       }
+       request_region(0x00,0x20,"dma1");
+       request_region(0x40,0x20,"timer");
+       request_region(0x80,0x10,"dma page reg");
+       request_region(0xc0,0x20,"dma2");
 
        return 0;
 }
@@ -998,28 +1098,39 @@ prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
        ISA_DMA_THRESHOLD = 0x00ffffff;
        DMA_MODE_READ = 0x44;
        DMA_MODE_WRITE = 0x48;
+       ppc_do_canonicalize_irqs = 1;
 
        /* figure out what kind of prep workstation we are */
-#ifdef CONFIG_PREP_RESIDUAL
-       if ( res->ResidualLength != 0 ) {
+       if (have_residual_data) {
                if ( !strncmp(res->VitalProductData.PrintableModel,"IBM",3) )
                        _prep_type = _PREP_IBM;
                else
                        _prep_type = _PREP_Motorola;
-       } else /* assume motorola if no residual (netboot?) */
-#endif
-       {
+       }
+       else {
+               /* assume motorola if no residual (netboot?) */
                _prep_type = _PREP_Motorola;
        }
 
+#ifdef CONFIG_PREP_RESIDUAL
+       /* Switch off all residual data processing if the user requests it */
+       if (strstr(cmd_line, "noresidual") != NULL)
+                       res = NULL;
+#endif
+
+       /* Initialise progress early to get maximum benefit */
+       prep_set_bat();
+       ibm_statusled_init();
+
        ppc_md.setup_arch     = prep_setup_arch;
        ppc_md.show_percpuinfo = prep_show_percpuinfo;
        ppc_md.show_cpuinfo   = NULL; /* set in prep_setup_arch() */
-       ppc_md.irq_canonicalize = prep_irq_canonicalize;
        ppc_md.init_IRQ       = prep_init_IRQ;
        /* this gets changed later on if we have an OpenPIC -- Cort */
        ppc_md.get_irq        = i8259_irq;
 
+       ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
+
        ppc_md.restart        = prep_restart;
        ppc_md.power_off      = NULL; /* set in prep_setup_arch() */
        ppc_md.halt           = prep_halt;
@@ -1050,6 +1161,6 @@ prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #endif
 
 #ifdef CONFIG_SMP
-       ppc_md.smp_ops           = &prep_smp_ops;
+       smp_ops                  = &prep_smp_ops;
 #endif /* CONFIG_SMP */
 }