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-08-17 09:14:19
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9421 Modified Files: README Log Message: SourceForge don't use cvs.<project-name>.sf.net any more Index: README =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 30 Oct 2003 01:15:34 -0000 1.5 +++ README 17 Aug 2004 09:09:01 -0000 1.6 @@ -20,7 +20,7 @@ check-out of the sources, you can save some typing by defining CVSROOT as follows: - export CVSROOT=:pserver:ano...@cv...:/cvsroot/linux-vax + export CVSROOT=:pserver:ano...@cv...:/cvsroot/linux-vax You won't need this definition after the initial checkout. When you run a CVS command inside a checked-out tree, CVS gets the info from |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-16 14:07:39
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12373 Removed Files: defconfig.old.m30 Log Message: - Bye bye. --- defconfig.old.m30 DELETED --- |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-16 12:46:39
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32527 Modified Files: Kconfig Log Message: - There's no simple mapped VGA card in VAXen. Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/console/Kconfig,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -d -r1.1.1.9 -r1.2 --- Kconfig 22 Feb 2004 19:03:17 -0000 1.1.1.9 +++ Kconfig 16 Aug 2004 12:46:10 -0000 1.2 @@ -6,7 +6,7 @@ config VGA_CONSOLE bool "VGA text console" if EMBEDDED || !X86 - depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K + depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC32 && !SPARC64 && !M68K && !VAX default y help Saying Y here will allow you to use Linux in text mode through a |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-16 11:22:48
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17291/configs Modified Files: ka4x_defconfig Log Message: - Add config options to switch off abortion of syscalls with wrong number of arguments and the matching warning for it. - Update ka4x_defconfig. - This is only in place to help Kaj-Michael with TA-Linux. It'll go away after his getty is fixed (which I think causes the error messages he gets out of his system...). Index: ka4x_defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka4x_defconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ka4x_defconfig 15 Aug 2004 17:09:55 -0000 1.5 +++ ka4x_defconfig 16 Aug 2004 11:22:39 -0000 1.6 @@ -390,6 +390,8 @@ CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_VAX_DIAG_LED=y +CONFIG_DEBUG_VAX_CHECK_CHMx_ARGS=y +CONFIG_DEBUG_VAX_CHECK_CHMx_ARGS_ABORT=y # # Security options |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-16 11:22:47
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17291/kernel Modified Files: syscall.c Log Message: - Add config options to switch off abortion of syscalls with wrong number of arguments and the matching warning for it. - Update ka4x_defconfig. - This is only in place to help Kaj-Michael with TA-Linux. It'll go away after his getty is fixed (which I think causes the error messages he gets out of his system...). Index: syscall.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/syscall.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- syscall.c 12 Jun 2004 22:52:53 -0000 1.10 +++ syscall.c 16 Aug 2004 11:22:38 -0000 1.11 @@ -21,15 +21,12 @@ #include <asm/ptrace.h> #include <asm/unistd.h> #include <asm/ipc.h> +#include <asm/thread_info.h> #include "interrupt.h" /* Local, private definitions */ -/* This is the handler for the CHMK (change mode to kernel) trap. - Later we'll probably re-write this in asm. */ extern unsigned long *sys_call_table[__NR_last_syscall + 1]; -extern unsigned long first_syscall; -extern unsigned long last_syscall; static int syscall_num_args[__NR_last_syscall + 1] = { [0] = -1, /* setup */ @@ -320,15 +317,19 @@ nr_args = *user_ap; } +#ifdef DEBUG_VAX_CHECK_CHMx_ARGS /* * Check number of syscall arguments */ if (unlikely (syscall_num_args[sc_number] != nr_args)) { printk (KERN_DEBUG "Stack mismatch (should=%d, caller=%d) on syscall %d\n", syscall_num_args[sc_number], nr_args, sc_number); +#ifdef DEBUG_VAX_CHECK_CHMx_ARGS_ABORT regs->r0 = -EFAULT; return; +#endif /* DEBUG_VAX_CHECK_CHMx_ARGS_ABORT */ } +#endif /* DEBUG_VAX_CHECK_CHMx_ARGS */ /* * We pass all the user-supplied args plus the pointer to the |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-16 11:22:47
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17291 Modified Files: Kconfig Log Message: - Add config options to switch off abortion of syscalls with wrong number of arguments and the matching warning for it. - Update ka4x_defconfig. - This is only in place to help Kaj-Michael with TA-Linux. It'll go away after his getty is fixed (which I think causes the error messages he gets out of his system...). Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Kconfig 15 Aug 2004 17:09:55 -0000 1.18 +++ Kconfig 16 Aug 2004 11:22:38 -0000 1.19 @@ -243,11 +243,35 @@ config VAX_DIAG_LED tristate "Support for accessing the diagnostic LEDs" default n + depends VAX help This driver is a hack and will probably go away soon. It's main purpose is to aid me towards rewriting the dz11 driver to be more modular... +# +# The next two options do basically have only one user. After his +# userland is fixed, they can go away (cf. ./arch/vax/kernel/syscall.c). +# +config DEBUG_VAX_CHECK_CHMx_ARGS + bool "Check number of syscall arguments" + default y + depends VAX + help + This option allows you to switch off checking the number of + supplied arguments to syscalls. That is, you'd call a syscall + with less atguments than needed unrecognized if you switch off + this option. Only a moron would do that, or somebody who's + on the way to fix his ABI code... + +config DEBUG_VAX_CHECK_CHMx_ARGS_ABORT + bool "Abort syscall with wrong number of arguments" + default y + depends DEBUG_VAX_CHECK_CHMx_ARGS + help + With this option enabled, you'll not only get a warning, but + the whole system call will be aborted before it can cause + any harm. That's a good think, so keep it enabled! endif endmenu |
|
From: Kenn H. <ke...@us...> - 2004-08-15 22:22:53
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4736/drivers/scsi Modified Files: NCR5380.c Log Message: Apply the locking bits of this patch http://marc.theaimsgroup.com/?l=linux-scsi&m=109250314410187&w=2 Index: NCR5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- NCR5380.c 14 Aug 2004 00:53:58 -0000 1.4 +++ NCR5380.c 15 Aug 2004 22:22:44 -0000 1.5 @@ -28,6 +28,11 @@ /* * $Log$ + * Revision 1.5 2004/08/15 22:22:44 kenn + * Apply the locking bits of this patch + * + * http://marc.theaimsgroup.com/?l=linux-scsi&m=109250314410187&w=2 + * * Revision 1.4 2004/08/14 00:53:58 kenn * Fix two compiler warnings about unused code * @@ -1204,7 +1209,6 @@ Scsi_Cmnd *tmp, *prev; struct Scsi_Host *instance; int done; - unsigned long flags = 0; /* * We run (with interrupts disabled) until we're sure that none of @@ -1220,8 +1224,7 @@ instance = hostdata->host; - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irqsave(instance->host_lock, flags); + spin_lock_irq(instance->host_lock); do { /* Lock held here */ @@ -1321,8 +1324,7 @@ break; } while (!done); - if(instance->irq != SCSI_IRQ_NONE) - spin_unlock_irqrestore(instance->host_lock, flags); + spin_unlock_irq(instance->host_lock); } #ifndef DONT_USE_INTR @@ -1347,12 +1349,13 @@ struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; int done; unsigned char basr; + unsigned long flags; dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n", irq)); do { done = 1; - spin_lock_irq(instance->host_lock); + spin_lock_irqsave(instance->host_lock, flags); /* Look for pending interrupts */ NCR5380_setup(instance); basr = NCR5380_read(BUS_AND_STATUS_REG); @@ -1403,7 +1406,7 @@ #endif } } /* if BASR_IRQ */ - spin_unlock_irq(instance->host_lock); + spin_unlock_irqrestore(instance->host_lock, flags); if(!done) schedule_work(&hostdata->coroutine); } while (!done); @@ -1486,12 +1489,8 @@ int err; NCR5380_setup(instance); - if (hostdata->selecting) { - if(instance->irq != SCSI_IRQ_NONE) - spin_unlock_irq(instance->host_lock); - goto part2; /* RvC: sorry prof. Dijkstra, but it keeps the - rest of the code nearly the same */ - } + if (hostdata->selecting) + goto part2; hostdata->restart_select = 0; @@ -1512,15 +1511,14 @@ NCR5380_write(OUTPUT_DATA_REG, hostdata->id_mask); NCR5380_write(MODE_REG, MR_ARBITRATE); - if(instance->irq != SCSI_IRQ_NONE) - spin_unlock_irq(instance->host_lock); /* We can be relaxed here, interrupts are on, we are in workqueue context, the birds are singing in the trees */ + spin_unlock_irq(instance->host_lock); err = NCR5380_poll_politely(instance, INITIATOR_COMMAND_REG, ICR_ARBITRATION_PROGRESS, ICR_ARBITRATION_PROGRESS, 5*HZ); - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); + + spin_lock_irq(instance->host_lock); if (err < 0) { printk(KERN_DEBUG "scsi: arbitration timeout at %d\n", __LINE__); @@ -1636,10 +1634,6 @@ hostdata->select_time = 0; /* we count the clock ticks at which we polled */ hostdata->selecting = cmd; - /* We always expect the lock to be released at part2: */ - if(instance->irq != SCSI_IRQ_NONE) - spin_unlock_irq(instance->host_lock); - part2: /* RvC: here we enter after a sleeping period, or immediately after execution of part 1 @@ -1648,8 +1642,6 @@ if (!value && (hostdata->select_time < HZ/4)) { /* RvC: we still must wait for a device response */ - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); hostdata->select_time++; /* after 25 ticks the device has failed */ hostdata->time_expires = jiffies + 1; NCR5380_set_timer(instance); @@ -1661,8 +1653,6 @@ waiting period */ if ((NCR5380_read(STATUS_REG) & (SR_SEL | SR_IO)) == (SR_SEL | SR_IO)) { NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); NCR5380_reselect(instance); printk("scsi%d : reselection after won arbitration?\n", instance->host_no); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); @@ -1680,8 +1670,6 @@ if (!(NCR5380_read(STATUS_REG) & SR_BSY)) { NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); if (hostdata->targets_present & (1 << cmd->device->id)) { printk(KERN_DEBUG "scsi%d : weirdness\n", instance->host_no); if (hostdata->restart_select) @@ -1717,10 +1705,12 @@ /* Wait for start of REQ/ACK handshake */ + spin_unlock_irq(instance->host_lock); err = NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, HZ); + spin_lock_irq(instance->host_lock); - if(err) - { printk(KERN_ERR "scsi%d: timeout at NCR5380.c:%d\n", instance->host_no, __LINE__); + if(err) { + printk(KERN_ERR "scsi%d: timeout at NCR5380.c:%d\n", instance->host_no, __LINE__); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); goto failed; } @@ -1728,9 +1718,6 @@ dprintk(NDEBUG_SELECTION, ("scsi%d : target %d selected, going into MESSAGE OUT phase.\n", instance->host_no, cmd->device->id)); tmp[0] = IDENTIFY(((instance->irq == SCSI_IRQ_NONE) ? 0 : 1), cmd->device->lun); - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); - len = 1; cmd->tag = 0; @@ -1751,8 +1738,6 @@ /* Selection failed */ failed: - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); return -1; } |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-15 17:10:08
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21436/arch/vax/configs Modified Files: ka4x_defconfig Log Message: - Enable "character based drivers" in Kconfig - Update ka4x_defconfig - ATTENTION: If you use 'make oldconfig', please switch off VGA console afterwards!!! Index: ka4x_defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/configs/ka4x_defconfig,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ka4x_defconfig 30 Jul 2004 00:24:12 -0000 1.4 +++ ka4x_defconfig 15 Aug 2004 17:09:55 -0000 1.5 @@ -110,9 +110,61 @@ # CONFIG_INPUT_MISC is not set # +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_QIC02_TAPE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_RAW_DRIVER is not set + +# # Graphics support # # CONFIG_FB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set @@ -325,13 +377,10 @@ # VAX character devices # CONFIG_SERIAL=y -CONFIG_SERIAL_CORE=y CONFIG_DZ=y CONFIG_SERIAL_IPR=y CONFIG_SERIAL_CONSOLE=y -CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTY_COUNT=256 -# CONFIG_RTC is not set # # Kernel hacking |
|
From: Jan-Benedict G. <jb...@us...> - 2004-08-15 17:10:08
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21436/arch/vax Modified Files: Kconfig Log Message: - Enable "character based drivers" in Kconfig - Update ka4x_defconfig - ATTENTION: If you use 'make oldconfig', please switch off VGA console afterwards!!! Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Kconfig 31 May 2004 09:43:46 -0000 1.17 +++ Kconfig 15 Aug 2004 17:09:55 -0000 1.18 @@ -117,7 +117,7 @@ # source "drivers/input/Kconfig" # -# source "drivers/char/Kconfig" +source "drivers/char/Kconfig" # source "drivers/video/Kconfig" |
|
From: Kenn H. <ke...@us...> - 2004-08-14 00:54:08
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18051 Modified Files: NCR5380.c Log Message: Fix two compiler warnings about unused code Index: NCR5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NCR5380.c 13 Aug 2004 23:44:24 -0000 1.3 +++ NCR5380.c 14 Aug 2004 00:53:58 -0000 1.4 @@ -28,6 +28,9 @@ /* * $Log$ + * Revision 1.4 2004/08/14 00:53:58 kenn + * Fix two compiler warnings about unused code + * * Revision 1.3 2004/08/13 23:44:24 kenn * Workaround a bug when AUTOSENSE is enabled * @@ -401,6 +404,7 @@ return -ETIMEDOUT; } +#ifdef NDEBUG static struct { unsigned char value; const char *name; @@ -414,7 +418,6 @@ {PHASE_UNKNOWN, "UNKNOWN"} }; -#ifdef NDEBUG static struct { unsigned char mask; const char *name; @@ -676,6 +679,8 @@ } +#ifdef AUTOPROBE_IRQ + static int probe_irq __initdata = 0; /** @@ -751,6 +756,7 @@ return probe_irq; } +#endif /* AUTOPROBE_IRQ */ /** * NCR58380_print_options - show options |
|
From: Kenn H. <ke...@us...> - 2004-08-13 23:45:24
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8771/drivers/vax/scsi Modified Files: vax-5380.c Log Message: Re-enable AUTOSENSE and increase the queue sizes again, now that we've got a workaround for the AUTOSENSE bug in NCR5380.c Index: vax-5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi/vax-5380.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vax-5380.c 10 Aug 2004 22:12:26 -0000 1.3 +++ vax-5380.c 13 Aug 2004 23:45:15 -0000 1.4 @@ -17,7 +17,7 @@ #include "../../scsi/hosts.h" /* See NCR5380.c for the options that can be set */ -#undef AUTOSENSE +#define AUTOSENSE #define NCR5380_implementation_fields \ unsigned volatile char *base @@ -62,10 +62,10 @@ .eh_bus_reset_handler = NCR5380_bus_reset, .eh_device_reset_handler = NCR5380_device_reset, .eh_host_reset_handler = NCR5380_host_reset, - .can_queue = 1, + .can_queue = 32, .this_id = 6, .sg_tablesize = SG_ALL, - .cmd_per_lun = 1, + .cmd_per_lun = 2, .use_clustering = DISABLE_CLUSTERING, .proc_name = "vax-5380", .proc_info = NCR5380_proc_info, |
|
From: Kenn H. <ke...@us...> - 2004-08-13 23:44:40
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8666/drivers/scsi Modified Files: NCR5380.c Log Message: Workaround a bug when AUTOSENSE is enabled Index: NCR5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NCR5380.c 8 Aug 2004 23:32:34 -0000 1.2 +++ NCR5380.c 13 Aug 2004 23:44:24 -0000 1.3 @@ -28,6 +28,9 @@ /* * $Log$ + * Revision 1.3 2004/08/13 23:44:24 kenn + * Workaround a bug when AUTOSENSE is enabled + * * Revision 1.2 2004/08/08 23:32:34 kenn * Temporary fix for some locking problems in the 5380 core driver. I've * asked on linux-scsi about this, so hopefully I'll get a definitive @@ -1734,8 +1737,9 @@ hostdata->connected = cmd; hostdata->busy[cmd->device->id] |= (1 << cmd->device->lun); - initialize_SCp(cmd); - + if (cmd->SCp.ptr != (char *)cmd->sense_buffer) { + initialize_SCp(cmd); + } return 0; |
|
From: Kenn H. <ke...@us...> - 2004-08-10 22:12:35
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11319/scsi Modified Files: vax-5380.c Log Message: Turn off AUTOSENSE option in NCR5380 driver - allows spin-up at boot to work again. Also limit to one outstanding command at a time to prevent a warning about possible loss of error information. Index: vax-5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi/vax-5380.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vax-5380.c 8 Aug 2004 23:29:49 -0000 1.2 +++ vax-5380.c 10 Aug 2004 22:12:26 -0000 1.3 @@ -17,7 +17,7 @@ #include "../../scsi/hosts.h" /* See NCR5380.c for the options that can be set */ -#define AUTOSENSE +#undef AUTOSENSE #define NCR5380_implementation_fields \ unsigned volatile char *base @@ -62,10 +62,10 @@ .eh_bus_reset_handler = NCR5380_bus_reset, .eh_device_reset_handler = NCR5380_device_reset, .eh_host_reset_handler = NCR5380_host_reset, - .can_queue = 32, + .can_queue = 1, .this_id = 6, .sg_tablesize = SG_ALL, - .cmd_per_lun = 2, + .cmd_per_lun = 1, .use_clustering = DISABLE_CLUSTERING, .proc_name = "vax-5380", .proc_info = NCR5380_proc_info, |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:47:12
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13495/arch/vax/kernel Modified Files: cpu_ka43.c Log Message: Register the SCSI controllers on the KA43 board Index: cpu_ka43.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- cpu_ka43.c 6 Aug 2004 22:48:28 -0000 1.16 +++ cpu_ka43.c 8 Aug 2004 23:47:03 -0000 1.17 @@ -268,6 +268,12 @@ #ifdef CONFIG_VSBUS vsbus_add_fixed_device(&ka43_vsbus_device.dev, "lance", 0x200e0000, 5); vsbus_add_fixed_device(&ka43_vsbus_device.dev, "dz", 0x200a0000, 6); + + /* Register internal SCSI bus */ + vsbus_add_fixed_device(&ka43_vsbus_device.dev, "vax-5380-int", 0x200c0080, 1); + + /* Register external SCSI bus */ + vsbus_add_fixed_device(&ka43_vsbus_device.dev, "vax-5380-ext", 0x200c0180, 0); #endif } |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:41:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12994 Removed Files: vax-5380.c vax-5380.h Log Message: VAX 5380 driver now lives in drivers/vax/scsi --- vax-5380.c DELETED --- --- vax-5380.h DELETED --- |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:39:09
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12581/arch/vax Modified Files: defconfig Log Message: Enable NCR5380 driver in defconfig. Also disable generic SCSI driver (it uses vmalloc and crashes) Index: defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- defconfig 7 Aug 2004 23:24:42 -0000 1.14 +++ defconfig 8 Aug 2004 23:38:59 -0000 1.15 @@ -234,7 +234,7 @@ # CONFIG_CHR_DEV_OSST is not set CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SG is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -259,7 +259,7 @@ # # VAX SCSI low-level drivers # -# CONFIG_SCSI_VAX_5380 is not set +CONFIG_SCSI_VAX_5380=y # CONFIG_SCSI_VAX_53C94 is not set # |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:35:38
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12124/arch/vax/kernel Modified Files: cpu_ka42.c Log Message: Kick off SCSI probing by registering the on-board SCSI adaptors Index: cpu_ka42.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cpu_ka42.c 6 Aug 2004 22:48:28 -0000 1.13 +++ cpu_ka42.c 8 Aug 2004 23:35:30 -0000 1.14 @@ -88,6 +88,12 @@ #ifdef CONFIG_VSBUS vsbus_add_fixed_device(&ka42_vsbus_device.dev, "lance", 0x200e0000, 5); vsbus_add_fixed_device(&ka42_vsbus_device.dev, "dz", 0x200a0000, 6); + + /* Register internal SCSI bus */ + vsbus_add_fixed_device(&ka42_vsbus_device.dev, "vax-5380-int", 0x200c0080, 1); + + /* Register external SCSI bus */ + vsbus_add_fixed_device(&ka42_vsbus_device.dev, "vax-5380-ext", 0x200c0180, 0); #endif } |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:35:12
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12100/drivers/scsi Modified Files: Makefile Log Message: VAX 5380 driver now lives in drivers/vax/scsi Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/Makefile,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- Makefile 28 Jul 2004 23:08:58 -0000 1.35 +++ Makefile 8 Aug 2004 23:35:02 -0000 1.36 @@ -115,7 +115,6 @@ obj-$(CONFIG_SUN3X_ESP) += NCR53C9x.o sun3x_esp.o # VAX stuff -obj-$(CONFIG_SCSI_VAX_5380) += vax-5380.o obj-$(CONFIG_SCSI_VAX_53C94) += NCR53C9x.o vax_esp.o # end VAX stuff |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:33:22
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11791/drivers/vax Modified Files: Makefile Log Message: Collect the VAX SCSI drivers in a separate directory Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 13 Oct 2003 00:55:44 -0000 1.5 +++ Makefile 8 Aug 2004 23:33:14 -0000 1.6 @@ -5,5 +5,6 @@ obj-y += bus/ #obj-y += char/ obj-y += net/ +obj-y += scsi/ obj-y += serial/ |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:32:43
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11555/drivers/scsi Modified Files: NCR5380.c Log Message: Temporary fix for some locking problems in the 5380 core driver. I've asked on linux-scsi about this, so hopefully I'll get a definitive solution soon. Index: NCR5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/NCR5380.c,v retrieving revision 1.1.1.19 retrieving revision 1.2 diff -u -d -r1.1.1.19 -r1.2 --- NCR5380.c 24 Mar 2004 22:45:21 -0000 1.1.1.19 +++ NCR5380.c 8 Aug 2004 23:32:34 -0000 1.2 @@ -28,6 +28,11 @@ /* * $Log$ + * Revision 1.2 2004/08/08 23:32:34 kenn + * Temporary fix for some locking problems in the 5380 core driver. I've + * asked on linux-scsi about this, so hopefully I'll get a definitive + * solution soon. + * * Revision 1.1.1.19 2004/03/24 22:45:21 kenn * Import of pristine Linus 2.6.4 tree * @@ -1622,6 +1627,10 @@ hostdata->select_time = 0; /* we count the clock ticks at which we polled */ hostdata->selecting = cmd; + /* We always expect the lock to be released at part2: */ + if(instance->irq != SCSI_IRQ_NONE) + spin_unlock_irq(instance->host_lock); + part2: /* RvC: here we enter after a sleeping period, or immediately after execution of part 1 @@ -1630,6 +1639,8 @@ if (!value && (hostdata->select_time < HZ/4)) { /* RvC: we still must wait for a device response */ + if(instance->irq != SCSI_IRQ_NONE) + spin_lock_irq(instance->host_lock); hostdata->select_time++; /* after 25 ticks the device has failed */ hostdata->time_expires = jiffies + 1; NCR5380_set_timer(instance); @@ -1660,6 +1671,8 @@ if (!(NCR5380_read(STATUS_REG) & SR_BSY)) { NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); + if(instance->irq != SCSI_IRQ_NONE) + spin_lock_irq(instance->host_lock); if (hostdata->targets_present & (1 << cmd->device->id)) { printk(KERN_DEBUG "scsi%d : weirdness\n", instance->host_no); if (hostdata->restart_select) @@ -1668,8 +1681,6 @@ NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); return -1; } - if(instance->irq != SCSI_IRQ_NONE) - spin_lock_irq(instance->host_lock); cmd->result = DID_BAD_TARGET << 16; collect_stats(hostdata, cmd); cmd->scsi_done(cmd); |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:29:58
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11122/drivers/vax/scsi Modified Files: vax-5380.c Log Message: Oops - including NCR5380.c from the current directory was just a temporary measure Index: vax-5380.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi/vax-5380.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vax-5380.c 8 Aug 2004 23:26:24 -0000 1.1 +++ vax-5380.c 8 Aug 2004 23:29:49 -0000 1.2 @@ -47,8 +47,7 @@ #include "../../scsi/NCR5380.h" -//#include "../../scsi/NCR5380.c" -#include "NCR5380.c" +#include "../../scsi/NCR5380.c" const char *vax_5380_info (struct Scsi_Host *spnt) { |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:26:34
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10379/drivers/vax/scsi Added Files: Makefile vax-5380.c Log Message: Add a more modern driver for the NCR5380 SCSI host bus adapters on the KA42 and KA43 boards. Currently uses PIO only. It seems to work as long the disk is already spun-up before the kernel boots. --- NEW FILE: Makefile --- # # Makefile for the Linux/VAX serial UART drivers. # obj-$(CONFIG_SCSI_VAX_5380) += vax-5380.o --- NEW FILE: vax-5380.c --- /* * Driver for NCR5380 SCSI controller on KA42 and KA43 CPU boards. * * Copyright 2000, 2004 Kenn Humborg <ke...@li...> * * Based on ARM SCSI drivers by Russell King */ #include <linux/device.h> #include <linux/init.h> #include <linux/blkdev.h> #include <linux/delay.h> #include <asm/bus/vsbus.h> #include "../../scsi/scsi.h" #include "../../scsi/hosts.h" /* See NCR5380.c for the options that can be set */ #define AUTOSENSE #define NCR5380_implementation_fields \ unsigned volatile char *base #define NCR5380_local_declare() \ unsigned volatile char *base #define NCR5380_setup(instance) \ base = (unsigned volatile char *)((instance)->base) #define VAX_5380_address(reg) (base + ((reg) * 0x04)) #if !(VDEBUG & VDEBUG_TRANSFER) #define NCR5380_read(reg) (*(VAX_5380_address(reg))) #define NCR5380_write(reg, value) (*(VAX_5380_address(reg)) = (value)) #else #define NCR5380_read(reg) \ (((unsigned char) printk("scsi%d : read register %d at address %08x\n"\ , instance->hostno, (reg), VAX_5380_address(reg))), *(VAX_5380_address(reg))) #define NCR5380_write(reg, value) { \ printk("scsi%d : write %02x to register %d at address %08x\n", \ instance->hostno, (value), (reg), VAX_5380_address(reg)); \ *(VAX_5380_address(reg)) = (value); \ } #endif #include "../../scsi/NCR5380.h" //#include "../../scsi/NCR5380.c" #include "NCR5380.c" const char *vax_5380_info (struct Scsi_Host *spnt) { return ""; } static Scsi_Host_Template vax_5380_template = { .name = "VAXstation 3100/MicroVAX 3100 NCR5380 SCSI", .info = vax_5380_info, .queuecommand = NCR5380_queue_command, .eh_abort_handler = NCR5380_abort, .eh_bus_reset_handler = NCR5380_bus_reset, .eh_device_reset_handler = NCR5380_device_reset, .eh_host_reset_handler = NCR5380_host_reset, .can_queue = 32, .this_id = 6, .sg_tablesize = SG_ALL, .cmd_per_lun = 2, .use_clustering = DISABLE_CLUSTERING, .proc_name = "vax-5380", .proc_info = NCR5380_proc_info, }; static int __init vax_5380_probe(struct vsbus_device *vsbus_dev) { struct Scsi_Host *host; int retval = -ENOMEM; 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)); if (!host) goto out; host->base = (unsigned long) ioremap(vsbus_dev->phys_base, 0x80); if (!host->base) goto out_unreg; NCR5380_init(host, 0); host->irq = vsbus_dev->vsbus_irq; retval = vsbus_request_irq(host->irq, NCR5380_intr, SA_INTERRUPT, "vax-5380", host); if (retval) { printk("scsi%d: IRQ%d not free: %d\n", host->host_no, host->irq, retval); goto out_iounmap; } printk("scsi%d: at virt 0x%08lx VSBUS irq %d", host->host_no, host->base, host->irq); printk(" options CAN_QUEUE=%d CMD_PER_LUN=%d", host->can_queue, host->cmd_per_lun); printk("\nscsi%d:", host->host_no); NCR5380_print_options(host); printk("\n"); retval = scsi_add_host(host, &vsbus_dev->dev); if (retval) goto out_free_irq; scsi_scan_host(host); goto out; out_free_irq: vsbus_free_irq(host->irq); out_iounmap: iounmap((void *)host->base); out_unreg: scsi_host_put(host); out: return retval; } static struct vsbus_driver vax_5380_driver = { .probe = vax_5380_probe, .drv = { .name = "vax-5380", }, }; int __init vax_5380_init(void) { return vsbus_register_driver(&vax_5380_driver); } device_initcall(vax_5380_init); |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:23:31
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10085/drivers/char Modified Files: dz.c Log Message: Remove obsoleted inclusion of asm/vsa.h Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- dz.c 6 Aug 2004 00:01:08 -0000 1.23 +++ dz.c 8 Aug 2004 23:23:22 -0000 1.24 @@ -60,7 +60,6 @@ #include <asm/irq.h> #include <asm/mv.h> -#include <asm/vsa.h> #include <asm/dz11.h> #ifdef DEBUG_DZ |
|
From: Kenn H. <ke...@us...> - 2004-08-08 23:20:13
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9612/drivers/vax/scsi Log Message: Directory /cvsroot/linux-vax/kernel-2.5/drivers/vax/scsi added to the repository |
|
From: Kenn H. <ke...@us...> - 2004-08-07 23:38:29
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13725/net Modified Files: lance.c Log Message: Remove obsoleted inclusions of <asm/vsa.h> Index: lance.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/lance.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- lance.c 10 May 2004 23:22:15 -0000 1.6 +++ lance.c 7 Aug 2004 23:38:20 -0000 1.7 @@ -27,7 +27,6 @@ #include <linux/etherdevice.h> #include <asm/cacheflush.h> /* for __flush_tlb_one */ -#include <asm/vsa.h> #include <asm/bus/vsbus.h> |
