Skip to content

L
linux-davinci
Commit 78a768b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix 5329 ColdFire periphal addressing
  uclinux: add process name to allocation error message
  m68knommu: correct the mii calculations for 532x ColdFire FEC
  m68knommu: add ColdFire M532x to the FEC configuration options
  m68knommu: fix syscall restarting
  m68knommu: remove the obsolete and long unused comempci chip support
  m68knommu: remove the no longer used PCI support option
  m68knommu: remove obsolete and unused eLIA board
  m68knommu: set NO_DMA
  m68knommu: fix cache flushing for the 527x ColdFire processors
  m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
  m68knommu: use one exist from execption
parents d8204ee2 add8240e
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 1035 deletions
arch/m68k/include/asm/cacheflush_no.h
View file @ 78a768b6
...@@ -51,13 +51,20 @@ static inline void __flush_cache_all(void) ...@@ -51,13 +51,20 @@ static inline void __flush_cache_all(void)
"movec %%d0,%%CACR\n\t" "movec %%d0,%%CACR\n\t"
: : : "d0", "a0" ); : : : "d0", "a0" );
#endif /* CONFIG_M5407 */ #endif /* CONFIG_M5407 */
#if defined(CONFIG_M527x) || defined(CONFIG_M528x) #if defined(CONFIG_M523x) || defined(CONFIG_M527x)
__asm__ __volatile__ (
"movel #0x81400100, %%d0\n\t"
"movec %%d0, %%CACR\n\t"
"nop\n\t"
: : : "d0" );
#endif /* CONFIG_M523x || CONFIG_M527x */
#if defined(CONFIG_M528x)
__asm__ __volatile__ ( __asm__ __volatile__ (
"movel #0x81000200, %%d0\n\t" "movel #0x81000200, %%d0\n\t"
"movec %%d0, %%CACR\n\t" "movec %%d0, %%CACR\n\t"
"nop\n\t" "nop\n\t"
: : : "d0" ); : : : "d0" );
#endif /* CONFIG_M527x || CONFIG_M528x */ #endif /* CONFIG_M528x */
#if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272) #if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)
__asm__ __volatile__ ( __asm__ __volatile__ (
"movel #0x81000100, %%d0\n\t" "movel #0x81000100, %%d0\n\t"
......
arch/m68k/include/asm/dma-mapping_no.h
View file @ 78a768b6
#ifndef _M68KNOMMU_DMA_MAPPING_H #ifndef _M68KNOMMU_DMA_MAPPING_H
#define _M68KNOMMU_DMA_MAPPING_H #define _M68KNOMMU_DMA_MAPPING_H
#ifdef CONFIG_PCI
#include <asm-generic/dma-mapping.h>
#else
#include <asm-generic/dma-mapping-broken.h> #include <asm-generic/dma-mapping-broken.h>
#endif
#endif /* _M68KNOMMU_DMA_MAPPING_H */ #endif /* _M68KNOMMU_DMA_MAPPING_H */
arch/m68k/include/asm/system_no.h
View file @ 78a768b6
...@@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz ...@@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
jmp 0xf0000400; \ jmp 0xf0000400; \
"); \ "); \
}) })
#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ #elif defined(CONFIG_NETtel) || \
defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
#define HARD_RESET_NOW() ({ \ #define HARD_RESET_NOW() ({ \
asm(" \ asm(" \
......
arch/m68knommu/Kconfig
View file @ 78a768b6
...@@ -14,6 +14,10 @@ config MMU ...@@ -14,6 +14,10 @@ config MMU
bool bool
default n default n
config NO_DMA
bool
default y
config FPU config FPU
bool bool
default n default n
...@@ -398,12 +402,6 @@ config M5307C3 ...@@ -398,12 +402,6 @@ config M5307C3
help help
Support for the Motorola M5307C3 board. Support for the Motorola M5307C3 board.
config eLIA
bool "Moreton Bay eLIA board support"
depends on M5307
help
Support for the Moreton Bay eLIA board.
config SECUREEDGEMP3 config SECUREEDGEMP3
bool "SnapGear SecureEdge/MP3 platform support" bool "SnapGear SecureEdge/MP3 platform support"
depends on M5307 depends on M5307
...@@ -697,25 +695,8 @@ config ISA_DMA_API ...@@ -697,25 +695,8 @@ config ISA_DMA_API
depends on !M5272 depends on !M5272
default y default y
menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
config PCI
bool "PCI support"
help
Support for PCI bus.
config COMEMPCI
bool "CO-MEM lite PCI controller support"
depends on (M5307 || M5407)
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
source "drivers/pci/hotplug/Kconfig"
endmenu
menu "Executable file formats" menu "Executable file formats"
source "fs/Kconfig.binfmt" source "fs/Kconfig.binfmt"
......
arch/m68knommu/Makefile
View file @ 78a768b6
...@@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB ...@@ -41,7 +41,6 @@ board-$(CONFIG_M5271EVB) := M5271EVB
board-$(CONFIG_M5275EVB) := M5275EVB board-$(CONFIG_M5275EVB) := M5275EVB
board-$(CONFIG_M5282EVB) := M5282EVB board-$(CONFIG_M5282EVB) := M5282EVB
board-$(CONFIG_ELITE) := eLITE board-$(CONFIG_ELITE) := eLITE
board-$(CONFIG_eLIA) := eLIA
board-$(CONFIG_NETtel) := NETtel board-$(CONFIG_NETtel) := NETtel
board-$(CONFIG_SECUREEDGEMP3) := MP3 board-$(CONFIG_SECUREEDGEMP3) := MP3
board-$(CONFIG_CLEOPATRA) := CLEOPATRA board-$(CONFIG_CLEOPATRA) := CLEOPATRA
......
arch/m68knommu/kernel/Makefile
View file @ 78a768b6
...@@ -8,4 +8,3 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \ ...@@ -8,4 +8,3 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \
setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_COMEMPCI) += comempci.o
arch/m68knommu/kernel/comempci.c deleted 100644 → 0
View file @ d8204ee2
/*****************************************************************************/
/*
* comemlite.c -- PCI access code for embedded CO-MEM Lite PCI controller.
*
* (C) Copyright 1999-2003, Greg Ungerer (gerg@snapgear.com).
* (C) Copyright 2000, Lineo (www.lineo.com)
*/
/*****************************************************************************/
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/ptrace.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <asm/coldfire.h>
#include <asm/mcfsim.h>
#include <asm/irq.h>
#include <asm/anchor.h>
#ifdef CONFIG_eLIA
#include <asm/elia.h>
#endif
/*****************************************************************************/
/*
* Debug configuration defines. DEBUGRES sets debugging output for
* the resource allocation phase. DEBUGPCI traces on pcibios_ function
* calls, and DEBUGIO traces all accesses to devices on the PCI bus.
*/
/*#define DEBUGRES 1*/
/*#define DEBUGPCI 1*/
/*#define DEBUGIO 1*/
/*****************************************************************************/
/*
* PCI markers for bus present and active slots.
*/
int pci_bus_is_present = 0;
unsigned long pci_slotmask = 0;
/*
* We may or may not need to swap the bytes of PCI bus tranfers.
* The endianess is re-roder automatically by the CO-MEM, but it
* will get the wrong byte order for a pure data stream.
*/
#define pci_byteswap 0
/*
* Resource tracking. The CO-MEM part creates a virtual address
* space that all the PCI devices live in - it is not in any way
* directly mapped into the ColdFire address space. So we can
* really assign any resources we like to devices, as long as
* they do not clash with other PCI devices.
*/
unsigned int pci_iobase = PCIBIOS_MIN_IO; /* Arbitrary start address */
unsigned int pci_membase = PCIBIOS_MIN_MEM; /* Arbitrary start address */
#define PCI_MINIO 0x100 /* 256 byte minimum I/O */
#define PCI_MINMEM 0x00010000 /* 64k minimum chunk */
/*
* The CO-MEM's shared memory segment is visible inside the PCI
* memory address space. We need to keep track of the address that
* this is mapped at, to setup the bus masters pointers.
*/
unsigned int pci_shmemaddr;
/*****************************************************************************/
void pci_interrupt(int irq, void *id, struct pt_regs *fp);
/*****************************************************************************/
/*
* Some platforms have custom ways of reseting the PCI bus.
*/
void pci_resetbus(void)
{
#ifdef CONFIG_eLIA
int i;
#ifdef DEBUGPCI
printk(KERN_DEBUG "pci_resetbus()\n");
#endif
*((volatile unsigned short *) (MCF_MBAR+MCFSIM_PADDR)) |= eLIA_PCIRESET;
for (i = 0; (i < 1000); i++) {
*((volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT)) =
(ppdata | eLIA_PCIRESET);
}
*((volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT)) = ppdata;
#endif
}
/*****************************************************************************/
int pcibios_assign_resource_slot(int slot)
{
volatile unsigned long *rp;
volatile unsigned char *ip;
unsigned int idsel, addr, val, align, i;
int bar;
#ifdef DEBUGPCI
printk(KERN_INFO "pcibios_assign_resource_slot(slot=%x)\n", slot);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
idsel = COMEM_DA_ADDR(0x1 << (slot + 16));
/* Try to assign resource to each BAR */
for (bar = 0; (bar < 6); bar++) {
addr = COMEM_PCIBUS + PCI_BASE_ADDRESS_0 + (bar * 4);
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
val = rp[LREG(addr)];
#ifdef DEBUGRES
printk(KERN_DEBUG "-----------------------------------"
"-------------------------------------\n");
printk(KERN_DEBUG "BAR[%d]: read=%08x ", bar, val);
#endif
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
rp[LREG(addr)] = 0xffffffff;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
val = rp[LREG(addr)];
#ifdef DEBUGRES
printk(KERN_DEBUG "write=%08x ", val);
#endif
if (val == 0) {
#ifdef DEBUGRES
printk(KERN_DEBUG "\n");
#endif
continue;
}
/* Determine space required by BAR */
/* FIXME: this should go backwords from 0x80000000... */
for (i = 0; (i < 32); i++) {
if ((0x1 << i) & (val & 0xfffffffc))
break;
}
#ifdef DEBUGRES
printk(KERN_DEBUG "size=%08x(%d)\n", (0x1 << i), i);
#endif
i = 0x1 << i;
/* Assign a resource */
if (val & PCI_BASE_ADDRESS_SPACE_IO) {
if (i < PCI_MINIO)
i = PCI_MINIO;
#ifdef DEBUGRES
printk(KERN_DEBUG "BAR[%d]: IO size=%08x iobase=%08x\n",
bar, i, pci_iobase);
#endif
if (i > 0xffff) {
/* Invalid size?? */
val = 0 | PCI_BASE_ADDRESS_SPACE_IO;
#ifdef DEBUGRES
printk(KERN_DEBUG "BAR[%d]: too big for IO??\n", bar);
#endif
} else {
/* Check for un-alignment */
if ((align = pci_iobase % i))
pci_iobase += (i - align);
val = pci_iobase | PCI_BASE_ADDRESS_SPACE_IO;
pci_iobase += i;
}
} else {
if (i < PCI_MINMEM)
i = PCI_MINMEM;
#ifdef DEBUGRES
printk(KERN_DEBUG "BAR[%d]: MEMORY size=%08x membase=%08x\n",
bar, i, pci_membase);
#endif
/* Check for un-alignment */
if ((align = pci_membase % i))
pci_membase += (i - align);
val = pci_membase | PCI_BASE_ADDRESS_SPACE_MEMORY;
pci_membase += i;
}
/* Write resource back into BAR register */
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
rp[LREG(addr)] = val;
#ifdef DEBUGRES
printk(KERN_DEBUG "BAR[%d]: assigned bar=%08x\n", bar, val);
#endif
}
#ifdef DEBUGRES
printk(KERN_DEBUG "-----------------------------------"
"-------------------------------------\n");
#endif
/* Assign IRQ if one is wanted... */
ip = (volatile unsigned char *) (COMEM_BASE + COMEM_PCIBUS);
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
addr = (PCI_INTERRUPT_PIN & 0xfc) + (~PCI_INTERRUPT_PIN & 0x03);
if (ip[addr]) {
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
addr = (PCI_INTERRUPT_LINE & 0xfc)+(~PCI_INTERRUPT_LINE & 0x03);
ip[addr] = 25;
#ifdef DEBUGRES
printk(KERN_DEBUG "IRQ LINE=25\n");
#endif
}
return(0);
}
/*****************************************************************************/
int pcibios_enable_slot(int slot)
{
volatile unsigned long *rp;
volatile unsigned short *wp;
unsigned int idsel, addr;
unsigned short cmd;
#ifdef DEBUGPCI
printk(KERN_DEBUG "pcibios_enbale_slot(slot=%x)\n", slot);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
wp = (volatile unsigned short *) COMEM_BASE;
idsel = COMEM_DA_ADDR(0x1 << (slot + 16));
/* Get current command settings */
addr = COMEM_PCIBUS + PCI_COMMAND;
addr = (addr & ~0x3) + (~addr & 0x02);
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGRD | idsel;
cmd = wp[WREG(addr)];
/*val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);*/
/* Enable I/O and memory accesses to this device */
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_CFGWR | idsel;
cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
wp[WREG(addr)] = cmd;
return(0);
}
/*****************************************************************************/
void pcibios_assign_resources(void)
{
volatile unsigned long *rp;
unsigned long sel, id;
int slot;
rp = (volatile unsigned long *) COMEM_BASE;
/*
* Do a quick scan of the PCI bus and see what is here.
*/
for (slot = COMEM_MINDEV; (slot <= COMEM_MAXDEV); slot++) {
sel = COMEM_DA_CFGRD | COMEM_DA_ADDR(0x1 << (slot + 16));
rp[LREG(COMEM_DAHBASE)] = sel;
rp[LREG(COMEM_PCIBUS)] = 0; /* Clear bus */
id = rp[LREG(COMEM_PCIBUS)];
if ((id != 0) && ((id & 0xffff0000) != (sel & 0xffff0000))) {
printk(KERN_INFO "PCI: slot=%d id=%08x\n", slot, (int) id);
pci_slotmask |= 0x1 << slot;
pcibios_assign_resource_slot(slot);
pcibios_enable_slot(slot);
}
}
}
/*****************************************************************************/
int pcibios_init(void)
{
volatile unsigned long *rp;
unsigned long sel, id;
int slot;
#ifdef DEBUGPCI
printk(KERN_DEBUG "pcibios_init()\n");
#endif
pci_resetbus();
/*
* Do some sort of basic check to see if the CO-MEM part
* is present... This works ok, but I think we really need
* something better...
*/
rp = (volatile unsigned long *) COMEM_BASE;
if ((rp[LREG(COMEM_LBUSCFG)] & 0xff) != 0x50) {
printk(KERN_INFO "PCI: no PCI bus present\n");
return(0);
}
#ifdef COMEM_BRIDGEDEV
/*
* Setup the PCI bridge device first. It needs resources too,
* so that bus masters can get to its shared memory.
*/
slot = COMEM_BRIDGEDEV;
sel = COMEM_DA_CFGRD | COMEM_DA_ADDR(0x1 << (slot + 16));
rp[LREG(COMEM_DAHBASE)] = sel;
rp[LREG(COMEM_PCIBUS)] = 0; /* Clear bus */
id = rp[LREG(COMEM_PCIBUS)];
if ((id == 0) || ((id & 0xffff0000) == (sel & 0xffff0000))) {
printk(KERN_INFO "PCI: no PCI bus bridge present\n");
return(0);
}
printk(KERN_INFO "PCI: bridge device at slot=%d id=%08x\n", slot, (int) id);
pci_slotmask |= 0x1 << slot;
pci_shmemaddr = pci_membase;
pcibios_assign_resource_slot(slot);
pcibios_enable_slot(slot);
#endif
pci_bus_is_present = 1;
/* Get PCI irq for local vectoring */
if (request_irq(COMEM_IRQ, pci_interrupt, 0, "PCI bridge", NULL)) {
printk(KERN_WARNING "PCI: failed to acquire interrupt %d\n", COMEM_IRQ);
} else {
mcf_autovector(COMEM_IRQ);
}
pcibios_assign_resources();
return(0);
}
/*****************************************************************************/
char *pcibios_setup(char *option)
{
/* Nothing for us to handle. */
return(option);
}
/*****************************************************************************/
void pcibios_fixup_bus(struct pci_bus *b)
{
}
/*****************************************************************************/
void pcibios_align_resource(void *data, struct resource *res,
resource_size_t size, resource_size_t align)
{
}
/*****************************************************************************/
int pcibios_enable_device(struct pci_dev *dev, int mask)
{
int slot;
slot = PCI_SLOT(dev->devfn);
if ((dev->bus == 0) && (pci_slotmask & (1 << slot)))
pcibios_enable_slot(slot);
return(0);
}
/*****************************************************************************/
/*
* Local routines to interrcept the standard I/O and vector handling
* code. Don't include this 'till now - initialization code above needs
* access to the real code too.
*/
#include <asm/mcfpci.h>
/*****************************************************************************/
void pci_outb(unsigned char val, unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned char *bp;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outb(val=%02x,addr=%x)\n", val, addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
bp = (volatile unsigned char *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
addr = (addr & ~0x3) + (~addr & 0x03);
bp[(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
}
/*****************************************************************************/
void pci_outw(unsigned short val, unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned short *sp;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outw(val=%04x,addr=%x)\n", val, addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
sp = (volatile unsigned short *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
addr = (addr & ~0x3) + (~addr & 0x02);
if (pci_byteswap)
val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);
sp[WREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
}
/*****************************************************************************/
void pci_outl(unsigned int val, unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned int *lp;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outl(val=%08x,addr=%x)\n", val, addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
lp = (volatile unsigned int *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(addr);
if (pci_byteswap)
val = (val << 24) | ((val & 0x0000ff00) << 8) |
((val & 0x00ff0000) >> 8) | (val >> 24);
lp[LREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))] = val;
}
/*****************************************************************************/
unsigned long pci_blmask[] = {
0x000000e0,
0x000000d0,
0x000000b0,
0x00000070
};
unsigned char pci_inb(unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned char *bp;
unsigned long r;
unsigned char val;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_inb(addr=%x)\n", addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
bp = (volatile unsigned char *) COMEM_BASE;
r = COMEM_DA_IORD | COMEM_DA_ADDR(addr) | pci_blmask[(addr & 0x3)];
rp[LREG(COMEM_DAHBASE)] = r;
addr = (addr & ~0x3) + (~addr & 0x3);
val = bp[(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
return(val);
}
/*****************************************************************************/
unsigned long pci_bwmask[] = {
0x000000c0,
0x000000c0,
0x00000030,
0x00000030
};
unsigned short pci_inw(unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned short *sp;
unsigned long r;
unsigned short val;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_inw(addr=%x)", addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
r = COMEM_DA_IORD | COMEM_DA_ADDR(addr) | pci_bwmask[(addr & 0x3)];
rp[LREG(COMEM_DAHBASE)] = r;
sp = (volatile unsigned short *) COMEM_BASE;
addr = (addr & ~0x3) + (~addr & 0x02);
val = sp[WREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
if (pci_byteswap)
val = ((val & 0xff) << 8) | ((val >> 8) & 0xff);
#ifdef DEBUGIO
printk(KERN_DEBUG "=%04x\n", val);
#endif
return(val);
}
/*****************************************************************************/
unsigned int pci_inl(unsigned int addr)
{
volatile unsigned long *rp;
volatile unsigned int *lp;
unsigned int val;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_inl(addr=%x)", addr);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
lp = (volatile unsigned int *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(addr);
val = lp[LREG(COMEM_PCIBUS + COMEM_DA_OFFSET(addr))];
if (pci_byteswap)
val = (val << 24) | ((val & 0x0000ff00) << 8) |
((val & 0x00ff0000) >> 8) | (val >> 24);
#ifdef DEBUGIO
printk(KERN_DEBUG "=%08x\n", val);
#endif
return(val);
}
/*****************************************************************************/
void pci_outsb(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned char *bp;
unsigned char *dp = (unsigned char *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outsb(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
a = (a & ~0x3) + (~a & 0x03);
bp = (volatile unsigned char *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--)
*bp = *dp++;
}
/*****************************************************************************/
void pci_outsw(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned short *wp;
unsigned short w, *dp = (unsigned short *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outsw(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
a = (a & ~0x3) + (~a & 0x2);
wp = (volatile unsigned short *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--) {
w = *dp++;
if (pci_byteswap)
w = ((w & 0xff) << 8) | ((w >> 8) & 0xff);
*wp = w;
}
}
/*****************************************************************************/
void pci_outsl(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned long *lp;
unsigned long l, *dp = (unsigned long *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_outsl(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IOWR | COMEM_DA_ADDR(a);
lp = (volatile unsigned long *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--) {
l = *dp++;
if (pci_byteswap)
l = (l << 24) | ((l & 0x0000ff00) << 8) |
((l & 0x00ff0000) >> 8) | (l >> 24);
*lp = l;
}
}
/*****************************************************************************/
void pci_insb(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned char *bp;
unsigned char *dp = (unsigned char *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_insb(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
a = (a & ~0x3) + (~a & 0x03);
bp = (volatile unsigned char *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--)
*dp++ = *bp;
}
/*****************************************************************************/
void pci_insw(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned short *wp;
unsigned short w, *dp = (unsigned short *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_insw(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
a = (a & ~0x3) + (~a & 0x2);
wp = (volatile unsigned short *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--) {
w = *wp;
if (pci_byteswap)
w = ((w & 0xff) << 8) | ((w >> 8) & 0xff);
*dp++ = w;
}
}
/*****************************************************************************/
void pci_insl(void *addr, void *buf, int len)
{
volatile unsigned long *rp;
volatile unsigned long *lp;
unsigned long l, *dp = (unsigned long *) buf;
unsigned int a = (unsigned int) addr;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_insl(addr=%x,buf=%x,len=%d)\n", (int)addr, (int)buf, len);
#endif
rp = (volatile unsigned long *) COMEM_BASE;
rp[LREG(COMEM_DAHBASE)] = COMEM_DA_IORD | COMEM_DA_ADDR(a);
lp = (volatile unsigned long *)
(COMEM_BASE + COMEM_PCIBUS + COMEM_DA_OFFSET(a));
while (len--) {
l = *lp;
if (pci_byteswap)
l = (l << 24) | ((l & 0x0000ff00) << 8) |
((l & 0x00ff0000) >> 8) | (l >> 24);
*dp++ = l;
}
}
/*****************************************************************************/
struct pci_localirqlist {
void (*handler)(int, void *, struct pt_regs *);
const char *device;
void *dev_id;
};
struct pci_localirqlist pci_irqlist[COMEM_MAXPCI];
/*****************************************************************************/
int pci_request_irq(unsigned int irq,
void (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *device, void *dev_id)
{
int i;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_request_irq(irq=%d,handler=%x,flags=%x,device=%s,"
"dev_id=%x)\n", irq, (int) handler, (int) flags, device,
(int) dev_id);
#endif
/* Check if this interrupt handler is already lodged */
for (i = 0; (i < COMEM_MAXPCI); i++) {
if (pci_irqlist[i].handler == handler)
return(0);
}
/* Find a free spot to put this handler */
for (i = 0; (i < COMEM_MAXPCI); i++) {
if (pci_irqlist[i].handler == 0) {
pci_irqlist[i].handler = handler;
pci_irqlist[i].device = device;
pci_irqlist[i].dev_id = dev_id;
return(0);
}
}
/* Couldn't fit?? */
return(1);
}
/*****************************************************************************/
void pci_free_irq(unsigned int irq, void *dev_id)
{
int i;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_free_irq(irq=%d,dev_id=%x)\n", irq, (int) dev_id);
#endif
if (dev_id == (void *) NULL)
return;
/* Check if this interrupt handler is lodged */
for (i = 0; (i < COMEM_MAXPCI); i++) {
if (pci_irqlist[i].dev_id == dev_id) {
pci_irqlist[i].handler = NULL;
pci_irqlist[i].device = NULL;
pci_irqlist[i].dev_id = NULL;
break;
}
}
}
/*****************************************************************************/
void pci_interrupt(int irq, void *id, struct pt_regs *fp)
{
int i;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_interrupt(irq=%d,id=%x,fp=%x)\n", irq, (int) id, (int) fp);
#endif
for (i = 0; (i < COMEM_MAXPCI); i++) {
if (pci_irqlist[i].handler)
(*pci_irqlist[i].handler)(irq,pci_irqlist[i].dev_id,fp);
}
}
/*****************************************************************************/
/*
* The shared memory region is broken up into contiguous 512 byte
* regions for easy allocation... This is not an optimal solution
* but it makes allocation and freeing regions really easy.
*/
#define PCI_MEMSLOTSIZE 512
#define PCI_MEMSLOTS (COMEM_SHMEMSIZE / PCI_MEMSLOTSIZE)
char pci_shmemmap[PCI_MEMSLOTS];
void *pci_bmalloc(int size)
{
int i, j, nrslots;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_bmalloc(size=%d)\n", size);
#endif
if (size <= 0)
return((void *) NULL);
nrslots = (size - 1) / PCI_MEMSLOTSIZE;
for (i = 0; (i < (PCI_MEMSLOTS-nrslots)); i++) {
if (pci_shmemmap[i] == 0) {
for (j = i+1; (j < (i+nrslots)); j++) {
if (pci_shmemmap[j])
goto restart;
}
for (j = i; (j <= i+nrslots); j++)
pci_shmemmap[j] = 1;
break;
}
restart:
}
return((void *) (COMEM_BASE + COMEM_SHMEM + (i * PCI_MEMSLOTSIZE)));
}
/*****************************************************************************/
void pci_bmfree(void *mp, int size)
{
int i, j, nrslots;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_bmfree(mp=%x,size=%d)\n", (int) mp, size);
#endif
nrslots = size / PCI_MEMSLOTSIZE;
i = (((unsigned long) mp) - (COMEM_BASE + COMEM_SHMEM)) /
PCI_MEMSLOTSIZE;
for (j = i; (j < (i+nrslots)); j++)
pci_shmemmap[j] = 0;
}
/*****************************************************************************/
unsigned long pci_virt_to_bus(volatile void *address)
{
unsigned long l;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_virt_to_bus(address=%x)", (int) address);
#endif
l = ((unsigned long) address) - COMEM_BASE;
#ifdef DEBUGIO
printk(KERN_DEBUG "=%x\n", (int) (l+pci_shmemaddr));
#endif
return(l + pci_shmemaddr);
}
/*****************************************************************************/
void *pci_bus_to_virt(unsigned long address)
{
unsigned long l;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_bus_to_virt(address=%x)", (int) address);
#endif
l = address - pci_shmemaddr;
#ifdef DEBUGIO
printk(KERN_DEBUG "=%x\n", (int) (address + COMEM_BASE));
#endif
return((void *) (address + COMEM_BASE));
}
/*****************************************************************************/
void pci_bmcpyto(void *dst, void *src, int len)
{
unsigned long *dp, *sp, val;
unsigned char *dcp, *scp;
int i, j;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_bmcpyto(dst=%x,src=%x,len=%d)\n", (int)dst, (int)src, len);
#endif
dp = (unsigned long *) dst;
sp = (unsigned long *) src;
i = len >> 2;
#if 0
printk(KERN_INFO "DATA:");
scp = (unsigned char *) sp;
for (i = 0; (i < len); i++) {
if ((i % 16) == 0) printk(KERN_INFO "\n%04x: ", i);
printk(KERN_INFO "%02x ", *scp++);
}
printk(KERN_INFO "\n");
#endif
for (j = 0; (i >= 0); i--, j++) {
val = *sp++;
val = (val << 24) | ((val & 0x0000ff00) << 8) |
((val & 0x00ff0000) >> 8) | (val >> 24);
*dp++ = val;
}
if (len & 0x3) {
dcp = (unsigned char *) dp;
scp = ((unsigned char *) sp) + 3;
for (i = 0; (i < (len & 0x3)); i++)
*dcp++ = *scp--;
}
}
/*****************************************************************************/
void pci_bmcpyfrom(void *dst, void *src, int len)
{
unsigned long *dp, *sp, val;
unsigned char *dcp, *scp;
int i;
#ifdef DEBUGIO
printk(KERN_DEBUG "pci_bmcpyfrom(dst=%x,src=%x,len=%d)\n",(int)dst,(int)src,len);
#endif
dp = (unsigned long *) dst;
sp = (unsigned long *) src;
i = len >> 2;
for (; (i >= 0); i--) {
val = *sp++;
val = (val << 24) | ((val & 0x0000ff00) << 8) |
((val & 0x00ff0000) >> 8) | (val >> 24);
*dp++ = val;
}
if (len & 0x3) {
dcp = ((unsigned char *) dp) + 3;
scp = (unsigned char *) sp;
for (i = 0; (i < (len & 0x3)); i++)
*dcp++ = *scp--;
}
#if 0
printk(KERN_INFO "DATA:");
dcp = (unsigned char *) dst;
for (i = 0; (i < len); i++) {
if ((i % 16) == 0) printk(KERN_INFO "\n%04x: ", i);
printk(KERN_INFO "%02x ", *dcp++);
}
printk(KERN_INFO "\n");
#endif
}
/*****************************************************************************/
void *pci_alloc_consistent(struct pci_dev *dev, size_t size, dma_addr_t *dma_addr)
{
void *mp;
if ((mp = pci_bmalloc(size)) != NULL) {
dma_addr = mp - (COMEM_BASE + COMEM_SHMEM);
return(mp);
}
*dma_addr = (dma_addr_t) NULL;
return(NULL);
}
/*****************************************************************************/
void pci_free_consistent(struct pci_dev *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr)
{
pci_bmfree(cpu_addr, size);
}
/*****************************************************************************/
arch/m68knommu/kernel/signal.c
View file @ 78a768b6
...@@ -279,6 +279,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp, ...@@ -279,6 +279,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
struct sigcontext context; struct sigcontext context;
int err = 0; int err = 0;
/* Always make any pending restarted system calls return -EINTR */
current_thread_info()->restart_block.fn = do_no_restart_syscall;
/* get previous context */ /* get previous context */
if (copy_from_user(&context, usc, sizeof(context))) if (copy_from_user(&context, usc, sizeof(context)))
goto badframe; goto badframe;
...@@ -316,6 +319,9 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw, ...@@ -316,6 +319,9 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
unsigned long usp; unsigned long usp;
int err; int err;
/* Always make any pending restarted system calls return -EINTR */
current_thread_info()->restart_block.fn = do_no_restart_syscall;
err = __get_user(temp, &uc->uc_mcontext.version); err = __get_user(temp, &uc->uc_mcontext.version);
if (temp != MCONTEXT_VERSION) if (temp != MCONTEXT_VERSION)
goto badframe; goto badframe;
...@@ -692,6 +698,15 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) ...@@ -692,6 +698,15 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
regs->d0 = -EINTR; regs->d0 = -EINTR;
break; break;
case -ERESTART_RESTARTBLOCK:
if (!has_handler) {
regs->d0 = __NR_restart_syscall;
regs->pc -= 2;
break;
}
regs->d0 = -EINTR;
break;
case -ERESTARTSYS: case -ERESTARTSYS:
if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) { if (has_handler && !(ka->sa.sa_flags & SA_RESTART)) {
regs->d0 = -EINTR; regs->d0 = -EINTR;
......
arch/m68knommu/kernel/syscalltable.S
View file @ 78a768b6
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.text .text
ALIGN ALIGN
ENTRY(sys_call_table) ENTRY(sys_call_table)
.long sys_ni_syscall /* 0 - old "setup()" system call*/ .long sys_restart_syscall /* 0 - old "setup()" system call */
.long sys_exit .long sys_exit
.long sys_fork .long sys_fork
.long sys_read .long sys_read
......
arch/m68knommu/platform/5307/config.c
View file @ 78a768b6
...@@ -123,7 +123,7 @@ void __init config_BSP(char *commandp, int size) ...@@ -123,7 +123,7 @@ void __init config_BSP(char *commandp, int size)
{ {
mcf_setimr(MCFSIM_IMR_MASKALL); mcf_setimr(MCFSIM_IMR_MASKALL);
#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ #if defined(CONFIG_NETtel) || \
defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
/* Copy command line from FLASH to local buffer... */ /* Copy command line from FLASH to local buffer... */
memcpy(commandp, (char *) 0xf0004000, size); memcpy(commandp, (char *) 0xf0004000, size);
......
arch/m68knommu/platform/532x/config.c
View file @ 78a768b6
...@@ -41,15 +41,15 @@ extern unsigned int mcf_timerlevel; ...@@ -41,15 +41,15 @@ extern unsigned int mcf_timerlevel;
static struct mcf_platform_uart m532x_uart_platform[] = { static struct mcf_platform_uart m532x_uart_platform[] = {
{ {
.mapbase = MCF_MBAR + MCFUART_BASE1, .mapbase = MCFUART_BASE1,
.irq = MCFINT_VECBASE + MCFINT_UART0, .irq = MCFINT_VECBASE + MCFINT_UART0,
}, },
{ {
.mapbase = MCF_MBAR + MCFUART_BASE2, .mapbase = MCFUART_BASE2,
.irq = MCFINT_VECBASE + MCFINT_UART1, .irq = MCFINT_VECBASE + MCFINT_UART1,
}, },
{ {
.mapbase = MCF_MBAR + MCFUART_BASE3, .mapbase = MCFUART_BASE3,
.irq = MCFINT_VECBASE + MCFINT_UART2, .irq = MCFINT_VECBASE + MCFINT_UART2,
}, },
{ }, { },
...@@ -108,7 +108,7 @@ void mcf_settimericr(unsigned int timer, unsigned int level) ...@@ -108,7 +108,7 @@ void mcf_settimericr(unsigned int timer, unsigned int level)
default: irq = 32; icr = MCFSIM_ICR_TIMER1; break; default: irq = 32; icr = MCFSIM_ICR_TIMER1; break;
} }
icrp = (volatile unsigned char *) (MCF_MBAR + icr); icrp = (volatile unsigned char *) (icr);
*icrp = level; *icrp = level;
mcf_enable_irq0(irq); mcf_enable_irq0(irq);
} }
......
arch/m68knommu/platform/coldfire/entry.S
View file @ 78a768b6
...@@ -215,19 +215,8 @@ ENTRY(fasthandler) ...@@ -215,19 +215,8 @@ ENTRY(fasthandler)
RESTORE_LOCAL RESTORE_LOCAL
ENTRY(ret_from_interrupt) ENTRY(ret_from_interrupt)
moveb %sp@(PT_SR),%d0 /* the fasthandler is confusing me, haven't seen any user */
andl #0x7,%d0 jmp ret_from_exception
jeq 1f
RESTORE_ALL
1:
/* check if we need to do software interrupts */
movel irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0
jeq ret_from_exception
pea ret_from_exception
jmp do_softirq
/* /*
* Beware - when entering resume, prev (the current task) is * Beware - when entering resume, prev (the current task) is
......
drivers/net/Kconfig
View file @ 78a768b6
...@@ -1829,7 +1829,7 @@ config 68360_ENET ...@@ -1829,7 +1829,7 @@ config 68360_ENET
config FEC config FEC
bool "FEC ethernet controller (of ColdFire CPUs)" bool "FEC ethernet controller (of ColdFire CPUs)"
depends on M523x || M527x || M5272 || M528x || M520x depends on M523x || M527x || M5272 || M528x || M520x || M532x
help help
Say Y here if you want to use the built-in 10/100 Fast ethernet Say Y here if you want to use the built-in 10/100 Fast ethernet
controller on some Motorola ColdFire processors. controller on some Motorola ColdFire processors.
......
drivers/net/fec.c
View file @ 78a768b6
...@@ -1698,7 +1698,7 @@ static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_priva ...@@ -1698,7 +1698,7 @@ static void __inline__ fec_set_mii(struct net_device *dev, struct fec_enet_priva
/* /*
* Set MII speed to 2.5 MHz * Set MII speed to 2.5 MHz
*/ */
fep->phy_speed = ((((MCF_CLK / 2) / (2500000 / 10)) + 5) / 10) * 2; fep->phy_speed = (MCF_CLK / 3) / (2500000 * 2 ) * 2;
fecp->fec_mii_speed = fep->phy_speed; fecp->fec_mii_speed = fep->phy_speed;
fec_restart(dev, 0); fec_restart(dev, 0);
......
drivers/serial/mcf.c
View file @ 78a768b6
...@@ -212,10 +212,18 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -212,10 +212,18 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios,
{ {
unsigned long flags; unsigned long flags;
unsigned int baud, baudclk; unsigned int baud, baudclk;
#if defined(CONFIG_M5272)
unsigned int baudfr;
#endif
unsigned char mr1, mr2; unsigned char mr1, mr2;
baud = uart_get_baud_rate(port, termios, old, 0, 230400); baud = uart_get_baud_rate(port, termios, old, 0, 230400);
#if defined(CONFIG_M5272)
baudclk = (MCF_BUSCLK / baud) / 32;
baudfr = (((MCF_BUSCLK / baud) + 1) / 2) % 16;
#else
baudclk = ((MCF_BUSCLK / baud) + 16) / 32; baudclk = ((MCF_BUSCLK / baud) + 16) / 32;
#endif
mr1 = MCFUART_MR1_RXIRQRDY | MCFUART_MR1_RXERRCHAR; mr1 = MCFUART_MR1_RXIRQRDY | MCFUART_MR1_RXERRCHAR;
mr2 = 0; mr2 = 0;
...@@ -262,6 +270,9 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -262,6 +270,9 @@ static void mcf_set_termios(struct uart_port *port, struct ktermios *termios,
writeb(mr2, port->membase + MCFUART_UMR); writeb(mr2, port->membase + MCFUART_UMR);
writeb((baudclk & 0xff00) >> 8, port->membase + MCFUART_UBG1); writeb((baudclk & 0xff00) >> 8, port->membase + MCFUART_UBG1);
writeb((baudclk & 0xff), port->membase + MCFUART_UBG2); writeb((baudclk & 0xff), port->membase + MCFUART_UBG2);
#if defined(CONFIG_M5272)
writeb((baudfr & 0x0f), port->membase + MCFUART_UFPD);
#endif
writeb(MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER, writeb(MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER,
port->membase + MCFUART_UCSR); port->membase + MCFUART_UCSR);
writeb(MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE, writeb(MCFUART_UCR_RXENABLE | MCFUART_UCR_TXENABLE,
......
mm/nommu.c
View file @ 78a768b6
...@@ -1161,8 +1161,8 @@ error_free: ...@@ -1161,8 +1161,8 @@ error_free:
return ret; return ret;
enomem: enomem:
printk("Allocation of length %lu from process %d failed\n", printk("Allocation of length %lu from process %d (%s) failed\n",
len, current->pid); len, current->pid, current->comm);
show_free_areas(); show_free_areas();
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment