Date: Thu, 16 Sep 2004 06:46:31 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 61597 for review Message-ID: <200409160646.i8G6kVJI021582@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=61597 Change 61597 by julian@julian_ref on 2004/09/16 06:46:15 IFC@61596 Affected files ... .. //depot/projects/nsched/sys/dev/aac/aac.c#7 integrate .. //depot/projects/nsched/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#9 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc_acpi.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#33 integrate .. //depot/projects/nsched/sys/sys/ttydefaults.h#3 integrate Differences ... ==== //depot/projects/nsched/sys/dev/aac/aac.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.102 2004/09/12 03:19:32 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.103 2004/09/16 02:37:40 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -1992,11 +1992,13 @@ { struct aac_command *cm; time_t deadline; + int timedout, code; /* * Traverse the busy command list, bitch about late commands once * only. */ + timedout = 0; deadline = time_second - AAC_CMD_TIMEOUT; TAILQ_FOREACH(cm, &sc->aac_busy, cm_link) { if ((cm->cm_timestamp < deadline) @@ -2006,9 +2008,17 @@ "COMMAND %p TIMEOUT AFTER %d SECONDS\n", cm, (int)(time_second-cm->cm_timestamp)); AAC_PRINT_FIB(sc, cm->cm_fib); + timedout++; } } + if (timedout) { + code = AAC_GET_FWSTATUS(sc); + if (code != AAC_UP_AND_RUNNING) { + device_printf(sc->aac_dev, "WARNING! Controller is no " + "longer running! code= 0x%x\n", code); + } + } return; } ==== //depot/projects/nsched/sys/dev/aac/aacreg.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.18 2004/08/13 01:44:09 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacreg.h,v 1.19 2004/09/16 02:37:40 scottl Exp $ */ /* @@ -551,6 +551,7 @@ * state of the adapter. */ #define AAC_SELF_TEST_FAILED 0x00000004 +#define AAC_MONITOR_PANIC 0x00000020 #define AAC_UP_AND_RUNNING 0x00000080 #define AAC_KERNEL_PANIC 0x00000100 ==== //depot/projects/nsched/sys/dev/fdc/fdc.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.288 2004/09/14 17:28:51 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.289 2004/09/16 06:34:00 imp Exp $"); #include "opt_fdc.h" @@ -1323,11 +1323,6 @@ if (ar == 0 && aw == 0 && ae == 0) { device_unbusy(fd->dev); - if (!(fdc->flags & FDC_NODMA) && --fdc->dmacnt == 0) { - mtx_lock(&Giant); - isa_dma_release(fdc->dmachan); - mtx_unlock(&Giant); - } return (0); } @@ -1341,12 +1336,6 @@ fd->flags &= ~FD_NEWDISK; } device_busy(fd->dev); - if (!(fdc->flags & FDC_NODMA) && fdc->dmacnt++ == 0) { - mtx_lock(&Giant); - isa_dma_acquire(fdc->dmachan); - isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL); - mtx_unlock(&Giant); - } } #ifdef notyet @@ -1495,8 +1484,7 @@ dev = fdc->fdc_dev; if (fdc->fdc_intr) - BUS_TEARDOWN_INTR(device_get_parent(dev), dev, fdc->res_irq, - fdc->fdc_intr); + bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr); fdc->fdc_intr = NULL; if (fdc->res_irq != NULL) bus_release_resource(dev, SYS_RES_IRQ, fdc->rid_irq, @@ -1640,6 +1628,8 @@ /* reset controller, turn motor off */ fdout_wr(fdc, 0); + if (!(fdc->flags & FDC_NODMA)) + isa_dma_release(fdc->dmachan); fdc_release_resources(fdc); mtx_destroy(&fdc->fdc_mtx); return (0); @@ -1687,12 +1677,19 @@ return (error); } error = bus_setup_intr(dev, fdc->res_irq, - INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, - fdc_intr, fdc, &fdc->fdc_intr); + INTR_TYPE_BIO | INTR_ENTROPY | INTR_FAST | INTR_MPSAFE, + fdc_intr, fdc, &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); return (error); } + if (!(fdc->flags & FDC_NODMA)) { + error = isa_dma_acquire(fdc->dmachan); + if (error) + return (error); + /* XXX no error return */ + isa_dmainit(fdc->dmachan, MAX_BYTES_PER_CYL); + } fdc->fdcu = device_get_unit(dev); fdc->flags |= FDC_NEEDS_RESET; ==== //depot/projects/nsched/sys/dev/fdc/fdc_acpi.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.5 2004/08/30 21:35:34 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc_acpi.c,v 1.7 2004/09/16 06:37:05 imp Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -137,7 +137,6 @@ fde = (uint32_t *)obj->Buffer.Pointer; if (obj->Buffer.Length < 20) { device_printf(dev, "_FDE too small\n"); - error = ENXIO; goto out; } break; @@ -150,7 +149,6 @@ fde = malloc(pkg->Package.Count * sizeof(uint32_t), M_TEMP, M_NOWAIT | M_ZERO); if (fde == NULL) { - error = ENOMEM; goto out; } for (i = 0; i < pkg->Package.Count; i++) { @@ -161,7 +159,6 @@ break; default: device_printf(dev, "invalid _FDE type %d\n", obj->Type); - error = ENXIO; goto out; } error = fdc_acpi_probe_children(bus, dev, fde); ==== //depot/projects/nsched/sys/kern/kern_switch.c#33 (text+ko) ==== @@ -86,7 +86,7 @@ ***/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.92 2004/09/15 03:51:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.93 2004/09/16 05:37:40 julian Exp $"); #include "opt_sched.h" @@ -597,9 +597,9 @@ struct ksegrp *kg; kg = td->td_ksegrp; - if (kg->kg_last_assigned == td) + if (kg->kg_last_assigned == td) kg->kg_last_assigned = - TAILQ_PREV(td, threadqueue, td_runq); + TAILQ_PREV(td, threadqueue, td_runq); TAILQ_REMOVE(&kg->kg_runq, td, td_runq); } ==== //depot/projects/nsched/sys/sys/ttydefaults.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ttydefaults.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.15 2004/04/07 04:19:50 imp Exp $ + * $FreeBSD: src/sys/sys/ttydefaults.h,v 1.16 2004/09/16 06:00:52 phk Exp $ */ /* @@ -45,15 +45,15 @@ * Defaults on "first" open. */ #define TTYDEF_IFLAG (BRKINT | ICRNL | IMAXBEL | IXON | IXANY) -#define TTYDEF_OFLAG (OPOST | ONLCR) -#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) +#define TTYDEF_OFLAG (OPOST | ONLCR) +#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL) #define TTYDEF_CFLAG (CREAD | CS8 | HUPCL) -#define TTYDEF_SPEED (B9600) +#define TTYDEF_SPEED (B9600) /* * Control Character Defaults */ -#define CTRL(x) (x&037) +#define CTRL(x) (x&037) #define CEOF CTRL('d') #define CEOL 0xff /* XXX avoid _POSIX_VDISABLE */ #define CERASE 0177 @@ -75,7 +75,7 @@ #define CEOT CEOF /* compat */ #define CBRK CEOL -#define CRPRNT CREPRINT +#define CRPRNT CREPRINT #define CFLUSH CDISCARD /* PROTECTED INCLUSION ENDS HERE */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409160646.i8G6kVJI021582>