Use physical addresses at the interface level, letting drivers remap
them as appropriate. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
7d7ee22121
commit
a5fc9c0bbe
@@ -10,31 +10,29 @@
|
||||
* Copyright (c) Harald Koerfgen, 1998
|
||||
* Copyright (c) 2001, 2003, 2005 Maciej W. Rozycki
|
||||
*/
|
||||
#include <linux/string.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/bug.h>
|
||||
#include <asm/errno.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/paccess.h>
|
||||
|
||||
#include <asm/dec/machtype.h>
|
||||
#include <asm/dec/prom.h>
|
||||
#include <asm/dec/tcinfo.h>
|
||||
#include <asm/dec/tcmodule.h>
|
||||
#include <asm/dec/interrupts.h>
|
||||
#include <asm/paccess.h>
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
#define TC_DEBUG
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
slot_info tc_bus[MAX_SLOT];
|
||||
static int num_tcslots;
|
||||
static tcinfo *info;
|
||||
|
||||
unsigned long system_base;
|
||||
|
||||
/*
|
||||
* Interface to the world. Read comment in include/asm-mips/tc.h.
|
||||
*/
|
||||
@@ -97,13 +95,16 @@ unsigned long get_tc_speed(void)
|
||||
static void __init tc_probe(unsigned long startaddr, unsigned long size,
|
||||
int slots)
|
||||
{
|
||||
unsigned long slotaddr;
|
||||
int i, slot, err;
|
||||
long offset;
|
||||
unsigned char pattern[4];
|
||||
unsigned char *module;
|
||||
u8 pattern[4];
|
||||
volatile u8 *module;
|
||||
|
||||
for (slot = 0; slot < slots; slot++) {
|
||||
module = (char *)(startaddr + slot * size);
|
||||
slotaddr = startaddr + slot * size;
|
||||
module = ioremap_nocache(slotaddr, size);
|
||||
BUG_ON(!module);
|
||||
|
||||
offset = OLDCARD;
|
||||
|
||||
@@ -112,8 +113,10 @@ static void __init tc_probe(unsigned long startaddr, unsigned long size,
|
||||
err |= get_dbe(pattern[1], module + OLDCARD + TC_PATTERN1);
|
||||
err |= get_dbe(pattern[2], module + OLDCARD + TC_PATTERN2);
|
||||
err |= get_dbe(pattern[3], module + OLDCARD + TC_PATTERN3);
|
||||
if (err)
|
||||
if (err) {
|
||||
iounmap(module);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (pattern[0] != 0x55 || pattern[1] != 0x00 ||
|
||||
pattern[2] != 0xaa || pattern[3] != 0xff) {
|
||||
@@ -124,16 +127,20 @@ static void __init tc_probe(unsigned long startaddr, unsigned long size,
|
||||
err |= get_dbe(pattern[1], module + TC_PATTERN1);
|
||||
err |= get_dbe(pattern[2], module + TC_PATTERN2);
|
||||
err |= get_dbe(pattern[3], module + TC_PATTERN3);
|
||||
if (err)
|
||||
if (err) {
|
||||
iounmap(module);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (pattern[0] != 0x55 || pattern[1] != 0x00 ||
|
||||
pattern[2] != 0xaa || pattern[3] != 0xff)
|
||||
pattern[2] != 0xaa || pattern[3] != 0xff) {
|
||||
iounmap(module);
|
||||
continue;
|
||||
}
|
||||
|
||||
tc_bus[slot].base_addr = (unsigned long)module;
|
||||
for(i = 0; i < 8; i++) {
|
||||
tc_bus[slot].base_addr = slotaddr;
|
||||
for (i = 0; i < 8; i++) {
|
||||
tc_bus[slot].firmware[i] =
|
||||
module[TC_FIRM_VER + offset + 4 * i];
|
||||
tc_bus[slot].vendor[i] =
|
||||
@@ -171,6 +178,8 @@ static void __init tc_probe(unsigned long startaddr, unsigned long size,
|
||||
tc_bus[slot].interrupt = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
iounmap(module);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -196,8 +205,8 @@ static int __init tc_init(void)
|
||||
tc_bus[i].flags = FREE;
|
||||
}
|
||||
|
||||
info = (tcinfo *) rex_gettcinfo();
|
||||
slot0addr = (unsigned long)CKSEG1ADDR(rex_slot_address(0));
|
||||
info = rex_gettcinfo();
|
||||
slot0addr = CPHYSADDR((long)rex_slot_address(0));
|
||||
|
||||
switch (mips_machtype) {
|
||||
case MACH_DS5000_200:
|
||||
@@ -216,35 +225,21 @@ static int __init tc_init(void)
|
||||
|
||||
tc_clock = 10000 / info->clk_period;
|
||||
|
||||
if (TURBOCHANNEL && info->slot_size && slot0addr) {
|
||||
printk("TURBOchannel rev. %1d at %2d.%1d MHz ", info->revision,
|
||||
tc_clock / 10, tc_clock % 10);
|
||||
printk("(with%s parity)\n", info->parity ? "" : "out");
|
||||
if (info->slot_size && slot0addr) {
|
||||
pr_info("TURBOchannel rev. %d at %d.%d MHz (with%s parity)\n",
|
||||
info->revision, tc_clock / 10, tc_clock % 10,
|
||||
info->parity ? "" : "out");
|
||||
|
||||
slot_size = info->slot_size << 20;
|
||||
|
||||
tc_probe(slot0addr, slot_size, num_tcslots);
|
||||
|
||||
/*
|
||||
* All TURBOchannel DECstations have the onboard devices
|
||||
* where the (num_tcslots + 0 or 1 on DS5k/xx) Option Module
|
||||
* would be.
|
||||
*/
|
||||
if(mips_machtype == MACH_DS5000_XX)
|
||||
i = 1;
|
||||
else
|
||||
i = 0;
|
||||
|
||||
system_base = slot0addr + slot_size * (num_tcslots + i);
|
||||
|
||||
#ifdef TC_DEBUG
|
||||
for (i = 0; i < num_tcslots; i++)
|
||||
if (tc_bus[i].base_addr) {
|
||||
printk(" slot %d: ", i);
|
||||
printk("%s %s %s\n", tc_bus[i].vendor,
|
||||
tc_bus[i].name, tc_bus[i].firmware);
|
||||
}
|
||||
#endif
|
||||
for (i = 0; i < num_tcslots; i++) {
|
||||
if (!tc_bus[i].base_addr)
|
||||
continue;
|
||||
pr_info(" slot %d: %s %s %s\n", i, tc_bus[i].vendor,
|
||||
tc_bus[i].name, tc_bus[i].firmware);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -258,4 +253,3 @@ EXPORT_SYMBOL(release_tc_card);
|
||||
EXPORT_SYMBOL(get_tc_base_addr);
|
||||
EXPORT_SYMBOL(get_tc_irq_nr);
|
||||
EXPORT_SYMBOL(get_tc_speed);
|
||||
EXPORT_SYMBOL(system_base);
|
||||
|
@@ -65,14 +65,14 @@
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/dec/serial.h>
|
||||
|
||||
#ifdef CONFIG_MACH_DECSTATION
|
||||
#include <asm/dec/interrupts.h>
|
||||
#include <asm/dec/machtype.h>
|
||||
#include <asm/dec/tc.h>
|
||||
#include <asm/dec/ioasic_addrs.h>
|
||||
#endif
|
||||
#include <asm/dec/machtype.h>
|
||||
#include <asm/dec/serial.h>
|
||||
#include <asm/dec/system.h>
|
||||
#include <asm/dec/tc.h>
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
#include <asm/kgdb.h>
|
||||
#endif
|
||||
@@ -1616,30 +1616,22 @@ static void __init probe_sccs(void)
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* When serial console is activated, tc_init has not been called yet
|
||||
* and system_base is undefined. Unfortunately we have to hardcode
|
||||
* system_base for this case :-(. HK
|
||||
*/
|
||||
switch(mips_machtype) {
|
||||
#ifdef CONFIG_MACH_DECSTATION
|
||||
case MACH_DS5000_2X0:
|
||||
case MACH_DS5900:
|
||||
system_base = CKSEG1ADDR(0x1f800000);
|
||||
n_chips = 2;
|
||||
zs_parms = &ds_parms;
|
||||
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
|
||||
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
|
||||
break;
|
||||
case MACH_DS5000_1XX:
|
||||
system_base = CKSEG1ADDR(0x1c000000);
|
||||
n_chips = 2;
|
||||
zs_parms = &ds_parms;
|
||||
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
|
||||
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
|
||||
break;
|
||||
case MACH_DS5000_XX:
|
||||
system_base = CKSEG1ADDR(0x1c000000);
|
||||
n_chips = 1;
|
||||
zs_parms = &ds_parms;
|
||||
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
|
||||
@@ -1661,10 +1653,10 @@ static void __init probe_sccs(void)
|
||||
* The sccs reside on the high byte of the 16 bit IOBUS
|
||||
*/
|
||||
zs_channels[n_channels].control =
|
||||
(volatile unsigned char *)system_base +
|
||||
(volatile void *)CKSEG1ADDR(dec_kn_slot_base +
|
||||
(0 == chip ? zs_parms->scc0 : zs_parms->scc1) +
|
||||
(0 == channel ? zs_parms->channel_a_offset :
|
||||
zs_parms->channel_b_offset);
|
||||
zs_parms->channel_b_offset));
|
||||
zs_channels[n_channels].data =
|
||||
zs_channels[n_channels].control + 4;
|
||||
|
||||
|
Reference in New Issue
Block a user