Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:08
|
Update of /cvsroot/linux-vax/kernel-2.5/kernel/power In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/kernel/power Removed Files: pmdisk.c Log Message: Merge with 2.6.9 --- pmdisk.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:06
|
Update of /cvsroot/linux-vax/kernel-2.5/include/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/include/sound Removed Files: sndmagic.h Log Message: Merge with 2.6.9 --- sndmagic.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:06
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-sh64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/include/asm-sh64 Removed Files: smplock.h softirq.h Log Message: Merge with 2.6.9 --- softirq.h DELETED --- --- smplock.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:06
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-um In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/include/asm-um Removed Files: module.h smplock.h Log Message: Merge with 2.6.9 --- module.h DELETED --- --- smplock.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:06
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-mips In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/include/asm-mips Removed Files: mv64340.h Log Message: Merge with 2.6.9 --- mv64340.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:04
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/message/i2o In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/drivers/message/i2o Removed Files: i2o_core.c Log Message: Merge with 2.6.9 --- i2o_core.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:04
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-h8300 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/include/asm-h8300 Removed Files: softirq.h Log Message: Merge with 2.6.9 --- softirq.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:09:02
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/message/fusion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/drivers/message/fusion Removed Files: ascq_tbl.c ascq_tbl.sh isense.c isense.h scsi3.h scsiops.c Log Message: Merge with 2.6.9 --- scsi3.h DELETED --- --- isense.c DELETED --- --- scsiops.c DELETED --- --- isense.h DELETED --- --- ascq_tbl.c DELETED --- --- ascq_tbl.sh DELETED --- |
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/mach-iop3xx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/arch/arm/mach-iop3xx Removed Files: iop310-irq.c iop310-pci.c iq80310-irq.c iq80310-pci.c iq80310-time.c mm.c xs80200-irq.c Log Message: Merge with 2.6.9 --- xs80200-irq.c DELETED --- --- iop310-irq.c DELETED --- --- iop310-pci.c DELETED --- --- iq80310-time.c DELETED --- --- iq80310-pci.c DELETED --- --- mm.c DELETED --- --- iq80310-irq.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:08:52
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/usb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/Documentation/usb Removed Files: philips.txt Log Message: Merge with 2.6.9 --- philips.txt DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:08:52
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/arch/arm/configs Removed Files: iq80310_defconfig Log Message: Merge with 2.6.9 --- iq80310_defconfig DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:08:52
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/alpha/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13106/arch/alpha/lib Removed Files: io.c Log Message: Merge with 2.6.9 --- io.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-11-17 00:05:38
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/s390/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12133 Added Files: irq.c Log Message: Merge with 2.6.9 --- NEW FILE: irq.c --- /* * arch/s390/kernel/irq.c * * S390 version * Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Martin Schwidefsky (sch...@de...), * * This file contains interrupt related functions. */ #include <linux/module.h> #include <linux/kernel.h> #include <linux/kernel_stat.h> #include <linux/interrupt.h> #include <linux/seq_file.h> #include <linux/cpu.h> /* * show_interrupts is needed by /proc/interrupts. */ int show_interrupts(struct seq_file *p, void *v) { static const char *intrclass_names[] = { "EXT", "I/O", }; int i = *(loff_t *) v, j; if (i == 0) { seq_puts(p, " "); for (j=0; j<NR_CPUS; j++) if (cpu_online(j)) seq_printf(p, "CPU%d ",j); seq_putc(p, '\n'); } if (i < NR_IRQS) { seq_printf(p, "%s: ", intrclass_names[i]); #ifndef CONFIG_SMP seq_printf(p, "%10u ", kstat_irqs(i)); #else for (j = 0; j < NR_CPUS; j++) if (cpu_online(j)) seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); #endif seq_putc(p, '\n'); } return 0; } /* * For compatibilty only. S/390 specific setup of interrupts et al. is done * much later in init_channel_subsystem(). */ void __init init_IRQ(void) { /* nothing... */ } /* * Switch to the asynchronous interrupt stack for softirq execution. */ extern void __do_softirq(void); asmlinkage void do_softirq(void) { unsigned long flags, old, new; if (in_interrupt()) return; local_irq_save(flags); if (local_softirq_pending()) { /* Get current stack pointer. */ asm volatile("la %0,0(15)" : "=a" (old)); /* Check against async. stack address range. */ new = S390_lowcore.async_stack; if (((new - old) >> (PAGE_SHIFT + THREAD_ORDER)) != 0) { /* Need to switch to the async. stack. */ new -= STACK_FRAME_OVERHEAD; ((struct stack_frame *) new)->back_chain = old; asm volatile(" la 15,0(%0)\n" " basr 14,%2\n" " la 15,0(%1)\n" : : "a" (new), "a" (old), "a" (__do_softirq) : "0", "1", "2", "3", "4", "5", "cc", "memory" ); } else /* We are already on the async stack. */ __do_softirq(); } local_irq_restore(flags); } EXPORT_SYMBOL(do_softirq); |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-28 19:23:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32497 Modified Files: sgec.c Log Message: - The Station Address ROM on a VAXserver 4000 Model 300 contains the "useful" bytes at the 2nd low byte, not at the low byte. - (Notice that the KA670 support isn't yet checked in into CVS.) - Don't yet fiddle with interrupts -- doesn't yet work on my machines. Index: sgec.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/sgec.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sgec.c 8 Oct 2004 22:44:38 -0000 1.3 +++ sgec.c 28 Oct 2004 19:23:42 -0000 1.4 @@ -665,10 +665,14 @@ last_dev = dev; /* Associate IRQ with sgec_interrupt */ + if (0){ if (vsbus_request_irq (lp->vsbus_int, &sgec_interrupt, 0, lp->name, dev)) { printk("SGEC: Can't get irq %d\n", dev->irq); return -EAGAIN; } + } else { + printk (KERN_ERR "Ignoring interrupt for now...\n"); + } sgec_stop(ll); @@ -929,14 +933,17 @@ */ printk("Ethernet address in ROM: "); for (i = 0; i < 6; i++) { - dev->dev_addr[i] = esar[i] & 0xff; + if (is_ka670 ()) + dev->dev_addr[i] = (esar[i] & 0xff00) >> 8; + else + dev->dev_addr[i] = esar[i] & 0xff; printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':'); } /* Don't need this any more */ iounmap (esar); - printk (KERN_INFO "Using LANCE interrupt vector %d, vsbus irq %d\n", + printk (KERN_INFO "Using SGEC interrupt vector %d, vsbus irq %d\n", dev->irq, lp->vsbus_int); dev->open = &sgec_open; |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-17 19:51:38
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25558 Modified Files: early_printk.c Log Message: - On early console shutdown, printk() out that console=ttyS0 may be needed... - Kenn: With this checked in, would you accept CONFIG_VT=y? Index: early_printk.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/early_printk.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- early_printk.c 4 Oct 2004 06:57:05 -0000 1.5 +++ early_printk.c 17 Oct 2004 19:51:30 -0000 1.6 @@ -52,7 +52,10 @@ printk (KERN_WARNING "Not disabling early console " "because it's still needed!\n"); else { - printk (KERN_INFO "Disabling early console\n"); + printk (KERN_INFO "Disabling early console. If this " + "is the last text you see, try to " + "append \"console=ttyS0\" to the " + "kernel command line\n"); unregister_console(&early_console); early_console_enabled = 0; } |
|
From: Kenn H. <ke...@us...> - 2004-10-16 13:05:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30870 Modified Files: head.S Log Message: boot_mv does not need to be global Index: head.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- head.S 4 Oct 2004 23:02:55 -0000 1.17 +++ head.S 16 Oct 2004 13:04:51 -0000 1.18 @@ -347,8 +347,7 @@ .int 0x00000000 # # This is here because we need a safe place to store it as we -# relocate around in memory. It may be handy later. -.globl boot_mv +# relocate around in memory. boot_mv: .int 0x00000000 |
|
From: Kenn H. <ke...@us...> - 2004-10-16 13:02:45
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30363 Modified Files: startup.c Log Message: Remove stale comment Index: startup.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/startup.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- startup.c 10 Mar 2004 10:35:41 -0000 1.8 +++ startup.c 16 Oct 2004 13:02:35 -0000 1.9 @@ -71,11 +71,6 @@ } #endif - /* - * Interrupts are still disabled. Do necessary setups, then - * enable them. - */ - printk("RPB info: .l_pfncnt=0x%08x, .l_vmb_version=0x%08x, " ".l_badpgs=0x%08x\n", boot_rpb.l_pfncnt, boot_rpb.l_vmb_version, boot_rpb.l_badpgs); |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-08 22:44:48
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29550/drivers/vax/net Modified Files: sgec.c Log Message: - Make one more function static. Index: sgec.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/sgec.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- sgec.c 8 Oct 2004 19:26:13 -0000 1.2 +++ sgec.c 8 Oct 2004 22:44:38 -0000 1.3 @@ -982,7 +982,7 @@ /* Find all the SGEC cards on the system and initialize them */ -int __init vax_sgec_probe(struct vsbus_device *vsbus_dev) +static int __init vax_sgec_probe (struct vsbus_device *vsbus_dev) { struct net_device *netdev; int retval; |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-08 19:40:28
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22606/arch/vax/kernel Modified Files: cpu_ka49.c Log Message: - There's a SGEC in KA49! Index: cpu_ka49.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka49.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cpu_ka49.c 8 Oct 2004 16:30:18 -0000 1.5 +++ cpu_ka49.c 8 Oct 2004 19:40:19 -0000 1.6 @@ -170,10 +170,7 @@ retval = platform_device_register (&ka49_vsbus_device); if (!retval) { #ifdef CONFIG_VSBUS -#if 0 - /* No lance, but SGEC instead */ - vsbus_add_fixed_device(&ka49_vsbus_device.dev, "lance", 0x200e0000, 1); -#endif + vsbus_add_fixed_device(&ka49_vsbus_device.dev, "sgec", 0x20008000, 1); vsbus_add_fixed_device(&ka49_vsbus_device.dev, "dz", 0x25000000, 4); #endif } |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-08 19:26:28
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19008/drivers/vax/net Modified Files: sgec.c Log Message: - First round on the SGEC: port over to Kenn's new vsbus API. - Corrected strange MAC address reading from ESAR. - Still doesn't work, of course... Upon bootp, nothing comes out of it:-( - I found an old email (http://solar.physics.montana.edu/hypermail/linux-vax/1673.html) which I'll go through. I guess it may still contain a lot of unapplied chunks (wrt. 2.6.x). - Dumb question: isn't this basically a Tulip without PCI interface? Index: sgec.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/sgec.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sgec.c 4 Oct 2003 17:47:47 -0000 1.1 +++ sgec.c 8 Oct 2004 19:26:13 -0000 1.2 @@ -23,7 +23,8 @@ #include <linux/ioport.h> /* for autoirq_setup/_report */ #include <asm/pgalloc.h> /* for __flush_tlb_one */ -#include <asm/vsa.h> +#include <asm/bus/vsbus.h> +#include <asm/mv.h> /* use #undef to turn these off */ #define VAX_SGEC_DEBUG @@ -212,14 +213,22 @@ /* * Adresses. */ -#define SGECADDR 0x20008000 -/*defines for the network card address in ROM */ -#define NISA_ROM 0x20084000 /* QBUS address - 3100/85 */ -/* #define NISA_ROM 0x27800000 * vsbus address */ -#define SGECVEC 0x108 - -/* register offsets */ +#define NISA_ROM ( \ + { \ + unsigned long __addr; \ + if (is_ka49 ()) \ + /* VS 4000m90 */ \ + __addr = 0x27800000; \ + else \ + /* QBUS 3100/85 */ \ + __addr = 0x20084000; \ + \ + __addr; \ + }) +/* + * Register offsets + */ #define SG_CSR0 0 #define SG_CSR1 4 #define SG_CSR2 8 @@ -537,7 +546,6 @@ volatile struct sgec_regs *ll = lp->ll; volatile struct sgec_tx_desc *td; int i, j; - int status; j = lp->tx_old; spin_lock(&lp->lock); @@ -602,7 +610,7 @@ spin_unlock(&lp->lock); } -static void sgec_interrupt(const int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t sgec_interrupt(const int irq, void *dev_id, struct pt_regs *regs) { struct net_device *dev = (struct net_device *) dev_id; struct sgec_private *lp = (struct sgec_private *) dev->priv; @@ -613,12 +621,10 @@ if ((csr5 & SG_NICSR5_IS) == 0) { /* Hmmm, not for us... */ - return; + return IRQ_NONE; } writereg(&ll->sg_nicsr5, csr5); /* reset interrupt */ - vsbus_clear_int(lp->vsbus_int); - /* if ((csr0 & LE_C0_ERR)) { * Clear the error condition writecsr0(ll, LE_C0_BABL | LE_C0_ERR | LE_C0_MISS | @@ -644,28 +650,26 @@ netif_wake_queue(dev); } */ + + return IRQ_HANDLED; } -struct net_device *last_dev = 0; +extern struct net_device *last_dev; static int sgec_open(struct net_device *dev) { struct sgec_private *lp = (struct sgec_private *) dev->priv; volatile struct sgec_init_block *ib = lp->init_block; volatile struct sgec_regs *ll = lp->ll; - int status = 0; last_dev = dev; /* Associate IRQ with sgec_interrupt */ - if (request_irq(dev->irq, &sgec_interrupt, 0, lp->name, dev)) { + if (vsbus_request_irq (lp->vsbus_int, &sgec_interrupt, 0, lp->name, dev)) { printk("SGEC: Can't get irq %d\n", dev->irq); return -EAGAIN; } - /* this is just a hack for now */ - vsbus_enable_int(lp->vsbus_int); - sgec_stop(ll); /* Clear the multicast filter */ @@ -680,14 +684,7 @@ netif_start_queue(dev); - status = init_restart_sgec(lp); - - /* - * if (!status) - * MOD_INC_USE_COUNT; - */ - - return status; + return init_restart_sgec(lp); } static int sgec_close(struct net_device *dev) @@ -879,36 +876,23 @@ sgec_set_multicast(dev); } -volatile void *base_addr=NULL; - -static int __init vax_sgec_init(struct net_device *dev) +static int __init vax_sgec_init(struct net_device *dev, + struct vsbus_device *vsbus_dev) { static unsigned version_printed = 0; struct sgec_private *lp; volatile struct sgec_regs *ll; int i, ret; - unsigned char *esar; + volatile unsigned long *esar; /* Could these base addresses be different on other CPUs? */ - unsigned long sgec_phys_addr=SGECADDR; - unsigned long esar_phys_addr=NISA_ROM; + unsigned long sgec_phys_addr = vsbus_dev->phys_base; + unsigned long esar_phys_addr = NISA_ROM; + printk (KERN_INFO "esar_phys_addr = 0x%08x\n", esar_phys_addr); if (version_printed++ == 0) printk(version); - if (dev == NULL) { - dev = init_etherdev(0, sizeof(struct sgec_private) + 8); - } else { - dev->priv = kmalloc(sizeof(struct sgec_private) + 8, - GFP_KERNEL); - if (dev->priv == NULL) - return -ENOMEM; - memset(dev->priv, 0, sizeof(struct sgec_private) + 8); - - } - /* Make certain the data structures used by the SGEC are aligned. */ - dev->priv = (void *) (((unsigned long) dev->priv + 7) & ~7); - lp = (struct sgec_private *) dev->priv; spin_lock_init(&lp->lock); @@ -924,21 +908,18 @@ dev->mem_end = dev->mem_start + 65536; - /* FIXME: check this for NULL */ - base_addr=ioremap(sgec_phys_addr, 0x8); - - dev->base_addr=(unsigned long)base_addr; + dev->base_addr = (unsigned long) ioremap (sgec_phys_addr, 0x8); + dev->irq = vsbus_irqindex_to_irq (vsbus_dev->vsbus_irq); lp->sgec_mem = (volatile struct sgec_shared_mem *)(dev->mem_start); lp->init_block = &(lp->sgec_mem->init_block); - /* need something meaningful in here */ - dev->irq = 0; + lp->vsbus_int = vsbus_dev->vsbus_irq; - ll = (struct sgec_regs *) base_addr; + ll = (struct sgec_regs *) dev->base_addr; /* FIXME: deal with failure here */ - esar=ioremap(esar_phys_addr, 0x80); + esar = ioremap (esar_phys_addr, 0x80); /* 3rd byte contains address part in 3100/85 -RB */ /* Note that 660 board types use a different position */ @@ -948,67 +929,15 @@ */ printk("Ethernet address in ROM: "); for (i = 0; i < 6; i++) { - dev->dev_addr[i] = esar[(i * 4) - 2]; + dev->dev_addr[i] = esar[i] & 0xff; printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':'); } /* Don't need this any more */ - iounmap(esar); - -#ifdef CONFIG_VSBUS -#ifndef CONFIG_VAX_4000HC - { - int num, irq; - autoirq_setup(0); - vsbus_probe_irq_on(); - writereg(&ll->sg_nicsr6, SG_NICSR6_RE); /* reset status register */ - writereg(&ll->sg_nicsr6, SG_NICSR6_IE); /* enable interrupts */ - udelay(1000); - num=vsbus_probe_irq_report(); - irq=autoirq_report(0); - if (num) - lp->vsbus_int=num; - } -#else - lp->vsbus_int=1; -#endif - -#endif - -#ifdef VAX_SGEC_AUTOPROBE_IRQ -#ifndef CONFIG_VAX_4000HC - printk("Autoprobing SGEC interrupt vector..."); - - autoirq_setup(0); - vsbus_enable_int(lp->vsbus_int); - sgec_stop(ll); - - writereg(&ll->sg_nicsr6, SG_NICSR6_RE|SG_NICSR6_IE); -#ifdef CONFIG_VSBUS - /*lp->vsbus_int=vsbus_probe_irq_report();*/ -#endif - - dev->irq = autoirq_report(100); - vsbus_clear_int(lp->vsbus_int); -#else - dev->irq=SGECVEC; -#endif - if (dev->irq) - printk(" probed IRQ %d, vsbus %d\n", dev->irq, lp->vsbus_int); - else - { - dev->irq=SGECVEC; - printk(" failed to detect IRQ line - assuming 0x108.\n"); - } - /* Fill the dev fields */ + iounmap (esar); -#else - dev->irq=SGECVEC; - printk("Using SGEC interrupt vector %d\n", dev->irq); -#endif - /* tmp atp*/ - dev->irq=SGECVEC; - printk("Using SGEC interrupt vector %d\n", dev->irq); + printk (KERN_INFO "Using LANCE interrupt vector %d, vsbus irq %d\n", + dev->irq, lp->vsbus_int); dev->open = &sgec_open; dev->stop = &sgec_close; @@ -1041,14 +970,7 @@ lp->multicast_timer.data = (unsigned long) dev; lp->multicast_timer.function = &sgec_set_multicast_retry; -#ifdef MODULE - /* - dev->ifindex = dev_new_index(); - lp->next_module = root_sgec_dev; - root_sgec_dev = lp; - #endif - */ -#endif + SET_NETDEV_DEV(dev, &vsbus_dev->dev); return 0; @@ -1060,44 +982,45 @@ /* Find all the SGEC cards on the system and initialize them */ -int __init vax_sgec_probe(void) +int __init vax_sgec_probe(struct vsbus_device *vsbus_dev) { - struct net_device *dev = NULL; - static int called = 0; + struct net_device *netdev; + int retval; + + printk("vax_sgec_probe: name = %s, base = 0x%08x, irqindex = %d\n", + vsbus_dev->dev.bus_id, vsbus_dev->phys_base, vsbus_dev->vsbus_irq); + + netdev = alloc_etherdev (sizeof (struct sgec_private)); + if (!netdev) + return -ENOMEM; + + retval = vax_sgec_init (netdev, vsbus_dev); + if (retval == 0) { + retval = register_netdev (netdev); + if (retval) + free_netdev (netdev); + } - if (!called) - { - called=1; - return vax_sgec_init(dev); - } - else - return -ENODEV; + return 0; } -__initcall(vax_sgec_probe); - -#ifdef MODULE +static struct vsbus_driver vax_sgec_driver = { + .probe = vax_sgec_probe, + .drv = { + .name = "sgec", + }, +}; -int init_module(void) +int __init sgec_init_module (void) { - root_sgec_dev = NULL; - return vax_sgec_probe(NULL); + return vsbus_register_driver (&vax_sgec_driver); } -void cleanup_module(void) +void __exit sgec_exit_module (void) { - struct sgec_private *lp; - - while (root_sgec_dev) { - lp = root_sgec_dev->next_module; - - unregister_netdev(root_sgec_dev->dev); - kfree(root_sgec_dev->dev); - root_sgec_dev = lp; - } + printk (KERN_ERR "vax_sgec_exit: What to do???\n"); } -#endif - - +module_init (sgec_init_module); +module_exit (sgec_exit_module); |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-08 16:30:33
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8768/arch/vax/kernel Modified Files: cpu_ka49.c Log Message: - Reversing the SIDEX value actually makes it boot using the new __CPUMATCH infrastructure. - Still SGEC remains to be brought to life again, as well as the vsbus driver (needed for DZ). Index: cpu_ka49.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka49.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- cpu_ka49.c 4 Oct 2004 06:56:10 -0000 1.4 +++ cpu_ka49.c 8 Oct 2004 16:30:18 -0000 1.5 @@ -22,8 +22,8 @@ int start, slut; #ifdef CONFIG_DZ - init_dz11_console(0x25000000, 3); - dz_serial_console_init(); + init_dz11_console (0x25000000, 3); + dz_serial_console_init (); #endif /* * Enable Caches @@ -147,7 +147,7 @@ .sidex_addr = NVAX_SIDEX_ADDR, .sidex_mask = 0xffffffff, /* Don't yet know how to interpret SID + SIDEX, so keep it tight */ - .sidex_match = 0x02000104, + .sidex_match = 0x04010002, }; static struct platform_device ka49_vsbus_device = { |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-08 10:20:13
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20428 Modified Files: Makefile Log Message: - Start resurrecting the SGEC driver by actually adding it to the build system... - Maybe DELAQ should be checked, too... Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 4 Oct 2003 18:22:37 -0000 1.5 +++ Makefile 8 Oct 2004 10:19:50 -0000 1.6 @@ -4,5 +4,5 @@ obj-$(CONFIG_DELQA) += delqa.o obj-$(CONFIG_VAX_LANCE) += lance.o -obj-$(CONFIG_SGEC) += sgec.o +obj-$(CONFIG_VAX_SGEC) += sgec.o |
|
From: Kenn H. <ke...@us...> - 2004-10-04 23:03:10
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30369/arch/vax/boot Modified Files: head.S Log Message: Make mv.pre_vm_init an optional pointer. Also print a blank line at start of boot output (KA42 and KA46 consoles leave the cursor immediately after -ESA0 when netbooting) Index: head.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- head.S 29 Sep 2004 21:49:58 -0000 1.16 +++ head.S 4 Oct 2004 23:02:55 -0000 1.17 @@ -68,8 +68,8 @@ addl2 %r8, MV_PRE_VM_GETCHAR(%r10) addl2 %r8, MV_CPU_TYPE_STR(%r10) - # pre_vm_init is called after we relocate - subl2 $PAGE_OFFSET, MV_PRE_VM_INIT(%r10) + calls $0, boot_crlf + calls $0, boot_crlf # print the cpu type calls $0, boot_print_cpu_id @@ -168,7 +168,11 @@ movl boot_r11, %r11 movc3 $RPB_SIZE, (%r11), boot_rpb movl mv, %r10 + tstl MV_PRE_VM_INIT(%r10) + beql no_pre_vm_init + subl2 $PAGE_OFFSET, MV_PRE_VM_INIT(%r10) calls $0, *MV_PRE_VM_INIT(%r10) +no_pre_vm_init: # set up the system page table for all of physical memory. # for the i386, the first page only is setup. For us, as the |
|
From: Kenn H. <ke...@us...> - 2004-10-04 23:00:05
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29852/arch/vax/boot Modified Files: lib.c Log Message: Speed up boot_memmove Index: lib.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/lib.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- lib.c 30 Sep 2004 05:31:04 -0000 1.6 +++ lib.c 4 Oct 2004 22:59:51 -0000 1.7 @@ -78,18 +78,53 @@ void __boot boot_memmove(void *dest, const void *src, size_t count) { - char *tmp, *s; + char *d, *s; + int *di; + int *si; if (dest <= src) { - tmp = (char *) dest; - s = (char *) src; - while (count--) - *tmp++ = *s++; + si = (int *) src; + di = (int *) dest; + + while (count & ~3) { + *di++ = *si++; + count -= 4; + } + d = (char *) di; + s = (char *) si; + + if (count & 2) { + *d++ = *s++; + *d++ = *s++; + count ++; + count ++; + } + + if (count & 1) { + *d++ = *s++; + count ++; + } + } else { - tmp = (char *) dest + count; + d = (char *) dest + count; s = (char *) src + count; - while (count--) - *--tmp = *--s; + + if (count & 1) { + *--d = *--s; + count--; + } + + if (count & 2) { + *--d = *--s; + *--d = *--s; + count--; + count--; + } + + si = (int *) s; + di = (int *) d; + while (count -= 4) + *--di = *--si; } } |
|
From: Jan-Benedict G. <jb...@us...> - 2004-10-04 06:57:27
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14838/arch/vax/kernel Modified Files: early_printk.c Log Message: - KERN_WARN -> KERN_WARNING Index: early_printk.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/early_printk.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- early_printk.c 4 Oct 2004 06:55:26 -0000 1.4 +++ early_printk.c 4 Oct 2004 06:57:05 -0000 1.5 @@ -49,7 +49,7 @@ { if (early_console_enabled) { if (mv->keep_early_console) - printk (KERN_WARN "Not disabling early console " + printk (KERN_WARNING "Not disabling early console " "because it's still needed!\n"); else { printk (KERN_INFO "Disabling early console\n"); |
