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: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:37:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10024/bus Modified Files: cqbic.c qbus.c vsbus-ka4x.c vsbus.c Log Message: - Some more __iomem and whitespace updates. Index: cqbic.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/cqbic.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cqbic.c 9 May 2004 23:39:58 -0000 1.3 +++ cqbic.c 25 Apr 2005 09:37:11 -0000 1.4 @@ -3,7 +3,7 @@ * * Support for the CQBIC (which I guess stands for something like * CVAX QBus Interface Chip). - * + * * This is the QBUS bus adapter used in the KA640/650/655. * Documentation is in the KA655 Technical manual * (EK-KA655-TM-001, available online via http://vt100.net/manx). @@ -35,13 +35,13 @@ static struct device_driver cqbic_driver; struct cqbic_private { - struct qbus_ops *bus_ops; + struct qbus_ops * bus_ops; DECLARE_BITMAP(vector_bitmap, QBUS_NUM_VECTORS); - unsigned int * mapregbase; - unsigned long iospace_phys_base; - unsigned int scb_offset; + unsigned int __iomem * mapregbase; + unsigned long iospace_phys_base; + unsigned int scb_offset; }; /* Given a (start, len), how many pagelets does this span? */ @@ -84,10 +84,10 @@ This is a very dumb allocator - does linear searches for available registers. Need a better way to do this. My first thought was to - use bits 30:0 in invalid map registers to contain forward and + use bits 30:0 in invalid map registers to contain forward and backward links to maintain a list of free registers. However, bits 30:20 are reserved (read as zero and should be written as zero), - so that only leaves us with 20 bits for links. This would be + so that only leaves us with 20 bits for links. This would be OK if we allow the allocation granularity to be 8 registers. - KPH */ @@ -121,7 +121,7 @@ map->virtaddr = start; map->busaddr = (reg * PAGELET_SIZE) + ((unsigned int)start & ~PAGELET_MASK); #if CQBIC_DEBUG - printk("Using map registers 0x%04x to 0x%04x to map virt %p to %p (bus %08x)\n", + printk("Using map registers 0x%04x to 0x%04x to map virt %p to %p (bus %08x)\n", reg, reg + pagelets - 1, start, (char *)start + len - 1, map->busaddr); #endif @@ -155,13 +155,13 @@ for (i=0; i<CQBIC_NUMMAPREGS; i++) { if (cqbic->mapregbase[i] != 0) { - printk("CQBIC map reg %04x = %08x (-> %08x)\n", i, + printk("CQBIC map reg %04x = %08x (-> %08x)\n", i, cqbic->mapregbase[i], (cqbic->mapregbase[i] & 0xfffff) << PAGELET_SHIFT); } } } - + /* Traditionally, QBUS interrupt vectors are multiples of 4. */ @@ -178,7 +178,7 @@ const char * devname, void *dev_id) { - return request_irq(cqbic_vector_to_irq(busdev, vector), + return request_irq(cqbic_vector_to_irq(busdev, vector), handler, irqflags, devname, dev_id); } @@ -192,7 +192,7 @@ return test_and_set_bit(vector / 4, cqbic->vector_bitmap); } -/* Locate an available interrupt vector and mark it reserved. Return 0 +/* Locate an available interrupt vector and mark it reserved. Return 0 if none available. */ static unsigned int cqbic_alloc_vector(struct device *busdev) @@ -267,7 +267,7 @@ static int __init cqbic_probe(struct device *busdev) { int i; - void *cqbic_iospace; + void __iomem *cqbic_iospace; struct cqbic_private *cqbic; cqbic = kmalloc(sizeof(*cqbic), GFP_KERNEL); @@ -283,14 +283,14 @@ cqbic->iospace_phys_base = CQBIC_IOSPACE_BASE; - /* The CQBIC maps QBUS interrupts to the second page of the SCB + /* The CQBIC maps QBUS interrupts to the second page of the SCB (each page of the SCB contains 128 vectors). */ cqbic->scb_offset = 128; /* Mark vector 0 as reserved */ set_bit(0, cqbic->vector_bitmap); - cqbic->mapregbase = (unsigned int *)ioremap(CQBIC_MAPREGPHYS, + cqbic->mapregbase = (unsigned int *)ioremap(CQBIC_MAPREGPHYS, CQBIC_NUMMAPREGS * sizeof(unsigned int)); #if CQBIC_DEBUG printk("CQBIC map registers mapped at %p\n", cqbic->mapregbase); @@ -324,7 +324,7 @@ }; int __init cqbic_init(void) -{ +{ return driver_register(&cqbic_driver); } Index: qbus.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/qbus.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- qbus.c 26 Apr 2004 23:29:52 -0000 1.9 +++ qbus.c 25 Apr 2005 09:37:11 -0000 1.10 @@ -20,7 +20,7 @@ #define QBUS_DEBUG 0 -/* These DMA, memory mapping and IRQ handling functions isolate +/* These DMA, memory mapping and IRQ handling functions isolate drivers for QBUS devices from the details of how the QBUS is hooked up to the rest of the system */ Index: vsbus.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/vsbus.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vsbus.c 28 Feb 2005 22:46:19 -0000 1.3 +++ vsbus.c 25 Apr 2005 09:37:11 -0000 1.4 @@ -1,20 +1,20 @@ /* * $Id$ * - * Support for the VSBUS pseudo-bus type. + * Support for the VSBUS pseudo-bus type. * - * As far as I can make out, VAXstation 3100, MicroVAX 3100 and - * VAXstation 4000 series machines have a chunk of bus interface + * As far as I can make out, VAXstation 3100, MicroVAX 3100 and + * VAXstation 4000 series machines have a chunk of bus interface * circuitry between the main CPU-memory bus and the on-board * peripheral chips (ethernet controller, SCSI controller, etc). * I imagine that this 'bus adapter' is responsible for mapping - * device interrupt lines to VAX SCB vectors, doing address - * line decoding to locate these devices in I/O space and + * device interrupt lines to VAX SCB vectors, doing address + * line decoding to locate these devices in I/O space and * provide DMA facilities to main memory. * * It would be real nice to see a datasheet or tech manual * for one of these boards. - * + * * This file implements the drivel model 'bus type' for the VSBUS * and the common features of all the VSBUS implementations. * @@ -31,7 +31,7 @@ #define VSBUS_DEBUG 1 -static struct vsbus_registers *vs_cpu_ptr; +static struct vsbus_registers __iomem *vs_cpu_ptr; static unsigned int vsbus_rom_vectors[VSBUS_NR_IRQS]; @@ -73,7 +73,7 @@ causes the ROM to place the longword at that address on the data bus, which the CPU picks up as the interrupt vector. - So, in summary, the firmware ROM contains an 8-longword table + So, in summary, the firmware ROM contains an 8-longword table at physical address 0x20040020, which contains the interrupt vectors. The hardware-specific driver fills in this table. */ @@ -118,7 +118,7 @@ return info->handler(irq, info->dev_id, regs); } -int vsbus_request_irq(unsigned int vsbus_irqindex, +int vsbus_request_irq(unsigned int vsbus_irqindex, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long irqflags, const char *devname, void *dev_id) { @@ -131,7 +131,7 @@ } info = irqinfo + vsbus_irqindex; - + /* FIXME: need a semaphore here */ if (info->handler) { @@ -181,7 +181,7 @@ } -void vsbus_add_fixed_device(struct device *parent, char *name, +void vsbus_add_fixed_device(struct device *parent, char *name, unsigned int phys_base, unsigned int irqindex) { struct vsbus_device *vsbus_dev; @@ -240,7 +240,7 @@ } /* This gets called for each device when a new driver is - registered. Since the set of devices that can appear on + registered. Since the set of devices that can appear on the VSBUS is very limited, we can get away with a very simple name-based match. */ Index: vsbus-ka4x.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/bus/vsbus-ka4x.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vsbus-ka4x.c 18 Sep 2004 23:06:33 -0000 1.3 +++ vsbus-ka4x.c 25 Apr 2005 09:37:11 -0000 1.4 @@ -19,12 +19,12 @@ static int __init vsbus_ka4x_probe(struct device *busdev) { - unsigned int *vectors; + unsigned int __iomem *vectors; int retval; /* * Map the area where we expect to find our device - * interrupt vectors so that we can copy them somewhere + * interrupt vectors so that we can copy them somewhere * more convenient */ |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:37:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10024/scsi Modified Files: vax-5380.c Log Message: - Some more __iomem and whitespace updates. Index: vax-5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi/vax-5380.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- vax-5380.c 28 Feb 2005 22:47:49 -0000 1.6 +++ vax-5380.c 25 Apr 2005 09:37:12 -0000 1.7 @@ -78,7 +78,7 @@ struct Scsi_Host *host; int retval = -ENOMEM; - printk("vax_5380_probe: name = %s, base = 0x%08x, irqindex = %d\n", + printk("vax_5380_probe: name = %s, base = 0x%08x, irqindex = %d\n", vsbus_dev->dev.bus_id, vsbus_dev->phys_base, vsbus_dev->vsbus_irq); host = scsi_host_alloc(&vax_5380_template, sizeof(struct NCR5380_hostdata)); |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:37:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10024/char Modified Files: dz.c Log Message: - Some more __iomem and whitespace updates. Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/char/dz.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dz.c 28 Mar 2005 16:26:54 -0000 1.3 +++ dz.c 25 Apr 2005 09:37:12 -0000 1.4 @@ -1,9 +1,9 @@ /* - * dz.c: Serial port driver for DECStations & VAXstations equiped + * dz.c: Serial port driver for DECStations & VAXstations equiped * with the DZ chipset. * - * Copyright (C) 1998 Olivier A. D. Lebaillif - * + * Copyright (C) 1998 Olivier A. D. Lebaillif + * * Email: oli...@if... * * [31-AUG-98] triemer @@ -11,13 +11,13 @@ * removed base_addr code - moving address assignment to setup.c * Changed name of dz_init to rs_init to be consistent with tc code * [13-NOV-98] triemer fixed code to receive characters - * after patches by harald to irq code. + * after patches by harald to irq code. * [09-JAN-99] triemer minor fix for schedule - due to removal of timeout * field from "current" - somewhere between 2.1.121 and 2.1.131 * [27-JUN-2001] Arnaldo Carvalho de Melo <ac...@co...> - cleanups - * - * Parts (C) 1999 David Airlie, ai...@li... - * [07-SEP-99] Bugfixes + * + * Parts (C) 1999 David Airlie, ai...@li... + * [07-SEP-99] Bugfixes */ /* #define DEBUG_DZ 1 */ @@ -28,7 +28,7 @@ #include <linux/device.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/init.h> +#include <linux/init.h> #include <linux/slab.h> #include <linux/mm.h> #include <linux/major.h> @@ -76,7 +76,7 @@ #ifdef DEBUG_DZ /* - * debugging code to send out chars via prom + * debugging code to send out chars via prom */ static void debug_console( const char *s,int count) { @@ -94,7 +94,7 @@ * ------------------------------------------------------------ * dz_in () and dz_out () * - * These routines are used to access the registers of the DZ + * These routines are used to access the registers of the DZ * chip, hiding relocation differences between implementation. * ------------------------------------------------------------ */ @@ -117,21 +117,21 @@ * ------------------------------------------------------------ * rs_stop () and rs_start () * - * These routines are called before setting or resetting - * tty->stopped. They enable or disable transmitter interrupts, + * These routines are called before setting or resetting + * tty->stopped. They enable or disable transmitter interrupts, * as necessary. * ------------------------------------------------------------ */ static void dz_stop (struct tty_struct *tty) { - struct dz_serial *info; + struct dz_serial *info; unsigned short mask, tmp; - if (!tty) - return; - - info = (struct dz_serial *)tty->driver_data; + if (!tty) + return; + + info = (struct dz_serial *)tty->driver_data; mask = 1 << info->line; tmp = dz_in (info, DZ_TCR); /* read the TX flag */ @@ -154,17 +154,17 @@ /* * ------------------------------------------------------------ - * Here starts the interrupt handling routines. All of the - * following subroutines are declared as inline and are folded - * into dz_interrupt. They were separated out for readability's - * sake. + * Here starts the interrupt handling routines. All of the + * following subroutines are declared as inline and are folded + * into dz_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 dz.c * * and look at the resulting assemble code in serial.s. @@ -267,7 +267,7 @@ #ifdef DEBUG_DZ debug_console("FERR\n",5); #endif /* DEBUG_DZ */ - } if (tmp & DZ_OERR) { + } if (tmp & DZ_OERR) { #ifdef DEBUG_DZ debug_console("OERR\n",5); #endif /* DEBUG_DZ */ @@ -348,7 +348,7 @@ return; status = dz_in(info, DZ_MSR); - + /* it's easy, since DSR2 is the only bit in the register */ if (status) info->icount.dsr++; @@ -372,7 +372,7 @@ status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */ info = lines[LINE(status)]; /* re-arrange info the proper port */ - if (status & DZ_RDONE) + if (status & DZ_RDONE) receive_chars (info); /* the receive function */ return IRQ_HANDLED; @@ -386,7 +386,7 @@ status = dz_in ((struct dz_serial *)dev, DZ_CSR); /* get the reason why we just got an irq */ info = lines[LINE(status)]; /* re-arrange info the proper port */ - if (status & DZ_TRDY) + if (status & DZ_TRDY) transmit_chars (info); return IRQ_HANDLED; @@ -422,13 +422,13 @@ * * serial interrupt routine -> (scheduler tqueue) -> * do_serial_hangup() -> tty->hangup() -> rs_hangup() - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static void do_serial_hangup (void *private_data) { struct dz_serial *info = (struct dz_serial *) private_data; struct tty_struct *tty = info->tty; - + if (!tty) return; @@ -440,22 +440,22 @@ * startup () * * various initialization tasks - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static int startup (struct dz_serial *info) { unsigned long page, flags; unsigned short tmp; - if (info->is_initialized) + if (info->is_initialized) return 0; - + save_and_cli(flags); if (!info->port) { if (info->tty) set_bit (TTY_IO_ERROR, &info->tty->flags); restore_flags (flags); - return -ENODEV; + return -ENODEV; } if (!info->xmit_buf) { @@ -467,7 +467,7 @@ info->xmit_buf = (unsigned char *)page; } - if (info->tty) + if (info->tty) clear_bit (TTY_IO_ERROR, &info->tty->flags); /* enable the interrupt and the scanning */ @@ -479,7 +479,7 @@ change_speed (info); /* set up the speed */ - /* + /* * Clear the line transmitter buffer I can't figure out why I need to * do this - but its necessary - in order for the console portion and * the interrupt portion to live happily side by side. @@ -487,18 +487,18 @@ info->is_initialized = 1; - restore_flags (flags); + restore_flags (flags); return 0; } -/* +/* * ------------------------------------------------------------------- * shutdown () * * 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 dz_serial *info) { @@ -536,12 +536,12 @@ restore_flags (flags); } -/* +/* * ------------------------------------------------------------------- * change_speed () * * set the baud rate. - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static void change_speed (struct dz_serial *info) { @@ -551,9 +551,9 @@ if (!info->tty || !info->tty->termios) return; - + save_and_cli(flags); - + info->cflags = info->line; cflag = info->tty->termios->c_cflag; @@ -568,7 +568,7 @@ case CS7: info->cflags |= DZ_CS7; break; - case CS8: + case CS8: default: info->cflags |= DZ_CS8; } @@ -579,7 +579,7 @@ info->cflags |= DZ_PARENB; if (cflag & PARODD) info->cflags |= DZ_PARODD; - + baud = tty_get_baud_rate(info->tty); switch (baud) { case 50: @@ -593,19 +593,19 @@ break; case 134: info->cflags |= DZ_B134; - break; + break; case 150: info->cflags |= DZ_B150; break; case 300: info->cflags |= DZ_B300; - break; + break; case 600: info->cflags |= DZ_B600; break; case 1200: info->cflags |= DZ_B1200; - break; + break; case 1800: info->cflags |= DZ_B1800; break; @@ -617,16 +617,16 @@ break; case 3600: info->cflags |= DZ_B3600; - break; + break; case 4800: info->cflags |= DZ_B4800; break; case 7200: info->cflags |= DZ_B7200; - break; - case 9600: + break; + case 9600: default: - info->cflags |= DZ_B9600; + info->cflags |= DZ_B9600; } info->cflags |= DZ_RXENAB; @@ -635,8 +635,8 @@ /* setup accept flag */ info->read_status_mask = DZ_OERR; if (I_INPCK(info->tty)) - info->read_status_mask |= (DZ_FERR | DZ_PERR); - + info->read_status_mask |= (DZ_FERR | DZ_PERR); + /* characters to ignore */ info->ignore_status_mask = 0; if (I_IGNPAR(info->tty)) @@ -645,12 +645,12 @@ restore_flags(flags); } -/* +/* * ------------------------------------------------------------------- * dz_flush_char () * * Flush the buffer. - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static void dz_flush_chars (struct tty_struct *tty) { @@ -667,12 +667,12 @@ } -/* +/* * ------------------------------------------------------------------- * dz_write () * * main output routine. - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static int dz_write (struct tty_struct *tty, const unsigned char *buf, int count) @@ -720,12 +720,12 @@ return ret; } -/* +/* * ------------------------------------------------------------------- * dz_write_room () * * compute the amount of space available for writing. - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static int dz_write_room (struct tty_struct *tty) { @@ -739,31 +739,31 @@ return ret; } -/* +/* * ------------------------------------------------------------------- * dz_chars_in_buffer () * * compute the amount of char left to be transmitted - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static int dz_chars_in_buffer (struct tty_struct *tty) { struct dz_serial *info = (struct dz_serial *)tty->driver_data; - + return info->xmit_cnt; } -/* +/* * ------------------------------------------------------------------- * dz_flush_buffer () * * Empty the output buffer - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ static void dz_flush_buffer (struct tty_struct *tty) { struct dz_serial *info = (struct dz_serial *)tty->driver_data; - + cli(); info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; sti(); @@ -778,14 +778,14 @@ /* * ------------------------------------------------------------ * dz_throttle () and dz_unthrottle () - * + * * This routine is called by the upper-layer tty layer to signal that * incoming characters should be throttled (or not). * ------------------------------------------------------------ */ static void dz_throttle (struct tty_struct *tty) { - struct dz_serial *info = (struct dz_serial *)tty->driver_data; + struct dz_serial *info = (struct dz_serial *)tty->driver_data; if (I_IXOFF(tty)) info->x_char = STOP_CHAR(tty); @@ -793,7 +793,7 @@ static void dz_unthrottle (struct tty_struct *tty) { - struct dz_serial *info = (struct dz_serial *)tty->driver_data; + struct dz_serial *info = (struct dz_serial *)tty->driver_data; if (I_IXOFF(tty)) { if (info->x_char) @@ -822,7 +822,7 @@ struct serial_struct *retinfo) { struct serial_struct tmp; - + if (!retinfo) return -EFAULT; @@ -884,7 +884,7 @@ * release the bus after transmitting. This must be done when * the transmit shift register is empty, not be done when the * transmit holding register is empty. This functionality - * allows an RS485 driver to be written in user space. + * allows an RS485 driver to be written in user space. */ static int get_lsr_info (struct dz_serial *info, unsigned int *value) { @@ -972,7 +972,7 @@ case TIOCSERGSTRUCT: return copy_to_user((struct dz_serial *)arg, info, sizeof(struct dz_serial)) ? -EFAULT : 0; - + default: return -ENOIOCTLCMD; } @@ -1000,7 +1000,7 @@ /* * ------------------------------------------------------------ * dz_close() - * + * * This routine is called when the serial port gets closed. First, we * wait for the last remaining data to be sent. Then, we turn off * the transmit enable and receive enable flags. @@ -1013,8 +1013,8 @@ if (!info) return; - - save_and_cli(flags); + + save_and_cli(flags); if (tty_hung_up_p(filp)) { restore_flags(flags); @@ -1089,7 +1089,7 @@ static void dz_hangup (struct tty_struct *tty) { struct dz_serial *info = (struct dz_serial *) tty->driver_data; - + dz_flush_buffer(tty); shutdown(info); info->event = 0; @@ -1107,7 +1107,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct dz_serial *info) { - DECLARE_WAITQUEUE(wait, current); + DECLARE_WAITQUEUE(wait, current); int retval; int do_clocal = 0; @@ -1159,7 +1159,7 @@ } schedule(); } - + current->state = TASK_RUNNING; remove_wait_queue (&info->open_wait, &wait); if (!tty_hung_up_p(filp)) @@ -1174,7 +1174,7 @@ /* * This routine is called whenever a serial port is opened. It - * enables interrupts for a serial port. It also performs the + * enables interrupts for a serial port. It also performs the * serial-specific initialization for the tty structure. */ static int dz_open (struct tty_struct *tty, struct file *filp) @@ -1314,7 +1314,7 @@ local_irq_save(flags); for (i=0; i < DZ_NB_PORT; i++) { - info = &multi[i]; + info = &multi[i]; lines[i] = info; info->magic = SERIAL_MAGIC; @@ -1329,8 +1329,8 @@ info->blocked_open = 0; INIT_WORK(&info->tqueue, do_softint, info); INIT_WORK(&info->tqueue_hangup, do_serial_hangup, info); - init_waitqueue_head(&info->open_wait); - init_waitqueue_head(&info->close_wait); + init_waitqueue_head(&info->open_wait); + init_waitqueue_head(&info->close_wait); /* * If we are pointing to address zero then punt - not correctly @@ -1383,35 +1383,35 @@ int tmp; dz_out(info, DZ_CSR, DZ_CLR); while ((tmp = dz_in(info,DZ_CSR)) & DZ_CLR); - + /* Enable scanning */ - dz_out(info, DZ_CSR, DZ_MSE); + dz_out(info, DZ_CSR, DZ_MSE); } #endif - + /* * Order matters here... the trick is that flags is updated... in * request_irq - to immediatedly obliterate it is unwise. */ local_irq_restore(flags); - + /* The bus-specific IRQ we are handed in the vsbus_dev * structure is the TX interrupt. The RX is always the * next one up. */ - printk("dz.c: using irq rx %d(bus %d), irq tx %d(bus %d)\n", + printk("dz.c: using irq rx %d(bus %d), irq tx %d(bus %d)\n", vsbus_irqindex_to_irq(vsbus_dev->vsbus_irq + 1), vsbus_dev->vsbus_irq + 1, vsbus_irqindex_to_irq(vsbus_dev->vsbus_irq), vsbus_dev->vsbus_irq); - + if (vsbus_request_irq (vsbus_dev->vsbus_irq, dz_interrupt_tx, SA_INTERRUPT, "DZ-TX", lines[0])) panic ("Unable to register DZ TX interrupt\n"); if (vsbus_request_irq (vsbus_dev->vsbus_irq + 1, dz_interrupt_rx, SA_INTERRUPT, "DZ-RX", lines[0])) panic ("Unable to register DZ RX interrupt\n"); /* enable scanning */ - dz_out(info, DZ_CSR, DZ_MSE); + dz_out(info, DZ_CSR, DZ_MSE); return 0; } @@ -1433,7 +1433,7 @@ dz_console = &multi[CONSOLE_LINE]; save_and_cli(flags); - + mask = 1 << dz_console->line; tcr = dz_in (dz_console, DZ_TCR); /* read the TX flag */ dz_out(dz_console, DZ_TCR, mask); @@ -1441,7 +1441,7 @@ /* spin our wheels */ while (((dz_in(dz_console, DZ_CSR) & DZ_TRDY) != DZ_TRDY) && loops--) ; - + /* Actually transmit the character. */ dz_out(dz_console, DZ_TDR, tmp); @@ -1450,19 +1450,19 @@ ; dz_out(dz_console, DZ_TCR, tcr); - restore_flags(flags); + restore_flags(flags); } -/* +/* * ------------------------------------------------------------------- * dz_console_print () * * dz_console_print is registered for printk. * The console must be locked when we get here. - * ------------------------------------------------------------------- + * ------------------------------------------------------------------- */ -static void dz_console_print (struct console *cons, - const char *str, +static void dz_console_print (struct console *cons, + const char *str, unsigned int count) { #ifdef DEBUG_DZ @@ -1529,11 +1529,11 @@ break; } switch(parity) { - case 'o': + case 'o': case 'O': cflag |= DZ_PARODD; break; - case 'e': + case 'e': case 'E': cflag |= DZ_PARENB; break; @@ -1542,7 +1542,7 @@ /* TOFIX: force to console line */ dz_console = &multi[CONSOLE_LINE]; - dz_console->port = (unsigned long)dz11_addr; + dz_console->port = (unsigned long)dz11_addr; dz_console->line = CONSOLE_LINE; /* This line locks up Dave Airlie's VS3100m38 after HALT */ @@ -1551,21 +1551,21 @@ while ((tmp = dz_in(dz_console,DZ_CSR)) & DZ_CLR) ; - /* enable scanning */ - dz_out(dz_console, DZ_CSR, DZ_MSE); - + /* enable scanning */ + dz_out(dz_console, DZ_CSR, DZ_MSE); + /* Set up flags... */ - dz_console->cflags = 0; - dz_console->cflags |= DZ_B9600; - dz_console->cflags |= DZ_CS8; - dz_console->cflags |= DZ_PARENB; + dz_console->cflags = 0; + dz_console->cflags |= DZ_B9600; + dz_console->cflags |= DZ_CS8; + dz_console->cflags |= DZ_PARENB; dz_out (dz_console, DZ_LPR, dz_console->cflags); mask = 1 << dz_console->line; tmp = dz_in (dz_console, DZ_TCR); /* read the TX flag */ if (!(tmp & mask)) { tmp |= mask; /* set the TX flag */ - dz_out (dz_console, DZ_TCR, tmp); + dz_out (dz_console, DZ_TCR, tmp); } return 0; @@ -1602,3 +1602,4 @@ module_init(dz_init_new); MODULE_LICENSE("GPL"); + |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:37:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10024/net Modified Files: delqa.c lance.c sgec.c Log Message: - Some more __iomem and whitespace updates. Index: sgec.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/sgec.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sgec.c 28 Oct 2004 19:23:42 -0000 1.4 +++ sgec.c 25 Apr 2005 09:37:12 -0000 1.5 @@ -1,7 +1,7 @@ -/* +/* * SGEC ethernet driver. Reported as EZA0 etc by VAX Console. * - * SGEC stands for Second Generation Ethernet Card, and is the + * SGEC stands for Second Generation Ethernet Card, and is the * replacement for the LANCE adapters in the MicroVaxen. * * Loosely adapted from vaxlance.c by Dave Airlie @@ -201,7 +201,7 @@ #define SG_TD1_VA 0x4000 /* virtual address */ #define SG_TD1_DT 0x3000 /* data type: */ #define SG_TD1_DT_NORM 0x0000 /* normal transmit frame */ -#define SG_TD1_DT_SETUP 0x2000 /* setup frame */ +#define SG_TD1_DT_SETUP 0x2000 /* setup frame */ #define SG_TD1_DT_DIAG 0x3000 /* diagnostic frame */ #define SG_TD1_AC 0x0800 /* CRC disable */ #define SG_TD1_FS 0x0400 /* first segment */ @@ -250,7 +250,7 @@ #define RXDESCS 30 /* no of receive descriptors */ #define TXDESCS 60 /* no of transmit descriptors */ -#define TX_RING_SIZE 60 +#define TX_RING_SIZE 60 #define TX_RING_MOD_MASK 59 #define RX_RING_SIZE 30 @@ -307,7 +307,7 @@ volatile struct sgec_shared_mem *sgec_mem; /* virtual addr of block inside shared mem block */ volatile struct sgec_init_block *init_block; - unsigned char vsbus_int; + unsigned char vsbus_int; spinlock_t lock; int rx_new, tx_new; int rx_old, tx_old; @@ -383,7 +383,7 @@ ib->phys_addr[4] = dev->dev_addr[4]; ib->phys_addr[5] = dev->dev_addr[5]; /* Setup the initialization block */ - + /* Setup rx descriptor pointer */ /* Calculate the physical address of the first receive descriptor */ @@ -393,7 +393,7 @@ #ifdef VAX_SGEC_DEBUG // printk("RX ptr: %8.8lx(%8.8x)\n", leptr, ib->brx_ring); -#endif +#endif /* Setup tx descriptor pointer */ /* Calculate the physical address of the first transmit descriptor */ @@ -439,7 +439,7 @@ reg = ll->sg_nicsr6; writecsr6(ll, SG_NICSR6_RE); /* reset card */ - + /* Wait for the sgec to complete initialization */ for (i = 0; (i < 100) && !(ll->sg_nicsr5 & SG_NICSR5_ID); i++) { #ifdef VAX_SGEC_DEBUG @@ -493,15 +493,15 @@ for (rd=&ib->brx_ring[lp->rx_new]; !((bits = rd->framelen) & SG_FR_OWN); rd=&ib->brx_ring[lp->rx_new]){ - + /* - * check for incomplete frame + * check for incomplete frame if ((bits & SG_R0_POK) != SG_R0_POK) { lp->stats.rx_over_errors ++; lp->stats_rx_errors++; } else if (bits & SG_R0_ERR) { - * only count last frame as the error + * only count last frame as the error if (bits & SG_R0_BUF) lp->stats.rx_fifo_errors++; if (bits & SG_R0_CRC) lp->stats.rx_crc_errors++; if (bits & SG_R0_OFL) lp->stats.rx_over_errors++; @@ -588,12 +588,12 @@ * So we don't count the packet more than once. */ td->word1 &= ~(SG_TD1_POK); - - /* * One collision before packet was sent. + + /* * One collision before packet was sent. if (td->word1 & SG_T1_EONE) lp->stats.collisions++; - - * More than one collision, be optimistic. + + * More than one collision, be optimistic. if (td->tmd1_bits & LE_T1_EMORE) lp->stats.collisions += 2; */ @@ -606,7 +606,7 @@ if (netif_queue_stopped(dev) && TX_BUFFS_AVAIL > 0) netif_wake_queue(dev); - + spin_unlock(&lp->lock); } @@ -626,7 +626,7 @@ writereg(&ll->sg_nicsr5, csr5); /* reset interrupt */ /* if ((csr0 & LE_C0_ERR)) { - * Clear the error condition + * Clear the error condition writecsr0(ll, LE_C0_BABL | LE_C0_ERR | LE_C0_MISS | LE_C0_CERR | LE_C0_MERR); }*/ @@ -713,7 +713,7 @@ struct sgec_private *lp = (struct sgec_private *) dev->priv; volatile struct sgec_regs *ll = lp->ll; int status; - + sgec_stop(ll); sgec_init_ring(dev); @@ -751,13 +751,13 @@ spin_lock_irq(&lp->lock); lp->stats.tx_bytes += len; - + entry = lp->tx_new & TX_RING_MOD_MASK; ib->btx_ring[entry].word1 = len; // ib->btx_ring[entry].misc = 0; - + cp_to_buf((char *) lp->sgec_mem->tx_buf[entry], skb->data, skblen); - + /* Clear the slack of the packet, do I need this? */ /* For a firewall its a good idea - AC */ /* @@ -779,7 +779,7 @@ dev->trans_start = jiffies; dev_kfree_skb(skb); - return 0; + return 0; } static struct net_device_stats *sgec_get_stats(struct net_device *dev) @@ -797,7 +797,7 @@ struct dev_mc_list *dmi = dev->mc_list; char *addrs; int i, j, bit, byte; - u32 crc, poly = CRC_POLYNOMIAL_LE; + u32 crc, poly = CRC_POLYNOMIAL_LE; /* set all multicast bits */ if (dev->flags & IFF_ALLMULTI) { @@ -821,7 +821,7 @@ /* multicast address? */ if (!(*addrs & 1)) continue; - + crc = 0xffffffff; for (byte = 0; byte < 6; byte++) for (bit = *addrs++, j = 0; j < 8; j++, bit >>= 1) { @@ -834,7 +834,7 @@ crc = crc ^ poly; } } - + crc = crc >> 26; mcast_table[crc >> 4] |= 1 << (crc & 0xf); } @@ -887,7 +887,7 @@ struct sgec_private *lp; volatile struct sgec_regs *ll; int i, ret; - volatile unsigned long *esar; + volatile unsigned long __iomem *esar; /* Could these base addresses be different on other CPUs? */ unsigned long sgec_phys_addr = vsbus_dev->phys_base; @@ -902,8 +902,8 @@ spin_lock_init(&lp->lock); /* Need a block of 64KB */ - /* At present, until we figure out the address extension - * parity control bit, ask for memory in the DMA zone */ + /* At present, until we figure out the address extension + * parity control bit, ask for memory in the DMA zone */ dev->mem_start = __get_free_pages(GFP_DMA, 4); if (!dev->mem_start) { /* Shouldn't we free dev->priv here if dev was non-NULL on entry? */ @@ -1007,7 +1007,7 @@ if (retval) free_netdev (netdev); } - + return 0; } Index: delqa.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/delqa.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- delqa.c 9 May 2004 23:40:48 -0000 1.10 +++ delqa.c 25 Apr 2005 09:37:12 -0000 1.11 @@ -61,7 +61,7 @@ }; struct delqa_private { - unsigned char *base; + unsigned char __iomem *base; unsigned int qbus_vector; struct net_device_stats stats; struct delqa_descs *descs; @@ -170,7 +170,7 @@ break; } } else { - printk("."); + printk("."); } } printk("\n"); @@ -202,7 +202,7 @@ break; } } else { - printk("."); + printk("."); } } printk("\n"); @@ -362,7 +362,7 @@ skb->dev = dev; skb_reserve(skb, 2); skb_put(skb, len); - memcpy(skb->data, + memcpy(skb->data, priv->rx_map[priv->next_rx]->virtaddr, len); skb->protocol = eth_type_trans(skb, dev); netif_rx(skb); @@ -381,7 +381,7 @@ desc = priv->descs->rxdesc + priv->next_rx; } - /* DEQNA manual errata sheet states that we must check for an + /* DEQNA manual errata sheet states that we must check for an invalid receive list before leaving the ISR and reset the buffer list if it is invalid */ if (read_reg(priv, DELQA_CSR) & DELQA_CSR_RL_INVALID) { @@ -396,7 +396,7 @@ o The while() loop above stops when next_rx points to a 'NOTYET' descriptor. */ - busaddr = priv->desc_map->busaddr + + busaddr = priv->desc_map->busaddr + offsetof(struct delqa_descs, rxdesc[priv->next_rx]); write_reg(priv, DELQA_RCLL, LOWORD(busaddr)); @@ -415,7 +415,7 @@ spin_lock(&priv->lock); csr = read_reg(priv, DELQA_CSR); - + #if DELQA_DEBUG_CSR dump_csr("delqa_interrupt entry", dev); #endif @@ -477,7 +477,7 @@ return -ENOMEM; } - memset(skb_put(new_skb, ETH_ZLEN - skb->len), 0, + memset(skb_put(new_skb, ETH_ZLEN - skb->len), 0, ETH_ZLEN - skb->len); dev_kfree_skb(skb); @@ -708,7 +708,7 @@ return -EAGAIN; } - /* Mark the transmit descriptors as not yet owned by + /* Mark the transmit descriptors as not yet owned by the DELQA (and also not VALID). */ for (i=0; i<TXDESCS; i++) { desc = priv->descs->txdesc + i; @@ -720,7 +720,7 @@ desc->status2 = 0; } - /* Mark the receive descriptors as not yet owned by + /* Mark the receive descriptors as not yet owned by the DELQA. */ for (i=0; i<RXDESCS; i++) { desc = priv->descs->rxdesc + i; @@ -732,13 +732,13 @@ /* Tell the DELQA where the receive descriptors live (i.e. which Q-bus addresses are mapped to the descriptor - addresses by the mapping registers. There is no + addresses by the mapping registers. There is no point in setting the transmit descriptor address, since there are no valid transmit descriptors yet. When the card hits an invalid transmit descriptor, it stops the transmit logic, which can only be restarted by setting the transmit descriptor address again. */ - + busaddr = priv->desc_map->busaddr + offsetof(struct delqa_descs, rxdesc[0]); write_reg(priv, DELQA_RCLL, LOWORD(busaddr)); @@ -911,7 +911,7 @@ printk("delqa qbus vector: %d (0%03o, 0x%04x)\n", priv->qbus_vector, priv->qbus_vector, priv->qbus_vector); - /* This is purely informational */ + /* This is purely informational */ dev->irq = qbus_vector_to_irq(priv->parent, priv->qbus_vector); printk("Ethernet address in ROM: "); @@ -975,7 +975,7 @@ } static struct qbus_driver delqa_driver = { - .probe = delqa_probe, + .probe = delqa_probe, .drv = { .name = "delqa", }, @@ -986,6 +986,5 @@ return qbus_register_driver(&delqa_driver); } - device_initcall(delqa_init); Index: lance.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/lance.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- lance.c 7 Aug 2004 23:38:20 -0000 1.7 +++ lance.c 25 Apr 2005 09:37:12 -0000 1.8 @@ -1,15 +1,15 @@ -/* +/* * Lance ethernet driver for the VAX station 3100 * * Adapted from declance.c - Linux MIPS Decstation Team * modified for DS5000/200 + VAX MIPS - Dave Airlie (ai...@li...) * - * I have every intention of remerging this driver with declance.c + * I have every intention of remerging this driver with declance.c * at some stage, this version is just intermediate I hope :-) * - D.A. July 2000 * * I've started to write some more of this.. doesn't do anything - * extra visibly, just does some static block allocation to use + * extra visibly, just does some static block allocation to use * until kmalloc arrives... next on the list are the IRQ and getting * the lance pointed at the init block in the right address space. * - D.A. 14 Aug 2000 @@ -117,7 +117,7 @@ unsigned short rmd0; /* low address of packet */ unsigned char rmd1_hadr; /* high address of packet */ unsigned char rmd1_bits; /* descriptor bits */ - short length; /* This length is 2s complement (negative)! + short length; /* This length is 2s complement (negative)! * Buffer length */ unsigned short mblength; /* This is the actual number of bytes received */ @@ -127,10 +127,10 @@ unsigned short tmd0; /* low address of packet */ unsigned char tmd1_hadr; /* high address of packet */ unsigned char tmd1_bits; /* descriptor bits */ - short length; /* Length is 2s complement (negative)! */ + short length; /* Length is 2s complement (negative)! */ unsigned short misc; }; - + /* First part of the LANCE initialization block, described in databook. */ struct lance_init_block { @@ -183,12 +183,12 @@ /* virtual addr of block inside shared mem block */ volatile struct lance_init_block *init_block; - unsigned char vsbus_int; + unsigned char vsbus_int; spinlock_t lock; int rx_new, tx_new; int rx_old, tx_old; - + struct net_device_stats stats; unsigned short busmaster_regval; @@ -217,8 +217,8 @@ /* Communication with the LANCE takes place via four channels: - 1. The RDP and RAP ports (which live at 200e0000 physical on - VS3100-family machines). Through these two ports we can + 1. The RDP and RAP ports (which live at 200e0000 physical on + VS3100-family machines). Through these two ports we can access the LANCE's 4 registers: CSR0, CSR1, CSR2 and CSR3 (very imaginatively named...) @@ -235,7 +235,7 @@ 4. The RX and TX buffers themselves. These buffers have no alignment requirement. - To keep things simple, we allocate a single 64K chunk of memory which + To keep things simple, we allocate a single 64K chunk of memory which contains the init block, followed by the buffer descriptors and then the buffers. @@ -246,11 +246,11 @@ However, the KA43 has an unusual requirement. Physical memory on the KA43 is accessible from address 0 upwards as normal, but is also visible in the region starting a 0x28000000. This region is called the DIAGMEM - region. What's different about it, I don't know, but it's probably - something to do with caching. + region. What's different about it, I don't know, but it's probably + something to do with caching. So, after allocating the 64KB chunk, but before we tell the LANCE - about it, we tweak the PTEs behind these pages to map to physical + about it, we tweak the PTEs behind these pages to map to physical addresses in the DIAGMEM region. As of 2001-03-06, the closest data sheet I can find is the AM79C90 (aka @@ -336,7 +336,7 @@ ib->phys_addr[4] = dev->dev_addr[4]; ib->phys_addr[5] = dev->dev_addr[5]; /* Setup the initialization block */ - + /* Setup rx descriptor pointer */ /* Calculate the physical address of the first receive descriptor */ @@ -346,7 +346,7 @@ #ifdef VAX_LANCE_DEBUG printk("RX ptr: %8.8lx(%8.8x)\n", leptr, ib->brx_ring); -#endif +#endif /* Setup tx descriptor pointer */ /* Calculate the physical address of the first transmit descriptor */ @@ -403,7 +403,7 @@ udelay(100); writecsr0(ll, LE_C0_INIT); - + /* Wait for the lance to complete initialization */ for (i = 0; (i < 100) && !(ll->rdp & LE_C0_IDON); i++) { #ifdef VAX_LANCE_DEBUG @@ -463,7 +463,7 @@ } printk("]"); #endif - + for (rd = &ib->brx_ring[lp->rx_new]; !((bits = rd->rmd1_bits) & LE_R1_OWN); rd = &ib->brx_ring[lp->rx_new]) { @@ -539,10 +539,10 @@ /* If we hit a packet not owned by us, stop */ if (td->tmd1_bits & LE_T1_OWN) break; - + if (td->tmd1_bits & LE_T1_ERR) { status = td->misc; - + lp->stats.tx_errors++; if (status & LE_T3_RTY) lp->stats.tx_aborted_errors++; @@ -636,7 +636,7 @@ } if (csr0 & LE_C0_RINT) lance_rx(dev); - + if (csr0 & LE_C0_TINT) lance_tx(dev); @@ -716,7 +716,7 @@ struct lance_private *lp = (struct lance_private *) dev->priv; volatile struct lance_regs *ll = lp->ll; int status; - + lance_stop(ll); lance_init_ring(dev); @@ -754,13 +754,13 @@ spin_lock_irq(&lp->lock); lp->stats.tx_bytes += len; - + entry = lp->tx_new & TX_RING_MOD_MASK; ib->btx_ring[entry].length = (-len) | 0xf000; ib->btx_ring[entry].misc = 0; - + cp_to_buf((char *) lp->lance_mem->tx_buf[entry], skb->data, skblen); - + /* Clear the slack of the packet, do I need this? */ /* For a firewall its a good idea - AC */ /* @@ -782,7 +782,7 @@ dev->trans_start = jiffies; dev_kfree_skb(skb); - return 0; + return 0; } static struct net_device_stats *lance_get_stats(struct net_device *dev) @@ -800,7 +800,7 @@ struct dev_mc_list *dmi = dev->mc_list; char *addrs; int i, j, bit, byte; - u32 crc, poly = CRC_POLYNOMIAL_LE; + u32 crc, poly = CRC_POLYNOMIAL_LE; /* set all multicast bits */ if (dev->flags & IFF_ALLMULTI) { @@ -824,7 +824,7 @@ /* multicast address? */ if (!(*addrs & 1)) continue; - + crc = 0xffffffff; for (byte = 0; byte < 6; byte++) for (bit = *addrs++, j = 0; j < 8; j++, bit >>= 1) { @@ -837,7 +837,7 @@ crc = crc ^ poly; } } - + crc = crc >> 26; mcast_table[crc >> 4] |= 1 << (crc & 0xf); } @@ -890,8 +890,8 @@ struct lance_private *lp; volatile struct lance_regs *ll; int i; - unsigned char *esar; - + unsigned char __iomem *esar; + /* Could these base addresses be different on other CPUs? */ unsigned long lance_phys_addr=vsbus_dev->phys_base; unsigned long esar_phys_addr=KA43_NWA_BASE; @@ -904,8 +904,8 @@ spin_lock_init(&lp->lock); /* Need a block of 64KB */ - /* At present, until we figure out the address extension - * parity control bit, ask for memory in the DMA zone */ + /* At present, until we figure out the address extension + * parity control bit, ask for memory in the DMA zone */ dev->mem_start = __get_free_pages(GFP_DMA, 4); if (!dev->mem_start) { return -ENOMEM; @@ -916,7 +916,7 @@ /* FIXME: We need to check if this block straddles the 16MB boundary. If - it does, then we can't use it for DMA. Instead we allocate + it does, then we can't use it for DMA. Instead we allocate another 64KB block (which obviously cannot straddle the 16MB boundary as well) and free the first. @@ -926,11 +926,10 @@ */ /* KA43 only. */ - ka43_diagmem_remap(dev->mem_start, 65536); - + ka43_diagmem_remap(dev->mem_start, 65536); } #endif /* CONFIG_CPU_KA43 */ - + dev->mem_end = dev->mem_start + 65536; @@ -1027,7 +1026,7 @@ struct net_device *netdev; int retval; - printk("vaxlance_probe: name = %s, base = 0x%08x, irqindex = %d\n", + printk("vaxlance_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 lance_private)); @@ -1059,6 +1058,5 @@ return vsbus_register_driver(&vaxlance_driver); } - device_initcall(vaxlance_init); |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:19:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30302/mm Modified Files: ioremap.c Log Message: - Some more __iomem related stuff. Index: ioremap.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/mm/ioremap.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ioremap.c 23 Jan 2003 23:06:51 -0000 1.7 +++ ioremap.c 25 Apr 2005 09:18:48 -0000 1.8 @@ -10,7 +10,7 @@ */ /* The i386 code maps a physical range by allocating a new vm area - (which seems to have a full 3-level page table structure) and + (which seems to have a full 3-level page table structure) and then fixing the PTEs to point to the specified physical region. We can't do this right now in VAXland because we haven't got the @@ -22,8 +22,8 @@ Dynamically expanding the system page table _may_ be possible, but would require enough contiguous physical memory to hold the - complete, larger table while we copy the current PTEs. I - suspect that it might not work in the general case, because I + complete, larger table while we copy the current PTEs. I + suspect that it might not work in the general case, because I have a feeling that we won't be able to notify everything that needs to know when the SPT base addr changes. (Scatter/gather hardware might be one example.) @@ -32,10 +32,10 @@ 1. When creating the initial system page table, we allocate a certain number of spare PTEs at the end of the table to - be used for mapping IO space. + be used for mapping IO space. 2. Each of these PTEs is be marked INVALID. A PTE in this - range which is INVALID is available for use for IO space + range which is INVALID is available for use for IO space mapping, one which is VALID is already in use. 3. When a driver wants to map a range of IO space, we work @@ -100,7 +100,6 @@ } } } - if ((p - start_pte) != num_ptes) { /* Unable to find contiguous chunk of IOMAP PTEs */ @@ -116,7 +115,7 @@ for (i = 0; i < num_ptes; i++) { pfn = (phys_start >> PAGE_SHIFT) + i; set_pte(start_pte + i, pfn_pte(pfn, __pgprot(_PAGE_VALID | _PAGE_KW)) ); - + /* fixme: tlb flushes for other pagelets */ __flush_tlb_one(virt_start + (i<<PAGE_SHIFT)); } |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 09:19:04
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30302/kernel Modified Files: clock.c cpu_generic.c cpu_ka48.c Log Message: - Some more __iomem related stuff. Index: clock.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/clock.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- clock.c 18 Sep 2004 23:06:33 -0000 1.6 +++ clock.c 25 Apr 2005 09:18:48 -0000 1.7 @@ -1,20 +1,20 @@ -/* arch/vax/kernel/clock.c +/* arch/vax/kernel/clock.c * * Copyright atp 2002. license: GPL - * + * * Routines to manipulate the real time clock on VAXen. * - * There are two sorts of battery backed hardware clocks. There is the - * TODR (time of day register) found on big VAXen, and the familiar + * There are two sorts of battery backed hardware clocks. There is the + * TODR (time of day register) found on big VAXen, and the familiar * Dallas CMOS clock on the desktop VAXen. - * - * The init routines are called through the machine vector. See - * cpu_kaxx.c for details of that. The callers are time_init() and + * + * The init routines are called through the machine vector. See + * cpu_kaxx.c for details of that. The callers are time_init() and * the rtc clock driver (drivers/char/rtc.c), using macros defined * in asm/mc146818rtc.h. - * + * * Prototypes for some of these functions are in asm/mc146818rtc.h - * and some in asm/clock.h. (The ones that are used in the mv + * and some in asm/clock.h. (The ones that are used in the mv * initialisation are in clock.h, and the ones used in mc146818rtc.h * are in that file). * @@ -33,6 +33,7 @@ /* this does nothing, and is a placeholder */ void generic_clock_init(void) { + printk (KERN_WARN "No RTC used\n"); return; } Index: cpu_generic.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_generic.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cpu_generic.c 2 Oct 2004 18:38:37 -0000 1.13 +++ cpu_generic.c 25 Apr 2005 09:18:48 -0000 1.14 @@ -12,15 +12,15 @@ */ /* - * Generic reboot and halt functions are in reboot.c + * Generic reboot and halt functions are in reboot.c * CPUs that need to do special stuff in their halt and reboot functions - * should point to their own functions in their machine vector, + * should point to their own functions in their machine vector, * otherwise they can leave NULL in the machine vector slots for these * functions * * atp. This holds for machine check functions too. Leave a NULL if you - * just want a halt instruction on receipt of a machine check. - * See VARM Chapter 5 for details on machine check frames. + * just want a halt instruction on receipt of a machine check. + * See VARM Chapter 5 for details on machine check frames. */ @@ -79,7 +79,7 @@ : "g"(c) : "r2"); } - + int ka46_48_49_prom_getchar(void) { /* Not yet implemented */ @@ -107,12 +107,12 @@ //#ifdef CONFIG_DZ /************************************************************************/ /* These functions can be used by implementations that do console I/O - via a DZ11-compatible chip (KA410, KA42 and KA43 CPUs). These functions can - only be used after VM is enabled and the DZ11 registers have been + via a DZ11-compatible chip (KA410, KA42 and KA43 CPUs). These functions can + only be used after VM is enabled and the DZ11 registers have been mapped by map_dz11_regs(). */ -volatile struct dz11_regs *dz11_addr; +volatile struct dz11_regs __iomem *dz11_addr; /* This is the serial line on the DZ11 that we should use as the console. Normally it is line 3 */ @@ -122,7 +122,7 @@ void dz11_putchar(int c) { u_int txcs, txdb, done; - + txdb = txcs = done = 0; txdb = (c & DZ11_TDR_DATA_MASK); @@ -143,7 +143,7 @@ do { txcs = (u_short) dz11_addr->csr; if (txcs & DZ11_CSR_TRDY) { - /* We should really check that this TRDY is for + /* We should really check that this TRDY is for * the correct line, and not one of the other lines */ dz11_addr->msr_tdr.tdr = (u_short) txdb; done = 1; @@ -173,7 +173,7 @@ //#endif /* CONFIG_DZ */ #ifdef CONFIG_CPU_VXT -volatile int *vxt2694_addr = NULL; +volatile int __iomem *vxt2694_addr = NULL; void vxt2694_putchar (int c) Index: cpu_ka48.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka48.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- cpu_ka48.c 2 Oct 2004 11:42:46 -0000 1.8 +++ cpu_ka48.c 25 Apr 2005 09:18:48 -0000 1.9 @@ -81,7 +81,7 @@ static void ka48_dma_init(void) { int i; - unsigned int *base_addr; + unsigned int __iomem *base_addr; unsigned long int *ka48_dmamap; /* @@ -107,7 +107,7 @@ iounmap(base_addr); return; -} +} static void ka48_init_devices(void) { |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 08:16:24
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30844/arch/vax/kernel Modified Files: cpu_ka43.c Log Message: - __iomem for cpu_ka43.c Index: cpu_ka43.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- cpu_ka43.c 20 Apr 2005 18:59:02 -0000 1.21 +++ cpu_ka43.c 25 Apr 2005 08:16:15 -0000 1.22 @@ -10,7 +10,7 @@ * Fixed the cache initializing, added the functions * ka43_cache_disbale/enable/clear and moved some stuff around. * atp jun 2001 - machine check implementation - * atp Jul 2001 - diagmem remap functions + * atp Jul 2001 - diagmem remap functions */ #include <linux/types.h> /* For NULL */ @@ -26,10 +26,10 @@ #include <asm/tlbflush.h> #include <asm/ka43.h> #include <asm/clock.h> /* For clock_init routines */ -#include <asm/bus/vsbus.h> +#include <asm/bus/vsbus.h> /* Internal CPU register space */ -static volatile struct ka43_cpu_regs *cpu_regs; +static volatile struct ka43_cpu_regs __iomem *cpu_regs; /* * We keep the cache page remaps handy incase we want to reset the cache @@ -38,8 +38,8 @@ * * atp jun 01 */ -static volatile unsigned int *ka43_ctag_addr; -static volatile unsigned int *ka43_creg_addr; +static volatile unsigned int __iomem *ka43_ctag_addr; +static volatile unsigned int __iomem *ka43_creg_addr; #define MC43_MAX 19 @@ -135,13 +135,13 @@ cpu_regs = ioremap(KA43_CPU_BASE, KA43_CPU_SIZE); ka43_creg_addr = ioremap(KA43_CH2_CREG, 1); ka43_ctag_addr = ioremap(KA43_CT2_BASE, KA43_CT2_SIZE); - + /* * Disable parity on DMA and CPU memory accesses. Don't know what the * story is with this, but VMS seems do this, too... */ cpu_regs->parctl = 0; - + /* * Resetting the cache involves disabling it, then clear it and * enable again. @@ -236,7 +236,7 @@ .sid_mask = VAX_SID_FAMILY_MASK, .sid_match = VAX_RIGEL << VAX_SID_FAMILY_SHIFT, .sidex_addr = RIGEL_SIDEX_ADDR, - .sidex_mask = 0x00000000, /* don't care */ + .sidex_mask = 0x00000000, /* Don't care */ .sidex_match = 0x00000000, }; |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 08:14:28
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29053/arch/vax/kernel Modified Files: diag_led.c Log Message: - __iomem for diag_led.c Index: diag_led.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/diag_led.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- diag_led.c 24 Apr 2005 20:53:30 -0000 1.10 +++ diag_led.c 25 Apr 2005 08:14:15 -0000 1.11 @@ -23,7 +23,7 @@ MODULE_LICENSE ("GPL"); MODULE_DESCRIPTION ("Hackish driver for VAXens diagnostic LEDs"); -static volatile uint8_t *diag; +static volatile uint8_t __iomem *diag; static uint8_t state; static int inverted; |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 08:13:05
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28653/arch/vax/kernel Modified Files: cpu_ka46.c Log Message: - __iomem for cpu_ka46.c Index: cpu_ka46.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- cpu_ka46.c 2 Oct 2004 11:42:46 -0000 1.22 +++ cpu_ka46.c 25 Apr 2005 08:12:56 -0000 1.23 @@ -21,7 +21,6 @@ #include <asm/ka46.h> #include <asm/clock.h> /* for clock_init routines */ #include <asm/bus/vsbus.h> - unsigned long int *ka46_dmamap; @@ -87,8 +86,8 @@ static void ka46_dma_init(void) { int i; - unsigned int *base_addr; - + unsigned int __iomem *base_addr; + /* * At present we just map all of the GFP_DMA region * this is obviously wasteful @@ -112,13 +111,13 @@ iounmap(base_addr); - return; + return; } static void ka46_init_devices(void) { printk("ka46: init_devices\n"); - + /* Initialise the DMA area */ ka46_dma_init(); } |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-24 20:53:52
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9668/arch/vax/kernel Modified Files: diag_led.c Log Message: - KA670 wasn't yet ment to be checked in. Index: diag_led.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/diag_led.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- diag_led.c 3 Oct 2004 11:30:28 -0000 1.9 +++ diag_led.c 24 Apr 2005 20:53:30 -0000 1.10 @@ -23,7 +23,8 @@ MODULE_LICENSE ("GPL"); MODULE_DESCRIPTION ("Hackish driver for VAXens diagnostic LEDs"); -static volatile uint16_t *diag; +static volatile uint8_t *diag; +static uint8_t state; static int inverted; @@ -40,53 +41,55 @@ if (is_ka46 ()) { inverted = 1; return DIAG_LED_KA46_BASE; - } - if (is_ka42 ()) { + } else if (is_ka42 ()) { inverted = 1; return DIAG_LED_KA42_BASE; - } - if (is_ka48 ()) { + } else if (is_ka48 ()) { inverted = 1; return DIAG_LED_KA48_BASE; - } - if (is_ka49 ()) { + } else if (is_ka49 ()) { inverted = 1; return DIAG_LED_KA49_BASE; - } - if (is_vxt ()) { + } else if (is_vxt ()) { inverted = 1; return DIAG_LED_VXT_BASE; +#if 0 + } else if (is_ka670 ()) { + inverted = 1; + return DIAG_LED_KA670_BASE; +#endif + } else if (is_ka43 ()) { + inverted = 1; + return DIAG_LED_KA43_BASE; + } else { + printk (KERN_ERR "diag_led: No base address known for your machine yet!\n"); + return 0; } - - printk (KERN_ERR "No base address known for your machine yet!\n"); - return 0; } /* * A binary "1" for a lit LED, a binary "0" for an off LED */ int -diag_led_set_state (unsigned char state) +diag_led_set_state (uint8_t new_state) { - uint16_t w_state; - if (!diag) return -ENODEV; - w_state = state; - if (inverted) - w_state ^= 0xffff; - - *diag = w_state; + if (inverted) { + *diag = new_state ^ 0xff; + state = new_state; + } else { + *diag = new_state; + state = new_state; + } return 0; } -unsigned char +uint8_t diag_led_get_state (void) { - uint16_t w_state; - if (!diag) { printk (KERN_ERR "Attention, there's no diag LEDs known on " "your system!!!\n"); @@ -94,12 +97,7 @@ return 0; } - w_state = *diag; - - if (inverted) - return (w_state & 0xff) ^ 0xff; - else - return w_state & 0xff; + return state; } /* @@ -111,7 +109,7 @@ int diag_led_on (int led_num) { - unsigned char state; + uint8_t new_state; if (led_num < 0 || led_num > 7) { printk (KERN_ERR "led_num out of range!\n"); @@ -119,10 +117,9 @@ return -EINVAL; } - state = diag_led_get_state (); - state |= 1 << led_num; + new_state = diag_led_get_state () | (1 << led_num); - return diag_led_set_state (state); + return diag_led_set_state (new_state); } /* @@ -134,7 +131,7 @@ int diag_led_off (int led_num) { - unsigned char state; + uint8_t new_state; if (led_num < 0 || led_num > 7) { printk (KERN_ERR "led_num out of range!\n"); @@ -142,10 +139,9 @@ return -EINVAL; } - state = diag_led_get_state (); - state &= ~(1 << led_num); + new_state = diag_led_get_state () & ~(1 << led_num); - return diag_led_set_state (state); + return diag_led_set_state (new_state); } #ifdef DIAG_LED_DEBUG @@ -180,7 +176,7 @@ if (!base_address) return -ENODEV; - diag = ioremap (base_address, 2); + diag = ioremap (base_address, 1); if (!diag) { /* FIXME: Register with /proc/iomem */ printk (KERN_ERR "Failed to ioremap (0x%08lx, 2)\n", base_address); @@ -220,9 +216,9 @@ }; static int __init -diag_led_init(void) +diag_led_init (void) { - return driver_register(&diag_led_driver); + return driver_register (&diag_led_driver); } |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-23 19:50:39
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5502 Modified Files: head.S Log Message: - Accumulated whitespace. - Fix debugging code (newish/ELFish assemblers want to see a '%' in front of register names). Index: head.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/head.S,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- head.S 16 Oct 2004 13:04:51 -0000 1.18 +++ head.S 23 Apr 2005 19:50:21 -0000 1.19 @@ -27,8 +27,8 @@ .globl bootparam bootparam: - .fill 256,1,0 # The boot parameter block. Presently just the - # command line. + .fill 256,1,0 # The boot parameter block. Presently just the + # command line. codestart: @@ -41,7 +41,7 @@ movl %r11, boot_r11 mfpr $PR_SCBB, boot_scb movab bootparam, %r5 - addl2 $PAGE_OFFSET,%r5 # we will only access this when mapen=1 + addl2 $PAGE_OFFSET,%r5 # we will only access this when MAPEN=1 movl %r5,kernel_cmd_line # put the sp somewhere safe, over our bootblock in fact @@ -50,8 +50,8 @@ movl %r5,%sp # Debug code: -# movzbl $0x42,r2 -# jsb 0x20040058 +# movzbl $0x42,%r2 +# jsb 0x20040058 calls $0, idcpu # Identify CPU and put the mv ptr into mv movl %r0, mv @@ -77,7 +77,7 @@ # print first line of debug diagnostics pushab msg_loaded # ascii string calls $1, boot_printstr - pushal start # where we were loaded + pushal start # where we were loaded calls $1, boot_printint calls $0, boot_crlf pushab msg_registers # ascii string @@ -99,7 +99,7 @@ # Save off the current machine vector address in boot_mv, because it # lies in the .bss section and it will get clobbered real soon... - # - atp. in fact it gets clobbered real quick, if your kernel is + # - atp. in fact it gets clobbered real quick, if your kernel is # larger than about 950k, as the relocation code clobbers it, along # with every thing else poking its head above $KERNEL_START_PHYS, # like the entire .bss section. @@ -201,7 +201,7 @@ # Fill in the main part of the SPT (the entries that map physical # memory) movl $0, %r6 # pfn number - movl RPB_PFNCNT_OFFSET(%r11), %r7 # pfncnt from rpb. + movl RPB_PFNCNT_OFFSET(%r11), %r7 # pfncnt from rpb. sysfill: bisl3 $_PAGE_VALID + _PAGE_UW, %r6, (%r5)+ # set PFN, VALID bit and protection UW in PTE @@ -311,26 +311,26 @@ msg_registers: .ascii "rpb/bootr5/ap/sp \0" .align 1 -msg_relocated: +msg_relocated: .ascii "relocated at phys address \0" .align 1 -msg_starting_vm: +msg_starting_vm: .ascii "Starting VM\0" .align 1 # # memory locations. -# +# # iomap_base holds the physical address of the first PTE in the # IOMAP portion of the system page table. -# Once VM is enabled, this is replaced with the VIRTUAL address +# Once VM is enabled, this is replaced with the VIRTUAL address .globl iomap_base iomap_base: .int 0x00000000 -.globl vmallocmap_base +.globl vmallocmap_base vmallocmap_base: .int 0x00000000 @@ -346,20 +346,19 @@ boot_scb: .int 0x00000000 # -# This is here because we need a safe place to store it as we +# This is here because we need a safe place to store it as we # relocate around in memory. boot_mv: .int 0x00000000 - -# our dummy pcb + +# our dummy pcb __INITDATA .globl fake_pcb fake_pcb: .fill 24,4,0x00000000 -# and a pointer to our initial command line +# and a pointer to our initial command line .globl kernel_cmd_line kernel_cmd_line: .int 0x00000000 - |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-23 19:43:48
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/boot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3296 Modified Files: lib.c Log Message: - boot_crlf() does have this name for a reason. Index: lib.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/boot/lib.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- lib.c 4 Oct 2004 22:59:51 -0000 1.7 +++ lib.c 23 Apr 2005 19:43:40 -0000 1.8 @@ -14,8 +14,8 @@ void __boot boot_crlf(void) { - boot_putchar('\n'); boot_putchar('\r'); + boot_putchar('\n'); } void __boot boot_printspace(void) |
|
From: Kenn H. <ke...@us...> - 2005-04-20 19:02:12
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21022/mm Modified Files: pgtable.h Log Message: The .lr member of swapper_pg_dir is already an unsigned long, so the cast in SPT_LEN is unnecessary. GCC 4.1 complains about it because casts are no longer allowed in lvalues. Index: pgtable.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pgtable.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pgtable.h 28 Mar 2005 16:38:57 -0000 1.12 +++ pgtable.h 20 Apr 2005 19:02:02 -0000 1.13 @@ -53,7 +53,7 @@ #define SPT_BASE ((unsigned long)( (swapper_pg_dir[2]).br )) /* SPT_LEN can be an lvalue, and is the length in longwords */ -#define SPT_LEN ((unsigned long)( (swapper_pg_dir[2]).lr )) +#define SPT_LEN swapper_pg_dir[2].lr /* SPT_SIZE is the size in BYTES */ #define SPT_SIZE ((unsigned long)( (swapper_pg_dir[2]).lr ) << 2) |
|
From: Kenn H. <ke...@us...> - 2005-04-20 19:01:15
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19653 Modified Files: tlbflush.h Log Message: The first argument for mtpr doesn't need to be in memory, so use "g" as the constraint instead of "m" in __flush_tlb_one(). (GCC 4.1 complained about uses that didn't end up with the argument in memory.) Index: tlbflush.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/tlbflush.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tlbflush.h 16 Feb 2003 00:13:17 -0000 1.3 +++ tlbflush.h 20 Apr 2005 19:01:05 -0000 1.4 @@ -21,7 +21,7 @@ __asm__ __volatile__("mtpr $0,%0" : : "i" (PR_TBIA) ) #define __flush_tlb_one(addr) \ -__asm__ __volatile__("mtpr %0,%1" : :"m" (addr), "i" (PR_TBIS) ) +__asm__ __volatile__("mtpr %0,%1" : :"g" (addr), "i" (PR_TBIS) ) #define flush_tlb() __flush_tlb() #define flush_tlb_all() __flush_tlb() |
|
From: Kenn H. <ke...@us...> - 2005-04-20 18:59:11
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18584/arch/vax/kernel Modified Files: cpu_ka43.c Log Message: GCC 4.1 complains about the extern declaration of ka43_mctype[] in ka43.h followed by the static definition in cpu_ka43.c. Nothing else uses it, so remove the declaration from ka43.h and define MC43_MAX in cpu_ka43.c. Index: cpu_ka43.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- cpu_ka43.c 2 Oct 2004 11:42:46 -0000 1.20 +++ cpu_ka43.c 20 Apr 2005 18:59:02 -0000 1.21 @@ -41,6 +41,7 @@ static volatile unsigned int *ka43_ctag_addr; static volatile unsigned int *ka43_creg_addr; +#define MC43_MAX 19 static char *ka43_mctype[MC43_MAX + 1] = { "no error (0)", /* Code 0: No error */ |
|
From: Kenn H. <ke...@us...> - 2005-04-20 18:59:11
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18584/include/asm-vax Modified Files: ka43.h Log Message: GCC 4.1 complains about the extern declaration of ka43_mctype[] in ka43.h followed by the static definition in cpu_ka43.c. Nothing else uses it, so remove the declaration from ka43.h and define MC43_MAX in cpu_ka43.c. Index: ka43.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/ka43.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ka43.h 2 Jun 2004 19:58:39 -0000 1.6 +++ ka43.h 20 Apr 2005 18:58:57 -0000 1.7 @@ -132,9 +132,6 @@ #define KA43_MC_RESTART 0x00008000 /* Restart possible*/ #define KA43_PSL_FPDONE 0x00010000 /* First Part Done */ -#define MC43_MAX 19 -extern char *ka43_mctype[MC43_MAX+1]; - #endif /* __ASSEMBLY */ extern void ka43_diagmem_remap(unsigned long int address, unsigned long int size); |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-20 13:46:27
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6946 Modified Files: byteorder.h Log Message: - Update for GCC-4.1 snapshot. Index: byteorder.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/byteorder.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- byteorder.h 5 Jun 2004 08:34:16 -0000 1.5 +++ byteorder.h 20 Apr 2005 13:46:19 -0000 1.6 @@ -1,18 +1,18 @@ #ifndef _VAX_BYTEORDER_H #define _VAX_BYTEORDER_H -/* FIXME: arch byte swapping in assembly - */ +/* FIXME: arch byte swapping in assembly */ #include <asm/types.h> +#include <linux/compiler.h> #define VAX_USE_ARCH_SWAB32 1 #ifdef __GNUC__ -/* - * ragge has a 1 insn shorter sequence which will probably replace this one - * later, depending on the relative instruction costs. +/* + * ragge has a 1 insn shorter sequence which will probably replace this one + * later, depending on the relative instruction costs. */ #if VAX_USE_ARCH_SWAB32 -static __inline__ __const__ __u32 ___arch__swab32(__u32 x) +static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) { __u32 t1; @@ -33,10 +33,10 @@ /* * According to the resident expert, this is as fast as assembly */ -static __inline__ __const__ __u16 ___arch__swab16(__u16 x) +static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x) { - register __u16 __x = x; - return (__u16)(__x << 8 | __x >> 8); + __u16 __x = x; + return (__u16)(__x << 8 | __x >> 8); } #if VAX_USE_ARCH_SWAB32 #define __arch__swab32(x) ___arch__swab32(x) @@ -50,7 +50,6 @@ #endif /* __GNUC__ */ - #include <linux/byteorder/little_endian.h> #endif /* _VAX_BYTEORDER_H */ |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-20 10:13:20
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22341 Modified Files: Makefile Log Message: - Just sorting out some diffs to HEAD. No real changes here... Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile 7 Apr 2005 22:56:26 -0000 1.35 +++ Makefile 20 Apr 2005 10:13:11 -0000 1.36 @@ -21,12 +21,11 @@ # in the top-level Makefile. We want -O1, not -O2. CFLAGS := $(subst -O2,-O1,$(CFLAGS) ) - + # These flags are used by the top-level makefile when linking # the kernel -LDFLAGS_vmlinux=-N -nostartfiles -nostdlib \ - -noinhibit-exec -warn-once \ - -Map vmlinux.map -cref +LDFLAGS_vmlinux=-N -nostartfiles -nostdlib -noinhibit-exec -warn-once \ + -Map vmlinux.map -cref # Tell the top-level makefile about the addition arch-specific # stuff that's needed @@ -52,13 +51,14 @@ TOOLS: $(Q)$(MAKE) $(build)=$(TOOLSDIR) +# # This will make a disk-bootable image. dd this directly to a -# disk and then tell your VAX to boot from this disk +# disk and then tell your VAX to boot from this disk. # -# NOTE: +# NOTE: # If you want to keep a partition table on the disk, and use # a boot loader to load the kernel from a file system, then -# use the vmlinux.SYS and something like asbl. Dont forget to +# use the vmlinux.SYS and something like asbl. Don't forget to # set the command line to something useful like "root=/dev/sda1" # diskboot: vmlinux.dsk @@ -87,17 +87,17 @@ vmlinux.dsk: vmlinux.bin TOOLS $(call cmd,mkdsk) $(call cmd,setcmd) - -# this is helpful for low level debuggery -listfile: + +# This is helpful for low level debuggery +listfile: rm -f vmlinux.lst - $(OBJDUMP) -D vmlinux > vmlinux.lst + $(OBJDUMP) -D vmlinux > vmlinux.lst CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h prepare: include/asm-$(ARCH)/asm_offsets.h arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ - include/config/MARKER + include/config/MARKER include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s $(call filechk,gen-asm-offsets) @@ -106,14 +106,14 @@ @rm -f vmlinux.* vmlinux @cd $(TOPDIR)/arch/vax ; rm -f *.out TEST.BIN TEST.SYS @cd $(TOOLSDIR) ; rm -f setcmdline showcmdline mkbootblk - + archmrproper: define archhelp - echo '* mopboot - MOP-bootable kernel image (vmlinux.SYS)' - echo '* diskboot - HDD bootable kernel image (vmlinux.dsk)' - echo '' - echo 'Notice: module support is not complete right now' + echo '* mopboot - MOP-bootable kernel image (vmlinux.SYS)' + echo '* diskboot - HDD bootable kernel image (vmlinux.dsk)' + echo '' + echo 'Notice: module support is not complete right now' endef clean: archclean |
|
From: Kenn H. <ke...@us...> - 2005-04-08 08:25:54
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5465/arch/vax/kernel Modified Files: cpu_ka55.c Log Message: #warning and #error directives should use quotes Index: cpu_ka55.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka55.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cpu_ka55.c 7 Apr 2005 22:19:42 -0000 1.13 +++ cpu_ka55.c 8 Apr 2005 08:25:43 -0000 1.14 @@ -64,7 +64,7 @@ .clock_init = generic_clock_init, }; -#warning KA55 needs a struct cpumatch +#warning "KA55 needs a struct cpumatch" -#warning KA55 needs a platform_device_init function +#warning "KA55 needs a platform_device_init function" |
|
From: Jan-Benedict G. <jb...@lu...> - 2005-04-08 06:59:38
|
On Thu, 2005-04-07 22:56:28 +0000, Kenn Humborg <ke...@us...> wrote in message <E1D...@sc...>: > --- Makefile 18 Nov 2004 09:41:58 -0000 1.34 > +++ Makefile 7 Apr 2005 22:56:26 -0000 1.35 > @@ -12,15 +12,14 @@ > # Copyright (C) 1994 by Linus Torvalds > # > =20 > +CROSS_COMPILE :=3D vax-dec-linux- :-) > # Note that this CFLAGS definition will override the definition > # in the top-level Makefile. We want -O1, not -O2. > -# Disabled for now, since we're hard-coding -O1 in top-level Makefile > -# until we find a better way > -#CFLAGS :=3D $(subst -O2,-O1,$(CFLAGS) ) > +CFLAGS :=3D $(subst -O2,-O1,$(CFLAGS) ) Does anybody actually remember _why_ we're used to use -O1? MfG, JBG --=20 Jan-Benedict Glaw jb...@lu... . +49-172-7608481 = _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg = _ _ O fuer einen Freien Staat voll Freier B=C3=BCrger" | im Internet! | im Ira= k! O O O ret =3D do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)= ); |
|
From: Jan-Benedict G. <jb...@lu...> - 2005-04-08 06:58:00
|
On Thu, 2005-04-07 22:56:27 +0000, Kenn Humborg <ke...@us...> wrote in message <E1D...@sc...>: > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v > retrieving revision 1.110 > retrieving revision 1.111 > diff -u -d -r1.110 -r1.111 > --- Makefile 27 Mar 2005 23:46:46 -0000 1.110 > +++ Makefile 7 Apr 2005 22:56:25 -0000 1.111 > @@ -189,8 +189,8 @@ > # Default value for CROSS_COMPILE is not to prefix executables > # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile > =20 > -ARCH ?=3D vax > -CROSS_COMPILE ?=3D vax-dec-linux- > +ARCH ?=3D $(SUBARCH) > +CROSS_COMPILE ?=3D I'm just used to have modifications in my main Makefile, just because I always used vax-linux as target... > # Architecture as present in compile.h > UTS_MACHINE :=3D $(ARCH) > @@ -508,7 +508,7 @@ > ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE > CFLAGS +=3D -Os > else > -CFLAGS +=3D -O1 > +CFLAGS +=3D -O2 > endif > =20 > #Add align options if CONFIG_CC_* is not equal to 0 Hopefully, we don't open a can of worms here... > @@ -968,7 +968,6 @@ > $(call cmd,rmfiles) > @find . $(RCS_FIND_IGNORE) \ > \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ > - -o -name '*.lst' \ > -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ > -type f -print | xargs rm -f > =20 This should stay, really. The list files are really useful (and I kept that switched on in my builds), but of course they need to be cleaned up at some time :-) MfG, JBG --=20 Jan-Benedict Glaw jb...@lu... . +49-172-7608481 = _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg = _ _ O fuer einen Freien Staat voll Freier B=C3=BCrger" | im Internet! | im Ira= k! O O O ret =3D do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)= ); |
|
From: Jan-Benedict G. <jb...@lu...> - 2005-04-08 06:54:04
|
On Thu, 2005-04-07 22:19:44 +0000, Kenn Humborg <ke...@us...> wrote in message <E1D...@sc...>: > @@ -70,3 +66,5 @@ > =20 > #warning KA55 needs a struct cpumatch > =20 > +#warning KA55 needs a platform_device_init function > + >=20 >=20 >=20 Some aftermath: Please put #warning or #error messages into quotation marks. If you don't, a semicolon (or other things special to C) /may/ lead to real compile errors... MfG, JBG --=20 Jan-Benedict Glaw jb...@lu... . +49-172-7608481 = _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg = _ _ O fuer einen Freien Staat voll Freier B=C3=BCrger" | im Internet! | im Ira= k! O O O ret =3D do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)= ); |
|
From: Kenn H. <ke...@us...> - 2005-04-07 22:56:34
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722/arch/vax Modified Files: Makefile Log Message: Revert the top-level Makefile to pristine condition. Side effect is that we will have to start using ARCH=vax on our make command line (or define ARCH=vax in the environment). We should get used to doing this anyway, since we'll have to do it once we merge with mainline. Of course, VAX hackers are free to locally modify their Makefile to set ARCH ?= vax, as long as this doesn't get committed to CVS Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Makefile 18 Nov 2004 09:41:58 -0000 1.34 +++ Makefile 7 Apr 2005 22:56:26 -0000 1.35 @@ -12,15 +12,14 @@ # Copyright (C) 1994 by Linus Torvalds # +CROSS_COMPILE := vax-dec-linux- LDFLAGS_BLOB := --format binary --oformat elf32-vax # Note that this CFLAGS definition will override the definition # in the top-level Makefile. We want -O1, not -O2. -# Disabled for now, since we're hard-coding -O1 in top-level Makefile -# until we find a better way -#CFLAGS := $(subst -O2,-O1,$(CFLAGS) ) +CFLAGS := $(subst -O2,-O1,$(CFLAGS) ) # These flags are used by the top-level makefile when linking |
|
From: Kenn H. <ke...@us...> - 2005-04-07 22:56:34
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722/Documentation/vax Modified Files: README Log Message: Revert the top-level Makefile to pristine condition. Side effect is that we will have to start using ARCH=vax on our make command line (or define ARCH=vax in the environment). We should get used to doing this anyway, since we'll have to do it once we merge with mainline. Of course, VAX hackers are free to locally modify their Makefile to set ARCH ?= vax, as long as this doesn't get committed to CVS Index: README =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- README 17 Aug 2004 09:09:01 -0000 1.6 +++ README 7 Apr 2005 22:56:25 -0000 1.7 @@ -80,32 +80,33 @@ Start with one of the default configs (i.e. run one of these commands): - make O=~/linux-vax/kbuild ka650_defconfig - make O=~/linux-vax/kbuild ka46_defconfig - make O=~/linux-vax/kbuild ka43_defconfig + make ARCH=vax O=~/linux-vax/kbuild ka650_defconfig + make ARCH=vax O=~/linux-vax/kbuild ka46_defconfig + make ARCH=vax O=~/linux-vax/kbuild ka43_defconfig You could of course, have multiple output directories, one for each config. Tweak the config if you want: - make O=~/linux-vax/kbuild config + make ARCH=vax O=~/linux-vax/kbuild config BTW, as a shorthand, you can define a KBUILD_OUTPUT environment variable rather than type O=... all the time. Now build the kernel: - make O=~/linux-vax/kbuild + make ARCH=vax O=~/linux-vax/kbuild - (Note that there is no 'make dep' any more.) + (As an alternative to specifying ARCH=vax on the make command line, you + can set ARCH=vax in your environment instead.) This will create a MOP-bootable image called vmlinux.SYS If you have your VAX and Linux machine on the same SCSI chain and you've got a scratch disk handy, you can do - $ make diskboot && dd if=vmlinux.dsk of=/dev/sdX + $ make ARCH=vax diskboot && dd if=vmlinux.dsk of=/dev/sdX and then tell your VAX to boot from this disk. This is faster than netbooting. |
|
From: Kenn H. <ke...@us...> - 2005-04-07 22:56:33
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722 Modified Files: Makefile Log Message: Revert the top-level Makefile to pristine condition. Side effect is that we will have to start using ARCH=vax on our make command line (or define ARCH=vax in the environment). We should get used to doing this anyway, since we'll have to do it once we merge with mainline. Of course, VAX hackers are free to locally modify their Makefile to set ARCH ?= vax, as long as this doesn't get committed to CVS Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- Makefile 27 Mar 2005 23:46:46 -0000 1.110 +++ Makefile 7 Apr 2005 22:56:25 -0000 1.111 @@ -189,8 +189,8 @@ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile -ARCH ?= vax -CROSS_COMPILE ?= vax-dec-linux- +ARCH ?= $(SUBARCH) +CROSS_COMPILE ?= # Architecture as present in compile.h UTS_MACHINE := $(ARCH) @@ -508,7 +508,7 @@ ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE CFLAGS += -Os else -CFLAGS += -O1 +CFLAGS += -O2 endif #Add align options if CONFIG_CC_* is not equal to 0 @@ -968,7 +968,6 @@ $(call cmd,rmfiles) @find . $(RCS_FIND_IGNORE) \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ - -o -name '*.lst' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ -type f -print | xargs rm -f |
