Menu
▾
▴
linux-vax-kern-commit — Notifications of CVS commits to kernel 2.4 source tree
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(6) |
Sep
(2) |
Oct
(43) |
Nov
(4) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(78) |
Feb
(97) |
Mar
(29) |
Apr
(2) |
May
(22) |
Jun
(38) |
Jul
(11) |
Aug
(27) |
Sep
(40) |
Oct
(2) |
Nov
(17) |
Dec
(8) |
| 2002 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(480) |
May
(456) |
Jun
(12) |
Jul
|
Aug
(1) |
Sep
|
Oct
(18) |
Nov
(3) |
Dec
(6) |
| 2003 |
Jan
|
Feb
(18) |
Mar
(1) |
Apr
|
May
(6) |
Jun
(147) |
Jul
(7) |
Aug
(3) |
Sep
(235) |
Oct
(10) |
Nov
(2) |
Dec
(1) |
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dave A. <ai...@us...> - 2001-02-23 03:33:08
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv2641/include/asm-vax
Modified Files:
vsa.h
Log Message:
mistake in strucuture def
vsa->vsbus
Index: vsa.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/vsa.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vsa.h 2001/01/23 23:58:58 1.2
+++ vsa.h 2001/02/22 22:20:31 1.3
@@ -13,13 +13,13 @@
unsigned char vc_vdcorg; /* Mono display origin */
unsigned char vc_vdcsel; /* Video interrupt select */
unsigned char vc_intreq; /* Interrupt request register */
- unsigned char vc_intclr; /* Interrupt acknowledge register */
+#define vc_intclr vc_intreq
};
-extern int vsa_setup(void);
-extern int vsa_enable_int(int bit_nr);
-extern int vsa_clear_int(int bit_nr);
-extern int vsa_probe_irq(void);
+extern int vsbus_setup(void);
+extern int vsbus_enable_int(int bit_nr);
+extern int vsbus_clear_int(int bit_nr);
+extern int vsbus_probe_irq(void);
#define VSA_BASE_REGS 0x20080000
|
|
From: Dave A. <ai...@us...> - 2001-02-23 01:08:23
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv4765
Modified Files:
cpu_ka42.c cpu_ka43.c cpu_ka46.c
Log Message:
more vsa->vsbus changes
Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpu_ka42.c 2001/02/11 23:58:11 1.3
+++ cpu_ka42.c 2001/02/22 22:36:42 1.4
@@ -73,8 +73,8 @@
void ka42_init_devices(void)
{
-#ifdef CONFIG_VSABUS
- vsa_setup();
+#ifdef CONFIG_VSBUS
+ vsbus_setup();
#endif
}
Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpu_ka43.c 2001/02/11 23:58:11 1.3
+++ cpu_ka43.c 2001/02/22 22:36:42 1.4
@@ -141,9 +141,9 @@
void ka43_init_devices(void)
{
-#ifdef CONFIG_VSABUS
- vsa_setup();
-#endif /* CONFIG_VSABUS */
+#ifdef CONFIG_VSBUS
+ vsbus_setup();
+#endif /* CONFIG_VSBUS */
}
Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpu_ka46.c 2001/02/18 20:37:39 1.4
+++ cpu_ka46.c 2001/02/22 22:36:42 1.5
@@ -125,7 +125,7 @@
void ka46_init_devices(void)
{
printk("ka46: init_devices\n");
-#ifdef CONFIG_VSABUS
- vsa_setup();
-#endif /* CONFIG_VSABUS */
+#ifdef CONFIG_VSBUS
+ vsbus_setup();
+#endif /* CONFIG_VSBUS */
}
|
|
From: Dave A. <ai...@us...> - 2001-02-23 01:07:12
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv6529/drivers/net
Modified Files:
vaxlance.c
Log Message:
enable autoprobing just of vector not mask
Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vaxlance.c 2001/02/11 23:57:16 1.4
+++ vaxlance.c 2001/02/22 22:49:22 1.5
@@ -47,6 +47,7 @@
#include <linux/delay.h>
#include <asm/io.h>
#include <linux/etherdevice.h>
+#include <asm/vsa.h>
#ifndef CONFIG_TC
unsigned long system_base = 0;
@@ -214,7 +215,7 @@
volatile struct lance_regs *ll;
volatile struct lance_init_block *init_block;
volatile unsigned long *dma_ptr_reg;
-
+ unsigned char vsbus_int;
spinlock_t lock;
int rx_new, tx_new;
@@ -585,7 +586,7 @@
writereg(&ll->rap, LE_CSR0);
csr0 = ll->rdp;
-
+ vsbus_clear_int(lp->vsbus_int);
/* Acknowledge all the interrupt sources ASAP */
writereg(&ll->rdp, csr0 & (LE_C0_INTR | LE_C0_TINT | LE_C0_RINT));
@@ -648,7 +649,7 @@
return -EAGAIN;
}
/* this is just a hack for now */
- vsa_enable_int(5);
+ vsbus_enable_int(lp->vsbus_int);
/* Stop the Lance */
writereg(&ll->rap, LE_CSR0);
@@ -981,8 +982,9 @@
dev->dev_addr[i] = esar[i * 4];
printk("%2.2x%c", dev->dev_addr[i], i == 5 ? ',' : ':');
}
-
-#if 0
+ lp->vsbus_int=5;
+#if 1
+ vsbus_enable_int(lp->vsbus_int);
autoirq_setup(0);
writereg(&ll->rap, LE_CSR0);
@@ -993,6 +995,7 @@
writereg(&ll->rdp, LE_C0_INEA|LE_C0_INIT);
dev->irq = autoirq_report(100);
+ vsbus_clear_int(lp->vsbus_int);
if (dev->irq)
printk(" probed IRQ %d", dev->irq);
else
@@ -1068,7 +1071,7 @@
/* Find all the lance cards on the system and initialize them */
-static int __init vax_lance_probe(void)
+int __init vax_lance_probe(void)
{
struct net_device *dev = NULL;
static int called = 0;
|
|
From: Dave A. <ai...@us...> - 2001-02-23 01:06:46
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory usw-pr-cvs1:/tmp/cvs-serv1911 Modified Files: Makefile Log Message: start to get rid os VSABUS .. called it VSBUS from here on in this make break some ppl's configs Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 2001/02/22 00:00:59 1.7 +++ Makefile 2001/02/22 22:15:07 1.8 @@ -19,7 +19,7 @@ HOSTCC = gcc HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -CROSS_COMPILE = /usr/local/bin/vax-dec-linux- +CROSS_COMPILE = /usr/local/vax-tools/bin/vax-dec-linux- # # Include the make variables (CC, etc...) @@ -178,7 +178,7 @@ DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o -DRIVERS-$(CONFIG_VSABUS) += drivers/vsbus/vsbus.a +DRIVERS-$(CONFIG_VSBUS) += drivers/vsbus/vsbus.a DRIVERS += $(DRIVERS-y) |
|
From: Dave A. <ai...@us...> - 2001-02-23 01:06:35
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv2391/drivers/scsi
Modified Files:
vax-5380.c
Log Message:
vsa->vsbus
Index: vax-5380.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/vax-5380.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vax-5380.c 2001/02/22 00:00:36 1.2
+++ vax-5380.c 2001/02/22 22:18:17 1.3
@@ -54,6 +54,9 @@
/*
* $Log$
+ * Revision 1.3 2001/02/22 22:18:17 airlied
+ * vsa->vsbus
+ *
* Revision 1.2 2001/02/22 00:00:36 kenn
* VS3100m76 SCSI sort of, kind of, seems to work...
*
@@ -92,9 +95,9 @@
{
do_vax_5380_intr(irq, dev_id, regs);
#if INTERNAL_SCSI
- vsa_clear_int(1);
+ vsbus_clear_int(1);
#else
- vsa_clear_int(0);
+ vsbus_clear_int(0);
#endif
}
@@ -149,9 +152,9 @@
if (instance->irq != IRQ_NONE) {
#if INTERNAL_SCSI
- vsa_enable_int(1);
+ vsbus_enable_int(1);
#else
- vsa_enable_int(0);
+ vsbus_enable_int(0);
#endif
}
#endif
|
|
From: Dave A. <ai...@us...> - 2001-02-23 00:38:52
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax In directory usw-pr-cvs1:/tmp/cvs-serv1911/arch/vax Modified Files: config.in Log Message: start to get rid os VSABUS .. called it VSBUS from here on in this make break some ppl's configs Index: config.in =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/config.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config.in 2001/02/18 16:42:44 1.3 +++ config.in 2001/02/22 22:15:07 1.4 @@ -73,7 +73,7 @@ bool 'Support for Q-bus' CONFIG_QBUS bool 'Support for Unibus' CONFIG_UNIBUS bool 'Support for VAXBI' CONFIG_VAXBI -bool 'Support for Vax Station BUS (??)' CONFIG_VSABUS +bool 'Support for Vax Station BUS (??)' CONFIG_VSBUS endmenu mainmenu_option next_comment |
|
From: Dave A. <ai...@us...> - 2001-02-23 00:36:35
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax In directory usw-pr-cvs1:/tmp/cvs-serv2017/arch/vax Modified Files: defconfig Log Message: fixed default config for VSBUS Index: defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/defconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- defconfig 2001/02/18 20:41:50 1.5 +++ defconfig 2001/02/22 22:15:41 1.6 @@ -43,7 +43,7 @@ CONFIG_QBUS=y CONFIG_UNIBUS=y CONFIG_VAXBI=y -CONFIG_VSABUS=y +CONFIG_VSBUS=y # # Mass storage support |
|
From: Dave A. <ai...@us...> - 2001-02-22 23:54:24
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv15841/arch/vax/kernel
Modified Files:
interrupt.c
Log Message:
added irq_enter / irq_exit for consistency sake with everyone else in 2.4
(might be useful at some stage)
Changed in_softirq() to softirq_active(cpu)&softirq_mask(cpu)
(again what everyone else seems to be doing .. also made networking work
so can't be all bad :-))
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/interrupt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- interrupt.c 2001/02/22 22:21:31 1.8
+++ interrupt.c 2001/02/22 23:55:27 1.9
@@ -265,16 +265,20 @@
{
int flags;
int status;
-
+ int cpu;
/* Fake a single-priority-level interrupt system by raising IPL
to 31 for _any_ interrupt. This is such a waste of the VAX's
hardware capabilities... */
+ cpu=smp_processor_id();
+ irq_enter(cpu);
+
save_and_cli(flags);
status = dispatch_irq(regs, vec);
+ irq_exit(cpu);
if (status) {
- if (in_softirq()) {
+ if (softirq_active(cpu)&softirq_mask(cpu)) {
do_softirq();
}
}
|
|
From: Dave A. <ai...@us...> - 2001-02-22 23:52:33
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv15719/include/asm-vax
Modified Files:
hardirq.h
Log Message:
hardirq_enter -> irq_enter
hardirq_exit -> irq_exit
if everyone else is doing it why can't we? :-)
Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/hardirq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hardirq.h 2001/01/18 15:52:28 1.2
+++ hardirq.h 2001/02/22 23:53:36 1.3
@@ -32,8 +32,8 @@
#define hardirq_trylock(cpu) (local_irq_count(cpu) == 0)
#define hardirq_endlock(cpu) do { } while (0)
-#define hardirq_enter(cpu) (local_irq_count(cpu)++)
-#define hardirq_exit(cpu) (local_irq_count(cpu)--)
+#define irq_enter(cpu) (local_irq_count(cpu)++)
+#define irq_exit(cpu) (local_irq_count(cpu)--)
#define synchronize_irq() do { } while (0)
|
|
From: Dave A. <ai...@us...> - 2001-02-22 23:51:17
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/vsbus
In directory usw-pr-cvs1:/tmp/cvs-serv15615/drivers/vsbus
Modified Files:
vsbus.c
Log Message:
move cpu_ptr into a structure .. write intclr at setup time
Index: vsbus.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/vsbus/vsbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsbus.c 2001/01/26 00:27:00 1.1
+++ vsbus.c 2001/02/22 23:52:21 1.2
@@ -9,32 +9,36 @@
#include <asm/vsa.h>
#include <asm/io.h>
-struct vs_cpu *vs_cpu_ptr;
+struct vsbus {
+ struct vs_cpu *vs_cpu_ptr;
+ unsigned char vs_mask;
+ unsigned char vs_enabled;
+} sys_vs;
-int vsa_setup(void)
+int vsbus_setup(void)
{
- vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
+ sys_vs.vs_cpu_ptr=(void *)ioremap(VSA_BASE_REGS, 128);
- vs_cpu_ptr->vc_intreq=0;
+ sys_vs.vs_cpu_ptr->vc_intclr=0xFF;
return 0;
}
-int vsa_enable_int(int bit_nr)
+int vsbus_enable_int(int bit_nr)
{
- vs_cpu_ptr->vc_intmsk=1<<bit_nr;
+ sys_vs.vs_cpu_ptr->vc_intmsk=1<<bit_nr;
return 0;
}
-int vsa_clear_int(int bit_nr)
+int vsbus_clear_int(int bit_nr)
{
- vs_cpu_ptr->vc_intclr=1<<bit_nr;
+ sys_vs.vs_cpu_ptr->vc_intclr=1<<bit_nr;
return 0;
}
-int vsa_probe_irq(void)
+int vsbus_probe_irq(void)
{
return 0;
}
|
|
From: Dave A. <ai...@us...> - 2001-02-22 23:35:03
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv11970/include/asm-vax
Modified Files:
checksum.h
Log Message:
remove printf from checksum.h
Index: checksum.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/checksum.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksum.h 2001/02/18 20:37:39 1.2
+++ checksum.h 2001/02/22 23:25:08 1.3
@@ -46,11 +46,8 @@
* of things like adding a varible but they seem to get optimsed
* out ... - D.A. 3 Dec 2000
*/
- printk("w: %8X, sum: %8X, i: %i\n", *(unsigned int *)w, sum, i);
+ // printk("w: %8X, sum: %8X, i: %i\n", *(unsigned int *)w, sum, i);
}
-
-
-
__asm__("addl2 %1, %0\n"
"adwc $0xffff, %0\n" : "=r" (sum)
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 23:59:59
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory usw-pr-cvs1:/tmp/cvs-serv14347 Modified Files: Makefile Log Message: Bump up EXTRAVERSION Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 2001/02/21 00:36:14 1.6 +++ Makefile 2001/02/22 00:00:59 1.7 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -20010220 +EXTRAVERSION = -20010221 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) |
|
From: Kenn H. <ke...@us...> - 2001-02-21 23:59:36
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv14265
Modified Files:
vax-5380.c vax-5380.h
Log Message:
VS3100m76 SCSI sort of, kind of, seems to work...
Index: vax-5380.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/vax-5380.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vax-5380.c 2001/01/17 16:00:11 1.1
+++ vax-5380.c 2001/02/22 00:00:36 1.2
@@ -54,6 +54,9 @@
/*
* $Log$
+ * Revision 1.2 2001/02/22 00:00:36 kenn
+ * VS3100m76 SCSI sort of, kind of, seems to work...
+ *
* Revision 1.1 2001/01/17 16:00:11 atp
* First pass add in of vax files into 2.4 tree
*
@@ -109,19 +112,21 @@
*/
-__initfunc(int vax_5380_detect(Scsi_Host_Template * tpnt)) {
+int __init vax_5380_detect(Scsi_Host_Template * tpnt) {
struct Scsi_Host *instance;
- unsigned char *base;
+ unsigned long base;
+ tpnt->proc_name = "vax5380";
+ tpnt->proc_info = vax_5380_proc_info;
#if INTERNAL_SCSI
- base = (char *) 0x200c0080;
+ base = 0x200c0080;
#else
- base = (char *) 0x200c0180;
+ base = 0x200c0180;
#endif
instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
- instance->base = ioremap((unsigned int)base, 0x80);
+ instance->base = (unsigned long) ioremap(base, 0x80);
NCR5380_init(instance, 0);
@@ -151,8 +156,7 @@
}
#endif
- printk("scsi%d : at 0x%08x", instance->host_no, (int)
- instance->base);
+ printk("scsi%d : at 0x%08lx", instance->host_no, instance->base);
if (instance->irq == IRQ_NONE)
printk (" interrupts disabled");
else
@@ -194,6 +198,7 @@
return 0;
}
+#ifdef PSEUDO_DMA
/*
* Function : int NCR5380_pread (struct Scsi_Host *instance,
* unsigned char *dst, int len)
@@ -206,38 +211,35 @@
* Returns : 0 on success, non zero on a failure such as a watchdog
* timeout.
*/
-
static inline int NCR5380_pread (struct Scsi_Host *instance, unsigned char *dst,
int len) {
-#if 0
- register unsigned char *reg = (unsigned char *) (instance->base +
- T_DATA_REG_OFFSET), *d = dst;
+ unsigned long base = instance->base;
+ unsigned char *d = dst;
register int i = len;
#if 0
for (; i; --i) {
- while (!(instance->base[T_STATUS_REG_OFFSET]) & T_ST_RDY) barrier();
+ while (!(NCR5380_read(T_STATUS_REG_OFFSET) & T_ST_RDY) barrier();
#else
- while (!(instance->base[T_STATUS_REG_OFFSET]) & T_ST_RDY) barrier();
+ while (!(NCR5380_read(T_STATUS_REG_OFFSET) & T_ST_RDY) barrier();
for (; i; --i) {
#endif
- *d++ = *reg;
+ *d++ = NCR5380_read(T_DATA_REG_OFFSET);
}
- if (*(instance->base + T_STATUS_REG_OFFSET) & T_ST_TIM) {
+ if (NCR5380_read(T_STATUS_REG_OFFSET) & T_ST_TIM) {
unsigned char tmp;
- volatile unsigned char *foo;
- foo = instance->base + T_CONTROL_REG_OFFSET;
- tmp = *foo;
- *foo = tmp | T_CR_CT;
- *foo = tmp;
+
+ tmp = NCR5380_read(T_CONTROL_REG_OFFSET);
+ NCR5380_write(T_CONTROL_REG_OFFSET, tmp | T_CR_CT);
+ NCR5380_write(T_CONTROL_REG_OFFSET, tmp);
+
printk("scsi%d : watchdog timer fired in NCR5380_pread()\n",
instance->host_no);
return -1;
} else
-#endif
return 0;
}
@@ -257,41 +259,39 @@
static inline int NCR5380_pwrite (struct Scsi_Host *instance, unsigned char *src,
int len) {
-#if 0
- register unsigned char *reg = (unsigned char *) (instance->base +
- T_DATA_REG_OFFSET), *s = src;
+ unsigned long base = instance->base;
+ register unsigned char *s = src;
register int i = len;
#if 0
for (; i; --i) {
- while (!(instance->base[T_STATUS_REG_OFFSET]) & T_ST_RDY) barrier();
+ while (!(NCR5380_read(T_STATUS_REG_OFFSET) & T_ST_RDY) barrier();
#else
- while (!(instance->base[T_STATUS_REG_OFFSET]) & T_ST_RDY) barrier();
+ while (!(NCR5380_read(T_STATUS_REG_OFFSET) & T_ST_RDY) barrier();
for (; i; --i) {
#endif
- *reg = *s++;
+ NCR5380_write(T_DATA_REG_OFFSET, *s++);
}
- if (*(instance->base + T_STATUS_REG_OFFSET) & T_ST_TIM) {
+ if (NCF5380_read(T_STATUS_REG_OFFSET) & T_ST_TIM) {
unsigned char tmp;
- volatile unsigned char *foo;
- foo = instance->base + T_CONTROL_REG_OFFSET;
- tmp = *foo;
- *foo = tmp | T_CR_CT;
- *foo = tmp;
+
+ tmp = NCR5380_read(T_CONTROL_REG_OFFSET);
+ NCR5380_write(T_CONTROL_REG_OFFSET, tmp | T_CR_CT);
+ NCR5380_write(T_CONTROL_REG_OFFSET, tmp);
+
printk("scsi%d : watchdog timer fired in NCR5380_pwrite()\n",
instance->host_no);
return -1;
} else
-#endif
return 0;
}
+#endif /* PSEUDO_DMA */
+
#include "NCR5380.c"
-#ifdef MODULE
/* Eventually this will go into an include file, but this will be later */
-Scsi_Host_Template driver_template = VAX_5380_TEMPLATE;
+static Scsi_Host_Template driver_template = VAX_5380_TEMPLATE;
#include "scsi_module.c"
-#endif
Index: vax-5380.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/scsi/vax-5380.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vax-5380.h 2001/01/17 16:00:11 1.1
+++ vax-5380.h 2001/02/22 00:00:36 1.2
@@ -31,6 +31,9 @@
/*
* $Log$
+ * Revision 1.2 2001/02/22 00:00:36 kenn
+ * VS3100m76 SCSI sort of, kind of, seems to work...
+ *
* Revision 1.1 2001/01/17 16:00:11 atp
* First pass add in of vax files into 2.4 tree
*
@@ -59,6 +62,9 @@
int vax_5380_detect(Scsi_Host_Template *);
int vax_5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int vax_5380_reset(Scsi_Cmnd *, unsigned int reset_flags);
+int vax_5380_proc_info (char *buffer, char **start, off_t offset,
+ int length, int hostno, int inout);
+
#ifndef NULL
#define NULL 0
@@ -78,8 +84,6 @@
* macros when this is being used solely for the host stub.
*/
-#if defined(HOSTS_C) || defined(MODULE)
-
#define VAX_5380_TEMPLATE { \
name: "VAXstation 3100/MicroVAX 3100 NCR5380 SCSI", \
detect: vax_5380_detect, \
@@ -93,18 +97,16 @@
cmd_per_lun: CMD_PER_LUN, \
use_clustering: DISABLE_CLUSTERING}
-#endif
-
#ifndef HOSTS_C
#define NCR5380_implementation_fields \
- volatile unsigned char *base
+ unsigned volatile char *base
#define NCR5380_local_declare() \
- volatile unsigned char *base
+ unsigned volatile char *base
#define NCR5380_setup(instance) \
- base = (volatile unsigned char *) (instance)->base
+ base = (unsigned volatile char *)((instance)->base)
#define VAX_5380_address(reg) (base + ((reg) * 0x04))
@@ -128,6 +130,7 @@
#define NCR5380_queue_command vax_5380_queue_command
#define NCR5380_abort vax_5380_abort
#define NCR5380_reset vax_5380_reset
+#define NCR5380_proc_info vax_5380_proc_info
#endif /* else def HOSTS_C */
#endif /* ndef ASM */
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 01:20:53
|
Update of /cvsroot/linux-vax/kernel-2.4/scripts/lxdialog In directory usw-pr-cvs1:/tmp/cvs-serv26887 Modified Files: .cvsignore Log Message: Ignore lxdialog as well Index: .cvsignore =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/lxdialog/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2001/01/15 22:21:53 1.1 +++ .cvsignore 2001/02/21 01:21:50 1.2 @@ -2,3 +2,4 @@ *.o.flags .depend *.lst +lxdialog |
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:35:17
|
Update of /cvsroot/linux-vax/kernel-2.4 In directory usw-pr-cvs1:/tmp/cvs-serv23615 Modified Files: Makefile Log Message: Generate assembly listing for init/main.c. Bump EXTRAVERSION up to -kh20010220. Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 2001/01/29 01:09:18 1.5 +++ Makefile 2001/02/21 00:36:14 1.6 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -20010129 +EXTRAVERSION = -20010220 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -323,8 +323,12 @@ init/version.o: init/version.c include/linux/compile.h include/config/MARKER $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -c -o init/version.o init/version.c +# FIXME: GCC bug? using -g here (in order to get source in the assembly listing) +# reduces the BogoMIPS rating. Examination of listing file shows that the compiler +# optimizes less when we use -g (even though -O1 is in CFLAGS). This isn't supposed +# to happen... init/main.o: init/main.c include/config/MARKER - $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< + $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -c -o $*.o $< -Wa,-adnhls=$*.lst # -g fs lib mm ipc kernel drivers net: dummy $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@) |
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:34:27
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/boot
In directory usw-pr-cvs1:/tmp/cvs-serv23478
Modified Files:
head.S
Log Message:
Remove some variables that are no longer needed. Also keep phys_kern_end
in a register, rather than in RAM since it may not survive the kernel
relocation. And replace phys_start location with KERNEL_START_PHYS
constant.
Index: head.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/boot/head.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- head.S 2001/02/18 16:42:45 1.4
+++ head.S 2001/02/21 00:35:24 1.5
@@ -29,10 +29,10 @@
jsb identify_cpu
-# now fix up the machine vector entries (They currently contain
+# now fix up the machine vector entries. (They currently contain
# pointers to virtual addresses in S0 space. We need to change
# the pointers to the functions we use before VM init to point
-# into the newly-loaded kernel image
+# into the newly-loaded kernel image.)
movl mv, r2
moval start, r3
@@ -88,7 +88,7 @@
subl2 $start,r6 # byte count to r6
movab __bss_start,r1
subl2 $0xffff, r1 # r1 points to top chunk of source
- movl phys_start, r3 # dest address to r3
+ movl $KERNEL_START_PHYS, r3 # dest address to r3
addl2 r6,r3
subl2 $0xffff,r3 #r3 points to top chunk of dest
#
@@ -103,7 +103,7 @@
brb copy_chunk
last_chunk:
movab start,r1
- movl phys_start,r3
+ movl $KERNEL_START_PHYS,r3
movc3 r6,(r1),(r3)
copy_done:
@@ -119,8 +119,7 @@
subl3 $__bss_start, $_end, r6 # length of .bss to r6
subl3 $start, $__bss_start, r3 # offset of .bss to r3
- addl2 phys_start, r3 # phys address of .bss start now in r3
-
+ addl2 $KERNEL_START_PHYS, r3 # phys address of .bss start now in r3
fill_chunk:
cmpl $0xffff, r6
bgeq last_fill
@@ -135,7 +134,8 @@
# end of kernel
fill_done:
decl r3 #
- movl r3, r6 # save phys addr of last byte of kernel
+ movl r3, r9 # save phys addr of last byte of kernel
+ # in R9. We'll need this later
# Need to know the distance we have moved the kernel, so that we can
# fix up the machine vector pointer after we jump
@@ -143,7 +143,7 @@
subl3 r2, $KERNEL_START_PHYS, r2 # r2 = START_PHYS - load_address
# calculate the position after jump to reloc
- movl phys_start, r3
+ movl $KERNEL_START_PHYS, r3
addl2 $reloc, r3
subl2 $start,r3
jmp (r3)
@@ -153,9 +153,6 @@
# made it, note that sp is still down there
# halt
-# Save physical address of end of kernel
- movl r6, phys_kern_end
-
# fix up the machine vector pointer (by restoring it from R11 and
# adding in the distance that the kernel was re-located)
addl3 r2, r11, mv
@@ -197,8 +194,8 @@
# p0br/p0lr, p1br/p1lr, sbr/slr
# First find a suitable start position for the SPT. This must be
# longword aligned
- addl3 $4, phys_kern_end, r5
- bicl2 $3, r5
+ addl3 $4, r9, r5 # R9 holds kernel end
+ bicl2 $3, r5 # R5 is R9 rounded up to longword aligned
moval swapper_pg_dir, r0
movl r5, 16(r0) # save address of base of system page table
@@ -319,27 +316,6 @@
#
# memory locations.
#
-
-# This is the place we want to relocate to (physical address)
-.globl phys_start
-phys_start: .int KERNEL_START_PHYS
-
-# This is the virtual offset we start at (== PAGE_OFFSET + phys_start)
-.globl virt_start
-virt_start: .int KERNEL_START_VIRT
-
-# pg0 is the PHYSICAL ADDRESS of the system page table directory.
-# This is immediately after the end of the bss section
-# Once VM is enabled, this is replaced with the VIRTUAL address
-#.globl pg0
-#pg0: .int 0x00000000
-
-# spt_size holds the length of the SPT (in entries, not bytes)
-#.globl spt_size
-#spt_size: .int 0x00000000
-
-.globl phys_kern_end
-phys_kern_end: .int 0x00000000
# iomap_base holds the physical address of the first PTE in the
# IOMAP portion of the system page table.
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:30:25
|
Update of /cvsroot/linux-vax/kernel-2.4/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv23347
Modified Files:
context.c
Log Message:
Wait for keventd thread to start before exiting start_context_thread().
Index: context.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/kernel/context.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- context.c 2001/01/14 16:41:41 1.1.1.1
+++ context.c 2001/02/21 00:31:23 1.2
@@ -28,8 +28,9 @@
static int need_keventd(const char *who)
{
- if (keventd_running == 0)
+ if (keventd_running == 0) {
printk(KERN_ERR "%s(): keventd has not started\n", who);
+ }
return keventd_running;
}
@@ -63,7 +64,7 @@
return ret;
}
-static int context_thread(void *dummy)
+static int context_thread(void *sem)
{
struct task_struct *curtask = current;
DECLARE_WAITQUEUE(wait, curtask);
@@ -79,6 +80,8 @@
recalc_sigpending(curtask);
spin_unlock_irq(&curtask->sigmask_lock);
+ up((struct semaphore *)sem);
+
/* Install a handler so SIGCLD is delivered */
sa.sa.sa_handler = SIG_IGN;
sa.sa.sa_flags = 0;
@@ -148,7 +151,9 @@
int start_context_thread(void)
{
- kernel_thread(context_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+ DECLARE_MUTEX_LOCKED(sem);
+ kernel_thread(context_thread, &sem, CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
+ down(&sem);
return 0;
}
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:28:08
|
Update of /cvsroot/linux-vax/kernel-2.4/mm
In directory usw-pr-cvs1:/tmp/cvs-serv23226
Modified Files:
slab.c
Log Message:
Remove stuff for 512-byte page support
Index: slab.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/mm/slab.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slab.c 2001/01/29 01:02:30 1.2
+++ slab.c 2001/02/21 00:29:05 1.3
@@ -293,11 +293,7 @@
#endif
/* maximum size of an obj (in 2^order pages) */
-#if PAGE_SIZE == 512 /* temporary for VAX */
-#define MAX_OBJ_ORDER 8 /* 256 pages */
-#else
#define MAX_OBJ_ORDER 5 /* 32 pages */
-#endif
/*
* Do not go above this order unless 0 objects fit into the slab.
@@ -309,12 +305,9 @@
/*
* Absolute limit for the gfp order
*/
-#if PAGE_SIZE == 512 /* temporary for VAX */
-#define MAX_GFP_ORDER 8 /* 256 pages */
-#else
#define MAX_GFP_ORDER 5 /* 32 pages */
-#endif
+
/* Macros for storing/retrieving the cachep and or slab from the
* global 'mem_map'. These are used to find the slab an obj belongs to.
* With kfree(), these are used to find the cache which an obj belongs to.
@@ -332,9 +325,6 @@
} cache_sizes_t;
static cache_sizes_t cache_sizes[] = {
-#if PAGE_SIZE == 4096 || PAGE_SIZE == 512 /* temporarly for VAX */
- { 32, NULL, NULL},
-#endif
{ 64, NULL, NULL},
{ 128, NULL, NULL},
{ 256, NULL, NULL},
@@ -1539,15 +1529,6 @@
void * kmalloc (size_t size, int flags)
{
cache_sizes_t *csizep = cache_sizes;
-
- /* With the VAX's 512-byte pages, kmalloc doesn't work for
- sizes between 33 and 128 bytes (inclusive). I don't know
- why, ( and I'm not really interested in fixing it, since
- we'll be moving to a 4K page soon), so this just fudges
- around the issue */
- if ((size >= 33) && (size <= 128)) {
- size = 129;
- }
for (; csizep->cs_size; csizep++) {
if (size > csizep->cs_size)
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:27:03
|
Update of /cvsroot/linux-vax/kernel-2.4/include/linux In directory usw-pr-cvs1:/tmp/cvs-serv23142 Modified Files: iobuf.h Log Message: Revert KIO_STATIC_PAGES back to original definition which works now that we have 4K pages Index: iobuf.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/linux/iobuf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iobuf.h 2001/01/18 15:52:28 1.2 +++ iobuf.h 2001/02/21 00:28:01 1.3 @@ -26,7 +26,7 @@ #define KIO_MAX_ATOMIC_IO 64 /* in kb */ #define KIO_MAX_ATOMIC_BYTES (64 * 1024) -#define KIO_STATIC_PAGES ( (KIO_MAX_ATOMIC_IO << 10) / (PAGE_SIZE) + 1) +#define KIO_STATIC_PAGES (KIO_MAX_ATOMIC_IO / (PAGE_SIZE >> 10) + 1) #define KIO_MAX_SECTORS (KIO_MAX_ATOMIC_IO * 2) /* The main kiobuf struct used for all our IO! */ |
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:26:01
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm In directory usw-pr-cvs1:/tmp/cvs-serv23001 Modified Files: pgtable.h Log Message: SPT_MAX_IOMAP is specified in KB, not in pages. Revert to previous value so that KA43 has enough IOMAP space to map and initialize its cache Index: pgtable.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/mm/pgtable.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pgtable.h 2001/02/18 16:42:46 1.8 +++ pgtable.h 2001/02/21 00:26:58 1.9 @@ -36,7 +36,7 @@ * of IOMAP entries in the SPT, we could use get_free_page() to * alloc a real page of RAM and hijack its SPTE. */ -#define SPT_MAX_IOMAP 128 +#define SPT_MAX_IOMAP 1024 #define SPT_MAX_VMALLOC 4096 #define SPT_ENTRIES_IOMAP (SPT_MAX_IOMAP >> (PAGE_SHIFT-10)) /* FIXME: (PAGE_SHIFT-10) is hardwired here to 2. asm bug in head.S */ |
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:23:49
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax
In directory usw-pr-cvs1:/tmp/cvs-serv22768
Modified Files:
serial.h
Log Message:
Not surprisingly, we don't have any PC-style UARTS. So remove all the
PC-related stuff to suppress the silly boot messages about 16450s
Index: serial.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/serial.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- serial.h 2001/01/18 15:52:28 1.2
+++ serial.h 2001/02/21 00:24:47 1.3
@@ -4,81 +4,15 @@
/* serial.h */
/* Jan 2001 atp. Added. Not sure what the base clock for VAX
* serial boards is - so go with 1.8Mhz at present
- */
-
-#include <linux/config.h>
-
-/*
- * This assumes you have a 1.8432 MHz clock for your UART.
*
- * It'd be nice if someone built a serial card with a 24.576 MHz
- * clock, since the 16550A is capable of handling a top speed of 1.5
- * megabits/second; but this requires the faster clock.
+ * 2000-02-18 KPH
+ * Removed all the PC-related stuff
*/
-#define BASE_BAUD ( 1843200 / 16 )
-
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
-#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
-#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
-#endif
-
-#ifdef CONFIG_SERIAL_MANY_PORTS
-#define FOURPORT_FLAGS ASYNC_FOURPORT
-#define ACCENT_FLAGS 0
-#define BOCA_FLAGS 0
-#define RS_TABLE_SIZE 64
-#else
-#define RS_TABLE_SIZE 4
-#endif
-
-#define STD_SERIAL_PORT_DEFNS \
- /* UART CLK PORT IRQ FLAGS */ \
- { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
- { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
- { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
- { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
-
-#ifdef CONFIG_SERIAL_MANY_PORTS
-#define EXTRA_SERIAL_PORT_DEFNS \
- { 0, BASE_BAUD, 0x1A0, 9, FOURPORT_FLAGS }, /* ttyS4 */ \
- { 0, BASE_BAUD, 0x1A8, 9, FOURPORT_FLAGS }, /* ttyS5 */ \
- { 0, BASE_BAUD, 0x1B0, 9, FOURPORT_FLAGS }, /* ttyS6 */ \
- { 0, BASE_BAUD, 0x1B8, 9, FOURPORT_FLAGS }, /* ttyS7 */ \
- { 0, BASE_BAUD, 0x2A0, 5, FOURPORT_FLAGS }, /* ttyS8 */ \
- { 0, BASE_BAUD, 0x2A8, 5, FOURPORT_FLAGS }, /* ttyS9 */ \
- { 0, BASE_BAUD, 0x2B0, 5, FOURPORT_FLAGS }, /* ttyS10 */ \
- { 0, BASE_BAUD, 0x2B8, 5, FOURPORT_FLAGS }, /* ttyS11 */ \
- { 0, BASE_BAUD, 0x330, 4, ACCENT_FLAGS }, /* ttyS12 */ \
- { 0, BASE_BAUD, 0x338, 4, ACCENT_FLAGS }, /* ttyS13 */ \
- { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS14 (spare) */ \
- { 0, BASE_BAUD, 0x000, 0, 0 }, /* ttyS15 (spare) */ \
- { 0, BASE_BAUD, 0x100, 12, BOCA_FLAGS }, /* ttyS16 */ \
- { 0, BASE_BAUD, 0x108, 12, BOCA_FLAGS }, /* ttyS17 */ \
- { 0, BASE_BAUD, 0x110, 12, BOCA_FLAGS }, /* ttyS18 */ \
- { 0, BASE_BAUD, 0x118, 12, BOCA_FLAGS }, /* ttyS19 */ \
- { 0, BASE_BAUD, 0x120, 12, BOCA_FLAGS }, /* ttyS20 */ \
- { 0, BASE_BAUD, 0x128, 12, BOCA_FLAGS }, /* ttyS21 */ \
- { 0, BASE_BAUD, 0x130, 12, BOCA_FLAGS }, /* ttyS22 */ \
- { 0, BASE_BAUD, 0x138, 12, BOCA_FLAGS }, /* ttyS23 */ \
- { 0, BASE_BAUD, 0x140, 12, BOCA_FLAGS }, /* ttyS24 */ \
- { 0, BASE_BAUD, 0x148, 12, BOCA_FLAGS }, /* ttyS25 */ \
- { 0, BASE_BAUD, 0x150, 12, BOCA_FLAGS }, /* ttyS26 */ \
- { 0, BASE_BAUD, 0x158, 12, BOCA_FLAGS }, /* ttyS27 */ \
- { 0, BASE_BAUD, 0x160, 12, BOCA_FLAGS }, /* ttyS28 */ \
- { 0, BASE_BAUD, 0x168, 12, BOCA_FLAGS }, /* ttyS29 */ \
- { 0, BASE_BAUD, 0x170, 12, BOCA_FLAGS }, /* ttyS30 */ \
- { 0, BASE_BAUD, 0x178, 12, BOCA_FLAGS }, /* ttyS31 */
-#else
-#define EXTRA_SERIAL_PORT_DEFNS
-#endif
+/* We don't have any PC-style UARTs, so we don't want drivers/char/serial.c
+ do do anything. So, we leave SERIAL_PORT_DFNS empty */
+#define SERIAL_PORT_DFNS
-#define SERIAL_PORT_DFNS \
- STD_SERIAL_PORT_DEFNS \
- EXTRA_SERIAL_PORT_DEFNS
+#define RS_TABLE_SIZE 0
#endif /* __VAX_SERIAL_H */
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:22:08
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-vax In directory usw-pr-cvs1:/tmp/cvs-serv22639 Modified Files: atomic.h Log Message: atomic_add_negative() was so broken that semaphores didn't have a chance of working. Fixed now... Index: atomic.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-vax/atomic.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- atomic.h 2001/01/29 00:44:21 1.2 +++ atomic.h 2001/02/21 00:23:06 1.3 @@ -100,11 +100,11 @@ int retval = 0; __asm__ __volatile__( " addl2 %2,%1 \n" - " blss 1f \n" - " incl %0 \n" + " bgeq 1f \n" /* >= 0, return FALSE */ + " incl %0 \n" /* < 0, return TRUE */ "1: \n" - : "=g" (retval) - : "m" (*v), "g" (i)); + : "+g" (retval), "+m" (*v) + : "g" (i) ); return retval; } |
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:20:43
|
Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv22508
Modified Files:
tty_io.c
Log Message:
Re-enable tty_struct size paranoia check now that we've got a 4K PAGE_SIZE
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tty_io.c 2001/02/11 23:56:25 1.2
+++ tty_io.c 2001/02/21 00:21:40 1.3
@@ -2219,10 +2219,8 @@
*/
void __init tty_init(void)
{
-#if 0 /* temporary for VAX */
if (sizeof(struct tty_struct) > PAGE_SIZE)
panic("size of tty structure > PAGE_SIZE!");
-#endif
/*
* dev_tty_driver and dev_console_driver are actually magic
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:19:33
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv22449
Modified Files:
setup.c
Log Message:
Clarify memory init a bit and remove duplicate code from calls to printk()
and free_bootmem()
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- setup.c 2001/02/18 16:42:45 1.6
+++ setup.c 2001/02/21 00:20:30 1.7
@@ -56,10 +56,13 @@
void __init setup_arch(char **cmdline_p)
{
unsigned long bootmap_size;
+ unsigned long region_start;
+ unsigned long region_len;
/*
* Locate the command line. - Don't have one yet...
* atp -- have a temporary one.
+ * Shouldn't we use strcpy here?
*/
memcpy(command_line, "root=/dev/nfs nfsroot=/tftpboot/vaxroot\0",54);
*cmdline_p = command_line;
@@ -80,17 +83,26 @@
at the start of physical memory. init_bootmem() also
marks every page as reserved. We have to explicitly free
available memory ourselves. (max_pfn comes from RPB.) */
- bootmap_size = init_bootmem(0, (max_pfn));
+ bootmap_size = init_bootmem(0, max_pfn);
printk("bootmap size = %8.8x\n", bootmap_size);
/* Available memory is now the region from the end of the
bootmem bitmap to the start of the kernel and from the
end of the SPT to the end of memory */
-printk("calling free_bootmem(%08lx, %08lx)\n", bootmap_size, KERNEL_START_PHYS - bootmap_size);
- free_bootmem(bootmap_size, KERNEL_START_PHYS - bootmap_size);
-printk("calling free_bootmem(%08lx, %08lx)\n", __pa(SPT_BASE + SPT_SIZE), (max_pfn << PAGE_SHIFT) - __pa(SPT_BASE + SPT_SIZE));
- free_bootmem(__pa(SPT_BASE + SPT_SIZE), (max_pfn << PAGE_SHIFT) - __pa(SPT_BASE + SPT_SIZE));
-
+ region_start = bootmap_size;
+ region_len = KERNEL_START_PHYS - bootmap_size;
+
+ printk("calling free_bootmem(start=%08lx, len=%08lx)\n",
+ region_start, region_len);
+ free_bootmem(region_start, region_len);
+
+ region_start = __pa(SPT_BASE + SPT_SIZE);
+ region_len = (max_pfn << PAGE_SHIFT) - __pa(SPT_BASE + SPT_SIZE);
+
+ printk("calling free_bootmem(start=%08lx, len=%08lx)\n",
+ region_start, region_len);
+ free_bootmem(region_start, region_len);
+
paging_init();
/* Set up the initial PCB. We can refer to current because head.S
|
|
From: Kenn H. <ke...@us...> - 2001-02-21 00:18:07
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv22252
Modified Files:
process.c
Log Message:
Changes to copy_thread:
o display correct PID (not passed in argument list anymore in 2.4)
o debugging message to allow me to track when threads actually start
executing
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/vax/kernel/process.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- process.c 2001/02/05 00:05:08 1.4
+++ process.c 2001/02/21 00:19:05 1.5
@@ -97,8 +97,8 @@
/* Defined in entry.S */
extern void ret_from_syscall(void);
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
- unsigned long unused,
+int copy_thread(int unused1, unsigned long clone_flags, unsigned long usp,
+ unsigned long unused2,
struct task_struct *p, struct pt_regs *regs)
{
struct new_thread_stack *child_stack;
@@ -106,7 +106,7 @@
void *stack_top;
printk("copy_thread: creating new thread: pid %d, task 0x%08lx, usp 0x%08lx\n",
- nr, (unsigned long)p, usp);
+ p->pid, (unsigned long)p, usp);
stack_top = ((union task_union *)p) + 1;
@@ -174,7 +174,8 @@
/* In child. At this point SP points to the very top of
our kernel stack, so we cannot pop anything off. That
means that we can never return from here. */
-/* printk("kernel_thread: child\n"); */
+ printk("kernel_thread: calling thread function at %08lx\n",
+ (unsigned long)fn);
kernel_thread_exit(fn(arg));
}
|
