From sjhill@linux-mips.org Tue Mar 1 03:51:40 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 03:51:40 +0000 (GMT) From: sjhill@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 03:51:40 +0000 X-archive-position: 302 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: sjhill@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: sjhill@ftp.linux-mips.org 05/03/01 03:51:33 Modified files: arch/mips/kernel: sysirix.c Log message: Fix 'prctl' system call for IRIX. At this point IRIX 5.3 static binaries are now working for 80% of the ones I have tried. The other ones that do not work all fail in the same way with the same messages. Once that bug is tracked down, we should be in good shape. Task locking still needs some work. diff -urN linux/arch/mips/kernel/sysirix.c linux/arch/mips/kernel/sysirix.c --- linux/arch/mips/kernel/sysirix.c 2005/02/19 05:56:51 1.68 +++ linux/arch/mips/kernel/sysirix.c 2005/03/01 03:51:33 1.69 @@ -73,32 +73,30 @@ } /* The prctl commands. */ -#define PR_MAXPROCS 1 /* Tasks/user. */ -#define PR_ISBLOCKED 2 /* If blocked, return 1. */ -#define PR_SETSTACKSIZE 3 /* Set largest task stack size. */ -#define PR_GETSTACKSIZE 4 /* Get largest task stack size. */ -#define PR_MAXPPROCS 5 /* Num parallel tasks. */ -#define PR_UNBLKONEXEC 6 /* When task exec/exit's, unblock. */ -#define PR_SETEXITSIG 8 /* When task exit's, set signal. */ -#define PR_RESIDENT 9 /* Make task unswappable. */ -#define PR_ATTACHADDR 10 /* (Re-)Connect a vma to a task. */ -#define PR_DETACHADDR 11 /* Disconnect a vma from a task. */ -#define PR_TERMCHILD 12 /* When parent sleeps with fishes, kill child. */ -#define PR_GETSHMASK 13 /* Get the sproc() share mask. */ -#define PR_GETNSHARE 14 /* Number of share group members. */ -#define PR_COREPID 15 /* Add task pid to name when it core. */ -#define PR_ATTACHADDRPERM 16 /* (Re-)Connect vma, with specified prot. */ -#define PR_PTHREADEXIT 17 /* Kill a pthread without prejudice. */ +#define PR_MAXPROCS 1 /* Tasks/user. */ +#define PR_ISBLOCKED 2 /* If blocked, return 1. */ +#define PR_SETSTACKSIZE 3 /* Set largest task stack size. */ +#define PR_GETSTACKSIZE 4 /* Get largest task stack size. */ +#define PR_MAXPPROCS 5 /* Num parallel tasks. */ +#define PR_UNBLKONEXEC 6 /* When task exec/exit's, unblock. */ +#define PR_SETEXITSIG 8 /* When task exit's, set signal. */ +#define PR_RESIDENT 9 /* Make task unswappable. */ +#define PR_ATTACHADDR 10 /* (Re-)Connect a vma to a task. */ +#define PR_DETACHADDR 11 /* Disconnect a vma from a task. */ +#define PR_TERMCHILD 12 /* Kill child if the parent dies. */ +#define PR_GETSHMASK 13 /* Get the sproc() share mask. */ +#define PR_GETNSHARE 14 /* Number of share group members. */ +#define PR_COREPID 15 /* Add task pid to name when it core. */ +#define PR_ATTACHADDRPERM 16 /* (Re-)Connect vma, with specified prot. */ +#define PR_PTHREADEXIT 17 /* Kill a pthread, only for IRIX 6.[234] */ -asmlinkage int irix_prctl(struct pt_regs *regs) +asmlinkage int irix_prctl(unsigned option, ...) { - unsigned long cmd; - int error = 0, base = 0; + va_list args; + int error = 0; - if (regs->regs[2] == 1000) - base = 1; - cmd = regs->regs[base + 4]; - switch (cmd) { + va_start(args, option); + switch (option) { case PR_MAXPROCS: printk("irix_prctl[%s:%d]: Wants PR_MAXPROCS\n", current->comm, current->pid); @@ -111,7 +109,7 @@ printk("irix_prctl[%s:%d]: Wants PR_ISBLOCKED\n", current->comm, current->pid); read_lock(&tasklist_lock); - task = find_task_by_pid(regs->regs[base + 5]); + task = find_task_by_pid(va_arg(args, pid_t)); error = -ESRCH; if (error) error = (task->run_list.next != NULL); @@ -121,7 +119,7 @@ } case PR_SETSTACKSIZE: { - long value = regs->regs[base + 5]; + long value = va_arg(args, long); printk("irix_prctl[%s:%d]: Wants PR_SETSTACKSIZE<%08lx>\n", current->comm, current->pid, (unsigned long) value); @@ -222,17 +220,13 @@ error = -EINVAL; break; - case PR_PTHREADEXIT: - printk("irix_prctl[%s:%d]: Wants PR_PTHREADEXIT\n", - current->comm, current->pid); - do_exit(regs->regs[base + 5]); - default: printk("irix_prctl[%s:%d]: Non-existant opcode %d\n", - current->comm, current->pid, (int)cmd); + current->comm, current->pid, option); error = -EINVAL; break; } + va_end(args); return error; } From ppopov@linux-mips.org Tue Mar 1 06:33:28 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 06:33:28 +0000 (GMT) From: ppopov@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 06:33:28 +0000 X-archive-position: 303 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ppopov@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ppopov@ftp.linux-mips.org 05/03/01 06:33:19 Modified files: arch/mips : Kconfig Makefile arch/mips/au1000/common: au1xxx_irqmap.c cputable.c dbdma.c irq.c arch/mips/kernel: cpu-probe.c proc.c arch/mips/mm : c-r4k.c tlbex.c include/asm-mips: bootinfo.h cpu.h include/asm-mips/mach-au1x00: au1000.h au1xxx_dbdma.h Added files: arch/mips/au1000/pb1200: Makefile board_setup.c init.c irqmap.c include/asm-mips/mach-db1x00: db1200.h include/asm-mips/mach-pb1x00: pb1200.h Log message: Base Au1200 2.6 support. diff -urN linux/arch/mips/Kconfig linux/arch/mips/Kconfig --- linux/arch/mips/Kconfig 2005/02/18 06:27:25 1.142 +++ linux/arch/mips/Kconfig 2005/03/01 06:33:16 1.143 @@ -58,6 +58,13 @@ select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN +config MIPS_PB1200 + bool "AMD Alchemy PB1200 board" + select SOC_AU1200 + select DMA_NONCOHERENT + select MIPS_DISABLE_OBSOLETE_IDE + select SYS_SUPPORTS_LITTLE_ENDIAN + config MIPS_DB1000 bool "AMD Alchemy DB1000 board" select SOC_AU1000 @@ -87,6 +94,13 @@ select MIPS_DISABLE_OBSOLETE_IDE select SYS_SUPPORTS_LITTLE_ENDIAN +config MIPS_DB1200 + bool "AMD Alchemy DB1200 board" + select SOC_AU1200 + select DMA_NONCOHERENT + select MIPS_DISABLE_OBSOLETE_IDE + select SYS_SUPPORTS_LITTLE_ENDIAN + config MIPS_MIRAGE bool "AMD Alchemy Mirage board" select DMA_NONCOHERENT @@ -778,6 +792,10 @@ bool select SOC_AU1X00 +config SOC_AU1200 + bool + select SOC_AU1X00 + config SOC_AU1X00 bool select SYS_SUPPORTS_32BIT_KERNEL diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile --- linux/arch/mips/Makefile 2005/02/21 16:18:36 1.190 +++ linux/arch/mips/Makefile 2005/03/01 06:33:16 1.191 @@ -267,6 +267,13 @@ load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000 # +# AMD Alchemy Pb1200 eval board +# +libs-$(CONFIG_MIPS_PB1200) += arch/mips/au1000/pb1200/ +cflags-$(CONFIG_MIPS_PB1200) += -Iinclude/asm-mips/mach-pb1x00 +load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000 + +# # AMD Alchemy Db1000 eval board # libs-$(CONFIG_MIPS_DB1000) += arch/mips/au1000/db1x00/ @@ -295,6 +302,13 @@ load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000 # +# AMD Alchemy Db1200 eval board +# +libs-$(CONFIG_MIPS_DB1200) += arch/mips/au1000/pb1200/ +cflags-$(CONFIG_MIPS_DB1200) += -Iinclude/asm-mips/mach-db1x00 +load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000 + +# # AMD Alchemy Bosporus eval board # libs-$(CONFIG_MIPS_BOSPORUS) += arch/mips/au1000/db1x00/ diff -urN linux/arch/mips/au1000/common/au1xxx_irqmap.c linux/arch/mips/au1000/common/au1xxx_irqmap.c --- linux/arch/mips/au1000/common/au1xxx_irqmap.c 2005/01/15 01:31:04 1.5 +++ linux/arch/mips/au1000/common/au1xxx_irqmap.c 2005/03/01 06:33:16 1.6 @@ -173,14 +173,14 @@ { AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1550_PSC3_INT, INTC_INT_HIGH_LEVEL, 0}, - { AU1550_TOY_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, - { AU1550_RTC_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1550_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, + { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, { AU1550_NAND_INT, INTC_INT_RISE_EDGE, 0}, { AU1550_USB_DEV_REQ_INT, INTC_INT_HIGH_LEVEL, 0 }, { AU1550_USB_DEV_SUS_INT, INTC_INT_RISE_EDGE, 0 }, @@ -201,14 +201,14 @@ { AU1200_PSC1_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_AES_INT, INTC_INT_HIGH_LEVEL, 0}, { AU1200_CAMERA_INT, INTC_INT_HIGH_LEVEL, 0}, - { AU1200_TOY_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, - { AU1200_RTC_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, - { AU1200_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_TOY_MATCH2_INT, INTC_INT_RISE_EDGE, 1 }, + { AU1000_RTC_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH0_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH1_INT, INTC_INT_RISE_EDGE, 0 }, + { AU1000_RTC_MATCH2_INT, INTC_INT_RISE_EDGE, 0 }, { AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0}, { AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 }, { AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0}, diff -urN linux/arch/mips/au1000/common/cputable.c linux/arch/mips/au1000/common/cputable.c --- linux/arch/mips/au1000/common/cputable.c 2005/01/15 01:31:04 1.4 +++ linux/arch/mips/au1000/common/cputable.c 2005/03/01 06:33:16 1.5 @@ -37,7 +37,8 @@ { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 }, { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, - { 0xffffffff, 0x04030200, "Au1200 AA", 0, 1 }, + { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 }, + { 0xffffffff, 0x04030201, "Au1200 AC", 0, 1 }, { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, }; diff -urN linux/arch/mips/au1000/common/dbdma.c linux/arch/mips/au1000/common/dbdma.c --- linux/arch/mips/au1000/common/dbdma.c 2005/01/15 01:31:04 1.11 +++ linux/arch/mips/au1000/common/dbdma.c 2005/03/01 06:33:16 1.12 @@ -29,6 +29,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. * */ + #include #include #include @@ -42,6 +43,8 @@ #include #include +/* #include */ + #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) /* @@ -55,43 +58,16 @@ * functions. The drivers allocate the data buffers and assign them * to the descriptors. */ -static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock); +static spinlock_t au1xxx_dbdma_spin_lock = SPIN_LOCK_UNLOCKED; /* I couldn't find a macro that did this...... */ #define ALIGN_ADDR(x, a) ((((u32)(x)) + (a-1)) & ~(a-1)) -static volatile dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE; -static int dbdma_initialized; +static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE; +static int dbdma_initialized=0; static void au1xxx_dbdma_init(void); -typedef struct dbdma_device_table { - u32 dev_id; - u32 dev_flags; - u32 dev_tsize; - u32 dev_devwidth; - u32 dev_physaddr; /* If FIFO */ - u32 dev_intlevel; - u32 dev_intpolarity; -} dbdev_tab_t; - -typedef struct dbdma_chan_config { - u32 chan_flags; - u32 chan_index; - dbdev_tab_t *chan_src; - dbdev_tab_t *chan_dest; - au1x_dma_chan_t *chan_ptr; - au1x_ddma_desc_t *chan_desc_base; - au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; - void *chan_callparam; - void (*chan_callback)(int, void *, struct pt_regs *); -} chan_tab_t; - -#define DEV_FLAGS_INUSE (1 << 0) -#define DEV_FLAGS_ANYUSE (1 << 1) -#define DEV_FLAGS_OUT (1 << 2) -#define DEV_FLAGS_IN (1 << 3) - static dbdev_tab_t dbdev_tab[] = { #ifdef CONFIG_SOC_AU1550 /* UARTS */ @@ -157,13 +133,13 @@ { DSCR_CMD0_MAE_BOTH, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_LCD, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, + { DSCR_CMD0_SDMS_TX0, DEV_FLAGS_OUT, 4, 8, 0x10600000, 0, 0 }, + { DSCR_CMD0_SDMS_RX0, DEV_FLAGS_IN, 4, 8, 0x10600004, 0, 0 }, + { DSCR_CMD0_SDMS_TX1, DEV_FLAGS_OUT, 4, 8, 0x10680000, 0, 0 }, + { DSCR_CMD0_SDMS_RX1, DEV_FLAGS_IN, 4, 8, 0x10680004, 0, 0 }, - { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_AES_RX, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, + { DSCR_CMD0_AES_RX, DEV_FLAGS_IN , 4, 32, 0x10300008, 0, 0 }, + { DSCR_CMD0_AES_TX, DEV_FLAGS_OUT, 4, 32, 0x10300004, 0, 0 }, { DSCR_CMD0_PSC0_TX, DEV_FLAGS_OUT, 0, 0, 0x11a0001c, 0, 0 }, { DSCR_CMD0_PSC0_RX, DEV_FLAGS_IN, 0, 0, 0x11a0001c, 0, 0 }, @@ -173,9 +149,9 @@ { DSCR_CMD0_PSC1_RX, DEV_FLAGS_IN, 0, 0, 0x11b0001c, 0, 0 }, { DSCR_CMD0_PSC1_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, - { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, + { DSCR_CMD0_CIM_RXA, DEV_FLAGS_IN, 0, 32, 0x14004020, 0, 0 }, + { DSCR_CMD0_CIM_RXB, DEV_FLAGS_IN, 0, 32, 0x14004040, 0, 0 }, + { DSCR_CMD0_CIM_RXC, DEV_FLAGS_IN, 0, 32, 0x14004060, 0, 0 }, { DSCR_CMD0_CIM_SYNC, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_NAND_FLASH, DEV_FLAGS_IN, 0, 0, 0x00000000, 0, 0 }, @@ -184,6 +160,24 @@ { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, { DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }, + + /* Provide 16 user definable device types */ + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0 }, }; #define DBDEV_TAB_SIZE (sizeof(dbdev_tab) / sizeof(dbdev_tab_t)) @@ -203,6 +197,30 @@ return NULL; } +u32 +au1xxx_ddma_add_device(dbdev_tab_t *dev) +{ + u32 ret = 0; + dbdev_tab_t *p=NULL; + static u16 new_id=0x1000; + + p = find_dbdev_id(0); + if ( NULL != p ) + { + memcpy(p, dev, sizeof(dbdev_tab_t)); + p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); + ret = p->dev_id; + new_id++; +#if 0 + printk("add_device: id:%x flags:%x padd:%x\n", + p->dev_id, p->dev_flags, p->dev_physaddr ); +#endif + } + + return ret; +} +EXPORT_SYMBOL(au1xxx_ddma_add_device); + /* Allocate a channel and return a non-zero descriptor if successful. */ u32 @@ -215,7 +233,7 @@ int i; dbdev_tab_t *stp, *dtp; chan_tab_t *ctp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; /* We do the intialization on the first channel allocation. * We have to wait because of the interrupt handler initialization @@ -225,9 +243,6 @@ au1xxx_dbdma_init(); dbdma_initialized = 1; - if ((srcid > DSCR_NDEV_IDS) || (destid > DSCR_NDEV_IDS)) - return 0; - if ((stp = find_dbdev_id(srcid)) == NULL) return 0; if ((dtp = find_dbdev_id(destid)) == NULL) return 0; @@ -269,9 +284,9 @@ /* If kmalloc fails, it is caught below same * as a channel not available. */ - ctp = kmalloc(sizeof(chan_tab_t), GFP_KERNEL); + ctp = (chan_tab_t *) + kmalloc(sizeof(chan_tab_t), GFP_KERNEL); chan_tab_ptr[i] = ctp; - ctp->chan_index = chan = i; break; } } @@ -279,10 +294,11 @@ if (ctp != NULL) { memset(ctp, 0, sizeof(chan_tab_t)); + ctp->chan_index = chan = i; dcp = DDMA_CHANNEL_BASE; dcp += (0x0100 * chan); ctp->chan_ptr = (au1x_dma_chan_t *)dcp; - cp = (volatile au1x_dma_chan_t *)dcp; + cp = (au1x_dma_chan_t *)dcp; ctp->chan_src = stp; ctp->chan_dest = dtp; ctp->chan_callback = callback; @@ -299,6 +315,9 @@ i |= DDMA_CFG_DED; if (dtp->dev_intpolarity) i |= DDMA_CFG_DP; + if ((stp->dev_flags & DEV_FLAGS_SYNC) || + (dtp->dev_flags & DEV_FLAGS_SYNC)) + i |= DDMA_CFG_SYNC; cp->ddma_cfg = i; au_sync(); @@ -309,14 +328,14 @@ rv = (u32)(&chan_tab_ptr[chan]); } else { - /* Release devices. - */ + /* Release devices */ stp->dev_flags &= ~DEV_FLAGS_INUSE; dtp->dev_flags &= ~DEV_FLAGS_INUSE; } } return rv; } +EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc); /* Set the device width if source or destination is a FIFO. * Should be 8, 16, or 32 bits. @@ -344,6 +363,7 @@ return rv; } +EXPORT_SYMBOL(au1xxx_dbdma_set_devwidth); /* Allocate a descriptor ring, initializing as much as possible. */ @@ -370,7 +390,8 @@ * and if we try that first we are likely to not waste larger * slabs of memory. */ - desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t), GFP_KERNEL); + desc_base = (u32)kmalloc(entries * sizeof(au1x_ddma_desc_t), + GFP_KERNEL|GFP_DMA); if (desc_base == 0) return 0; @@ -381,7 +402,7 @@ kfree((const void *)desc_base); i = entries * sizeof(au1x_ddma_desc_t); i += (sizeof(au1x_ddma_desc_t) - 1); - if ((desc_base = (u32)kmalloc(i, GFP_KERNEL)) == 0) + if ((desc_base = (u32)kmalloc(i, GFP_KERNEL|GFP_DMA)) == 0) return 0; desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); @@ -461,9 +482,14 @@ /* If source input is fifo, set static address. */ if (stp->dev_flags & DEV_FLAGS_IN) { - src0 = stp->dev_physaddr; + if ( stp->dev_flags & DEV_FLAGS_BURSTABLE ) + src1 |= DSCR_SRC1_SAM(DSCR_xAM_BURST); + else src1 |= DSCR_SRC1_SAM(DSCR_xAM_STATIC); + } + if (stp->dev_physaddr) + src0 = stp->dev_physaddr; /* Set up dest1. For now, assume no stride and increment. * A channel attribute update can change this later. @@ -487,10 +513,18 @@ /* If destination output is fifo, set static address. */ if (dtp->dev_flags & DEV_FLAGS_OUT) { - dest0 = dtp->dev_physaddr; + if ( dtp->dev_flags & DEV_FLAGS_BURSTABLE ) + dest1 |= DSCR_DEST1_DAM(DSCR_xAM_BURST); + else dest1 |= DSCR_DEST1_DAM(DSCR_xAM_STATIC); } + if (dtp->dev_physaddr) + dest0 = dtp->dev_physaddr; +#if 0 + printk("did:%x sid:%x cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n", + dtp->dev_id, stp->dev_id, cmd0, cmd1, src0, src1, dest0, dest1 ); +#endif for (i=0; idscr_cmd0 = cmd0; dp->dscr_cmd1 = cmd1; @@ -499,6 +533,7 @@ dp->dscr_dest0 = dest0; dp->dscr_dest1 = dest1; dp->dscr_stat = 0; + dp->sw_context = dp->sw_status = 0; dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(dp + 1)); dp++; } @@ -511,13 +546,14 @@ return (u32)(ctp->chan_desc_base); } +EXPORT_SYMBOL(au1xxx_dbdma_ring_alloc); /* Put a source buffer into the DMA ring. * This updates the source pointer and byte count. Normally used * for memory to fifo transfers. */ u32 -au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes) +_au1xxx_dbdma_put_source(u32 chanid, void *buf, int nbytes, u32 flags) { chan_tab_t *ctp; au1x_ddma_desc_t *dp; @@ -544,24 +580,40 @@ */ dp->dscr_source0 = virt_to_phys(buf); dp->dscr_cmd1 = nbytes; - dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ - ctp->chan_ptr->ddma_dbell = 0xffffffff; /* Make it go */ - + /* Check flags */ + if (flags & DDMA_FLAGS_IE) + dp->dscr_cmd0 |= DSCR_CMD0_IE; + if (flags & DDMA_FLAGS_NOIE) + dp->dscr_cmd0 &= ~DSCR_CMD0_IE; /* Get next descriptor pointer. */ ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + /* + * There is an errata on the Au1200/Au1550 parts that could result + * in "stale" data being DMA'd. It has to do with the snoop logic on + * the dache eviction buffer. NONCOHERENT_IO is on by default for + * these parts. If it is fixedin the future, these dma_cache_inv will + * just be nothing more than empty macros. See io.h. + * */ + dma_cache_wback_inv(buf,nbytes); + dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ + au_sync(); + dma_cache_wback_inv(dp, sizeof(dp)); + ctp->chan_ptr->ddma_dbell = 0; + /* return something not zero. */ return nbytes; } +EXPORT_SYMBOL(_au1xxx_dbdma_put_source); /* Put a destination buffer into the DMA ring. * This updates the destination pointer and byte count. Normally used * to place an empty buffer into the ring for fifo to memory transfers. */ u32 -au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes) +_au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags) { chan_tab_t *ctp; au1x_ddma_desc_t *dp; @@ -583,11 +635,33 @@ if (dp->dscr_cmd0 & DSCR_CMD0_V) return 0; - /* Load up buffer address and byte count. - */ + /* Load up buffer address and byte count */ + + /* Check flags */ + if (flags & DDMA_FLAGS_IE) + dp->dscr_cmd0 |= DSCR_CMD0_IE; + if (flags & DDMA_FLAGS_NOIE) + dp->dscr_cmd0 &= ~DSCR_CMD0_IE; + dp->dscr_dest0 = virt_to_phys(buf); dp->dscr_cmd1 = nbytes; +#if 0 + printk("cmd0:%x cmd1:%x source0:%x source1:%x dest0:%x dest1:%x\n", + dp->dscr_cmd0, dp->dscr_cmd1, dp->dscr_source0, + dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1 ); +#endif + /* + * There is an errata on the Au1200/Au1550 parts that could result in + * "stale" data being DMA'd. It has to do with the snoop logic on the + * dache eviction buffer. NONCOHERENT_IO is on by default for these + * parts. If it is fixedin the future, these dma_cache_inv will just + * be nothing more than empty macros. See io.h. + * */ + dma_cache_inv(buf,nbytes); dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ + au_sync(); + dma_cache_wback_inv(dp, sizeof(dp)); + ctp->chan_ptr->ddma_dbell = 0; /* Get next descriptor pointer. */ @@ -597,6 +671,7 @@ */ return nbytes; } +EXPORT_SYMBOL(_au1xxx_dbdma_put_dest); /* Get a destination buffer into the DMA ring. * Normally used to get a full buffer from the ring during fifo @@ -646,7 +721,7 @@ au1xxx_dbdma_stop(u32 chanid) { chan_tab_t *ctp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; int halt_timeout = 0; ctp = *((chan_tab_t **)chanid); @@ -666,6 +741,7 @@ cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V); au_sync(); } +EXPORT_SYMBOL(au1xxx_dbdma_stop); /* Start using the current descriptor pointer. If the dbdma encounters * a not valid descriptor, it will stop. In this case, we can just @@ -675,17 +751,17 @@ au1xxx_dbdma_start(u32 chanid) { chan_tab_t *ctp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; ctp = *((chan_tab_t **)chanid); - cp = ctp->chan_ptr; cp->ddma_desptr = virt_to_phys(ctp->cur_ptr); cp->ddma_cfg |= DDMA_CFG_EN; /* Enable channel */ au_sync(); - cp->ddma_dbell = 0xffffffff; /* Make it go */ + cp->ddma_dbell = 0; au_sync(); } +EXPORT_SYMBOL(au1xxx_dbdma_start); void au1xxx_dbdma_reset(u32 chanid) @@ -704,15 +780,21 @@ do { dp->dscr_cmd0 &= ~DSCR_CMD0_V; + /* reset our SW status -- this is used to determine + * if a descriptor is in use by upper level SW. Since + * posting can reset 'V' bit. + */ + dp->sw_status = 0; dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); } while (dp != ctp->chan_desc_base); } +EXPORT_SYMBOL(au1xxx_dbdma_reset); u32 au1xxx_get_dma_residue(u32 chanid) { chan_tab_t *ctp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; u32 rv; ctp = *((chan_tab_t **)chanid); @@ -747,15 +829,16 @@ kfree(ctp); } +EXPORT_SYMBOL(au1xxx_dbdma_chan_free); -static irqreturn_t +static void dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - u32 intstat; + u32 intstat, flags; u32 chan_index; chan_tab_t *ctp; au1x_ddma_desc_t *dp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; intstat = dbdma_gptr->ddma_intstat; au_sync(); @@ -774,19 +857,26 @@ (ctp->chan_callback)(irq, ctp->chan_callparam, regs); ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); - - return IRQ_HANDLED; } -static void -au1xxx_dbdma_init(void) +static void au1xxx_dbdma_init(void) { + int irq_nr; + dbdma_gptr->ddma_config = 0; dbdma_gptr->ddma_throttle = 0; dbdma_gptr->ddma_inten = 0xffff; au_sync(); - if (request_irq(AU1550_DDMA_INT, dbdma_interrupt, SA_INTERRUPT, +#if defined(CONFIG_SOC_AU1550) + irq_nr = AU1550_DDMA_INT; +#elif defined(CONFIG_SOC_AU1200) + irq_nr = AU1200_DDMA_INT; +#else + #error Unknown Au1x00 SOC +#endif + + if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT, "Au1xxx dbdma", (void *)dbdma_gptr)) printk("Can't get 1550 dbdma irq"); } @@ -797,7 +887,8 @@ chan_tab_t *ctp; au1x_ddma_desc_t *dp; dbdev_tab_t *stp, *dtp; - volatile au1x_dma_chan_t *cp; + au1x_dma_chan_t *cp; + u32 i = 0; ctp = *((chan_tab_t **)chanid); stp = ctp->chan_src; @@ -822,15 +913,64 @@ dp = ctp->chan_desc_base; do { - printk("dp %08x, cmd0 %08x, cmd1 %08x\n", - (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1); - printk("src0 %08x, src1 %08x, dest0 %08x\n", - dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0); - printk("dest1 %08x, stat %08x, nxtptr %08x\n", - dp->dscr_dest1, dp->dscr_stat, dp->dscr_nxtptr); + printk("Dp[%d]= %08x, cmd0 %08x, cmd1 %08x\n", + i++, (u32)dp, dp->dscr_cmd0, dp->dscr_cmd1); + printk("src0 %08x, src1 %08x, dest0 %08x, dest1 %08x\n", + dp->dscr_source0, dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1); + printk("stat %08x, nxtptr %08x\n", + dp->dscr_stat, dp->dscr_nxtptr); dp = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); } while (dp != ctp->chan_desc_base); } +/* Put a descriptor into the DMA ring. + * This updates the source/destination pointers and byte count. + */ +u32 +au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr ) +{ + chan_tab_t *ctp; + au1x_ddma_desc_t *dp; + u32 nbytes=0; + + /* I guess we could check this to be within the + * range of the table...... + */ + ctp = *((chan_tab_t **)chanid); + + /* We should have multiple callers for a particular channel, + * an interrupt doesn't affect this pointer nor the descriptor, + * so no locking should be needed. + */ + dp = ctp->put_ptr; + + /* If the descriptor is valid, we are way ahead of the DMA + * engine, so just return an error condition. + */ + if (dp->dscr_cmd0 & DSCR_CMD0_V) + return 0; + + /* Load up buffer addresses and byte count. + */ + dp->dscr_dest0 = dscr->dscr_dest0; + dp->dscr_source0 = dscr->dscr_source0; + dp->dscr_dest1 = dscr->dscr_dest1; + dp->dscr_source1 = dscr->dscr_source1; + dp->dscr_cmd1 = dscr->dscr_cmd1; + nbytes = dscr->dscr_cmd1; + /* Allow the caller to specifiy if an interrupt is generated */ + dp->dscr_cmd0 &= ~DSCR_CMD0_IE; + dp->dscr_cmd0 |= dscr->dscr_cmd0 | DSCR_CMD0_V; + ctp->chan_ptr->ddma_dbell = 0; + + /* Get next descriptor pointer. + */ + ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + + /* return something not zero. + */ + return nbytes; +} + #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */ diff -urN linux/arch/mips/au1000/common/irq.c linux/arch/mips/au1000/common/irq.c --- linux/arch/mips/au1000/common/irq.c 2005/02/28 13:39:57 1.37 +++ linux/arch/mips/au1000/common/irq.c 2005/03/01 06:33:16 1.38 @@ -488,7 +488,7 @@ intc0_req0 |= au_readl(IC0_REQ0INT); if (!intc0_req0) return; - +#ifdef AU1000_USB_DEV_REQ_INT /* * Because of the tight timing of SETUP token to reply * transactions, the USB devices-side packet complete @@ -499,7 +499,7 @@ do_IRQ(AU1000_USB_DEV_REQ_INT, regs); return; } - +#endif irq = au_ffs(intc0_req0) - 1; intc0_req0 &= ~(1< +#include +#include +#include +#include +#include +#include +#include + +#if defined(CONFIG_BLK_DEV_IDE_AU1XXX) +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef CONFIG_MIPS_PB1200 +#include +#endif + +#ifdef CONFIG_MIPS_DB1200 +#include +#define PB1200_ETH_INT DB1200_ETH_INT +#define PB1200_IDE_INT DB1200_IDE_INT +#endif + +extern void _board_init_irq(void); +extern void (*board_init_irq)(void); + +#ifdef CONFIG_BLK_DEV_IDE_AU1XXX +extern struct ide_ops *ide_ops; +extern struct ide_ops au1xxx_ide_ops; +extern u32 au1xxx_ide_virtbase; +extern u64 au1xxx_ide_physbase; +extern int au1xxx_ide_irq; + +u32 led_base_addr; +/* Ddma */ +chan_tab_t *ide_read_ch, *ide_write_ch; +u32 au1xxx_ide_ddma_enable = 0, switch4ddma = 1; // PIO+ddma + +dbdev_tab_t new_dbdev_tab_element = { DSCR_CMD0_THROTTLE, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 }; +#endif /* end CONFIG_BLK_DEV_IDE_AU1XXX */ + +void board_reset (void) +{ + bcsr->resets = 0; +} + +void __init board_setup(void) +{ + char *argptr = NULL; + u32 pin_func; + +#if 0 + /* Enable PSC1 SYNC for AC97. Normaly done in audio driver, + * but it is board specific code, so put it here. + */ + pin_func = au_readl(SYS_PINFUNC); + au_sync(); + pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1; + au_writel(pin_func, SYS_PINFUNC); + + au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */ + au_sync(); +#endif + +#if defined( CONFIG_I2C_ALGO_AU1550 ) + { + u32 freq0, clksrc; + + /* Select SMBUS in CPLD */ + bcsr->resets &= ~(BCSR_RESETS_PCS0MUX); + + pin_func = au_readl(SYS_PINFUNC); + au_sync(); + pin_func &= ~(3<<17 | 1<<4); + /* Set GPIOs correctly */ + pin_func |= 2<<17; + au_writel(pin_func, SYS_PINFUNC); + au_sync(); + + /* The i2c driver depends on 50Mhz clock */ + freq0 = au_readl(SYS_FREQCTRL0); + au_sync(); + freq0 &= ~(SYS_FC_FRDIV1_MASK | SYS_FC_FS1 | SYS_FC_FE1); + freq0 |= (3<resets bit 12: 0=SMB 1=SPI + */ +#if defined(CONFIG_AU1550_PSC_SPI) && defined(CONFIG_I2C_ALGO_AU1550) + #error I2C and SPI are mutually exclusive. Both are physically connected to PSC0.\ + Refer to Pb1200/Db1200 documentation. +#elif defined( CONFIG_AU1550_PSC_SPI ) + bcsr->resets |= BCSR_RESETS_PCS0MUX; +#elif defined( CONFIG_I2C_ALGO_AU1550 ) + bcsr->resets &= (~BCSR_RESETS_PCS0MUX); +#endif + au_sync(); + +#ifdef CONFIG_MIPS_PB1200 + printk("AMD Alchemy Pb1200 Board\n"); +#endif +#ifdef CONFIG_MIPS_DB1200 + printk("AMD Alchemy Db1200 Board\n"); +#endif +#if 0 + /* Setup Pb1200 External Interrupt Controller */ + { + extern void (*board_init_irq)(void); + extern void _board_init_irq(void); + board_init_irq = _board_init_irq; + } +#endif +} diff -urN linux/arch/mips/au1000/pb1200/init.c linux/arch/mips/au1000/pb1200/init.c --- linux/arch/mips/au1000/pb1200/init.c 2005/01/30 08:01:28 1.1 +++ linux/arch/mips/au1000/pb1200/init.c 2005/03/01 06:33:16 1.2 @@ -0,0 +1,69 @@ +/* + * + * BRIEF MODULE DESCRIPTION + * PB1200 board setup + * + * Copyright 2001 MontaVista Software Inc. + * Author: MontaVista Software, Inc. + * ppopov@mvista.com or source@mvista.com + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +int prom_argc; +char **prom_argv, **prom_envp; +extern void __init prom_init_cmdline(void); +extern char *prom_getenv(char *envname); + +const char *get_system_type(void) +{ + return "Alchemy Pb1200"; +} + +void __init prom_init(void) +{ + unsigned char *memsize_str; + unsigned long memsize; + + prom_argc = (int) fw_arg0; + prom_argv = (char **) fw_arg1; + prom_envp = (char **) fw_arg2; + + mips_machgroup = MACH_GROUP_ALCHEMY; + mips_machtype = MACH_PB1200; + + prom_init_cmdline(); + memsize_str = prom_getenv("memsize"); + if (!memsize_str) { + memsize = 0x08000000; + } else { + memsize = simple_strtol(memsize_str, NULL, 0); + } + add_memory_region(0, memsize, BOOT_MEM_RAM); +} diff -urN linux/arch/mips/au1000/pb1200/irqmap.c linux/arch/mips/au1000/pb1200/irqmap.c --- linux/arch/mips/au1000/pb1200/irqmap.c 2005/01/30 08:01:28 1.1 +++ linux/arch/mips/au1000/pb1200/irqmap.c 2005/03/01 06:33:16 1.2 @@ -0,0 +1,180 @@ +/* + * BRIEF MODULE DESCRIPTION + * Au1xxx irq map table + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#ifdef CONFIG_MIPS_PB1200 +#include +#endif + +#ifdef CONFIG_MIPS_DB1200 +#include +#define PB1200_INT_BEGIN DB1200_INT_BEGIN +#define PB1200_INT_END DB1200_INT_END +#endif + +au1xxx_irq_map_t au1xxx_irq_map[] = { + { AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade +}; + +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); + +/* + * Support for External interrupts on the PbAu1200 Development platform. + */ +static volatile int pb1200_cascade_en=0; + +void pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs) +{ + unsigned short bisr = bcsr->int_status; + int extirq_nr = 0; + + /* Clear all the edge interrupts. This has no effect on level */ + bcsr->int_status = bisr; + for( ; bisr; bisr &= (bisr-1) ) + { + extirq_nr = (PB1200_INT_BEGIN-1) + au_ffs(bisr); + /* Ack and dispatch IRQ */ + do_IRQ(extirq_nr,regs); + } +} + +inline void pb1200_enable_irq(unsigned int irq_nr) +{ + bcsr->intset_mask = 1<<(irq_nr - PB1200_INT_BEGIN); + bcsr->intset = 1<<(irq_nr - PB1200_INT_BEGIN); +} + +inline void pb1200_disable_irq(unsigned int irq_nr) +{ + bcsr->intclr_mask = 1<<(irq_nr - PB1200_INT_BEGIN); + bcsr->intclr = 1<<(irq_nr - PB1200_INT_BEGIN); +} + +static unsigned int pb1200_startup_irq( unsigned int irq_nr ) +{ + if (++pb1200_cascade_en == 1) + { + request_irq(AU1000_GPIO_7, &pb1200_cascade_handler, + 0, "Pb1200 Cascade", &pb1200_cascade_handler ); +#ifdef CONFIG_MIPS_PB1200 + /* We have a problem with CPLD rev3. Enable a workaround */ + if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3) + { + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("Pb1200 must be at CPLD rev4. Please have Pb1200\n"); + printk("updated to latest revision. This software will not\n"); + printk("work on anything less than CPLD rev4\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + printk("\nWARNING!!!\n"); + while(1); + } +#endif + } + pb1200_enable_irq(irq_nr); + return 0; +} + +static void pb1200_shutdown_irq( unsigned int irq_nr ) +{ + pb1200_disable_irq(irq_nr); + if (--pb1200_cascade_en == 0) + { + free_irq(AU1000_GPIO_7,&pb1200_cascade_handler ); + } + return; +} + +static inline void pb1200_mask_and_ack_irq(unsigned int irq_nr) +{ + pb1200_disable_irq( irq_nr ); +} + +static void pb1200_end_irq(unsigned int irq_nr) +{ + if (!(irq_desc[irq_nr].status & (IRQ_DISABLED|IRQ_INPROGRESS))) { + pb1200_enable_irq(irq_nr); + } +} + +static struct hw_interrupt_type external_irq_type = +{ +#ifdef CONFIG_MIPS_PB1200 + "Pb1200 Ext", +#endif +#ifdef CONFIG_MIPS_DB1200 + "Db1200 Ext", +#endif + pb1200_startup_irq, + pb1200_shutdown_irq, + pb1200_enable_irq, + pb1200_disable_irq, + pb1200_mask_and_ack_irq, + pb1200_end_irq, + NULL +}; + +void _board_init_irq(void) +{ + int irq_nr; + + for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++) + { + irq_desc[irq_nr].handler = &external_irq_type; + pb1200_disable_irq(irq_nr); + } + + /* GPIO_7 can not be hooked here, so it is hooked upon first + request of any source attached to the cascade */ +} + diff -urN linux/arch/mips/kernel/cpu-probe.c linux/arch/mips/kernel/cpu-probe.c --- linux/arch/mips/kernel/cpu-probe.c 2004/10/27 14:42:39 1.39 +++ linux/arch/mips/kernel/cpu-probe.c 2005/03/01 06:33:16 1.40 @@ -116,6 +116,8 @@ case CPU_AU1000: case CPU_AU1100: case CPU_AU1500: + case CPU_AU1550: + case CPU_AU1200: if (au1k_wait_ptr != NULL) { cpu_wait = au1k_wait_ptr; printk(" available.\n"); @@ -511,6 +513,9 @@ case 3: c->cputype = CPU_AU1550; break; + case 4: + c->cputype = CPU_AU1200; + break; default: panic("Unknown Au Core!"); break; diff -urN linux/arch/mips/kernel/proc.c linux/arch/mips/kernel/proc.c --- linux/arch/mips/kernel/proc.c 2005/02/21 21:34:24 1.54 +++ linux/arch/mips/kernel/proc.c 2005/03/01 06:33:17 1.55 @@ -60,6 +60,9 @@ [CPU_TX3927] "TX3927", [CPU_AU1000] "Au1000", [CPU_AU1500] "Au1500", + [CPU_AU1100] "Au1100", + [CPU_AU1550] "Au1550", + [CPU_AU1200] "Au1200", [CPU_4KEC] "MIPS 4KEc", [CPU_4KSC] "MIPS 4KSc", [CPU_VR41XX] "NEC Vr41xx", diff -urN linux/arch/mips/mm/c-r4k.c linux/arch/mips/mm/c-r4k.c --- linux/arch/mips/mm/c-r4k.c 2005/02/19 13:32:02 1.104 +++ linux/arch/mips/mm/c-r4k.c 2005/03/01 06:33:17 1.105 @@ -1037,7 +1037,11 @@ c->icache.flags |= MIPS_CACHE_VTAG; break; + case CPU_AU1000: case CPU_AU1500: + case CPU_AU1100: + case CPU_AU1550: + case CPU_AU1200: c->icache.flags |= MIPS_CACHE_IC_F_DC; break; } diff -urN linux/arch/mips/mm/tlbex.c linux/arch/mips/mm/tlbex.c --- linux/arch/mips/mm/tlbex.c 2005/01/12 16:38:50 1.16 +++ linux/arch/mips/mm/tlbex.c 2005/03/01 06:33:17 1.17 @@ -840,6 +840,7 @@ case CPU_AU1100: case CPU_AU1500: case CPU_AU1550: + case CPU_AU1200: i_nop(p); tlbw(p); break; diff -urN linux/include/asm-mips/bootinfo.h linux/include/asm-mips/bootinfo.h --- linux/include/asm-mips/bootinfo.h 2004/12/15 14:08:18 1.79 +++ linux/include/asm-mips/bootinfo.h 2005/03/01 06:33:17 1.80 @@ -177,6 +177,8 @@ #define MACH_MTX1 7 /* 4G MTX-1 Au1500-based board */ #define MACH_PB1550 8 /* Au1550-based eval board */ #define MACH_DB1550 9 /* Au1550-based eval board */ +#define MACH_PB1200 10 /* Au1200-based eval board */ +#define MACH_DB1200 11 /* Au1200-based eval board */ /* * Valid machtype for group NEC_VR41XX diff -urN linux/include/asm-mips/cpu.h linux/include/asm-mips/cpu.h --- linux/include/asm-mips/cpu.h 2005/02/07 21:52:35 1.53 +++ linux/include/asm-mips/cpu.h 2005/03/01 06:33:17 1.54 @@ -182,7 +182,8 @@ #define CPU_VR4133 56 #define CPU_AU1550 57 #define CPU_24K 58 -#define CPU_LAST 58 +#define CPU_AU1200 59 +#define CPU_LAST 59 /* * ISA Level encodings diff -urN linux/include/asm-mips/mach-au1x00/au1000.h linux/include/asm-mips/mach-au1x00/au1000.h --- linux/include/asm-mips/mach-au1x00/au1000.h 2005/01/15 01:31:03 1.13 +++ linux/include/asm-mips/mach-au1x00/au1000.h 2005/03/01 06:33:19 1.14 @@ -162,28 +162,356 @@ #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) #endif -/* SDRAM Controller */ +/* + * SDRAM Register Offsets + */ #if defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1100) -#define MEM_SDMODE0 0xB4000000 -#define MEM_SDMODE1 0xB4000004 -#define MEM_SDMODE2 0xB4000008 - -#define MEM_SDADDR0 0xB400000C -#define MEM_SDADDR1 0xB4000010 -#define MEM_SDADDR2 0xB4000014 - -#define MEM_SDREFCFG 0xB4000018 -#define MEM_SDPRECMD 0xB400001C -#define MEM_SDAUTOREF 0xB4000020 - -#define MEM_SDWRMD0 0xB4000024 -#define MEM_SDWRMD1 0xB4000028 -#define MEM_SDWRMD2 0xB400002C +#define MEM_SDMODE0 (0x0000) +#define MEM_SDMODE1 (0x0004) +#define MEM_SDMODE2 (0x0008) +#define MEM_SDADDR0 (0x000C) +#define MEM_SDADDR1 (0x0010) +#define MEM_SDADDR2 (0x0014) +#define MEM_SDREFCFG (0x0018) +#define MEM_SDPRECMD (0x001C) +#define MEM_SDAUTOREF (0x0020) +#define MEM_SDWRMD0 (0x0024) +#define MEM_SDWRMD1 (0x0028) +#define MEM_SDWRMD2 (0x002C) +#define MEM_SDSLEEP (0x0030) +#define MEM_SDSMCKE (0x0034) + +#ifndef ASSEMBLER +/*typedef volatile struct +{ + uint32 sdmode0; + uint32 sdmode1; + uint32 sdmode2; + uint32 sdaddr0; + uint32 sdaddr1; + uint32 sdaddr2; + uint32 sdrefcfg; + uint32 sdautoref; + uint32 sdwrmd0; + uint32 sdwrmd1; + uint32 sdwrmd2; + uint32 sdsleep; + uint32 sdsmcke; + +} AU1X00_SDRAM;*/ +#endif + +/* + * MEM_SDMODE register content definitions + */ +#define MEM_SDMODE_F (1<<22) +#define MEM_SDMODE_SR (1<<21) +#define MEM_SDMODE_BS (1<<20) +#define MEM_SDMODE_RS (3<<18) +#define MEM_SDMODE_CS (7<<15) +#define MEM_SDMODE_TRAS (15<<11) +#define MEM_SDMODE_TMRD (3<<9) +#define MEM_SDMODE_TWR (3<<7) +#define MEM_SDMODE_TRP (3<<5) +#define MEM_SDMODE_TRCD (3<<3) +#define MEM_SDMODE_TCL (7<<0) + +#define MEM_SDMODE_BS_2Bank (0<<20) +#define MEM_SDMODE_BS_4Bank (1<<20) +#define MEM_SDMODE_RS_11Row (0<<18) +#define MEM_SDMODE_RS_12Row (1<<18) +#define MEM_SDMODE_RS_13Row (2<<18) +#define MEM_SDMODE_RS_N(N) ((N)<<18) +#define MEM_SDMODE_CS_7Col (0<<15) +#define MEM_SDMODE_CS_8Col (1<<15) +#define MEM_SDMODE_CS_9Col (2<<15) +#define MEM_SDMODE_CS_10Col (3<<15) +#define MEM_SDMODE_CS_11Col (4<<15) +#define MEM_SDMODE_CS_N(N) ((N)<<15) +#define MEM_SDMODE_TRAS_N(N) ((N)<<11) +#define MEM_SDMODE_TMRD_N(N) ((N)<<9) +#define MEM_SDMODE_TWR_N(N) ((N)<<7) +#define MEM_SDMODE_TRP_N(N) ((N)<<5) +#define MEM_SDMODE_TRCD_N(N) ((N)<<3) +#define MEM_SDMODE_TCL_N(N) ((N)<<0) + +/* + * MEM_SDADDR register contents definitions + */ +#define MEM_SDADDR_E (1<<20) +#define MEM_SDADDR_CSBA (0x03FF<<10) +#define MEM_SDADDR_CSMASK (0x03FF<<0) +#define MEM_SDADDR_CSBA_N(N) ((N)&(0x03FF<<22)>>12) +#define MEM_SDADDR_CSMASK_N(N) ((N)&(0x03FF<<22)>>22) + +/* + * MEM_SDREFCFG register content definitions + */ +#define MEM_SDREFCFG_TRC (15<<28) +#define MEM_SDREFCFG_TRPM (3<<26) +#define MEM_SDREFCFG_E (1<<25) +#define MEM_SDREFCFG_RE (0x1ffffff<<0) +#define MEM_SDREFCFG_TRC_N(N) ((N)< +#include + +// This is defined in au1000.h with bogus value +#undef AU1X00_EXTERNAL_INT + +#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX +#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX +#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC1_TX +#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC1_RX + +/* SPI and SMB are muxed on the Pb1200 board. + Refer to board documentation. + */ +#define SPI_PSC_BASE PSC0_BASE_ADDR +#define SMBUS_PSC_BASE PSC0_BASE_ADDR +/* AC97 and I2S are muxed on the Pb1200 board. + Refer to board documentation. + */ +#define AC97_PSC_BASE PSC1_BASE_ADDR +#define I2S_PSC_BASE PSC1_BASE_ADDR + +#define BCSR_KSEG1_ADDR 0xB9800000 + +typedef volatile struct +{ + /*00*/ u16 whoami; + u16 reserved0; + /*04*/ u16 status; + u16 reserved1; + /*08*/ u16 switches; + u16 reserved2; + /*0C*/ u16 resets; + u16 reserved3; + + /*10*/ u16 pcmcia; + u16 reserved4; + /*14*/ u16 board; + u16 reserved5; + /*18*/ u16 disk_leds; + u16 reserved6; + /*1C*/ u16 system; + u16 reserved7; + + /*20*/ u16 intclr; + u16 reserved8; + /*24*/ u16 intset; + u16 reserved9; + /*28*/ u16 intclr_mask; + u16 reserved10; + /*2C*/ u16 intset_mask; + u16 reserved11; + + /*30*/ u16 sig_status; + u16 reserved12; + /*34*/ u16 int_status; + u16 reserved13; + /*38*/ u16 reserved14; + u16 reserved15; + /*3C*/ u16 reserved16; + u16 reserved17; + +} BCSR; + +static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; + +/* + * Register bit definitions for the BCSRs + */ +#define BCSR_WHOAMI_DCID 0x000F +#define BCSR_WHOAMI_CPLD 0x00F0 +#define BCSR_WHOAMI_BOARD 0x0F00 + +#define BCSR_STATUS_PCMCIA0VS 0x0003 +#define BCSR_STATUS_PCMCIA1VS 0x000C +#define BCSR_STATUS_SWAPBOOT 0x0040 +#define BCSR_STATUS_FLASHBUSY 0x0100 +#define BCSR_STATUS_IDECBLID 0x0200 +#define BCSR_STATUS_SD0WP 0x0400 +#define BCSR_STATUS_U0RXD 0x1000 +#define BCSR_STATUS_U1RXD 0x2000 + +#define BCSR_SWITCHES_OCTAL 0x00FF +#define BCSR_SWITCHES_DIP_1 0x0080 +#define BCSR_SWITCHES_DIP_2 0x0040 +#define BCSR_SWITCHES_DIP_3 0x0020 +#define BCSR_SWITCHES_DIP_4 0x0010 +#define BCSR_SWITCHES_DIP_5 0x0008 +#define BCSR_SWITCHES_DIP_6 0x0004 +#define BCSR_SWITCHES_DIP_7 0x0002 +#define BCSR_SWITCHES_DIP_8 0x0001 +#define BCSR_SWITCHES_ROTARY 0x0F00 + +#define BCSR_RESETS_ETH 0x0001 +#define BCSR_RESETS_CAMERA 0x0002 +#define BCSR_RESETS_DC 0x0004 +#define BCSR_RESETS_IDE 0x0008 +#define BCSR_RESETS_TV 0x0010 +/* not resets but in the same register */ +#define BCSR_RESETS_PWMR1mUX 0x0800 +#define BCSR_RESETS_PCS0MUX 0x1000 +#define BCSR_RESETS_PCS1MUX 0x2000 +#define BCSR_RESETS_SPISEL 0x4000 + +#define BCSR_PCMCIA_PC0VPP 0x0003 +#define BCSR_PCMCIA_PC0VCC 0x000C +#define BCSR_PCMCIA_PC0DRVEN 0x0010 +#define BCSR_PCMCIA_PC0RST 0x0080 +#define BCSR_PCMCIA_PC1VPP 0x0300 +#define BCSR_PCMCIA_PC1VCC 0x0C00 +#define BCSR_PCMCIA_PC1DRVEN 0x1000 +#define BCSR_PCMCIA_PC1RST 0x8000 + +#define BCSR_BOARD_LCDVEE 0x0001 +#define BCSR_BOARD_LCDVDD 0x0002 +#define BCSR_BOARD_LCDBL 0x0004 +#define BCSR_BOARD_CAMSNAP 0x0010 +#define BCSR_BOARD_CAMPWR 0x0020 +#define BCSR_BOARD_SD0PWR 0x0040 + +#define BCSR_LEDS_DECIMALS 0x0003 +#define BCSR_LEDS_LED0 0x0100 +#define BCSR_LEDS_LED1 0x0200 +#define BCSR_LEDS_LED2 0x0400 +#define BCSR_LEDS_LED3 0x0800 + +#define BCSR_SYSTEM_POWEROFF 0x4000 +#define BCSR_SYSTEM_RESET 0x8000 + +/* Bit positions for the different interrupt sources */ +#define BCSR_INT_IDE 0x0001 +#define BCSR_INT_ETH 0x0002 +#define BCSR_INT_PC0 0x0004 +#define BCSR_INT_PC0STSCHG 0x0008 +#define BCSR_INT_PC1 0x0010 +#define BCSR_INT_PC1STSCHG 0x0020 +#define BCSR_INT_DC 0x0040 +#define BCSR_INT_FLASHBUSY 0x0080 +#define BCSR_INT_PC0INSERT 0x0100 +#define BCSR_INT_PC0EJECT 0x0200 +#define BCSR_INT_PC1INSERT 0x0400 +#define BCSR_INT_PC1EJECT 0x0800 +#define BCSR_INT_SD0INSERT 0x1000 +#define BCSR_INT_SD0EJECT 0x2000 + +#define AU1XXX_SMC91111_PHYS_ADDR (0x19000300) +#define AU1XXX_SMC91111_IRQ DB1200_ETH_INT + +#define AU1XXX_ATA_PHYS_ADDR (0x18800000) +#define AU1XXX_ATA_PHYS_LEN (0x100) +#define AU1XXX_ATA_REG_OFFSET (5) +#define AU1XXX_ATA_INT DB1200_IDE_INT +#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1; +#define AU1XXX_ATA_RQSIZE 128 + +#define NAND_PHYS_ADDR 0x20000000 + +/* + * External Interrupts for Pb1200 as of 8/6/2004. + * Bit positions in the CPLD registers can be calculated by taking + * the interrupt define and subtracting the DB1200_INT_BEGIN value. + * *example: IDE bis pos is = 64 - 64 + ETH bit pos is = 65 - 64 + */ +#define DB1200_INT_BEGIN (AU1000_LAST_INTC1_INT + 1) +#define DB1200_IDE_INT (DB1200_INT_BEGIN + 0) +#define DB1200_ETH_INT (DB1200_INT_BEGIN + 1) +#define DB1200_PC0_INT (DB1200_INT_BEGIN + 2) +#define DB1200_PC0_STSCHG_INT (DB1200_INT_BEGIN + 3) +#define DB1200_PC1_INT (DB1200_INT_BEGIN + 4) +#define DB1200_PC1_STSCHG_INT (DB1200_INT_BEGIN + 5) +#define DB1200_DC_INT (DB1200_INT_BEGIN + 6) +#define DB1200_FLASHBUSY_INT (DB1200_INT_BEGIN + 7) +#define DB1200_PC0_INSERT_INT (DB1200_INT_BEGIN + 8) +#define DB1200_PC0_EJECT_INT (DB1200_INT_BEGIN + 9) +#define DB1200_PC1_INSERT_INT (DB1200_INT_BEGIN + 10) +#define DB1200_PC1_EJECT_INT (DB1200_INT_BEGIN + 11) +#define DB1200_SD0_INSERT_INT (DB1200_INT_BEGIN + 12) +#define DB1200_SD0_EJECT_INT (DB1200_INT_BEGIN + 13) + +#define DB1200_INT_END (DB1200_INT_BEGIN + 15) + +/* For drivers/pcmcia/au1000_db1x00.c */ +#define BOARD_PC0_INT DB1200_PC0_INT +#define BOARD_PC1_INT DB1200_PC1_INT +#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) + +#endif /* __ASM_DB1200_H */ + diff -urN linux/include/asm-mips/mach-pb1x00/pb1200.h linux/include/asm-mips/mach-pb1x00/pb1200.h --- linux/include/asm-mips/mach-pb1x00/pb1200.h 1970/01/01 00:00:00 +++ linux/include/asm-mips/mach-pb1x00/pb1200.h Tue Mar 1 06:33:19 2005 1.1 @@ -0,0 +1,245 @@ +/* + * AMD Alchemy PB1200 Referrence Board + * Board Registers defines. + * + * ######################################################################## + * + * This program is free software; you can distribute it and/or modify it + * under the terms of the GNU General Public License (Version 2) as + * published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + * ######################################################################## + * + * + */ +#ifndef __ASM_PB1200_H +#define __ASM_PB1200_H + +#include +#include + +// This is defined in au1000.h with bogus value +#undef AU1X00_EXTERNAL_INT + +#define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX +#define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX +#define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC1_TX +#define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC1_RX + +/* SPI and SMB are muxed on the Pb1200 board. + Refer to board documentation. + */ +#define SPI_PSC_BASE PSC0_BASE_ADDR +#define SMBUS_PSC_BASE PSC0_BASE_ADDR +/* AC97 and I2S are muxed on the Pb1200 board. + Refer to board documentation. + */ +#define AC97_PSC_BASE PSC1_BASE_ADDR +#define I2S_PSC_BASE PSC1_BASE_ADDR + +#define BCSR_KSEG1_ADDR 0xAD800000 + +typedef volatile struct +{ + /*00*/ u16 whoami; + u16 reserved0; + /*04*/ u16 status; + u16 reserved1; + /*08*/ u16 switches; + u16 reserved2; + /*0C*/ u16 resets; + u16 reserved3; + + /*10*/ u16 pcmcia; + u16 reserved4; + /*14*/ u16 board; + u16 reserved5; + /*18*/ u16 disk_leds; + u16 reserved6; + /*1C*/ u16 system; + u16 reserved7; + + /*20*/ u16 intclr; + u16 reserved8; + /*24*/ u16 intset; + u16 reserved9; + /*28*/ u16 intclr_mask; + u16 reserved10; + /*2C*/ u16 intset_mask; + u16 reserved11; + + /*30*/ u16 sig_status; + u16 reserved12; + /*34*/ u16 int_status; + u16 reserved13; + /*38*/ u16 reserved14; + u16 reserved15; + /*3C*/ u16 reserved16; + u16 reserved17; + +} BCSR; + +static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; + +/* + * Register bit definitions for the BCSRs + */ +#define BCSR_WHOAMI_DCID 0x000F +#define BCSR_WHOAMI_CPLD 0x00F0 +#define BCSR_WHOAMI_BOARD 0x0F00 + +#define BCSR_STATUS_PCMCIA0VS 0x0003 +#define BCSR_STATUS_PCMCIA1VS 0x000C +#define BCSR_STATUS_SWAPBOOT 0x0040 +#define BCSR_STATUS_FLASHBUSY 0x0100 +#define BCSR_STATUS_IDECBLID 0x0200 +#define BCSR_STATUS_SD0WP 0x0400 +#define BCSR_STATUS_SD1WP 0x0800 +#define BCSR_STATUS_U0RXD 0x1000 +#define BCSR_STATUS_U1RXD 0x2000 + +#define BCSR_SWITCHES_OCTAL 0x00FF +#define BCSR_SWITCHES_DIP_1 0x0080 +#define BCSR_SWITCHES_DIP_2 0x0040 +#define BCSR_SWITCHES_DIP_3 0x0020 +#define BCSR_SWITCHES_DIP_4 0x0010 +#define BCSR_SWITCHES_DIP_5 0x0008 +#define BCSR_SWITCHES_DIP_6 0x0004 +#define BCSR_SWITCHES_DIP_7 0x0002 +#define BCSR_SWITCHES_DIP_8 0x0001 +#define BCSR_SWITCHES_ROTARY 0x0F00 + +#define BCSR_RESETS_ETH 0x0001 +#define BCSR_RESETS_CAMERA 0x0002 +#define BCSR_RESETS_DC 0x0004 +#define BCSR_RESETS_IDE 0x0008 +/* not resets but in the same register */ +#define BCSR_RESETS_WSCFSM 0x0800 +#define BCSR_RESETS_PCS0MUX 0x1000 +#define BCSR_RESETS_PCS1MUX 0x2000 +#define BCSR_RESETS_SPISEL 0x4000 +#define BCSR_RESETS_SD1MUX 0x8000 + +#define BCSR_PCMCIA_PC0VPP 0x0003 +#define BCSR_PCMCIA_PC0VCC 0x000C +#define BCSR_PCMCIA_PC0DRVEN 0x0010 +#define BCSR_PCMCIA_PC0RST 0x0080 +#define BCSR_PCMCIA_PC1VPP 0x0300 +#define BCSR_PCMCIA_PC1VCC 0x0C00 +#define BCSR_PCMCIA_PC1DRVEN 0x1000 +#define BCSR_PCMCIA_PC1RST 0x8000 + +#define BCSR_BOARD_LCDVEE 0x0001 +#define BCSR_BOARD_LCDVDD 0x0002 +#define BCSR_BOARD_LCDBL 0x0004 +#define BCSR_BOARD_CAMSNAP 0x0010 +#define BCSR_BOARD_CAMPWR 0x0020 +#define BCSR_BOARD_SD0PWR 0x0040 +#define BCSR_BOARD_SD1PWR 0x0080 + +#define BCSR_LEDS_DECIMALS 0x00FF +#define BCSR_LEDS_LED0 0x0100 +#define BCSR_LEDS_LED1 0x0200 +#define BCSR_LEDS_LED2 0x0400 +#define BCSR_LEDS_LED3 0x0800 + +#define BCSR_SYSTEM_VDDI 0x001F +#define BCSR_SYSTEM_POWEROFF 0x4000 +#define BCSR_SYSTEM_RESET 0x8000 + +/* Bit positions for the different interrupt sources */ +#define BCSR_INT_IDE 0x0001 +#define BCSR_INT_ETH 0x0002 +#define BCSR_INT_PC0 0x0004 +#define BCSR_INT_PC0STSCHG 0x0008 +#define BCSR_INT_PC1 0x0010 +#define BCSR_INT_PC1STSCHG 0x0020 +#define BCSR_INT_DC 0x0040 +#define BCSR_INT_FLASHBUSY 0x0080 +#define BCSR_INT_PC0INSERT 0x0100 +#define BCSR_INT_PC0EJECT 0x0200 +#define BCSR_INT_PC1INSERT 0x0400 +#define BCSR_INT_PC1EJECT 0x0800 +#define BCSR_INT_SD0INSERT 0x1000 +#define BCSR_INT_SD0EJECT 0x2000 +#define BCSR_INT_SD1INSERT 0x4000 +#define BCSR_INT_SD1EJECT 0x8000 + +#define AU1XXX_SMC91111_PHYS_ADDR (0x0D000300) +#define AU1XXX_SMC91111_IRQ PB1200_ETH_INT + +#define AU1XXX_ATA_PHYS_ADDR (0x0C800000) +#define AU1XXX_ATA_PHYS_LEN (0x100) +#define AU1XXX_ATA_REG_OFFSET (5) +#define AU1XXX_ATA_INT PB1200_IDE_INT +#define AU1XXX_ATA_DDMA_REQ DSCR_CMD0_DMA_REQ1; +#define AU1XXX_ATA_RQSIZE 128 + +#define NAND_PHYS_ADDR 0x1C000000 + +/* Timing values as described in databook, * ns value stripped of + * lower 2 bits. + * These defines are here rather than an SOC1200 generic file because + * the parts chosen on another board may be different and may require + * different timings. + */ +#define NAND_T_H (18 >> 2) +#define NAND_T_PUL (30 >> 2) +#define NAND_T_SU (30 >> 2) +#define NAND_T_WH (30 >> 2) + +/* Bitfield shift amounts */ +#define NAND_T_H_SHIFT 0 +#define NAND_T_PUL_SHIFT 4 +#define NAND_T_SU_SHIFT 8 +#define NAND_T_WH_SHIFT 12 + +#define NAND_TIMING ((NAND_T_H & 0xF) << NAND_T_H_SHIFT) | \ + ((NAND_T_PUL & 0xF) << NAND_T_PUL_SHIFT) | \ + ((NAND_T_SU & 0xF) << NAND_T_SU_SHIFT) | \ + ((NAND_T_WH & 0xF) << NAND_T_WH_SHIFT) + + +/* + * External Interrupts for Pb1200 as of 8/6/2004. + * Bit positions in the CPLD registers can be calculated by taking + * the interrupt define and subtracting the PB1200_INT_BEGIN value. + * *example: IDE bis pos is = 64 - 64 + ETH bit pos is = 65 - 64 + */ +#define PB1200_INT_BEGIN (AU1000_LAST_INTC1_INT + 1) +#define PB1200_IDE_INT (PB1200_INT_BEGIN + 0) +#define PB1200_ETH_INT (PB1200_INT_BEGIN + 1) +#define PB1200_PC0_INT (PB1200_INT_BEGIN + 2) +#define PB1200_PC0_STSCHG_INT (PB1200_INT_BEGIN + 3) +#define PB1200_PC1_INT (PB1200_INT_BEGIN + 4) +#define PB1200_PC1_STSCHG_INT (PB1200_INT_BEGIN + 5) +#define PB1200_DC_INT (PB1200_INT_BEGIN + 6) +#define PB1200_FLASHBUSY_INT (PB1200_INT_BEGIN + 7) +#define PB1200_PC0_INSERT_INT (PB1200_INT_BEGIN + 8) +#define PB1200_PC0_EJECT_INT (PB1200_INT_BEGIN + 9) +#define PB1200_PC1_INSERT_INT (PB1200_INT_BEGIN + 10) +#define PB1200_PC1_EJECT_INT (PB1200_INT_BEGIN + 11) +#define PB1200_SD0_INSERT_INT (PB1200_INT_BEGIN + 12) +#define PB1200_SD0_EJECT_INT (PB1200_INT_BEGIN + 13) +#define PB1200_SD1_INSERT_INT (PB1200_INT_BEGIN + 14) +#define PB1200_SD1_EJECT_INT (PB1200_INT_BEGIN + 15) + +#define PB1200_INT_END (PB1200_INT_BEGIN + 15) + +/* For drivers/pcmcia/au1000_db1x00.c */ +#define BOARD_PC0_INT PB1200_PC0_INT +#define BOARD_PC1_INT PB1200_PC1_INT +#define BOARD_CARD_INSERTED(SOCKET) bcsr->sig_status & (1<<(8+(2*SOCKET))) + +#endif /* __ASM_PB1200_H */ + From ppopov@linux-mips.org Tue Mar 1 07:54:57 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 07:54:57 +0000 (GMT) From: ppopov@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 07:54:57 +0000 X-archive-position: 304 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ppopov@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ppopov@ftp.linux-mips.org 05/03/01 07:54:51 Modified files: arch/mips/au1000/common: dbdma.c arch/mips/au1000/db1x00: irqmap.c arch/mips/au1000/mtx-1: irqmap.c arch/mips/au1000/pb1500: irqmap.c arch/mips/au1000/pb1550: irqmap.c arch/mips/pci : fixup-au1000.c include/asm-mips/mach-au1x00: au1000.h Log message: Moved irq_tab_alchemy to the board specific irqmap.c files. Cleaned up a to of warnings in dbdma.c. diff -urN linux/arch/mips/au1000/common/dbdma.c linux/arch/mips/au1000/common/dbdma.c --- linux/arch/mips/au1000/common/dbdma.c 2005/03/01 06:33:16 1.12 +++ linux/arch/mips/au1000/common/dbdma.c 2005/03/01 07:54:50 1.13 @@ -39,11 +39,11 @@ #include #include #include +#include #include #include #include -/* #include */ #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) @@ -596,10 +596,10 @@ * these parts. If it is fixedin the future, these dma_cache_inv will * just be nothing more than empty macros. See io.h. * */ - dma_cache_wback_inv(buf,nbytes); + dma_cache_wback_inv((unsigned long)buf, nbytes); dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ au_sync(); - dma_cache_wback_inv(dp, sizeof(dp)); + dma_cache_wback_inv((unsigned long)dp, sizeof(dp)); ctp->chan_ptr->ddma_dbell = 0; /* return something not zero. @@ -657,10 +657,10 @@ * parts. If it is fixedin the future, these dma_cache_inv will just * be nothing more than empty macros. See io.h. * */ - dma_cache_inv(buf,nbytes); + dma_cache_inv((unsigned long)buf,nbytes); dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ au_sync(); - dma_cache_wback_inv(dp, sizeof(dp)); + dma_cache_wback_inv((unsigned long)dp, sizeof(dp)); ctp->chan_ptr->ddma_dbell = 0; /* Get next descriptor pointer. @@ -821,7 +821,7 @@ au1xxx_dbdma_stop(chanid); if (ctp->chan_desc_base != NULL) - kfree(ctp->chan_desc_base); + kfree((void *)ctp->chan_desc_base); stp->dev_flags &= ~DEV_FLAGS_INUSE; dtp->dev_flags &= ~DEV_FLAGS_INUSE; @@ -831,11 +831,11 @@ } EXPORT_SYMBOL(au1xxx_dbdma_chan_free); -static void +static irqreturn_t dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - u32 intstat, flags; - u32 chan_index; + u32 intstat; + u32 chan_index; chan_tab_t *ctp; au1x_ddma_desc_t *dp; au1x_dma_chan_t *cp; @@ -857,6 +857,7 @@ (ctp->chan_callback)(irq, ctp->chan_callparam, regs); ctp->cur_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); + return IRQ_RETVAL(1); } static void au1xxx_dbdma_init(void) diff -urN linux/arch/mips/au1000/db1x00/irqmap.c linux/arch/mips/au1000/db1x00/irqmap.c --- linux/arch/mips/au1000/db1x00/irqmap.c 2004/10/25 20:44:16 1.8 +++ linux/arch/mips/au1000/db1x00/irqmap.c 2005/03/01 07:54:50 1.9 @@ -48,6 +48,38 @@ #include #include +#ifdef CONFIG_MIPS_DB1500 +char irq_tab_alchemy[][5] __initdata = { + [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - HPT371 */ + [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ +}; +#endif + +#ifdef CONFIG_MIPS_BOSPORUS +char irq_tab_alchemy[][5] __initdata = { + [11] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 11 - miniPCI */ + [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - SN1741 */ + [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ +}; +#endif + +#ifdef CONFIG_MIPS_MIRAGE +char irq_tab_alchemy[][5] __initdata = { + [11] = { -1, INTD, INTX, INTX, INTX}, /* IDSEL 11 - SMI VGX */ + [12] = { -1, INTX, INTX, INTC, INTX}, /* IDSEL 12 - PNX1300 */ + [13] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 13 - miniPCI */ +}; +#endif + +#ifdef CONFIG_MIPS_DB1550 +char irq_tab_alchemy[][5] __initdata = { + [11] = { -1, INTC, INTX, INTX, INTX}, /* IDSEL 11 - on-board HPT371 */ + [12] = { -1, INTB, INTC, INTD, INTA}, /* IDSEL 12 - PCI slot 2 (left) */ + [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ +}; +#endif + + au1xxx_irq_map_t au1xxx_irq_map[] = { #ifndef CONFIG_MIPS_MIRAGE diff -urN linux/arch/mips/au1000/mtx-1/irqmap.c linux/arch/mips/au1000/mtx-1/irqmap.c --- linux/arch/mips/au1000/mtx-1/irqmap.c 2004/12/03 08:55:48 1.5 +++ linux/arch/mips/au1000/mtx-1/irqmap.c 2005/03/01 07:54:50 1.6 @@ -47,6 +47,17 @@ #include #include +char irq_tab_alchemy[][5] __initdata = { + [0] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 00 - AdapterA-Slot0 (top) */ + [1] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 01 - AdapterA-Slot1 (bottom) */ + [2] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 02 - AdapterB-Slot0 (top) */ + [3] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 03 - AdapterB-Slot1 (bottom) */ + [4] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 04 - AdapterC-Slot0 (top) */ + [5] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 05 - AdapterC-Slot1 (bottom) */ + [6] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 06 - AdapterD-Slot0 (top) */ + [7] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 07 - AdapterD-Slot1 (bottom) */ +}; + au1xxx_irq_map_t au1xxx_irq_map[] = { { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, diff -urN linux/arch/mips/au1000/pb1500/irqmap.c linux/arch/mips/au1000/pb1500/irqmap.c --- linux/arch/mips/au1000/pb1500/irqmap.c 2004/10/25 20:44:16 1.5 +++ linux/arch/mips/au1000/pb1500/irqmap.c 2005/03/01 07:54:50 1.6 @@ -47,6 +47,11 @@ #include #include +char irq_tab_alchemy[][5] __initdata = { + [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - HPT370 */ + [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ +}; + au1xxx_irq_map_t au1xxx_irq_map[] = { { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, diff -urN linux/arch/mips/au1000/pb1550/irqmap.c linux/arch/mips/au1000/pb1550/irqmap.c --- linux/arch/mips/au1000/pb1550/irqmap.c 2004/10/25 20:44:16 1.4 +++ linux/arch/mips/au1000/pb1550/irqmap.c 2005/03/01 07:54:50 1.5 @@ -47,6 +47,11 @@ #include #include +char irq_tab_alchemy[][5] __initdata = { + [12] = { -1, INTB, INTC, INTD, INTA}, /* IDSEL 12 - PCI slot 2 (left) */ + [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ +}; + au1xxx_irq_map_t au1xxx_irq_map[] = { { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, diff -urN linux/arch/mips/pci/fixup-au1000.c linux/arch/mips/pci/fixup-au1000.c --- linux/arch/mips/pci/fixup-au1000.c 2004/12/03 08:55:48 1.14 +++ linux/arch/mips/pci/fixup-au1000.c 2005/03/01 07:54:50 1.15 @@ -34,82 +34,7 @@ #include -/* - * Shortcut - */ -#ifdef CONFIG_SOC_AU1500 -#define INTA AU1000_PCI_INTA -#define INTB AU1000_PCI_INTB -#define INTC AU1000_PCI_INTC -#define INTD AU1000_PCI_INTD -#endif - -#ifdef CONFIG_SOC_AU1550 -#define INTA AU1550_PCI_INTA -#define INTB AU1550_PCI_INTB -#define INTC AU1550_PCI_INTC -#define INTD AU1550_PCI_INTD -#endif - -#define INTX 0xFF /* not valid */ - -#ifdef CONFIG_MIPS_DB1500 -static char irq_tab_alchemy[][5] __initdata = { - [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - HPT371 */ - [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ -}; -#endif - -#ifdef CONFIG_MIPS_BOSPORUS -static char irq_tab_alchemy[][5] __initdata = { - [11] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 11 - miniPCI */ - [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - SN1741 */ - [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ -}; -#endif - -#ifdef CONFIG_MIPS_MIRAGE -static char irq_tab_alchemy[][5] __initdata = { - [11] = { -1, INTD, INTX, INTX, INTX}, /* IDSEL 11 - SMI VGX */ - [12] = { -1, INTX, INTX, INTC, INTX}, /* IDSEL 12 - PNX1300 */ - [13] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 13 - miniPCI */ -}; -#endif - -#ifdef CONFIG_MIPS_DB1550 -static char irq_tab_alchemy[][5] __initdata = { - [11] = { -1, INTC, INTX, INTX, INTX}, /* IDSEL 11 - on-board HPT371 */ - [12] = { -1, INTB, INTC, INTD, INTA}, /* IDSEL 12 - PCI slot 2 (left) */ - [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ -}; -#endif - -#ifdef CONFIG_MIPS_PB1500 -static char irq_tab_alchemy[][5] __initdata = { - [12] = { -1, INTA, INTX, INTX, INTX}, /* IDSEL 12 - HPT370 */ - [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot */ -}; -#endif - -#ifdef CONFIG_MIPS_PB1550 -static char irq_tab_alchemy[][5] __initdata = { - [12] = { -1, INTB, INTC, INTD, INTA}, /* IDSEL 12 - PCI slot 2 (left) */ - [13] = { -1, INTA, INTB, INTC, INTD}, /* IDSEL 13 - PCI slot 1 (right) */ -}; -#endif - -#ifdef CONFIG_MIPS_MTX1 -static char irq_tab_alchemy[][5] __initdata = { - [0] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 00 - AdapterA-Slot0 (top) */ - [1] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 01 - AdapterA-Slot1 (bottom) */ - [2] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 02 - AdapterB-Slot0 (top) */ - [3] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 03 - AdapterB-Slot1 (bottom) */ - [4] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 04 - AdapterC-Slot0 (top) */ - [5] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 05 - AdapterC-Slot1 (bottom) */ - [6] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 06 - AdapterD-Slot0 (top) */ - [7] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 07 - AdapterD-Slot1 (bottom) */ -}; -#endif +extern char irq_tab_alchemy[][5]; int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) { diff -urN linux/include/asm-mips/mach-au1x00/au1000.h linux/include/asm-mips/mach-au1x00/au1000.h --- linux/include/asm-mips/mach-au1x00/au1000.h 2005/03/01 06:33:19 1.14 +++ linux/include/asm-mips/mach-au1x00/au1000.h 2005/03/01 07:54:51 1.15 @@ -757,6 +757,12 @@ #define AU1500_GPIO_207 62 #define AU1500_GPIO_208_215 63 +/* shortcuts */ +#define INTA AU1000_PCI_INTA +#define INTB AU1000_PCI_INTB +#define INTC AU1000_PCI_INTC +#define INTD AU1000_PCI_INTD + #define UART0_ADDR 0xB1100000 #define UART3_ADDR 0xB1400000 @@ -907,6 +913,12 @@ #define AU1500_GPIO_207 62 #define AU1500_GPIO_208_218 63 // Logical or of GPIO208:218 +/* shortcuts */ +#define INTA AU1550_PCI_INTA +#define INTB AU1550_PCI_INTB +#define INTC AU1550_PCI_INTC +#define INTD AU1550_PCI_INTD + #define UART0_ADDR 0xB1100000 #define UART1_ADDR 0xB1200000 #define UART3_ADDR 0xB1400000 @@ -1019,6 +1031,7 @@ #define AU1000_LAST_INTC0_INT 31 #define AU1000_LAST_INTC1_INT 63 #define AU1000_MAX_INTR 63 +#define INTX 0xFF /* not valid */ /* Programmable Counters 0 and 1 */ #define SYS_BASE 0xB1900000 From ralf@linux-mips.org Tue Mar 1 10:39:04 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 10:39:04 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 10:39:04 +0000 X-archive-position: 305 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/01 10:38:58 Modified files: arch/mips/kernel: proc.c Log message: Use ISO C99 initializers instead of that GNU C extension that's deprecated since gcc 2.5 ... diff -urN linux/arch/mips/kernel/proc.c linux/arch/mips/kernel/proc.c --- linux/arch/mips/kernel/proc.c 2005/03/01 06:33:17 1.55 +++ linux/arch/mips/kernel/proc.c 2005/03/01 10:38:58 1.56 @@ -19,66 +19,66 @@ unsigned int vced_count, vcei_count; static const char *cpu_name[] = { - [CPU_UNKNOWN] "unknown", - [CPU_R2000] "R2000", - [CPU_R3000] "R3000", - [CPU_R3000A] "R3000A", - [CPU_R3041] "R3041", - [CPU_R3051] "R3051", - [CPU_R3052] "R3052", - [CPU_R3081] "R3081", - [CPU_R3081E] "R3081E", - [CPU_R4000PC] "R4000PC", - [CPU_R4000SC] "R4000SC", - [CPU_R4000MC] "R4000MC", - [CPU_R4200] "R4200", - [CPU_R4400PC] "R4400PC", - [CPU_R4400SC] "R4400SC", - [CPU_R4400MC] "R4400MC", - [CPU_R4600] "R4600", - [CPU_R6000] "R6000", - [CPU_R6000A] "R6000A", - [CPU_R8000] "R8000", - [CPU_R10000] "R10000", - [CPU_R12000] "R12000", - [CPU_R4300] "R4300", - [CPU_R4650] "R4650", - [CPU_R4700] "R4700", - [CPU_R5000] "R5000", - [CPU_R5000A] "R5000A", - [CPU_R4640] "R4640", - [CPU_NEVADA] "Nevada", - [CPU_RM7000] "RM7000", - [CPU_RM9000] "RM9000", - [CPU_R5432] "R5432", - [CPU_4KC] "MIPS 4Kc", - [CPU_5KC] "MIPS 5Kc", - [CPU_R4310] "R4310", - [CPU_SB1] "SiByte SB1", - [CPU_TX3912] "TX3912", - [CPU_TX3922] "TX3922", - [CPU_TX3927] "TX3927", - [CPU_AU1000] "Au1000", - [CPU_AU1500] "Au1500", - [CPU_AU1100] "Au1100", - [CPU_AU1550] "Au1550", - [CPU_AU1200] "Au1200", - [CPU_4KEC] "MIPS 4KEc", - [CPU_4KSC] "MIPS 4KSc", - [CPU_VR41XX] "NEC Vr41xx", - [CPU_R5500] "R5500", - [CPU_TX49XX] "TX49xx", - [CPU_20KC] "MIPS 20Kc", - [CPU_24K] "MIPS 24K", - [CPU_25KF] "MIPS 25Kf", - [CPU_VR4111] "NEC VR4111", - [CPU_VR4121] "NEC VR4121", - [CPU_VR4122] "NEC VR4122", - [CPU_VR4131] "NEC VR4131", - [CPU_VR4133] "NEC VR4133", - [CPU_VR4181] "NEC VR4181", - [CPU_VR4181A] "NEC VR4181A", - [CPU_SR71000] "Sandcraft SR71000" + [CPU_UNKNOWN] = "unknown", + [CPU_R2000] = "R2000", + [CPU_R3000] = "R3000", + [CPU_R3000A] = "R3000A", + [CPU_R3041] = "R3041", + [CPU_R3051] = "R3051", + [CPU_R3052] = "R3052", + [CPU_R3081] = "R3081", + [CPU_R3081E] = "R3081E", + [CPU_R4000PC] = "R4000PC", + [CPU_R4000SC] = "R4000SC", + [CPU_R4000MC] = "R4000MC", + [CPU_R4200] = "R4200", + [CPU_R4400PC] = "R4400PC", + [CPU_R4400SC] = "R4400SC", + [CPU_R4400MC] = "R4400MC", + [CPU_R4600] = "R4600", + [CPU_R6000] = "R6000", + [CPU_R6000A] = "R6000A", + [CPU_R8000] = "R8000", + [CPU_R10000] = "R10000", + [CPU_R12000] = "R12000", + [CPU_R4300] = "R4300", + [CPU_R4650] = "R4650", + [CPU_R4700] = "R4700", + [CPU_R5000] = "R5000", + [CPU_R5000A] = "R5000A", + [CPU_R4640] = "R4640", + [CPU_NEVADA] = "Nevada", + [CPU_RM7000] = "RM7000", + [CPU_RM9000] = "RM9000", + [CPU_R5432] = "R5432", + [CPU_4KC] = "MIPS 4Kc", + [CPU_5KC] = "MIPS 5Kc", + [CPU_R4310] = "R4310", + [CPU_SB1] = "SiByte SB1", + [CPU_TX3912] = "TX3912", + [CPU_TX3922] = "TX3922", + [CPU_TX3927] = "TX3927", + [CPU_AU1000] = "Au1000", + [CPU_AU1500] = "Au1500", + [CPU_AU1100] = "Au1100", + [CPU_AU1550] = "Au1550", + [CPU_AU1200] = "Au1200", + [CPU_4KEC] = "MIPS 4KEc", + [CPU_4KSC] = "MIPS 4KSc", + [CPU_VR41XX] = "NEC Vr41xx", + [CPU_R5500] = "R5500", + [CPU_TX49XX] = "TX49xx", + [CPU_20KC] = "MIPS 20Kc", + [CPU_24K] = "MIPS 24K", + [CPU_25KF] = "MIPS 25Kf", + [CPU_VR4111] = "NEC VR4111", + [CPU_VR4121] = "NEC VR4121", + [CPU_VR4122] = "NEC VR4122", + [CPU_VR4131] = "NEC VR4131", + [CPU_VR4133] = "NEC VR4133", + [CPU_VR4181] = "NEC VR4181", + [CPU_VR4181A] = "NEC VR4181A", + [CPU_SR71000] = "Sandcraft SR71000" }; From ralf@linux-mips.org Tue Mar 1 18:12:13 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 18:12:13 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 18:12:13 +0000 X-archive-position: 306 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/01 18:12:06 Modified files: include/asm-mips: hazards.h Log message: New hazard handling function back_to_back_c0_hazard() to handle back to back mtc0 / mfc0 pairs from the same coprocessor register. diff -urN linux/include/asm-mips/hazards.h linux/include/asm-mips/hazards.h --- linux/include/asm-mips/hazards.h 2004/12/05 13:36:12 1.7 +++ linux/include/asm-mips/hazards.h 2005/03/01 18:12:06 1.8 @@ -124,6 +124,9 @@ ".set\tmips32\n\t" \ "_ssnop; _ssnop; _ssnop; _ssnop\n\t" \ ".set\tmips0") + +#define back_to_back_c0_hazard() do { } while (0) + #else /* @@ -141,6 +144,12 @@ "nop; nop; nop; nop; nop; nop;\n\t" \ ".set reorder\n\t") +#define back_to_back_c0_hazard() \ + __asm__ __volatile__( \ + " .set noreorder \n" \ + " nop; nop; nop \n" \ + " .set reorder \n") + #endif /* @@ -170,6 +179,10 @@ __asm__ __volatile__( \ "_ehb\t\t\t\t# irq_disable_hazard") +#define back_to_back_c0_hazard() \ + __asm__ __volatile__( \ + "_ehb\t\t\t\t# back_to_back_c0_hazard") + #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) /* @@ -186,6 +199,8 @@ #define irq_enable_hazard() do { } while (0) #define irq_disable_hazard() do { } while (0) +#define back_to_back_c0_hazard() do { } while (0) + #else /* @@ -210,6 +225,12 @@ __asm__ __volatile__( \ "_ssnop; _ssnop; _ssnop;\t\t# irq_disable_hazard") +#define back_to_back_c0_hazard() \ + __asm__ __volatile__( \ + " .set noreorder \n" \ + " nop; nop; nop \n" \ + " .set reorder \n") + #endif #endif /* __ASSEMBLY__ */ From ralf@linux-mips.org Tue Mar 1 18:15:13 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 18:15:14 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 18:15:14 +0000 X-archive-position: 307 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/01 18:15:08 Modified files: arch/mips/kernel: traps.c Log message: On 24K we did always disable cache parity protection - obviously not the greatest thing to do. Try to enable parity protection, check if we actually succeeded and print a message about the outcome of this. diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c --- linux/arch/mips/kernel/traps.c 2005/02/07 02:54:34 1.208 +++ linux/arch/mips/kernel/traps.c 2005/03/01 18:15:08 1.209 @@ -736,16 +736,12 @@ { switch (current_cpu_data.cputype) { case CPU_24K: - /* 24K cache parity not currently implemented in FPGA */ - printk(KERN_INFO "Disable cache parity protection for " - "MIPS 24K CPU.\n"); - write_c0_ecc(read_c0_ecc() & ~0x80000000); - break; case CPU_5KC: - /* Set the PE bit (bit 31) in the c0_ecc register. */ - printk(KERN_INFO "Enable cache parity protection for " - "MIPS 5KC/24K CPUs.\n"); - write_c0_ecc(read_c0_ecc() | 0x80000000); + write_c0_ecc(0x80000000); + back_to_back_c0_hazard(); + /* Set the PE bit (bit 31) in the c0_errctl register. */ + printk(KERN_INFO "Cache parity protection %sabled\n", + (read_c0_ecc() & 0x80000000) ? "en" : "dis"); break; case CPU_20KC: case CPU_25KF: From ralf@linux-mips.org Tue Mar 1 19:22:37 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 19:22:37 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 19:22:37 +0000 X-archive-position: 308 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/01 19:22:29 Modified files: include/asm-mips: uaccess.h Log message: Add sparse annotations for uaccess.h, the hardest part. diff -urN linux/include/asm-mips/uaccess.h linux/include/asm-mips/uaccess.h --- linux/include/asm-mips/uaccess.h 2004/12/03 11:30:32 1.40 +++ linux/include/asm-mips/uaccess.h 2005/03/01 19:22:29 1.41 @@ -128,7 +128,8 @@ * * See access_ok() for more details. */ -static inline int verify_area(int type, const void * addr, unsigned long size) +static inline int verify_area(int type, const void __user * addr, + unsigned long size) { return access_ok(type, addr, size) ? 0 : -EFAULT; } @@ -218,31 +219,29 @@ __get_user_nocheck((x),(ptr),sizeof(*(ptr))) struct __large_struct { unsigned long buf[100]; }; -#define __m(x) (*(struct __large_struct *)(x)) +#define __m(x) (*(struct __large_struct __user *)(x)) /* * Yuck. We need two variants, one for 64bit operation and one * for 32 bit mode and old iron. */ #ifdef __mips64 -#define __GET_USER_DW(__gu_err) __get_user_asm("ld", __gu_err) +#define __GET_USER_DW(ptr) __get_user_asm("ld", ptr) #else -#define __GET_USER_DW(__gu_err) __get_user_asm_ll32(__gu_err) +#define __GET_USER_DW(ptr) __get_user_asm_ll32(ptr) #endif #define __get_user_nocheck(x,ptr,size) \ ({ \ __typeof(*(ptr)) __gu_val = 0; \ - long __gu_addr; \ long __gu_err = 0; \ \ might_sleep(); \ - __gu_addr = (long) (ptr); \ switch (size) { \ - case 1: __get_user_asm("lb", __gu_err); break; \ - case 2: __get_user_asm("lh", __gu_err); break; \ - case 4: __get_user_asm("lw", __gu_err); break; \ - case 8: __GET_USER_DW(__gu_err); break; \ + case 1: __get_user_asm("lb", ptr); break; \ + case 2: __get_user_asm("lh", ptr); break; \ + case 4: __get_user_asm("lw", ptr); break; \ + case 8: __GET_USER_DW(ptr); break; \ default: __get_user_unknown(); break; \ } \ x = (__typeof__(*(ptr))) __gu_val; \ @@ -251,20 +250,19 @@ #define __get_user_check(x,ptr,size) \ ({ \ + const __typeof__(*(ptr)) __user * __gu_addr = (ptr); \ __typeof__(*(ptr)) __gu_val = 0; \ - long __gu_addr; \ long __gu_err; \ \ might_sleep(); \ - __gu_addr = (long) (ptr); \ - __gu_err = verify_area(VERIFY_READ, (void *) __gu_addr, size); \ \ + __gu_err = verify_area(VERIFY_READ, __gu_addr, size); \ if (likely(!__gu_err)) { \ switch (size) { \ - case 1: __get_user_asm("lb", __gu_err); break; \ - case 2: __get_user_asm("lh", __gu_err); break; \ - case 4: __get_user_asm("lw", __gu_err); break; \ - case 8: __GET_USER_DW(__gu_err); break; \ + case 1: __get_user_asm("lb", __gu_addr); break; \ + case 2: __get_user_asm("lh", __gu_addr); break; \ + case 4: __get_user_asm("lw", __gu_addr); break; \ + case 8: __GET_USER_DW(__gu_addr); break; \ default: __get_user_unknown(); break; \ } \ } \ @@ -272,7 +270,7 @@ __gu_err; \ }) -#define __get_user_asm(insn,__gu_err) \ +#define __get_user_asm(insn, addr) \ ({ \ __asm__ __volatile__( \ "1: " insn " %1, %3 \n" \ @@ -285,20 +283,20 @@ " "__UA_ADDR "\t1b, 3b \n" \ " .previous \n" \ : "=r" (__gu_err), "=r" (__gu_val) \ - : "0" (__gu_err), "o" (__m(__gu_addr)), "i" (-EFAULT)); \ + : "0" (__gu_err), "o" (__m(addr)), "i" (-EFAULT)); \ }) /* * Get a long long 64 using 32 bit registers. */ -#define __get_user_asm_ll32(__gu_err) \ +#define __get_user_asm_ll32(addr) \ ({ \ __asm__ __volatile__( \ - "1: lw %1, %3 \n" \ - "2: lw %D1, %4 \n" \ + "1: lw %1, (%3) \n" \ + "2: lw %D1, 4(%3) \n" \ " move %0, $0 \n" \ "3: .section .fixup,\"ax\" \n" \ - "4: li %0, %5 \n" \ + "4: li %0, %4 \n" \ " move %1, $0 \n" \ " move %D1, $0 \n" \ " j 3b \n" \ @@ -308,8 +306,7 @@ " " __UA_ADDR " 2b, 4b \n" \ " .previous \n" \ : "=r" (__gu_err), "=&r" (__gu_val) \ - : "0" (__gu_err), "o" (__m(__gu_addr)), \ - "o" (__m(__gu_addr + 4)), "i" (-EFAULT)); \ + : "0" (__gu_err), "r" (addr), "i" (-EFAULT)); \ }) extern void __get_user_unknown(void); @@ -319,25 +316,23 @@ * for 32 bit mode and old iron. */ #ifdef __mips64 -#define __PUT_USER_DW(__pu_val) __put_user_asm("sd", __pu_val) +#define __PUT_USER_DW(ptr) __put_user_asm("sd", ptr) #else -#define __PUT_USER_DW(__pu_val) __put_user_asm_ll32(__pu_val) +#define __PUT_USER_DW(ptr) __put_user_asm_ll32(ptr) #endif #define __put_user_nocheck(x,ptr,size) \ ({ \ __typeof__(*(ptr)) __pu_val; \ - long __pu_addr; \ long __pu_err = 0; \ \ might_sleep(); \ __pu_val = (x); \ - __pu_addr = (long) (ptr); \ switch (size) { \ - case 1: __put_user_asm("sb", __pu_val); break; \ - case 2: __put_user_asm("sh", __pu_val); break; \ - case 4: __put_user_asm("sw", __pu_val); break; \ - case 8: __PUT_USER_DW(__pu_val); break; \ + case 1: __put_user_asm("sb", ptr); break; \ + case 2: __put_user_asm("sh", ptr); break; \ + case 4: __put_user_asm("sw", ptr); break; \ + case 8: __PUT_USER_DW(ptr); break; \ default: __put_user_unknown(); break; \ } \ __pu_err; \ @@ -345,28 +340,26 @@ #define __put_user_check(x,ptr,size) \ ({ \ - __typeof__(*(ptr)) __pu_val; \ - long __pu_addr; \ + __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ + __typeof__(*(ptr)) __pu_val = (x); \ long __pu_err; \ \ might_sleep(); \ - __pu_val = (x); \ - __pu_addr = (long) (ptr); \ - __pu_err = verify_area(VERIFY_WRITE, (void *) __pu_addr, size); \ \ + __pu_err = verify_area(VERIFY_WRITE, __pu_addr, size); \ if (likely(!__pu_err)) { \ switch (size) { \ - case 1: __put_user_asm("sb", __pu_val); break; \ - case 2: __put_user_asm("sh", __pu_val); break; \ - case 4: __put_user_asm("sw", __pu_val); break; \ - case 8: __PUT_USER_DW(__pu_val); break; \ + case 1: __put_user_asm("sb", __pu_addr); break; \ + case 2: __put_user_asm("sh", __pu_addr); break; \ + case 4: __put_user_asm("sw", __pu_addr); break; \ + case 8: __PUT_USER_DW(__pu_addr); break; \ default: __put_user_unknown(); break; \ } \ } \ __pu_err; \ }) -#define __put_user_asm(insn, __pu_val) \ +#define __put_user_asm(insn, ptr) \ ({ \ __asm__ __volatile__( \ "1: " insn " %z2, %3 # __put_user_asm\n" \ @@ -379,18 +372,18 @@ " " __UA_ADDR " 1b, 3b \n" \ " .previous \n" \ : "=r" (__pu_err) \ - : "0" (__pu_err), "Jr" (__pu_val), "o" (__m(__pu_addr)), \ + : "0" (__pu_err), "Jr" (__pu_val), "o" (__m(ptr)), \ "i" (-EFAULT)); \ }) -#define __put_user_asm_ll32(__pu_val) \ +#define __put_user_asm_ll32(ptr) \ ({ \ __asm__ __volatile__( \ - "1: sw %2, %3 # __put_user_asm_ll32 \n" \ - "2: sw %D2, %4 \n" \ + "1: sw %2, (%3) # __put_user_asm_ll32 \n" \ + "2: sw %D2, 4(%3) \n" \ "3: \n" \ " .section .fixup,\"ax\" \n" \ - "4: li %0, %5 \n" \ + "4: li %0, %4 \n" \ " j 3b \n" \ " .previous \n" \ " .section __ex_table,\"a\" \n" \ @@ -398,8 +391,8 @@ " " __UA_ADDR " 2b, 4b \n" \ " .previous" \ : "=r" (__pu_err) \ - : "0" (__pu_err), "r" (__pu_val), "o" (__m(__pu_addr)), \ - "o" (__m(__pu_addr + 4)), "i" (-EFAULT)); \ + : "0" (__pu_err), "r" (__pu_val), "r" (ptr), \ + "i" (-EFAULT)); \ }) extern void __put_user_unknown(void); @@ -423,7 +416,7 @@ #define __invoke_copy_to_user(to,from,n) \ ({ \ - register void *__cu_to_r __asm__ ("$4"); \ + register void __user *__cu_to_r __asm__ ("$4"); \ register const void *__cu_from_r __asm__ ("$5"); \ register long __cu_len_r __asm__ ("$6"); \ \ @@ -455,7 +448,7 @@ */ #define __copy_to_user(to,from,n) \ ({ \ - void *__cu_to; \ + void __user __user *__cu_to; \ const void *__cu_from; \ long __cu_len; \ \ @@ -485,7 +478,7 @@ */ #define copy_to_user(to,from,n) \ ({ \ - void *__cu_to; \ + void __user *__cu_to; \ const void *__cu_from; \ long __cu_len; \ \ @@ -502,7 +495,7 @@ #define __invoke_copy_from_user(to,from,n) \ ({ \ register void *__cu_to_r __asm__ ("$4"); \ - register const void *__cu_from_r __asm__ ("$5"); \ + register const void __user *__cu_from_r __asm__ ("$5"); \ register long __cu_len_r __asm__ ("$6"); \ \ __cu_to_r = (to); \ @@ -541,7 +534,7 @@ #define __copy_from_user(to,from,n) \ ({ \ void *__cu_to; \ - const void *__cu_from; \ + const void __user *__cu_from; \ long __cu_len; \ \ might_sleep(); \ @@ -572,7 +565,7 @@ #define copy_from_user(to,from,n) \ ({ \ void *__cu_to; \ - const void *__cu_from; \ + const void __user *__cu_from; \ long __cu_len; \ \ might_sleep(); \ @@ -589,8 +582,8 @@ #define copy_in_user(to,from,n) \ ({ \ - void *__cu_to; \ - const void *__cu_from; \ + void __user *__cu_to; \ + const void __user *__cu_from; \ long __cu_len; \ \ might_sleep(); \ @@ -616,7 +609,7 @@ * On success, this will be zero. */ static inline __kernel_size_t -__clear_user(void *addr, __kernel_size_t size) +__clear_user(void __user *addr, __kernel_size_t size) { __kernel_size_t res; @@ -665,7 +658,7 @@ * and returns @count. */ static inline long -__strncpy_from_user(char *__to, const char *__from, long __len) +__strncpy_from_user(char *__to, const char __user *__from, long __len) { long res; @@ -702,7 +695,7 @@ * and returns @count. */ static inline long -strncpy_from_user(char *__to, const char *__from, long __len) +strncpy_from_user(char *__to, const char __user *__from, long __len) { long res; @@ -721,7 +714,7 @@ } /* Returns: 0 if bad, string length+1 (memory size) of string if ok */ -static inline long __strlen_user(const char *s) +static inline long __strlen_user(const char __user *s) { long res; @@ -751,7 +744,7 @@ * If there is a limit on the length of a valid string, you may wish to * consider using strnlen_user() instead. */ -static inline long strlen_user(const char *s) +static inline long strlen_user(const char __user *s) { long res; @@ -768,7 +761,7 @@ } /* Returns: 0 if bad, string length+1 (memory size) of string if ok */ -static inline long __strnlen_user(const char *s, long n) +static inline long __strnlen_user(const char __user *s, long n) { long res; @@ -799,7 +792,7 @@ * If there is a limit on the length of a valid string, you may wish to * consider using strnlen_user() instead. */ -static inline long strnlen_user(const char *s, long n) +static inline long strnlen_user(const char __user *s, long n) { long res; From ralf@linux-mips.org Tue Mar 1 21:20:53 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 01 Mar 2005 21:20:53 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 01 Mar 2005 21:20:53 +0000 X-archive-position: 309 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/01 21:20:47 Modified files: arch/mips : Makefile arch/mips/kernel: i8259.c process.c ptrace.c signal.c traps.c unaligned.c arch/mips/mm : c-r4k.c cache.c fault.c include/asm-mips: cacheflush.h irq.h signal.h Log message: More sparsification. diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile --- linux/arch/mips/Makefile 2005/03/01 06:33:16 1.191 +++ linux/arch/mips/Makefile 2005/03/01 21:20:46 1.192 @@ -52,6 +52,16 @@ CROSS_COMPILE := $(tool-prefix) endif +CHECKFLAGS-y += -D__linux__ -D__mips__ +CHECKFLAGS-$(CONFIG_MIPS32) += -D_MIPS_SZLONG=32 \ + -D__PTRDIFF_TYPE__=int +CHECKFLAGS-$(CONFIG_MIPS64) += -D_MIPS_SZLONG=64 \ + -D__PTRDIFF_TYPE__="long int" +CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEL__ +CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN) += -D__MIPSEL__ + +CHECKFLAGS = $(CHECKFLAGS-y) + ifdef CONFIG_BUILD_ELF64 gas-abi = 64 ld-emul = $(64bit-emul) diff -urN linux/arch/mips/kernel/i8259.c linux/arch/mips/kernel/i8259.c --- linux/arch/mips/kernel/i8259.c 2005/02/28 13:39:57 1.20 +++ linux/arch/mips/kernel/i8259.c 2005/03/01 21:20:47 1.21 @@ -321,7 +321,7 @@ for (i = 0; i < 16; i++) { irq_desc[i].status = IRQ_DISABLED; - irq_desc[i].action = 0; + irq_desc[i].action = NULL; irq_desc[i].depth = 1; irq_desc[i].handler = &i8259A_irq_type; } diff -urN linux/arch/mips/kernel/process.c linux/arch/mips/kernel/process.c --- linux/arch/mips/kernel/process.c 2005/02/21 10:55:16 1.75 +++ linux/arch/mips/kernel/process.c 2005/03/01 21:20:47 1.76 @@ -39,14 +39,6 @@ #include /* - * We use this if we don't have any better idle routine.. - * (This to kill: kernel/platform.c. - */ -void default_idle (void) -{ -} - -/* * The idle thread. There's no useful work to be done, so just try to conserve * power and have a low exit latency (ie sit in a loop waiting for somebody to * say that they'd like to reschedule) diff -urN linux/arch/mips/kernel/ptrace.c linux/arch/mips/kernel/ptrace.c --- linux/arch/mips/kernel/ptrace.c 2005/02/07 02:54:34 1.58 +++ linux/arch/mips/kernel/ptrace.c 2005/03/01 21:20:47 1.59 @@ -101,7 +101,7 @@ ret = -EIO; if (copied != sizeof(tmp)) break; - ret = put_user(tmp,(unsigned long *) data); + ret = put_user(tmp,(unsigned long __user *) data); break; } @@ -178,7 +178,7 @@ ret = -EIO; goto out_tsk; } - ret = put_user(tmp, (unsigned long *) data); + ret = put_user(tmp, (unsigned long __user *) data); break; } diff -urN linux/arch/mips/kernel/signal.c linux/arch/mips/kernel/signal.c --- linux/arch/mips/kernel/signal.c 2005/01/25 04:28:00 1.88 +++ linux/arch/mips/kernel/signal.c 2005/03/01 21:20:47 1.89 @@ -47,9 +47,10 @@ __attribute_used__ noinline static int _sys_sigsuspend(nabi_no_regargs struct pt_regs regs) { - sigset_t *uset, saveset, newset; + sigset_t saveset, newset; + sigset_t __user *uset; - uset = (sigset_t *) regs.regs[4]; + uset = (sigset_t __user *) regs.regs[4]; if (copy_from_user(&newset, uset, sizeof(sigset_t))) return -EFAULT; sigdelsetmask(&newset, ~_BLOCKABLE); @@ -75,7 +76,8 @@ __attribute_used__ noinline static int _sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) { - sigset_t *unewset, saveset, newset; + sigset_t saveset, newset; + sigset_t __user *unewset; size_t sigsetsize; /* XXX Don't preclude handling different sized sigset_t's. */ @@ -83,7 +85,7 @@ if (sigsetsize != sizeof(sigset_t)) return -EINVAL; - unewset = (sigset_t *) regs.regs[4]; + unewset = (sigset_t __user *) regs.regs[4]; if (copy_from_user(&newset, unewset, sizeof(newset))) return -EFAULT; sigdelsetmask(&newset, ~_BLOCKABLE); @@ -147,8 +149,8 @@ asmlinkage int sys_sigaltstack(nabi_no_regargs struct pt_regs regs) { - const stack_t *uss = (const stack_t *) regs.regs[4]; - stack_t *uoss = (stack_t *) regs.regs[5]; + const stack_t __user *uss = (const stack_t __user *) regs.regs[4]; + stack_t __user *uoss = (stack_t __user *) regs.regs[5]; unsigned long usp = regs.regs[29]; return do_sigaltstack(uss, uoss, usp); diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c --- linux/arch/mips/kernel/traps.c 2005/03/01 18:15:08 1.209 +++ linux/arch/mips/kernel/traps.c 2005/03/01 21:20:47 1.210 @@ -339,9 +339,9 @@ static inline int get_insn_opcode(struct pt_regs *regs, unsigned int *opcode) { - unsigned int *epc; + unsigned int __user *epc; - epc = (unsigned int *) regs->cp0_epc + + epc = (unsigned int __user *) regs->cp0_epc + ((regs->cp0_cause & CAUSEF_BD) != 0); if (!get_user(*opcode, epc)) return 0; @@ -371,7 +371,7 @@ static inline void simulate_ll(struct pt_regs *regs, unsigned int opcode) { - unsigned long value, *vaddr; + unsigned long value, __user *vaddr; long offset; int signal = 0; @@ -385,7 +385,8 @@ offset <<= 16; offset >>= 16; - vaddr = (unsigned long *)((long)(regs->regs[(opcode & BASE) >> 21]) + offset); + vaddr = (unsigned long __user *) + ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset); if ((unsigned long)vaddr & 3) { signal = SIGBUS; @@ -418,7 +419,8 @@ static inline void simulate_sc(struct pt_regs *regs, unsigned int opcode) { - unsigned long *vaddr, reg; + unsigned long __user *vaddr; + unsigned long reg; long offset; int signal = 0; @@ -432,7 +434,8 @@ offset <<= 16; offset >>= 16; - vaddr = (unsigned long *)((long)(regs->regs[(opcode & BASE) >> 21]) + offset); + vaddr = (unsigned long __user *) + ((unsigned long)(regs->regs[(opcode & BASE) >> 21]) + offset); reg = (opcode & RT) >> 16; if ((unsigned long)vaddr & 3) { @@ -498,7 +501,7 @@ info.si_code = FPE_INTOVF; info.si_signo = SIGFPE; info.si_errno = 0; - info.si_addr = (void *)regs->cp0_epc; + info.si_addr = (void __user *) regs->cp0_epc; force_sig_info(SIGFPE, &info, current); } @@ -584,7 +587,7 @@ info.si_code = FPE_INTOVF; info.si_signo = SIGFPE; info.si_errno = 0; - info.si_addr = (void *)regs->cp0_epc; + info.si_addr = (void __user *) regs->cp0_epc; force_sig_info(SIGFPE, &info, current); break; default: @@ -621,7 +624,7 @@ info.si_code = FPE_INTOVF; info.si_signo = SIGFPE; info.si_errno = 0; - info.si_addr = (void *)regs->cp0_epc; + info.si_addr = (void __user *) regs->cp0_epc; force_sig_info(SIGFPE, &info, current); break; default: diff -urN linux/arch/mips/kernel/unaligned.c linux/arch/mips/kernel/unaligned.c --- linux/arch/mips/kernel/unaligned.c 2004/01/02 15:40:40 1.36 +++ linux/arch/mips/kernel/unaligned.c 2005/03/01 21:20:47 1.37 @@ -94,7 +94,7 @@ #endif static inline int emulate_load_store_insn(struct pt_regs *regs, - void *addr, unsigned long pc, + void __user *addr, unsigned int __user *pc, unsigned long **regptr, unsigned long *newvalue) { union mips_instruction insn; @@ -107,7 +107,7 @@ /* * This load never faults. */ - __get_user(insn.word, (unsigned int *)pc); + __get_user(insn.word, pc); switch (insn.i_format.opcode) { /* @@ -494,8 +494,8 @@ { unsigned long *regptr, newval; extern int do_dsemulret(struct pt_regs *); + unsigned int __user *pc; mm_segment_t seg; - unsigned long pc; /* * Address errors may be deliberately induced by the FPU emulator to @@ -515,7 +515,7 @@ if ((regs->cp0_badvaddr == regs->cp0_epc) || (regs->cp0_epc & 0x1)) goto sigbus; - pc = exception_epc(regs); + pc = (unsigned int __user *) exception_epc(regs); if ((current->thread.mflags & MF_FIXADE) == 0) goto sigbus; @@ -526,7 +526,7 @@ seg = get_fs(); if (!user_mode(regs)) set_fs(KERNEL_DS); - if (!emulate_load_store_insn(regs, (void *)regs->cp0_badvaddr, pc, + if (!emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc, ®ptr, &newval)) { compute_return_epc(regs); /* diff -urN linux/arch/mips/mm/c-r4k.c linux/arch/mips/mm/c-r4k.c --- linux/arch/mips/mm/c-r4k.c 2005/03/01 06:33:17 1.105 +++ linux/arch/mips/mm/c-r4k.c 2005/03/01 21:20:47 1.106 @@ -457,8 +457,8 @@ } struct flush_icache_range_args { - unsigned long start; - unsigned long end; + unsigned long __user start; + unsigned long __user end; }; static inline void local_r4k_flush_icache_range(void *args) @@ -520,7 +520,8 @@ } } -static void r4k_flush_icache_range(unsigned long start, unsigned long end) +static void r4k_flush_icache_range(unsigned long __user start, + unsigned long __user end) { struct flush_icache_range_args args; diff -urN linux/arch/mips/mm/cache.c linux/arch/mips/mm/cache.c --- linux/arch/mips/mm/cache.c 2004/12/18 01:59:14 1.16 +++ linux/arch/mips/mm/cache.c 2005/03/01 21:20:47 1.17 @@ -24,7 +24,8 @@ void (*flush_cache_range)(struct vm_area_struct *vma, unsigned long start, unsigned long end); void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page); -void (*flush_icache_range)(unsigned long start, unsigned long end); +void (*flush_icache_range)(unsigned long __user start, + unsigned long __user end); void (*flush_icache_page)(struct vm_area_struct *vma, struct page *page); /* MIPS specific cache operations */ @@ -49,10 +50,10 @@ * We could optimize the case where the cache argument is not BCACHE but * that seems very atypical use ... */ -asmlinkage int sys_cacheflush(unsigned long addr, unsigned long int bytes, - unsigned int cache) +asmlinkage int sys_cacheflush(unsigned long __user addr, + unsigned long bytes, unsigned int cache) { - if (verify_area(VERIFY_WRITE, (void *) addr, bytes)) + if (verify_area(VERIFY_WRITE, (void __user *) addr, bytes)) return -EFAULT; flush_icache_range(addr, addr + bytes); diff -urN linux/arch/mips/mm/fault.c linux/arch/mips/mm/fault.c --- linux/arch/mips/mm/fault.c 2005/02/19 13:56:04 1.56 +++ linux/arch/mips/mm/fault.c 2005/03/01 21:20:47 1.57 @@ -141,7 +141,7 @@ info.si_signo = SIGSEGV; info.si_errno = 0; /* info.si_code has been set above */ - info.si_addr = (void *) address; + info.si_addr = (void __user *) address; force_sig_info(SIGSEGV, &info, tsk); return; } @@ -197,7 +197,7 @@ info.si_signo = SIGBUS; info.si_errno = 0; info.si_code = BUS_ADRERR; - info.si_addr = (void *) address; + info.si_addr = (void __user *) address; force_sig_info(SIGBUS, &info, tsk); return; diff -urN linux/include/asm-mips/cacheflush.h linux/include/asm-mips/cacheflush.h --- linux/include/asm-mips/cacheflush.h 2005/02/09 12:59:39 1.15 +++ linux/include/asm-mips/cacheflush.h 2005/03/01 21:20:47 1.16 @@ -50,7 +50,8 @@ extern void (*flush_icache_page)(struct vm_area_struct *vma, struct page *page); -extern void (*flush_icache_range)(unsigned long start, unsigned long end); +extern void (*flush_icache_range)(unsigned long __user start, + unsigned long __user end); #define flush_cache_vmap(start, end) flush_cache_all() #define flush_cache_vunmap(start, end) flush_cache_all() diff -urN linux/include/asm-mips/irq.h linux/include/asm-mips/irq.h --- linux/include/asm-mips/irq.h 2004/11/09 13:27:43 1.26 +++ linux/include/asm-mips/irq.h 2005/03/01 21:20:47 1.27 @@ -24,11 +24,9 @@ struct pt_regs; -#ifdef CONFIG_PREEMPT - extern asmlinkage unsigned int do_IRQ(unsigned int irq, struct pt_regs *regs); -#else +#ifdef CONFIG_PREEMPT /* * do_IRQ handles all normal device IRQ's (the special diff -urN linux/include/asm-mips/signal.h linux/include/asm-mips/signal.h --- linux/include/asm-mips/signal.h 2003/09/30 14:27:29 1.17 +++ linux/include/asm-mips/signal.h 2005/03/01 21:20:47 1.18 @@ -120,7 +120,8 @@ set only the low 32 bit of the sigset. */ /* Type of a signal handler. */ -typedef void (*__sighandler_t)(int); +typedef void __signalfn_t(int); +typedef __signalfn_t __user *__sighandler_t; /* Fake signal functions */ #define SIG_DFL ((__sighandler_t)0) /* default signal handling */ From ralf@linux-mips.org Wed Mar 2 18:12:15 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Wed, 02 Mar 2005 18:12:15 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Wed, 02 Mar 2005 18:12:15 +0000 X-archive-position: 310 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/02 18:12:09 Modified files: arch/mips : defconfig arch/mips/configs: atlas_defconfig capcella_defconfig cobalt_defconfig db1000_defconfig db1100_defconfig db1500_defconfig db1550_defconfig ddb5476_defconfig ddb5477_defconfig decstation_defconfig e55_defconfig ev64120_defconfig ev96100_defconfig ip22_defconfig ip27_defconfig ip32_defconfig it8172_defconfig ivr_defconfig jaguar-atx_defconfig jmr3927_defconfig lasat200_defconfig malta_defconfig mpc30x_defconfig ocelot_3_defconfig ocelot_c_defconfig ocelot_defconfig ocelot_g_defconfig osprey_defconfig pb1100_defconfig pb1500_defconfig pb1550_defconfig rm200_defconfig sb1250-swarm_defconfig sead_defconfig tb0226_defconfig tb0229_defconfig workpad_defconfig yosemite_defconfig Log message: Somebody didn't update the defconfigs. You know who you are. diff -urN linux/arch/mips/defconfig linux/arch/mips/defconfig --- linux/arch/mips/defconfig 2005/02/28 15:45:10 1.284 +++ linux/arch/mips/defconfig 2005/03/02 18:12:08 1.285 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:35 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:17 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/atlas_defconfig linux/arch/mips/configs/atlas_defconfig --- linux/arch/mips/configs/atlas_defconfig 2005/02/28 15:45:10 1.48 +++ linux/arch/mips/configs/atlas_defconfig 2005/03/02 18:12:08 1.49 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:36 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:19 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/capcella_defconfig linux/arch/mips/configs/capcella_defconfig --- linux/arch/mips/configs/capcella_defconfig 2005/02/28 15:45:10 1.48 +++ linux/arch/mips/configs/capcella_defconfig 2005/03/02 18:12:08 1.49 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:37 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:19 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/cobalt_defconfig linux/arch/mips/configs/cobalt_defconfig --- linux/arch/mips/configs/cobalt_defconfig 2005/02/28 15:45:10 1.45 +++ linux/arch/mips/configs/cobalt_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:37 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:20 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set CONFIG_MIPS_COBALT=y # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/db1000_defconfig linux/arch/mips/configs/db1000_defconfig --- linux/arch/mips/configs/db1000_defconfig 2005/02/28 15:45:10 1.51 +++ linux/arch/mips/configs/db1000_defconfig 2005/03/02 18:12:08 1.52 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:38 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:20 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set CONFIG_MIPS_DB1000=y # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/db1100_defconfig linux/arch/mips/configs/db1100_defconfig --- linux/arch/mips/configs/db1100_defconfig 2005/02/28 15:45:10 1.49 +++ linux/arch/mips/configs/db1100_defconfig 2005/03/02 18:12:08 1.50 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:39 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:21 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set CONFIG_MIPS_DB1100=y # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/db1500_defconfig linux/arch/mips/configs/db1500_defconfig --- linux/arch/mips/configs/db1500_defconfig 2005/02/28 15:45:10 1.53 +++ linux/arch/mips/configs/db1500_defconfig 2005/03/02 18:12:08 1.54 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:39 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:22 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set CONFIG_MIPS_DB1500=y # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/db1550_defconfig linux/arch/mips/configs/db1550_defconfig --- linux/arch/mips/configs/db1550_defconfig 2005/02/28 15:45:10 1.28 +++ linux/arch/mips/configs/db1550_defconfig 2005/03/02 18:12:08 1.29 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:41 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:22 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set CONFIG_MIPS_DB1550=y +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ddb5476_defconfig linux/arch/mips/configs/ddb5476_defconfig --- linux/arch/mips/configs/ddb5476_defconfig 2005/02/28 15:45:10 1.45 +++ linux/arch/mips/configs/ddb5476_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:41 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:23 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ddb5477_defconfig linux/arch/mips/configs/ddb5477_defconfig --- linux/arch/mips/configs/ddb5477_defconfig 2005/02/28 15:45:10 1.45 +++ linux/arch/mips/configs/ddb5477_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:41 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:23 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/decstation_defconfig linux/arch/mips/configs/decstation_defconfig --- linux/arch/mips/configs/decstation_defconfig 2005/02/28 15:45:10 1.46 +++ linux/arch/mips/configs/decstation_defconfig 2005/03/02 18:12:08 1.47 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:42 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:24 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set CONFIG_MACH_DECSTATION=y diff -urN linux/arch/mips/configs/e55_defconfig linux/arch/mips/configs/e55_defconfig --- linux/arch/mips/configs/e55_defconfig 2005/02/28 15:45:10 1.47 +++ linux/arch/mips/configs/e55_defconfig 2005/03/02 18:12:08 1.48 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:43 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:24 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ev64120_defconfig linux/arch/mips/configs/ev64120_defconfig --- linux/arch/mips/configs/ev64120_defconfig 2005/02/28 15:45:10 1.44 +++ linux/arch/mips/configs/ev64120_defconfig 2005/03/02 18:12:08 1.45 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:43 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:25 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ev96100_defconfig linux/arch/mips/configs/ev96100_defconfig --- linux/arch/mips/configs/ev96100_defconfig 2005/02/28 15:45:10 1.45 +++ linux/arch/mips/configs/ev96100_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:44 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:26 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ip22_defconfig linux/arch/mips/configs/ip22_defconfig --- linux/arch/mips/configs/ip22_defconfig 2005/02/28 15:45:10 1.54 +++ linux/arch/mips/configs/ip22_defconfig 2005/03/02 18:12:08 1.55 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:44 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:26 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ip27_defconfig linux/arch/mips/configs/ip27_defconfig --- linux/arch/mips/configs/ip27_defconfig 2005/02/28 15:45:10 1.58 +++ linux/arch/mips/configs/ip27_defconfig 2005/03/02 18:12:08 1.59 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:45 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:27 2005 # CONFIG_MIPS=y @@ -61,10 +61,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ip32_defconfig linux/arch/mips/configs/ip32_defconfig --- linux/arch/mips/configs/ip32_defconfig 2005/02/28 15:45:10 1.48 +++ linux/arch/mips/configs/ip32_defconfig 2005/03/02 18:12:08 1.49 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:46 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:27 2005 # CONFIG_MIPS=y @@ -54,10 +54,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/it8172_defconfig linux/arch/mips/configs/it8172_defconfig --- linux/arch/mips/configs/it8172_defconfig 2005/02/28 15:45:10 1.44 +++ linux/arch/mips/configs/it8172_defconfig 2005/03/02 18:12:08 1.45 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:47 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:28 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ivr_defconfig linux/arch/mips/configs/ivr_defconfig --- linux/arch/mips/configs/ivr_defconfig 2005/02/28 15:45:11 1.44 +++ linux/arch/mips/configs/ivr_defconfig 2005/03/02 18:12:08 1.45 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:47 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:28 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/jaguar-atx_defconfig linux/arch/mips/configs/jaguar-atx_defconfig --- linux/arch/mips/configs/jaguar-atx_defconfig 2005/02/28 15:45:11 1.49 +++ linux/arch/mips/configs/jaguar-atx_defconfig 2005/03/02 18:12:08 1.50 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:48 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:29 2005 # CONFIG_MIPS=y @@ -57,10 +57,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/jmr3927_defconfig linux/arch/mips/configs/jmr3927_defconfig --- linux/arch/mips/configs/jmr3927_defconfig 2005/02/28 15:45:11 1.44 +++ linux/arch/mips/configs/jmr3927_defconfig 2005/03/02 18:12:08 1.45 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:48 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:29 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/lasat200_defconfig linux/arch/mips/configs/lasat200_defconfig --- linux/arch/mips/configs/lasat200_defconfig 2005/02/28 15:45:11 1.45 +++ linux/arch/mips/configs/lasat200_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:49 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:30 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/malta_defconfig linux/arch/mips/configs/malta_defconfig --- linux/arch/mips/configs/malta_defconfig 2005/02/28 15:45:11 1.47 +++ linux/arch/mips/configs/malta_defconfig 2005/03/02 18:12:08 1.48 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:50 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:31 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/mpc30x_defconfig linux/arch/mips/configs/mpc30x_defconfig --- linux/arch/mips/configs/mpc30x_defconfig 2005/02/28 15:45:11 1.49 +++ linux/arch/mips/configs/mpc30x_defconfig 2005/03/02 18:12:08 1.50 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:50 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:32 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ocelot_3_defconfig linux/arch/mips/configs/ocelot_3_defconfig --- linux/arch/mips/configs/ocelot_3_defconfig 2005/02/28 15:45:11 1.17 +++ linux/arch/mips/configs/ocelot_3_defconfig 2005/03/02 18:12:08 1.18 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:52 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:32 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ocelot_c_defconfig linux/arch/mips/configs/ocelot_c_defconfig --- linux/arch/mips/configs/ocelot_c_defconfig 2005/02/28 15:45:11 1.43 +++ linux/arch/mips/configs/ocelot_c_defconfig 2005/03/02 18:12:08 1.44 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:52 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:33 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ocelot_defconfig linux/arch/mips/configs/ocelot_defconfig --- linux/arch/mips/configs/ocelot_defconfig 2005/02/28 15:45:11 1.45 +++ linux/arch/mips/configs/ocelot_defconfig 2005/03/02 18:12:08 1.46 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:53 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:33 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/ocelot_g_defconfig linux/arch/mips/configs/ocelot_g_defconfig --- linux/arch/mips/configs/ocelot_g_defconfig 2005/02/28 15:45:11 1.38 +++ linux/arch/mips/configs/ocelot_g_defconfig 2005/03/02 18:12:08 1.39 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:53 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:34 2005 # CONFIG_MIPS=y @@ -53,10 +53,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/osprey_defconfig linux/arch/mips/configs/osprey_defconfig --- linux/arch/mips/configs/osprey_defconfig 2005/02/28 15:45:11 1.44 +++ linux/arch/mips/configs/osprey_defconfig 2005/03/02 18:12:08 1.45 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:54 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:34 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/pb1100_defconfig linux/arch/mips/configs/pb1100_defconfig --- linux/arch/mips/configs/pb1100_defconfig 2005/02/28 15:45:11 1.47 +++ linux/arch/mips/configs/pb1100_defconfig 2005/03/02 18:12:08 1.48 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:55 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:35 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ CONFIG_MIPS_PB1100=y # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/pb1500_defconfig linux/arch/mips/configs/pb1500_defconfig --- linux/arch/mips/configs/pb1500_defconfig 2005/02/28 15:45:11 1.53 +++ linux/arch/mips/configs/pb1500_defconfig 2005/03/02 18:12:08 1.54 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:55 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:36 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set CONFIG_MIPS_PB1500=y # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/pb1550_defconfig linux/arch/mips/configs/pb1550_defconfig --- linux/arch/mips/configs/pb1550_defconfig 2005/02/28 15:45:11 1.43 +++ linux/arch/mips/configs/pb1550_defconfig 2005/03/02 18:12:08 1.44 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:56 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:36 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set CONFIG_MIPS_PB1550=y +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/rm200_defconfig linux/arch/mips/configs/rm200_defconfig --- linux/arch/mips/configs/rm200_defconfig 2005/02/28 15:45:11 1.54 +++ linux/arch/mips/configs/rm200_defconfig 2005/03/02 18:12:08 1.55 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:57 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:37 2005 # CONFIG_MIPS=y @@ -61,10 +61,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/sb1250-swarm_defconfig linux/arch/mips/configs/sb1250-swarm_defconfig --- linux/arch/mips/configs/sb1250-swarm_defconfig 2005/02/28 15:45:11 1.51 +++ linux/arch/mips/configs/sb1250-swarm_defconfig 2005/03/02 18:12:08 1.52 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:58 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:37 2005 # CONFIG_MIPS=y @@ -60,10 +60,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/sead_defconfig linux/arch/mips/configs/sead_defconfig --- linux/arch/mips/configs/sead_defconfig 2005/02/28 15:45:11 1.43 +++ linux/arch/mips/configs/sead_defconfig 2005/03/02 18:12:08 1.44 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:58 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:38 2005 # CONFIG_MIPS=y @@ -51,10 +51,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/tb0226_defconfig linux/arch/mips/configs/tb0226_defconfig --- linux/arch/mips/configs/tb0226_defconfig 2005/02/28 15:45:11 1.47 +++ linux/arch/mips/configs/tb0226_defconfig 2005/03/02 18:12:08 1.48 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:59 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:38 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/tb0229_defconfig linux/arch/mips/configs/tb0229_defconfig --- linux/arch/mips/configs/tb0229_defconfig 2005/02/28 15:45:11 1.50 +++ linux/arch/mips/configs/tb0229_defconfig 2005/03/02 18:12:08 1.51 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:06:59 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:39 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/workpad_defconfig linux/arch/mips/configs/workpad_defconfig --- linux/arch/mips/configs/workpad_defconfig 2005/02/28 15:45:11 1.47 +++ linux/arch/mips/configs/workpad_defconfig 2005/03/02 18:12:08 1.48 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:07:00 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:40 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set diff -urN linux/arch/mips/configs/yosemite_defconfig linux/arch/mips/configs/yosemite_defconfig --- linux/arch/mips/configs/yosemite_defconfig 2005/02/28 15:45:11 1.49 +++ linux/arch/mips/configs/yosemite_defconfig 2005/03/02 18:12:08 1.50 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-rc5 -# Mon Feb 28 15:07:00 2005 +# Linux kernel version: 2.6.11 +# Wed Mar 2 18:07:40 2005 # CONFIG_MIPS=y @@ -59,10 +59,12 @@ # CONFIG_MIPS_PB1100 is not set # CONFIG_MIPS_PB1500 is not set # CONFIG_MIPS_PB1550 is not set +# CONFIG_MIPS_PB1200 is not set # CONFIG_MIPS_DB1000 is not set # CONFIG_MIPS_DB1100 is not set # CONFIG_MIPS_DB1500 is not set # CONFIG_MIPS_DB1550 is not set +# CONFIG_MIPS_DB1200 is not set # CONFIG_MIPS_MIRAGE is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set From ralf@linux-mips.org Wed Mar 2 19:18:51 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Wed, 02 Mar 2005 19:18:51 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Wed, 02 Mar 2005 19:18:51 +0000 X-archive-position: 311 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/02 19:18:46 Modified files: include/asm-mips: hazards.h Log message: One definition of back_to_back_c0_hazard too much. diff -urN linux/include/asm-mips/hazards.h linux/include/asm-mips/hazards.h --- linux/include/asm-mips/hazards.h 2005/03/01 18:12:06 1.8 +++ linux/include/asm-mips/hazards.h 2005/03/02 19:18:46 1.9 @@ -107,6 +107,7 @@ " .endm \n\t"); #ifdef CONFIG_CPU_RM9000 + /* * RM9000 hazards. When the JTLB is updated by tlbwi or tlbwr, a subsequent * use of the JTLB for instructions should not occur for 4 cpu cycles and use @@ -144,12 +145,6 @@ "nop; nop; nop; nop; nop; nop;\n\t" \ ".set reorder\n\t") -#define back_to_back_c0_hazard() \ - __asm__ __volatile__( \ - " .set noreorder \n" \ - " nop; nop; nop \n" \ - " .set reorder \n") - #endif /* From ralf@linux-mips.org Wed Mar 2 19:58:17 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Wed, 02 Mar 2005 19:58:17 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Wed, 02 Mar 2005 19:58:17 +0000 X-archive-position: 312 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/02 19:58:04 Modified files: . : CREDITS Makefile arch/arm/kernel: debug.S arch/arm/mach-imx: dma.c generic.c arch/arm/mm : consistent.c arch/i386/kernel: apic.c arch/ia64/kernel: ptrace.c arch/ppc64/mm : tlb.c arch/x86_64/mm : srat.c drivers/acpi : pci_irq.c drivers/block : cfq-iosched.c genhd.c drivers/char : keyboard.c pty.c drivers/ide : ide-disk.c ide-io.c drivers/ide/pci: hpt366.c drivers/input/serio: i8042-x86ia64io.h drivers/isdn/hisax: icc.c icc.h drivers/net : hp100.c rrunner.c drivers/net/wireless/prism54: islpci_hotplug.c drivers/parport: parport_pc.c drivers/scsi : dc395x.c scsi_devinfo.c drivers/serial : 8250.c 8250_pci.c Makefile drivers/usb/class: cdc-acm.c drivers/usb/core: devio.c drivers/video : modedb.c drivers/video/aty: radeon_base.c fs : binfmt_elf.c pipe.c fs/sysfs : file.c include/linux : ide.h pci_ids.h sysctl.h include/net : ipv6.h kernel : audit.c auditsc.c sysctl.c mm : highmem.c net/core : pktgen.c net/ipv4 : fib_hash.c route.c net/ipv4/netfilter: ip_conntrack_standalone.c ipt_hashlimit.c net/ipv6 : addrconf.c af_inet6.c proc.c net/unix : af_unix.c security/keys : compat.c keyctl.c security/selinux/ss: conditional.c policydb.c sound/oss : aedsp16.c opl3sa2.c sonicvibes.c Log message: Merge with Linux 2.6.11. diff -urN linux/CREDITS linux/CREDITS --- linux/CREDITS 2005/02/13 20:16:13 1.139 +++ linux/CREDITS 2005/03/02 19:58:00 1.140 @@ -805,6 +805,21 @@ S: Round Rock, TX 78682 S: USA +N: Ben Dooks +E: ben-linux@fluff.org +E: ben@simtec.co.uk +W: http://www.fluff.org/ben/ +W: http://www.simtec.co.uk/ +D: Samsung S3C2410/S3C2440 support, general ARM support +D: Maintaining Simtec Electronics development boards +S: Simtec Electronics +S: Avondale Drive +S: Tarleton +S: Preston +S: Lancs +S: PR4 6AX +S: United Kingdom + N: John G Dorsey E: john+@cs.cmu.edu D: ARM Linux ports to Assabet/Neponset, Spot diff -urN linux/Makefile linux/Makefile --- linux/Makefile 2005/02/28 15:45:09 1.246 +++ linux/Makefile 2005/03/02 19:58:00 1.247 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 11 -EXTRAVERSION =-rc5 +EXTRAVERSION = NAME=Woozy Numbat # *DOCUMENTATION* diff -urN linux/arch/arm/kernel/debug.S linux/arch/arm/kernel/debug.S --- linux/arch/arm/kernel/debug.S 2005/02/28 15:45:09 1.17 +++ linux/arch/arm/kernel/debug.S 2005/03/02 19:58:00 1.18 @@ -52,29 +52,6 @@ #include #endif -#if 0 -// #elif defined(CONFIG_ARCH_FTVPCI) - .macro addruart,rx - mrc p15, 0, \rx, c1, c0 - tst \rx, #1 @ MMU enabled? - movne \rx, #0xe0000000 - moveq \rx, #0x10000000 - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0xc] - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x4] - tst \rd, #1 << 2 - beq 1001b - .endm - - .macro waituart,rd,rx - .endm -#endif - /* * Useful debugging routines */ diff -urN linux/arch/arm/mach-imx/dma.c linux/arch/arm/mach-imx/dma.c --- linux/arch/arm/mach-imx/dma.c 2004/08/24 15:10:03 1.1 +++ linux/arch/arm/mach-imx/dma.c 2005/03/02 19:58:00 1.2 @@ -136,7 +136,7 @@ i, channel->name); DBOSR |= (1 << i); } - DISR |= (1 << i); + DISR = (1 << i); } return IRQ_HANDLED; } @@ -158,10 +158,10 @@ */ printk(KERN_WARNING "spurious IRQ for DMA channel %d\n", i); - DISR |= (1 << i); } } } + DISR = disr; return IRQ_HANDLED; } diff -urN linux/arch/arm/mach-imx/generic.c linux/arch/arm/mach-imx/generic.c --- linux/arch/arm/mach-imx/generic.c 2004/08/24 15:10:03 1.1 +++ linux/arch/arm/mach-imx/generic.c 2005/03/02 19:58:00 1.2 @@ -100,8 +100,8 @@ static unsigned int imx_decode_pll(unsigned int pll) { u32 mfi = (pll >> 10) & 0xf; - u32 mfn = pll & 0x3f; - u32 mfd = (pll >> 16) & 0x3f; + u32 mfn = pll & 0x3ff; + u32 mfd = (pll >> 16) & 0x3ff; u32 pd = (pll >> 26) & 0xf; u32 f_ref = (CSCR & CSCR_SYSTEM_SEL) ? 16000000 : (CLK32 * 512); diff -urN linux/arch/arm/mm/consistent.c linux/arch/arm/mm/consistent.c --- linux/arch/arm/mm/consistent.c 2005/02/28 15:45:10 1.25 +++ linux/arch/arm/mm/consistent.c 2005/03/02 19:58:00 1.26 @@ -293,7 +293,8 @@ vma->vm_flags |= VM_RESERVED; ret = remap_pfn_range(vma, vma->vm_start, page_to_pfn(c->vm_pages) + off, - user_size, vma->vm_page_prot); + user_size << PAGE_SHIFT, + vma->vm_page_prot); } } diff -urN linux/arch/i386/kernel/apic.c linux/arch/i386/kernel/apic.c --- linux/arch/i386/kernel/apic.c 2005/02/07 02:54:31 1.60 +++ linux/arch/i386/kernel/apic.c 2005/03/02 19:58:00 1.61 @@ -894,7 +894,7 @@ * Default initialization for 8254 timers. If we use other timers like HPET, * we override this later */ -void (*wait_timer_tick)(void) = wait_8254_wraparound; +void (*wait_timer_tick)(void) __initdata = wait_8254_wraparound; /* * This function sets up the local APIC timer, with a timeout of @@ -930,7 +930,7 @@ apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR); } -static void setup_APIC_timer(unsigned int clocks) +static void __init setup_APIC_timer(unsigned int clocks) { unsigned long flags; diff -urN linux/arch/ia64/kernel/ptrace.c linux/arch/ia64/kernel/ptrace.c --- linux/arch/ia64/kernel/ptrace.c 2005/02/13 20:16:16 1.34 +++ linux/arch/ia64/kernel/ptrace.c 2005/03/02 19:58:00 1.35 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff -urN linux/arch/ppc64/mm/tlb.c linux/arch/ppc64/mm/tlb.c --- linux/arch/ppc64/mm/tlb.c 2004/09/19 12:30:06 1.4 +++ linux/arch/ppc64/mm/tlb.c 2005/03/02 19:58:00 1.5 @@ -85,8 +85,12 @@ ptepage = virt_to_page(ptep); mm = (struct mm_struct *) ptepage->mapping; - addr = ptepage->index + - (((unsigned long)ptep & ~PAGE_MASK) * PTRS_PER_PTE); + addr = ptepage->index; + if (pte_huge(pte)) + addr += ((unsigned long)ptep & ~PAGE_MASK) + / sizeof(*ptep) * HPAGE_SIZE; + else + addr += ((unsigned long)ptep & ~PAGE_MASK) * PTRS_PER_PTE; if (REGION_ID(addr) == USER_REGION_ID) context = mm->context.id; diff -urN linux/arch/x86_64/mm/srat.c linux/arch/x86_64/mm/srat.c --- linux/arch/x86_64/mm/srat.c 2005/02/07 02:54:39 1.3 +++ linux/arch/x86_64/mm/srat.c 2005/03/02 19:58:00 1.4 @@ -23,7 +23,7 @@ static nodemask_t nodes_parsed __initdata; static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; -static __u8 pxm2node[256] __initdata = { [0 ... 255] = 0xff }; +static __u8 pxm2node[256] = { [0 ... 255] = 0xff }; static __init int setup_node(int pxm) { diff -urN linux/drivers/acpi/pci_irq.c linux/drivers/acpi/pci_irq.c --- linux/drivers/acpi/pci_irq.c 2005/01/25 04:28:09 1.24 +++ linux/drivers/acpi/pci_irq.c 2005/03/02 19:58:01 1.25 @@ -460,7 +460,7 @@ acpi_pci_irq_disable ( struct pci_dev *dev) { - u32 gsi = 0; + int gsi = 0; u8 pin = 0; int edge_level = ACPI_LEVEL_SENSITIVE; int active_high_low = ACPI_ACTIVE_LOW; @@ -487,10 +487,10 @@ * If no PRT entry was found, we'll try to derive an IRQ from the * device's parent bridge. */ - if (!gsi) + if (gsi < 0) gsi = acpi_pci_irq_derive(dev, pin, &edge_level, &active_high_low); - if (!gsi) + if (gsi < 0) return_VOID; /* diff -urN linux/drivers/block/cfq-iosched.c linux/drivers/block/cfq-iosched.c --- linux/drivers/block/cfq-iosched.c 2005/02/07 02:54:43 1.10 +++ linux/drivers/block/cfq-iosched.c 2005/03/02 19:58:01 1.11 @@ -1819,7 +1819,7 @@ .elevator_owner = THIS_MODULE, }; -int cfq_init(void) +static int __init cfq_init(void) { int ret; diff -urN linux/drivers/block/genhd.c linux/drivers/block/genhd.c --- linux/drivers/block/genhd.c 2005/02/07 02:54:43 1.79 +++ linux/drivers/block/genhd.c 2005/03/02 19:58:01 1.80 @@ -660,9 +660,10 @@ { int res = 0; struct block_device *bdev = bdget_disk(disk, index); - if (bdev) + if (bdev) { res = __invalidate_device(bdev, 1); - bdput(bdev); + bdput(bdev); + } return res; } diff -urN linux/drivers/char/keyboard.c linux/drivers/char/keyboard.c --- linux/drivers/char/keyboard.c 2005/01/25 04:28:12 1.48 +++ linux/drivers/char/keyboard.c 2005/03/02 19:58:01 1.49 @@ -198,6 +198,8 @@ if (scancode < 0 || scancode >= dev->keycodemax) return -EINVAL; + if (keycode < 0 || keycode > KEY_MAX) + return -EINVAL; oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode); diff -urN linux/drivers/char/pty.c linux/drivers/char/pty.c --- linux/drivers/char/pty.c 2005/01/13 14:05:52 1.35 +++ linux/drivers/char/pty.c 2005/03/02 19:58:01 1.36 @@ -149,13 +149,15 @@ static int pty_chars_in_buffer(struct tty_struct *tty) { struct tty_struct *to = tty->link; + ssize_t (*chars_in_buffer)(struct tty_struct *); int count; - if (!to || !to->ldisc.chars_in_buffer) + /* We should get the line discipline lock for "tty->link" */ + if (!to || !(chars_in_buffer = to->ldisc.chars_in_buffer)) return 0; /* The ldisc must report 0 if no characters available to be read */ - count = to->ldisc.chars_in_buffer(to); + count = chars_in_buffer(to); if (tty->driver->subtype == PTY_TYPE_SLAVE) return count; diff -urN linux/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c --- linux/drivers/ide/ide-disk.c 2005/02/13 20:16:22 1.78 +++ linux/drivers/ide/ide-disk.c 2005/03/02 19:58:01 1.79 @@ -119,9 +119,8 @@ /* * __ide_do_rw_disk() issues READ and WRITE commands to a disk, * using LBA if supported, or CHS otherwise, to address sectors. - * It also takes care of issuing special DRIVE_CMDs. */ -ide_startstop_t __ide_do_rw_disk (ide_drive_t *drive, struct request *rq, sector_t block) +static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, sector_t block) { ide_hwif_t *hwif = HWIF(drive); unsigned int dma = drive->using_dma; @@ -256,7 +255,6 @@ return pre_task_out_intr(drive, rq); } } -EXPORT_SYMBOL_GPL(__ide_do_rw_disk); /* * 268435455 == 137439 MB or 28bit limit @@ -281,9 +279,9 @@ block, rq->nr_sectors, (unsigned long)rq->buffer); if (hwif->rw_disk) - return hwif->rw_disk(drive, rq, block); - else - return __ide_do_rw_disk(drive, rq, block); + hwif->rw_disk(drive, rq); + + return __ide_do_rw_disk(drive, rq, block); } /* diff -urN linux/drivers/ide/ide-io.c linux/drivers/ide/ide-io.c --- linux/drivers/ide/ide-io.c 2005/02/28 15:45:14 1.31 +++ linux/drivers/ide/ide-io.c 2005/03/02 19:58:01 1.32 @@ -1163,14 +1163,14 @@ * happens anyway when any interrupt comes in, IDE or otherwise * -- the kernel masks the IRQ while it is being handled. */ - if (hwif->irq != masked_irq) + if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq) disable_irq_nosync(hwif->irq); spin_unlock(&ide_lock); local_irq_enable(); /* allow other IRQs while we start this request */ startstop = start_request(drive, rq); spin_lock_irq(&ide_lock); - if (hwif->irq != masked_irq) + if (masked_irq != IDE_NO_IRQ && hwif->irq != masked_irq) enable_irq(hwif->irq); if (startstop == ide_stopped) hwgroup->busy = 0; diff -urN linux/drivers/ide/pci/hpt366.c linux/drivers/ide/pci/hpt366.c --- linux/drivers/ide/pci/hpt366.c 2005/02/13 20:16:23 1.30 +++ linux/drivers/ide/pci/hpt366.c 2005/03/02 19:58:01 1.31 @@ -1018,32 +1018,25 @@ } /** - * hpt372n_rw_disk - wrapper for I/O + * hpt372n_rw_disk - prepare for I/O * @drive: drive for command * @rq: block request structure - * @block: block number - * - * This is called when a disk I/O is issued to the 372N instead - * of the default functionality. We need it because of the clock - * switching * + * This is called when a disk I/O is issued to the 372N. + * We need it because of the clock switching. */ - -static ide_startstop_t hpt372n_rw_disk(ide_drive_t *drive, struct request *rq, sector_t block) + +static void hpt372n_rw_disk(ide_drive_t *drive, struct request *rq) { + ide_hwif_t *hwif = drive->hwif; int wantclock; - - if(rq_data_dir(rq) == READ) - wantclock = 0x21; - else - wantclock = 0x23; - - if(HWIF(drive)->config_data != wantclock) - { + + wantclock = rq_data_dir(rq) ? 0x23 : 0x21; + + if (hwif->config_data != wantclock) { hpt372n_set_clock(drive, wantclock); - HWIF(drive)->config_data = wantclock; + hwif->config_data = wantclock; } - return __ide_do_rw_disk(drive, rq, block); } /* diff -urN linux/drivers/input/serio/i8042-x86ia64io.h linux/drivers/input/serio/i8042-x86ia64io.h --- linux/drivers/input/serio/i8042-x86ia64io.h 2005/01/13 14:06:03 1.1 +++ linux/drivers/input/serio/i8042-x86ia64io.h 2005/03/02 19:58:01 1.2 @@ -224,7 +224,7 @@ static struct acpi_driver i8042_acpi_aux_driver = { .name = "i8042", - .ids = "PNP0F13,SYN0801", + .ids = "PNP0F03,PNP0F0B,PNP0F0E,PNP0F12,PNP0F13,SYN0801", .ops = { .add = i8042_acpi_aux_add, }, diff -urN linux/drivers/isdn/hisax/icc.c linux/drivers/isdn/hisax/icc.c --- linux/drivers/isdn/hisax/icc.c 2004/03/11 16:46:49 1.13 +++ linux/drivers/isdn/hisax/icc.c 2005/03/02 19:58:01 1.14 @@ -27,7 +27,7 @@ static char *ICCVer[] __initdata = {"2070 A1/A3", "2070 B1", "2070 B2/B3", "2070 V2.4"}; -void +void __init ICCVersion(struct IsdnCardState *cs, char *s) { int val; diff -urN linux/drivers/isdn/hisax/icc.h linux/drivers/isdn/hisax/icc.h --- linux/drivers/isdn/hisax/icc.h 2004/03/11 16:46:49 1.7 +++ linux/drivers/isdn/hisax/icc.h 2005/03/02 19:58:01 1.8 @@ -65,7 +65,7 @@ #define ICC_IND_AIL 0xE #define ICC_IND_DC 0xF -extern void ICCVersion(struct IsdnCardState *cs, char *s); +extern void __init ICCVersion(struct IsdnCardState *cs, char *s); extern void initicc(struct IsdnCardState *cs); extern void icc_interrupt(struct IsdnCardState *cs, u_char val); extern void clear_pending_icc_ints(struct IsdnCardState *cs); diff -urN linux/drivers/net/hp100.c linux/drivers/net/hp100.c --- linux/drivers/net/hp100.c 2005/01/13 14:06:10 1.44 +++ linux/drivers/net/hp100.c 2005/03/02 19:58:01 1.45 @@ -306,7 +306,7 @@ * Read board id and convert to string. * Effectively same code as decode_eisa_sig */ -static __init const char *hp100_read_id(int ioaddr) +static __devinit const char *hp100_read_id(int ioaddr) { int i; static char str[HP100_SIG_LEN]; @@ -429,8 +429,8 @@ } #endif -static int __init hp100_probe1(struct net_device *dev, int ioaddr, - u_char bus, struct pci_dev *pci_dev) +static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, + u_char bus, struct pci_dev *pci_dev) { int i; int err = -ENODEV; diff -urN linux/drivers/net/rrunner.c linux/drivers/net/rrunner.c --- linux/drivers/net/rrunner.c 2004/10/25 20:44:28 1.38 +++ linux/drivers/net/rrunner.c 2005/03/02 19:58:01 1.39 @@ -62,7 +62,7 @@ MODULE_DESCRIPTION("Essential RoadRunner HIPPI driver"); MODULE_LICENSE("GPL"); -static char version[] __initdata = "rrunner.c: v0.50 11/11/2002 Jes Sorensen (jes@wildopensource.com)\n"; +static char version[] __devinitdata = "rrunner.c: v0.50 11/11/2002 Jes Sorensen (jes@wildopensource.com)\n"; /* * Implementation notes: diff -urN linux/drivers/net/wireless/prism54/islpci_hotplug.c linux/drivers/net/wireless/prism54/islpci_hotplug.c --- linux/drivers/net/wireless/prism54/islpci_hotplug.c 2005/01/13 14:06:17 1.8 +++ linux/drivers/net/wireless/prism54/islpci_hotplug.c 2005/03/02 19:58:01 1.9 @@ -163,7 +163,7 @@ if (rvalue || !mem_addr) { printk(KERN_ERR "%s: PCI device memory region not configured; fix your BIOS or CardBus bridge/drivers\n", DRV_NAME); - goto do_pci_disable_device; + goto do_pci_release_regions; } /* enable PCI bus-mastering */ diff -urN linux/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c --- linux/drivers/parport/parport_pc.c 2005/01/25 04:28:38 1.72 +++ linux/drivers/parport/parport_pc.c 2005/03/02 19:58:01 1.73 @@ -2488,7 +2488,7 @@ /* VIA 8231 support by Pavel Fedin based on VIA 686a support code by Jeff Garzik */ -static int __initdata parport_init_mode = 0; +static int __devinitdata parport_init_mode = 0; /* Data for two known VIA chips */ static struct parport_pc_via_data via_686a_data __devinitdata = { diff -urN linux/drivers/scsi/dc395x.c linux/drivers/scsi/dc395x.c --- linux/drivers/scsi/dc395x.c 2004/12/04 18:16:06 1.15 +++ linux/drivers/scsi/dc395x.c 2005/03/02 19:58:01 1.16 @@ -488,7 +488,7 @@ int def; /* default value */ int safe; /* safe value */ }; -static struct ParameterData __initdata cfg_data[] = { +static struct ParameterData __devinitdata cfg_data[] = { { /* adapter id */ CFG_PARAM_UNSET, 0, @@ -573,7 +573,7 @@ * set_safe_settings - if the use_safe_settings option is set then * set all values to the safe and slow values. **/ -static void __init set_safe_settings(void) +static void __devinit set_safe_settings(void) { if (use_safe_settings) { @@ -592,7 +592,7 @@ * fix_settings - reset any boot parameters which are out of range * back to the default values. **/ -static void __init fix_settings(void) +static void __devinit fix_settings(void) { int i; @@ -619,7 +619,7 @@ * Mapping from the eeprom delay index value (index into this array) * to the the number of actual seconds that the delay should be for. */ -static char __initdata eeprom_index_to_delay_map[] = +static char __devinitdata eeprom_index_to_delay_map[] = { 1, 3, 5, 10, 16, 30, 60, 120 }; @@ -629,7 +629,7 @@ * * @eeprom: The eeprom structure in which we find the delay index to map. **/ -static void __init eeprom_index_to_delay(struct NvRamType *eeprom) +static void __devinit eeprom_index_to_delay(struct NvRamType *eeprom) { eeprom->delay_time = eeprom_index_to_delay_map[eeprom->delay_time]; } @@ -642,7 +642,7 @@ * * @delay: The delay, in seconds, to find the eeprom index for. **/ -static int __init delay_to_eeprom_index(int delay) +static int __devinit delay_to_eeprom_index(int delay) { u8 idx = 0; while (idx < 7 && eeprom_index_to_delay_map[idx] < delay) @@ -658,7 +658,7 @@ * * @eeprom: The eeprom data to override with command line options. **/ -static void __init eeprom_override(struct NvRamType *eeprom) +static void __devinit eeprom_override(struct NvRamType *eeprom) { u8 id; @@ -3931,7 +3931,7 @@ * * @io_port: base I/O address **/ -static void __init trms1040_wait_30us(unsigned long io_port) +static void __devinit trms1040_wait_30us(unsigned long io_port) { /* ScsiPortStallExecution(30); wait 30 us */ outb(5, io_port + TRM_S1040_GEN_TIMER); @@ -3948,7 +3948,7 @@ * @cmd: SB + op code (command) to send * @addr: address to send **/ -static void __init trms1040_write_cmd(unsigned long io_port, u8 cmd, u8 addr) +static void __devinit trms1040_write_cmd(unsigned long io_port, u8 cmd, u8 addr) { int i; u8 send_data; @@ -3993,7 +3993,7 @@ * @addr: offset into EEPROM * @byte: bytes to write **/ -static void __init trms1040_set_data(unsigned long io_port, u8 addr, u8 byte) +static void __devinit trms1040_set_data(unsigned long io_port, u8 addr, u8 byte) { int i; u8 send_data; @@ -4047,7 +4047,7 @@ * @eeprom: the data to write * @io_port: the base io port **/ -static void __init trms1040_write_all(struct NvRamType *eeprom, unsigned long io_port) +static void __devinit trms1040_write_all(struct NvRamType *eeprom, unsigned long io_port) { u8 *b_eeprom = (u8 *)eeprom; u8 addr; @@ -4087,7 +4087,7 @@ * * Returns the the byte read. **/ -static u8 __init trms1040_get_data(unsigned long io_port, u8 addr) +static u8 __devinit trms1040_get_data(unsigned long io_port, u8 addr) { int i; u8 read_byte; @@ -4125,7 +4125,7 @@ * @eeprom: where to store the data * @io_port: the base io port **/ -static void __init trms1040_read_all(struct NvRamType *eeprom, unsigned long io_port) +static void __devinit trms1040_read_all(struct NvRamType *eeprom, unsigned long io_port) { u8 *b_eeprom = (u8 *)eeprom; u8 addr; @@ -4155,7 +4155,7 @@ * @eeprom: caller allocated strcuture to read the eeprom data into * @io_port: io port to read from **/ -static void __init check_eeprom(struct NvRamType *eeprom, unsigned long io_port) +static void __devinit check_eeprom(struct NvRamType *eeprom, unsigned long io_port) { u16 *w_eeprom = (u16 *)eeprom; u16 w_addr; @@ -4225,7 +4225,7 @@ * * @eeprom: The eeprom data strucutre to show details for. **/ -static void __init print_eeprom_settings(struct NvRamType *eeprom) +static void __devinit print_eeprom_settings(struct NvRamType *eeprom) { dprintkl(KERN_INFO, "Used settings: AdapterID=%02i, Speed=%i(%02i.%01iMHz), dev_mode=0x%02x\n", eeprom->scsi_id, @@ -4254,7 +4254,7 @@ /* * Allocate SG tables; as we have to pci_map them, an SG list (struct SGentry*) * should never cross a page boundary */ -static int __init adapter_sg_tables_alloc(struct AdapterCtlBlk *acb) +static int __devinit adapter_sg_tables_alloc(struct AdapterCtlBlk *acb) { const unsigned mem_needed = (DC395x_MAX_SRB_CNT+1) *SEGMENTX_LEN; @@ -4300,7 +4300,7 @@ * * @acb: The adapter to print the information for. **/ -static void __init adapter_print_config(struct AdapterCtlBlk *acb) +static void __devinit adapter_print_config(struct AdapterCtlBlk *acb) { u8 bval; @@ -4344,7 +4344,7 @@ * * @acb: The adapter to initialize. **/ -static void __init adapter_init_params(struct AdapterCtlBlk *acb) +static void __devinit adapter_init_params(struct AdapterCtlBlk *acb) { struct NvRamType *eeprom = &acb->eeprom; int i; @@ -4406,7 +4406,7 @@ * * @host: The scsi host instance to fill in the values for. **/ -static void __init adapter_init_scsi_host(struct Scsi_Host *host) +static void __devinit adapter_init_scsi_host(struct Scsi_Host *host) { struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)host->hostdata; struct NvRamType *eeprom = &acb->eeprom; @@ -4447,7 +4447,7 @@ * * @acb: The adapter which we are to init. **/ -static void __init adapter_init_chip(struct AdapterCtlBlk *acb) +static void __devinit adapter_init_chip(struct AdapterCtlBlk *acb) { struct NvRamType *eeprom = &acb->eeprom; @@ -4500,7 +4500,7 @@ * Returns 0 if the initialization succeeds, any other value on * failure. **/ -static int __init adapter_init(struct AdapterCtlBlk *acb, +static int __devinit adapter_init(struct AdapterCtlBlk *acb, unsigned long io_port, u32 io_port_len, unsigned int irq) { if (!request_region(io_port, io_port_len, DC395X_NAME)) { diff -urN linux/drivers/scsi/scsi_devinfo.c linux/drivers/scsi/scsi_devinfo.c --- linux/drivers/scsi/scsi_devinfo.c 2004/12/27 02:15:59 1.14 +++ linux/drivers/scsi/scsi_devinfo.c 2005/03/02 19:58:02 1.15 @@ -28,7 +28,7 @@ static const char spaces[] = " "; /* 16 of them */ static unsigned scsi_default_dev_flags; static LIST_HEAD(scsi_dev_info_list); -static __initdata char scsi_dev_flags[256]; +static char scsi_dev_flags[256]; /* * scsi_static_device_list: deprecated list of devices that require diff -urN linux/drivers/serial/8250.c linux/drivers/serial/8250.c --- linux/drivers/serial/8250.c 2005/02/13 20:16:26 1.31 +++ linux/drivers/serial/8250.c 2005/03/02 19:58:02 1.32 @@ -450,9 +450,11 @@ */ static int size_fifo(struct uart_8250_port *up) { - unsigned char old_fcr, old_mcr, old_dll, old_dlm; + unsigned char old_fcr, old_mcr, old_dll, old_dlm, old_lcr; int count; + old_lcr = serial_inp(up, UART_LCR); + serial_outp(up, UART_LCR, 0); old_fcr = serial_inp(up, UART_FCR); old_mcr = serial_inp(up, UART_MCR); serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | @@ -475,11 +477,40 @@ serial_outp(up, UART_LCR, UART_LCR_DLAB); serial_outp(up, UART_DLL, old_dll); serial_outp(up, UART_DLM, old_dlm); + serial_outp(up, UART_LCR, old_lcr); return count; } /* + * Read UART ID using the divisor method - set DLL and DLM to zero + * and the revision will be in DLL and device type in DLM. We + * preserve the device state across this. + */ +static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p) +{ + unsigned char old_dll, old_dlm, old_lcr; + unsigned int id; + + old_lcr = serial_inp(p, UART_LCR); + serial_outp(p, UART_LCR, UART_LCR_DLAB); + + old_dll = serial_inp(p, UART_DLL); + old_dlm = serial_inp(p, UART_DLM); + + serial_outp(p, UART_DLL, 0); + serial_outp(p, UART_DLM, 0); + + id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8; + + serial_outp(p, UART_DLL, old_dll); + serial_outp(p, UART_DLM, old_dlm); + serial_outp(p, UART_LCR, old_lcr); + + return id; +} + +/* * This is a helper routine to autodetect StarTech/Exar/Oxsemi UART's. * When this function is called we know it is at least a StarTech * 16650 V2, but it might be one of several StarTech UARTs, or one of @@ -491,7 +522,7 @@ */ static void autoconfig_has_efr(struct uart_8250_port *up) { - unsigned char id1, id2, id3, rev, saved_dll, saved_dlm; + unsigned int id1, id2, id3, rev; /* * Everything with an EFR has SLEEP @@ -541,21 +572,13 @@ * 0x12 - XR16C2850. * 0x14 - XR16C854. */ - serial_outp(up, UART_LCR, UART_LCR_DLAB); - saved_dll = serial_inp(up, UART_DLL); - saved_dlm = serial_inp(up, UART_DLM); - serial_outp(up, UART_DLL, 0); - serial_outp(up, UART_DLM, 0); - id2 = serial_inp(up, UART_DLL); - id1 = serial_inp(up, UART_DLM); - serial_outp(up, UART_DLL, saved_dll); - serial_outp(up, UART_DLM, saved_dlm); - - DEBUG_AUTOCONF("850id=%02x:%02x ", id1, id2); - - if (id1 == 0x10 || id1 == 0x12 || id1 == 0x14) { - if (id1 == 0x10) - up->rev = id2; + id1 = autoconfig_read_divisor_id(up); + DEBUG_AUTOCONF("850id=%04x ", id1); + + id2 = id1 >> 8; + if (id2 == 0x10 || id2 == 0x12 || id2 == 0x14) { + if (id2 == 0x10) + up->rev = id1 & 255; up->port.type = PORT_16850; return; } @@ -597,6 +620,19 @@ up->port.type = PORT_16450; } +static int broken_efr(struct uart_8250_port *up) +{ + /* + * Exar ST16C2550 "A2" devices incorrectly detect as + * having an EFR, and report an ID of 0x0201. See + * http://www.exar.com/info.php?pdf=dan180_oct2004.pdf + */ + if (autoconfig_read_divisor_id(up) == 0x0201 && size_fifo(up) == 16) + return 1; + + return 0; +} + /* * We know that the chip has FIFOs. Does it have an EFR? The * EFR is located in the same register position as the IIR and @@ -633,7 +669,7 @@ * (other ST16C650V2 UARTs, TI16C752A, etc) */ serial_outp(up, UART_LCR, 0xBF); - if (serial_in(up, UART_EFR) == 0) { + if (serial_in(up, UART_EFR) == 0 && !broken_efr(up)) { DEBUG_AUTOCONF("EFRv2 "); autoconfig_has_efr(up); return; diff -urN linux/drivers/serial/8250_pci.c linux/drivers/serial/8250_pci.c --- linux/drivers/serial/8250_pci.c 2004/12/04 18:16:07 1.28 +++ linux/drivers/serial/8250_pci.c 2005/03/02 19:58:02 1.29 @@ -2212,6 +2212,13 @@ 0, pbn_exar_XR17C158 }, /* + * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke) + */ + { PCI_VENDOR_ID_TOPIC, PCI_DEVICE_ID_TOPIC_TP560, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, + pbn_b0_1_115200 }, + + /* * These entries match devices with class COMMUNICATION_SERIAL, * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL */ @@ -2241,7 +2248,7 @@ static int __init serial8250_pci_init(void) { - return pci_module_init(&serial_pci_driver); + return pci_register_driver(&serial_pci_driver); } static void __exit serial8250_pci_exit(void) diff -urN linux/drivers/serial/Makefile linux/drivers/serial/Makefile --- linux/drivers/serial/Makefile 2005/02/13 20:16:26 1.31 +++ linux/drivers/serial/Makefile 2005/03/02 19:58:02 1.32 @@ -6,9 +6,9 @@ serial-8250-y := serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o +serial-8250-$(CONFIG_PNP) += 8250_pnp.o serial-8250-$(CONFIG_GSC) += 8250_gsc.o serial-8250-$(CONFIG_PCI) += 8250_pci.o -serial-8250-$(CONFIG_PNP) += 8250_pnp.o serial-8250-$(CONFIG_HP300) += 8250_hp300.o obj-$(CONFIG_SERIAL_CORE) += serial_core.o diff -urN linux/drivers/usb/class/cdc-acm.c linux/drivers/usb/class/cdc-acm.c --- linux/drivers/usb/class/cdc-acm.c 2005/02/13 20:16:27 1.42 +++ linux/drivers/usb/class/cdc-acm.c 2005/03/02 19:58:02 1.43 @@ -278,15 +278,14 @@ - if (acm->used) { + if (acm->used++) { goto done; } acm->ctrlurb->dev = acm->dev; if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) { dbg("usb_submit_urb(ctrl irq) failed"); - rv = -EIO; - goto err_out; + goto bail_out; } acm->readurb->dev = acm->dev; @@ -303,7 +302,6 @@ tty->low_latency = 1; done: - acm->used++; err_out: up(&open_sem); return rv; @@ -312,6 +310,8 @@ usb_kill_urb(acm->readurb); bail_out_and_unlink: usb_kill_urb(acm->ctrlurb); +bail_out: + acm->used--; up(&open_sem); return -EIO; } diff -urN linux/drivers/usb/core/devio.c linux/drivers/usb/core/devio.c --- linux/drivers/usb/core/devio.c 2005/02/13 20:16:27 1.35 +++ linux/drivers/usb/core/devio.c 2005/03/02 19:58:02 1.36 @@ -841,7 +841,7 @@ if ((ret = checkintf(ps, ifnum))) return ret; } - if ((uurb.endpoint & ~USB_ENDPOINT_DIR_MASK) != 0) + if ((uurb.endpoint & USB_ENDPOINT_DIR_MASK) != 0) ep = ps->dev->ep_in [uurb.endpoint & USB_ENDPOINT_NUMBER_MASK]; else ep = ps->dev->ep_out [uurb.endpoint & USB_ENDPOINT_NUMBER_MASK]; diff -urN linux/drivers/video/modedb.c linux/drivers/video/modedb.c --- linux/drivers/video/modedb.c 2005/01/13 14:06:29 1.17 +++ linux/drivers/video/modedb.c 2005/03/02 19:58:02 1.18 @@ -37,7 +37,7 @@ #define DEFAULT_MODEDB_INDEX 0 -static const __init struct fb_videomode modedb[] = { +static const struct fb_videomode modedb[] = { { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, diff -urN linux/drivers/video/aty/radeon_base.c linux/drivers/video/aty/radeon_base.c --- linux/drivers/video/aty/radeon_base.c 2005/02/28 15:45:17 1.16 +++ linux/drivers/video/aty/radeon_base.c 2005/03/02 19:58:02 1.17 @@ -2551,7 +2551,7 @@ MODULE_DESCRIPTION("framebuffer driver for ATI Radeon chipset"); MODULE_LICENSE("GPL"); module_param(noaccel, bool, 0); -module_param(default_dynclk, int, -2); +module_param(default_dynclk, int, 0); MODULE_PARM_DESC(default_dynclk, "int: -2=enable on mobility only,-1=do not change,0=off,1=on"); MODULE_PARM_DESC(noaccel, "bool: disable acceleration"); module_param(nomodeset, bool, 0); diff -urN linux/fs/binfmt_elf.c linux/fs/binfmt_elf.c --- linux/fs/binfmt_elf.c 2005/02/28 15:45:17 1.106 +++ linux/fs/binfmt_elf.c 2005/03/02 19:58:02 1.107 @@ -803,13 +803,14 @@ nbyte = ELF_MIN_ALIGN - nbyte; if (nbyte > elf_brk - elf_bss) nbyte = elf_brk - elf_bss; - /* - * This bss-zeroing can fail if the ELF file - * specifies odd protections. So we don't check - * the return value - */ - (void)clear_user((void __user *)elf_bss + - load_bias, nbyte); + if (clear_user((void __user *)elf_bss + + load_bias, nbyte)) { + /* + * This bss-zeroing can fail if the ELF + * file specifies odd protections. So + * we don't check the return value + */ + } } } diff -urN linux/fs/pipe.c linux/fs/pipe.c --- linux/fs/pipe.c 2005/02/07 02:54:54 1.63 +++ linux/fs/pipe.c 2005/03/02 19:58:02 1.64 @@ -235,6 +235,12 @@ down(PIPE_SEM(*inode)); info = inode->i_pipe; + if (!PIPE_READERS(*inode)) { + send_sig(SIGPIPE, current, 0); + ret = -EPIPE; + goto out; + } + /* We try to merge small writes */ if (info->nrbufs && total_len < PAGE_SIZE) { int lastbuf = (info->curbuf + info->nrbufs - 1) & (PIPE_BUFFERS-1); @@ -398,13 +404,18 @@ /* Reading only -- no need for acquiring the semaphore. */ nrbufs = info->nrbufs; - mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0; - mask |= (nrbufs < PIPE_BUFFERS) ? POLLOUT | POLLWRNORM : 0; + mask = 0; + if (filp->f_mode & FMODE_READ) { + mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0; + if (!PIPE_WRITERS(*inode) && filp->f_version != PIPE_WCOUNTER(*inode)) + mask |= POLLHUP; + } - if (!PIPE_WRITERS(*inode) && filp->f_version != PIPE_WCOUNTER(*inode)) - mask |= POLLHUP; - if (!PIPE_READERS(*inode)) - mask |= POLLERR; + if (filp->f_mode & FMODE_WRITE) { + mask |= (nrbufs < PIPE_BUFFERS) ? POLLOUT | POLLWRNORM : 0; + if (!PIPE_READERS(*inode)) + mask |= POLLERR; + } return mask; } diff -urN linux/fs/sysfs/file.c linux/fs/sysfs/file.c --- linux/fs/sysfs/file.c 2004/11/15 11:49:36 1.13 +++ linux/fs/sysfs/file.c 2005/03/02 19:58:02 1.14 @@ -231,15 +231,16 @@ sysfs_write_file(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct sysfs_buffer * buffer = file->private_data; + ssize_t len; down(&buffer->sem); - count = fill_write_buffer(buffer,buf,count); - if (count > 0) - count = flush_write_buffer(file->f_dentry,buffer,count); - if (count > 0) - *ppos += count; + len = fill_write_buffer(buffer, buf, count); + if (len > 0) + len = flush_write_buffer(file->f_dentry, buffer, len); + if (len > 0) + *ppos += len; up(&buffer->sem); - return count; + return len; } static int check_perm(struct inode * inode, struct file * file) diff -urN linux/include/linux/ide.h linux/include/linux/ide.h --- linux/include/linux/ide.h 2005/02/13 20:16:31 1.99 +++ linux/include/linux/ide.h 2005/03/02 19:58:02 1.100 @@ -797,7 +797,7 @@ struct pci_dev *pci_dev; /* for pci chipsets */ struct ide_pci_device_s *cds; /* chipset device struct */ - ide_startstop_t (*rw_disk)(ide_drive_t *, struct request *, sector_t); + void (*rw_disk)(ide_drive_t *, struct request *); #if 0 ide_hwif_ops_t *hwifops; @@ -934,9 +934,9 @@ /* BOOL: protects all fields below */ volatile int busy; /* BOOL: wake us up on timer expiry */ - int sleeping : 1; + unsigned int sleeping : 1; /* BOOL: polling active & poll_timeout field valid */ - int polling : 1; + unsigned int polling : 1; /* current drive */ ide_drive_t *drive; /* ptr to current hwif in linked-list */ @@ -1318,7 +1318,6 @@ extern int taskfile_lib_get_identify(ide_drive_t *drive, u8 *); extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout); -ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, sector_t block); /* * ide_stall_queue() can be used by a drive to give excess bandwidth back diff -urN linux/include/linux/pci_ids.h linux/include/linux/pci_ids.h --- linux/include/linux/pci_ids.h 2005/01/25 04:28:56 1.137 +++ linux/include/linux/pci_ids.h 2005/03/02 19:58:02 1.138 @@ -1971,6 +1971,9 @@ #define PCI_DEVICE_ID_BCM4401 0x4401 #define PCI_DEVICE_ID_BCM4401B0 0x4402 +#define PCI_VENDOR_ID_TOPIC 0x151f +#define PCI_DEVICE_ID_TOPIC_TP560 0x0000 + #define PCI_VENDOR_ID_ENE 0x1524 #define PCI_DEVICE_ID_ENE_1211 0x1211 #define PCI_DEVICE_ID_ENE_1225 0x1225 diff -urN linux/include/linux/sysctl.h linux/include/linux/sysctl.h --- linux/include/linux/sysctl.h 2005/02/28 15:45:18 1.93 +++ linux/include/linux/sysctl.h 2005/03/02 19:58:02 1.94 @@ -797,6 +797,8 @@ void __user *, size_t *, loff_t *); extern int proc_dointvec_userhz_jiffies(ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); +extern int proc_dointvec_ms_jiffies(ctl_table *, int, struct file *, + void __user *, size_t *, loff_t *); extern int proc_doulongvec_minmax(ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int, @@ -814,6 +816,7 @@ extern ctl_handler sysctl_string; extern ctl_handler sysctl_intvec; extern ctl_handler sysctl_jiffies; +extern ctl_handler sysctl_ms_jiffies; /* diff -urN linux/include/net/ipv6.h linux/include/net/ipv6.h --- linux/include/net/ipv6.h 2005/01/25 04:28:58 1.37 +++ linux/include/net/ipv6.h 2005/03/02 19:58:03 1.38 @@ -149,6 +149,8 @@ int snmp6_register_dev(struct inet6_dev *idev); int snmp6_unregister_dev(struct inet6_dev *idev); +int snmp6_alloc_dev(struct inet6_dev *idev); +int snmp6_free_dev(struct inet6_dev *idev); int snmp6_mib_init(void *ptr[2], size_t mibsize, size_t mibalign); void snmp6_mib_free(void *ptr[2]); diff -urN linux/kernel/audit.c linux/kernel/audit.c --- linux/kernel/audit.c 2005/02/07 02:55:03 1.6 +++ linux/kernel/audit.c 2005/03/02 19:58:03 1.7 @@ -360,7 +360,7 @@ status_set.backlog_limit = audit_backlog_limit; status_set.lost = atomic_read(&audit_lost); status_set.backlog = atomic_read(&audit_backlog); - audit_send_reply(pid, seq, AUDIT_GET, 0, 0, + audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); break; case AUDIT_SET: @@ -407,8 +407,8 @@ /* fallthrough */ case AUDIT_LIST: #ifdef CONFIG_AUDITSYSCALL - err = audit_receive_filter(nlh->nlmsg_type, pid, uid, seq, - data); + err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, + uid, seq, data); #else err = -EOPNOTSUPP; #endif diff -urN linux/kernel/auditsc.c linux/kernel/auditsc.c --- linux/kernel/auditsc.c 2005/02/07 02:55:03 1.6 +++ linux/kernel/auditsc.c 2005/03/02 19:58:03 1.7 @@ -358,7 +358,7 @@ case AUDIT_INODE: if (ctx) { for (j = 0; j < ctx->name_count; j++) { - if (MINOR(ctx->names[j].ino)==value) { + if (ctx->names[j].ino == value) { ++result; break; } diff -urN linux/kernel/sysctl.c linux/kernel/sysctl.c --- linux/kernel/sysctl.c 2005/02/07 02:55:03 1.94 +++ linux/kernel/sysctl.c 2005/03/02 19:58:03 1.95 @@ -1902,6 +1902,27 @@ return 0; } +static int do_proc_dointvec_ms_jiffies_conv(int *negp, unsigned long *lvalp, + int *valp, + int write, void *data) +{ + if (write) { + *valp = msecs_to_jiffies(*negp ? -*lvalp : *lvalp); + } else { + int val = *valp; + unsigned long lval; + if (val < 0) { + *negp = -1; + lval = (unsigned long)-val; + } else { + *negp = 0; + lval = (unsigned long)val; + } + *lvalp = jiffies_to_msecs(lval); + } + return 0; +} + /** * proc_dointvec_jiffies - read a vector of integers as seconds * @table: the sysctl table @@ -1946,6 +1967,28 @@ do_proc_dointvec_userhz_jiffies_conv,NULL); } +/** + * proc_dointvec_ms_jiffies - read a vector of integers as 1 milliseconds + * @table: the sysctl table + * @write: %TRUE if this is a write to the sysctl file + * @filp: the file structure + * @buffer: the user buffer + * @lenp: the size of the user buffer + * + * Reads/writes up to table->maxlen/sizeof(unsigned int) integer + * values from/to the user buffer, treated as an ASCII string. + * The values read are assumed to be in 1/1000 seconds, and + * are converted into jiffies. + * + * Returns 0 on success. + */ +int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + return do_proc_dointvec(table, write, filp, buffer, lenp, ppos, + do_proc_dointvec_ms_jiffies_conv, NULL); +} + #else /* CONFIG_PROC_FS */ int proc_dostring(ctl_table *table, int write, struct file *filp, @@ -1990,6 +2033,12 @@ return -ENOSYS; } +int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + return -ENOSYS; +} + int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -2119,6 +2168,33 @@ return 1; } +/* Strategy function to convert jiffies to seconds */ +int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen, + void __user *oldval, size_t __user *oldlenp, + void __user *newval, size_t newlen, void **context) +{ + if (oldval) { + size_t olen; + if (oldlenp) { + if (get_user(olen, oldlenp)) + return -EFAULT; + if (olen!=sizeof(int)) + return -EINVAL; + } + if (put_user(jiffies_to_msecs(*(int *)(table->data)), (int __user *)oldval) || + (oldlenp && put_user(sizeof(int),oldlenp))) + return -EFAULT; + } + if (newval && newlen) { + int new; + if (newlen != sizeof(int)) + return -EINVAL; + if (get_user(new, (int __user *)newval)) + return -EFAULT; + *(int *)(table->data) = msecs_to_jiffies(new); + } + return 1; +} #else /* CONFIG_SYSCTL */ @@ -2149,6 +2225,13 @@ return -ENOSYS; } +int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen, + void __user *oldval, size_t __user *oldlenp, + void __user *newval, size_t newlen, void **context) +{ + return -ENOSYS; +} + int proc_dostring(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -2185,6 +2268,12 @@ return -ENOSYS; } +int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + return -ENOSYS; +} + int proc_doulongvec_minmax(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -2219,11 +2308,13 @@ EXPORT_SYMBOL(proc_dointvec_jiffies); EXPORT_SYMBOL(proc_dointvec_minmax); EXPORT_SYMBOL(proc_dointvec_userhz_jiffies); +EXPORT_SYMBOL(proc_dointvec_ms_jiffies); EXPORT_SYMBOL(proc_dostring); EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); EXPORT_SYMBOL(register_sysctl_table); EXPORT_SYMBOL(sysctl_intvec); EXPORT_SYMBOL(sysctl_jiffies); +EXPORT_SYMBOL(sysctl_ms_jiffies); EXPORT_SYMBOL(sysctl_string); EXPORT_SYMBOL(unregister_sysctl_table); diff -urN linux/mm/highmem.c linux/mm/highmem.c --- linux/mm/highmem.c 2005/01/13 14:07:01 1.54 +++ linux/mm/highmem.c 2005/03/02 19:58:03 1.55 @@ -425,7 +425,7 @@ * at least one page was bounced, fill in possible non-highmem * pages */ - bio_for_each_segment(from, *bio_orig, i) { + __bio_for_each_segment(from, *bio_orig, i, 0) { to = bio_iovec_idx(bio, i); if (!to->bv_page) { to->bv_page = from->bv_page; diff -urN linux/net/core/pktgen.c linux/net/core/pktgen.c --- linux/net/core/pktgen.c 2005/02/28 15:45:19 1.20 +++ linux/net/core/pktgen.c 2005/03/02 19:58:03 1.21 @@ -104,6 +104,8 @@ * Corrections from Nikolai Malykh (nmalykh@bilim.com) * Removed unused flags F_SET_SRCMAC & F_SET_SRCIP 041230 * + * interruptible_sleep_on_timeout() replaced Nishanth Aravamudan + * 050103 */ #include #include @@ -135,6 +137,7 @@ #include #include #include +#include #include #include #include @@ -148,7 +151,7 @@ #include -#define VERSION "pktgen v2.56: Packet Generator for packet performance testing.\n" +#define VERSION "pktgen v2.58: Packet Generator for packet performance testing.\n" /* #define PG_DEBUG(a) a */ #define PG_DEBUG(a) @@ -808,6 +811,7 @@ struct pktgen_dev *pkt_dev = (struct pktgen_dev*)(data); char* pg_result = NULL; int tmp = 0; + char buf[128]; pg_result = &(pkt_dev->result[0]); @@ -1068,7 +1072,6 @@ return count; } if (!strcmp(name, "dst_min") || !strcmp(name, "dst")) { - char buf[IP_NAME_SZ]; len = strn_len(&user_buffer[i], sizeof(pkt_dev->dst_min) - 1); if (len < 0) { return len; } @@ -1088,7 +1091,6 @@ return count; } if (!strcmp(name, "dst_max")) { - char buf[IP_NAME_SZ]; len = strn_len(&user_buffer[i], sizeof(pkt_dev->dst_max) - 1); if (len < 0) { return len; } @@ -1109,9 +1111,7 @@ return count; } if (!strcmp(name, "dst6")) { - char buf[128]; - - len = strn_len(&user_buffer[i], 128 - 1); + len = strn_len(&user_buffer[i], sizeof(buf) - 1); if (len < 0) return len; pkt_dev->flags |= F_IPV6; @@ -1133,9 +1133,7 @@ return count; } if (!strcmp(name, "dst6_min")) { - char buf[128]; - - len = strn_len(&user_buffer[i], 128 - 1); + len = strn_len(&user_buffer[i], sizeof(buf) - 1); if (len < 0) return len; pkt_dev->flags |= F_IPV6; @@ -1156,9 +1154,7 @@ return count; } if (!strcmp(name, "dst6_max")) { - char buf[128]; - - len = strn_len(&user_buffer[i], 128 - 1); + len = strn_len(&user_buffer[i], sizeof(buf) - 1); if (len < 0) return len; pkt_dev->flags |= F_IPV6; @@ -1178,9 +1174,7 @@ return count; } if (!strcmp(name, "src6")) { - char buf[128]; - - len = strn_len(&user_buffer[i], 128 - 1); + len = strn_len(&user_buffer[i], sizeof(buf) - 1); if (len < 0) return len; pkt_dev->flags |= F_IPV6; @@ -1202,7 +1196,6 @@ return count; } if (!strcmp(name, "src_min")) { - char buf[IP_NAME_SZ]; len = strn_len(&user_buffer[i], sizeof(pkt_dev->src_min) - 1); if (len < 0) { return len; } if (copy_from_user(buf, &user_buffer[i], len)) @@ -1221,7 +1214,6 @@ return count; } if (!strcmp(name, "src_max")) { - char buf[IP_NAME_SZ]; len = strn_len(&user_buffer[i], sizeof(pkt_dev->src_max) - 1); if (len < 0) { return len; } if (copy_from_user(buf, &user_buffer[i], len)) @@ -2402,16 +2394,14 @@ static int pktgen_wait_thread_run(struct pktgen_thread *t ) { - wait_queue_head_t queue; - - init_waitqueue_head(&queue); - if_lock(t); while(thread_is_running(t)) { + if_unlock(t); - - interruptible_sleep_on_timeout(&queue, HZ/10); + + msleep_interruptible(100); + if (signal_pending(current)) goto signal; if_lock(t); @@ -2738,6 +2728,7 @@ static void pktgen_thread_worker(struct pktgen_thread *t) { + DEFINE_WAIT(wait); struct pktgen_dev *pkt_dev = NULL; int cpu = t->cpu; sigset_t tmpsig; @@ -2805,9 +2796,11 @@ do_softirq(); tx_since_softirq = 0; } + } else { + prepare_to_wait(&(t->queue), &wait, TASK_INTERRUPTIBLE); + schedule_timeout(HZ/10); + finish_wait(&(t->queue), &wait); } - else - interruptible_sleep_on_timeout(&(t->queue), HZ/10); /* * Back from sleep, either due to the timeout or signal. @@ -3117,8 +3110,7 @@ struct pktgen_thread *t = pktgen_threads; pktgen_threads->control |= (T_TERMINATE); - while( t == pktgen_threads) - interruptible_sleep_on_timeout(&queue, HZ); + wait_event_interruptible_timeout(queue, (t != pktgen_threads), HZ); } /* Un-register us from receiving netdevice events */ diff -urN linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c --- linux/net/ipv4/fib_hash.c 2005/01/25 04:29:03 1.23 +++ linux/net/ipv4/fib_hash.c 2005/03/02 19:58:03 1.24 @@ -684,7 +684,7 @@ list_for_each_entry(fa, &f->fn_alias, fa_list) { if (i < s_i) - continue; + goto next; if (fib_dump_info(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, @@ -699,7 +699,7 @@ cb->args[3] = i; return -1; } - + next: i++; } } diff -urN linux/net/ipv4/route.c linux/net/ipv4/route.c --- linux/net/ipv4/route.c 2005/02/28 15:45:19 1.82 +++ linux/net/ipv4/route.c 2005/03/02 19:58:03 1.83 @@ -2545,10 +2545,10 @@ .ctl_name = NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS, .procname = "gc_min_interval_ms", .data = &ip_rt_gc_min_interval, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_doulongvec_ms_jiffies_minmax, - .strategy = &sysctl_jiffies, + .proc_handler = &proc_dointvec_ms_jiffies, + .strategy = &sysctl_ms_jiffies, }, { .ctl_name = NET_IPV4_ROUTE_GC_TIMEOUT, diff -urN linux/net/ipv4/netfilter/ip_conntrack_standalone.c linux/net/ipv4/netfilter/ip_conntrack_standalone.c --- linux/net/ipv4/netfilter/ip_conntrack_standalone.c 2005/02/07 02:55:05 1.36 +++ linux/net/ipv4/netfilter/ip_conntrack_standalone.c 2005/03/02 19:58:03 1.37 @@ -384,10 +384,12 @@ const struct net_device *out, int (*okfn)(struct sk_buff *)) { +#if !defined(CONFIG_IP_NF_NAT) && !defined(CONFIG_IP_NF_NAT_MODULE) /* Previously seen (loopback)? Ignore. Do this before fragment check. */ if ((*pskb)->nfct) return NF_ACCEPT; +#endif /* Gather fragments. */ if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) { diff -urN linux/net/ipv4/netfilter/ipt_hashlimit.c linux/net/ipv4/netfilter/ipt_hashlimit.c --- linux/net/ipv4/netfilter/ipt_hashlimit.c 2005/02/13 20:16:33 1.4 +++ linux/net/ipv4/netfilter/ipt_hashlimit.c 2005/03/02 19:58:03 1.5 @@ -98,6 +98,7 @@ }; static DECLARE_RWLOCK(hashlimit_lock); /* protects htables list */ +static DECLARE_MUTEX(hlimit_mutex); /* additional checkentry protection */ static LIST_HEAD(hashlimit_htables); static kmem_cache_t *hashlimit_cachep; @@ -531,10 +532,19 @@ if (!r->cfg.expire) return 0; + /* This is the best we've got: We cannot release and re-grab lock, + * since checkentry() is called before ip_tables.c grabs ipt_mutex. + * We also cannot grab the hashtable spinlock, since htable_create will + * call vmalloc, and that can sleep. And we cannot just re-search + * the list of htable's in htable_create(), since then we would + * create duplicate proc files. -HW */ + down(&hlimit_mutex); r->hinfo = htable_find_get(r->name); if (!r->hinfo && (htable_create(r) != 0)) { + up(&hlimit_mutex); return 0; } + up(&hlimit_mutex); /* Ugly hack: For SMP, we only want to use one set */ r->u.master = r; diff -urN linux/net/ipv6/addrconf.c linux/net/ipv6/addrconf.c --- linux/net/ipv6/addrconf.c 2005/01/25 04:29:05 1.73 +++ linux/net/ipv6/addrconf.c 2005/03/02 19:58:03 1.74 @@ -308,7 +308,7 @@ printk("Freeing alive inet6 device %p\n", idev); return; } - snmp6_unregister_dev(idev); + snmp6_free_dev(idev); kfree(idev); } @@ -339,6 +339,16 @@ /* We refer to the device */ dev_hold(dev); + if (snmp6_alloc_dev(ndev) < 0) { + ADBG((KERN_WARNING + "%s(): cannot allocate memory for statistics; dev=%s.\n", + __FUNCTION__, dev->name)); + neigh_parms_release(&nd_tbl, ndev->nd_parms); + ndev->dead = 1; + in6_dev_finish_destroy(ndev); + return NULL; + } + if (snmp6_register_dev(ndev) < 0) { ADBG((KERN_WARNING "%s(): cannot create /proc/net/dev_snmp6/%s\n", @@ -2013,6 +2023,10 @@ dev->ip6_ptr = NULL; idev->dead = 1; write_unlock_bh(&addrconf_lock); + + /* Step 1.5: remove snmp6 entry */ + snmp6_unregister_dev(idev); + } /* Step 2: clear hash table */ diff -urN linux/net/ipv6/af_inet6.c linux/net/ipv6/af_inet6.c --- linux/net/ipv6/af_inet6.c 2005/01/25 04:29:05 1.69 +++ linux/net/ipv6/af_inet6.c 2005/03/02 19:58:03 1.70 @@ -652,8 +652,10 @@ { if (ptr == NULL) return; - free_percpu(ptr[0]); - free_percpu(ptr[1]); + if (ptr[0]) + free_percpu(ptr[0]); + if (ptr[1]) + free_percpu(ptr[1]); ptr[0] = ptr[1] = NULL; } diff -urN linux/net/ipv6/proc.c linux/net/ipv6/proc.c --- linux/net/ipv6/proc.c 2004/08/06 00:33:32 1.26 +++ linux/net/ipv6/proc.c 2005/03/02 19:58:03 1.27 @@ -201,33 +201,23 @@ int snmp6_register_dev(struct inet6_dev *idev) { - int err = -ENOMEM; struct proc_dir_entry *p; if (!idev || !idev->dev) return -EINVAL; - if (snmp6_mib_init((void **)idev->stats.icmpv6, sizeof(struct icmpv6_mib), - __alignof__(struct icmpv6_mib)) < 0) - goto err_icmp; + if (!proc_net_devsnmp6) + return -ENOENT; - if (!proc_net_devsnmp6) { - err = -ENOENT; - goto err_proc; - } p = create_proc_entry(idev->dev->name, S_IRUGO, proc_net_devsnmp6); if (!p) - goto err_proc; + return -ENOMEM; + p->data = idev; p->proc_fops = &snmp6_seq_fops; idev->stats.proc_dir_entry = p; return 0; - -err_proc: - snmp6_mib_free((void **)idev->stats.icmpv6); -err_icmp: - return err; } int snmp6_unregister_dev(struct inet6_dev *idev) @@ -238,8 +228,6 @@ return -EINVAL; remove_proc_entry(idev->stats.proc_dir_entry->name, proc_net_devsnmp6); - snmp6_mib_free((void **)idev->stats.icmpv6); - return 0; } @@ -280,6 +268,17 @@ int snmp6_register_dev(struct inet6_dev *idev) { + return 0; +} + +int snmp6_unregister_dev(struct inet6_dev *idev) +{ + return 0; +} +#endif /* CONFIG_PROC_FS */ + +int snmp6_alloc_dev(struct inet6_dev *idev) +{ int err = -ENOMEM; if (!idev || !idev->dev) @@ -295,11 +294,10 @@ return err; } -int snmp6_unregister_dev(struct inet6_dev *idev) +int snmp6_free_dev(struct inet6_dev *idev) { snmp6_mib_free((void **)idev->stats.icmpv6); return 0; } -#endif diff -urN linux/net/unix/af_unix.c linux/net/unix/af_unix.c --- linux/net/unix/af_unix.c 2005/01/25 04:29:09 1.91 +++ linux/net/unix/af_unix.c 2005/03/02 19:58:03 1.92 @@ -1850,15 +1850,22 @@ case SIOCINQ: { struct sk_buff *skb; + if (sk->sk_state == TCP_LISTEN) { err = -EINVAL; break; } spin_lock(&sk->sk_receive_queue.lock); - skb = skb_peek(&sk->sk_receive_queue); - if (skb) - amount=skb->len; + if (sk->sk_type == SOCK_STREAM || + sk->sk_type == SOCK_SEQPACKET) { + skb_queue_walk(&sk->sk_receive_queue, skb) + amount += skb->len; + } else { + skb = skb_peek(&sk->sk_receive_queue); + if (skb) + amount=skb->len; + } spin_unlock(&sk->sk_receive_queue.lock); err = put_user(amount, (int __user *)arg); break; diff -urN linux/security/keys/compat.c linux/security/keys/compat.c --- linux/security/keys/compat.c 2004/11/15 11:49:52 1.1 +++ linux/security/keys/compat.c 2005/03/02 19:58:03 1.2 @@ -31,7 +31,7 @@ return keyctl_get_keyring_ID(arg2, arg3); case KEYCTL_JOIN_SESSION_KEYRING: - return keyctl_join_session_keyring(compat_ptr(arg3)); + return keyctl_join_session_keyring(compat_ptr(arg2)); case KEYCTL_UPDATE: return keyctl_update_key(arg2, compat_ptr(arg3), arg4); diff -urN linux/security/keys/keyctl.c linux/security/keys/keyctl.c --- linux/security/keys/keyctl.c 2004/11/15 11:49:52 1.2 +++ linux/security/keys/keyctl.c 2005/03/02 19:58:03 1.3 @@ -923,7 +923,7 @@ (int) arg3); case KEYCTL_JOIN_SESSION_KEYRING: - return keyctl_join_session_keyring((const char __user *) arg3); + return keyctl_join_session_keyring((const char __user *) arg2); case KEYCTL_UPDATE: return keyctl_update_key((key_serial_t) arg2, diff -urN linux/security/selinux/ss/conditional.c linux/security/selinux/ss/conditional.c --- linux/security/selinux/ss/conditional.c 2005/01/13 14:07:09 1.3 +++ linux/security/selinux/ss/conditional.c 2005/03/02 19:58:04 1.4 @@ -401,8 +401,10 @@ expr->expr_type = le32_to_cpu(buf[0]); expr->bool = le32_to_cpu(buf[1]); - if (!expr_isvalid(p, expr)) + if (!expr_isvalid(p, expr)) { + kfree(expr); goto err; + } if (i == 0) { node->expr = expr; diff -urN linux/security/selinux/ss/policydb.c linux/security/selinux/ss/policydb.c --- linux/security/selinux/ss/policydb.c 2005/01/25 04:29:14 1.12 +++ linux/security/selinux/ss/policydb.c 2005/03/02 19:58:04 1.13 @@ -773,7 +773,7 @@ cladatum = kmalloc(sizeof(*cladatum), GFP_KERNEL); if (!cladatum) { rc = -ENOMEM; - goto bad; + goto out; } memset(cladatum, 0, sizeof(*cladatum)); diff -urN linux/sound/oss/aedsp16.c linux/sound/oss/aedsp16.c --- linux/sound/oss/aedsp16.c 2005/01/13 14:07:13 1.3 +++ linux/sound/oss/aedsp16.c 2005/03/02 19:58:04 1.4 @@ -489,7 +489,7 @@ {0x00, 0x00} }; -static struct aedsp16_info ae_config __initdata = { +static struct aedsp16_info ae_config = { DEF_AEDSP16_IOB, DEF_AEDSP16_IRQ, DEF_AEDSP16_MRQ, @@ -1155,7 +1155,7 @@ return TRUE; } -static void __init uninit_aedsp16_sb(void) +static void uninit_aedsp16_sb(void) { DBG(("uninit_aedsp16_sb: ")); @@ -1196,7 +1196,7 @@ return TRUE; } -static void __init uninit_aedsp16_mss(void) +static void uninit_aedsp16_mss(void) { DBG(("uninit_aedsp16_mss: ")); @@ -1237,7 +1237,7 @@ return TRUE; } -static void __init uninit_aedsp16_mpu(void) +static void uninit_aedsp16_mpu(void) { DBG(("uninit_aedsp16_mpu: ")); @@ -1294,7 +1294,7 @@ return initialized; } -static void __init uninit_aedsp16(void) +static void __exit uninit_aedsp16(void) { if (ae_config.mss_base != -1) uninit_aedsp16_mss(); diff -urN linux/sound/oss/opl3sa2.c linux/sound/oss/opl3sa2.c --- linux/sound/oss/opl3sa2.c 2005/01/25 04:29:15 1.18 +++ linux/sound/oss/opl3sa2.c 2005/03/02 19:58:04 1.19 @@ -711,7 +711,7 @@ } -static void __init opl3sa2_clear_slots(struct address_info* hw_config) +static void opl3sa2_clear_slots(struct address_info* hw_config) { int i; diff -urN linux/sound/oss/sonicvibes.c linux/sound/oss/sonicvibes.c --- linux/sound/oss/sonicvibes.c 2005/01/13 14:07:13 1.20 +++ linux/sound/oss/sonicvibes.c 2005/03/02 19:58:04 1.21 @@ -2470,7 +2470,7 @@ static struct initvol { int mixch; int vol; -} initvol[] __initdata = { +} initvol[] __devinitdata = { { SOUND_MIXER_WRITE_RECLEV, 0x4040 }, { SOUND_MIXER_WRITE_LINE1, 0x4040 }, { SOUND_MIXER_WRITE_CD, 0x4040 }, @@ -2487,7 +2487,7 @@ static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid) { - static char __initdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller"; + static char __devinitdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller"; struct sv_state *s; mm_segment_t fs; int i, val, ret; From ralf@linux-mips.org Thu Mar 3 11:54:02 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Thu, 03 Mar 2005 11:54:02 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Thu, 03 Mar 2005 11:54:02 +0000 X-archive-position: 313 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/03 11:53:56 Modified files: arch/mips : Makefile Log message: Fix typo. diff -urN linux/arch/mips/Makefile linux/arch/mips/Makefile --- linux/arch/mips/Makefile 2005/03/01 21:20:46 1.192 +++ linux/arch/mips/Makefile 2005/03/03 11:53:56 1.193 @@ -57,7 +57,7 @@ -D__PTRDIFF_TYPE__=int CHECKFLAGS-$(CONFIG_MIPS64) += -D_MIPS_SZLONG=64 \ -D__PTRDIFF_TYPE__="long int" -CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEL__ +CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEB__ CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN) += -D__MIPSEL__ CHECKFLAGS = $(CHECKFLAGS-y) From ralf@linux-mips.org Thu Mar 3 12:23:04 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Thu, 03 Mar 2005 12:23:04 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Thu, 03 Mar 2005 12:23:04 +0000 X-archive-position: 314 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/03 12:22:58 Modified files: arch/mips/kernel: smp.c Log message: No point in having a return statement after panicing. diff -urN linux/arch/mips/kernel/smp.c linux/arch/mips/kernel/smp.c --- linux/arch/mips/kernel/smp.c 2005/02/22 21:18:01 1.75 +++ linux/arch/mips/kernel/smp.c 2005/03/03 12:22:58 1.76 @@ -280,12 +280,9 @@ * Linux can schedule processes on this slave. */ idle = fork_idle(cpu); - if (IS_ERR(idle)) { + if (IS_ERR(idle)) panic(KERN_ERR "Fork failed for CPU %d\n", cpu); - return PTR_ERR(idle); - } - prom_boot_secondary(cpu, idle); /* From ppopov@linux-mips.org Fri Mar 4 08:31:12 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 08:31:12 +0000 (GMT) From: ppopov@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 08:31:12 +0000 X-archive-position: 315 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ppopov@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ppopov@ftp.linux-mips.org 05/03/04 08:31:06 Modified files: arch/mips/au1000/pb1200: board_setup.c Log message: Int controller fixes. diff -urN linux/arch/mips/au1000/pb1200/board_setup.c linux/arch/mips/au1000/pb1200/board_setup.c --- linux/arch/mips/au1000/pb1200/board_setup.c 2005/03/01 06:33:16 1.2 +++ linux/arch/mips/au1000/pb1200/board_setup.c 2005/03/04 08:31:06 1.3 @@ -59,8 +59,6 @@ extern void (*board_init_irq)(void); #ifdef CONFIG_BLK_DEV_IDE_AU1XXX -extern struct ide_ops *ide_ops; -extern struct ide_ops au1xxx_ide_ops; extern u32 au1xxx_ide_virtbase; extern u64 au1xxx_ide_physbase; extern int au1xxx_ide_irq; @@ -147,7 +145,6 @@ /* * Iniz IDE parameters */ - ide_ops = &au1xxx_ide_ops; au1xxx_ide_irq = PB1200_IDE_INT; au1xxx_ide_physbase = AU1XXX_ATA_PHYS_ADDR; au1xxx_ide_virtbase = KSEG1ADDR(AU1XXX_ATA_PHYS_ADDR); @@ -176,12 +173,11 @@ #ifdef CONFIG_MIPS_DB1200 printk("AMD Alchemy Db1200 Board\n"); #endif -#if 0 + /* Setup Pb1200 External Interrupt Controller */ { extern void (*board_init_irq)(void); extern void _board_init_irq(void); board_init_irq = _board_init_irq; } -#endif } From ralf@linux-mips.org Fri Mar 4 12:35:47 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 12:35:47 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 12:35:47 +0000 X-archive-position: 316 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/04 12:35:42 Modified files: arch/mips/kernel: entry.S Log message: Fix preemption bug. diff -urN linux/arch/mips/kernel/entry.S linux/arch/mips/kernel/entry.S --- linux/arch/mips/kernel/entry.S 2005/02/07 02:54:34 1.65 +++ linux/arch/mips/kernel/entry.S 2005/03/04 12:35:42 1.66 @@ -58,9 +58,8 @@ LONG_L t0, PT_STATUS(sp) # Interrupts off? andi t0, 1 beqz t0, restore_all - li t0, PREEMPT_ACTIVE - sw t0, TI_PRE_COUNT($28) jal preempt_schedule_irq + b need_resched #endif FEXPORT(ret_from_fork) From ralf@linux-mips.org Fri Mar 4 14:22:14 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 14:22:14 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 14:22:14 +0000 X-archive-position: 317 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/04 14:22:08 Modified files: arch/mips/cobalt: setup.c arch/mips/pci : fixup-cobalt.c Log message: Instead of hiding the Galileo system controller mark is as the host bridge and Linux won't missconfigure it in funny ways. diff -urN linux/arch/mips/cobalt/setup.c linux/arch/mips/cobalt/setup.c --- linux/arch/mips/cobalt/setup.c 2005/02/21 16:18:36 1.21 +++ linux/arch/mips/cobalt/setup.c 2005/03/04 14:22:08 1.22 @@ -62,11 +62,11 @@ extern struct pci_ops gt64111_pci_ops; static struct resource cobalt_mem_resource = { - "GT64111 PCI MEM", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM + "PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM }; static struct resource cobalt_io_resource = { - "GT64111 IO MEM", 0x00001000UL, GT64111_IO_END - GT64111_IO_BASE, IORESOURCE_IO + "PCI I/O", 0x1000, 0xffff, IORESOURCE_IO }; static struct resource cobalt_io_resources[] = { @@ -100,7 +100,7 @@ set_io_port_base(CKSEG1ADDR(GT64111_IO_BASE)); - /* IO region should cover all Galileo IO */ + /* I/O port resource must include UART and LCD/buttons */ ioport_resource.end = 0x0fffffff; /* diff -urN linux/arch/mips/pci/fixup-cobalt.c linux/arch/mips/pci/fixup-cobalt.c --- linux/arch/mips/pci/fixup-cobalt.c 2005/02/21 16:24:02 1.8 +++ linux/arch/mips/pci/fixup-cobalt.c 2005/03/04 14:22:08 1.9 @@ -21,6 +21,20 @@ extern int cobalt_board_id; +static void qube_raq_galileo_early_fixup(struct pci_dev *dev) +{ + if (dev->devfn == PCI_DEVFN(0, 0) && + (dev->class >> 8) == PCI_CLASS_MEMORY_OTHER) { + + dev->class = (PCI_CLASS_BRIDGE_HOST << 8) | (dev->class & 0xff); + + printk(KERN_INFO "Galileo: fixed bridge class\n"); + } +} + +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111, + qube_raq_galileo_early_fixup); + static void qube_raq_via_bmIDE_fixup(struct pci_dev *dev) { unsigned short cfgword; @@ -47,8 +61,10 @@ static void qube_raq_galileo_fixup(struct pci_dev *dev) { unsigned short galileo_id; - int i; + if (dev->devfn != PCI_DEVFN(0, 0)) + return; + /* Fix PCI latency-timer and cache-line-size values in Galileo * host bridge. */ @@ -73,7 +89,7 @@ pci_read_config_word(dev, PCI_REVISION_ID, &galileo_id); galileo_id &= 0xff; /* mask off class info */ - printk("Galileo ID: %u\n", galileo_id); + printk(KERN_INFO "Galileo: revision %u\n", galileo_id); #if 0 if (galileo_id >= 0x10) { @@ -88,18 +104,9 @@ /* Old Galileo, assumes PCI STOP line to VIA is disconnected. */ GALILEO_OUTL(0xffff, GT_PCI0_TOR_OFS); } - - /* - * hide Galileo from the kernel's PCI resource assignment. The BARs - * on Galileo will already have been set up by the boot loader to - * match the DRAM configuration so we don't want them being monkeyed - * around with. - */ - for (i = 0; i < DEVICE_COUNT_RESOURCE; ++i) - dev->resource[i].start = dev->resource[i].end = dev->resource[i].flags = 0; } -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111, qube_raq_galileo_fixup); static char irq_tab_cobalt[] __initdata = { From ralf@linux-mips.org Fri Mar 4 15:13:43 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 15:13:43 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 15:13:43 +0000 X-archive-position: 318 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/04 15:13:37 Modified files: arch/mips/cobalt: setup.c arch/mips/pci : fixup-cobalt.c ops-gt64111.c drivers/net/tulip: de2104x.c include/asm-mips: serial.h include/asm-mips/cobalt: cobalt.h Log message: On Qube2700 Galileo hangs if we access slot #6. Make console serial port initialisation dependent on unit type. diff -urN linux/arch/mips/cobalt/setup.c linux/arch/mips/cobalt/setup.c --- linux/arch/mips/cobalt/setup.c 2005/03/04 14:22:08 1.22 +++ linux/arch/mips/cobalt/setup.c 2005/03/04 15:13:37 1.23 @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -21,6 +23,7 @@ #include #include #include +#include #include @@ -89,6 +92,7 @@ static int __init cobalt_setup(void) { + static struct uart_port uart; unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0); int i; @@ -127,6 +131,21 @@ register_pci_controller(&cobalt_pci_controller); #endif +#ifdef CONFIG_SERIAL_8250 + if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { + + uart.line = 0; + uart.type = PORT_UNKNOWN; + uart.uartclk = 18432000; + uart.irq = COBALT_SERIAL_IRQ; + uart.flags = STD_COM_FLAGS; + uart.iobase = 0xc800000; + uart.iotype = UPIO_PORT; + + early_serial_setup(&uart); + } +#endif + return 0; } diff -urN linux/arch/mips/pci/fixup-cobalt.c linux/arch/mips/pci/fixup-cobalt.c --- linux/arch/mips/pci/fixup-cobalt.c 2005/03/04 14:22:08 1.9 +++ linux/arch/mips/pci/fixup-cobalt.c 2005/03/04 15:13:37 1.10 @@ -109,6 +109,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT64111, qube_raq_galileo_fixup); +static char irq_tab_qube1[] __initdata = { + [COBALT_PCICONF_CPU] = 0, + [COBALT_PCICONF_ETH0] = COBALT_QUBE1_ETH0_IRQ, + [COBALT_PCICONF_RAQSCSI] = COBALT_SCSI_IRQ, + [COBALT_PCICONF_VIA] = 0, + [COBALT_PCICONF_PCISLOT] = COBALT_QUBE_SLOT_IRQ, + [COBALT_PCICONF_ETH1] = 0 +}; + static char irq_tab_cobalt[] __initdata = { [COBALT_PCICONF_CPU] = 0, [COBALT_PCICONF_ETH0] = COBALT_ETH0_IRQ, @@ -129,6 +138,9 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) { + if (cobalt_board_id < COBALT_BRD_ID_QUBE2) + return irq_tab_qube1[slot]; + if (cobalt_board_id == COBALT_BRD_ID_RAQ2) return irq_tab_raq2[slot]; diff -urN linux/arch/mips/pci/ops-gt64111.c linux/arch/mips/pci/ops-gt64111.c --- linux/arch/mips/pci/ops-gt64111.c 2003/11/13 16:55:07 1.1 +++ linux/arch/mips/pci/ops-gt64111.c 2005/03/04 15:13:37 1.2 @@ -20,13 +20,21 @@ /* * Accessing device 31 hangs the GT64120. Not sure if this will also hang * the GT64111, let's be paranoid for now. + * + * Accessing device COBALT_PCICONF_CPU hangs early units. */ static inline int pci_range_ck(struct pci_bus *bus, unsigned int devfn) { - if (bus->number == 0 && devfn == PCI_DEVFN(31, 0)) - return -1; + unsigned slot; - return 0; + if (bus->number == 0) { + + slot = PCI_SLOT(devfn); + if (slot != COBALT_PCICONF_CPU && slot < 31) + return 0; + } + + return -1; } static int gt64111_pci_read_config(struct pci_bus *bus, unsigned int devfn, diff -urN linux/drivers/net/tulip/de2104x.c linux/drivers/net/tulip/de2104x.c --- linux/drivers/net/tulip/de2104x.c 2005/02/28 15:45:15 1.25 +++ linux/drivers/net/tulip/de2104x.c 2005/03/04 15:13:37 1.26 @@ -1787,10 +1787,15 @@ /* DEC now has a specification but early board makers just put the address in the first EEPROM locations. */ /* This does memcmp(eedata, eedata+16, 8) */ + +#ifndef CONFIG_MIPS_COBALT + for (i = 0; i < 8; i ++) if (ee_data[i] != ee_data[16+i]) sa_offset = 20; +#endif + /* store MAC address */ for (i = 0; i < 6; i ++) de->dev->dev_addr[i] = ee_data[i + sa_offset]; diff -urN linux/include/asm-mips/serial.h linux/include/asm-mips/serial.h --- linux/include/asm-mips/serial.h 2005/02/28 13:35:57 1.62 +++ linux/include/asm-mips/serial.h 2005/03/04 15:13:37 1.63 @@ -78,16 +78,6 @@ #define JAZZ_SERIAL_PORT_DEFNS #endif -#ifdef CONFIG_MIPS_COBALT -#include -#define COBALT_BASE_BAUD (18432000 / 16) -#define COBALT_SERIAL_PORT_DEFNS \ - /* UART CLK PORT IRQ FLAGS */ \ - { 0, COBALT_BASE_BAUD, 0xc800000, COBALT_SERIAL_IRQ, STD_COM_FLAGS }, /* ttyS0 */ -#else -#define COBALT_SERIAL_PORT_DEFNS -#endif - /* * Both Galileo boards have the same UART mappings. */ @@ -424,7 +414,6 @@ #endif /* CONFIG_SGI_IP32 */ #define SERIAL_PORT_DFNS \ - COBALT_SERIAL_PORT_DEFNS \ DDB5477_SERIAL_PORT_DEFNS \ EV96100_SERIAL_PORT_DEFNS \ EXTRA_SERIAL_PORT_DEFNS \ diff -urN linux/include/asm-mips/cobalt/cobalt.h linux/include/asm-mips/cobalt/cobalt.h --- linux/include/asm-mips/cobalt/cobalt.h 2005/02/21 16:18:36 1.12 +++ linux/include/asm-mips/cobalt/cobalt.h 2005/03/04 15:13:37 1.13 @@ -29,6 +29,7 @@ #define COBALT_SCC_IRQ 19 /* pre-production has 85C30 */ #define COBALT_RAQ_SCSI_IRQ 19 #define COBALT_ETH0_IRQ 19 +#define COBALT_QUBE1_ETH0_IRQ 20 #define COBALT_ETH1_IRQ 20 #define COBALT_SERIAL_IRQ 21 #define COBALT_SCSI_IRQ 21 From ralf@linux-mips.org Fri Mar 4 17:24:39 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 17:24:39 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 17:24:39 +0000 X-archive-position: 319 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/04 17:24:33 Modified files: arch/mips : Kconfig arch/mips/configs: jmr3927_defconfig arch/mips/jmr3927/rbhma3100: setup.c arch/mips/tx4927/toshiba_rbtx4927: toshiba_rbtx4927_setup.c drivers/char : Kconfig Makefile drivers/serial : Kconfig include/asm-mips: serial.h include/asm-mips/jmr3927: jmr3927.h Added files: drivers/serial : serial_txx9.c Removed files: drivers/char : serial_tx3912.c serial_tx3912.h serial_txx9.c serial_txx927.c Log message: Replace old txx9 with drivers/serial/ new-style txx9 driver. diff -urN linux/arch/mips/Kconfig linux/arch/mips/Kconfig --- linux/arch/mips/Kconfig 2005/03/01 06:33:16 1.143 +++ linux/arch/mips/Kconfig 2005/03/04 17:24:32 1.144 @@ -623,6 +623,7 @@ config TOSHIBA_RBTX4927 bool "Support for Toshiba TBTX49[23]7 board" select DMA_NONCOHERENT + select HAS_TXX9_SERIAL select HW_HAS_PCI select I8259 select ISA @@ -769,6 +770,7 @@ config MIPS_TX3927 bool + select HAS_TXX9_SERIAL config PCI_MARVELL bool diff -urN linux/arch/mips/configs/jmr3927_defconfig linux/arch/mips/configs/jmr3927_defconfig --- linux/arch/mips/configs/jmr3927_defconfig 2005/03/02 18:12:08 1.45 +++ linux/arch/mips/configs/jmr3927_defconfig 2005/03/04 17:24:32 1.46 @@ -467,10 +467,6 @@ # CONFIG_SX is not set # CONFIG_RIO is not set # CONFIG_STALDRV is not set -# CONFIG_SERIAL_TX3912 is not set -CONFIG_TXX927_SERIAL=y -CONFIG_TXX927_SERIAL_CONSOLE=y -# CONFIG_SERIAL_TXX9 is not set # # Serial drivers @@ -480,6 +476,12 @@ # # Non-8250 serial port support # +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_TXX9=y +CONFIG_HAS_TXX9_SERIAL=y +CONFIG_SERIAL_TXX9_CONSOLE=y +CONFIG_SERIAL_TXX9_STDSERIAL=y # CONFIG_UNIX98_PTYS is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 diff -urN linux/arch/mips/jmr3927/rbhma3100/setup.c linux/arch/mips/jmr3927/rbhma3100/setup.c --- linux/arch/mips/jmr3927/rbhma3100/setup.c 2005/01/13 14:05:30 1.17 +++ linux/arch/mips/jmr3927/rbhma3100/setup.c 2005/03/04 17:24:32 1.18 @@ -44,6 +44,11 @@ #include #include /* for HZ */ #include +#ifdef CONFIG_SERIAL_TXX9 +#include +#include +#include +#endif #include #include @@ -211,8 +216,8 @@ */ ioport_resource.start = pci_io_resource.start; ioport_resource.end = pci_io_resource.end; - iomem_resource.start = pci_mem_resource.start; - iomem_resource.end = pci_mem_resource.end; + iomem_resource.start = 0; + iomem_resource.end = 0xffffffff; /* Reboot on panic */ panic_timeout = 180; @@ -265,13 +270,33 @@ strcat(argptr, " ip=bootp"); } -#ifdef CONFIG_TXX927_SERIAL_CONSOLE +#ifdef CONFIG_SERIAL_TXX9 + { + extern int early_serial_txx9_setup(struct uart_port *port); + int i; + struct uart_port req; + for(i = 0; i < 2; i++) { + memset(&req, 0, sizeof(req)); + req.line = i; + req.iotype = UPIO_MEM; + req.membase = (char *)TX3927_SIO_REG(i); + req.mapbase = TX3927_SIO_REG(i); + req.irq = i == 0 ? + JMR3927_IRQ_IRC_SIO0 : JMR3927_IRQ_IRC_SIO1; + if (i == 0) + req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; + req.uartclk = JMR3927_IMCLK; + early_serial_txx9_setup(&req); + } + } +#ifdef CONFIG_SERIAL_TXX9_CONSOLE argptr = prom_getcmdline(); if ((argptr = strstr(argptr, "console=")) == NULL) { argptr = prom_getcmdline(); strcat(argptr, " console=ttyS1,115200"); } #endif +#endif } early_initcall(jmr3927_setup); diff -urN linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c --- linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2005/01/05 22:29:20 1.14 +++ linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2005/03/04 17:24:33 1.15 @@ -77,6 +77,11 @@ #include #include #endif +#ifdef CONFIG_SERIAL_TXX9 +#include +#include +#include +#endif #undef TOSHIBA_RBTX4927_SETUP_DEBUG @@ -920,12 +925,30 @@ #endif /* CONFIG_PCI */ +#ifdef CONFIG_SERIAL_TXX9 + { + extern int early_serial_txx9_setup(struct uart_port *port); + int i; + struct uart_port req; + for(i = 0; i < 2; i++) { + memset(&req, 0, sizeof(req)); + req.line = i; + req.iotype = UPIO_MEM; + req.membase = (char *)(0xff1ff300 + i * 0x100); + req.mapbase = 0xff1ff300 + i * 0x100; + req.irq = 32 + i; + req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; + req.uartclk = 50000000; + early_serial_txx9_setup(&req); + } + } #ifdef CONFIG_SERIAL_TXX9_CONSOLE argptr = prom_getcmdline(); if (strstr(argptr, "console=") == NULL) { strcat(argptr, " console=ttyS0,38400"); } #endif +#endif #ifdef CONFIG_ROOT_NFS argptr = prom_getcmdline(); diff -urN linux/drivers/char/Kconfig linux/drivers/char/Kconfig --- linux/drivers/char/Kconfig 2005/01/25 04:28:12 1.48 +++ linux/drivers/char/Kconfig 2005/03/04 17:24:33 1.49 @@ -364,38 +364,6 @@ tristate "Au1000 USB Raw Device support" depends on MIPS && MIPS_AU1000 && AU1000_USB_DEVICE=y && AU1000_USB_TTY!=y && AU1X00_USB_DEVICE -config SERIAL_TX3912 - bool "TX3912/PR31700 serial port support" - depends on MIPS && CPU_TX39XX=y - help - The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core; - see . - Say Y here to enable kernel support for the on-board serial port. - -config SERIAL_TX3912_CONSOLE - bool "Console on TX3912/PR31700 serial port" - depends on SERIAL_TX3912 - help - The TX3912 is a Toshiba RISC processor based on the MIPS 3900 core; - see . - Say Y here to direct console I/O to the on-board serial port. - -config TXX927_SERIAL - bool "TXx927 SIO support" - depends on MIPS && CPU_TX39XX=y - -config TXX927_SERIAL_CONSOLE - bool "TXx927 SIO Console support" - depends on TXX927_SERIAL - -config SERIAL_TXX9 - bool "TMPTX39XX/49XX SIO support" - depends on MIPS && TOSHIBA_BOARDS=y - -config SERIAL_TXX9_CONSOLE - bool "TMPTX39XX/49XX SIO Console support" - depends on SERIAL_TXX9 - config SIBYTE_SB1250_DUART bool "Support for BCM1xxx onchip DUART" depends on MIPS && SIBYTE_SB1xxx_SOC=y diff -urN linux/drivers/char/Makefile linux/drivers/char/Makefile --- linux/drivers/char/Makefile 2004/11/18 19:14:35 1.134 +++ linux/drivers/char/Makefile 2005/03/04 17:24:33 1.135 @@ -20,8 +20,6 @@ obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o -obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o -obj-$(CONFIG_SERIAL_TXX9) += generic_serial.o serial_txx9.o obj-$(CONFIG_ROCKETPORT) += rocket.o obj-$(CONFIG_SERIAL167) += serial167.o obj-$(CONFIG_CYCLADES) += cyclades.o diff -urN linux/drivers/char/serial_tx3912.c linux/drivers/char/serial_tx3912.c --- linux/drivers/char/Attic/serial_tx3912.c Fri Mar 4 17:24:33 2005 1.16 +++ linux/drivers/char/Attic/serial_tx3912.c 1970/01/01 00:00:002002 @@ -1,812 +0,0 @@ -/* - * drivers/char/serial_tx3912.c - * - * Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Serial driver for TMPR3912/05 and PR31700 processors - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "serial_tx3912.h" - -/* - * Forward declarations for serial routines - */ -static void rs_disable_tx_interrupts (void * ptr); -static void rs_enable_tx_interrupts (void * ptr); -static void rs_disable_rx_interrupts (void * ptr); -static void rs_enable_rx_interrupts (void * ptr); -static int rs_get_CD (void * ptr); -static void rs_shutdown_port (void * ptr); -static int rs_set_real_termios (void *ptr); -static int rs_chars_in_buffer (void * ptr); - -/* - * Used by generic serial driver to access hardware - */ -static struct real_driver rs_real_driver = { - .disable_tx_interrupts = rs_disable_tx_interrupts, - .enable_tx_interrupts = rs_enable_tx_interrupts, - .disable_rx_interrupts = rs_disable_rx_interrupts, - .enable_rx_interrupts = rs_enable_rx_interrupts, - .get_CD = rs_get_CD, - .shutdown_port = rs_shutdown_port, - .set_real_termios = rs_set_real_termios, - .chars_in_buffer = rs_chars_in_buffer, -}; - -/* - * Structures and usage counts - */ -static struct tty_driver *rs_driver; -static struct rs_port *rs_port; -static int rs_initialized; - - -/* - * Receive a character - */ -static inline void receive_char_pio(struct rs_port *port) -{ - struct tty_struct *tty = port->gs.tty; - unsigned char ch; - int counter = 2048; - - /* While there are characters */ - while (counter > 0) { - if (!(inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_RXHOLDFULL)) - break; - ch = inb(TX3912_UARTA_DATA); - if (tty->flip.count < TTY_FLIPBUF_SIZE) { - *tty->flip.char_buf_ptr++ = ch; - *tty->flip.flag_buf_ptr++ = 0; - tty->flip.count++; - } - udelay(1); - counter--; - } - - tty_flip_buffer_push(tty); -} - -/* - * Transmit a character - */ -static inline void transmit_char_pio(struct rs_port *port) -{ - /* TX while bytes available */ - for (;;) { - if (!(inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_EMPTY)) - break; - else if (port->x_char) { - outb(port->x_char, TX3912_UARTA_DATA); - port->icount.tx++; - port->x_char = 0; - } - else if (port->gs.xmit_cnt <= 0 || port->gs.tty->stopped || - port->gs.tty->hw_stopped) { - break; - } - else { - outb(port->gs.xmit_buf[port->gs.xmit_tail++], - TX3912_UARTA_DATA); - port->icount.tx++; - port->gs.xmit_tail &= SERIAL_XMIT_SIZE-1; - if (--port->gs.xmit_cnt <= 0) { - break; - } - } - udelay(10); - } - - if (port->gs.xmit_cnt <= 0 || port->gs.tty->stopped || - port->gs.tty->hw_stopped) { - rs_disable_tx_interrupts(port); - } - - if (port->gs.xmit_cnt <= port->gs.wakeup_chars) { - tty_wakeup(port->gs.tty); - rs_dprintk(TX3912_UART_DEBUG_TRANSMIT, "Waking up.... ldisc (%d)....\n", - port->gs.wakeup_chars); - wake_up_interruptible(&port->gs.tty->write_wait); - } -} - -/* - * We don't have MSR - */ -static inline void check_modem_status(struct rs_port *port) -{ - wake_up_interruptible(&port->gs.open_wait); -} - -/* - * RX interrupt handler - */ -static inline void rs_rx_interrupt(int irq, void *dev_id, struct pt_regs *regs) -{ - unsigned long flags, status; - - save_and_cli(flags); - - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "rs_rx_interrupt..."); - - /* Get the interrupts */ - status = inl(TX3912_INT2_STATUS); - - /* Clear any interrupts we might be about to handle */ - outl(TX3912_INT2_UARTA_RX_BITS, TX3912_INT2_CLEAR); - - if(!rs_port || !rs_port->gs.tty) { - restore_flags(flags); - return; - } - - /* RX Receiver Holding Register Overrun */ - if(status & TX3912_INT2_UARTATXOVERRUNINT) { - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "overrun"); - rs_port->icount.overrun++; - } - - /* RX Frame Error */ - if(status & TX3912_INT2_UARTAFRAMEERRINT) { - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "frame error"); - rs_port->icount.frame++; - } - - /* Break signal received */ - if(status & TX3912_INT2_UARTABREAKINT) { - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "break"); - rs_port->icount.brk++; - } - - /* RX Parity Error */ - if(status & TX3912_INT2_UARTAPARITYINT) { - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "parity error"); - rs_port->icount.parity++; - } - - /* Byte received */ - if(status & TX3912_INT2_UARTARXINT) { - receive_char_pio(rs_port); - } - - restore_flags(flags); - - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "end.\n"); -} - -/* - * TX interrupt handler - */ -static inline void rs_tx_interrupt(int irq, void *dev_id, struct pt_regs *regs) -{ - unsigned long flags, status; - - save_and_cli(flags); - - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "rs_tx_interrupt..."); - - /* Get the interrupts */ - status = inl(TX3912_INT2_STATUS); - - if(!rs_port || !rs_port->gs.tty) { - restore_flags(flags); - return; - } - - /* Clear interrupts */ - outl(TX3912_INT2_UARTA_TX_BITS, TX3912_INT2_CLEAR); - - /* TX holding register empty - transmit a byte */ - if(status & TX3912_INT2_UARTAEMPTYINT) { - transmit_char_pio(rs_port); - } - - /* TX Transmit Holding Register Overrun (shouldn't happen) */ - if(status & TX3912_INT2_UARTATXOVERRUNINT) { - printk( "rs_tx_interrupt: TX overrun\n"); - } - - restore_flags(flags); - - rs_dprintk(TX3912_UART_DEBUG_INTERRUPTS, "end.\n"); -} - -/* - * Here are the routines that actually interface with the generic driver - */ -static void rs_disable_tx_interrupts (void * ptr) -{ - unsigned long flags; - - save_and_cli(flags); - - outl(inl(TX3912_INT2_ENABLE) & ~TX3912_INT2_UARTA_TX_BITS, - TX3912_INT2_ENABLE); - outl(TX3912_INT2_UARTA_TX_BITS, TX3912_INT2_CLEAR); - - restore_flags(flags); -} - -static void rs_enable_tx_interrupts (void * ptr) -{ - unsigned long flags; - - save_and_cli(flags); - - outl(TX3912_INT2_UARTA_TX_BITS, TX3912_INT2_CLEAR); - outl(inl(TX3912_INT2_ENABLE) | TX3912_INT2_UARTA_TX_BITS, - TX3912_INT2_ENABLE); - transmit_char_pio(rs_port); - - restore_flags(flags); -} - -static void rs_disable_rx_interrupts (void * ptr) -{ - unsigned long flags; - - save_and_cli(flags); - - outl(inl(TX3912_INT2_ENABLE) & ~TX3912_INT2_UARTA_RX_BITS, - TX3912_INT2_ENABLE); - outl(TX3912_INT2_UARTA_RX_BITS, TX3912_INT2_CLEAR); - - restore_flags(flags); -} - -static void rs_enable_rx_interrupts (void * ptr) -{ - unsigned long flags; - - save_and_cli(flags); - - outl(inl(TX3912_INT2_ENABLE) | TX3912_INT2_UARTA_RX_BITS, - TX3912_INT2_ENABLE); - while (inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_RXHOLDFULL) - inb(TX3912_UARTA_DATA); - outl(TX3912_INT2_UARTA_RX_BITS, TX3912_INT2_CLEAR); - - restore_flags(flags); -} - -/* - * We have no CD - */ -static int rs_get_CD (void * ptr) -{ - return 1; -} - -/* - * Shut down the port - */ -static void rs_shutdown_port (void * ptr) -{ - func_enter(); - rs_port->gs.flags &= ~GS_ACTIVE; - func_exit(); -} - -static int rs_set_real_termios (void *ptr) -{ - unsigned int ctrl1 = 0; - unsigned int ctrl2 = 0; - - /* Set baud rate */ - switch (rs_port->gs.baud) { - case 0: - goto done; - case 1200: - ctrl2 = TX3912_UART_CTRL2_B1200; - break; - case 2400: - ctrl2 = TX3912_UART_CTRL2_B2400; - break; - case 4800: - ctrl2 = TX3912_UART_CTRL2_B4800; - break; - case 9600: - ctrl2 = TX3912_UART_CTRL2_B9600; - break; - case 19200: - ctrl2 = TX3912_UART_CTRL2_B19200; - break; - case 38400: - ctrl2 = TX3912_UART_CTRL2_B38400; - break; - case 57600: - ctrl2 = TX3912_UART_CTRL2_B57600; - break; - case 115200: - default: - ctrl2 = TX3912_UART_CTRL2_B115200; - break; - } - - /* Clear current UARTA settings */ - ctrl1 = inl(TX3912_UARTA_CTRL1) & 0xf000000f; - - /* Set parity */ - if(C_PARENB(rs_port->gs.tty)) { - if (!C_PARODD(rs_port->gs.tty)) - ctrl1 |= (TX3912_UART_CTRL1_ENPARITY | - TX3912_UART_CTRL1_EVENPARITY); - else - ctrl1 |= TX3912_UART_CTRL1_ENPARITY; - } - - /* Set data size */ - switch(rs_port->gs.tty->termios->c_cflag & CSIZE) { - case CS7: - ctrl1 |= TX3912_UART_CTRL1_BIT_7; - break; - case CS5: - case CS6: - printk(KERN_ERR "Data byte size unsupported. Defaulting to CS8\n"); - case CS8: - default: - ctrl1 &= ~TX3912_UART_CTRL1_BIT_7; - } - - /* Set stop bits */ - if(C_CSTOPB(rs_port->gs.tty)) - ctrl1 |= TX3912_UART_CTRL1_TWOSTOP; - - /* Write the control registers */ - outl(ctrl2, TX3912_UARTA_CTRL2); - outl(0, TX3912_UARTA_DMA_CTRL1); - outl(0, TX3912_UARTA_DMA_CTRL2); - outl(ctrl1, TX3912_UARTA_CTRL1); - - /* Loop until the UART is on */ - while(~inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_UARTON); - -done: - func_exit(); - return 0; -} - -/* - * Anyone in the buffer? - */ -static int rs_chars_in_buffer (void * ptr) -{ - return ((inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_EMPTY) ? 0 : 1); -} - -/* - * Open the serial port - */ -static int rs_open(struct tty_struct * tty, struct file * filp) -{ - int retval; - - func_enter(); - - if (!rs_initialized) { - return -EIO; - } - - rs_dprintk(TX3912_UART_DEBUG_OPEN, "Serial opening...\n"); - - tty->driver_data = rs_port; - rs_port->gs.tty = tty; - rs_port->gs.count++; - - /* - * Start up serial port - */ - retval = gs_init_port(&rs_port->gs); - rs_dprintk(TX3912_UART_DEBUG_OPEN, "Finished gs_init...\n"); - if(retval) { - rs_port->gs.count--; - return retval; - } - - rs_port->gs.flags |= GS_ACTIVE; - - rs_enable_rx_interrupts(rs_port); - rs_enable_tx_interrupts(rs_port); - - retval = gs_block_til_ready(&rs_port->gs, filp); - if(retval) { - rs_port->gs.count--; - return retval; - } - - func_exit(); - - return 0; -} - -/* - * Serial ioctl call - */ -static int rs_ioctl(struct tty_struct * tty, struct file * filp, - unsigned int cmd, unsigned long arg) -{ - int ival, rc; - - rc = 0; - switch (cmd) { - case TIOCGSOFTCAR: - rc = put_user((tty->termios->c_cflag & CLOCAL) ? 1 : 0, - (unsigned int *) arg); - break; - case TIOCSSOFTCAR: - if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { - tty->termios->c_cflag = - (tty->termios->c_cflag & ~CLOCAL) | - (ival ? CLOCAL : 0); - } - break; - case TIOCGSERIAL: - if ((rc = verify_area(VERIFY_WRITE, (void *) arg, - sizeof(struct serial_struct))) == 0) - rc = gs_getserial(&rs_port->gs, - (struct serial_struct *) arg); - break; - case TIOCSSERIAL: - if ((rc = verify_area(VERIFY_READ, (void *) arg, - sizeof(struct serial_struct))) == 0) - rc = gs_setserial(&rs_port->gs, (struct serial_struct *) arg); - break; - default: - rc = -ENOIOCTLCMD; - break; - } - - return rc; -} - -/* - * Send xchar - */ -static void rs_send_xchar(struct tty_struct * tty, char ch) -{ - func_enter(); - - rs_port->x_char = ch; - if (ch) { - rs_enable_tx_interrupts(tty); - } - - func_exit(); -} - -/* - * Throttle characters as directed by upper tty layer - */ -static void rs_throttle(struct tty_struct * tty) -{ -#ifdef TX3912_UART_DEBUG_THROTTLE - char buf[64]; - - printk("throttle %s: %d....\n", tty_name(tty, buf), - tty->ldisc.chars_in_buffer(tty)); -#endif - - func_enter(); - - if (I_IXOFF(tty)) - rs_send_xchar(tty, STOP_CHAR(tty)); - - func_exit(); -} - -/* - * Un-throttle characters as directed by upper tty layer - */ -static void rs_unthrottle(struct tty_struct * tty) -{ -#ifdef TX3912_UART_DEBUG_THROTTLE - char buf[64]; - - printk("unthrottle %s: %d....\n", tty_name(tty, buf), - tty->ldisc.chars_in_buffer(tty)); -#endif - - func_enter(); - - if (I_IXOFF(tty)) { - if (rs_port->x_char) - rs_port->x_char = 0; - else - rs_send_xchar(tty, START_CHAR(tty)); - } - - func_exit(); -} - -static struct tty_operations rs_ops = { - .open = rs_open, - .close = gs_close, - .write = gs_write, - .put_char = gs_put_char, - .flush_chars = gs_flush_chars, - .write_room = gs_write_room, - .chars_in_buffer = gs_chars_in_buffer, - .flush_buffer = gs_flush_buffer, - .ioctl = rs_ioctl, - .throttle = rs_throttle, - .unthrottle = rs_unthrottle, - .set_termios = gs_set_termios, - .stop = gs_stop, - .start = gs_start, - .hangup = gs_hangup, -}; - -/* - * Initialize the serial port - */ -static void __init tx3912_rs_init(void) -{ - func_enter(); - - rs_driver = alloc_tty_driver(TX3912_UART_NPORTS); - if (!rs_driver) - return -ENOMEM; - - rs_dprintk(TX3912_UART_DEBUG_INIT, "Initializing serial...\n"); - - /* Allocate critical structures */ - if(!(rs_tty = kmalloc(sizeof(struct tty_struct), GFP_KERNEL))) { - return; - } - if(!(rs_port = kmalloc(sizeof(struct rs_port), GFP_KERNEL))) { - kfree(rs_tty); - return; - } - if(!(rs_termios = kmalloc(sizeof(struct termios), GFP_KERNEL))) { - kfree(rs_port); - kfree(rs_tty); - return; - } - if(!(rs_termios_locked = kmalloc(sizeof(struct termios), GFP_KERNEL))) { - kfree(rs_termios); - kfree(rs_port); - kfree(rs_tty); - return; - } - - /* Zero out the structures */ - memset(rs_tty, 0, sizeof(struct tty_struct)); - memset(rs_port, 0, sizeof(struct rs_port)); - memset(rs_termios, 0, sizeof(struct termios)); - memset(rs_termios_locked, 0, sizeof(struct termios)); - memset(&rs_driver, 0, sizeof(rs_driver)); - memset(&rs_callout_driver, 0, sizeof(rs_callout_driver)); - - /* Fill in hardware specific port structure */ - rs_port->gs.callout_termios = tty_std_termios; - rs_port->gs.normal_termios = tty_std_termios; - rs_port->gs.magic = SERIAL_MAGIC; - rs_port->gs.close_delay = HZ/2; - rs_port->gs.closing_wait = 30 * HZ; - rs_port->gs.rd = &rs_real_driver; -#ifdef NEW_WRITE_LOCKING - rs_port->gs.port_write_sem = MUTEX; -#endif -#ifdef DECLARE_WAITQUEUE - init_waitqueue_head(&rs_port->gs.open_wait); - init_waitqueue_head(&rs_port->gs.close_wait); -#endif - - rs_driver->owner = THIS_MODULE; - rs_driver->driver_name = "serial"; - rs_driver->name = "ttyS"; - rs_driver->major = TTY_MAJOR; - rs_driver->minor_start = 64; - rs_driver->type = TTY_DRIVER_TYPE_SERIAL; - rs_driver->subtype = SERIAL_TYPE_NORMAL; - rs_driver->init_termios = tty_std_termios; - rs_driver->init_termios.c_cflag = - B115200 | CS8 | CREAD | HUPCL | CLOCAL; - tty_set_operations(rs_driver, &rs_ops); - if ((error = tty_register_driver(rs_driver))) { - printk(KERN_ERR "Unable to register serial driver\n"); - put_tty_driver(rs_driver); - goto error; - } - - /* Assign IRQs */ - if(request_irq(2, rs_tx_interrupt, SA_SHIRQ, - "uarta_tx", rs_port)) { - printk(KERN_ERR "Cannot allocate IRQ for UARTA_TX.\n"); - goto error; - } - - if(request_irq(3, rs_rx_interrupt, SA_SHIRQ, - "uarta_rx", rs_port)) { - printk(KERN_ERR "Cannot allocate IRQ for UARTA_RX.\n"); - goto error; - } - - /* Enable the serial receive interrupt */ - rs_enable_rx_interrupts(rs_port); - -#ifndef CONFIG_SERIAL_TX3912_CONSOLE - /* Write the control registers */ - outl(TX3912_UART_CTRL2_B115200, TX3912_UARTA_CTRL2); - outl(0x00000000, TX3912_UARTA_DMA_CTRL1); - outl(0x00000000, TX3912_UARTA_DMA_CTRL2); - outl(inl(TX3912_UARTA_CTRL1) | TX3912_UART_CTRL1_ENUART, - TX3912_UARTA_CTRL1); - - /* Loop until the UART is on */ - while(~inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_UARTON); -#endif - - rs_initialized = 1; - func_exit(); - return; - -error: - kfree(rs_termios_locked); - kfree(rs_termios); - kfree(rs_port); - kfree(rs_tty); - func_exit(); -} -module_init(tx3912_rs_init); - -/* - * Begin serial console routines - */ -#ifdef CONFIG_SERIAL_TX3912_CONSOLE -void serial_outc(unsigned char c) -{ - int i; - unsigned long int2; - - /* Disable UARTA_TX interrupts */ - int2 = inl(TX3912_INT2_ENABLE); - outl(inl(TX3912_INT2_ENABLE) & ~TX3912_INT2_UARTA_TX_BITS, - TX3912_INT2_ENABLE); - - /* Wait for UARTA_TX register to empty */ - i = 10000; - while(!(inl(TX3912_INT2_STATUS) & TX3912_INT2_UARTATXINT) && i--); - outl(TX3912_INT2_UARTA_TX_BITS, TX3912_INT2_CLEAR); - - /* Send the character */ - outl(c, TX3912_UARTA_DATA); - - /* Wait for UARTA_TX register to empty */ - i = 10000; - while(!(inl(TX3912_INT2_STATUS) & TX3912_INT2_UARTATXINT) && i--); - outl(TX3912_INT2_UARTA_TX_BITS, TX3912_INT2_CLEAR); - - /* Enable UARTA_TX interrupts */ - outl(int2, TX3912_INT2_ENABLE); -} - -static void serial_console_write(struct console *co, const char *s, - unsigned count) -{ - unsigned int i; - - for (i = 0; i < count; i++) { - if (*s == '\n') - serial_outc('\r'); - serial_outc(*s++); - } -} - -static struct tty_driver *serial_console_device(struct console *c, int *index) -{ - *index = c->index; - return rs_driver; -} - -static __init int serial_console_setup(struct console *co, char *options) -{ - int baud = 115200; - int bits = 8; - int parity = 'n'; - char *s; - unsigned int ctrl1 = 0; - unsigned int ctrl2 = 0; - - if (options) { - baud = simple_strtoul(options, NULL, 10); - s = options; - while(*s >= '0' && *s <= '9') - s++; - if (*s) parity = *s++; - if (*s) bits = *s++ - '0'; - } - - switch(baud) { - case 1200: - ctrl2 = TX3912_UART_CTRL2_B1200; - break; - case 2400: - ctrl2 = TX3912_UART_CTRL2_B2400; - break; - case 4800: - ctrl2 = TX3912_UART_CTRL2_B4800; - break; - case 9600: - ctrl2 = TX3912_UART_CTRL2_B9600; - break; - case 19200: - ctrl2 = TX3912_UART_CTRL2_B19200; - break; - case 38400: - ctrl2 = TX3912_UART_CTRL2_B38400; - break; - case 57600: - ctrl2 = TX3912_UART_CTRL2_B57600; - break; - case 115200: - default: - ctrl2 = TX3912_UART_CTRL2_B115200; - break; - } - - switch(bits) { - case 7: - ctrl1 = TX3912_UART_CTRL1_BIT_7; - break; - default: - break; - } - - switch(parity) { - case 'o': case 'O': - ctrl1 |= TX3912_UART_CTRL1_ENPARITY; - break; - case 'e': case 'E': - ctrl1 |= (TX3912_UART_CTRL1_ENPARITY | - TX3912_UART_CTRL1_EVENPARITY); - break; - default: - break; - } - - /* Write the control registers */ - outl(ctrl2, TX3912_UARTA_CTRL2); - outl(0x00000000, TX3912_UARTA_DMA_CTRL1); - outl(0x00000000, TX3912_UARTA_DMA_CTRL2); - outl((ctrl1 | TX3912_UART_CTRL1_ENUART), TX3912_UARTA_CTRL1); - - /* Loop until the UART is on */ - while(~inl(TX3912_UARTA_CTRL1) & TX3912_UART_CTRL1_UARTON); - - return 0; -} - -static struct console sercons = { - .name = "ttyS", - .write = serial_console_write, - .device = serial_console_device, - .setup = serial_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1 -}; - -static int __init tx3912_console_init(void) -{ - register_console(&sercons); - return 0; -} -console_initcall(tx3912_console_init); - -#endif diff -urN linux/drivers/char/serial_tx3912.h linux/drivers/char/serial_tx3912.h --- linux/drivers/char/Attic/serial_tx3912.h Fri Mar 4 17:24:33 2005 1.3 +++ linux/drivers/char/Attic/serial_tx3912.h 1970/01/01 00:00:002002 @@ -1,58 +0,0 @@ -/* - * drivers/char/serial_tx3912.h - * - * Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Serial driver for TMPR3912/05 and PR31700 processors - */ -#include -#include - -#undef TX3912_UART_DEBUG - -#ifdef TX3912_UART_DEBUG -#define TX3912_UART_DEBUG_OPEN 0x00000001 -#define TX3912_UART_DEBUG_SETTING 0x00000002 -#define TX3912_UART_DEBUG_FLOW 0x00000004 -#define TX3912_UART_DEBUG_MODEMSIGNALS 0x00000008 -#define TX3912_UART_DEBUG_TERMIOS 0x00000010 -#define TX3912_UART_DEBUG_TRANSMIT 0x00000020 -#define TX3912_UART_DEBUG_RECEIVE 0x00000040 -#define TX3912_UART_DEBUG_INTERRUPTS 0x00000080 -#define TX3912_UART_DEBUG_PROBE 0x00000100 -#define TX3912_UART_DEBUG_INIT 0x00000200 -#define TX3912_UART_DEBUG_CLEANUP 0x00000400 -#define TX3912_UART_DEBUG_CLOSE 0x00000800 -#define TX3912_UART_DEBUG_FIRMWARE 0x00001000 -#define TX3912_UART_DEBUG_MEMTEST 0x00002000 -#define TX3912_UART_DEBUG_THROTTLE 0x00004000 -#define TX3912_UART_DEBUG_NO_TX 0xffffffdf -#define TX3912_UART_DEBUG_ALL 0xffffffff - -#define rs_dprintk(f, str...) if(TX3912_UART_DEBUG_NO_TX & f) printk(str) -#define func_enter() rs_dprintk(TX3912_UART_DEBUG_FLOW, \ - "rs: enter %s\n", __FUNCTION__) -#define func_exit() rs_dprintk(TX3912_UART_DEBUG_FLOW, \ - "rs: exit %s\n", __FUNCTION__) -#else -#define rs_dprintk(f, str...) -#define func_enter() -#define func_exit() -#endif - -/* - * Hardware specific serial port structure - */ -struct rs_port { - struct gs_port gs; /* Must be first field! */ - struct wait_queue *shutdown_wait; - int stat_flags; - struct async_icount icount; /* Counters for 4 input IRQs */ - int read_status_mask; - int ignore_status_mask; - int x_char; /* XON/XOFF character */ -}; diff -urN linux/drivers/char/serial_txx9.c linux/drivers/char/serial_txx9.c --- linux/drivers/char/Attic/serial_txx9.c Fri Mar 4 17:24:33 2005 1.5 +++ linux/drivers/char/Attic/serial_txx9.c 1970/01/01 00:00:002002 @@ -1,1744 +0,0 @@ -/* - * drivers/char/serial_txx9.c - * - * Copyright (C) 1999 Harald Koerfgen - * Copyright (C) 2000 Jim Pick - * Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com) - * Copyright (C) 2000-2002 Toshiba Corporation - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * Serial driver for TX3927/TX4927/TX4925/TX4938 internal SIO controller - * - * Copyright (C) 2004 MontaVista Software Inc. - * Author: Manish Lachwani, mlachwani@mvista.com - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_MAGIC_SYSRQ -#include -#endif -#include - -#define DEBUG -#ifdef DEBUG -#define DBG(x...) printk(x) -#else -#define DBG(x...) -#endif - -static char *serial_version = "0.30-mvl"; -static char *serial_name = "TX39/49 Serial driver"; -static struct tty_driver *serial_driver; - -#define GS_INTERNAL_FLAGS (GS_TX_INTEN|GS_RX_INTEN|GS_ACTIVE) - -#define TXX9_SERIAL_MAGIC 0x39274927 - -#ifdef CONFIG_SERIAL -/* "ttyS","cua" is used for standard serial driver */ -#define TXX9_TTY_NAME "ttyTX" -#define TXX9_TTY_DEVFS_NAME "tts/TX%d" -#define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ -#define TXX9_CU_NAME "cuatx" -#define TXX9_CU_DEVFS_NAME "cua/TX%d" -#else -/* acts like standard serial driver */ -#define TXX9_TTY_NAME "ttyS" -#define TXX9_TTY_DEVFS_NAME "tts/%d" -#define TXX9_TTY_MINOR_START 64 -#define TXX9_CU_NAME "cua" -#define TXX9_CU_DEVFS_NAME "cua/%d" -#endif -#define TXX9_TTY_MAJOR TTY_MAJOR -#define TXX9_TTYAUX_MAJOR TTYAUX_MAJOR - -#define TXX9_SERIAL_HAVE_CTS_LINE 1 - -#ifdef CONFIG_PCI -/* support for Toshiba TC86C001 SIO */ -#define ENABLE_SERIAL_TXX9_PCI -#endif - -/* - * Number of serial ports - */ -#ifdef ENABLE_SERIAL_TXX9_PCI -#define NR_PCI_BOARDS 4 -#define NR_PORTS (2 + NR_PCI_BOARDS) -#else -#define NR_PORTS 2 -#endif - -/* - * Hardware specific serial port structure - */ -static struct rs_port { - struct gs_port gs; /* Must be first field! */ - - unsigned long base; - int irq; - int baud_base; - int flags; - struct async_icount icount; - int x_char; /* XON/XOFF character */ - int read_status_mask; - int ignore_status_mask; - int quot; - char io_type; -#ifdef ENABLE_SERIAL_TXX9_PCI - struct pci_dev * pci_dev; -#endif -} rs_ports[NR_PORTS] -#ifdef CONFIG_TOSHIBA_RBTX4925 -= { - /* NR_PORTS = 0 */ - {base: 0xff1f0000 + 0xf300, - .irq = 36, - .baud_base = 40000000 / 16 / 2, - .io_type = -1, /* virtual memory mapped */ - .flags = TXX9_SERIAL_HAVE_CTS_LINE,}, - /* NR_PORTS = 1 */ - {base: 0xff1f0000 + 0xf400, - .irq = 37, - .baud_base = 40000000 / 16 / 2, - .io_type = -1, /* virtual memory mapped */ - .flags = TXX9_SERIAL_HAVE_CTS_LINE,} -}; -#endif -#ifdef CONFIG_TOSHIBA_RBTX4927 -= { - /* NR_PORTS = 0 */ - {base: 0xff1f0000 + 0xf300, - .irq = 32, - .baud_base = 50000000 / 16 / 2, - .io_type = -1, /* virtual memory mapped */ - .flags = TXX9_SERIAL_HAVE_CTS_LINE,}, - /* NR_PORTS = 1 */ - {base: 0xff1f0000 + 0xf400, - .irq = 33, - .baud_base = 50000000 / 16 / 2, - .io_type = -1, /* virtual memory mapped */ - .flags = TXX9_SERIAL_HAVE_CTS_LINE,} -}; -#endif - -/* TXX9 Serial Registers */ -#define TXX9_SILCR 0x00 -#define TXX9_SIDICR 0x04 -#define TXX9_SIDISR 0x08 -#define TXX9_SICISR 0x0c -#define TXX9_SIFCR 0x10 -#define TXX9_SIFLCR 0x14 -#define TXX9_SIBGR 0x18 -#define TXX9_SITFIFO 0x1c -#define TXX9_SIRFIFO 0x20 - -/* SILCR : Line Control */ -#define TXX9_SILCR_SCS_MASK 0x00000060 -#define TXX9_SILCR_SCS_IMCLK 0x00000000 -#define TXX9_SILCR_SCS_IMCLK_BG 0x00000020 -#define TXX9_SILCR_SCS_SCLK 0x00000040 -#define TXX9_SILCR_SCS_SCLK_BG 0x00000060 -#define TXX9_SILCR_UEPS 0x00000010 -#define TXX9_SILCR_UPEN 0x00000008 -#define TXX9_SILCR_USBL_MASK 0x00000004 -//#define TXX9_SILCR_USBL_1BIT 0x00000004 -//#define TXX9_SILCR_USBL_2BIT 0x00000000 -#define TXX9_SILCR_USBL_1BIT 0x00000000 -#define TXX9_SILCR_USBL_2BIT 0x00000004 -#define TXX9_SILCR_UMODE_MASK 0x00000003 -#define TXX9_SILCR_UMODE_8BIT 0x00000000 -#define TXX9_SILCR_UMODE_7BIT 0x00000001 - -/* SIDICR : DMA/Int. Control */ -#define TXX9_SIDICR_TDE 0x00008000 -#define TXX9_SIDICR_RDE 0x00004000 -#define TXX9_SIDICR_TIE 0x00002000 -#define TXX9_SIDICR_RIE 0x00001000 -#define TXX9_SIDICR_SPIE 0x00000800 -#define TXX9_SIDICR_CTSAC 0x00000600 -#define TXX9_SIDICR_STIE_MASK 0x0000003f -#define TXX9_SIDICR_STIE_OERS 0x00000020 -#define TXX9_SIDICR_STIE_CTSS 0x00000010 -#define TXX9_SIDICR_STIE_RBRKD 0x00000008 -#define TXX9_SIDICR_STIE_TRDY 0x00000004 -#define TXX9_SIDICR_STIE_TXALS 0x00000002 -#define TXX9_SIDICR_STIE_UBRKD 0x00000001 - -/* SIDISR : DMA/Int. Status */ -#define TXX9_SIDISR_UBRK 0x00008000 -#define TXX9_SIDISR_UVALID 0x00004000 -#define TXX9_SIDISR_UFER 0x00002000 -#define TXX9_SIDISR_UPER 0x00001000 -#define TXX9_SIDISR_UOER 0x00000800 -#define TXX9_SIDISR_ERI 0x00000400 -#define TXX9_SIDISR_TOUT 0x00000200 -#define TXX9_SIDISR_TDIS 0x00000100 -#define TXX9_SIDISR_RDIS 0x00000080 -#define TXX9_SIDISR_STIS 0x00000040 -#define TXX9_SIDISR_RFDN_MASK 0x0000001f - -/* SICISR : Change Int. Status */ -#define TXX9_SICISR_OERS 0x00000020 -#define TXX9_SICISR_CTSS 0x00000010 -#define TXX9_SICISR_RBRKD 0x00000008 -#define TXX9_SICISR_TRDY 0x00000004 -#define TXX9_SICISR_TXALS 0x00000002 -#define TXX9_SICISR_UBRKD 0x00000001 - -/* SIFCR : FIFO Control */ -#define TXX9_SIFCR_SWRST 0x00008000 -#define TXX9_SIFCR_RDIL_MASK 0x00000180 -#define TXX9_SIFCR_RDIL_1 0x00000000 -#define TXX9_SIFCR_RDIL_4 0x00000080 -#define TXX9_SIFCR_RDIL_8 0x00000100 -#define TXX9_SIFCR_RDIL_12 0x00000180 -#define TXX9_SIFCR_RDIL_MAX 0x00000180 -#define TXX9_SIFCR_TDIL_MASK 0x00000018 -#define TXX9_SIFCR_TDIL_MASK 0x00000018 -#define TXX9_SIFCR_TDIL_1 0x00000000 -#define TXX9_SIFCR_TDIL_4 0x00000001 -#define TXX9_SIFCR_TDIL_8 0x00000010 -#define TXX9_SIFCR_TDIL_MAX 0x00000010 -#define TXX9_SIFCR_TFRST 0x00000004 -#define TXX9_SIFCR_RFRST 0x00000002 -#define TXX9_SIFCR_FRSTE 0x00000001 -#define TXX9_SIO_TX_FIFO 8 -#define TXX9_SIO_RX_FIFO 16 - -/* SIFLCR : Flow Control */ -#define TXX9_SIFLCR_RCS 0x00001000 -#define TXX9_SIFLCR_TES 0x00000800 -#define TXX9_SIFLCR_RTSSC 0x00000200 -#define TXX9_SIFLCR_RSDE 0x00000100 -#define TXX9_SIFLCR_TSDE 0x00000080 -#define TXX9_SIFLCR_RTSTL_MASK 0x0000001e -#define TXX9_SIFLCR_RTSTL_MAX 0x0000001e -#define TXX9_SIFLCR_TBRK 0x00000001 - -/* SIBGR : Baudrate Control */ -#define TXX9_SIBGR_BCLK_MASK 0x00000300 -#define TXX9_SIBGR_BCLK_T0 0x00000000 -#define TXX9_SIBGR_BCLK_T2 0x00000100 -#define TXX9_SIBGR_BCLK_T4 0x00000200 -#define TXX9_SIBGR_BCLK_T6 0x00000300 -#define TXX9_SIBGR_BRD_MASK 0x000000ff - -static /*inline*/ unsigned int -sio_in(struct rs_port *port, int offset) -{ - if (port->io_type < 0) - /* don't use __raw_readl that does swapping for big endian */ - return (*(volatile unsigned long*)(port->base + offset)); - else - return inl(port->base + offset); -} - -static /*inline*/ void -sio_out(struct rs_port *port, int offset, unsigned int value) -{ - if (port->io_type < 0) - /* don't use __raw_writel that does swapping for big endian */ - (*(volatile unsigned long*)(port->base + offset))=(value); - else - outl(value, port->base + offset); -} - -static inline void -sio_mask(struct rs_port *port, int offset, unsigned int value) -{ - sio_out(port, offset, sio_in(port, offset) & ~value); -} -static inline void -sio_set(struct rs_port *port, int offset, unsigned int value) -{ - sio_out(port, offset, sio_in(port, offset) | value); -} - -/* - * Forward declarations for serial routines - */ -static void rs_disable_tx_interrupts (void * ptr); -static void rs_enable_tx_interrupts (void * ptr); -static void rs_disable_rx_interrupts (void * ptr); -static void rs_enable_rx_interrupts (void * ptr); -static int rs_get_CD (void * ptr); -static void rs_shutdown_port (void * ptr); -static int rs_set_real_termios (void *ptr); -static int rs_chars_in_buffer (void * ptr); -static void rs_hungup (void *ptr); -static void rs_getserial (void*, struct serial_struct *sp); -static void rs_close (void *ptr); - -/* - * Used by generic serial driver to access hardware - */ -static struct real_driver rs_real_driver = { - .disable_tx_interrupts = rs_disable_tx_interrupts, - .enable_tx_interrupts = rs_enable_tx_interrupts, - .disable_rx_interrupts = rs_disable_rx_interrupts, - .enable_rx_interrupts = rs_enable_rx_interrupts, - get_CD: rs_get_CD, - .shutdown_port = rs_shutdown_port, - .set_real_termios = rs_set_real_termios, - .chars_in_buffer = rs_chars_in_buffer, - .close = rs_close, - .hungup = rs_hungup, - .getserial = rs_getserial, -}; - -/* - * Structures and such for TTY sessions and usage counts - */ -static struct tty_driver rs_driver, rs_callout_driver; -static struct tty_struct *rs_table[NR_PORTS]; -static struct termios *rs_termios[NR_PORTS]; -static struct termios *rs_termios_locked[NR_PORTS]; -int rs_refcount; -int rs_initialized = 0; - -#ifdef CONFIG_SERIAL_TXX9_CONSOLE -static struct console sercons; -#endif -#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -static unsigned long break_pressed; /* break, really ... */ -#endif - -static inline void receive_chars(struct rs_port *port, - int *status, struct pt_regs *regs) -{ - struct tty_struct *tty = port->gs.tty; - unsigned char ch; - struct async_icount *icount; - int max_count = 256; - - icount = &port->icount; - do { - if (tty->flip.count >= TTY_FLIPBUF_SIZE) { - return; - } - ch = sio_in(port, TXX9_SIRFIFO); - *tty->flip.char_buf_ptr = ch; - icount->rx++; - - *tty->flip.flag_buf_ptr = 0; - if (*status & (TXX9_SIDISR_UBRK | TXX9_SIDISR_UPER | - TXX9_SIDISR_UFER | TXX9_SIDISR_UOER)) { - /* - * For statistics only - */ - if (*status & TXX9_SIDISR_UBRK) { - *status &= ~(TXX9_SIDISR_UFER | TXX9_SIDISR_UPER); - icount->brk++; - /* - * We do the SysRQ and SAK checking - * here because otherwise the break - * may get masked by ignore_status_mask - * or read_status_mask. - */ -#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) - if (port == &rs_ports[sercons.index]) { - if (!break_pressed) { - break_pressed = jiffies; - goto ignore_char; - } - break_pressed = 0; - } -#endif - if (port->gs.flags & ASYNC_SAK) - do_SAK(tty); - } else if (*status & TXX9_SIDISR_UPER) - icount->parity++; - else if (*status & TXX9_SIDISR_UFER) - icount->frame++; - if (*status & TXX9_SIDISR_UOER) - icount->overrun++; - - /* - * Mask off conditions which should be ignored. - */ - *status &= port->read_status_mask; - -#ifdef CONFIG_SERIAL_TXX9_CONSOLE - /* Break flag is updated by reading RFIFO. */ -#endif - if (*status & (TXX9_SIDISR_UBRK)) { - *tty->flip.flag_buf_ptr = TTY_BREAK; - } else if (*status & TXX9_SIDISR_UPER) - *tty->flip.flag_buf_ptr = TTY_PARITY; - else if (*status & TXX9_SIDISR_UFER) - *tty->flip.flag_buf_ptr = TTY_FRAME; - } -#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) - if (break_pressed && port == &rs_ports[sercons.index]) { - if (ch != 0 && - time_before(jiffies, break_pressed + HZ*5)) { - handle_sysrq(ch, regs, NULL, NULL); - break_pressed = 0; - goto ignore_char; - } - break_pressed = 0; - } -#endif - if ((*status & port->ignore_status_mask) == 0) { - tty->flip.flag_buf_ptr++; - tty->flip.char_buf_ptr++; - tty->flip.count++; - } - if ((*status & TXX9_SIDISR_UOER) && - (tty->flip.count < TTY_FLIPBUF_SIZE)) { - /* - * Overrun is special, since it's reported - * immediately, and doesn't affect the current - * character - */ - *tty->flip.flag_buf_ptr = TTY_OVERRUN; - tty->flip.count++; - tty->flip.flag_buf_ptr++; - tty->flip.char_buf_ptr++; - } -#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) - ignore_char: -#endif - *status = sio_in(port, TXX9_SIDISR); - } while ((!(*status & TXX9_SIDISR_UVALID)) && (max_count-- > 0)); - tty_flip_buffer_push(tty); -} - -static inline void transmit_chars(struct rs_port *port) -{ - int count; - - if (port->x_char) { - sio_out(port, TXX9_SITFIFO, port->x_char); - port->icount.tx++; - port->x_char = 0; - return; - } - if (port->gs.xmit_cnt <= 0 - || port->gs.tty->stopped - || port->gs.tty->hw_stopped) { - rs_disable_tx_interrupts(port); - return; - } - - count = TXX9_SIO_TX_FIFO; - do { - sio_out(port, TXX9_SITFIFO, port->gs.xmit_buf[port->gs.xmit_tail++]); - port->gs.xmit_tail &= SERIAL_XMIT_SIZE-1; - port->icount.tx++; - if (--port->gs.xmit_cnt <= 0) - break; - } while (--count > 0); - - if (port->gs.xmit_cnt <= 0 || port->gs.tty->stopped || - port->gs.tty->hw_stopped) { - rs_disable_tx_interrupts(port); - } - - if (port->gs.xmit_cnt <= port->gs.wakeup_chars) { - if ((port->gs.tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && - port->gs.tty->ldisc.write_wakeup) - (port->gs.tty->ldisc.write_wakeup)(port->gs.tty); - wake_up_interruptible(&port->gs.tty->write_wait); - } -} - -static inline void check_modem_status(struct rs_port *port) -{ - /* We don't have a carrier detect line - but just respond - like we had one anyways so that open() becomes unblocked */ - wake_up_interruptible(&port->gs.open_wait); -} - -#define RS_ISR_PASS_LIMIT 256 - -static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) -{ - struct rs_port * port = (struct rs_port *)dev_id; - unsigned long flags; - int status; - int pass_counter = 0; - - local_irq_save(flags); - - if (!port || !port->gs.tty) { - local_irq_restore(flags); - return; - } - - do { - status = sio_in(port, TXX9_SIDISR); - if (!(sio_in(port, TXX9_SIDICR) & TXX9_SIDICR_TIE)) - status &= ~TXX9_SIDISR_TDIS; - if (!(status & (TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS | - TXX9_SIDISR_TOUT))) - break; - - if (status & TXX9_SIDISR_RDIS) - receive_chars(port, &status, regs); -#if 0 /* RTS/CTS are controled by HW. (if possible) */ - check_modem_status(port); -#endif - if (status & TXX9_SIDISR_TDIS) - transmit_chars(port); - /* Clear TX/RX Int. Status */ - sio_mask(port, TXX9_SIDISR, - TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS | - TXX9_SIDISR_TOUT); - - if (pass_counter++ > RS_ISR_PASS_LIMIT) { - break; - } - } while (1); - local_irq_restore(flags); -} - -/* - *********************************************************************** - * Here are the routines that actually * - * interface with the generic_serial driver * - *********************************************************************** - */ -static void rs_disable_tx_interrupts (void * ptr) -{ - struct rs_port *port = ptr; - unsigned long flags; - - local_irq_save(flags); - port->gs.flags &= ~GS_TX_INTEN; - sio_mask(port, TXX9_SIDICR, TXX9_SIDICR_TIE); - local_irq_restore(flags); -} - -static void rs_enable_tx_interrupts (void * ptr) -{ - struct rs_port *port = ptr; - unsigned long flags; - - local_irq_save(flags); - sio_set(port, TXX9_SIDICR, TXX9_SIDICR_TIE); - local_irq_restore(flags); -} - -static void rs_disable_rx_interrupts (void * ptr) -{ - struct rs_port *port = ptr; - unsigned long flags; - - local_irq_save(flags); - port->read_status_mask &= ~TXX9_SIDISR_RDIS; -#if 0 - sio_mask(port, TXX9_SIDICR, TXX9_SIDICR_RIE); -#endif - local_irq_restore(flags); -} - -static void rs_enable_rx_interrupts (void * ptr) -{ - struct rs_port *port = ptr; - sio_set(port, TXX9_SIDICR, TXX9_SIDICR_RIE); -} - - -static int rs_get_CD (void * ptr) -{ - /* No Carried Detect in Hardware - just return true */ - return (1); -} - -static void rs_shutdown_port (void * ptr) -{ - struct rs_port *port = ptr; - - port->gs.flags &= ~GS_ACTIVE; - - free_irq(port->irq, port); - sio_out(port, TXX9_SIDICR, 0); /* disable all intrs */ - /* disable break condition */ - sio_mask(port, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); - -#ifdef CONFIG_SERIAL_TXX9_CONSOLE - if (port == &rs_ports[sercons.index]) { -#endif - if (!port->gs.tty || (port->gs.tty->termios->c_cflag & HUPCL)) { - /* drop RTS */ - sio_set(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - /* TXX9-SIO can not control DTR... */ - } - - /* reset FIFO's */ - sio_set(port, TXX9_SIFCR, - TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); - /* clear reset */ - sio_mask(port, TXX9_SIFCR, - TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); - /* Disable RX/TX */ - sio_set(port, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); -#ifdef CONFIG_SERIAL_TXX9_CONSOLE - } -#endif -} - -static int rs_set_real_termios (void *ptr) -{ - struct rs_port *port = ptr; - int quot = 0, baud_base, baud; - unsigned cflag, cval, fcr = 0; - int bits; - unsigned long flags; - - if (!port->gs.tty || !port->gs.tty->termios) - return 0; - cflag = port->gs.tty->termios->c_cflag; - cval = sio_in(port, TXX9_SILCR); - /* byte size and parity */ - cval &= ~TXX9_SILCR_UMODE_MASK; - switch (cflag & CSIZE) { - case CS7: - cval |= TXX9_SILCR_UMODE_7BIT; - bits = 9; - break; - case CS5: /* not supported */ - case CS6: /* not supported */ - case CS8: - default: - cval |= TXX9_SILCR_UMODE_8BIT; - bits = 10; - break; - } - cval &= ~TXX9_SILCR_USBL_MASK; - if (cflag & CSTOPB) { - cval |= TXX9_SILCR_USBL_2BIT; - bits++; - } else { - cval |= TXX9_SILCR_USBL_1BIT; - } - - cval &= ~(TXX9_SILCR_UPEN | TXX9_SILCR_UEPS); - if (cflag & PARENB) { - cval |= TXX9_SILCR_UPEN; - bits++; - } - if (!(cflag & PARODD)) - cval |= TXX9_SILCR_UEPS; - - /* Determine divisor based on baud rate */ - baud = tty_get_baud_rate(port->gs.tty); - if (!baud) - baud = 9600; /* B0 transition handled in rs_set_termios */ - baud_base = port->baud_base; - quot = (baud_base + baud / 2) / baud; - /* As a last resort, if the quotient is zero, default to 9600 bps */ - if (!quot) - quot = (baud_base + 9600 / 2) / 9600; - port->quot = quot; - - /* Set up FIFO's */ - /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */ - fcr = TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1; - - /* CTS flow control flag */ - if (cflag & CRTSCTS) { - port->gs.flags |= ASYNC_CTS_FLOW; - if (port->flags & TXX9_SERIAL_HAVE_CTS_LINE) - sio_out(port, TXX9_SIFLCR, - TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES | - TXX9_SIFLCR_RTSTL_MAX /* 15 */); - } else { - port->gs.flags &= ~ASYNC_CTS_FLOW; - sio_mask(port, TXX9_SIFLCR, - TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES | - TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); - } - - /* - * Set up parity check flag - */ -#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) - - port->read_status_mask = TXX9_SIDISR_UOER | - TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS; - if (I_INPCK(port->gs.tty)) - port->read_status_mask |= TXX9_SIDISR_UFER | TXX9_SIDISR_UPER; - if (I_BRKINT(port->gs.tty) || I_PARMRK(port->gs.tty)) - port->read_status_mask |= TXX9_SIDISR_UBRK; - - /* - * Characters to ignore - */ - port->ignore_status_mask = 0; - if (I_IGNPAR(port->gs.tty)) - port->ignore_status_mask |= TXX9_SIDISR_UPER | TXX9_SIDISR_UFER; - if (I_IGNBRK(port->gs.tty)) { - port->ignore_status_mask |= TXX9_SIDISR_UBRK; - /* - * If we're ignore parity and break indicators, ignore - * overruns too. (For real raw support). - */ - if (I_IGNPAR(port->gs.tty)) - port->ignore_status_mask |= TXX9_SIDISR_UOER; - } -#if 0 /* XXX: This cause problem with some programs(init, mingetty, etc) */ - /* - * !!! ignore all characters if CREAD is not set - */ - if ((cflag & CREAD) == 0) - port->ignore_status_mask |= TXX9_SIDISR_RDIS; -#endif - local_irq_save(flags); - cval &= ~TXX9_SILCR_SCS_IMCLK; - sio_out(port, TXX9_SILCR, cval | TXX9_SILCR_SCS_IMCLK_BG); - sio_out(port, TXX9_SIBGR, quot | TXX9_SIBGR_BCLK_T0); - sio_out(port, TXX9_SIFCR, fcr); - local_irq_restore(flags); - return 0; -} - -static int rs_chars_in_buffer (void * ptr) -{ - struct rs_port *port = ptr; - - /* return 0 if transmitter disabled. */ - if (sio_in(port, TXX9_SIFLCR) & TXX9_SIFLCR_TSDE) - return 0; - return (sio_in(port, TXX9_SICISR) & TXX9_SICISR_TXALS) ? 0 : 1; -} - -/* ********************************************************************** * - * Here are the routines that actually * - * interface with the rest of the system * - * ********************************************************************** */ -static int rs_open (struct tty_struct * tty, struct file * filp) -{ - struct rs_port *port; - int retval, line; - - if (!rs_initialized) { - return -EIO; - } - - line = tty->index; - - if ((line < 0) || (line >= NR_PORTS)) - return -ENODEV; - - /* Pre-initialized already */ - port = & rs_ports[line]; - - if (!port->base) - return -ENODEV; - - tty->driver_data = port; - port->gs.tty = tty; - port->gs.count++; - - /* - * Start up serial port - */ - retval = gs_init_port(&port->gs); - if (retval) { - port->gs.count--; - return retval; - } - - port->gs.flags |= GS_ACTIVE; - - if (port->gs.count == 1) { - /* - * Clear the FIFO buffers and disable them - * (they will be reenabled in rs_set_real_termios()) - */ - sio_set(port, TXX9_SIFCR, - TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | - TXX9_SIFCR_FRSTE); - /* clear reset */ - sio_mask(port, TXX9_SIFCR, - TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | - TXX9_SIFCR_FRSTE); - sio_out(port, TXX9_SIDICR, 0); - - retval = request_irq(port->irq, rs_interrupt, SA_SHIRQ, - "serial_txx9", port); - if (retval) { - printk(KERN_ERR "serial_txx9: request_irq: err %d\n", - retval); - port->gs.count--; - return retval; - } - /* - * Clear the interrupt registers. - */ - sio_out(port, TXX9_SIDISR, 0); - - /* HW RTS/CTS control */ - if (port->flags & TXX9_SERIAL_HAVE_CTS_LINE) - sio_out(port, TXX9_SIFLCR, - TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES | - TXX9_SIFLCR_RTSTL_MAX /* 15 */); - } - - /* Enable RX/TX */ - sio_mask(port, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); - - /* - * Finally, enable interrupts - */ - rs_enable_rx_interrupts(port); - - /* - * and set the speed of the serial port - */ - rs_set_real_termios(port); - - retval = gs_block_til_ready(&port->gs, filp); - - if (retval) { - if (port->gs.count == 1) { - free_irq(port->irq, port); - } - port->gs.count--; - return retval; - } - /* tty->low_latency = 1; */ - - if (port->gs.count == 1) - rs_set_real_termios(port); - -#ifdef CONFIG_SERIAL_TXX9_CONSOLE - if (sercons.cflag && sercons.index == line) { - tty->termios->c_cflag = sercons.cflag; - sercons.cflag = 0; - rs_set_real_termios(port); - } -#endif - return 0; -} - -/* - * /proc fs routines.... - */ - -static inline int line_info(char *buf, struct rs_port *port) -{ - char stat_buf[30]; - int ret; - unsigned long flags; - - ret = sprintf(buf, "%d: uart:txx9 io%s:%lx irq:%d", - port - &rs_ports[0], - port->io_type < 0 ? "mem" : "port", - port->base, port->irq); - - if (!port->base) { - ret += sprintf(buf+ret, "\n"); - return ret; - } - - /* - * Figure out the current RS-232 lines - */ - stat_buf[0] = 0; - stat_buf[1] = 0; - local_irq_save(flags); - if (!(sio_in(port, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC)) - strcat(stat_buf, "|RTS"); - if (!(sio_in(port, TXX9_SICISR) & TXX9_SICISR_CTSS)) - strcat(stat_buf, "|CTS"); - local_irq_restore(flags); - - if (port->quot) { - ret += sprintf(buf+ret, " baud:%d", - port->baud_base / port->quot); - } - - ret += sprintf(buf+ret, " tx:%d rx:%d", - port->icount.tx, port->icount.rx); - - if (port->icount.frame) - ret += sprintf(buf+ret, " fe:%d", port->icount.frame); - - if (port->icount.parity) - ret += sprintf(buf+ret, " pe:%d", port->icount.parity); - - if (port->icount.brk) - ret += sprintf(buf+ret, " brk:%d", port->icount.brk); - - if (port->icount.overrun) - ret += sprintf(buf+ret, " oe:%d", port->icount.overrun); - - /* - * Last thing is the RS-232 status lines - */ - ret += sprintf(buf+ret, " %s\n", stat_buf+1); - return ret; -} - -static int rs_read_proc(char *page, char **start, off_t off, int count, - int *eof, void *data) -{ - int i, len = 0, l; - off_t begin = 0; - - len += sprintf(page, "serinfo:1.0 driver:%s\n", serial_version); - for (i = 0; i < NR_PORTS && len < 4000; i++) { - l = line_info(page + len, &rs_ports[i]); - len += l; - if (len+begin > off+count) - goto done; - if (len+begin < off) { - begin += len; - len = 0; - } - } - *eof = 1; -done: - if (off >= len+begin) - return 0; - *start = page + (begin-off); - return ((count < begin+len-off) ? count : begin+len-off); -} - -static void rs_close (void *ptr) -{ -#if 0 - struct rs_port *port = ptr; - free_irq(port->irq, port); -#endif -} - -/* I haven't the foggiest why the decrement use count has to happen - here. The whole linux serial drivers stuff needs to be redesigned. - My guess is that this is a hack to minimize the impact of a bug - elsewhere. Thinking about it some more. (try it sometime) Try - running minicom on a serial port that is driven by a modularized - driver. Have the modem hangup. Then remove the driver module. Then - exit minicom. I expect an "oops". -- REW */ -static void rs_hungup (void *ptr) -{ -} - -static void rs_getserial (void *ptr, struct serial_struct *sp) -{ - struct rs_port *port = ptr; - struct tty_struct *tty = port->gs.tty; - /* some applications (busybox, dbootstrap, etc.) look this */ - sp->line = tty->index; -} - -/* - * rs_break() --- routine which turns the break handling on or off - */ -static void rs_break(struct tty_struct *tty, int break_state) -{ - struct rs_port *port = tty->driver_data; - unsigned long flags; - - if (!port->base) - return; - local_irq_save(flags); - if (break_state == -1) - sio_set(port, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); - else - sio_mask(port, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); - local_irq_restore(flags); -} - -static int get_modem_info(struct rs_port *port, unsigned int *value) -{ - unsigned int result; - unsigned long flags; - - local_irq_save(flags); - result = ((sio_in(port, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS) - | ((sio_in(port, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS); - local_irq_restore(flags); - return put_user(result,value); -} - -static int set_modem_info(struct rs_port *port, unsigned int cmd, - unsigned int *value) -{ - int error = 0; - unsigned int arg; - unsigned long flags; - - if (copy_from_user(&arg, value, sizeof(int))) - return -EFAULT; - - local_irq_save(flags); - switch (cmd) { - case TIOCMBIS: - if (arg & TIOCM_RTS) - sio_mask(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - break; - case TIOCMBIC: - if (arg & TIOCM_RTS) - sio_set(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - break; - case TIOCMSET: - if (arg & TIOCM_RTS) - sio_mask(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - else - sio_set(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - break; - default: - error = -EINVAL; - } - local_irq_restore(flags); - return error; -} - -static int rs_ioctl (struct tty_struct * tty, struct file * filp, - unsigned int cmd, unsigned long arg) -{ - int rc; - struct rs_port *port = tty->driver_data; - int ival; - - rc = 0; - switch (cmd) { - case TIOCMGET: - return get_modem_info(port, (unsigned int *) arg); - case TIOCMBIS: - case TIOCMBIC: - case TIOCMSET: - return set_modem_info(port, cmd, (unsigned int *) arg); - return 0; - case TIOCGSOFTCAR: - rc = put_user(((tty->termios->c_cflag & CLOCAL) ? 1 : 0), - (unsigned int *) arg); - break; - case TIOCSSOFTCAR: - if ((rc = verify_area(VERIFY_READ, (void *) arg, - sizeof(int))) == 0) { - get_user(ival, (unsigned int *) arg); - tty->termios->c_cflag = - (tty->termios->c_cflag & ~CLOCAL) | - (ival ? CLOCAL : 0); - } - break; - case TIOCGSERIAL: - if ((rc = verify_area(VERIFY_WRITE, (void *) arg, - sizeof(struct serial_struct))) == 0) - rc = gs_getserial(&port->gs, (struct serial_struct *) arg); - break; - case TIOCSSERIAL: - if ((rc = verify_area(VERIFY_READ, (void *) arg, - sizeof(struct serial_struct))) == 0) - rc = gs_setserial(&port->gs, (struct serial_struct *) arg); - break; - default: - rc = -ENOIOCTLCMD; - break; - } - - return rc; -} - - -/* - * This function is used to send a high-priority XON/XOFF character to - * the device - */ -static void rs_send_xchar(struct tty_struct * tty, char ch) -{ - struct rs_port *port = (struct rs_port *)tty->driver_data; - - port->x_char = ch; - if (ch) { - /* Make sure transmit interrupts are on */ - rs_enable_tx_interrupts(tty); - } -} - - -/* - * ------------------------------------------------------------ - * rs_throttle() - * - * This routine is called by the upper-layer tty layer to signal that - * incoming characters should be throttled. - * ------------------------------------------------------------ - */ -static void rs_throttle(struct tty_struct * tty) -{ - struct rs_port *port = (struct rs_port *)tty->driver_data; - unsigned long flags; - - if (I_IXOFF(tty)) - rs_send_xchar(tty, STOP_CHAR(tty)); - if (tty->termios->c_cflag & CRTSCTS) { - local_irq_save(flags); - /* drop RTS */ - sio_set(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - local_irq_restore(flags); - } -} - -static void rs_unthrottle(struct tty_struct * tty) -{ - struct rs_port *port = tty->driver_data; - unsigned long flags; - - if (I_IXOFF(tty)) { - if (port->x_char) - port->x_char = 0; - else - rs_send_xchar(tty, START_CHAR(tty)); - } - if (tty->termios->c_cflag & CRTSCTS) { - local_irq_save(flags); - sio_mask(port, TXX9_SIFLCR, - TXX9_SIFLCR_RTSSC | TXX9_SIFLCR_RSDE); - local_irq_restore(flags); - } -} - -/* ********************************************************************** * - * Here are the initialization routines. * - * ********************************************************************** */ - -static inline void show_serial_version(void) -{ - printk(KERN_INFO "%s version %s\n", serial_name, serial_version); -} - -static int rs_init_portstructs(void) -{ - struct rs_port *port; - int i; - - /* Adjust the values in the "driver" */ - rs_driver.termios = rs_termios; - rs_driver.termios_locked = rs_termios_locked; - - port = rs_ports; - for (i=0; i < NR_PORTS;i++) { - port->gs.magic = TXX9_SERIAL_MAGIC; - port->gs.close_delay = HZ/2; - port->gs.closing_wait = 30 * HZ; - port->gs.rd = &rs_real_driver; -#ifdef NEW_WRITE_LOCKING - port->gs.port_write_sem = MUTEX; -#endif -#ifdef DECLARE_WAITQUEUE - init_waitqueue_head(&port->gs.open_wait); - init_waitqueue_head(&port->gs.close_wait); -#endif - port++; - } - - return 0; -} - -static int rs_init_drivers(void) -{ - int error; - - memset(&rs_driver, 0, sizeof(rs_driver)); - rs_driver.magic = TTY_DRIVER_MAGIC; - rs_driver.driver_name = "serial_txx9"; -#if defined(CONFIG_DEVFS_FS) - rs_driver.name = TXX9_TTY_DEVFS_NAME; -#else - rs_driver.name = TXX9_TTY_NAME; -#endif - rs_driver.major = TXX9_TTY_MAJOR; - rs_driver.minor_start = TXX9_TTY_MINOR_START; - rs_driver.num = NR_PORTS; - rs_driver.type = TTY_DRIVER_TYPE_SERIAL; - rs_driver.subtype = SERIAL_TYPE_NORMAL; - rs_driver.init_termios = tty_std_termios; - rs_driver.init_termios.c_cflag = - B9600 | CS8 | CREAD | HUPCL | CLOCAL; - rs_driver.refcount = &rs_refcount; - rs_driver.termios = rs_termios; - rs_driver.termios_locked = rs_termios_locked; - - rs_driver.open = rs_open; - rs_driver.close = gs_close; - rs_driver.write = gs_write; - rs_driver.put_char = gs_put_char; - rs_driver.flush_chars = gs_flush_chars; - rs_driver.write_room = gs_write_room; - rs_driver.chars_in_buffer = gs_chars_in_buffer; - rs_driver.flush_buffer = gs_flush_buffer; - rs_driver.ioctl = rs_ioctl; - rs_driver.throttle = rs_throttle; - rs_driver.unthrottle = rs_unthrottle; - rs_driver.set_termios = gs_set_termios; - rs_driver.stop = gs_stop; - rs_driver.start = gs_start; - rs_driver.hangup = gs_hangup; - rs_driver.break_ctl = rs_break; - rs_driver.read_proc = rs_read_proc; - - rs_callout_driver = rs_driver; -#if defined(CONFIG_DEVFS_FS) - rs_callout_driver.name = TXX9_CU_DEVFS_NAME; -#else - rs_callout_driver.name = TXX9_CU_NAME; -#endif - if ((error = tty_register_driver(&rs_driver))) { - printk(KERN_ERR - "Couldn't register serial driver, error = %d\n", - error); - return 1; - } - - return 0; -} - -/* - * This routine is called by txx9_rs_init() to initialize a specific serial - * port. - */ -static void txx9_config(struct rs_port *port) -{ - unsigned long flags; - - if (port - &rs_ports[0] != sercons.index) { - local_irq_save(flags); - /* - * Reset the UART. - */ - sio_out(port, TXX9_SIFCR, TXX9_SIFCR_SWRST); -#ifdef CONFIG_CPU_TX49XX - /* TX4925 BUG WORKAROUND. Accessing SIOC register - * immediately after soft reset causes bus error. */ - wbflush();/* change iob(); */ - udelay(1); -#endif - while (sio_in(port, TXX9_SIFCR) & TXX9_SIFCR_SWRST) - ; - /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */ - sio_set(port, TXX9_SIFCR, - TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1); - /* initial settings */ - sio_out(port, TXX9_SILCR, - TXX9_SILCR_UMODE_8BIT | TXX9_SILCR_USBL_1BIT | - TXX9_SILCR_SCS_IMCLK_BG); - sio_out(port, TXX9_SIBGR, - ((port->baud_base + 9600 / 2) / 9600) | - TXX9_SIBGR_BCLK_T0); - local_irq_restore(flags); - } - DBG("txx9_config: port->io_type is %d\n", port->io_type); - if (port->io_type < 0) - request_mem_region(port->base, 36, "serial_txx9"); - else - request_region(port->base, 36, "serial_txx9"); -} - -#ifdef ENABLE_SERIAL_TXX9_PCI -static int __devinit serial_txx9_init_one(struct pci_dev *dev, - const struct pci_device_id *ent) -{ - int rc, i; - struct rs_port *port; - - rc = pci_enable_device(dev); - if (rc) return rc; - - /* find empty slot */ - for (i = 0; i < NR_PORTS && rs_ports[i].base; i++) - ; - if (i == NR_PORTS) - return -ENODEV; - port = &rs_ports[i]; - DBG("port number is %d\n",i); - - port->pci_dev = dev; - port->base = pci_resource_start(dev, 1); - - DBG("port->base is %x\n",(u32)port->base); - port->io_type = SERIAL_IO_PORT; - port->irq = dev->irq; - port->flags |= TXX9_SERIAL_HAVE_CTS_LINE; - port->baud_base = 66670000 / 16 / 2; /* 66.67MHz */ - DBG("port->baud_base %x\n",port->baud_base); - - txx9_config(port); - - printk(KERN_INFO - "%s%d at 0x%08lx (irq = %d) is a TX39/49 SIO\n", - TXX9_TTY_NAME, i, port->base, port->irq); - return 0; -} - -static void __devexit serial_txx9_remove_one(struct pci_dev *dev) -{ - int i; - for (i = 0; i < NR_PORTS; i++) { - if (rs_ports[i].pci_dev == dev) { - rs_ports[i].irq = 0; - rs_ports[i].base = 0; - rs_ports[i].pci_dev = 0; - /* XXX NOT IMPLEMENTED YET */ - break; - } - } -} - -static struct pci_device_id serial_txx9_pci_tbl[] __devinitdata = { -#ifdef PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC - { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 }, -#endif - { 0, } -}; - -MODULE_DEVICE_TABLE(pci, serial_txx9_pci_tbl); - -static struct pci_driver serial_txx9_pci_driver = { - .name = "serial_txx9", - .probe = serial_txx9_init_one, - .remove = __devexit_p(serial_txx9_remove_one), - .id_table = serial_txx9_pci_tbl, -}; - -/* - * Query PCI space for known serial boards - * If found, add them to the PCI device space in rs_table[] - */ -static void __devinit probe_serial_txx9_pci(void) -{ - /* Register call PCI serial devices. Null out - * the driver name upon failure, as a signal - * not to attempt to unregister the driver later - */ - if (pci_module_init (&serial_txx9_pci_driver) != 0) - serial_txx9_pci_driver.name = ""; - - return; -} -#endif /* ENABLE_SERIAL_TXX9_PCI */ - -static int __init txx9_rs_init(void) -{ - int rc; - struct rs_port *port; - int i; - -#ifndef ENABLE_SERIAL_TXX9_PCI - for (i = 0, port = &rs_ports[0]; i < NR_PORTS; i++,port++) { - if (port->base) - goto config_ok; - } - return -ENODEV; - config_ok: -#endif - - show_serial_version(); - rc = rs_init_portstructs (); - rs_init_drivers (); - for (i = 0, port = &rs_ports[0]; i < NR_PORTS; i++,port++) { - if (!port->base) - continue; - if (port->io_type < 0) { - if (check_mem_region(port->base, 36)) - continue; - } else { - if (check_region(port->base, 36)) - continue; - } - txx9_config(port); - printk(KERN_INFO - "%s%d at 0x%08lx (irq = %d) is a TX39/49 SIO\n", - TXX9_TTY_NAME, i, port->base, port->irq); - } - - /* Note: I didn't do anything to enable the second UART */ - if (rc >= 0) - rs_initialized++; - -#ifdef ENABLE_SERIAL_TXX9_PCI - probe_serial_txx9_pci(); -#endif - return 0; -} - -/* - * This is for use by architectures that know their serial console - * attributes only at run time. Not to be invoked after rs_init(). - */ -int __init early_serial_txx9_setup(int line, unsigned long base, int irq, - int baud_base, int have_cts) -{ - if (line >= NR_PORTS) - return(-ENOENT); - rs_ports[line].base = base; - rs_ports[line].irq = irq; - rs_ports[line].baud_base = baud_base; - rs_ports[line].io_type = -1; /* virtual memory mapped */ - if (have_cts) - rs_ports[line].flags |= TXX9_SERIAL_HAVE_CTS_LINE; - return(0); -} - -static void __exit txx9_rs_fini(void) -{ - unsigned long flags; - int e1, e2; - int i; - - local_irq_save(flags); - if ((e1 = tty_unregister_driver(&rs_driver))) - printk("serial: failed to unregister serial driver (%d)\n", - e1); - if ((e2 = tty_unregister_driver(&rs_callout_driver))) - printk("serial: failed to unregister callout driver (%d)\n", - e2); - local_irq_restore(flags); - - for (i = 0; i < NR_PORTS; i++) { - if (!rs_ports[i].base) - continue; - if (rs_ports[i].io_type < 0) - release_mem_region(rs_ports[i].base, 36); - else - release_region(rs_ports[i].base, 36); - } - -#ifdef ENABLE_SERIAL_PCI - if (serial_txx9_pci_driver.name[0]) - pci_unregister_driver (&serial_txx9_pci_driver); -#endif -} - -module_init(txx9_rs_init); -module_exit(txx9_rs_fini); -MODULE_DESCRIPTION("TX39/49 serial driver"); -MODULE_AUTHOR("TOSHIBA Corporation"); -MODULE_LICENSE("GPL"); - -/* - * Begin serial console routines - */ -#ifdef CONFIG_SERIAL_TXX9_CONSOLE - -/* - * Wait for transmitter & holding register to empty - */ -static inline void wait_for_xmitr(struct rs_port *port) -{ - unsigned int tmout = 1000000; - - do { - if (--tmout == 0) break; - } while (!(sio_in(port, TXX9_SICISR) & TXX9_SICISR_TXALS)); - - /* Wait for flow control if necessary */ -#if (ASYNC_INTERNAL_FLAGS & GS_INTERNAL_FLAGS) == 0 /* check conflict... */ - if (port->gs.flags & ASYNC_CONS_FLOW) { - tmout = 1000000; - while (--tmout && - (sio_in(port, TXX9_SICISR) & TXX9_SICISR_CTSS)); - } -#endif -} - -/* - * Print a string to the serial port trying not to disturb - * any possible real use of the port... - * - * The console_lock must be held when we get here. - */ -static void serial_console_write(struct console *co, const char *s, - unsigned count) -{ - struct rs_port *port = &rs_ports[co->index]; - int ier; - unsigned i; - - /* - * First save the IER then disable the interrupts - */ - ier = sio_in(port, TXX9_SIDICR); - sio_out(port, TXX9_SIDICR, 0); - - /* - * Now, do each character - */ - for (i = 0; i < count; i++, s++) { - wait_for_xmitr(port); - - /* - * Send the character out. - * If a LF, also do CR... - */ - sio_out(port, TXX9_SITFIFO, *s); - if (*s == 10) { - wait_for_xmitr(port); - sio_out(port, TXX9_SITFIFO, 13); - } - } - - /* - * Finally, Wait for transmitter & holding register to empty - * and restore the IER - */ - wait_for_xmitr(port); - sio_out(port, TXX9_SIDICR, ier); -} - -static struct tty_driver *serial_console_device(struct console *c, int *index) -{ - *index = c->index; - return &rs_driver; -} - -static int serial_console_setup(struct console *co, char *options) -{ - struct rs_port *port; - unsigned cval; - int baud = 9600; - int bits = 8; - int parity = 'n'; - int doflow = 0; - int cflag = CREAD | HUPCL | CLOCAL; - int quot = 0; - char *s; - - if (co->index < 0 || co->index >= NR_PORTS) - return -1; - if (options) { - baud = simple_strtoul(options, NULL, 10); - s = options; - while(*s >= '0' && *s <= '9') - s++; - if (*s) parity = *s++; - if (*s) bits = *s - '0'; - if (*s) doflow = (*s++ == 'r'); - } - - /* - * Now construct a cflag setting. - */ - switch(baud) { - case 1200: cflag |= B1200; break; - case 2400: cflag |= B2400; break; - case 4800: cflag |= B4800; break; - case 19200: cflag |= B19200; break; - case 38400: cflag |= B38400; break; - case 57600: cflag |= B57600; break; - case 115200: cflag |= B115200; break; - default: - /* - * Set this to a sane value to prevent a divide error - */ - baud = 9600; - case 9600: cflag |= B9600; break; - } - - switch(bits) { - case 7: cflag |= CS7; break; - default: - case 8: cflag |= CS8; break; - } - switch(parity) { - case 'o': case 'O': cflag |= PARODD; break; - case 'e': case 'E': cflag |= PARENB; break; - } - co->cflag = cflag; - - port = &rs_ports[co->index]; - if (!port->base) - return -1; - - /* - * Divisor, bytesize and parity - */ -#if (ASYNC_INTERNAL_FLAGS & GS_INTERNAL_FLAGS) == 0 /* check conflict... */ - if (doflow) - port->gs.flags |= ASYNC_CONS_FLOW; -#endif - quot = port->baud_base / baud; - switch (cflag & CSIZE) { - case CS7: cval = TXX9_SILCR_UMODE_7BIT; break; - default: - case CS8: cval = TXX9_SILCR_UMODE_8BIT; break; - } - if (cflag & CSTOPB) - cval |= TXX9_SILCR_USBL_2BIT; - else - cval |= TXX9_SILCR_USBL_1BIT; - if (cflag & PARENB) - cval |= TXX9_SILCR_UPEN; - if (!(cflag & PARODD)) - cval |= TXX9_SILCR_UEPS; - - /* - * Disable UART interrupts, set DTR and RTS high - * and set speed. - */ - sio_out(port, TXX9_SIDICR, 0); - sio_out(port, TXX9_SILCR, cval | TXX9_SILCR_SCS_IMCLK_BG); - sio_out(port, TXX9_SIBGR, quot | TXX9_SIBGR_BCLK_T0); - /* no RTS/CTS control */ - sio_out(port, TXX9_SIFLCR, TXX9_SIFLCR_RTSTL_MAX /* 15 */); - /* Enable RX/TX */ - sio_mask(port, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); - - /* console port should not use RTC/CTS. */ - port->flags &= ~TXX9_SERIAL_HAVE_CTS_LINE; - return 0; -} - -static struct console sercons = { - .name = TXX9_TTY_NAME, - .write = serial_console_write, - .device = serial_console_device, - .setup = serial_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1, -}; - -static int __init txx9_serial_console_init(void) -{ - register_console(&sercons); - - return 0; -} - -console_initcall(txx9_serial_console_init); - -#endif - -/******************************************************************************/ -/* BEG: KDBG Routines */ -/******************************************************************************/ - -#ifdef CONFIG_KGDB -int kgdb_init_count = 0; - -void txx9_sio_kgdb_hook(unsigned int port, unsigned int baud_rate) -{ - static struct resource kgdb_resource; - int ret; - - /* prevent initialization by driver */ - kgdb_resource.name = "serial_txx9(debug)"; - kgdb_resource.start = rs_ports[port].base; - kgdb_resource.end = rs_ports[port].base + 36 - 1; - kgdb_resource.flags = IORESOURCE_MEM | IORESOURCE_BUSY; - - ret = request_resource(&iomem_resource, &kgdb_resource); - if(ret == -EBUSY) - printk(" serial_txx9(debug): request_resource failed\n"); - - return; -} -void -txx9_sio_kdbg_init( unsigned int port_number ) -{ - if ( port_number == 1 ) { - txx9_sio_kgdb_hook( port_number, 38400 ); - } else { - printk("Bad Port Number [%u] != [1]\n",port_number); - } - return; -} - -u8 -txx9_sio_kdbg_rd( void ) -{ - unsigned int status,ch; - - if ( kgdb_init_count == 0 ) - { - txx9_sio_kdbg_init( 1 ); - kgdb_init_count = 1; - } - - while ( 1 ) - { - status = sio_in(&rs_ports[1], TXX9_SIDISR); - if ( status & 0x1f ) - { - ch = sio_in(&rs_ports[1], TXX9_SIRFIFO ); - break; - } - } - - return( ch ); -} - -int -txx9_sio_kdbg_wr( u8 ch ) -{ - unsigned int status; - - if ( kgdb_init_count == 0 ) - { - txx9_sio_kdbg_init( 1 ); - kgdb_init_count = 1; - } - - while ( 1 ) - { - status = sio_in(&rs_ports[1], TXX9_SICISR); - if (status & TXX9_SICISR_TRDY) - { - if ( ch == '\n' ) - { - txx9_sio_kdbg_wr( '\r' ); - } - sio_out(&rs_ports[1], TXX9_SITFIFO, (u32)ch ); - - break; - } - } - - return( 1 ); -} -#endif /* CONFIG_KGDB */ - - -/******************************************************************************/ -/* END: KDBG Routines */ -/******************************************************************************/ - - -void txx9_raw_output(char c) -{ - struct rs_port *port = &rs_ports[0]; - if ( c == '\n' ) - { - sio_out(port, TXX9_SITFIFO, '\r'); - wait_for_xmitr(port); - } - sio_out(port, TXX9_SITFIFO, c); - wait_for_xmitr(port); - return; -} - - diff -urN linux/drivers/char/serial_txx927.c linux/drivers/char/serial_txx927.c --- linux/drivers/char/Attic/serial_txx927.c Fri Mar 4 17:24:33 2005 1.4 +++ linux/drivers/char/Attic/serial_txx927.c 1970/01/01 00:00:002002 @@ -1,2331 +0,0 @@ -/* - * drivers/char/serial_txx927.c - * driver for TX[34]927 SIO - * - * Copyright 2001 MontaVista Software Inc. - * Author: MontaVista Software, Inc. - * ahennessy@mvista.com - * - * Based on drivers/char/serial.c - * - * Copyright (C) 2000-2001 Toshiba Corporation - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#define SERIAL_DO_RESTART - -/* Set of debugging defines */ - -#undef SERIAL_DEBUG_INTR -#undef SERIAL_DEBUG_OPEN -#undef SERIAL_DEBUG_FLOW -#undef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT -#undef SERIAL_DEBUG_PCI -#undef SERIAL_DEBUG_AUTOCONF - -#ifdef MODULE -#undef CONFIG_TXX927_SERIAL_CONSOLE -#endif - -#define CONFIG_SERIAL_RSA - -#define RS_STROBE_TIME (10*HZ) -#define RS_ISR_PASS_LIMIT 256 - -/* - * End of serial driver configuration section. - */ - -#ifdef MODVERSIONS -#include -#endif -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_TXX927_SERIAL_CONSOLE -#include -#endif -#ifdef CONFIG_MAGIC_SYSRQ -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_TOSHIBA_JMR3927 -#include -#endif - -#define _INLINE_ inline - -#ifdef CONFIG_MAC_SERIAL -#define SERIAL_DEV_OFFSET 2 -#else -#define SERIAL_DEV_OFFSET 0 -#endif - -static char *serial_name = "TXx927 Serial driver"; -static char *serial_version = "0.02"; - -static DECLARE_TASK_QUEUE(tq_serial); - -static struct tty_driver serial_driver, callout_driver; -static int serial_refcount; - -static struct timer_list serial_timer; - -extern unsigned long get_txx927_uart_baud(void); - -/* serial subtype definitions */ -#ifndef SERIAL_TYPE_NORMAL -#define SERIAL_TYPE_NORMAL 1 -#define SERIAL_TYPE_CALLOUT 2 -#endif - -/* number of characters left in xmit buffer before we ask for more */ -#define WAKEUP_CHARS 256 - -/* - * IRQ_timeout - How long the timeout should be for each IRQ - * should be after the IRQ has been active. - */ - -static struct async_struct *IRQ_ports[NR_IRQS]; -static int IRQ_timeout[NR_IRQS]; -#ifdef CONFIG_TXX927_SERIAL_CONSOLE -static struct console sercons; -#endif -#if defined(CONFIG_TXX927_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -static unsigned long break_pressed; /* break, really ... */ -#endif - -static void change_speed(struct async_struct *info, struct termios *old); -static void rs_wait_until_sent(struct tty_struct *tty, int timeout); - -#ifndef PREPARE_FUNC -#define PREPARE_FUNC(dev) (dev->prepare) -#define ACTIVATE_FUNC(dev) (dev->activate) -#define DEACTIVATE_FUNC(dev) (dev->deactivate) -#endif - -#define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) - - -#if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT) -#define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \ - kdevname(tty->device), (info->flags), serial_refcount,info->count,tty->count,s) -#else -#define DBG_CNT(s) -#endif - -#define SERIAL_DRIVER_NAME "TXx927SIO" - -#ifdef CONFIG_SERIAL -/* "ttyS","cua" is used for standard serial driver */ -#define TXX927_TTY_NAME "ttySC" -#define TXX927_TTY_MINOR_START (64 + 16) /* ttySC0(80), ttySC1(81) */ -#define TXX927_CU_NAME "cuac" -#define TXX927_SERIAL_BH TXX927SERIAL_BH -#else -/* acts like standard serial driver */ -#define TXX927_TTY_NAME "ttyS" -#define TXX927_TTY_MINOR_START 64 -#define TXX927_CU_NAME "cua" -#define TXX927_SERIAL_BH SERIAL_BH -#endif -#define TXX927_TTY_MAJOR TTY_MAJOR -#define TXX927_TTYAUX_MAJOR TTYAUX_MAJOR - -#define ASYNC_HAVE_CTS_LINE ASYNC_BOOT_AUTOCONF /* reuse */ - -static struct serial_state rs_table[RS_TABLE_SIZE] = { - SERIAL_PORT_DFNS /* Defined in serial.h */ -}; - -#define NR_PORTS (sizeof(rs_table)/sizeof(struct serial_state)) - -static struct tty_struct *serial_table[NR_PORTS]; -static struct termios *serial_termios[NR_PORTS]; -static struct termios *serial_termios_locked[NR_PORTS]; - -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - -/* - * tmp_buf is used as a temporary buffer by serial_write. We need to - * lock it in case the copy_from_user blocks while swapping in a page, - * and some other program tries to do a serial write at the same time. - * Since the lock will only come under contention when the system is - * swapping and available memory is low, it makes sense to share one - * buffer across all the serial ports, since it significantly saves - * memory if large numbers of serial ports are open. - */ -static unsigned char *tmp_buf; -#ifdef DECLARE_MUTEX -static DECLARE_MUTEX(tmp_buf_sem); -#else -static struct semaphore tmp_buf_sem = MUTEX; -#endif - -static inline int serial_paranoia_check(struct async_struct *info, - kdev_t device, const char *routine) -{ -#ifdef SERIAL_PARANOIA_CHECK - static const char *badmagic = - "Warning: bad magic number for serial struct (%s) in %s\n"; - static const char *badinfo = - "Warning: null async_struct for (%s) in %s\n"; - - if (!info) { - printk(badinfo, kdevname(device), routine); - return 1; - } - if (info->magic != SERIAL_MAGIC) { - printk(badmagic, kdevname(device), routine); - return 1; - } -#endif - return 0; -} - -static inline struct txx927_sio_reg *sio_reg(struct async_struct *info) -{ - return (struct txx927_sio_reg *)info->port; -} - -/* - * Wait for transmitter & holding register to empty - */ -static inline void wait_for_xmitr(struct async_struct *info) -{ - unsigned int tmout = 1000000; - - do { - if (--tmout == 0) break; - } while (!(sio_reg(info)->cisr & TXx927_SICISR_TXALS)); -} - -/* - * ------------------------------------------------------------ - * rs_stop() and rs_start() - * - * This routines are called before setting or resetting tty->stopped. - * They enable or disable transmitter interrupts, as necessary. - * ------------------------------------------------------------ - */ -static void rs_stop(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_stop")) - return; - - save_flags(flags); cli(); - if (info->IER & UART_IER_THRI) { - info->IER &= ~UART_IER_THRI; - sio_reg(info)->dicr &= ~TXx927_SIDICR_TIE; - } - restore_flags(flags); -} - -static void rs_start(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_start")) - return; - - save_flags(flags); cli(); - if (info->xmit.head != info->xmit.tail - && info->xmit.buf - && !(info->IER & UART_IER_THRI)) { - info->IER |= UART_IER_THRI; - sio_reg(info)->dicr |= TXx927_SIDICR_TIE; - } - restore_flags(flags); -} - -/* - * ---------------------------------------------------------------------- - * - * Here starts the interrupt handling routines. All of the following - * subroutines are declared as inline and are folded into - * rs_interrupt(). They were separated out for readability's sake. - * - * Note: rs_interrupt() is a "fast" interrupt, which means that it - * runs with interrupts turned off. People who may want to modify - * rs_interrupt() should try to keep the interrupt handler as fast as - * possible. After you are done making modifications, it is not a bad - * idea to do: - * - * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c - * - * and look at the resulting assemble code in serial.s. - * - * - Ted Ts'o (tytso@mit.edu), 7-Mar-93 - * ----------------------------------------------------------------------- - */ - -/* - * This routine is used by the interrupt handler to schedule - * processing in the software interrupt portion of the driver. - */ -static _INLINE_ void rs_sched_event(struct async_struct *info, - int event) -{ - info->event |= 1 << event; - queue_task(&info->tqueue, &tq_serial); - mark_bh(TXX927_SERIAL_BH); -} - -static _INLINE_ void receive_chars(struct async_struct *info, - int *status) -{ - struct tty_struct *tty = info->tty; - unsigned char ch; - int ignored = 0; - struct async_icount *icount; - - icount = &info->state->icount; - do { - ch = sio_reg(info)->rfifo; - if (tty->flip.count >= TTY_FLIPBUF_SIZE) - break; - *tty->flip.char_buf_ptr = ch; - icount->rx++; - -#ifdef SERIAL_DEBUG_INTR - printk("DR%02x:%02x...", ch, *status); -#endif - *tty->flip.flag_buf_ptr = 0; - if (*status & (TXx927_SIDISR_UBRK | TXx927_SIDISR_UPER | - TXx927_SIDISR_UFER | TXx927_SIDISR_UOER)) { - /* - * For statistics only - */ - if (*status & TXx927_SIDISR_UBRK) { - *status &= ~(TXx927_SIDISR_UFER | TXx927_SIDISR_UPER); - icount->brk++; - } else if (*status & TXx927_SIDISR_UPER) - icount->parity++; - else if (*status & TXx927_SIDISR_UFER) - icount->frame++; - if (*status & TXx927_SIDISR_UOER) - icount->overrun++; - - /* - * Now check to see if character should be - * ignored, and mask off conditions which - * should be ignored. - */ - if (*status & info->ignore_status_mask) { - if (++ignored > 100) - break; - goto ignore_char; - } - *status &= info->read_status_mask; - - if (*status & (TXx927_SIDISR_UBRK)) { -#ifdef SERIAL_DEBUG_INTR - printk("handling break...."); -#endif - *tty->flip.flag_buf_ptr = TTY_BREAK; - if (info->flags & ASYNC_SAK) - do_SAK(tty); - } else if (*status & TXx927_SIDISR_UPER) - *tty->flip.flag_buf_ptr = TTY_PARITY; - else if (*status & TXx927_SIDISR_UFER) - *tty->flip.flag_buf_ptr = TTY_FRAME; - if (*status & TXx927_SIDISR_UOER) { - /* - * Overrun is special, since it's - * reported immediately, and doesn't - * affect the current character - */ - if (tty->flip.count < TTY_FLIPBUF_SIZE) { - tty->flip.count++; - tty->flip.flag_buf_ptr++; - tty->flip.char_buf_ptr++; - *tty->flip.flag_buf_ptr = TTY_OVERRUN; - } - } - } - tty->flip.flag_buf_ptr++; - tty->flip.char_buf_ptr++; - tty->flip.count++; - ignore_char: - *status = sio_reg(info)->disr; - } while (!(*status & TXx927_SIDISR_UVALID)); - - tty_flip_buffer_push(tty); -} - -static _INLINE_ void transmit_chars(struct async_struct *info, int *intr_done) -{ - int count; - - wait_for_xmitr(info); - - if (info->x_char) { - sio_reg(info)->tfifo = info->x_char; - info->state->icount.tx++; - info->x_char = 0; - if (intr_done) - *intr_done = 0; - return; - } - - if (info->xmit.head == info->xmit.tail - || info->tty->stopped - || info->tty->hw_stopped) { - sio_reg(info)->dicr &= ~TXx927_SIDICR_TIE; - return; - } - - count = info->xmit_fifo_size; - do { - sio_reg(info)->tfifo = info->xmit.buf[info->xmit.tail++]; - info->xmit.tail = info->xmit.tail & (SERIAL_XMIT_SIZE-1); - info->state->icount.tx++; - if (info->xmit.head == info->xmit.tail) - break; - } while (--count > 0); - - if (CIRC_CNT(info->xmit.head, - info->xmit.tail, - SERIAL_XMIT_SIZE) < WAKEUP_CHARS) - rs_sched_event(info, RS_EVENT_WRITE_WAKEUP); - -#ifdef SERIAL_DEBUG_INTR - printk("THRE..."); -#endif - if (intr_done) - *intr_done = 0; - - if (info->xmit.head == info->xmit.tail) { - sio_reg(info)->dicr &= ~TXx927_SIDICR_TIE; - } -} - -static _INLINE_ void check_modem_status(struct async_struct *info) -{ - /* RTS/CTS are controled by HW. (if possible) */ -} - -/* - * This is the serial driver's interrupt routine for a single port - */ -static void rs_interrupt_single(int irq, void *dev_id, struct pt_regs * regs) -{ - int status; - int pass_counter = 0; - struct async_struct * info; - -#ifdef SERIAL_DEBUG_INTR - printk("rs_interrupt_single(%d)...", irq); -#endif - - info = IRQ_ports[irq]; - if (!info || !info->tty) - return; - - do { - status = sio_reg(info)->disr; -#ifdef SERIAL_DEBUG_INTR - printk("status = %x...", status); -#endif - if (!(sio_reg(info)->dicr & TXx927_SIDICR_TIE)) - status &= ~TXx927_SIDISR_TDIS; - if (!(status & (TXx927_SIDISR_TDIS | TXx927_SIDISR_RDIS | TXx927_SIDISR_TOUT))) - break; - - if (status & TXx927_SIDISR_RDIS) - receive_chars(info, &status); - check_modem_status(info); - if (status & TXx927_SIDISR_TDIS) - transmit_chars(info, 0); - /* Clear TX/RX Int. Status */ - sio_reg(info)->disr &= ~(TXx927_SIDISR_TDIS | TXx927_SIDISR_RDIS | TXx927_SIDISR_TOUT); - - if (pass_counter++ > RS_ISR_PASS_LIMIT) { -#ifdef SERIAL_DEBUG_INTR - printk("rs_single loop break.\n"); -#endif - break; - } - } while (1); - info->last_active = jiffies; -#ifdef SERIAL_DEBUG_INTR - printk("end.\n"); -#endif -} - -/* - * ------------------------------------------------------------------- - * Here ends the serial interrupt routines. - * ------------------------------------------------------------------- - */ - -/* - * This routine is used to handle the "bottom half" processing for the - * serial driver, known also the "software interrupt" processing. - * This processing is done at the kernel interrupt level, after the - * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON. This - * is where time-consuming activities which can not be done in the - * interrupt driver proper are done; the interrupt driver schedules - * them using rs_sched_event(), and they get done here. - */ -static void do_serial_bh(void) -{ - run_task_queue(&tq_serial); -} - -static void do_softint(void *private_) -{ - struct async_struct *info = (struct async_struct *) private_; - struct tty_struct *tty; - - tty = info->tty; - if (!tty) - return; - - if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) { - if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); - wake_up_interruptible(&tty->write_wait); -#ifdef SERIAL_HAVE_POLL_WAIT - wake_up_interruptible(&tty->poll_wait); -#endif - } -} - -/* - * This subroutine is called when the RS_TIMER goes off. It is used - * by the serial driver to handle ports that do not have an interrupt - * (irq=0). This doesn't work very well for 16450's, but gives barely - * passable results for a 16550A. (Although at the expense of much - * CPU overhead). - */ -static void rs_timer(unsigned long dummy) -{ - static unsigned long last_strobe; - struct async_struct *info; - unsigned int i; - unsigned long flags; - - if ((jiffies - last_strobe) >= RS_STROBE_TIME) { - for (i=0; i < NR_IRQS; i++) { - info = IRQ_ports[i]; - if (!info) - continue; - save_flags(flags); cli(); - rs_interrupt_single(i, NULL, NULL); - restore_flags(flags); - } - } - last_strobe = jiffies; - mod_timer(&serial_timer, jiffies + RS_STROBE_TIME); - -#if 0 - if (IRQ_ports[0]) { - save_flags(flags); cli(); - rs_interrupt_single(0, NULL, NULL); - restore_flags(flags); - - mod_timer(&serial_timer, jiffies + IRQ_timeout[0]); - } -#endif -} - -/* - * --------------------------------------------------------------- - * Low level utility subroutines for the serial driver: routines to - * figure out the appropriate timeout for an interrupt chain, routines - * to initialize and startup a serial port, and routines to shutdown a - * serial port. Useful stuff like that. - * --------------------------------------------------------------- - */ - -/* - * This routine figures out the correct timeout for a particular IRQ. - * It uses the smallest timeout of all of the serial ports in a - * particular interrupt chain. Now only used for IRQ 0.... - */ -static void figure_IRQ_timeout(int irq) -{ - struct async_struct *info; - int timeout = 60*HZ; /* 60 seconds === a long time :-) */ - - info = IRQ_ports[irq]; - if (!info) { - IRQ_timeout[irq] = 60*HZ; - return; - } - while (info) { - if (info->timeout < timeout) - timeout = info->timeout; - info = info->next_port; - } - if (!irq) - timeout = timeout / 2; - IRQ_timeout[irq] = timeout ? timeout : 1; -} - -static int startup(struct async_struct * info) -{ - unsigned long flags; - int retval=0; - struct serial_state *state= info->state; - unsigned long page; - - page = get_zeroed_page(GFP_KERNEL); - if (!page) - return -ENOMEM; - - save_flags(flags); cli(); - - if (info->flags & ASYNC_INITIALIZED) { - free_page(page); - goto errout; - } - - if (!state->port) { - if (info->tty) - set_bit(TTY_IO_ERROR, &info->tty->flags); - free_page(page); - goto errout; - } - if (info->xmit.buf) - free_page(page); - else - info->xmit.buf = (unsigned char *) page; - -#ifdef SERIAL_DEBUG_OPEN - printk("starting up ttys%d (irq %d)...", info->line, state->irq); -#endif - - /* - * Clear the FIFO buffers and disable them - * (they will be reenabled in change_speed()) - */ - sio_reg(info)->fcr |= TXx927_SIFCR_TFRST | TXx927_SIFCR_RFRST | - TXx927_SIFCR_FRSTE; - /* clear reset */ - sio_reg(info)->fcr &= ~(TXx927_SIFCR_TFRST | TXx927_SIFCR_RFRST | - TXx927_SIFCR_FRSTE); - - /* - * Allocate the IRQ if necessary - */ - if (state->irq && (!IRQ_ports[state->irq] || - !IRQ_ports[state->irq]->next_port)) { - if (IRQ_ports[state->irq]) { - retval = -EBUSY; - goto errout; - } - - retval = request_irq(state->irq, rs_interrupt_single, - SA_INTERRUPT, - "txx927serial", NULL); - if (retval) { - if (capable(CAP_SYS_ADMIN)) { - if (info->tty) - set_bit(TTY_IO_ERROR, - &info->tty->flags); - retval = 0; - } - goto errout; - } - } - - /* - * Insert serial port into IRQ chain. - */ - info->prev_port = 0; - info->next_port = IRQ_ports[state->irq]; - if (info->next_port) - info->next_port->prev_port = info; - IRQ_ports[state->irq] = info; - figure_IRQ_timeout(state->irq); - - /* - * Clear the interrupt registers. - */ - sio_reg(info)->disr = 0; - - /* - * Now, initialize the UART - */ - /* HW RTS/CTS control */ - if (state->flags & ASYNC_HAVE_CTS_LINE) - sio_reg(info)->flcr = TXx927_SIFLCR_RCS | TXx927_SIFLCR_TES | - TXx927_SIFLCR_RTSTL_MAX /* 15 */; - /* Enable RX/TX */ - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RSDE | TXx927_SIFLCR_TSDE); - - /* - * Finally, enable interrupts - */ - sio_reg(info)->dicr = TXx927_SIDICR_RIE; - - if (info->tty) - clear_bit(TTY_IO_ERROR, &info->tty->flags); - info->xmit.head = info->xmit.tail = 0; - - /* - * Set up the tty->alt_speed kludge - */ - if (info->tty) { - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI) - info->tty->alt_speed = 57600; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI) - info->tty->alt_speed = 115200; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI) - info->tty->alt_speed = 230400; - if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) - info->tty->alt_speed = 460800; - } - - /* - * and set the speed of the serial port - */ - change_speed(info, 0); - - info->flags |= ASYNC_INITIALIZED; - restore_flags(flags); - return 0; - -errout: - restore_flags(flags); - return retval; -} - -/* - * This routine will shutdown a serial port; interrupts are disabled, and - * DTR is dropped if the hangup on close termio flag is on. - */ -static void shutdown(struct async_struct * info) -{ - unsigned long flags; - struct serial_state *state; - int retval; - - if (!(info->flags & ASYNC_INITIALIZED)) - return; - - state = info->state; - -#ifdef SERIAL_DEBUG_OPEN - printk("Shutting down serial port %d (irq %d)....", info->line, - state->irq); -#endif - - save_flags(flags); cli(); /* Disable interrupts */ - - /* - * First unlink the serial port from the IRQ chain... - */ - if (info->next_port) - info->next_port->prev_port = info->prev_port; - if (info->prev_port) - info->prev_port->next_port = info->next_port; - else - IRQ_ports[state->irq] = info->next_port; - figure_IRQ_timeout(state->irq); - - /* - * Free the IRQ, if necessary - */ - if (state->irq && (!IRQ_ports[state->irq] || - !IRQ_ports[state->irq]->next_port)) { - if (IRQ_ports[state->irq]) { - free_irq(state->irq, NULL); - retval = request_irq(state->irq, rs_interrupt_single, - SA_INTERRUPT, "txx927serial", NULL); - - if (retval) - printk(KERN_WARNING "txx927serial shutdown: request_irq: error %d" - " Couldn't reacquire IRQ.\n", retval); - } else - free_irq(state->irq, NULL); - } - - if (info->xmit.buf) { - free_page((unsigned long) info->xmit.buf); - info->xmit.buf = 0; - } - - sio_reg(info)->dicr = 0; /* disable all intrs */ - - /* disable break condition */ - sio_reg(info)->flcr &= ~TXx927_SIFLCR_TBRK; - - if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) { - /* drop RTS */ - sio_reg(info)->flcr |= TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE; - /* TXx927-SIO can not control DTR... */ - } - - /* reset FIFO's */ - sio_reg(info)->fcr |= TXx927_SIFCR_TFRST | TXx927_SIFCR_RFRST | - TXx927_SIFCR_FRSTE; - /* clear reset */ - sio_reg(info)->fcr &= ~(TXx927_SIFCR_TFRST | TXx927_SIFCR_RFRST | - TXx927_SIFCR_FRSTE); - - /* DON'T disable Rx/Tx here, ie. DON'T set either - * TXx927_SIFLCR_RSDE or TXx927_SIFLCR_TSDE in flcr - */ - - if (info->tty) - set_bit(TTY_IO_ERROR, &info->tty->flags); - - info->flags &= ~ASYNC_INITIALIZED; - restore_flags(flags); -} - -/* - * This routine is called to set the UART divisor registers to match - * the specified baud rate for a serial port. - */ -static void change_speed(struct async_struct *info, - struct termios *old_termios) -{ - int quot = 0, baud_base, baud; - unsigned cflag, cval; - int bits; - unsigned long flags; - - if (!info->tty || !info->tty->termios) - return; - cflag = info->tty->termios->c_cflag; - if (!info->port) - return; - - cval = sio_reg(info)->lcr; - /* byte size and parity */ - cval &= ~TXx927_SILCR_UMODE_MASK; - switch (cflag & CSIZE) { - case CS7: - cval |= TXx927_SILCR_UMODE_7BIT; - bits = 9; - break; - case CS5: /* not supported */ - case CS6: /* not supported */ - case CS8: - default: - cval |= TXx927_SILCR_UMODE_8BIT; - bits = 10; - break; - } - cval &= ~TXx927_SILCR_USBL_MASK; - if (cflag & CSTOPB) { - cval |= TXx927_SILCR_USBL_2BIT; - bits++; - } else { - cval |= TXx927_SILCR_USBL_1BIT; - } - - cval &= ~(TXx927_SILCR_UPEN|TXx927_SILCR_UEPS); - if (cflag & PARENB) { - cval |= TXx927_SILCR_UPEN; - bits++; - } - if (!(cflag & PARODD)) - cval |= TXx927_SILCR_UEPS; - - /* Determine divisor based on baud rate */ - baud = tty_get_baud_rate(info->tty); - if (!baud) - baud = 9600; /* B0 transition handled in rs_set_termios */ - baud_base = info->state->baud_base; - quot = (baud_base + baud / 2) / baud; - /* If the quotient is zero refuse the change */ - if (!quot && old_termios) { - info->tty->termios->c_cflag &= ~CBAUD; - info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD); - baud = tty_get_baud_rate(info->tty); - if (!baud) - baud = 9600; - quot = (baud_base + baud / 2) / baud; - } - /* As a last resort, if the quotient is zero, default to 9600 bps */ - if (!quot) - quot = (baud_base + 9600 / 2) / 9600; - info->quot = quot; - info->timeout = ((info->xmit_fifo_size*HZ*bits*quot) / baud_base); - info->timeout += HZ/50; /* Add .02 seconds of slop */ - - /* CTS flow control flag */ - if (cflag & CRTSCTS) { - info->flags |= ASYNC_CTS_FLOW; - if (info->state->flags & ASYNC_HAVE_CTS_LINE) - sio_reg(info)->flcr = TXx927_SIFLCR_RCS | TXx927_SIFLCR_TES | - TXx927_SIFLCR_RTSTL_MAX /* 15 */; - } else { - info->flags &= ~ASYNC_CTS_FLOW; - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RCS | TXx927_SIFLCR_TES | TXx927_SIFLCR_RSDE | TXx927_SIFLCR_TSDE); - } - - /* - * Set up parity check flag - */ -#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) - - info->read_status_mask = TXx927_SIDISR_UOER | - TXx927_SIDISR_TDIS | TXx927_SIDISR_RDIS; - if (I_INPCK(info->tty)) - info->read_status_mask |= TXx927_SIDISR_UFER | TXx927_SIDISR_UPER; - if (I_BRKINT(info->tty) || I_PARMRK(info->tty)) - info->read_status_mask |= TXx927_SIDISR_UBRK; - - /* - * Characters to ignore - */ - info->ignore_status_mask = 0; - if (I_IGNPAR(info->tty)) - info->ignore_status_mask |= TXx927_SIDISR_UPER | TXx927_SIDISR_UFER; - if (I_IGNBRK(info->tty)) { - info->ignore_status_mask |= TXx927_SIDISR_UBRK; - /* - * If we're ignore parity and break indicators, ignore - * overruns too. (For real raw support). - */ - if (I_IGNPAR(info->tty)) - info->ignore_status_mask |= TXx927_SIDISR_UOER; - } - /* - * !!! ignore all characters if CREAD is not set - */ - if ((cflag & CREAD) == 0) - info->ignore_status_mask |= TXx927_SIDISR_RDIS; - save_flags(flags); cli(); - sio_reg(info)->lcr = cval | TXx927_SILCR_SCS_IMCLK_BG; - sio_reg(info)->bgr = quot | TXx927_SIBGR_BCLK_T0; - restore_flags(flags); -} - -static void rs_put_char(struct tty_struct *tty, unsigned char ch) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_put_char")) - return; - - if (!tty || !info->xmit.buf) - return; - - save_flags(flags); cli(); - if (CIRC_SPACE(info->xmit.head, - info->xmit.tail, - SERIAL_XMIT_SIZE) == 0) { - restore_flags(flags); - return; - } - - info->xmit.buf[info->xmit.head++] = ch; - info->xmit.head &= SERIAL_XMIT_SIZE-1; - restore_flags(flags); -} - -static void rs_flush_chars(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_flush_chars")) - return; - - if (info->xmit.head == info->xmit.tail - || tty->stopped - || tty->hw_stopped - || !info->xmit.buf) - return; - - save_flags(flags); cli(); - sio_reg(info)->dicr |= TXx927_SIDICR_TIE; - restore_flags(flags); -} - -static int rs_write(struct tty_struct * tty, int from_user, - const unsigned char *buf, int count) -{ - int c, ret = 0; - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_write")) - return 0; - - if (!tty || !info->xmit.buf || !tmp_buf) - return 0; - - save_flags(flags); - - if (from_user) { - down(&tmp_buf_sem); - while (1) { - int c1; - c = CIRC_SPACE_TO_END(info->xmit.head, - info->xmit.tail, - SERIAL_XMIT_SIZE); - - if (count < c) - c = count; - if (c <= 0) - break; - - c -= copy_from_user(tmp_buf, buf, c); - if (!c) { - if (!ret) - ret = -EFAULT; - break; - } - cli(); - c1 = CIRC_SPACE_TO_END(info->xmit.head, - info->xmit.tail, - SERIAL_XMIT_SIZE); - - if (c1 < c) - c = c1; - memcpy(info->xmit.buf + info->xmit.head, tmp_buf, c); - info->xmit.head = ((info->xmit.head + c) & - (SERIAL_XMIT_SIZE-1)); - restore_flags(flags); - buf += c; - count -= c; - ret += c; - } - up(&tmp_buf_sem); - } else { - cli(); - while (1) { - c = CIRC_SPACE_TO_END(info->xmit.head, - info->xmit.tail, - SERIAL_XMIT_SIZE); - - if (count < c) - c = count; - if (c <= 0) { - break; - } - memcpy(info->xmit.buf + info->xmit.head, buf, c); - info->xmit.head = ((info->xmit.head + c) & - (SERIAL_XMIT_SIZE-1)); - buf += c; - count -= c; - ret += c; - } - restore_flags(flags); - } - if (info->xmit.head != info->xmit.tail - && !tty->stopped - && !tty->hw_stopped - && !(info->IER & UART_IER_THRI)) - sio_reg(info)->dicr |= TXx927_SIDICR_TIE; - - return ret; -} - -static int rs_write_room(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - - if (serial_paranoia_check(info, tty->device, "rs_write_room")) - return 0; - - return CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); -} - -static int rs_chars_in_buffer(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - - if (serial_paranoia_check(info, tty->device, "rs_chars_in_buffer")) - return 0; - - return CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE); -} - -static void rs_flush_buffer(struct tty_struct *tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_flush_buffer")) - return; - save_flags(flags); cli(); - info->xmit.head = info->xmit.tail = 0; - restore_flags(flags); - wake_up_interruptible(&tty->write_wait); -#ifdef SERIAL_HAVE_POLL_WAIT - wake_up_interruptible(&tty->poll_wait); -#endif - if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && - tty->ldisc.write_wakeup) - (tty->ldisc.write_wakeup)(tty); -} - -/* - * This function is used to send a high-priority XON/XOFF character to - * the device - */ -static void rs_send_xchar(struct tty_struct *tty, char ch) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - - - if (serial_paranoia_check(info, tty->device, "rs_send_char")) - return; - - info->x_char = ch; - if (ch) { - /* Make sure transmit interrupts are on */ - sio_reg(info)->dicr |= TXx927_SIDICR_TIE; - } -} - -/* - * ------------------------------------------------------------ - * rs_throttle() - * - * This routine is called by the upper-layer tty layer to signal that - * incoming characters should be throttled. - * ------------------------------------------------------------ - */ -static void rs_throttle(struct tty_struct * tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; -#ifdef SERIAL_DEBUG_THROTTLE - char buf[64]; - - printk("throttle %s: %d....\n", tty_name(tty, buf), - tty->ldisc.chars_in_buffer(tty)); -#endif - - if (serial_paranoia_check(info, tty->device, "rs_throttle")) - return; - - if (I_IXOFF(tty)) - rs_send_xchar(tty, STOP_CHAR(tty)); - - if (tty->termios->c_cflag & CRTSCTS) { - save_flags(flags); cli(); - /* drop RTS */ - sio_reg(info)->flcr |= TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE; - restore_flags(flags); - } -} - -static void rs_unthrottle(struct tty_struct * tty) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; -#ifdef SERIAL_DEBUG_THROTTLE - char buf[64]; - - printk("unthrottle %s: %d....\n", tty_name(tty, buf), - tty->ldisc.chars_in_buffer(tty)); -#endif - - if (serial_paranoia_check(info, tty->device, "rs_unthrottle")) - return; - - if (I_IXOFF(tty)) { - if (info->x_char) - info->x_char = 0; - else - rs_send_xchar(tty, START_CHAR(tty)); - } - if (tty->termios->c_cflag & CRTSCTS) { - save_flags(flags); cli(); - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE); - restore_flags(flags); - } -} - -/* - * ------------------------------------------------------------ - * rs_ioctl() and friends - * ------------------------------------------------------------ - */ - -static int get_modem_info(struct async_struct * info, unsigned int *value) -{ - unsigned int result; - unsigned long flags; - - save_flags(flags); cli(); - result = ((sio_reg(info)->flcr & TXx927_SIFLCR_RTSSC) ? 0 : TIOCM_RTS) - | ((sio_reg(info)->cisr & TXx927_SICISR_CTSS) ? 0 : TIOCM_CTS); - restore_flags(flags); - return put_user(result,value); -} - -static int set_modem_info(struct async_struct * info, unsigned int cmd, - unsigned int *value) -{ - int error; - unsigned int arg; - unsigned long flags; - - error = get_user(arg, value); - if (error) - return error; - save_flags(flags); cli(); - switch (cmd) { - case TIOCMBIS: - if (arg & TIOCM_RTS) - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE); - break; - case TIOCMBIC: - if (arg & TIOCM_RTS) - sio_reg(info)->flcr |= TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE; - break; - case TIOCMSET: - sio_reg(info)->flcr = - (sio_reg(info)->flcr & ~(TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE)) | - ((arg & TIOCM_RTS) ? 0 : TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE); - break; - default: - error = -EINVAL; - } - restore_flags(flags); - return error; -} - -/* - * rs_break() --- routine which turns the break handling on or off - */ -static void rs_break(struct tty_struct *tty, int break_state) -{ - struct async_struct * info = (struct async_struct *)tty->driver_data; - unsigned long flags; - - if (serial_paranoia_check(info, tty->device, "rs_break")) - return; - - if (!info->port) - return; - save_flags(flags); cli(); - if (break_state == -1) - sio_reg(info)->flcr |= TXx927_SIFLCR_TBRK; - else - sio_reg(info)->flcr &= ~TXx927_SIFLCR_TBRK; - restore_flags(flags); -} - -static int rs_ioctl(struct tty_struct *tty, struct file * file, - unsigned int cmd, unsigned long arg) -{ - struct async_struct * info = (struct async_struct *)tty->driver_data; - - if (serial_paranoia_check(info, tty->device, "rs_ioctl")) - return -ENODEV; - - if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) && - (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) && - (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) { - if (tty->flags & (1 << TTY_IO_ERROR)) - return -EIO; - } - - switch (cmd) { - case TIOCMGET: - return get_modem_info(info, (unsigned int *) arg); - case TIOCMBIS: - case TIOCMBIC: - case TIOCMSET: - return set_modem_info(info, cmd, (unsigned int *) arg); - return 0; - case TIOCGSERIAL: - printk("TIOCGSERIAL\n"); - return 0; - case TIOCSSERIAL: - printk("TIOCSSERIAL\n"); - return 0; - case TIOCSERCONFIG: - printk("TIOCSERCONFIG\n"); - return 0; - - case TIOCSERGETLSR: /* Get line status register */ - printk("TIOCSERGETLSR\n"); - return 0; - - case TIOCSERGSTRUCT: - printk("TIOCSERGSTRUCT\n"); - return 0; - - /* - * Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change - * - mask passed in arg for lines of interest - * (use |'ed TIOCM_RNG/DSR/CD/CTS for masking) - * Caller should use TIOCGICOUNT to see which one it was - */ - case TIOCMIWAIT: - printk("TIOCMIWAIT\n"); - return 0; - - /* - * Get counter of input serial line interrupts (DCD,RI,DSR,CTS) - * Return: write counters to the user passed counter struct - * NB: both 1->0 and 0->1 transitions are counted except for - * RI where only 0->1 is counted. - */ - case TIOCGICOUNT: - printk("TIOCGICOUNT\n"); - return 0; - - case TIOCSERGWILD: - case TIOCSERSWILD: - /* "setserial -W" is called in Debian boot */ - printk ("TIOCSER?WILD ioctl obsolete, ignored.\n"); - return 0; - - default: - return -ENOIOCTLCMD; - } - return 0; -} - -static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios) -{ - struct async_struct *info = (struct async_struct *)tty->driver_data; - unsigned long flags; - unsigned int cflag = tty->termios->c_cflag; - - if ( (cflag == old_termios->c_cflag) - && ( RELEVANT_IFLAG(tty->termios->c_iflag) - == RELEVANT_IFLAG(old_termios->c_iflag))) - return; - - change_speed(info, old_termios); - - /* Handle transition to B0 status */ - if ((old_termios->c_cflag & CBAUD) && - !(cflag & CBAUD)) { - save_flags(flags); cli(); - sio_reg(info)->flcr |= TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE; - restore_flags(flags); - } - - /* Handle transition away from B0 status */ - if (!(old_termios->c_cflag & CBAUD) && - (cflag & CBAUD)) { - if (!(tty->termios->c_cflag & CRTSCTS) || - !test_bit(TTY_THROTTLED, &tty->flags)) { - save_flags(flags); cli(); - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE); - restore_flags(flags); - } - } - - /* Handle turning off CRTSCTS */ - if ((old_termios->c_cflag & CRTSCTS) && - !(tty->termios->c_cflag & CRTSCTS)) { - tty->hw_stopped = 0; - rs_start(tty); - } -} - -/* - * ------------------------------------------------------------ - * rs_close() - * - * This routine is called when the serial port gets closed. First, we - * wait for the last remaining data to be sent. Then, we unlink its - * async structure from the interrupt chain if necessary, and we free - * that IRQ if nothing is left in the chain. - * ------------------------------------------------------------ - */ -static void rs_close(struct tty_struct *tty, struct file * filp) -{ - struct async_struct * info = (struct async_struct *)tty->driver_data; - struct serial_state *state; - unsigned long flags; - - if (!info || serial_paranoia_check(info, tty->device, "rs_close")) - return; - - state = info->state; - - save_flags(flags); cli(); - - if (tty_hung_up_p(filp)) { - restore_flags(flags); - return; - } - -#ifdef SERIAL_DEBUG_OPEN - printk("rs_close ttys%d, count = %d\n", info->line, state->count); -#endif - if ((tty->count == 1) && (state->count != 1)) { - /* - * Uh, oh. tty->count is 1, which means that the tty - * structure will be freed. state->count should always - * be one in these conditions. If it's greater than - * one, we've got real problems, since it means the - * serial port won't be shutdown. - */ - printk(KERN_WARNING "rs_close: bad serial port count; tty->count is 1, " - "state->count is %d\n", state->count); - state->count = 1; - } - if (--state->count < 0) { - printk(KERN_WARNING "rs_close: bad serial port count for ttys%d: %d\n", - info->line, state->count); - state->count = 0; - } - if (state->count) { - restore_flags(flags); - return; - } - info->flags |= ASYNC_CLOSING; - /* - * Save the termios structure, since this port may have - * separate termios for callout and dialin. - */ - if (info->flags & ASYNC_NORMAL_ACTIVE) - info->state->normal_termios = *tty->termios; - if (info->flags & ASYNC_CALLOUT_ACTIVE) - info->state->callout_termios = *tty->termios; - /* - * Now we wait for the transmit buffer to clear; and we notify - * the line discipline to only process XON/XOFF characters. - */ - tty->closing = 1; - if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) - tty_wait_until_sent(tty, info->closing_wait); - /* - * At this point we stop accepting input. To do this, we - * disable the receive line status interrupts, and tell the - * interrupt driver to stop checking the data ready bit in the - * line status register. - */ - info->read_status_mask &= ~TXx927_SIDISR_RDIS; - if (info->flags & ASYNC_INITIALIZED) { -#if 0 - sio_reg(info)->dicr &= ~TXx927_SIDICR_RIE; -#endif - /* - * Before we drop DTR, make sure the UART transmitter - * has completely drained; this is especially - * important if there is a transmit FIFO! - */ - rs_wait_until_sent(tty, info->timeout); - } - shutdown(info); - if (tty->driver.flush_buffer) - tty->driver.flush_buffer(tty); - if (tty->ldisc.flush_buffer) - tty->ldisc.flush_buffer(tty); - tty->closing = 0; - info->event = 0; - info->tty = 0; - if (info->blocked_open) { - if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(info->close_delay); - } - wake_up_interruptible(&info->open_wait); - } - info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CALLOUT_ACTIVE| - ASYNC_CLOSING); - wake_up_interruptible(&info->close_wait); - restore_flags(flags); -} - -/* - * rs_wait_until_sent() --- wait until the transmitter is empty - */ -static void rs_wait_until_sent(struct tty_struct *tty, int timeout) -{ - struct async_struct * info = (struct async_struct *)tty->driver_data; - unsigned long orig_jiffies, char_time; - int cisr; - - if (serial_paranoia_check(info, tty->device, "rs_wait_until_sent")) - return; - - if (info->xmit_fifo_size == 0) - return; /* Just in case.... */ - - orig_jiffies = jiffies; - /* - * Set the check interval to be 1/5 of the estimated time to - * send a single character, and make it at least 1. The check - * interval should also be less than the timeout. - * - * Note: we have to use pretty tight timings here to satisfy - * the NIST-PCTS. - */ - char_time = (info->timeout - HZ/50) / info->xmit_fifo_size; - char_time = char_time / 5; - if (char_time == 0) - char_time = 1; - if (timeout) - char_time = MIN(char_time, timeout); - /* - * If the transmitter hasn't cleared in twice the approximate - * amount of time to send the entire FIFO, it probably won't - * ever clear. This assumes the UART isn't doing flow - * control, which is currently the case. Hence, if it ever - * takes longer than info->timeout, this is probably due to a - * UART bug of some kind. So, we clamp the timeout parameter at - * 2*info->timeout. - */ - if (!timeout || timeout > 2*info->timeout) - timeout = 2*info->timeout; -#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT - printk("In rs_wait_until_sent(%d) check=%lu...", timeout, char_time); - printk("jiff=%lu...", jiffies); -#endif - while (!((cisr = sio_reg(info)->cisr) & TXx927_SICISR_TXALS)) { -#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT - printk("cisr = %d (jiff=%lu)...", cisr, jiffies); -#endif - __set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(char_time); - if (signal_pending(current)) - break; - if (timeout && time_after(jiffies, orig_jiffies + timeout)) - break; - } - current->state = TASK_RUNNING; -#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT - printk("cisr = %d (jiff=%lu)...done\n", cisr, jiffies); -#endif -} - -/* - * rs_hangup() --- called by tty_hangup() when a hangup is signaled. - */ -static void rs_hangup(struct tty_struct *tty) -{ - struct async_struct * info = (struct async_struct *)tty->driver_data; - struct serial_state *state = info->state; - - if (serial_paranoia_check(info, tty->device, "rs_hangup")) - return; - - state = info->state; - - rs_flush_buffer(tty); - shutdown(info); - info->event = 0; - state->count = 0; - info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CALLOUT_ACTIVE); - info->tty = 0; - wake_up_interruptible(&info->open_wait); -} - -/* - * ------------------------------------------------------------ - * rs_open() and friends - * ------------------------------------------------------------ - */ -static int block_til_ready(struct tty_struct *tty, struct file * filp, - struct async_struct *info) -{ - DECLARE_WAITQUEUE(wait, current); - struct serial_state *state = info->state; - int retval; - int do_clocal = 0, extra_count = 0; - unsigned long flags; - - /* - * If the device is in the middle of being closed, then block - * until it's done, and then try again. - */ - if (tty_hung_up_p(filp) || - (info->flags & ASYNC_CLOSING)) { - if (info->flags & ASYNC_CLOSING) - interruptible_sleep_on(&info->close_wait); -#ifdef SERIAL_DO_RESTART - return ((info->flags & ASYNC_HUP_NOTIFY) ? - -EAGAIN : -ERESTARTSYS); -#else - return -EAGAIN; -#endif - } - - /* - * If this is a callout device, then just make sure the normal - * device isn't being used. - */ - if (tty->driver.subtype == SERIAL_TYPE_CALLOUT) { - if (info->flags & ASYNC_NORMAL_ACTIVE) - return -EBUSY; - if ((info->flags & ASYNC_CALLOUT_ACTIVE) && - (info->flags & ASYNC_SESSION_LOCKOUT) && - (info->session != current->session)) - return -EBUSY; - if ((info->flags & ASYNC_CALLOUT_ACTIVE) && - (info->flags & ASYNC_PGRP_LOCKOUT) && - (info->pgrp != current->pgrp)) - return -EBUSY; - info->flags |= ASYNC_CALLOUT_ACTIVE; - return 0; - } - - /* - * If non-blocking mode is set, or the port is not enabled, - * then make the check up front and then exit. - */ - if ((filp->f_flags & O_NONBLOCK) || - (tty->flags & (1 << TTY_IO_ERROR))) { - if (info->flags & ASYNC_CALLOUT_ACTIVE) - return -EBUSY; - info->flags |= ASYNC_NORMAL_ACTIVE; - return 0; - } - - if (info->flags & ASYNC_CALLOUT_ACTIVE) { - if (state->normal_termios.c_cflag & CLOCAL) - do_clocal = 1; - } else { - if (tty->termios->c_cflag & CLOCAL) - do_clocal = 1; - } - - /* - * Block waiting for the carrier detect and the line to become - * free (i.e., not in use by the callout). While we are in - * this loop, state->count is dropped by one, so that - * rs_close() knows when to free things. We restore it upon - * exit, either normal or abnormal. - */ - retval = 0; - add_wait_queue(&info->open_wait, &wait); -#ifdef SERIAL_DEBUG_OPEN - printk("block_til_ready before block: ttys%d, count = %d\n", - state->line, state->count); -#endif - save_flags(flags); cli(); - if (!tty_hung_up_p(filp)) { - extra_count = 1; - state->count--; - } - restore_flags(flags); - info->blocked_open++; - while (1) { - save_flags(flags); cli(); - if (!(info->flags & ASYNC_CALLOUT_ACTIVE) && - (tty->termios->c_cflag & CBAUD)) - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RTSSC|TXx927_SIFLCR_RSDE); - restore_flags(flags); - current->state = TASK_INTERRUPTIBLE; - if (tty_hung_up_p(filp) || - !(info->flags & ASYNC_INITIALIZED)) { -#ifdef SERIAL_DO_RESTART - if (info->flags & ASYNC_HUP_NOTIFY) - retval = -EAGAIN; - else - retval = -ERESTARTSYS; -#else - retval = -EAGAIN; -#endif - break; - } - if (!(info->flags & ASYNC_CALLOUT_ACTIVE) && - !(info->flags & ASYNC_CLOSING)) - break; - if (signal_pending(current)) { - retval = -ERESTARTSYS; - break; - } -#ifdef SERIAL_DEBUG_OPEN - printk("block_til_ready blocking: ttys%d, count = %d\n", - info->line, state->count); -#endif - schedule(); - } - current->state = TASK_RUNNING; - remove_wait_queue(&info->open_wait, &wait); - if (extra_count) - state->count++; - info->blocked_open--; -#ifdef SERIAL_DEBUG_OPEN - printk("block_til_ready after blocking: ttys%d, count = %d\n", - info->line, state->count); -#endif - if (retval) - return retval; - info->flags |= ASYNC_NORMAL_ACTIVE; - return 0; -} - -static int get_async_struct(int line, struct async_struct **ret_info) -{ - struct async_struct *info; - struct serial_state *sstate; - -#ifdef REMOTE_DEBUG - if (kdb_port_info.state && line == kdb_port_info.line) - return -ENODEV; -#endif - sstate = rs_table + line; - sstate->count++; - if (sstate->info) { - *ret_info = sstate->info; - return 0; - } - info = kmalloc(sizeof(struct async_struct), GFP_KERNEL); - if (!info) { - sstate->count--; - return -ENOMEM; - } - memset(info, 0, sizeof(struct async_struct)); - init_waitqueue_head(&info->open_wait); - init_waitqueue_head(&info->close_wait); - init_waitqueue_head(&info->delta_msr_wait); - info->magic = SERIAL_MAGIC; - info->port = sstate->port; - info->flags = sstate->flags; - info->io_type = sstate->io_type; - info->xmit_fifo_size = sstate->xmit_fifo_size; - info->line = line; - info->tqueue.routine = do_softint; - info->tqueue.data = info; - info->state = sstate; - if (sstate->info) { - kfree(info); - *ret_info = sstate->info; - return 0; - } - *ret_info = sstate->info = info; - return 0; -} - -/* - * This routine is called whenever a serial port is opened. It - * enables interrupts for a serial port, linking in its async structure into - * the IRQ chain. It also performs the serial-specific - * initialization for the tty structure. - */ -static int rs_open(struct tty_struct *tty, struct file * filp) -{ - struct async_struct *info; - int retval, line; - unsigned long page; - - line = minor(tty->device) - tty->driver.minor_start; - if ((line < 0) || (line >= NR_PORTS)) { - return -ENODEV; - } - retval = get_async_struct(line, &info); - if (retval) { - return retval; - } - tty->driver_data = info; - info->tty = tty; - -#ifdef SERIAL_DEBUG_OPEN - printk("rs_open %s%d, count = %d\n", tty->driver.name, info->line, - info->state->count); -#endif - info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0; - - if (!tmp_buf) { - page = get_free_page(GFP_KERNEL); - if (!page) { - return -ENOMEM; - } - if (tmp_buf) - free_page(page); - else - tmp_buf = (unsigned char *) page; - } - - /* - * If the port is the middle of closing, bail out now - */ - if (tty_hung_up_p(filp) || - (info->flags & ASYNC_CLOSING)) { - if (info->flags & ASYNC_CLOSING) - interruptible_sleep_on(&info->close_wait); -#ifdef SERIAL_DO_RESTART - return ((info->flags & ASYNC_HUP_NOTIFY) ? - -EAGAIN : -ERESTARTSYS); -#else - return -EAGAIN; -#endif - } - - /* - * Start up serial port - */ - retval = startup(info); - if (retval) { - return retval; - } - - retval = block_til_ready(tty, filp, info); - if (retval) { -#ifdef SERIAL_DEBUG_OPEN - printk("rs_open returning after block_til_ready with %d\n", - retval); -#endif - return retval; - } - - if ((info->state->count == 1) && - (info->flags & ASYNC_SPLIT_TERMIOS)) { - if (tty->driver.subtype == SERIAL_TYPE_NORMAL) - *tty->termios = info->state->normal_termios; - else - *tty->termios = info->state->callout_termios; - change_speed(info, 0); - } -#ifdef CONFIG_TXX927_SERIAL_CONSOLE - if (sercons.cflag && sercons.index == line) { - tty->termios->c_cflag = sercons.cflag; - sercons.cflag = 0; - change_speed(info, 0); - } -#endif - info->session = current->session; - info->pgrp = current->pgrp; - -#ifdef SERIAL_DEBUG_OPEN - printk("rs_open ttys%d successful...", info->line); -#endif - return 0; -} - -/* - * /proc fs routines.... - */ - -static inline int line_info(char *buf, struct serial_state *state) -{ - struct async_struct *info = state->info, scr_info; - char stat_buf[30]; - int ret; - unsigned long flags; - - ret = sprintf(buf, "%d: uart:%s port:%lX irq:%d", - state->line, SERIAL_DRIVER_NAME, - state->port, state->irq); - - if (!state->port) { - ret += sprintf(buf+ret, "\n"); - return ret; - } - - /* - * Figure out the current RS-232 lines - */ - if (!info) { - info = &scr_info; /* This is just for serial_{in,out} */ - - info->magic = SERIAL_MAGIC; - info->port = state->port; - info->flags = state->flags; - info->quot = 0; - info->tty = 0; - } - - stat_buf[0] = 0; - stat_buf[1] = 0; - save_flags(flags); cli(); - if (!(sio_reg(info)->flcr & TXx927_SIFLCR_RTSSC)) - strcat(stat_buf, "|RTS"); - if (!(sio_reg(info)->cisr & TXx927_SICISR_CTSS)) - strcat(stat_buf, "|CTS"); - restore_flags(flags); - - if (info->quot) { - ret += sprintf(buf+ret, " baud:%d", - state->baud_base / info->quot); - } - - ret += sprintf(buf+ret, " tx:%d rx:%d", - state->icount.tx, state->icount.rx); - - if (state->icount.frame) - ret += sprintf(buf+ret, " fe:%d", state->icount.frame); - - if (state->icount.parity) - ret += sprintf(buf+ret, " pe:%d", state->icount.parity); - - if (state->icount.brk) - ret += sprintf(buf+ret, " brk:%d", state->icount.brk); - - if (state->icount.overrun) - ret += sprintf(buf+ret, " oe:%d", state->icount.overrun); - - /* - * Last thing is the RS-232 status lines - */ - ret += sprintf(buf+ret, " %s\n", stat_buf+1); - return ret; -} - -static int rs_read_proc(char *page, char **start, off_t off, int count, - int *eof, void *data) -{ - int i, len = 0, l; - off_t begin = 0; - - len += sprintf(page, "serinfo:1.0 driver:%s\n", serial_version); - for (i = 0; i < NR_PORTS && len < 4000; i++) { - l = line_info(page + len, &rs_table[i]); - len += l; - if (len+begin > off+count) - goto done; - if (len+begin < off) { - begin += len; - len = 0; - } - } - *eof = 1; -done: - if (off >= len+begin) - return 0; - *start = page + (begin-off); - return ((count < begin+len-off) ? count : begin+len-off); -} - -/* - * --------------------------------------------------------------------- - * rs_init() and friends - * - * rs_init() is called at boot-time to initialize the serial driver. - * --------------------------------------------------------------------- - */ - -/* - * This routine prints out the appropriate serial driver version - * number, and identifies which options were configured into this - * driver. - */ -static _INLINE_ void show_serial_version(void) -{ - printk(KERN_INFO "%s version %s\n", serial_name, serial_version); -} - -/* - * The serial driver boot-time initialization code! - */ -static int __init rs_init(void) -{ - int i; - struct serial_state * state; - - if (rs_table[0].port == 0) - return -ENODEV; - - init_bh(TXX927_SERIAL_BH, do_serial_bh); - init_timer(&serial_timer); - serial_timer.function = rs_timer; - mod_timer(&serial_timer, jiffies + RS_STROBE_TIME); - - for (i = 0; i < NR_IRQS; i++) { - IRQ_ports[i] = 0; - IRQ_timeout[i] = 0; - } -#ifdef CONFIG_TXX927_SERIAL_CONSOLE - /* - * The interrupt of the serial console port - * can't be shared. - */ - if (sercons.flags & CON_CONSDEV) { - for(i = 0; i < NR_PORTS; i++) - if (i != sercons.index && - rs_table[i].irq == rs_table[sercons.index].irq) - rs_table[i].irq = 0; - } -#endif - show_serial_version(); - - /* Initialize the tty_driver structure */ - - memset(&serial_driver, 0, sizeof(struct tty_driver)); - serial_driver.magic = TTY_DRIVER_MAGIC; - serial_driver.driver_name = "txx927serial"; -#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - serial_driver.name = "tts/%d"; -#else - serial_driver.name = "ttyS"; -#endif - serial_driver.major = TXX927_TTY_MAJOR; - serial_driver.minor_start = TXX927_TTY_MINOR_START + SERIAL_DEV_OFFSET; - serial_driver.num = NR_PORTS; - serial_driver.type = TTY_DRIVER_TYPE_SERIAL; - serial_driver.subtype = SERIAL_TYPE_NORMAL; - serial_driver.init_termios = tty_std_termios; - serial_driver.init_termios.c_cflag = - B9600 | CS8 | CREAD | HUPCL | CLOCAL; - serial_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; - serial_driver.refcount = &serial_refcount; - serial_driver.table = serial_table; - serial_driver.termios = serial_termios; - serial_driver.termios_locked = serial_termios_locked; - - serial_driver.open = rs_open; - serial_driver.close = rs_close; - serial_driver.write = rs_write; - serial_driver.put_char = rs_put_char; - serial_driver.flush_chars = rs_flush_chars; - serial_driver.write_room = rs_write_room; - serial_driver.chars_in_buffer = rs_chars_in_buffer; - serial_driver.flush_buffer = rs_flush_buffer; - serial_driver.ioctl = rs_ioctl; - serial_driver.throttle = rs_throttle; - serial_driver.unthrottle = rs_unthrottle; - serial_driver.send_xchar = rs_send_xchar; - serial_driver.set_termios = rs_set_termios; - serial_driver.stop = rs_stop; - serial_driver.start = rs_start; - serial_driver.hangup = rs_hangup; - serial_driver.break_ctl = rs_break; - serial_driver.wait_until_sent = rs_wait_until_sent; - serial_driver.read_proc = rs_read_proc; - - /* - * The callout device is just like normal device except for - * major number and the subtype code. - */ - callout_driver = serial_driver; -#if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - callout_driver.name = "cua/%d"; -#else - callout_driver.name = "cua"; -#endif - callout_driver.major = TTYAUX_MAJOR; - callout_driver.subtype = SERIAL_TYPE_CALLOUT; - callout_driver.read_proc = 0; - callout_driver.proc_entry = 0; - - if (tty_register_driver(&serial_driver)){ - panic("Couldn't register serial driver\n"); - } - if (tty_register_driver(&callout_driver)) { - panic("Couldn't register callout driver\n"); - } - - for (i = 0, state = rs_table; i < NR_PORTS; i++,state++) { - state->magic = SSTATE_MAGIC; - state->line = i; - state->type = PORT_UNKNOWN; - state->custom_divisor = 0; - state->close_delay = 5*HZ/10; - state->closing_wait = 30*HZ; - state->callout_termios = callout_driver.init_termios; - state->normal_termios = serial_driver.init_termios; - state->icount.cts = state->icount.dsr = - state->icount.rng = state->icount.dcd = 0; - state->icount.rx = state->icount.tx = 0; - state->icount.frame = state->icount.parity = 0; - state->icount.overrun = state->icount.brk = 0; - state->irq = irq_cannonicalize(state->irq); - state->xmit_fifo_size = TXx927_SIO_TX_FIFO; - if (state->hub6) - state->io_type = SERIAL_IO_HUB6; - if (state->port) { - continue; - } - } - - for (i = 0, state = rs_table; i < NR_PORTS; i++,state++) { - if (state->type == PORT_UNKNOWN) { - continue; - } - printk(KERN_INFO "%s%02d at 0x%04lx (irq = %d) is a %s\n", - TXX927_TTY_NAME, - state->line, - state->port, state->irq, - SERIAL_DRIVER_NAME); - tty_register_devfs(&serial_driver, 0, - serial_driver.minor_start + state->line); - tty_register_devfs(&callout_driver, 0, - callout_driver.minor_start + state->line); - } - return 0; -} - -static void __exit rs_fini(void) -{ - unsigned long flags; - int e1, e2; - int i; - struct async_struct *info; - - del_timer_sync(&serial_timer); - save_flags(flags); cli(); - remove_bh(TXX927_SERIAL_BH); - if ((e1 = tty_unregister_driver(&serial_driver))) - printk(KERN_WARNING "serial: failed to unregister serial driver (%d)\n", - e1); - if ((e2 = tty_unregister_driver(&callout_driver))) - printk(KERN_WARNING "serial: failed to unregister callout driver (%d)\n", - e2); - restore_flags(flags); - - for (i = 0; i < NR_PORTS; i++) { - if ((info = rs_table[i].info)) { - rs_table[i].info = NULL; - kfree(info); - } - } - if (tmp_buf) { - unsigned long pg = (unsigned long) tmp_buf; - tmp_buf = NULL; - free_page(pg); - } -} - -module_init(rs_init); -module_exit(rs_fini); -MODULE_DESCRIPTION("TXX927 serial driver"); - -/* - * ------------------------------------------------------------ - * Serial console driver - * ------------------------------------------------------------ - */ -#ifdef CONFIG_TXX927_SERIAL_CONSOLE - -static struct async_struct async_sercons; - -/* - * Print a string to the serial port trying not to disturb - * any possible real use of the port... - */ -static void serial_console_write(struct console *co, const char *s, - unsigned count) -{ - static struct async_struct *info = &async_sercons; - int ier; - unsigned i; - - /* - * First save the IER then disable the interrupts - */ - ier = sio_reg(info)->dicr; - sio_reg(info)->dicr = 0; - - - /* - * Now, do each character - */ - for (i = 0; i < count; i++, s++) { - wait_for_xmitr(info); - - /* - * Send the character out. - * If a LF, also do CR... - */ - sio_reg(info)->tfifo = *s; - if (*s == 10) { - wait_for_xmitr(info); - sio_reg(info)->tfifo = 13; - } - } - - /* - * Finally, Wait for transmitter & holding register to empty - * and restore the IER - */ - wait_for_xmitr(info); - sio_reg(info)->dicr = ier; -} - -static kdev_t serial_console_device(struct console *c) -{ - return mk_kdev(TXX927_TTY_MAJOR, TXX927_TTY_MINOR_START + c->index); -} - -/* - * Setup initial baud/bits/parity. We do two things here: - * - construct a cflag setting for the first rs_open() - * - initialize the serial port - * Return non-zero if we didn't find a serial port. - */ -static int serial_console_setup(struct console *co, char *options) -{ - static struct async_struct *info; - struct serial_state *state; - unsigned cval; - int baud = 9600; - int bits = 8; - int parity = 'n'; - int cflag = CREAD | HUPCL | CLOCAL; - int quot = 0; - char *s; - - if (co->index < 0 || co->index >= NR_PORTS) { - return -1; - } - if (options) { - baud = simple_strtoul(options, NULL, 10); - s = options; - while(*s >= '0' && *s <= '9') - s++; - if (*s) parity = *s++; - if (*s) bits = *s - '0'; - } - - /* - * Now construct a cflag setting. - */ - switch(baud) { - case 1200: - cflag |= B1200; - break; - case 2400: - cflag |= B2400; - break; - case 4800: - cflag |= B4800; - break; - case 19200: - cflag |= B19200; - break; - case 38400: - cflag |= B38400; - break; - case 57600: - cflag |= B57600; - break; - case 115200: - cflag |= B115200; - break; - case 9600: - default: - cflag |= B9600; - break; - } - switch(bits) { - case 7: - cflag |= CS7; - break; - default: - case 8: - cflag |= CS8; - break; - } - switch(parity) { - case 'o': case 'O': - cflag |= PARODD; - break; - case 'e': case 'E': - cflag |= PARENB; - break; - } - co->cflag = cflag; - - /* - * Divisor, bytesize and parity - */ - state = rs_table + co->index; - info = &async_sercons; - info->magic = SERIAL_MAGIC; - info->state = state; - info->port = state->port; - info->flags = state->flags; - info->io_type = state->io_type; - info->iomem_base = state->iomem_base; - info->iomem_reg_shift = state->iomem_reg_shift; - quot = state->baud_base / baud; - - switch (cflag & CSIZE) { - case CS7: cval = TXx927_SILCR_UMODE_7BIT; break; - default: - case CS8: cval = TXx927_SILCR_UMODE_8BIT; break; - } - if (cflag & CSTOPB) - cval |= TXx927_SILCR_USBL_2BIT; - else - cval |= TXx927_SILCR_USBL_1BIT; - if (cflag & PARENB) - cval |= TXx927_SILCR_UPEN; - if (!(cflag & PARODD)) - cval |= TXx927_SILCR_UEPS; - - /* - * Disable UART interrupts, set DTR and RTS high - * and set speed. - */ - sio_reg(info)->dicr = 0; - sio_reg(info)->lcr = cval | TXx927_SILCR_SCS_IMCLK_BG; - sio_reg(info)->bgr = quot | TXx927_SIBGR_BCLK_T0; - /* HW RTS/CTS control */ - if (info->flags & ASYNC_HAVE_CTS_LINE) - sio_reg(info)->flcr = TXx927_SIFLCR_RCS | TXx927_SIFLCR_TES | - TXx927_SIFLCR_RTSTL_MAX /* 15 */; - /* Enable RX/TX */ - sio_reg(info)->flcr &= ~(TXx927_SIFLCR_RSDE | TXx927_SIFLCR_TSDE); - - return 0; -} - -static struct console sercons = { - .name = TXX927_TTY_NAME, - .write = serial_console_write, - .device = serial_console_device, - .setup = serial_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1, -}; - -/* - * Register console. - */ -void __init txx927_console_init(void) -{ - register_console(&sercons); -} -#endif diff -urN linux/drivers/serial/serial_txx9.c linux/drivers/serial/serial_txx9.c --- linux/drivers/serial/serial_txx9.c 1970/01/01 00:00:00 +++ linux/drivers/serial/serial_txx9.c Fri Mar 4 17:24:33 2005 1.1 @@ -0,0 +1,1177 @@ +/* + * drivers/serial/serial_txx9.c + * + * Derived from many drivers using generic_serial interface, + * especially serial_tx3912.c by Steven J. Hill and r39xx_serial.c + * (was in Linux/VR tree) by Jim Pick. + * + * Copyright (C) 1999 Harald Koerfgen + * Copyright (C) 2000 Jim Pick + * Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com) + * Copyright (C) 2000-2002 Toshiba Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Serial driver for TX3927/TX4927/TX4925/TX4938 internal SIO controller + * + * Revision History: + * 0.30 Initial revision. (Renamed from serial_txx927.c) + * 0.31 Use save_flags instead of local_irq_save. + * 0.32 Support SCLK. + * 0.33 Switch TXX9_TTY_NAME by CONFIG_SERIAL_TXX9_STDSERIAL. + * Support TIOCSERGETLSR. + * 0.34 Support slow baudrate. + * 0.40 Merge codes from mainstream kernel (2.4.22). + * 0.41 Fix console checking in rs_shutdown_port(). + * Disable flow-control in serial_console_write(). + * 0.42 Fix minor compiler warning. + * 1.00 Kernel 2.6. Converted to new serial core (based on 8250.c). + * 1.01 Set fifosize to make tx_empry called properly. + * Use standard uart_get_divisor. + * 1.02 Cleanup. (import 8250.c changes) + * 1.03 Fix low-latency mode. (import 8250.c changes) + */ +#include + +#if defined(CONFIG_SERIAL_TXX9_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#define SUPPORT_SYSRQ +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static char *serial_version = "1.03"; +static char *serial_name = "TX39/49 Serial driver"; + +#define PASS_LIMIT 256 + +#if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) +/* "ttyS" is used for standard serial driver */ +#define TXX9_TTY_NAME "ttyTX" +#define TXX9_TTY_DEVFS_NAME "tttx/" +#define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ +#else +/* acts like standard serial driver */ +#define TXX9_TTY_NAME "ttyS" +#define TXX9_TTY_DEVFS_NAME "tts/" +#define TXX9_TTY_MINOR_START 64 +#endif +#define TXX9_TTY_MAJOR TTY_MAJOR + +/* flag aliases */ +#define UPF_TXX9_HAVE_CTS_LINE UPF_BUGGY_UART +#define UPF_TXX9_USE_SCLK UPF_MAGIC_MULTIPLIER + +#ifdef CONFIG_PCI +/* support for Toshiba TC86C001 SIO */ +#define ENABLE_SERIAL_TXX9_PCI +#endif + +/* + * Number of serial ports + */ +#ifdef ENABLE_SERIAL_TXX9_PCI +#define NR_PCI_BOARDS 4 +#define UART_NR (2 + NR_PCI_BOARDS) +#else +#define UART_NR 2 +#endif + +struct uart_txx9_port { + struct uart_port port; + + /* + * We provide a per-port pm hook. + */ + void (*pm)(struct uart_port *port, + unsigned int state, unsigned int old); +}; + +#define TXX9_REGION_SIZE 0x24 + +/* TXX9 Serial Registers */ +#define TXX9_SILCR 0x00 +#define TXX9_SIDICR 0x04 +#define TXX9_SIDISR 0x08 +#define TXX9_SICISR 0x0c +#define TXX9_SIFCR 0x10 +#define TXX9_SIFLCR 0x14 +#define TXX9_SIBGR 0x18 +#define TXX9_SITFIFO 0x1c +#define TXX9_SIRFIFO 0x20 + +/* SILCR : Line Control */ +#define TXX9_SILCR_SCS_MASK 0x00000060 +#define TXX9_SILCR_SCS_IMCLK 0x00000000 +#define TXX9_SILCR_SCS_IMCLK_BG 0x00000020 +#define TXX9_SILCR_SCS_SCLK 0x00000040 +#define TXX9_SILCR_SCS_SCLK_BG 0x00000060 +#define TXX9_SILCR_UEPS 0x00000010 +#define TXX9_SILCR_UPEN 0x00000008 +#define TXX9_SILCR_USBL_MASK 0x00000004 +#define TXX9_SILCR_USBL_1BIT 0x00000000 +#define TXX9_SILCR_USBL_2BIT 0x00000004 +#define TXX9_SILCR_UMODE_MASK 0x00000003 +#define TXX9_SILCR_UMODE_8BIT 0x00000000 +#define TXX9_SILCR_UMODE_7BIT 0x00000001 + +/* SIDICR : DMA/Int. Control */ +#define TXX9_SIDICR_TDE 0x00008000 +#define TXX9_SIDICR_RDE 0x00004000 +#define TXX9_SIDICR_TIE 0x00002000 +#define TXX9_SIDICR_RIE 0x00001000 +#define TXX9_SIDICR_SPIE 0x00000800 +#define TXX9_SIDICR_CTSAC 0x00000600 +#define TXX9_SIDICR_STIE_MASK 0x0000003f +#define TXX9_SIDICR_STIE_OERS 0x00000020 +#define TXX9_SIDICR_STIE_CTSS 0x00000010 +#define TXX9_SIDICR_STIE_RBRKD 0x00000008 +#define TXX9_SIDICR_STIE_TRDY 0x00000004 +#define TXX9_SIDICR_STIE_TXALS 0x00000002 +#define TXX9_SIDICR_STIE_UBRKD 0x00000001 + +/* SIDISR : DMA/Int. Status */ +#define TXX9_SIDISR_UBRK 0x00008000 +#define TXX9_SIDISR_UVALID 0x00004000 +#define TXX9_SIDISR_UFER 0x00002000 +#define TXX9_SIDISR_UPER 0x00001000 +#define TXX9_SIDISR_UOER 0x00000800 +#define TXX9_SIDISR_ERI 0x00000400 +#define TXX9_SIDISR_TOUT 0x00000200 +#define TXX9_SIDISR_TDIS 0x00000100 +#define TXX9_SIDISR_RDIS 0x00000080 +#define TXX9_SIDISR_STIS 0x00000040 +#define TXX9_SIDISR_RFDN_MASK 0x0000001f + +/* SICISR : Change Int. Status */ +#define TXX9_SICISR_OERS 0x00000020 +#define TXX9_SICISR_CTSS 0x00000010 +#define TXX9_SICISR_RBRKD 0x00000008 +#define TXX9_SICISR_TRDY 0x00000004 +#define TXX9_SICISR_TXALS 0x00000002 +#define TXX9_SICISR_UBRKD 0x00000001 + +/* SIFCR : FIFO Control */ +#define TXX9_SIFCR_SWRST 0x00008000 +#define TXX9_SIFCR_RDIL_MASK 0x00000180 +#define TXX9_SIFCR_RDIL_1 0x00000000 +#define TXX9_SIFCR_RDIL_4 0x00000080 +#define TXX9_SIFCR_RDIL_8 0x00000100 +#define TXX9_SIFCR_RDIL_12 0x00000180 +#define TXX9_SIFCR_RDIL_MAX 0x00000180 +#define TXX9_SIFCR_TDIL_MASK 0x00000018 +#define TXX9_SIFCR_TDIL_MASK 0x00000018 +#define TXX9_SIFCR_TDIL_1 0x00000000 +#define TXX9_SIFCR_TDIL_4 0x00000001 +#define TXX9_SIFCR_TDIL_8 0x00000010 +#define TXX9_SIFCR_TDIL_MAX 0x00000010 +#define TXX9_SIFCR_TFRST 0x00000004 +#define TXX9_SIFCR_RFRST 0x00000002 +#define TXX9_SIFCR_FRSTE 0x00000001 +#define TXX9_SIO_TX_FIFO 8 +#define TXX9_SIO_RX_FIFO 16 + +/* SIFLCR : Flow Control */ +#define TXX9_SIFLCR_RCS 0x00001000 +#define TXX9_SIFLCR_TES 0x00000800 +#define TXX9_SIFLCR_RTSSC 0x00000200 +#define TXX9_SIFLCR_RSDE 0x00000100 +#define TXX9_SIFLCR_TSDE 0x00000080 +#define TXX9_SIFLCR_RTSTL_MASK 0x0000001e +#define TXX9_SIFLCR_RTSTL_MAX 0x0000001e +#define TXX9_SIFLCR_TBRK 0x00000001 + +/* SIBGR : Baudrate Control */ +#define TXX9_SIBGR_BCLK_MASK 0x00000300 +#define TXX9_SIBGR_BCLK_T0 0x00000000 +#define TXX9_SIBGR_BCLK_T2 0x00000100 +#define TXX9_SIBGR_BCLK_T4 0x00000200 +#define TXX9_SIBGR_BCLK_T6 0x00000300 +#define TXX9_SIBGR_BRD_MASK 0x000000ff + +static inline unsigned int sio_in(struct uart_txx9_port *up, int offset) +{ + switch (up->port.iotype) { + default: + return *(volatile u32 *)(up->port.membase + offset); + case UPIO_PORT: + return inl(up->port.iobase + offset); + } +} + +static inline void +sio_out(struct uart_txx9_port *up, int offset, int value) +{ + switch (up->port.iotype) { + default: + *(volatile u32 *)(up->port.membase + offset) = value; + break; + case UPIO_PORT: + outl(value, up->port.iobase + offset); + break; + } +} + +static inline void +sio_mask(struct uart_txx9_port *up, int offset, unsigned int value) +{ + sio_out(up, offset, sio_in(up, offset) & ~value); +} +static inline void +sio_set(struct uart_txx9_port *up, int offset, unsigned int value) +{ + sio_out(up, offset, sio_in(up, offset) | value); +} + +static inline void +sio_quot_set(struct uart_txx9_port *up, int quot) +{ + quot >>= 1; + if (quot < 256) + sio_out(up, TXX9_SIBGR, quot | TXX9_SIBGR_BCLK_T0); + else if (quot < (256 << 2)) + sio_out(up, TXX9_SIBGR, (quot >> 2) | TXX9_SIBGR_BCLK_T2); + else if (quot < (256 << 4)) + sio_out(up, TXX9_SIBGR, (quot >> 4) | TXX9_SIBGR_BCLK_T4); + else if (quot < (256 << 6)) + sio_out(up, TXX9_SIBGR, (quot >> 6) | TXX9_SIBGR_BCLK_T6); + else + sio_out(up, TXX9_SIBGR, 0xff | TXX9_SIBGR_BCLK_T6); +} + +static void serial_txx9_stop_tx(struct uart_port *port, unsigned int tty_stop) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_TIE); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void serial_txx9_start_tx(struct uart_port *port, unsigned int tty_start) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + sio_set(up, TXX9_SIDICR, TXX9_SIDICR_TIE); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void serial_txx9_stop_rx(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + up->port.read_status_mask &= ~TXX9_SIDISR_RDIS; +#if 0 + sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_RIE); +#endif + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void serial_txx9_enable_ms(struct uart_port *port) +{ + /* TXX9-SIO can not control DTR... */ +} + +static inline void +receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *regs) +{ + struct tty_struct *tty = up->port.info->tty; + unsigned char ch; + unsigned int disr = *status; + int max_count = 256; + char flag; + + do { + /* The following is not allowed by the tty layer and + unsafe. It should be fixed ASAP */ + if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) { + if (tty->low_latency) { + spin_unlock(&up->port.lock); + tty_flip_buffer_push(tty); + spin_lock(&up->port.lock); + } + /* If this failed then we will throw away the + bytes but must do so to clear interrupts */ + } + ch = sio_in(up, TXX9_SIRFIFO); + flag = TTY_NORMAL; + up->port.icount.rx++; + + if (unlikely(disr & (TXX9_SIDISR_UBRK | TXX9_SIDISR_UPER | + TXX9_SIDISR_UFER | TXX9_SIDISR_UOER))) { + /* + * For statistics only + */ + if (disr & TXX9_SIDISR_UBRK) { + disr &= ~(TXX9_SIDISR_UFER | TXX9_SIDISR_UPER); + up->port.icount.brk++; + /* + * We do the SysRQ and SAK checking + * here because otherwise the break + * may get masked by ignore_status_mask + * or read_status_mask. + */ + if (uart_handle_break(&up->port)) + goto ignore_char; + } else if (disr & TXX9_SIDISR_UPER) + up->port.icount.parity++; + else if (disr & TXX9_SIDISR_UFER) + up->port.icount.frame++; + if (disr & TXX9_SIDISR_UOER) + up->port.icount.overrun++; + + /* + * Mask off conditions which should be ingored. + */ + disr &= up->port.read_status_mask; + + if (disr & TXX9_SIDISR_UBRK) { + flag = TTY_BREAK; + } else if (disr & TXX9_SIDISR_UPER) + flag = TTY_PARITY; + else if (disr & TXX9_SIDISR_UFER) + flag = TTY_FRAME; + } + if (uart_handle_sysrq_char(&up->port, ch, regs)) + goto ignore_char; + if ((disr & up->port.ignore_status_mask) == 0) { + tty_insert_flip_char(tty, ch, flag); + } + if ((disr & TXX9_SIDISR_UOER) && + tty->flip.count < TTY_FLIPBUF_SIZE) { + /* + * Overrun is special, since it's reported + * immediately, and doesn't affect the current + * character. + */ + tty_insert_flip_char(tty, 0, TTY_OVERRUN); + } + ignore_char: + disr = sio_in(up, TXX9_SIDISR); + } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0)); + spin_unlock(&up->port.lock); + tty_flip_buffer_push(tty); + spin_lock(&up->port.lock); + *status = disr; +} + +static inline void transmit_chars(struct uart_txx9_port *up) +{ + struct circ_buf *xmit = &up->port.info->xmit; + int count; + + if (up->port.x_char) { + sio_out(up, TXX9_SITFIFO, up->port.x_char); + up->port.icount.tx++; + up->port.x_char = 0; + return; + } + if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { + serial_txx9_stop_tx(&up->port, 0); + return; + } + + count = TXX9_SIO_TX_FIFO; + do { + sio_out(up, TXX9_SITFIFO, xmit->buf[xmit->tail]); + xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); + up->port.icount.tx++; + if (uart_circ_empty(xmit)) + break; + } while (--count > 0); + + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(&up->port); + + if (uart_circ_empty(xmit)) + serial_txx9_stop_tx(&up->port, 0); +} + +static irqreturn_t serial_txx9_interrupt(int irq, void *dev_id, struct pt_regs *regs) +{ + int pass_counter = 0; + struct uart_txx9_port *up = dev_id; + unsigned int status; + + while (1) { + spin_lock(&up->port.lock); + status = sio_in(up, TXX9_SIDISR); + if (!(sio_in(up, TXX9_SIDICR) & TXX9_SIDICR_TIE)) + status &= ~TXX9_SIDISR_TDIS; + if (!(status & (TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS | + TXX9_SIDISR_TOUT))) { + spin_unlock(&up->port.lock); + break; + } + + if (status & TXX9_SIDISR_RDIS) + receive_chars(up, &status, regs); + if (status & TXX9_SIDISR_TDIS) + transmit_chars(up); + /* Clear TX/RX Int. Status */ + sio_mask(up, TXX9_SIDISR, + TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS | + TXX9_SIDISR_TOUT); + spin_unlock(&up->port.lock); + + if (pass_counter++ > PASS_LIMIT) + break; + } + + return pass_counter ? IRQ_HANDLED : IRQ_NONE; +} + +static unsigned int serial_txx9_tx_empty(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + unsigned int ret; + + spin_lock_irqsave(&up->port.lock, flags); + ret = (sio_in(up, TXX9_SICISR) & TXX9_SICISR_TXALS) ? TIOCSER_TEMT : 0; + spin_unlock_irqrestore(&up->port.lock, flags); + + return ret; +} + +static unsigned int serial_txx9_get_mctrl(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + unsigned int ret; + + spin_lock_irqsave(&up->port.lock, flags); + ret = ((sio_in(up, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS) + | ((sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS); + spin_unlock_irqrestore(&up->port.lock, flags); + + return ret; +} + +static void serial_txx9_set_mctrl(struct uart_port *port, unsigned int mctrl) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + if (mctrl & TIOCM_RTS) + sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC); + else + sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void serial_txx9_break_ctl(struct uart_port *port, int break_state) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + spin_lock_irqsave(&up->port.lock, flags); + if (break_state == -1) + sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); + else + sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static int serial_txx9_startup(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + int retval; + + /* + * Clear the FIFO buffers and disable them. + * (they will be reeanbled in set_termios()) + */ + sio_set(up, TXX9_SIFCR, + TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); + /* clear reset */ + sio_mask(up, TXX9_SIFCR, + TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); + sio_out(up, TXX9_SIDICR, 0); + + /* + * Clear the interrupt registers. + */ + sio_out(up, TXX9_SIDISR, 0); + + retval = request_irq(up->port.irq, serial_txx9_interrupt, + SA_SHIRQ, "serial_txx9", up); + if (retval) + return retval; + + /* + * Now, initialize the UART + */ + spin_lock_irqsave(&up->port.lock, flags); + serial_txx9_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); + + /* Enable RX/TX */ + sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); + + /* + * Finally, enable interrupts. + */ + sio_set(up, TXX9_SIDICR, TXX9_SIDICR_RIE); + + return 0; +} + +static void serial_txx9_shutdown(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + + /* + * Disable interrupts from this port + */ + sio_out(up, TXX9_SIDICR, 0); /* disable all intrs */ + + spin_lock_irqsave(&up->port.lock, flags); + serial_txx9_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); + + /* + * Disable break condition + */ + sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_TBRK); + +#ifdef CONFIG_SERIAL_TXX9_CONSOLE + if (up->port.cons && up->port.line == up->port.cons->index) { + free_irq(up->port.irq, up); + return; + } +#endif + /* reset FIFOs */ + sio_set(up, TXX9_SIFCR, + TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); + /* clear reset */ + sio_mask(up, TXX9_SIFCR, + TXX9_SIFCR_TFRST | TXX9_SIFCR_RFRST | TXX9_SIFCR_FRSTE); + + /* Disable RX/TX */ + sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RSDE | TXX9_SIFLCR_TSDE); + + free_irq(up->port.irq, up); +} + +static void +serial_txx9_set_termios(struct uart_port *port, struct termios *termios, + struct termios *old) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned int cval, fcr = 0; + unsigned long flags; + unsigned int baud, quot; + + cval = sio_in(up, TXX9_SILCR); + /* byte size and parity */ + cval &= ~TXX9_SILCR_UMODE_MASK; + switch (termios->c_cflag & CSIZE) { + case CS7: + cval |= TXX9_SILCR_UMODE_7BIT; + break; + default: + case CS5: /* not supported */ + case CS6: /* not supported */ + case CS8: + cval |= TXX9_SILCR_UMODE_8BIT; + break; + } + + cval &= ~TXX9_SILCR_USBL_MASK; + if (termios->c_cflag & CSTOPB) + cval |= TXX9_SILCR_USBL_2BIT; + else + cval |= TXX9_SILCR_USBL_1BIT; + cval &= ~(TXX9_SILCR_UPEN | TXX9_SILCR_UEPS); + if (termios->c_cflag & PARENB) + cval |= TXX9_SILCR_UPEN; + if (!(termios->c_cflag & PARODD)) + cval |= TXX9_SILCR_UEPS; + + /* + * Ask the core to calculate the divisor for us. + */ + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16/2); + quot = uart_get_divisor(port, baud); + + /* Set up FIFOs */ + /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */ + fcr = TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1; + + /* + * Ok, we're now changing the port state. Do it with + * interrupts disabled. + */ + spin_lock_irqsave(&up->port.lock, flags); + + /* + * Update the per-port timeout. + */ + uart_update_timeout(port, termios->c_cflag, baud); + + up->port.read_status_mask = TXX9_SIDISR_UOER | + TXX9_SIDISR_TDIS | TXX9_SIDISR_RDIS; + if (termios->c_iflag & INPCK) + up->port.read_status_mask |= TXX9_SIDISR_UFER | TXX9_SIDISR_UPER; + if (termios->c_iflag & (BRKINT | PARMRK)) + up->port.read_status_mask |= TXX9_SIDISR_UBRK; + + /* + * Characteres to ignore + */ + up->port.ignore_status_mask = 0; + if (termios->c_iflag & IGNPAR) + up->port.ignore_status_mask |= TXX9_SIDISR_UPER | TXX9_SIDISR_UFER; + if (termios->c_iflag & IGNBRK) { + up->port.ignore_status_mask |= TXX9_SIDISR_UBRK; + /* + * If we're ignoring parity and break indicators, + * ignore overruns too (for real raw support). + */ + if (termios->c_iflag & IGNPAR) + up->port.ignore_status_mask |= TXX9_SIDISR_UOER; + } + + /* + * ignore all characters if CREAD is not set + */ + if ((termios->c_cflag & CREAD) == 0) + up->port.ignore_status_mask |= TXX9_SIDISR_RDIS; + + /* CTS flow control flag */ + if ((termios->c_cflag & CRTSCTS) && + (up->port.flags & UPF_TXX9_HAVE_CTS_LINE)) { + sio_set(up, TXX9_SIFLCR, + TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES); + } else { + sio_mask(up, TXX9_SIFLCR, + TXX9_SIFLCR_RCS | TXX9_SIFLCR_TES); + } + + sio_out(up, TXX9_SILCR, cval); + sio_quot_set(up, quot); + sio_out(up, TXX9_SIFCR, fcr); + + serial_txx9_set_mctrl(&up->port, up->port.mctrl); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static void +serial_txx9_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + if (state) { + /* sleep */ + + if (up->pm) + up->pm(port, state, oldstate); + } else { + /* wake */ + + if (up->pm) + up->pm(port, state, oldstate); + } +} + +static int serial_txx9_request_resource(struct uart_txx9_port *up) +{ + unsigned int size = TXX9_REGION_SIZE; + int ret = 0; + + switch (up->port.iotype) { + default: + if (!up->port.mapbase) + break; + + if (!request_mem_region(up->port.mapbase, size, "serial_txx9")) { + ret = -EBUSY; + break; + } + + if (up->port.flags & UPF_IOREMAP) { + up->port.membase = ioremap(up->port.mapbase, size); + if (!up->port.membase) { + release_mem_region(up->port.mapbase, size); + ret = -ENOMEM; + } + } + break; + + case UPIO_PORT: + if (!request_region(up->port.iobase, size, "serial_txx9")) + ret = -EBUSY; + break; + } + return ret; +} + +static void serial_txx9_release_resource(struct uart_txx9_port *up) +{ + unsigned int size = TXX9_REGION_SIZE; + + switch (up->port.iotype) { + default: + if (!up->port.mapbase) + break; + + if (up->port.flags & UPF_IOREMAP) { + iounmap(up->port.membase); + up->port.membase = NULL; + } + + release_mem_region(up->port.mapbase, size); + break; + + case UPIO_PORT: + release_region(up->port.iobase, size); + break; + } +} + +static void serial_txx9_release_port(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + serial_txx9_release_resource(up); +} + +static int serial_txx9_request_port(struct uart_port *port) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + return serial_txx9_request_resource(up); +} + +static void serial_txx9_config_port(struct uart_port *port, int uflags) +{ + struct uart_txx9_port *up = (struct uart_txx9_port *)port; + unsigned long flags; + int ret; + + /* + * Find the region that we can probe for. This in turn + * tells us whether we can probe for the type of port. + */ + ret = serial_txx9_request_resource(up); + if (ret < 0) + return; + port->type = PORT_TXX9; + up->port.fifosize = TXX9_SIO_TX_FIFO; + +#ifdef CONFIG_SERIAL_TXX9_CONSOLE + if (up->port.line == up->port.cons->index) + return; +#endif + spin_lock_irqsave(&up->port.lock, flags); + /* + * Reset the UART. + */ + sio_out(up, TXX9_SIFCR, TXX9_SIFCR_SWRST); +#ifdef CONFIG_CPU_TX49XX + /* TX4925 BUG WORKAROUND. Accessing SIOC register + * immediately after soft reset causes bus error. */ + iob(); + udelay(1); +#endif + while (sio_in(up, TXX9_SIFCR) & TXX9_SIFCR_SWRST) + ; + /* TX Int by FIFO Empty, RX Int by Receiving 1 char. */ + sio_set(up, TXX9_SIFCR, + TXX9_SIFCR_TDIL_MAX | TXX9_SIFCR_RDIL_1); + /* initial settings */ + sio_out(up, TXX9_SILCR, + TXX9_SILCR_UMODE_8BIT | TXX9_SILCR_USBL_1BIT | + ((up->port.flags & UPF_TXX9_USE_SCLK) ? + TXX9_SILCR_SCS_SCLK_BG : TXX9_SILCR_SCS_IMCLK_BG)); + sio_quot_set(up, uart_get_divisor(port, 9600)); + sio_out(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSTL_MAX /* 15 */); + spin_unlock_irqrestore(&up->port.lock, flags); +} + +static int +serial_txx9_verify_port(struct uart_port *port, struct serial_struct *ser) +{ + if (ser->irq < 0 || + ser->baud_base < 9600 || ser->type != PORT_TXX9) + return -EINVAL; + return 0; +} + +static const char * +serial_txx9_type(struct uart_port *port) +{ + return "txx9"; +} + +static struct uart_ops serial_txx9_pops = { + .tx_empty = serial_txx9_tx_empty, + .set_mctrl = serial_txx9_set_mctrl, + .get_mctrl = serial_txx9_get_mctrl, + .stop_tx = serial_txx9_stop_tx, + .start_tx = serial_txx9_start_tx, + .stop_rx = serial_txx9_stop_rx, + .enable_ms = serial_txx9_enable_ms, + .break_ctl = serial_txx9_break_ctl, + .startup = serial_txx9_startup, + .shutdown = serial_txx9_shutdown, + .set_termios = serial_txx9_set_termios, + .pm = serial_txx9_pm, + .type = serial_txx9_type, + .release_port = serial_txx9_release_port, + .request_port = serial_txx9_request_port, + .config_port = serial_txx9_config_port, + .verify_port = serial_txx9_verify_port, +}; + +static struct uart_txx9_port serial_txx9_ports[UART_NR]; + +static void __init serial_txx9_register_ports(struct uart_driver *drv) +{ + int i; + + for (i = 0; i < UART_NR; i++) { + struct uart_txx9_port *up = &serial_txx9_ports[i]; + + up->port.line = i; + up->port.ops = &serial_txx9_pops; + uart_add_one_port(drv, &up->port); + } +} + +#ifdef CONFIG_SERIAL_TXX9_CONSOLE + +/* + * Wait for transmitter & holding register to empty + */ +static inline void wait_for_xmitr(struct uart_txx9_port *up) +{ + unsigned int tmout = 10000; + + /* Wait up to 10ms for the character(s) to be sent. */ + while (--tmout && + !(sio_in(up, TXX9_SICISR) & TXX9_SICISR_TXALS)) + udelay(1); + + /* Wait up to 1s for flow control if necessary */ + if (up->port.flags & UPF_CONS_FLOW) { + tmout = 1000000; + while (--tmout && + (sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS)) + udelay(1); + } +} + +/* + * Print a string to the serial port trying not to disturb + * any possible real use of the port... + * + * The console_lock must be held when we get here. + */ +static void +serial_txx9_console_write(struct console *co, const char *s, unsigned int count) +{ + struct uart_txx9_port *up = &serial_txx9_ports[co->index]; + unsigned int ier, flcr; + int i; + + /* + * First save the UER then disable the interrupts + */ + ier = sio_in(up, TXX9_SIDICR); + sio_out(up, TXX9_SIDICR, 0); + /* + * Disable flow-control if enabled (and unnecessary) + */ + flcr = sio_in(up, TXX9_SIFLCR); + if (!(up->port.flags & UPF_CONS_FLOW) && (flcr & TXX9_SIFLCR_TES)) + sio_out(up, TXX9_SIFLCR, flcr & ~TXX9_SIFLCR_TES); + + /* + * Now, do each character + */ + for (i = 0; i < count; i++, s++) { + wait_for_xmitr(up); + + /* + * Send the character out. + * If a LF, also do CR... + */ + sio_out(up, TXX9_SITFIFO, *s); + if (*s == 10) { + wait_for_xmitr(up); + sio_out(up, TXX9_SITFIFO, 13); + } + } + + /* + * Finally, wait for transmitter to become empty + * and restore the IER + */ + wait_for_xmitr(up); + sio_out(up, TXX9_SIFLCR, flcr); + sio_out(up, TXX9_SIDICR, ier); +} + +static int serial_txx9_console_setup(struct console *co, char *options) +{ + struct uart_port *port; + struct uart_txx9_port *up; + int baud = 9600; + int bits = 8; + int parity = 'n'; + int flow = 'n'; + + /* + * Check whether an invalid uart number has been specified, and + * if so, search for the first available port that does have + * console support. + */ + if (co->index >= UART_NR) + co->index = 0; + up = &serial_txx9_ports[co->index]; + port = &up->port; + if (!port->ops) + return -ENODEV; + + /* + * Temporary fix. + */ + spin_lock_init(&port->lock); + + /* + * Disable UART interrupts, set DTR and RTS high + * and set speed. + */ + sio_out(up, TXX9_SIDICR, 0); + /* initial settings */ + sio_out(up, TXX9_SILCR, + TXX9_SILCR_UMODE_8BIT | TXX9_SILCR_USBL_1BIT | + ((port->flags & UPF_TXX9_USE_SCLK) ? + TXX9_SILCR_SCS_SCLK_BG : TXX9_SILCR_SCS_IMCLK_BG)); + sio_out(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSTL_MAX /* 15 */); + + if (options) + uart_parse_options(options, &baud, &parity, &bits, &flow); + + return uart_set_options(port, co, baud, parity, bits, flow); +} + +static struct uart_driver serial_txx9_reg; +static struct console serial_txx9_console = { + .name = TXX9_TTY_NAME, + .write = serial_txx9_console_write, + .device = uart_console_device, + .setup = serial_txx9_console_setup, + .flags = CON_PRINTBUFFER, + .index = -1, + .data = &serial_txx9_reg, +}; + +static int __init serial_txx9_console_init(void) +{ + register_console(&serial_txx9_console); + return 0; +} +console_initcall(serial_txx9_console_init); + +static int __init serial_txx9_late_console_init(void) +{ + if (!(serial_txx9_console.flags & CON_ENABLED)) + register_console(&serial_txx9_console); + return 0; +} +late_initcall(serial_txx9_late_console_init); + +#define SERIAL_TXX9_CONSOLE &serial_txx9_console +#else +#define SERIAL_TXX9_CONSOLE NULL +#endif + +static struct uart_driver serial_txx9_reg = { + .owner = THIS_MODULE, + .driver_name = "serial_txx9", + .devfs_name = TXX9_TTY_DEVFS_NAME, + .dev_name = TXX9_TTY_NAME, + .major = TXX9_TTY_MAJOR, + .minor = TXX9_TTY_MINOR_START, + .nr = UART_NR, + .cons = SERIAL_TXX9_CONSOLE, +}; + +int __init early_serial_txx9_setup(struct uart_port *port) +{ + if (port->line >= ARRAY_SIZE(serial_txx9_ports)) + return -ENODEV; + + serial_txx9_ports[port->line].port = *port; + serial_txx9_ports[port->line].port.ops = &serial_txx9_pops; + serial_txx9_ports[port->line].port.flags |= UPF_BOOT_AUTOCONF; + return 0; +} + +#ifdef ENABLE_SERIAL_TXX9_PCI +/** + * serial_txx9_suspend_port - suspend one serial port + * @line: serial line number + * @level: the level of port suspension, as per uart_suspend_port + * + * Suspend one serial port. + */ +static void serial_txx9_suspend_port(int line) +{ + uart_suspend_port(&serial_txx9_reg, &serial_txx9_ports[line].port); +} + +/** + * serial_txx9_resume_port - resume one serial port + * @line: serial line number + * @level: the level of port resumption, as per uart_resume_port + * + * Resume one serial port. + */ +static void serial_txx9_resume_port(int line) +{ + uart_resume_port(&serial_txx9_reg, &serial_txx9_ports[line].port); +} + +/* + * Probe one serial board. Unfortunately, there is no rhyme nor reason + * to the arrangement of serial ports on a PCI card. + */ +static int __devinit +pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent) +{ + struct uart_port port; + int line; + int rc; + + rc = pci_enable_device(dev); + if (rc) + return rc; + + memset(&port, 0, sizeof(port)); + port.ops = &serial_txx9_pops; + port.flags |= UPF_BOOT_AUTOCONF; /* uart_ops.config_port will be called */ + port.flags |= UPF_TXX9_HAVE_CTS_LINE; + port.uartclk = 66670000; + port.irq = dev->irq; + port.iotype = UPIO_PORT; + port.iobase = pci_resource_start(dev, 1); + line = uart_register_port(&serial_txx9_reg, &port); + if (line < 0) { + printk(KERN_WARNING "Couldn't register serial port %s: %d\n", pci_name(dev), line); + } + pci_set_drvdata(dev, (void *)(long)line); + + return 0; +} + +static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev) +{ + int line = (int)(long)pci_get_drvdata(dev); + + pci_set_drvdata(dev, NULL); + + if (line) { + uart_unregister_port(&serial_txx9_reg, line); + pci_disable_device(dev); + } +} + +static int pciserial_txx9_suspend_one(struct pci_dev *dev, u32 state) +{ + int line = (int)(long)pci_get_drvdata(dev); + + if (line) + serial_txx9_suspend_port(line); + return 0; +} + +static int pciserial_txx9_resume_one(struct pci_dev *dev) +{ + int line = (int)(long)pci_get_drvdata(dev); + + if (line) + serial_txx9_resume_port(line); + return 0; +} + +static struct pci_device_id serial_txx9_pci_tbl[] = { + { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC, + PCI_ANY_ID, PCI_ANY_ID, + 0, 0, 0 }, + { 0, } +}; + +static struct pci_driver serial_txx9_pci_driver = { + .name = "serial_txx9", + .probe = pciserial_txx9_init_one, + .remove = __devexit_p(pciserial_txx9_remove_one), + .suspend = pciserial_txx9_suspend_one, + .resume = pciserial_txx9_resume_one, + .id_table = serial_txx9_pci_tbl, +}; + +MODULE_DEVICE_TABLE(pci, serial_txx9_pci_tbl); +#endif /* ENABLE_SERIAL_TXX9_PCI */ + +static int __init serial_txx9_init(void) +{ + int ret; + + printk(KERN_INFO "%s version %s\n", serial_name, serial_version); + + ret = uart_register_driver(&serial_txx9_reg); + if (ret >= 0) { + serial_txx9_register_ports(&serial_txx9_reg); + +#ifdef ENABLE_SERIAL_TXX9_PCI + ret = pci_module_init(&serial_txx9_pci_driver); +#endif + } + return ret; +} + +static void __exit serial_txx9_exit(void) +{ + int i; + +#ifdef ENABLE_SERIAL_TXX9_PCI + pci_unregister_driver(&serial_txx9_pci_driver); +#endif + for (i = 0; i < UART_NR; i++) + uart_remove_one_port(&serial_txx9_reg, &serial_txx9_ports[i].port); + + uart_unregister_driver(&serial_txx9_reg); +} + +module_init(serial_txx9_init); +module_exit(serial_txx9_exit); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("TX39/49 serial driver"); + +MODULE_ALIAS_CHARDEV_MAJOR(TXX9_TTY_MAJOR); diff -urN linux/drivers/serial/Kconfig linux/drivers/serial/Kconfig --- linux/drivers/serial/Kconfig 2005/01/25 04:28:44 1.39 +++ linux/drivers/serial/Kconfig 2005/03/04 17:24:33 1.40 @@ -792,4 +792,22 @@ If you use an M3T-M32700UT or an OPSPUT platform, please say Y. +config SERIAL_TXX9 + bool "TMPTX39XX/49XX SIO support" + depends HAS_TXX9_SERIAL + select SERIAL_CORE + default y + +config HAS_TXX9_SERIAL + bool + +config SERIAL_TXX9_CONSOLE + bool "TMPTX39XX/49XX SIO Console support" + depends on SERIAL_TXX9=y + select SERIAL_CORE_CONSOLE + +config SERIAL_TXX9_STDSERIAL + bool "TX39XX/49XX SIO act as standard serial" + depends on !SERIAL_8250 && SERIAL_TXX9 + endmenu diff -urN linux/include/asm-mips/serial.h linux/include/asm-mips/serial.h --- linux/include/asm-mips/serial.h 2005/03/04 15:13:37 1.63 +++ linux/include/asm-mips/serial.h 2005/03/04 17:24:33 1.64 @@ -129,17 +129,6 @@ #define IVR_SERIAL_PORT_DEFNS #endif -#ifdef CONFIG_TOSHIBA_JMR3927 -#include -#define TXX927_SERIAL_PORT_DEFNS \ - { .baud_base = JMR3927_BASE_BAUD, .port = UART0_ADDR, .irq = UART0_INT, \ - .flags = UART0_FLAGS, .type = 1 }, \ - { .baud_base = JMR3927_BASE_BAUD, .port = UART1_ADDR, .irq = UART1_INT, \ - .flags = UART1_FLAGS, .type = 1 }, -#else -#define TXX927_SERIAL_PORT_DEFNS -#endif - #ifdef CONFIG_SERIAL_AU1X00 #include #ifdef CONFIG_SOC_AU1000 @@ -427,7 +416,6 @@ MOMENCO_OCELOT_C_SERIAL_PORT_DEFNS \ MOMENCO_OCELOT_SERIAL_PORT_DEFNS \ MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS \ - TXX927_SERIAL_PORT_DEFNS \ AU1000_SERIAL_PORT_DEFNS #endif /* _ASM_SERIAL_H */ diff -urN linux/include/asm-mips/jmr3927/jmr3927.h linux/include/asm-mips/jmr3927/jmr3927.h --- linux/include/asm-mips/jmr3927/jmr3927.h 2003/07/17 02:38:34 1.5 +++ linux/include/asm-mips/jmr3927/jmr3927.h 2005/03/04 17:24:33 1.6 @@ -202,20 +202,6 @@ #endif /* !__ASSEMBLY__ */ /* - * UART defines for serial.h - */ - -/* use Pre-scaler T0 (1/2) */ -#define JMR3927_BASE_BAUD (JMR3927_IMCLK / 2 / 16) - -#define UART0_ADDR 0xfffef300 -#define UART1_ADDR 0xfffef400 -#define UART0_INT JMR3927_IRQ_IRC_SIO0 -#define UART1_INT JMR3927_IRQ_IRC_SIO1 -#define UART0_FLAGS ASYNC_BOOT_AUTOCONF -#define UART1_FLAGS 0 - -/* * IRQ mappings */ From ralf@linux-mips.org Fri Mar 4 19:37:06 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 19:37:06 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 19:37:06 +0000 X-archive-position: 320 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/04 19:36:53 Modified files: arch/mips/kernel: signal32.c arch/mips/mm : c-sb1.c include/asm-mips: paccess.h uaccess.h Log message: Gcc 4.0 fixes. diff -urN linux/arch/mips/kernel/signal32.c linux/arch/mips/kernel/signal32.c --- linux/arch/mips/kernel/signal32.c 2005/02/16 21:24:16 1.25 +++ linux/arch/mips/kernel/signal32.c 2005/03/04 19:36:51 1.26 @@ -266,11 +266,12 @@ if (act) { old_sigset_t mask; + s32 handler; if (!access_ok(VERIFY_READ, act, sizeof(*act))) return -EFAULT; - err |= __get_user((u32)(u64)new_ka.sa.sa_handler, - &act->sa_handler); + err |= __get_user(handler, &act->sa_handler); + new_ka.sa.sa_handler = (void*)(s64)handler; err |= __get_user(new_ka.sa.sa_flags, &act->sa_flags); err |= __get_user(mask, &act->sa_mask.sig[0]); if (err) @@ -832,12 +833,13 @@ goto out; if (act) { + s32 handler; int err = 0; if (!access_ok(VERIFY_READ, act, sizeof(*act))) return -EFAULT; - err |= __get_user((u32)(u64)new_sa.sa.sa_handler, - &act->sa_handler); + err |= __get_user(handler, &act->sa_handler); + new_sa.sa.sa_handler = (void*)(s64)handler; err |= __get_user(new_sa.sa.sa_flags, &act->sa_flags); err |= get_sigset(&new_sa.sa.sa_mask, &act->sa_mask); if (err) diff -urN linux/arch/mips/mm/c-sb1.c linux/arch/mips/mm/c-sb1.c --- linux/arch/mips/mm/c-sb1.c 2004/12/09 21:57:03 1.55 +++ linux/arch/mips/mm/c-sb1.c 2005/03/04 19:36:53 1.56 @@ -234,7 +234,7 @@ /* * Invalidate all caches on this CPU */ -static void local_sb1___flush_cache_all(void) +static void __attribute_used__ local_sb1___flush_cache_all(void) { __sb1_writeback_inv_dcache_all(); __sb1_flush_icache_all(); diff -urN linux/include/asm-mips/paccess.h linux/include/asm-mips/paccess.h --- linux/include/asm-mips/paccess.h 2003/07/29 03:21:47 1.4 +++ linux/include/asm-mips/paccess.h 2005/03/04 19:36:53 1.5 @@ -52,7 +52,7 @@ }) #define __get_dbe_asm(insn) \ -({ \ +{ \ __asm__ __volatile__( \ "1:\t" insn "\t%1,%2\n\t" \ "move\t%0,$0\n" \ @@ -67,7 +67,7 @@ ".previous" \ :"=r" (__gu_err), "=r" (__gu_val) \ :"o" (__mp(__gu_addr)), "i" (-EFAULT)); \ -}) +} extern void __get_dbe_unknown(void); @@ -90,7 +90,7 @@ }) #define __put_dbe_asm(insn) \ -({ \ +{ \ __asm__ __volatile__( \ "1:\t" insn "\t%1,%2\n\t" \ "move\t%0,$0\n" \ @@ -104,7 +104,7 @@ ".previous" \ : "=r" (__pu_err) \ : "r" (__pu_val), "o" (__mp(__pu_addr)), "i" (-EFAULT)); \ -}) +} extern void __put_dbe_unknown(void); diff -urN linux/include/asm-mips/uaccess.h linux/include/asm-mips/uaccess.h --- linux/include/asm-mips/uaccess.h 2005/03/01 19:22:29 1.41 +++ linux/include/asm-mips/uaccess.h 2005/03/04 19:36:53 1.42 @@ -244,7 +244,7 @@ case 8: __GET_USER_DW(ptr); break; \ default: __get_user_unknown(); break; \ } \ - x = (__typeof__(*(ptr))) __gu_val; \ + (x) = (__typeof__(*(ptr))) __gu_val; \ __gu_err; \ }) @@ -266,12 +266,12 @@ default: __get_user_unknown(); break; \ } \ } \ - x = (__typeof__(*(ptr))) __gu_val; \ + (x) = (__typeof__(*(ptr))) __gu_val; \ __gu_err; \ }) #define __get_user_asm(insn, addr) \ -({ \ +{ \ __asm__ __volatile__( \ "1: " insn " %1, %3 \n" \ "2: \n" \ @@ -284,13 +284,13 @@ " .previous \n" \ : "=r" (__gu_err), "=r" (__gu_val) \ : "0" (__gu_err), "o" (__m(addr)), "i" (-EFAULT)); \ -}) +} /* * Get a long long 64 using 32 bit registers. */ #define __get_user_asm_ll32(addr) \ -({ \ +{ \ __asm__ __volatile__( \ "1: lw %1, (%3) \n" \ "2: lw %D1, 4(%3) \n" \ @@ -307,7 +307,7 @@ " .previous \n" \ : "=r" (__gu_err), "=&r" (__gu_val) \ : "0" (__gu_err), "r" (addr), "i" (-EFAULT)); \ -}) +} extern void __get_user_unknown(void); @@ -360,7 +360,7 @@ }) #define __put_user_asm(insn, ptr) \ -({ \ +{ \ __asm__ __volatile__( \ "1: " insn " %z2, %3 # __put_user_asm\n" \ "2: \n" \ @@ -374,10 +374,10 @@ : "=r" (__pu_err) \ : "0" (__pu_err), "Jr" (__pu_val), "o" (__m(ptr)), \ "i" (-EFAULT)); \ -}) +} #define __put_user_asm_ll32(ptr) \ -({ \ +{ \ __asm__ __volatile__( \ "1: sw %2, (%3) # __put_user_asm_ll32 \n" \ "2: sw %D2, 4(%3) \n" \ @@ -393,7 +393,7 @@ : "=r" (__pu_err) \ : "0" (__pu_err), "r" (__pu_val), "r" (ptr), \ "i" (-EFAULT)); \ -}) +} extern void __put_user_unknown(void); From ths@linux-mips.org Fri Mar 4 19:40:51 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Fri, 04 Mar 2005 19:40:51 +0000 (GMT) From: ths@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Fri, 04 Mar 2005 19:40:51 +0000 X-archive-position: 321 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ths@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ths@ftp.linux-mips.org 05/03/04 19:40:45 Modified files: drivers/video : gbefb.c Log message: It helps to not use a _mem_ function for requesting I/O space. diff -urN linux/drivers/video/gbefb.c linux/drivers/video/gbefb.c --- linux/drivers/video/gbefb.c 2004/11/21 17:13:11 1.13 +++ linux/drivers/video/gbefb.c 2005/03/04 19:40:45 1.14 @@ -1126,7 +1126,7 @@ gbefb_setup(options); #endif - if (!request_mem_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) { + if (!request_region(GBE_BASE, sizeof(struct sgi_gbe), "GBE")) { printk(KERN_ERR "gbefb: couldn't reserve mmio region\n"); ret = -EBUSY; goto out_release_framebuffer; @@ -1152,12 +1152,24 @@ if (gbe_mem_phys) { /* memory was allocated at boot time */ gbe_mem = ioremap_nocache(gbe_mem_phys, gbe_mem_size); + if (!gbe_mem) { + printk(KERN_ERR "gbefb: couldn't map framebuffer\n"); + ret = -ENOMEM; + goto out_tiles_free; + } + gbe_dma_addr = 0; } else { /* try to allocate memory with the classical allocator * this has high chance to fail on low memory machines */ gbe_mem = dma_alloc_coherent(NULL, gbe_mem_size, &gbe_dma_addr, GFP_KERNEL); + if (!gbe_mem) { + printk(KERN_ERR "gbefb: couldn't allocate framebuffer memory\n"); + ret = -ENOMEM; + goto out_tiles_free; + } + gbe_mem_phys = (unsigned long) gbe_dma_addr; } @@ -1165,12 +1177,6 @@ mtrr_add(gbe_mem_phys, gbe_mem_size, MTRR_TYPE_WRCOMB, 1); #endif - if (!gbe_mem) { - printk(KERN_ERR "gbefb: couldn't map framebuffer\n"); - ret = -ENXIO; - goto out_tiles_free; - } - /* map framebuffer memory into tiles table */ for (i = 0; i < (gbe_mem_size >> TILE_SHIFT); i++) gbe_tiles.cpu[i] = (gbe_mem_phys >> TILE_SHIFT) + i; From ralf@linux-mips.org Mon Mar 7 14:28:28 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Mon, 07 Mar 2005 14:28:28 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Mon, 07 Mar 2005 14:28:28 +0000 X-archive-position: 322 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/07 14:28:22 Modified files: include/linux : pci_ids.h serial_core.h Log message: Lost TX serial driver bits. diff -urN linux/include/linux/pci_ids.h linux/include/linux/pci_ids.h --- linux/include/linux/pci_ids.h 2005/03/02 19:58:02 1.138 +++ linux/include/linux/pci_ids.h 2005/03/07 14:28:22 1.139 @@ -1471,6 +1471,7 @@ #define PCI_DEVICE_ID_TOSHIBA_TX3927 0x000a #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 #define PCI_DEVICE_ID_TOSHIBA_TX4927 0x0180 +#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 #define PCI_VENDOR_ID_RICOH 0x1180 #define PCI_DEVICE_ID_RICOH_RL5C465 0x0465 diff -urN linux/include/linux/serial_core.h linux/include/linux/serial_core.h --- linux/include/linux/serial_core.h 2005/01/25 04:28:56 1.31 +++ linux/include/linux/serial_core.h 2005/03/07 14:28:22 1.32 @@ -103,6 +103,9 @@ /* Marvell MPSC */ #define PORT_MPSC 63 +/* TXX9 type number */ +#define PORT_TXX9 64 + #ifdef __KERNEL__ #include From ralf@linux-mips.org Mon Mar 7 15:40:40 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Mon, 07 Mar 2005 15:40:40 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Mon, 07 Mar 2005 15:40:40 +0000 X-archive-position: 323 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/07 15:40:34 Modified files: arch/mips/arc : Makefile Log message: Put salone.o back into arclib. It's a lib so doesn't harm if unused. diff -urN linux/arch/mips/arc/Makefile linux/arch/mips/arc/Makefile --- linux/arch/mips/arc/Makefile 2003/06/22 23:09:48 1.10 +++ linux/arch/mips/arc/Makefile 2005/03/07 15:40:34 1.11 @@ -3,7 +3,7 @@ # lib-y += cmdline.o env.o file.o identify.o init.o \ - misc.o time.o tree.o + misc.o salone.o time.o tree.o lib-$(CONFIG_ARC_MEMORY) += memory.o lib-$(CONFIG_ARC_CONSOLE) += arc_con.o From ralf@linux-mips.org Mon Mar 7 18:42:22 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Mon, 07 Mar 2005 18:42:23 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Mon, 07 Mar 2005 18:42:22 +0000 X-archive-position: 324 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/07 18:42:17 Modified files: arch/mips/pci : ops-vr41xx.c pci-vr41xx.c pci-vr41xx.h include/asm-mips/vr41xx: vr41xx.h Added files: include/asm-mips/vr41xx: pci.h Log message: Update NEC VR41xx PCI code. diff -urN linux/arch/mips/pci/ops-vr41xx.c linux/arch/mips/pci/ops-vr41xx.c --- linux/arch/mips/pci/ops-vr41xx.c 2004/05/26 19:31:41 1.1 +++ linux/arch/mips/pci/ops-vr41xx.c 2005/03/07 18:42:16 1.2 @@ -3,7 +3,7 @@ * * Copyright (C) 2001-2003 MontaVista Software Inc. * Author: Yoichi Yuasa - * Copyright (C) 2004 Yoichi Yuasa + * Copyright (C) 2004-2005 Yoichi Yuasa * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,8 +29,8 @@ #include -#define PCICONFDREG KSEG1ADDR(0x0f000c14) -#define PCICONFAREG KSEG1ADDR(0x0f000c18) +#define PCICONFDREG (void __iomem *)KSEG1ADDR(0x0f000c14) +#define PCICONFAREG (void __iomem *)KSEG1ADDR(0x0f000c18) static inline int set_pci_configuration_address(unsigned char number, unsigned int devfn, int where) diff -urN linux/arch/mips/pci/pci-vr41xx.c linux/arch/mips/pci/pci-vr41xx.c --- linux/arch/mips/pci/pci-vr41xx.c 2005/01/15 01:03:03 1.7 +++ linux/arch/mips/pci/pci-vr41xx.c 2005/03/07 18:42:16 1.8 @@ -3,8 +3,8 @@ * * Copyright (C) 2001-2003 MontaVista Software Inc. * Author: Yoichi Yuasa - * Copyright (C) 2004 Yoichi Yuasa - * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2004-2005 Yoichi Yuasa + * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,12 +31,18 @@ #include #include +#include #include #include "pci-vr41xx.h" extern struct pci_ops vr41xx_pci_ops; +static void __iomem *pciu_base; + +#define pciu_read(offset) readl(pciu_base + (offset)) +#define pciu_write(offset, value) writel((value), pciu_base + (offset)) + static struct pci_master_address_conversion pci_master_memory1 = { .bus_base_address = PCI_MASTER_MEM1_BUS_BASE_ADDRESS, .address_mask = PCI_MASTER_MEM1_ADDRESS_MASK, @@ -113,6 +119,13 @@ setup = &vr41xx_pci_controller_unit_setup; + if (request_mem_region(PCIU_BASE, PCIU_SIZE, "PCIU") == NULL) + return -EBUSY; + + pciu_base = ioremap(PCIU_BASE, PCIU_SIZE); + if (pciu_base == NULL) + return -EBUSY; + /* Disable PCI interrupt */ vr41xx_disable_pciint(); @@ -129,14 +142,14 @@ pci_clock_max = PCI_CLOCK_MAX; vtclock = vr41xx_get_vtclock_frequency(); if (vtclock < pci_clock_max) - writel(EQUAL_VTCLOCK, PCICLKSELREG); + pciu_write(PCICLKSELREG, EQUAL_VTCLOCK); else if ((vtclock / 2) < pci_clock_max) - writel(HALF_VTCLOCK, PCICLKSELREG); + pciu_write(PCICLKSELREG, HALF_VTCLOCK); else if (current_cpu_data.processor_id >= PRID_VR4131_REV2_1 && (vtclock / 3) < pci_clock_max) - writel(ONE_THIRD_VTCLOCK, PCICLKSELREG); + pciu_write(PCICLKSELREG, ONE_THIRD_VTCLOCK); else if ((vtclock / 4) < pci_clock_max) - writel(QUARTER_VTCLOCK, PCICLKSELREG); + pciu_write(PCICLKSELREG, QUARTER_VTCLOCK); else { printk(KERN_ERR "PCI Clock is over 33MHz.\n"); return -EINVAL; @@ -151,11 +164,11 @@ MASTER_MSK(master->address_mask) | WINEN | PCIA(master->pci_base_address); - writel(val, PCIMMAW1REG); + pciu_write(PCIMMAW1REG, val); } else { - val = readl(PCIMMAW1REG); + val = pciu_read(PCIMMAW1REG); val &= ~WINEN; - writel(val, PCIMMAW1REG); + pciu_write(PCIMMAW1REG, val); } if (setup->master_memory2 != NULL) { @@ -164,11 +177,11 @@ MASTER_MSK(master->address_mask) | WINEN | PCIA(master->pci_base_address); - writel(val, PCIMMAW2REG); + pciu_write(PCIMMAW2REG, val); } else { - val = readl(PCIMMAW2REG); + val = pciu_read(PCIMMAW2REG); val &= ~WINEN; - writel(val, PCIMMAW2REG); + pciu_write(PCIMMAW2REG, val); } if (setup->target_memory1 != NULL) { @@ -176,11 +189,11 @@ val = TARGET_MSK(target->address_mask) | WINEN | ITA(target->bus_base_address); - writel(val, PCITAW1REG); + pciu_write(PCITAW1REG, val); } else { - val = readl(PCITAW1REG); + val = pciu_read(PCITAW1REG); val &= ~WINEN; - writel(val, PCITAW1REG); + pciu_write(PCITAW1REG, val); } if (setup->target_memory2 != NULL) { @@ -188,11 +201,11 @@ val = TARGET_MSK(target->address_mask) | WINEN | ITA(target->bus_base_address); - writel(val, PCITAW2REG); + pciu_write(PCITAW2REG, val); } else { - val = readl(PCITAW2REG); + val = pciu_read(PCITAW2REG); val &= ~WINEN; - writel(val, PCITAW2REG); + pciu_write(PCITAW2REG, val); } if (setup->master_io != NULL) { @@ -201,50 +214,50 @@ MASTER_MSK(master->address_mask) | WINEN | PCIIA(master->pci_base_address); - writel(val, PCIMIOAWREG); + pciu_write(PCIMIOAWREG, val); } else { - val = readl(PCIMIOAWREG); + val = pciu_read(PCIMIOAWREG); val &= ~WINEN; - writel(val, PCIMIOAWREG); + pciu_write(PCIMIOAWREG, val); } if (setup->exclusive_access == CANNOT_LOCK_FROM_DEVICE) - writel(UNLOCK, PCIEXACCREG); + pciu_write(PCIEXACCREG, UNLOCK); else - writel(0, PCIEXACCREG); + pciu_write(PCIEXACCREG, 0); if (current_cpu_data.cputype == CPU_VR4122) - writel(TRDYV(setup->wait_time_limit_from_irdy_to_trdy), PCITRDYVREG); + pciu_write(PCITRDYVREG, TRDYV(setup->wait_time_limit_from_irdy_to_trdy)); - writel(MLTIM(setup->master_latency_timer), LATTIMEREG); + pciu_write(LATTIMEREG, MLTIM(setup->master_latency_timer)); if (setup->mailbox != NULL) { mailbox = setup->mailbox; val = MBADD(mailbox->base_address) | TYPE_32BITSPACE | MSI_MEMORY | PREF_APPROVAL; - writel(val, MAILBAREG); + pciu_write(MAILBAREG, val); } if (setup->target_window1) { window = setup->target_window1; val = PMBA(window->base_address) | TYPE_32BITSPACE | MSI_MEMORY | PREF_APPROVAL; - writel(val, PCIMBA1REG); + pciu_write(PCIMBA1REG, val); } if (setup->target_window2) { window = setup->target_window2; val = PMBA(window->base_address) | TYPE_32BITSPACE | MSI_MEMORY | PREF_APPROVAL; - writel(val, PCIMBA2REG); + pciu_write(PCIMBA2REG, val); } - val = readl(RETVALREG); + val = pciu_read(RETVALREG); val &= ~RTYVAL_MASK; val |= RTYVAL(setup->retry_limit); - writel(val, RETVALREG); + pciu_write(RETVALREG, val); - val = readl(PCIAPCNTREG); + val = pciu_read(PCIAPCNTREG); val &= ~(TKYGNT | PAPC); switch (setup->arbiter_priority_control) { @@ -262,15 +275,16 @@ if (setup->take_away_gnt_mode == PCI_TAKE_AWAY_GNT_ENABLE) val |= TKYGNT_ENABLE; - writel(val, PCIAPCNTREG); + pciu_write(PCIAPCNTREG, val); - writel(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | - PCI_COMMAND_PARITY | PCI_COMMAND_SERR, COMMANDREG); + pciu_write(COMMANDREG, PCI_COMMAND_IO | PCI_COMMAND_MEMORY | + PCI_COMMAND_MASTER | PCI_COMMAND_PARITY | + PCI_COMMAND_SERR); /* Clear bus error */ - readl(BUSERRADREG); + pciu_read(BUSERRADREG); - writel(BLOODY_CONFIG_DONE, PCIENREG); + pciu_write(PCIENREG, PCIU_CONFIG_DONE); if (setup->mem_resource != NULL) vr41xx_pci_controller.mem_resource = setup->mem_resource; @@ -288,4 +302,4 @@ return 0; } -early_initcall(vr41xx_pciu_init); +arch_initcall(vr41xx_pciu_init); diff -urN linux/arch/mips/pci/pci-vr41xx.h linux/arch/mips/pci/pci-vr41xx.h --- linux/arch/mips/pci/pci-vr41xx.h 2005/01/15 01:03:03 1.5 +++ linux/arch/mips/pci/pci-vr41xx.h 2005/03/07 18:42:16 1.6 @@ -3,7 +3,7 @@ * * Copyright (C) 2002 MontaVista Software Inc. * Author: Yoichi Yuasa - * Copyright (C) 2004 Yoichi Yuasa + * Copyright (C) 2004-2005 Yoichi Yuasa * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,11 +22,14 @@ #ifndef __PCI_VR41XX_H #define __PCI_VR41XX_H -#define PCIMMAW1REG KSEG1ADDR(0x0f000c00) -#define PCIMMAW2REG KSEG1ADDR(0x0f000c04) -#define PCITAW1REG KSEG1ADDR(0x0f000c08) -#define PCITAW2REG KSEG1ADDR(0x0f000c0c) -#define PCIMIOAWREG KSEG1ADDR(0x0f000c10) +#define PCIU_BASE 0x0f000c00UL +#define PCIU_SIZE 0x200UL + +#define PCIMMAW1REG 0x00 +#define PCIMMAW2REG 0x04 +#define PCITAW1REG 0x08 +#define PCITAW2REG 0x0c +#define PCIMIOAWREG 0x10 #define IBA(addr) ((addr) & 0xff000000U) #define MASTER_MSK(mask) (((mask) >> 11) & 0x000fe000U) #define PCIA(addr) (((addr) >> 24) & 0x000000ffU) @@ -34,13 +37,13 @@ #define ITA(addr) (((addr) >> 24) & 0x000000ffU) #define PCIIA(addr) (((addr) >> 24) & 0x000000ffU) #define WINEN 0x1000U -#define PCICONFDREG KSEG1ADDR(0x0f000c14) -#define PCICONFAREG KSEG1ADDR(0x0f000c18) -#define PCIMAILREG KSEG1ADDR(0x0f000c1c) -#define BUSERRADREG KSEG1ADDR(0x0f000c24) +#define PCICONFDREG 0x14 +#define PCICONFAREG 0x18 +#define PCIMAILREG 0x1c +#define BUSERRADREG 0x24 #define EA(reg) ((reg) &0xfffffffc) -#define INTCNTSTAREG KSEG1ADDR(0x0f000c28) +#define INTCNTSTAREG 0x28 #define MABTCLR 0x80000000U #define TRDYCLR 0x40000000U #define PARCLR 0x20000000U @@ -67,34 +70,34 @@ #define MABORT 0x00000002U #define TABORT 0x00000001U -#define PCIEXACCREG KSEG1ADDR(0x0f000c2c) +#define PCIEXACCREG 0x2c #define UNLOCK 0x2U #define EAREQ 0x1U -#define PCIRECONTREG KSEG1ADDR(0x0f000c30) +#define PCIRECONTREG 0x30 #define RTRYCNT(reg) ((reg) & 0x000000ffU) -#define PCIENREG KSEG1ADDR(0x0f000c34) - #define BLOODY_CONFIG_DONE 0x4U -#define PCICLKSELREG KSEG1ADDR(0x0f000c38) +#define PCIENREG 0x34 + #define PCIU_CONFIG_DONE 0x4U +#define PCICLKSELREG 0x38 #define EQUAL_VTCLOCK 0x2U #define HALF_VTCLOCK 0x0U #define ONE_THIRD_VTCLOCK 0x3U #define QUARTER_VTCLOCK 0x1U -#define PCITRDYVREG KSEG1ADDR(0x0f000c3c) +#define PCITRDYVREG 0x3c #define TRDYV(val) ((uint32_t)(val) & 0xffU) -#define PCICLKRUNREG KSEG1ADDR(0x0f000c60) +#define PCICLKRUNREG 0x60 -#define VENDORIDREG KSEG1ADDR(0x0f000d00) -#define DEVICEIDREG KSEG1ADDR(0x0f000d00) -#define COMMANDREG KSEG1ADDR(0x0f000d04) -#define STATUSREG KSEG1ADDR(0x0f000d04) -#define REVIDREG KSEG1ADDR(0x0f000d08) -#define CLASSREG KSEG1ADDR(0x0f000d08) -#define CACHELSREG KSEG1ADDR(0x0f000d0c) -#define LATTIMEREG KSEG1ADDR(0x0f000d0c) +#define VENDORIDREG 0x100 +#define DEVICEIDREG 0x100 +#define COMMANDREG 0x104 +#define STATUSREG 0x104 +#define REVIDREG 0x108 +#define CLASSREG 0x108 +#define CACHELSREG 0x10c +#define LATTIMEREG 0x10c #define MLTIM(val) (((uint32_t)(val) << 7) & 0xff00U) -#define MAILBAREG KSEG1ADDR(0x0f000d10) -#define PCIMBA1REG KSEG1ADDR(0x0f000d14) -#define PCIMBA2REG KSEG1ADDR(0x0f000d18) +#define MAILBAREG 0x110 +#define PCIMBA1REG 0x114 +#define PCIMBA2REG 0x118 #define MBADD(base) ((base) & 0xfffff800U) #define PMBA(base) ((base) & 0xffe00000U) #define PREF 0x8U @@ -104,10 +107,10 @@ #define TYPE_32BITSPACE 0x0U #define MSI 0x1U #define MSI_MEMORY 0x0U -#define INTLINEREG KSEG1ADDR(0x0f000d3c) -#define INTPINREG KSEG1ADDR(0x0f000d3c) -#define RETVALREG KSEG1ADDR(0x0f000d40) -#define PCIAPCNTREG KSEG1ADDR(0x0f000d40) +#define INTLINEREG 0x13c +#define INTPINREG 0x13c +#define RETVALREG 0x140 +#define PCIAPCNTREG 0x140 #define TKYGNT 0x04000000U #define TKYGNT_ENABLE 0x04000000U #define TKYGNT_DISABLE 0x00000000U diff -urN linux/include/asm-mips/vr41xx/pci.h linux/include/asm-mips/vr41xx/pci.h --- linux/include/asm-mips/vr41xx/pci.h 1970/01/01 00:00:00 +++ linux/include/asm-mips/vr41xx/pci.h Mon Mar 7 18:42:17 2005 1.1 @@ -0,0 +1,90 @@ +/* + * Include file for NEC VR4100 series PCI Control Unit. + * + * Copyright (C) 2004-2005 Yoichi Yuasa + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __NEC_VR41XX_PCI_H +#define __NEC_VR41XX_PCI_H + +#define PCI_MASTER_ADDRESS_MASK 0x7fffffffU + +struct pci_master_address_conversion { + uint32_t bus_base_address; + uint32_t address_mask; + uint32_t pci_base_address; +}; + +struct pci_target_address_conversion { + uint32_t address_mask; + uint32_t bus_base_address; +}; + +typedef enum { + CANNOT_LOCK_FROM_DEVICE, + CAN_LOCK_FROM_DEVICE, +} pci_exclusive_access_t; + +struct pci_mailbox_address { + uint32_t base_address; +}; + +struct pci_target_address_window { + uint32_t base_address; +}; + +typedef enum { + PCI_ARBITRATION_MODE_FAIR, + PCI_ARBITRATION_MODE_ALTERNATE_0, + PCI_ARBITRATION_MODE_ALTERNATE_B, +} pci_arbiter_priority_control_t; + +typedef enum { + PCI_TAKE_AWAY_GNT_DISABLE, + PCI_TAKE_AWAY_GNT_ENABLE, +} pci_take_away_gnt_mode_t; + +struct pci_controller_unit_setup { + struct pci_master_address_conversion *master_memory1; + struct pci_master_address_conversion *master_memory2; + + struct pci_target_address_conversion *target_memory1; + struct pci_target_address_conversion *target_memory2; + + struct pci_master_address_conversion *master_io; + + pci_exclusive_access_t exclusive_access; + + uint32_t pci_clock_max; + uint8_t wait_time_limit_from_irdy_to_trdy; /* Only VR4122 is supported */ + + struct pci_mailbox_address *mailbox; + struct pci_target_address_window *target_window1; + struct pci_target_address_window *target_window2; + + uint8_t master_latency_timer; + uint8_t retry_limit; + + pci_arbiter_priority_control_t arbiter_priority_control; + pci_take_away_gnt_mode_t take_away_gnt_mode; + + struct resource *mem_resource; + struct resource *io_resource; +}; + +extern void vr41xx_pciu_setup(struct pci_controller_unit_setup *setup); + +#endif /* __NEC_VR41XX_PCI_H */ diff -urN linux/include/asm-mips/vr41xx/vr41xx.h linux/include/asm-mips/vr41xx/vr41xx.h --- linux/include/asm-mips/vr41xx/vr41xx.h 2004/05/26 19:31:41 1.18 +++ linux/include/asm-mips/vr41xx/vr41xx.h 2005/03/07 18:42:17 1.19 @@ -274,74 +274,4 @@ */ extern void vr41xx_dsiu_init(void); -/* - * PCI Control Unit - */ -#define PCI_MASTER_ADDRESS_MASK 0x7fffffffU - -struct pci_master_address_conversion { - uint32_t bus_base_address; - uint32_t address_mask; - uint32_t pci_base_address; -}; - -struct pci_target_address_conversion { - uint32_t address_mask; - uint32_t bus_base_address; -}; - -typedef enum { - CANNOT_LOCK_FROM_DEVICE, - CAN_LOCK_FROM_DEVICE, -} pci_exclusive_access_t; - -struct pci_mailbox_address { - uint32_t base_address; -}; - -struct pci_target_address_window { - uint32_t base_address; -}; - -typedef enum { - PCI_ARBITRATION_MODE_FAIR, - PCI_ARBITRATION_MODE_ALTERNATE_0, - PCI_ARBITRATION_MODE_ALTERNATE_B, -} pci_arbiter_priority_control_t; - -typedef enum { - PCI_TAKE_AWAY_GNT_DISABLE, - PCI_TAKE_AWAY_GNT_ENABLE, -} pci_take_away_gnt_mode_t; - -struct pci_controller_unit_setup { - struct pci_master_address_conversion *master_memory1; - struct pci_master_address_conversion *master_memory2; - - struct pci_target_address_conversion *target_memory1; - struct pci_target_address_conversion *target_memory2; - - struct pci_master_address_conversion *master_io; - - pci_exclusive_access_t exclusive_access; - - uint32_t pci_clock_max; - uint8_t wait_time_limit_from_irdy_to_trdy; /* Only VR4122 is supported */ - - struct pci_mailbox_address *mailbox; - struct pci_target_address_window *target_window1; - struct pci_target_address_window *target_window2; - - uint8_t master_latency_timer; - uint8_t retry_limit; - - pci_arbiter_priority_control_t arbiter_priority_control; - pci_take_away_gnt_mode_t take_away_gnt_mode; - - struct resource *mem_resource; - struct resource *io_resource; -}; - -extern void vr41xx_pciu_setup(struct pci_controller_unit_setup *setup); - #endif /* __NEC_VR41XX_H */ From ralf@linux-mips.org Mon Mar 7 18:58:20 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Mon, 07 Mar 2005 18:58:20 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Mon, 07 Mar 2005 18:58:20 +0000 X-archive-position: 325 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/07 18:58:15 Modified files: arch/mips/vr41xx: Kconfig arch/mips/vr41xx/common: Makefile icu.c Log message: VR41xx IRQ updates. diff -urN linux/arch/mips/vr41xx/Kconfig linux/arch/mips/vr41xx/Kconfig --- linux/arch/mips/vr41xx/Kconfig 2005/01/30 20:45:36 1.1 +++ linux/arch/mips/vr41xx/Kconfig 2005/03/07 18:58:15 1.2 @@ -97,6 +97,10 @@ bool "Add PCI control unit support of NEC VR4100 series" depends on MACH_VR41XX && PCI +config GPIO_VR41XX + bool "Add General-purpose I/O unit support of NEC VR4100 series" + depends on MACH_VR41XX + config VRC4171 tristate "Add NEC VRC4171 companion chip support" depends on MACH_VR41XX && ISA diff -urN linux/arch/mips/vr41xx/common/Makefile linux/arch/mips/vr41xx/common/Makefile --- linux/arch/mips/vr41xx/common/Makefile 2004/02/25 02:15:36 1.15 +++ linux/arch/mips/vr41xx/common/Makefile 2005/03/07 18:58:15 1.16 @@ -2,7 +2,8 @@ # Makefile for common code of the NEC VR4100 series. # -obj-y += bcu.o cmu.o giu.o icu.o init.o int-handler.o ksyms.o pmu.o rtc.o +obj-y += bcu.o cmu.o icu.o init.o int-handler.o ksyms.o pmu.o rtc.o +obj-$(CONFIG_GPIO_VR41XX) += giu.o obj-$(CONFIG_SERIAL_8250) += serial.o obj-$(CONFIG_VRC4171) += vrc4171.o obj-$(CONFIG_VRC4173) += vrc4173.o diff -urN linux/arch/mips/vr41xx/common/icu.c linux/arch/mips/vr41xx/common/icu.c --- linux/arch/mips/vr41xx/common/icu.c 2005/01/15 01:31:06 1.19 +++ linux/arch/mips/vr41xx/common/icu.c 2005/03/07 18:58:15 1.20 @@ -3,8 +3,7 @@ * * Copyright (C) 2001-2002 MontaVista Software Inc. * Author: Yoichi Yuasa - * Copyright (C) 2003-2004 Yoichi Yuasa - * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) + * Copyright (C) 2003-2005 Yoichi Yuasa * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +28,7 @@ * Yoichi Yuasa * - Coped with INTASSIGN of NEC VR4133. */ +#include #include #include #include @@ -45,8 +45,10 @@ extern asmlinkage void vr41xx_handle_interrupt(void); +#ifdef CONFIG_GPIO_VR41XX extern void init_vr41xx_giuint_irq(void); extern void giuint_irq_dispatch(struct pt_regs *regs); +#endif static uint32_t icu1_base; static uint32_t icu2_base; @@ -672,9 +674,11 @@ for (i = 0; i < 16; i++) { if (intnum == sysint1_assign[i] && (mask1 & ((uint16_t)1 << i))) { +#ifdef CONFIG_GPIO_VR41XX if (i == 8) giuint_irq_dispatch(regs); else +#endif do_IRQ(SYSINT1_IRQ(i), regs); return; } @@ -698,8 +702,10 @@ /*=======================================================================*/ -static int __init vr41xx_icu_init(void) +static inline void init_vr41xx_icu_irq(void) { + int i; + switch (current_cpu_data.cputype) { case CPU_VR4111: case CPU_VR4121: @@ -723,17 +729,6 @@ write_icu2(0, MSYSINT2REG); write_icu2(0xffff, MGIUINTHREG); - return 0; -} - -early_initcall(vr41xx_icu_init); - -/*=======================================================================*/ - -static inline void init_vr41xx_icu_irq(void) -{ - int i; - for (i = SYSINT1_IRQ_BASE; i <= SYSINT1_IRQ_LAST; i++) irq_desc[i].handler = &sysint1_irq_type; @@ -751,7 +746,9 @@ { mips_cpu_irq_init(MIPS_CPU_IRQ_BASE); init_vr41xx_icu_irq(); +#ifdef CONFIG_GPIO_VR41XX init_vr41xx_giuint_irq(); +#endif set_except_vector(0, vr41xx_handle_interrupt); } From ralf@linux-mips.org Tue Mar 8 14:39:45 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Tue, 08 Mar 2005 14:39:45 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Tue, 08 Mar 2005 14:39:45 +0000 X-archive-position: 326 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/08 14:39:39 Modified files: arch/mips/kernel: syscall.c arch/mips/mm : cache.c Log message: Export shm_align_mask and flush_data_cache_page. diff -urN linux/arch/mips/kernel/syscall.c linux/arch/mips/kernel/syscall.c --- linux/arch/mips/kernel/syscall.c 2005/01/15 00:36:45 1.48 +++ linux/arch/mips/kernel/syscall.c 2005/03/08 14:39:39 1.49 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -56,6 +57,8 @@ unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */ +EXPORT_SYMBOL(shm_align_mask); + #define COLOUR_ALIGN(addr,pgoff) \ ((((addr) + shm_align_mask) & ~shm_align_mask) + \ (((pgoff) << PAGE_SHIFT) & shm_align_mask)) diff -urN linux/arch/mips/mm/cache.c linux/arch/mips/mm/cache.c --- linux/arch/mips/mm/cache.c 2005/03/01 21:20:47 1.17 +++ linux/arch/mips/mm/cache.c 2005/03/08 14:39:39 1.18 @@ -33,6 +33,8 @@ void (*flush_data_cache_page)(unsigned long addr); void (*flush_icache_all)(void); +EXPORT_SYMBOL(flush_data_cache_page); + #ifdef CONFIG_DMA_NONCOHERENT /* DMA cache operations. */ From ralf@linux-mips.org Thu Mar 10 17:34:09 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Thu, 10 Mar 2005 17:34:09 +0000 (GMT) From: ralf@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Thu, 10 Mar 2005 17:34:09 +0000 X-archive-position: 327 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ralf@ftp.linux-mips.org 05/03/10 17:34:03 Modified files: drivers/char : qtronix.c Log message: Handle kmalloc failure. diff -urN linux/drivers/char/qtronix.c linux/drivers/char/qtronix.c --- linux/drivers/char/qtronix.c 2005/01/25 04:28:12 1.12 +++ linux/drivers/char/qtronix.c 2005/03/10 17:34:03 1.13 @@ -590,6 +590,11 @@ return retval; queue = (struct aux_queue *) kmalloc(sizeof(*queue), GFP_KERNEL); + if (!queue) { + misc_deregister(&psaux_mouse); + return -ENOMEM; + } + memset(queue, 0, sizeof(*queue)); queue->head = queue->tail = 0; init_waitqueue_head(&queue->proc_list); From ths@linux-mips.org Sun Mar 13 00:07:06 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Sun, 13 Mar 2005 00:07:06 +0000 (GMT) From: ths@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Sun, 13 Mar 2005 00:07:06 +0000 X-archive-position: 328 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ths@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ths@ftp.linux-mips.org 05/03/13 00:07:00 Modified files: arch/mips/kernel: scall32-o32.S Log message: sys_futex has 6 arguments. diff -urN linux/arch/mips/kernel/scall32-o32.S linux/arch/mips/kernel/scall32-o32.S --- linux/arch/mips/kernel/scall32-o32.S 2005/02/16 21:19:59 1.24 +++ linux/arch/mips/kernel/scall32-o32.S 2005/03/13 00:07:00 1.25 @@ -578,7 +578,7 @@ sys sys_fremovexattr 2 /* 4235 */ sys sys_tkill 2 sys sys_sendfile64 5 - sys sys_futex 2 + sys sys_futex 6 sys sys_sched_setaffinity 3 sys sys_sched_getaffinity 3 /* 4240 */ sys sys_io_setup 2 From ppopov@linux-mips.org Sun Mar 13 07:57:04 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Sun, 13 Mar 2005 07:57:04 +0000 (GMT) From: ppopov@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Sun, 13 Mar 2005 07:57:04 +0000 X-archive-position: 329 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ppopov@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ppopov@ftp.linux-mips.org 05/03/13 07:56:58 Modified files: arch/mips/au1000/common: Tag: linux_2_4 irq.c time.c Log message: When CONFIG_PM is enabled, it uses the TOY_MATCH2 interrupt as the system timer tick. Prior to this patch, if IDE IRQ probing occured, then the TOY_MATCH2 interrupt would be permanently disabled, and no system timer tick occurs. This patch corrects this situation by correctly registering the TOY_MATCH2 interrupt so that IDE IRQ probing doesn't have adverse side effects. diff -urN linux/arch/mips/au1000/common/irq.c linux/arch/mips/au1000/common/irq.c --- linux/arch/mips/au1000/common/irq.c 2005/01/30 08:01:27 1.11.2.28 +++ linux/arch/mips/au1000/common/irq.c 2005/03/13 07:56:57 1.11.2.29 @@ -303,8 +303,30 @@ }; #ifdef CONFIG_PM -void startup_match20_interrupt(void) +void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *)) { + static struct irqaction action; + /* This is a big problem.... since we didn't use request_irq + when kernel/irq.c calls probe_irq_xxx this interrupt will + be probed for usage. This will end up disabling the device :( + + Give it a bogus "action" pointer -- this will keep it from + getting auto-probed! + + By setting the status to match that of request_irq() we + can avoid it. --cgray + */ + action.dev_id = handler; + action.flags = 0; + action.mask = 0; + action.name = "Au1xxx TOY"; + action.handler = handler; + action.next = NULL; + + irq_desc[AU1000_TOY_MATCH2_INT].action = &action; + irq_desc[AU1000_TOY_MATCH2_INT].status + &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS); + local_enable_irq(AU1000_TOY_MATCH2_INT); } #endif @@ -538,17 +560,7 @@ irq = au_ffs(intc0_req1) - 1; intc0_req1 &= ~(1< #include -extern void startup_match20_interrupt(void); extern void do_softirq(void); extern volatile unsigned long wall_jiffies; unsigned long missed_heart_beats = 0; @@ -66,7 +65,7 @@ #ifdef CONFIG_PM #define MATCH20_INC 328 -extern void startup_match20_interrupt(void); +extern void startup_match20_interrupt(void (*handler)(int, void *, struct pt_regs *)); static unsigned long last_pc0, last_match20; #endif @@ -444,7 +443,7 @@ au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2); au_sync(); while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20); - startup_match20_interrupt(); + startup_match20_interrupt(counter0_irq); do_gettimeoffset = do_fast_pm_gettimeoffset; From ppopov@linux-mips.org Sun Mar 13 08:04:22 2005 Received: with ECARTIS (v1.0.0; list linux-cvs-patches); Sun, 13 Mar 2005 08:04:22 +0000 (GMT) From: ppopov@linux-mips.org To: linux-cvs-patches@linux-mips.org Subject: CVS Update@linux-mips.org: linux Date: Sun, 13 Mar 2005 08:04:22 +0000 X-archive-position: 330 X-ecartis-version: Ecartis v1.0.0 Sender: linux-cvs-patches-bounce@linux-mips.org Errors-to: linux-cvs-patches-bounce@linux-mips.org X-original-sender: ppopov@linux-mips.org Precedence: bulk Reply-to: linux-mips@linux-mips.org X-list: linux-cvs-patches CVSROOT: /home/cvs Module name: linux Changes by: ppopov@ftp.linux-mips.org 05/03/13 08:04:16 Modified files: arch/mips/au1000/ficmmp: Tag: linux_2_4 board_setup.c arch/mips/au1000/pb1200: Tag: linux_2_4 board_setup.c drivers/video : Tag: linux_2_4 au1200fb.c Log message: - Add Toppoly 7" 19:6 panel - Move board-specific panel selection/init/shutdown into platform's board_setup.c - Utilize au1200_setpanel() to turn blanking on/off. - Call board-specific panel selection by default if no panel specified. - Remove all CONFIG_MIPS_ from the driver diff -urN linux/arch/mips/au1000/ficmmp/board_setup.c linux/arch/mips/au1000/ficmmp/board_setup.c --- linux/arch/mips/au1000/ficmmp/Attic/board_setup.c 2005/01/30 08:01:27 1.1.2.1 +++ linux/arch/mips/au1000/ficmmp/Attic/board_setup.c 2005/03/13 08:04:16 1.1.2.2 @@ -134,7 +134,7 @@ #ifdef CONFIG_FB_AU1200 argptr = prom_getcmdline(); - strcat(argptr, " video=au1200fb:panel:s11"); + strcat(argptr, " video=au1200fb:"); #endif #if defined(CONFIG_BLK_DEV_IDE_AU1XXX) @@ -189,3 +189,34 @@ printk("B190002C: %X\n", *((volatile u32*)0xB190002C)); } +int +board_au1200fb_panel (void) +{ + au1xxx_gpio_tristate(6); + + if (au1xxx_gpio_read(12) == 0) + return 9; /* FS453_640x480 (Composite/S-Video) */ + else + return 7; /* Sharp 320x240 TFT */ +} + +int +board_au1200fb_panel_init (void) +{ + /*Enable data buffers*/ + ficmmp_config_clear(FICMMP_CONFIG_LCMDATAOUT); + /*Take LCD out of reset*/ + ficmmp_config_set(FICMMP_CONFIG_LCMPWREN | FICMMP_CONFIG_LCMEN); + return 0; +} + +int +board_au1200fb_panel_shutdown (void) +{ + /*Disable data buffers*/ + ficmmp_config_set(FICMMP_CONFIG_LCMDATAOUT); + /*Put LCD in reset, remove power*/ + ficmmp_config_clear(FICMMP_CONFIG_LCMEN | FICMMP_CONFIG_LCMPWREN); + return 0; +} + diff -urN linux/arch/mips/au1000/pb1200/board_setup.c linux/arch/mips/au1000/pb1200/board_setup.c --- linux/arch/mips/au1000/pb1200/board_setup.c 2005/01/30 08:01:28 1.1.2.1 +++ linux/arch/mips/au1000/pb1200/board_setup.c 2005/03/13 08:04:16 1.1.2.2 @@ -139,12 +139,7 @@ #ifdef CONFIG_FB_AU1200 argptr = prom_getcmdline(); -#ifdef CONFIG_MIPS_PB1200 - strcat(argptr, " video=au1200fb:panel:s11"); -#endif -#ifdef CONFIG_MIPS_DB1200 - strcat(argptr, " video=au1200fb:panel:s7"); -#endif + strcat(argptr, " video=au1200fb:"); #endif #if defined(CONFIG_BLK_DEV_IDE_AU1XXX) @@ -188,3 +183,34 @@ board_init_irq = _board_init_irq; } } + +int +board_au1200fb_panel (void) +{ + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; + int p; + + p = bcsr->switches; + p >>= 8; + p &= 0x0F; + return p; +} + +int +board_au1200fb_panel_init (void) +{ + /* Apply power */ + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; + bcsr->board |= (BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL); + return 0; +} + +int +board_au1200fb_panel_shutdown (void) +{ + /* Remove power */ + BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; + bcsr->board &= ~(BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD | BCSR_BOARD_LCDBL); + return 0; +} + diff -urN linux/drivers/video/au1200fb.c linux/drivers/video/au1200fb.c --- linux/drivers/video/Attic/au1200fb.c 2005/02/11 21:16:44 1.1.2.1 +++ linux/drivers/video/Attic/au1200fb.c 2005/03/13 08:04:16 1.1.2.2 @@ -51,18 +51,6 @@ #include