Menu
▾
▴
linux-mips-commits — CVS Commit Patches
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(165) |
Sep
(240) |
Oct
(424) |
Nov
(526) |
Dec
(293) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(242) |
Feb
(149) |
Mar
(143) |
Apr
(143) |
May
(76) |
Jun
(59) |
Jul
(20) |
Aug
(2) |
Sep
(49) |
Oct
(1) |
Nov
(4) |
Dec
|
| 2003 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(72) |
Jul
(36) |
Aug
(9) |
Sep
(16) |
Oct
(23) |
Nov
(9) |
Dec
(3) |
| 2010 |
Jan
|
Feb
(1) |
Mar
(35) |
Apr
(44) |
May
(56) |
Jun
(71) |
Jul
(41) |
Aug
(41) |
Sep
(22) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(25) |
Oct
(105) |
Nov
(15) |
Dec
|
| 2025 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul M. <le...@us...> - 2001-08-25 06:24:49
|
Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv25707/drivers/char
Modified Files:
mem.c serial.c
Log Message:
Synced with Ralf's 2.4.8 code.
Index: mem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/mem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mem.c 2001/08/25 02:19:27 1.2
--- mem.c 2001/08/25 06:24:45 1.3
***************
*** 261,265 ****
len = PAGE_SIZE;
len = vread(kbuf, (char *)p, len);
! if (len && copy_to_user(buf, kbuf, len)) {
free_page((unsigned long)kbuf);
return -EFAULT;
--- 261,267 ----
len = PAGE_SIZE;
len = vread(kbuf, (char *)p, len);
! if (!len)
! break;
! if (copy_to_user(buf, kbuf, len)) {
free_page((unsigned long)kbuf);
return -EFAULT;
Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** serial.c 2001/08/25 02:19:27 1.3
--- serial.c 2001/08/25 06:24:45 1.4
***************
*** 3181,3184 ****
--- 3181,3187 ----
#endif
+ /*
+ * This relies on lock_kernel() stuff so wants tidying for 2.5
+ */
if (!tmp_buf) {
page = get_zeroed_page(GFP_KERNEL);
***************
*** 5455,5458 ****
--- 5458,5465 ----
if (state->port && check_region(state->port,8))
continue;
+ #ifdef CONFIG_MCA
+ if ((state->flags & ASYNC_BOOT_ONLYMCA) && !MCA_bus)
+ continue;
+ #endif
if (state->flags & ASYNC_BOOT_AUTOCONF)
autoconfig(state);
|
|
From: Paul M. <le...@us...> - 2001-08-25 06:24:49
|
Update of /cvsroot/linux-mips/linux/arch/mips In directory usw-pr-cvs1:/tmp/cvs-serv25707/arch/mips Modified Files: defconfig Log Message: Synced with Ralf's 2.4.8 code. Index: defconfig =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** defconfig 2001/08/25 02:19:27 1.6 --- defconfig 2001/08/25 06:24:45 1.7 *************** *** 484,487 **** --- 484,488 ---- # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set + # CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set |
|
From: Paul M. <le...@us...> - 2001-08-25 06:24:49
|
Update of /cvsroot/linux-mips/linux In directory usw-pr-cvs1:/tmp/cvs-serv25707 Modified Files: Makefile Log Message: Synced with Ralf's 2.4.8 code. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 2001/08/25 02:19:27 1.3 --- Makefile 2001/08/25 06:24:45 1.4 *************** *** 1,5 **** VERSION = 2 PATCHLEVEL = 4 ! SUBLEVEL = 7 EXTRAVERSION = -mips --- 1,5 ---- VERSION = 2 PATCHLEVEL = 4 ! SUBLEVEL = 8 EXTRAVERSION = -mips |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/fs/proc In directory usw-pr-cvs1:/tmp/cvs-serv13548/fs/proc Modified Files: proc_misc.c Log Message: Sync to 2.4.7 Index: proc_misc.c =================================================================== RCS file: /cvsroot/linux-mips/linux/fs/proc/proc_misc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** proc_misc.c 2001/06/22 02:29:31 1.1.1.1 --- proc_misc.c 2001/08/25 02:19:28 1.2 *************** *** 147,195 **** #define K(x) ((x) << (PAGE_SHIFT - 10)) #define B(x) ((x) << PAGE_SHIFT) ! si_meminfo(&i); ! si_swapinfo(&i); ! len = sprintf(page, " total: used: free: shared: buffers: cached:\n" ! "Mem: %8lu %8lu %8lu %8lu %8lu %8u\n" ! "Swap: %8lu %8lu %8lu\n", ! B(i.totalram), B(i.totalram-i.freeram), B(i.freeram), ! B(i.sharedram), B(i.bufferram), ! B(atomic_read(&page_cache_size)), B(i.totalswap), ! B(i.totalswap-i.freeswap), B(i.freeswap)); ! /* ! * Tagged format, for easy grepping and expansion. ! * The above will go away eventually, once the tools ! * have been updated. ! */ ! len += sprintf(page+len, ! "MemTotal: %8lu kB\n" ! "MemFree: %8lu kB\n" ! "MemShared: %8lu kB\n" ! "Buffers: %8lu kB\n" ! "Cached: %8u kB\n" "Active: %8u kB\n" "Inact_dirty: %8u kB\n" "Inact_clean: %8u kB\n" "Inact_target: %8lu kB\n" ! "HighTotal: %8lu kB\n" ! "HighFree: %8lu kB\n" ! "LowTotal: %8lu kB\n" ! "LowFree: %8lu kB\n" ! "SwapTotal: %8lu kB\n" ! "SwapFree: %8lu kB\n", ! K(i.totalram), ! K(i.freeram), ! K(i.sharedram), ! K(i.bufferram), ! K(atomic_read(&page_cache_size)), K(nr_active_pages), K(nr_inactive_dirty_pages), K(nr_inactive_clean_pages()), K(inactive_target), ! K(i.totalhigh), ! K(i.freehigh), ! K(i.totalram-i.totalhigh), ! K(i.freeram-i.freehigh), ! K(i.totalswap), ! K(i.freeswap)); return proc_calc_metrics(page, start, off, count, eof, len); --- 147,197 ---- #define K(x) ((x) << (PAGE_SHIFT - 10)) #define B(x) ((x) << PAGE_SHIFT) ! si_meminfo(&i); ! si_swapinfo(&i); ! len = sprintf(page, " total: used: free: shared: buffers: cached:\n" ! "Mem: %8lu %8lu %8lu %8lu %8lu %8u\n" ! "Swap: %8lu %8lu %8lu\n", ! B(i.totalram), B(i.totalram-i.freeram), B(i.freeram), ! B(i.sharedram), B(i.bufferram), ! B(atomic_read(&page_cache_size)), B(i.totalswap), ! B(i.totalswap-i.freeswap), B(i.freeswap)); ! /* ! * Tagged format, for easy grepping and expansion. ! * The above will go away eventually, once the tools ! * have been updated. ! */ ! len += sprintf(page+len, ! "MemTotal: %8lu kB\n" ! "MemFree: %8lu kB\n" ! "MemShared: %8lu kB\n" ! "Buffers: %8lu kB\n" ! "Cached: %8lu kB\n" ! "SwapCached: %8lu kB\n" "Active: %8u kB\n" "Inact_dirty: %8u kB\n" "Inact_clean: %8u kB\n" "Inact_target: %8lu kB\n" ! "HighTotal: %8lu kB\n" ! "HighFree: %8lu kB\n" ! "LowTotal: %8lu kB\n" ! "LowFree: %8lu kB\n" ! "SwapTotal: %8lu kB\n" ! "SwapFree: %8lu kB\n", ! K(i.totalram), ! K(i.freeram), ! K(i.sharedram), ! K(i.bufferram), ! K(atomic_read(&page_cache_size) - swapper_space.nrpages), ! K(swapper_space.nrpages), K(nr_active_pages), K(nr_inactive_dirty_pages), K(nr_inactive_clean_pages()), K(inactive_target), ! K(i.totalhigh), ! K(i.freehigh), ! K(i.totalram-i.totalhigh), ! K(i.freeram-i.freehigh), ! K(i.totalswap), ! K(i.freeswap)); return proc_calc_metrics(page, start, off, count, eof, len); *************** *** 290,298 **** hz_to_std(kstat.per_cpu_system[cpu_logical_map(i)]), jif - hz_to_std( kstat.per_cpu_user[cpu_logical_map(i)] \ ! + kstat.per_cpu_nice[cpu_logical_map(i)] \ ! + kstat.per_cpu_system[cpu_logical_map(i)])); len += sprintf(page + len, "page %u %u\n" ! "swap %u %u\n" "intr %u", kstat.pgpgin >> 1, --- 292,300 ---- hz_to_std(kstat.per_cpu_system[cpu_logical_map(i)]), jif - hz_to_std( kstat.per_cpu_user[cpu_logical_map(i)] \ ! + kstat.per_cpu_nice[cpu_logical_map(i)] \ ! + kstat.per_cpu_system[cpu_logical_map(i)])); len += sprintf(page + len, "page %u %u\n" ! "swap %u %u\n" "intr %u", kstat.pgpgin >> 1, |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/video
Modified Files:
Config.in Makefile fbmem.c
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Config.in 2001/07/23 23:43:11 1.4
--- Config.in 2001/08/25 02:19:28 1.5
***************
*** 104,110 ****
hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
fi
! if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
! tristate ' Dreamcast Frame Buffer support' CONFIG_FB_DC
! fi
bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
--- 104,109 ----
hex ' Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
fi
! tristate ' NEC PowerVR 2 display support' CONFIG_FB_PVR2
! dep_bool ' Debug pvr2fb' CONFIG_FB_PVR2_DEBUG $CONFIG_FB_PVR2
bool ' MediaQ Framebuffer support' CONFIG_FB_MQ200
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
***************
*** 289,293 ****
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
! "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
--- 288,293 ----
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \
! "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \
! "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 y
else
***************
*** 303,307 ****
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
--- 303,308 ----
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_PVR2" = "m" -o \
! "$CONFIG_FB_MQ200" = "y" ]; then
define_tristate CONFIG_FBCON_CFB16 m
fi
***************
*** 311,315 ****
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_ATY128" = "y" -o \
! "$CONFIG_FB_CYBER2000" = "y" ]; then
define_tristate CONFIG_FBCON_CFB24 y
else
--- 312,316 ----
"$CONFIG_FB_MATROX" = "y" -o "$CONFIG_FB_PM2" = "y" -o \
"$CONFIG_FB_ATY128" = "y" -o \
! "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB24 y
else
***************
*** 318,322 ****
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
"$CONFIG_FB_ATY128" = "m" -o \
! "$CONFIG_FB_CYBER2000" = "m" ]; then
define_tristate CONFIG_FBCON_CFB24 m
fi
--- 319,323 ----
"$CONFIG_FB_MATROX" = "m" -o "$CONFIG_FB_PM2" = "m" -o \
"$CONFIG_FB_ATY128" = "m" -o \
! "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_PVR2" = "m" ]; then
define_tristate CONFIG_FBCON_CFB24 m
fi
***************
*** 329,333 ****
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
! "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
--- 330,335 ----
"$CONFIG_FB_RIVA" = "y" -o "$CONFIG_FB_ATY128" = "y" -o \
"$CONFIG_FB_FM2" = "y" -o "$CONFIG_FB_SGIVW" = "y" -o \
! "$CONFIG_FB_3DFX" = "y" -o "$CONFIG_FB_SIS" = "y" -o \
! "$CONFIG_FB_PVR2" = "y" ]; then
define_tristate CONFIG_FBCON_CFB32 y
else
***************
*** 339,343 ****
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_3DFX" = "m" -o \
! "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
--- 341,346 ----
"$CONFIG_FB_RIVA" = "m" -o "$CONFIG_FB_ATY128" = "m" -o \
"$CONFIG_FB_3DFX" = "m" -o \
! "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
! "$CONFIG_FB_PVR2" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 2001/07/23 21:05:24 1.3
--- Makefile 2001/08/25 02:19:28 1.4
***************
*** 108,112 ****
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
! obj-$(CONFIG_FB_DC) += dcfb.o fbgen.o
# Generic Low Level Drivers
--- 108,112 ----
obj-$(CONFIG_FB_E1355) += epson1355fb.o fbgen.o
obj-$(CONFIG_FB_E1356) += epson1356fb.o
! obj-$(CONFIG_FB_PVR2) += pvr2fb.o
# Generic Low Level Drivers
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fbmem.c 2001/07/23 21:09:43 1.2
--- fbmem.c 2001/08/25 02:19:28 1.3
***************
*** 130,134 ****
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
! extern int dcfb_init(void);
extern int mq200fb_init(void);
extern int mq200fb_setup(char*);
--- 130,135 ----
extern int e1355fb_init(void);
extern int e1355fb_setup(char*);
! extern int pvr2fb_init(void);
! extern int pvr2fb_setup(char*);
extern int mq200fb_init(void);
extern int mq200fb_setup(char*);
***************
*** 283,288 ****
{ "e1355fb", e1355fb_init, e1355fb_setup },
#endif
! #ifdef CONFIG_FB_DC
! { "dcfb", dcfb_init, NULL },
#endif
#ifdef CONFIG_FB_MQ200
--- 284,289 ----
{ "e1355fb", e1355fb_init, e1355fb_setup },
#endif
! #ifdef CONFIG_FB_PVR2
! { "pvr2", pvr2fb_init, pvr2fb_setup },
#endif
#ifdef CONFIG_FB_MQ200
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13548/kernel
Modified Files:
sys.c
Log Message:
Sync to 2.4.7
Index: sys.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/kernel/sys.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sys.c 2001/06/22 02:29:32 1.1.1.1
--- sys.c 2001/08/25 02:19:28 1.2
***************
*** 400,404 ****
if (new_egid != old_egid)
{
! current->dumpable = 0;
wmb();
}
--- 400,404 ----
if (new_egid != old_egid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 425,429 ****
if(old_egid != gid)
{
! current->dumpable=0;
wmb();
}
--- 425,429 ----
if(old_egid != gid)
{
! current->mm->dumpable=0;
wmb();
}
***************
*** 434,438 ****
if(old_egid != gid)
{
! current->dumpable=0;
wmb();
}
--- 434,438 ----
if(old_egid != gid)
{
! current->mm->dumpable=0;
wmb();
}
***************
*** 508,512 ****
if(dumpclear)
{
! current->dumpable = 0;
wmb();
}
--- 508,512 ----
if(dumpclear)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 562,566 ****
if (new_euid != old_euid)
{
! current->dumpable=0;
wmb();
}
--- 562,566 ----
if (new_euid != old_euid)
{
! current->mm->dumpable=0;
wmb();
}
***************
*** 609,613 ****
if (old_euid != uid)
{
! current->dumpable = 0;
wmb();
}
--- 609,613 ----
if (old_euid != uid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 651,655 ****
if (euid != current->euid)
{
! current->dumpable = 0;
wmb();
}
--- 651,655 ----
if (euid != current->euid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 697,701 ****
if (egid != current->egid)
{
! current->dumpable = 0;
wmb();
}
--- 697,701 ----
if (egid != current->egid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 739,743 ****
if (uid != old_fsuid)
{
! current->dumpable = 0;
wmb();
}
--- 739,743 ----
if (uid != old_fsuid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 781,785 ****
if (gid != old_fsgid)
{
! current->dumpable = 0;
wmb();
}
--- 781,785 ----
if (gid != old_fsgid)
{
! current->mm->dumpable = 0;
wmb();
}
***************
*** 1127,1132 ****
if(copy_from_user(&new_rlim, rlim, sizeof(*rlim)))
return -EFAULT;
- if (new_rlim.rlim_cur < 0 || new_rlim.rlim_max < 0)
- return -EINVAL;
old_rlim = current->rlim + resource;
if (((new_rlim.rlim_cur > old_rlim->rlim_max) ||
--- 1127,1130 ----
***************
*** 1228,1232 ****
break;
case PR_GET_DUMPABLE:
! if (current->dumpable)
error = 1;
break;
--- 1226,1230 ----
break;
case PR_GET_DUMPABLE:
! if (current->mm->dumpable)
error = 1;
break;
***************
*** 1236,1240 ****
break;
}
! current->dumpable = arg2;
break;
case PR_SET_UNALIGN:
--- 1234,1238 ----
break;
}
! current->mm->dumpable = arg2;
break;
case PR_SET_UNALIGN:
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv13548/include/asm-mips
Modified Files:
atomic.h au1000.h cpu.h hardirq.h irq.h
Log Message:
Sync to 2.4.7
Index: atomic.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/atomic.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** atomic.h 2001/07/26 21:55:39 1.2
--- atomic.h 2001/08/25 02:19:28 1.3
***************
*** 273,276 ****
--- 273,282 ----
*/
+ /* Atomic operations are already serializing */
+ #define smp_mb__before_atomic_dec() barrier()
+ #define smp_mb__after_atomic_dec() barrier()
+ #define smp_mb__before_atomic_inc() barrier()
+ #define smp_mb__after_atomic_inc() barrier()
+
#endif /* defined(__KERNEL__) */
Index: au1000.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/au1000.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** au1000.h 2001/08/17 22:53:26 1.3
--- au1000.h 2001/08/25 02:19:28 1.4
***************
*** 70,182 ****
/* SDRAM Controller */
! #define CS_MODE_0 0xB4000000
! #define CS_MODE_1 0xB4000004
! #define CS_MODE_2 0xB4000008
! #define CS_CONFIG_0 0xB400000C
! #define CS_CONFIG_1 0xB4000010
! #define CS_CONFIG_2 0xB4000014
! #define REFRESH_CONFIG 0xB4000018
! #define PRECHARGE_CMD 0xB400001C
! #define AUTO_REFRESH_CMD 0xB4000020
! #define WRITE_EXTERN_0 0xB4000024
! #define WRITE_EXTERN_1 0xB4000028
! #define WRITE_EXTERN_2 0xB400002C
! #define SDRAM_SLEEP 0xB4000030
! #define TOGGLE_CKE 0xB4000034
/* Static Bus Controller */
! #define STATIC_CONFIG_0 0xB4001000
! #define STATIC_TIMING_0 0xB4001004
! #define STATIC_ADDRESS_0 0xB4001008
! #define STATIC_CONFIG_1 0xB4001010
! #define STATIC_TIMING_1 0xB4001014
! #define STATIC_ADDRESS_1 0xB4001018
! #define STATIC_CONFIG_2 0xB4001020
! #define STATIC_TIMING_2 0xB4001024
! #define STATIC_ADDRESS_2 0xB4001028
! #define STATIC_CONFIG_3 0xB4001030
! #define STATIC_TIMING_3 0xB4001034
! #define STATIC_ADDRESS_3 0xB4001038
/* Interrupt Controller 0 */
! #define INTC0_CONFIG0_READ 0xB0400040
! #define INTC0_CONFIG0_SET 0xB0400040
! #define INTC0_CONFIG0_CLEAR 0xB0400044
! #define INTC0_CONFIG1_READ 0xB0400048
! #define INTC0_CONFIG1_SET 0xB0400048
! #define INTC0_CONFIG1_CLEAR 0xB040004C
! #define INTC0_CONFIG2_READ 0xB0400050
! #define INTC0_CONFIG2_SET 0xB0400050
! #define INTC0_CONFIG2_CLEAR 0xB0400054
! #define INTC0_REQ0_INT 0xB0400054
! #define INTC0_SOURCE_READ 0xB0400058
! #define INTC0_SOURCE_SET 0xB0400058
! #define INTC0_SOURCE_CLEAR 0xB040005C
! #define INTC0_REQ1_INT 0xB040005C
! #define INTC0_ASSIGN_REQ_READ 0xB0400060
! #define INTC0_ASSIGN_REQ_SET 0xB0400060
! #define INTC0_ASSIGN_REQ_CLEAR 0xB0400064
! #define INTC0_WAKEUP_READ 0xB0400068
! #define INTC0_WAKEUP_SET 0xB0400068
! #define INTC0_WAKEUP_CLEAR 0xB040006C
! #define INTC0_MASK_READ 0xB0400070
! #define INTC0_MASK_SET 0xB0400070
! #define INTC0_MASK_CLEAR 0xB0400074
! #define INTC0_R_EDGE_DETECT 0xB0400078
! #define INTC0_R_EDGE_DETECT_CLEAR 0xB0400078
! #define INTC0_F_EDGE_DETECT_CLEAR 0xB040007C
! #define INTC0_TEST_BIT 0xB0400080
/* Interrupt Controller 1 */
! #define INTC1_CONFIG0_READ 0xB1800040
! #define INTC1_CONFIG0_SET 0xB1800040
! #define INTC1_CONFIG0_CLEAR 0xB1800044
! #define INTC1_CONFIG1_READ 0xB1800048
! #define INTC1_CONFIG1_SET 0xB1800048
! #define INTC1_CONFIG1_CLEAR 0xB180004C
! #define INTC1_CONFIG2_READ 0xB1800050
! #define INTC1_CONFIG2_SET 0xB1800050
! #define INTC1_CONFIG2_CLEAR 0xB1800054
! #define INTC1_REQ0_INT 0xB1800054
! #define INTC1_SOURCE_READ 0xB1800058
! #define INTC1_SOURCE_SET 0xB1800058
! #define INTC1_SOURCE_CLEAR 0xB180005C
! #define INTC1_REQ1_INT 0xB180005C
! #define INTC1_ASSIGN_REQ_READ 0xB1800060
! #define INTC1_ASSIGN_REQ_SET 0xB1800060
! #define INTC1_ASSIGN_REQ_CLEAR 0xB1800064
! #define INTC1_WAKEUP_READ 0xB1800068
! #define INTC1_WAKEUP_SET 0xB1800068
! #define INTC1_WAKEUP_CLEAR 0xB180006C
! #define INTC1_MASK_READ 0xB1800070
! #define INTC1_MASK_SET 0xB1800070
! #define INTC1_MASK_CLEAR 0xB1800074
! #define INTC1_R_EDGE_DETECT 0xB1800078
! #define INTC1_R_EDGE_DETECT_CLEAR 0xB1800078
! #define INTC1_F_EDGE_DETECT_CLEAR 0xB180007C
! #define INTC1_TEST_BIT 0xB1800080
/* Interrupt Configuration Modes */
--- 70,254 ----
/* SDRAM Controller */
! #define CS_MODE_0 0x14000000
! #define CS_MODE_1 0x14000004
! #define CS_MODE_2 0x14000008
! #define CS_CONFIG_0 0x1400000C
! #define CS_CONFIG_1 0x14000010
! #define CS_CONFIG_2 0x14000014
! #define REFRESH_CONFIG 0x14000018
! #define PRECHARGE_CMD 0x1400001C
! #define AUTO_REFRESH_CMD 0x14000020
! #define WRITE_EXTERN_0 0x14000024
! #define WRITE_EXTERN_1 0x14000028
! #define WRITE_EXTERN_2 0x1400002C
! #define SDRAM_SLEEP 0x14000030
! #define TOGGLE_CKE 0x14000034
/* Static Bus Controller */
! #define STATIC_CONFIG_0 0x14001000
! #define STATIC_TIMING_0 0x14001004
! #define STATIC_ADDRESS_0 0x14001008
! #define STATIC_CONFIG_1 0x14001010
! #define STATIC_TIMING_1 0x14001014
! #define STATIC_ADDRESS_1 0x14001018
! #define STATIC_CONFIG_2 0x14001020
! #define STATIC_TIMING_2 0x14001024
! #define STATIC_ADDRESS_2 0x14001028
! #define STATIC_CONFIG_3 0x14001030
! #define STATIC_TIMING_3 0x14001034
! #define STATIC_ADDRESS_3 0x14001038
!
! /* DMA Controller 0 */
! #define DMA0_MODE_SET 0x14002000
! #define DMA0_MODE_CLEAR 0x14002004
! #define DMA0_PERIPHERAL_ADDR 0x14002008
! #define DMA0_BUFFER0_START 0x1400200C
! #define DMA0_BUFFER0_COUNT 0x14002010
! #define DMA0_BUFFER1_START 0x14002014
! #define DMA0_BUFFER1_COUNT 0x14002018
!
! /* DMA Controller 1 */
! #define DMA1_MODE_SET 0x14002100
! #define DMA1_MODE_CLEAR 0x14002104
! #define DMA1_PERIPHERAL_ADDR 0x14002108
! #define DMA1_BUFFER0_START 0x1400210C
! #define DMA1_BUFFER0_COUNT 0x14002110
! #define DMA1_BUFFER1_START 0x14002114
! #define DMA1_BUFFER1_COUNT 0x14002118
!
! /* DMA Controller 2 */
! #define DMA2_MODE_SET 0x14002200
! #define DMA2_MODE_CLEAR 0x14002204
! #define DMA2_PERIPHERAL_ADDR 0x14002208
! #define DMA2_BUFFER0_START 0x1400220C
! #define DMA2_BUFFER0_COUNT 0x14002210
! #define DMA2_BUFFER1_START 0x14002214
! #define DMA2_BUFFER1_COUNT 0x14002218
!
! /* DMA Controller 3 */
! #define DMA3_MODE_SET 0x14002300
! #define DMA3_MODE_CLEAR 0x14002304
! #define DMA3_PERIPHERAL_ADDR 0x14002308
! #define DMA3_BUFFER0_START 0x1400230C
! #define DMA3_BUFFER0_COUNT 0x14002310
! #define DMA3_BUFFER1_START 0x14002314
! #define DMA3_BUFFER1_COUNT 0x14002318
+ /* DMA Controller 4 */
+ #define DMA4_MODE_SET 0x14002400
+ #define DMA4_MODE_CLEAR 0x14002404
+ #define DMA4_PERIPHERAL_ADDR 0x14002408
+ #define DMA4_BUFFER0_START 0x1400240C
+ #define DMA4_BUFFER0_COUNT 0x14002410
+ #define DMA4_BUFFER1_START 0x14002414
+ #define DMA4_BUFFER1_COUNT 0x14002418
+
+ /* DMA Controller 5 */
+ #define DMA5_MODE_SET 0x14002500
+ #define DMA5_MODE_CLEAR 0x14002504
+ #define DMA5_PERIPHERAL_ADDR 0x14002508
+ #define DMA5_BUFFER0_START 0x1400250C
+ #define DMA5_BUFFER0_COUNT 0x14002510
+ #define DMA5_BUFFER1_START 0x14002514
+ #define DMA5_BUFFER1_COUNT 0x14002518
+
+ /* DMA Controller 6 */
+ #define DMA6_MODE_SET 0x14002600
+ #define DMA6_MODE_CLEAR 0x14002604
+ #define DMA6_PERIPHERAL_ADDR 0x14002608
+ #define DMA6_BUFFER0_START 0x1400260C
+ #define DMA6_BUFFER0_COUNT 0x14002610
+ #define DMA6_BUFFER1_START 0x14002614
+ #define DMA6_BUFFER1_COUNT 0x14002618
+
+ /* DMA Controller 7 */
+ #define DMA7_MODE_SET 0x14002700
+ #define DMA7_MODE_CLEAR 0x14002704
+ #define DMA7_PERIPHERAL_ADDR 0x14002708
+ #define DMA7_BUFFER0_START 0x1400270C
+ #define DMA7_BUFFER0_COUNT 0x14002710
+ #define DMA7_BUFFER1_START 0x14002714
+ #define DMA7_BUFFER1_COUNT 0x14002718
+
/* Interrupt Controller 0 */
! #define INTC0_CONFIG0_READ 0x10400040
! #define INTC0_CONFIG0_SET 0x10400040
! #define INTC0_CONFIG0_CLEAR 0x10400044
! #define INTC0_CONFIG1_READ 0x10400048
! #define INTC0_CONFIG1_SET 0x10400048
! #define INTC0_CONFIG1_CLEAR 0x1040004C
! #define INTC0_CONFIG2_READ 0x10400050
! #define INTC0_CONFIG2_SET 0x10400050
! #define INTC0_CONFIG2_CLEAR 0x10400054
! #define INTC0_REQ0_INT 0x10400054
! #define INTC0_SOURCE_READ 0x10400058
! #define INTC0_SOURCE_SET 0x10400058
! #define INTC0_SOURCE_CLEAR 0x1040005C
! #define INTC0_REQ1_INT 0x1040005C
! #define INTC0_ASSIGN_REQ_READ 0x10400060
! #define INTC0_ASSIGN_REQ_SET 0x10400060
! #define INTC0_ASSIGN_REQ_CLEAR 0x10400064
! #define INTC0_WAKEUP_READ 0x10400068
! #define INTC0_WAKEUP_SET 0x10400068
! #define INTC0_WAKEUP_CLEAR 0x1040006C
! #define INTC0_MASK_READ 0x10400070
! #define INTC0_MASK_SET 0x10400070
! #define INTC0_MASK_CLEAR 0x10400074
! #define INTC0_R_EDGE_DETECT 0x10400078
! #define INTC0_R_EDGE_DETECT_CLEAR 0x10400078
! #define INTC0_F_EDGE_DETECT_CLEAR 0x1040007C
! #define INTC0_TEST_BIT 0x10400080
/* Interrupt Controller 1 */
! #define INTC1_CONFIG0_READ 0x11800040
! #define INTC1_CONFIG0_SET 0x11800040
! #define INTC1_CONFIG0_CLEAR 0x11800044
! #define INTC1_CONFIG1_READ 0x11800048
! #define INTC1_CONFIG1_SET 0x11800048
! #define INTC1_CONFIG1_CLEAR 0x1180004C
! #define INTC1_CONFIG2_READ 0x11800050
! #define INTC1_CONFIG2_SET 0x11800050
! #define INTC1_CONFIG2_CLEAR 0x11800054
! #define INTC1_REQ0_INT 0x11800054
! #define INTC1_SOURCE_READ 0x11800058
! #define INTC1_SOURCE_SET 0x11800058
! #define INTC1_SOURCE_CLEAR 0x1180005C
! #define INTC1_REQ1_INT 0x1180005C
! #define INTC1_ASSIGN_REQ_READ 0x11800060
! #define INTC1_ASSIGN_REQ_SET 0x11800060
! #define INTC1_ASSIGN_REQ_CLEAR 0x11800064
! #define INTC1_WAKEUP_READ 0x11800068
! #define INTC1_WAKEUP_SET 0x11800068
! #define INTC1_WAKEUP_CLEAR 0x1180006C
! #define INTC1_MASK_READ 0x11800070
! #define INTC1_MASK_SET 0x11800070
! #define INTC1_MASK_CLEAR 0x11800074
! #define INTC1_R_EDGE_DETECT 0x11800078
! #define INTC1_R_EDGE_DETECT_CLEAR 0x11800078
! #define INTC1_F_EDGE_DETECT_CLEAR 0x1180007C
! #define INTC1_TEST_BIT 0x11800080
/* Interrupt Configuration Modes */
***************
*** 196,200 ****
#define AU1000_SSI0_INT 4
#define AU1000_SSI1_INT 5
! #define AU1000_DMA_INT_BASE 6
#define AU1000_PC0_INT 14
#define AU1000_PC0_MATCH0_INT 15
--- 268,279 ----
#define AU1000_SSI0_INT 4
#define AU1000_SSI1_INT 5
! #define AU1000_DMA0_INT 6
! #define AU1000_DMA1_INT 7
! #define AU1000_DMA2_INT 8
! #define AU1000_DMA3_INT 9
! #define AU1000_DMA4_INT 10
! #define AU1000_DMA5_INT 11
! #define AU1000_DMA6_INT 12
! #define AU1000_DMA7_INT 13
#define AU1000_PC0_INT 14
#define AU1000_PC0_MATCH0_INT 15
***************
*** 252,256 ****
/* Programmable Counters 0 and 1 */
! #define PC_BASE 0xB1900000
#define PC_COUNTER_CNTRL (PC_BASE + 0x14)
#define PC_CNTRL_E1S (1<<23)
--- 331,335 ----
/* Programmable Counters 0 and 1 */
! #define PC_BASE 0x11900000
#define PC_COUNTER_CNTRL (PC_BASE + 0x14)
#define PC_CNTRL_E1S (1<<23)
***************
*** 292,298 ****
/* I2S Controller */
! #define I2S_DATA 0xB1000000
! #define I2S_CONFIG_STATUS 0xB1000001
! #define I2S_CONTROL 0xB1000002
/* USB Host Controller */
--- 371,377 ----
/* I2S Controller */
! #define I2S_DATA 0x11000000
! #define I2S_CONFIG_STATUS 0x11000001
! #define I2S_CONTROL 0x11000002
/* USB Host Controller */
***************
*** 345,350 ****
/* Ethernet Controllers */
! #define AU1000_ETH0_BASE 0xB0500000
! #define AU1000_ETH1_BASE 0xB0510000
/* 4 byte offsets from AU1000_ETH_BASE */
--- 424,429 ----
/* Ethernet Controllers */
! #define AU1000_ETH0_BASE 0x10500000
! #define AU1000_ETH1_BASE 0x10510000
/* 4 byte offsets from AU1000_ETH_BASE */
***************
*** 391,399 ****
/* Ethernet Controller Enable */
! #define MAC0_ENABLE 0xB0520000
! #define MAC1_ENABLE 0xB0520004
#define MAC_EN_CLOCK_ENABLE (1<<0)
#define MAC_EN_RESET0 (1<<1)
! #define MAC_EN_TOSS (0<<2)
#define MAC_EN_CACHEABLE (1<<3)
#define MAC_EN_RESET1 (1<<4)
--- 470,478 ----
/* Ethernet Controller Enable */
! #define MAC0_ENABLE 0x10520000
! #define MAC1_ENABLE 0x10520004
#define MAC_EN_CLOCK_ENABLE (1<<0)
#define MAC_EN_RESET0 (1<<1)
! #define MAC_EN_TOSS (1<<2)
#define MAC_EN_CACHEABLE (1<<3)
#define MAC_EN_RESET1 (1<<4)
***************
*** 403,408 ****
/* Ethernet Controller DMA Channels */
! #define MAC0_TX_DMA_ADDR 0xB4004000
! #define MAC1_TX_DMA_ADDR 0xB4004200
/* offsets from MAC_TX_RING_ADDR address */
#define MAC_TX_BUFF0_STATUS 0x0
--- 482,487 ----
/* Ethernet Controller DMA Channels */
! #define MAC0_TX_DMA_ADDR 0x14004000
! #define MAC1_TX_DMA_ADDR 0x14004200
/* offsets from MAC_TX_RING_ADDR address */
#define MAC_TX_BUFF0_STATUS 0x0
***************
*** 434,439 ****
#define MAC_TX_BUFF3_LEN 0x38
! #define MAC0_RX_DMA_ADDR 0xB4004100
! #define MAC1_RX_DMA_ADDR 0xB4004300
/* offsets from MAC_RX_RING_ADDR */
#define MAC_RX_BUFF0_STATUS 0x0
--- 513,518 ----
#define MAC_TX_BUFF3_LEN 0x38
! #define MAC0_RX_DMA_ADDR 0x14004100
! #define MAC1_RX_DMA_ADDR 0x14004300
/* offsets from MAC_RX_RING_ADDR */
#define MAC_RX_BUFF0_STATUS 0x0
***************
*** 475,482 ****
/* UARTS 0-3 */
! #define UART0_ADDR 0xB1100000
! #define UART1_ADDR 0xB1200000
! #define UART2_ADDR 0xB1300000
! #define UART3_ADDR 0xB1400000
#define UART_RX 0 /* Receive buffer */
--- 554,561 ----
/* UARTS 0-3 */
! #define UART0_ADDR 0x11100000
! #define UART1_ADDR 0x11200000
! #define UART2_ADDR 0x11300000
! #define UART3_ADDR 0x11400000
#define UART_RX 0 /* Receive buffer */
***************
*** 573,638 ****
/* SSIO */
! #define SSI0_STATUS 0xB1600000
! #define SSI0_INT 0xB1600004
! #define SSI0_INT_ENABLE 0xB1600008
! #define SSI0_CONFIG 0xB1600020
! #define SSI0_ADATA 0xB1600024
! #define SSI0_CLKDIV 0xB1600028
! #define SSI0_CONTROL 0xB1600100
/* SSI1 */
! #define SSI1_STATUS 0xB1680000
! #define SSI1_INT 0xB1680004
! #define SSI1_INT_ENABLE 0xB1680008
! #define SSI1_CONFIG 0xB1680020
! #define SSI1_ADATA 0xB1680024
! #define SSI1_CLKDIV 0xB1680028
! #define SSI1_CONTROL 0xB1680100
/* IrDA Controller */
! #define IR_RING_PTR_STATUS 0xB1500000
! #define IR_RING_BASE_ADDR_H 0xB1500004
! #define IR_RING_BASE_ADDR_L 0xB1500008
! #define IR_RING_SIZE 0xB150000C
! #define IR_RING_PROMPT 0xB1500010
! #define IR_RING_ADDR_CMPR 0xB1500014
! #define IR_CONFIG_1 0xB1500020
! #define IR_SIR_FLAGS 0xB1500024
! #define IR_ENABLE 0xB1500028
! #define IR_READ_PHY_CONFIG 0xB150002C
! #define IR_WRITE_PHY_CONFIG 0xB1500030
! #define IR_MAX_PKT_LEN 0xB1500034
! #define IR_RX_BYTE_CNT 0xB1500038
! #define IR_CONFIG_2 0xB150003C
! #define IR_INTERFACE_CONFIG 0xB1500040
/* GPIO */
! #define PIN_FUNCTION 0xB190002C
! #define TSTATE_STATE_READ 0xB1900100
! #define TSTATE_STATE_SET 0xB1900100
! #define OUTPUT_STATE_READ 0xB1900108
! #define OUTPUT_STATE_SET 0xB1900108
! #define OUTPUT_STATE_CLEAR 0xB190010C
! #define PIN_STATE 0xB1900110
/* Power Management */
! #define PM_SCRATCH_0 0xB1900018
! #define PM_SCRATCH_1 0xB190001C
! #define PM_WAKEUP_SOURCE_MASK 0xB1900034
! #define PM_ENDIANESS 0xB1900038
! #define PM_POWERUP_CONTROL 0xB190003C
! #define PM_WAKEUP_CAUSE 0xB190005C
! #define PM_SLEEP_POWER 0xB1900078
! #define PM_SLEEP 0xB190007C
/* Clock Controller */
! #define FQ_CNTRL_1 0xB1900020
! #define FQ_CNTRL_2 0xB1900024
! #define CLOCK_SOURCE_CNTRL 0xB1900028
! #define CPU_PLL_CNTRL 0xB1900060
! #define AUX_PLL_CNTRL 0xB1900064
/* AC97 Controller */
! #define AC97C_CONFIG 0xB0000000
#define AC97C_RECV_SLOTS_BIT 13
#define AC97C_RECV_SLOTS_MASK (0x3ff << AC97C_RECV_SLOTS_BIT)
--- 652,716 ----
/* SSIO */
! #define SSI0_STATUS 0x11600000
! #define SSI0_INT 0x11600004
! #define SSI0_INT_ENABLE 0x11600008
! #define SSI0_CONFIG 0x11600020
! #define SSI0_ADATA 0x11600024
! #define SSI0_CLKDIV 0x11600028
! #define SSI0_CONTROL 0x11600100
/* SSI1 */
! #define SSI1_STATUS 0x11680000
! #define SSI1_INT 0x11680004
! #define SSI1_INT_ENABLE 0x11680008
! #define SSI1_CONFIG 0x11680020
! #define SSI1_ADATA 0x11680024
! #define SSI1_CLKDIV 0x11680028
! #define SSI1_CONTROL 0x11680100
/* IrDA Controller */
! #define IR_RING_PTR_STATUS 0x11500000
! #define IR_RING_BASE_ADDR_H 0x11500004
! #define IR_RING_BASE_ADDR_L 0x11500008
! #define IR_RING_SIZE 0x1150000C
! #define IR_RING_PROMPT 0x11500010
! #define IR_RING_ADDR_CMPR 0x11500014
! #define IR_CONFIG_1 0x11500020
! #define IR_SIR_FLAGS 0x11500024
! #define IR_ENABLE 0x11500028
! #define IR_READ_PHY_CONFIG 0x1150002C
! #define IR_WRITE_PHY_CONFIG 0x11500030
! #define IR_MAX_PKT_LEN 0x11500034
! #define IR_RX_BYTE_CNT 0x11500038
! #define IR_CONFIG_2 0x1150003C
! #define IR_INTERFACE_CONFIG 0x11500040
/* GPIO */
! #define TSTATE_STATE_READ 0x11900100
! #define TSTATE_STATE_SET 0x11900100
! #define OUTPUT_STATE_READ 0x11900108
! #define OUTPUT_STATE_SET 0x11900108
! #define OUTPUT_STATE_CLEAR 0x1190010C
! #define PIN_STATE 0x11900110
/* Power Management */
! #define PM_SCRATCH_0 0x11900018
! #define PM_SCRATCH_1 0x1190001C
! #define PM_WAKEUP_SOURCE_MASK 0x11900034
! #define PM_ENDIANESS 0x11900038
! #define PM_POWERUP_CONTROL 0x1190003C
! #define PM_WAKEUP_CAUSE 0x1190005C
! #define PM_SLEEP_POWER 0x11900078
! #define PM_SLEEP 0x1190007C
/* Clock Controller */
! #define FQ_CNTRL_1 0x11900020
! #define FQ_CNTRL_2 0x11900024
! #define CLOCK_SOURCE_CNTRL 0x11900028
! #define CPU_PLL_CNTRL 0x11900060
! #define AUX_PLL_CNTRL 0x11900064
/* AC97 Controller */
! #define AC97C_CONFIG 0x10000000
#define AC97C_RECV_SLOTS_BIT 13
#define AC97C_RECV_SLOTS_MASK (0x3ff << AC97C_RECV_SLOTS_BIT)
***************
*** 642,646 ****
#define AC97C_SYNC (1<<1)
#define AC97C_RESET (1<<0)
! #define AC97C_STATUS 0xB0000004
#define AC97C_XU (1<<11)
#define AC97C_XO (1<<10)
--- 720,724 ----
#define AC97C_SYNC (1<<1)
#define AC97C_RESET (1<<0)
! #define AC97C_STATUS 0x10000004
#define AC97C_XU (1<<11)
#define AC97C_XO (1<<10)
***************
*** 655,664 ****
#define AC97C_RE (1<<1)
#define AC97C_RF (1<<0)
! #define AC97C_DATA 0xB0000008
! #define AC97C_CMD 0xB000000C
#define AC97C_WD_BIT 16
#define AC97C_READ (1<<7)
#define AC97C_INDEX_MASK 0x7f
! #define AC97C_CNTRL 0xB0000010
#define AC97C_RS (1<<1)
#define AC97C_CE (1<<0)
--- 733,742 ----
#define AC97C_RE (1<<1)
#define AC97C_RF (1<<0)
! #define AC97C_DATA 0x10000008
! #define AC97C_CMD 0x1000000C
#define AC97C_WD_BIT 16
#define AC97C_READ (1<<7)
#define AC97C_INDEX_MASK 0x7f
! #define AC97C_CNTRL 0x10000010
#define AC97C_RS (1<<1)
#define AC97C_CE (1<<0)
Index: cpu.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/cpu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cpu.h 2001/08/17 22:53:26 1.6
--- cpu.h 2001/08/25 02:19:28 1.7
***************
*** 9,12 ****
--- 9,13 ----
#include <asm/cache.h>
+
/* Assigned Company values for bits 23:16 of the PRId Register
(CP0 register 15, select 0). As of the MIPS32 and MIPS64 specs from
***************
*** 38,43 ****
*/
#define PRID_IMP_R2000 0x0100
! #define PRID_IMP_AU1_REV1 0x0100
! #define PRID_IMP_AU1_REV2 0x0200
#define PRID_IMP_R3000 0x0200 /* Same as R2000A */
#define PRID_IMP_R6000 0x0300 /* Same as R3000A */
--- 39,43 ----
*/
#define PRID_IMP_R2000 0x0100
! #define PRID_IMP_AU1000 0x0100
#define PRID_IMP_R3000 0x0200 /* Same as R2000A */
#define PRID_IMP_R6000 0x0300 /* Same as R3000A */
Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/hardirq.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hardirq.h 2001/08/22 18:18:14 1.4
--- hardirq.h 2001/08/25 02:19:28 1.5
***************
*** 21,24 ****
--- 21,25 ----
unsigned int __local_bh_count;
unsigned int __syscall_count;
+ struct task_struct * __ksoftirqd_task; /* waitqueue is too large */
} ____cacheline_aligned irq_cpustat_t;
Index: irq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/irq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** irq.h 2001/07/09 21:50:55 1.2
--- irq.h 2001/08/25 02:19:28 1.3
***************
*** 29,33 ****
extern void disable_irq(unsigned int);
! #if defined(CONFIG_ROTTEN_IRQ) || defined(CONFIG_COBALT_MICRO_SERVER)
#define disable_irq_nosync disable_irq
#else
--- 29,33 ----
extern void disable_irq(unsigned int);
! #if !defined(CONFIG_NEW_IRQ) || defined(CONFIG_COBALT_MICRO_SERVER)
#define disable_irq_nosync disable_irq
#else
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/sound
Modified Files:
Config.in
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/Config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Config.in 2001/08/17 23:38:44 1.5
--- Config.in 2001/08/25 02:19:28 1.6
***************
*** 7,16 ****
# Prompt user for primary drivers.
! dep_tristate ' C-Media PCI (CMI8338/8378)' CONFIG_SOUND_CMPCI $CONFIG_SOUND $CONFIG_PCI
if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
! bool ' Enable S/PDIF loop for CMI8738' CONFIG_SOUND_CMPCI_SPDIFLOOP
! bool ' Enable 4 channel mode for CMI8738' CONFIG_SOUND_CMPCI_4CH
! if [ "$CONFIG_SOUND_CMPCI_4CH" = "y" ]; then
! bool ' Separate rear out jack' CONFIG_SOUND_CMPCI_REAR
fi
fi
--- 7,31 ----
# Prompt user for primary drivers.
! dep_tristate ' C-Media PCI (CMI8338/8738)' CONFIG_SOUND_CMPCI $CONFIG_SOUND $CONFIG_PCI
if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
! bool ' Enable legacy FM' CONFIG_SOUND_CMPCI_FM
! if [ "$CONFIG_SOUND_CMPCI_FM" = "y" ]; then
! define_hex CONFIG_SOUND_CMPCI_FMIO 388
! hex ' FM I/O 388, 3C8, 3E0, 3E8' CONFIG_SOUND_CMPCI_FMIO 388
! fi
! bool ' Enable legacy MPU-401' CONFIG_SOUND_CMPCI_MIDI
! if [ "$CONFIG_SOUND_CMPCI_MIDI" = "y" ]; then
! hex ' MPU-401 I/O 330, 320, 310, 300' CONFIG_SOUND_CMPCI_MPUIO 330
! fi
! bool ' Enable joystick' CONFIG_SOUND_CMPCI_JOYSTICK
! bool ' Support CMI8738 based audio cards' CONFIG_SOUND_CMPCI_CM8738
! if [ "$CONFIG_SOUND_CMPCI_CM8738" = "y" ]; then
! bool ' Inverse S/PDIF in for CMI8738' CONFIG_SOUND_CMPCI_SPDIFINVERSE
! bool ' Enable S/PDIF loop for CMI8738' CONFIG_SOUND_CMPCI_SPDIFLOOP
! int ' Number of speakers 2, 4, 5, 6' CONFIG_SOUND_CMPCI_SPEAKERS 2
! if [ "$CONFIG_SOUND_CMPCI_SPEAKERS" != "2" ]; then
! bool ' Use Line-in as Read-out' CONFIG_SOUND_CMPCI_LINE_REAR
! bool ' Use Line-in as Bass' CONFIG_SOUND_CMPCI_LINE_BASS
! fi
fi
fi
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/include/linux In directory usw-pr-cvs1:/tmp/cvs-serv13548/include/linux Modified Files: netdevice.h Log Message: Sync to 2.4.7 Index: netdevice.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** netdevice.h 2001/07/09 21:50:55 1.2 --- netdevice.h 2001/08/25 02:19:28 1.3 *************** *** 65,69 **** #endif ! #define MAX_ADDR_LEN 7 /* Largest hardware address length */ /* --- 65,69 ---- #endif ! #define MAX_ADDR_LEN 8 /* Largest hardware address length */ /* *************** *** 493,497 **** dev->next_sched = softnet_data[cpu].output_queue; softnet_data[cpu].output_queue = dev; ! __cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } --- 493,497 ---- dev->next_sched = softnet_data[cpu].output_queue; softnet_data[cpu].output_queue = dev; ! cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } *************** *** 542,546 **** skb->next = softnet_data[cpu].completion_queue; softnet_data[cpu].completion_queue = skb; ! __cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } --- 542,546 ---- skb->next = softnet_data[cpu].completion_queue; softnet_data[cpu].completion_queue = skb; ! cpu_raise_softirq(cpu, NET_TX_SOFTIRQ); local_irq_restore(flags); } |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv13548/fs/partitions
Modified Files:
check.c
Log Message:
Sync to 2.4.7
Index: check.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/partitions/check.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** check.c 2001/08/10 18:53:20 1.4
--- check.c 2001/08/25 02:19:28 1.5
***************
*** 329,332 ****
--- 329,334 ----
}
+ static struct unique_numspace disc_numspace = UNIQUE_NUMBERSPACE_INITIALISER;
+
static void devfs_register_disc (struct gendisk *dev, int minor)
{
***************
*** 336,340 ****
unsigned int devfs_flags = DEVFS_FL_DEFAULT;
char dirname[64], symlink[16];
- static unsigned int disc_counter;
static devfs_handle_t devfs_handle;
--- 338,341 ----
***************
*** 357,361 ****
if (!devfs_handle)
devfs_handle = devfs_mk_dir (NULL, "discs", NULL);
! sprintf (symlink, "disc%u", disc_counter++);
devfs_mk_symlink (devfs_handle, symlink, DEVFS_FL_DEFAULT,
dirname + pos, &slave, NULL);
--- 358,363 ----
if (!devfs_handle)
devfs_handle = devfs_mk_dir (NULL, "discs", NULL);
! dev->part[minor].number = devfs_alloc_unique_number (&disc_numspace);
! sprintf (symlink, "disc%d", dev->part[minor].number);
devfs_mk_symlink (devfs_handle, symlink, DEVFS_FL_DEFAULT,
dirname + pos, &slave, NULL);
***************
*** 387,390 ****
--- 389,394 ----
devfs_unregister (dev->part[minor].de);
dev->part[minor].de = NULL;
+ devfs_dealloc_unique_number (&disc_numspace,
+ dev->part[minor].number);
}
#endif /* CONFIG_DEVFS_FS */
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/drivers/sgi/char In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/sgi/char Modified Files: sgicons.c Log Message: Sync to 2.4.7 Index: sgicons.c =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/sgi/char/sgicons.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** sgicons.c 2001/06/22 02:29:32 1.1.1.1 --- sgicons.c 2001/08/25 02:19:28 1.2 *************** *** 14,20 **** #include "gconsole.h" - /* To make psaux code cleaner */ - unsigned char aux_device_present = 0xaa; - /* This is the system graphics console (the first adapter found) */ struct console_ops *gconsole = 0; --- 14,17 ---- |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/include/asm-mips64 In directory usw-pr-cvs1:/tmp/cvs-serv13548/include/asm-mips64 Modified Files: atomic.h hardirq.h ioctl.h Log Message: Sync to 2.4.7 Index: atomic.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/atomic.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** atomic.h 2001/06/22 02:29:32 1.1.1.1 --- atomic.h 2001/08/25 02:19:28 1.2 *************** *** 184,187 **** --- 184,193 ---- */ + /* Atomic operations are already serializing */ + #define smp_mb__before_atomic_dec() barrier() + #define smp_mb__after_atomic_dec() barrier() + #define smp_mb__before_atomic_inc() barrier() + #define smp_mb__after_atomic_inc() barrier() + #endif /* defined(__KERNEL__) */ Index: hardirq.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/hardirq.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hardirq.h 2001/08/22 18:18:14 1.2 --- hardirq.h 2001/08/25 02:19:28 1.3 *************** *** 20,23 **** --- 20,24 ---- unsigned int __local_bh_count; unsigned int __syscall_count; + struct task_struct * __ksoftirqd_task; /* waitqueue is too large */ } ____cacheline_aligned irq_cpustat_t; Index: ioctl.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/ioctl.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ioctl.h 2001/06/22 02:29:33 1.1.1.1 --- ioctl.h 2001/08/25 02:19:28 1.2 *************** *** 39,42 **** --- 39,47 ---- /* + * We to additionally limit parameters to a maximum 255 bytes. + */ + #define _IOC_SLMASK 0xff + + /* * Direction bits _IOC_NONE could be 0, but OSF/1 gives it a bit. * And this turns out useful to catch old ioctl numbers in header |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:33
|
Update of /cvsroot/linux-mips/linux/init
In directory usw-pr-cvs1:/tmp/cvs-serv13548/init
Modified Files:
main.c
Log Message:
Sync to 2.4.7
Index: main.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/init/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.c 2001/08/10 19:32:35 1.4
--- main.c 2001/08/25 02:19:28 1.5
***************
*** 505,508 ****
--- 505,523 ----
/*
+ * We need to finalize in a non-__init function or else race conditions
+ * between the root thread and the init thread may cause start_kernel to
+ * be reaped by free_initmem before the root thread has proceeded to
+ * cpu_idle.
+ */
+
+ static void rest_init(void)
+ {
+ kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
+ unlock_kernel();
+ current->need_resched = 1;
+ cpu_idle();
+ }
+
+ /*
* Activate the first processor.
*/
***************
*** 525,530 ****
init_IRQ();
sched_init();
- time_init();
softirq_init();
/*
--- 540,545 ----
init_IRQ();
sched_init();
softirq_init();
+ time_init();
/*
***************
*** 589,596 ****
*/
smp_init();
! kernel_thread(init, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGNAL);
! unlock_kernel();
! current->need_resched = 1;
! cpu_idle();
}
--- 604,608 ----
*/
smp_init();
! rest_init();
}
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/scsi
Modified Files:
Config.in dec_esp.c ncr53c8xx.c sym53c8xx_defs.h
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/Config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Config.in 2001/06/22 02:29:32 1.1.1.1
--- Config.in 2001/08/25 02:19:28 1.2
***************
*** 102,106 ****
fi
if [ "$CONFIG_X86" = "y" ]; then
! dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI
fi
dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI $CONFIG_PCI
--- 102,106 ----
fi
if [ "$CONFIG_X86" = "y" ]; then
! dep_tristate 'IBM ServeRAID support' CONFIG_SCSI_IPS $CONFIG_SCSI $CONFIG_PCI
fi
dep_tristate 'Initio 9100U(W) support' CONFIG_SCSI_INITIO $CONFIG_SCSI $CONFIG_PCI
***************
*** 197,200 ****
--- 197,224 ----
if [ "$CONFIG_MIPS_JAZZ" = "y" ]; then
bool 'MIPS JAZZ FAS216 SCSI support' CONFIG_JAZZ_ESP
+ fi
+
+ if [ "$CONFIG_AMIGA" = "y" ]; then
+ dep_tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI $CONFIG_SCSI
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool 'A4000T SCSI support (EXPERIMENTAL)' CONFIG_A4000T_SCSI
+ fi
+ fi
+ if [ "$CONFIG_ZORRO" = "y" ]; then
+ dep_tristate 'A2091/A590 WD33C93A support' CONFIG_A2091_SCSI $CONFIG_SCSI
+ dep_tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI $CONFIG_SCSI
+ dep_tristate 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI $CONFIG_SCSI
+ dep_tristate 'CyberStorm Mk II SCSI support' CONFIG_CYBERSTORMII_SCSI $CONFIG_SCSI
+ dep_tristate 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI $CONFIG_SCSI
+ dep_tristate 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI $CONFIG_SCSI
+ dep_tristate 'Fastlane SCSI support' CONFIG_FASTLANE_SCSI $CONFIG_SCSI
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ bool 'A4091 SCSI support (EXPERIMENTAL)' CONFIG_A4091_SCSI
+ bool 'WarpEngine SCSI support (EXPERIMENTAL)' CONFIG_WARPENGINE_SCSI
+ bool 'Blizzard PowerUP 603e+ SCSI (EXPERIMENTAL)' CONFIG_BLZ603EPLUS_SCSI
+ dep_tristate 'BSC Oktagon SCSI support (EXPERIMENTAL)' CONFIG_OKTAGON_SCSI $CONFIG_SCSI
+ # bool 'Cyberstorm Mk III SCSI support (EXPERIMENTAL)' CONFIG_CYBERSTORMIII_SCSI
+ # bool 'GVP Turbo 040/060 SCSI support (EXPERIMENTAL)' CONFIG_GVP_TURBO_SCSI
+ fi
fi
Index: dec_esp.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/dec_esp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** dec_esp.c 2001/06/22 02:29:32 1.1.1.1
--- dec_esp.c 2001/08/25 02:19:28 1.2
***************
*** 189,198 ****
esp_initialize(esp);
! if (request_irq(esp->irq, esp_intr, SA_INTERRUPT,
! "NCR 53C94 SCSI", NULL))
! goto err_dealloc;
! if (request_irq(SCSI_DMA_INT, scsi_dma_int, SA_INTERRUPT,
! "JUNKIO SCSI DMA", NULL))
! goto err_free_irq;
}
--- 189,198 ----
esp_initialize(esp);
! if (request_irq(esp->irq, esp_intr, SA_INTERRUPT,
! "NCR 53C94 SCSI", NULL))
! goto err_dealloc;
! if (request_irq(SCSI_DMA_INT, scsi_dma_int, SA_INTERRUPT,
! "JUNKIO SCSI DMA", NULL))
! goto err_free_irq;
}
Index: ncr53c8xx.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/ncr53c8xx.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ncr53c8xx.c 2001/07/09 21:55:49 1.1
--- ncr53c8xx.c 2001/08/25 02:19:28 1.2
***************
*** 104,108 ****
** Name and version of the driver
*/
! #define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3-20010212"
#define SCSI_NCR_DEBUG_FLAGS (0)
--- 104,108 ----
** Name and version of the driver
*/
! #define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3b-20010512"
#define SCSI_NCR_DEBUG_FLAGS (0)
***************
*** 3088,3092 ****
/*
! ** Print something which allows to retrieve the controler type, unit,
** target, lun concerned by a kernel message.
*/
--- 3088,3092 ----
/*
! ** Print something which allows to retrieve the controller type, unit,
** target, lun concerned by a kernel message.
*/
***************
*** 4325,4329 ****
**----------------------------------------------------
*/
! #if 0 /* This stuff was only usefull for linux-1.2.13 */
if (lp && !lp->numtags && cmd->device && cmd->device->tagged_queue) {
lp->numtags = tp->usrtags;
--- 4325,4329 ----
**----------------------------------------------------
*/
! #if 0 /* This stuff was only useful for linux-1.2.13 */
if (lp && !lp->numtags && cmd->device && cmd->device->tagged_queue) {
lp->numtags = tp->usrtags;
***************
*** 5727,5731 ****
fak = (kpc - 1) / div_10M[div] + 1;
! #if 0 /* This optimization does not seem very usefull */
per = (fak * div_10M[div]) / clk;
--- 5727,5731 ----
fak = (kpc - 1) / div_10M[div] + 1;
! #if 0 /* This optimization does not seem very useful */
per = (fak * div_10M[div]) / clk;
***************
*** 6673,6677 ****
/*
! ** The data in the dma fifo has not been transfered to
** the target -> add the amount to the rest
** and clear the data.
--- 6673,6677 ----
/*
! ** The data in the dma fifo has not been transferred to
** the target -> add the amount to the rest
** and clear the data.
***************
*** 7183,7187 ****
**
** We try to negotiate sync and wide transfer only after
! ** a successfull inquire command. We look at byte 7 of the
** inquire data to determine the capabilities of the target.
**
--- 7183,7187 ----
**
** We try to negotiate sync and wide transfer only after
! ** a successful inquire command. We look at byte 7 of the
** inquire data to determine the capabilities of the target.
**
***************
*** 7580,7584 ****
**
**
! ** Aquire a control block
**
**
--- 7580,7584 ----
**
**
! ** Acquire a control block
**
**
Index: sym53c8xx_defs.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/sym53c8xx_defs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** sym53c8xx_defs.h 2001/06/22 02:29:32 1.1.1.1
--- sym53c8xx_defs.h 2001/08/25 02:19:28 1.2
***************
*** 173,178 ****
/*
! * Use normal IO if configured. Forced for alpha and powerpc.
! * Powerpc fails copying to on-chip RAM using memcpy_toio().
*/
#if defined(CONFIG_SCSI_NCR53C8XX_IOMAPPED)
--- 173,177 ----
/*
! * Use normal IO if configured. Forced for alpha.
*/
#if defined(CONFIG_SCSI_NCR53C8XX_IOMAPPED)
***************
*** 181,186 ****
--- 180,187 ----
#define SCSI_NCR_IOMAPPED
#elif defined(__powerpc__)
+ #if LINUX_VERSION_CODE <= LinuxVersionCode(2,4,3)
#define SCSI_NCR_IOMAPPED
#define SCSI_NCR_PCI_MEM_NOT_SUPPORTED
+ #endif
#elif defined(__sparc__)
#undef SCSI_NCR_IOMAPPED
***************
*** 748,752 ****
#define FE_LDSTR (1<<13) /* Load/Store supported */
#define FE_RAM (1<<14) /* On chip RAM present */
! #define FE_VARCLK (1<<15) /* SCSI lock may vary */
#define FE_RAM8K (1<<16) /* On chip RAM sized 8Kb */
#define FE_64BIT (1<<17) /* Have a 64-bit PCI interface */
--- 749,753 ----
#define FE_LDSTR (1<<13) /* Load/Store supported */
#define FE_RAM (1<<14) /* On chip RAM present */
! #define FE_VARCLK (1<<15) /* SCSI clock may vary */
#define FE_RAM8K (1<<16) /* On chip RAM sized 8Kb */
#define FE_64BIT (1<<17) /* Have a 64-bit PCI interface */
***************
*** 758,761 ****
--- 759,763 ----
#define FE_66MHZ (1<<23) /* 66MHz PCI Support */
#define FE_DAC (1<<24) /* Support DAC cycles (64 bit addressing) */
+ #define FE_ISTAT1 (1<<25) /* Have ISTAT1, MBOX0, MBOX1 registers */
#define FE_CACHE_SET (FE_ERL|FE_CLSE|FE_WRIE|FE_ERMP)
***************
*** 822,826 ****
{PCI_DEVICE_ID_NCR_53C896, 0xff, "896", 6, 31, 7, \
FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
! FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC} \
, \
{PCI_DEVICE_ID_NCR_53C895A, 0xff, "895a", 6, 31, 7, \
--- 824,828 ----
{PCI_DEVICE_ID_NCR_53C896, 0xff, "896", 6, 31, 7, \
FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
! FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ISTAT1} \
, \
{PCI_DEVICE_ID_NCR_53C895A, 0xff, "895a", 6, 31, 7, \
***************
*** 837,845 ****
, \
{PCI_DEVICE_ID_LSI_53C1010, 0xff, "1010-33", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3} \
, \
{PCI_DEVICE_ID_LSI_53C1010_66, 0xff, "1010-66", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3| \
FE_66MHZ} \
--- 839,847 ----
, \
{PCI_DEVICE_ID_LSI_53C1010, 0xff, "1010-33", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_ISTAT1| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3} \
, \
{PCI_DEVICE_ID_LSI_53C1010_66, 0xff, "1010-66", 6, 62, 7, \
! FE_WIDE|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_ISTAT1| \
FE_RAM|FE_RAM8K|FE_64BIT|FE_DAC|FE_IO256|FE_NOPM|FE_LEDC|FE_ULTRA3| \
FE_66MHZ} \
***************
*** 1193,1199 ****
#define DIP 0x01 /* sta: host/script interrupt */
! /*15*/ u_char nc_istat1; /* 896 only */
! /*16*/ u_char nc_mbox0; /* 896 only */
! /*17*/ u_char nc_mbox1; /* 896 only */
/*18*/ u_char nc_ctest0;
--- 1195,1205 ----
#define DIP 0x01 /* sta: host/script interrupt */
! /*15*/ u_char nc_istat1; /* 896 and later cores only */
! #define FLSH 0x04 /* sta: chip is flushing */
! #define SRUN 0x02 /* sta: scripts are running */
! #define SIRQD 0x01 /* r/w: disable INT pin */
!
! /*16*/ u_char nc_mbox0; /* 896 and later cores only */
! /*17*/ u_char nc_mbox1; /* 896 and later cores only */
/*18*/ u_char nc_ctest0;
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/net
Modified Files:
Config.in Makefile au1000_eth.c declance.c gt96100eth.c
gt96100eth.h
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Config.in 2001/08/23 19:13:56 1.6
--- Config.in 2001/08/25 02:19:27 1.7
***************
*** 186,190 ****
dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
fi
! if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ORION" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
fi
--- 186,190 ----
dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
fi
! if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
fi
***************
*** 223,226 ****
--- 223,227 ----
dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
dep_mbool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I $CONFIG_ACENIC
+ dep_tristate 'D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
dep_tristate 'MyriCOM Gigabit Ethernet support' CONFIG_MYRI_SBUS $CONFIG_SBUS
dep_tristate 'Packet Engines Hamachi GNIC-II support' CONFIG_HAMACHI $CONFIG_PCI
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile 2001/08/23 19:13:56 1.4
--- Makefile 2001/08/25 02:19:28 1.5
***************
*** 31,35 ****
subdir-$(CONFIG_NET_PCMCIA) += pcmcia
! subdir-$(CONFIG_NET_RADIO) += wireless
subdir-$(CONFIG_TULIP) += tulip
subdir-$(CONFIG_IRDA) += irda
--- 31,35 ----
subdir-$(CONFIG_NET_PCMCIA) += pcmcia
! subdir-$(CONFIG_NET_WIRELESS) += wireless
subdir-$(CONFIG_TULIP) += tulip
subdir-$(CONFIG_IRDA) += irda
***************
*** 210,213 ****
--- 210,214 ----
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_NEC_CANDY) += nec_candy.o
+ obj-$(CONFIG_DL2K) += dl2k.o
ifeq ($(CONFIG_ARCH_ACORN),y)
Index: au1000_eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/au1000_eth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** au1000_eth.c 2001/06/26 04:26:42 1.2
--- au1000_eth.c 2001/08/25 02:19:28 1.3
***************
*** 79,82 ****
--- 79,83 ----
static inline void update_rx_stats(struct net_device *, u32);
static void au1000_timer(unsigned long);
+ static void cleanup_buffers(struct net_device *);
static int au1000_ioctl(struct net_device *, struct ifreq *, int);
static int mdio_read(struct net_device *, int, int);
***************
*** 485,488 ****
--- 486,509 ----
}
+ static void cleanup_buffers(struct net_device *dev)
+ {
+ int i;
+ struct au1000_private *aup = (struct au1000_private *) dev->priv;
+
+ for (i=0; i<NUM_RX_DMA; i++) {
+ if (aup->rx_db_inuse[i]) {
+ ReleaseDB(aup, aup->rx_db_inuse[i]);
+ aup->rx_db_inuse[i] = 0;
+ }
+ }
+
+ for (i=0; i<NUM_TX_DMA; i++) {
+ if (aup->tx_db_inuse[i]) {
+ ReleaseDB(aup, aup->tx_db_inuse[i]);
+ aup->tx_db_inuse[i] = 0;
+ }
+ }
+ }
+
/*
***************
*** 497,504 ****
for (i=0; i<NUM_RX_DMA; i++) {
! aup->rx_dma_ring[i] = (volatile rx_dma_t *) (rx_base + sizeof(rx_dma_t)*i);
}
for (i=0; i<NUM_TX_DMA; i++) {
! aup->tx_dma_ring[i] = (volatile tx_dma_t *) (tx_base + sizeof(tx_dma_t)*i);
}
}
--- 518,527 ----
for (i=0; i<NUM_RX_DMA; i++) {
! aup->rx_dma_ring[i] = (volatile rx_dma_t *) ioremap_nocache((unsigned long)
! (rx_base + sizeof(rx_dma_t)*i), sizeof(rx_dma_t));
}
for (i=0; i<NUM_TX_DMA; i++) {
! aup->tx_dma_ring[i] = (volatile tx_dma_t *)ioremap_nocache((unsigned long)
! (tx_base + sizeof(tx_dma_t)*i), sizeof(tx_dma_t));
}
}
***************
*** 586,598 ****
/* aup->mac is the base address of the MAC's registers */
! aup->mac = (volatile mac_reg_t *)((unsigned long)ioaddr);
/* Setup some variables for quick register address access */
if (ioaddr == AU1000_ETH0_BASE) {
! aup->enable = (volatile u32 *) ((unsigned long)MAC0_ENABLE);
memcpy(dev->dev_addr, au1000_mac_addr[0], sizeof(dev->dev_addr));
setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
}
else if (ioaddr == AU1000_ETH1_BASE) {
! aup->enable = (volatile u32 *) ((unsigned long)MAC1_ENABLE);
memcpy(dev->dev_addr, au1000_mac_addr[1], sizeof(dev->dev_addr));
setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
--- 609,623 ----
/* aup->mac is the base address of the MAC's registers */
! aup->mac = (volatile mac_reg_t *)ioremap_nocache((unsigned long)ioaddr, sizeof(*aup->mac));
/* Setup some variables for quick register address access */
if (ioaddr == AU1000_ETH0_BASE) {
! aup->enable = (volatile u32 *)
! ioremap_nocache((unsigned long)MAC0_ENABLE, sizeof(*aup->enable));
memcpy(dev->dev_addr, au1000_mac_addr[0], sizeof(dev->dev_addr));
setup_hw_rings(aup, MAC0_RX_DMA_ADDR, MAC0_TX_DMA_ADDR);
}
else if (ioaddr == AU1000_ETH1_BASE) {
! aup->enable = (volatile u32 *)
! ioremap_nocache((unsigned long)MAC1_ENABLE, sizeof(*aup->enable));
memcpy(dev->dev_addr, au1000_mac_addr[1], sizeof(dev->dev_addr));
setup_hw_rings(aup, MAC1_RX_DMA_ADDR, MAC1_TX_DMA_ADDR);
***************
*** 744,748 ****
struct net_device *dev = (struct net_device *)data;
struct au1000_private *aup = (struct au1000_private *) dev->priv;
! u16 link, speed;
if (!dev) {
--- 769,773 ----
struct net_device *dev = (struct net_device *)data;
struct au1000_private *aup = (struct au1000_private *) dev->priv;
! u16 mii_data, link, speed;
if (!dev) {
***************
*** 850,867 ****
if (status & TX_FRAME_ABORTED) {
! if (dev->if_port == IF_PORT_100BASEFX) {
! if (status & (TX_JAB_TIMEOUT | TX_UNDERRUN)) {
! /* any other tx errors are only valid
! * in half duplex mode */
! ps->tx_errors++;
! ps->tx_aborted_errors++;
! }
! }
! else {
! ps->tx_errors++;
! ps->tx_aborted_errors++;
! if (status & (TX_NO_CARRIER | TX_LOSS_CARRIER))
! ps->tx_carrier_errors++;
! }
}
}
--- 875,882 ----
if (status & TX_FRAME_ABORTED) {
! ps->tx_errors++;
! ps->tx_aborted_errors++;
! if (status & (TX_NO_CARRIER | TX_LOSS_CARRIER))
! ps->tx_carrier_errors++;
}
}
Index: declance.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/declance.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** declance.c 2001/08/10 03:04:58 1.3
--- declance.c 2001/08/25 02:19:28 1.4
***************
*** 84,88 ****
#ifndef CONFIG_TC
! unsigned long system_base = 0;
unsigned long dmaptr;
#endif
--- 84,88 ----
#ifndef CONFIG_TC
! unsigned long system_base;
unsigned long dmaptr;
#endif
Index: gt96100eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/gt96100eth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gt96100eth.c 2001/08/22 00:33:54 1.2
--- gt96100eth.c 2001/08/25 02:19:28 1.3
***************
*** 25,34 ****
*/
- #ifndef __OPTIMIZE__
- #error You must compile this file with the correct options!
- #error See the last lines of the source file.
- #error You must compile this driver with "-O".
- #endif
-
#ifndef __mips__
#error This driver only works with MIPS architectures!
[...2737 lines suppressed...]
}
! static struct net_device_stats *gt96100_get_stats(struct net_device *dev)
{
! struct gt96100_private *gp = (struct gt96100_private *) dev->priv;
! unsigned long flags;
! if (gt96100_debug > 2)
! printk("%s: gt96100_get_stats: dev=%p\n", dev->name, dev);
! if (netif_device_present(dev)) {
! spin_lock_irqsave(&gp->lock, flags);
! update_stats(gp);
! spin_unlock_irqrestore(&gp->lock, flags);
! }
! return &gp->stats;
}
+
+ module_init(gt96100_probe);
Index: gt96100eth.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/gt96100eth.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gt96100eth.h 2001/08/22 00:33:54 1.2
--- gt96100eth.h 2001/08/25 02:19:28 1.3
***************
*** 33,37 ****
#define TX_RING_SIZE 16
#define RX_RING_SIZE 32
! #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/
#define RX_HASH_TABLE_SIZE 16384
--- 33,37 ----
#define TX_RING_SIZE 16
#define RX_RING_SIZE 32
! #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer. */
#define RX_HASH_TABLE_SIZE 16384
***************
*** 40,44 ****
#define NUM_INTERFACES 2
! #define GT96100ETH_TX_TIMEOUT HZ/4
#define GT96100_ETH0_BASE (MIPS_GT96100_BASE + GT96100_ETH_PORT_CONFIG)
--- 40,44 ----
#define NUM_INTERFACES 2
! #define GT96100ETH_TX_TIMEOUT HZ
#define GT96100_ETH0_BASE (MIPS_GT96100_BASE + GT96100_ETH_PORT_CONFIG)
***************
*** 53,59 ****
#endif
- #define REV_GT96100 1
- #define REV_GT96100A 3
-
#define GT96100ETH_READ(gp, offset) \
GT96100_READ((gp->port_offset + offset))
--- 53,56 ----
***************
*** 73,130 ****
/* Bit definitions of the SMI Reg */
enum {
! smirDataMask = 0xffff,
! smirPhyAdMask = 0x1f<<16,
! smirPhyAdBit = 16,
! smirRegAdMask = 0x1f<<21,
! smirRegAdBit = 21,
! smirOpCode = 1<<26,
! smirReadValid = 1<<27,
! smirBusy = 1<<28
};
/* Bit definitions of the Port Config Reg */
enum pcr_bits {
! pcrPM = 1,
! pcrRBM = 2,
! pcrPBF = 4,
! pcrEN = 1<<7,
! pcrLPBKMask = 0x3<<8,
! pcrLPBKBit = 8,
! pcrFC = 1<<10,
! pcrHS = 1<<12,
! pcrHM = 1<<13,
! pcrHDM = 1<<14,
! pcrHD = 1<<15,
! pcrISLMask = 0x7<<28,
! pcrISLBit = 28,
! pcrACCS = 1<<31
};
/* Bit definitions of the Port Config Extend Reg */
enum pcxr_bits {
! pcxrIGMP = 1,
! pcxrSPAN = 2,
! pcxrPAR = 4,
! pcxrPRIOtxMask = 0x7<<3,
! pcxrPRIOtxBit = 3,
! pcxrPRIOrxMask = 0x3<<6,
! pcxrPRIOrxBit = 6,
! pcxrPRIOrxOverride = 1<<8,
! pcxrDPLXen = 1<<9,
! pcxrFCTLen = 1<<10,
! pcxrFLP = 1<<11,
! pcxrFCTL = 1<<12,
! pcxrMFLMask = 0x3<<14,
! pcxrMFLBit = 14,
! pcxrMIBclrMode = 1<<16,
! pcxrSpeed = 1<<18,
! pcxrSpeeden = 1<<19,
! pcxrRMIIen = 1<<20,
! pcxrDSCPen = 1<<21
};
/* Bit definitions of the Port Command Reg */
enum pcmr_bits {
! pcmrFJ = 1<<15
};
--- 70,127 ----
/* Bit definitions of the SMI Reg */
enum {
! smirDataMask = 0xffff,
! smirPhyAdMask = 0x1f << 16,
! smirPhyAdBit = 16,
! smirRegAdMask = 0x1f << 21,
! smirRegAdBit = 21,
! smirOpCode = 1 << 26,
! smirReadValid = 1 << 27,
! smirBusy = 1 << 28
};
/* Bit definitions of the Port Config Reg */
enum pcr_bits {
! pcrPM = 1,
! pcrRBM = 2,
! pcrPBF = 4,
! pcrEN = 1 << 7,
! pcrLPBKMask = 0x3 << 8,
! pcrLPBKBit = 8,
! pcrFC = 1 << 10,
! pcrHS = 1 << 12,
! pcrHM = 1 << 13,
! pcrHDM = 1 << 14,
! pcrHD = 1 << 15,
! pcrISLMask = 0x7 << 28,
! pcrISLBit = 28,
! pcrACCS = 1 << 31
};
/* Bit definitions of the Port Config Extend Reg */
enum pcxr_bits {
! pcxrIGMP = 1,
! pcxrSPAN = 2,
! pcxrPAR = 4,
! pcxrPRIOtxMask = 0x7 << 3,
! pcxrPRIOtxBit = 3,
! pcxrPRIOrxMask = 0x3 << 6,
! pcxrPRIOrxBit = 6,
! pcxrPRIOrxOverride = 1 << 8,
! pcxrDPLXen = 1 << 9,
! pcxrFCTLen = 1 << 10,
! pcxrFLP = 1 << 11,
! pcxrFCTL = 1 << 12,
! pcxrMFLMask = 0x3 << 14,
! pcxrMFLBit = 14,
! pcxrMIBclrMode = 1 << 16,
! pcxrSpeed = 1 << 18,
! pcxrSpeeden = 1 << 19,
! pcxrRMIIen = 1 << 20,
! pcxrDSCPen = 1 << 21
};
/* Bit definitions of the Port Command Reg */
enum pcmr_bits {
! pcmrFJ = 1 << 15
};
***************
*** 132,335 ****
/* Bit definitions of the Port Status Reg */
enum psr_bits {
! psrSpeed = 1,
! psrDuplex = 2,
! psrFctl = 4,
! psrLink = 8,
! psrPause = 1<<4,
! psrTxLow = 1<<5,
! psrTxHigh = 1<<6,
! psrTxInProg = 1<<7
};
/* Bit definitions of the SDMA Config Reg */
enum sdcr_bits {
! sdcrRCMask = 0xf<<2,
! sdcrRCBit = 2,
! sdcrBLMR = 1<<6,
! sdcrBLMT = 1<<7,
! sdcrPOVR = 1<<8,
! sdcrRIFB = 1<<9,
! sdcrBSZMask = 0x3<<12,
! sdcrBSZBit = 12
};
/* Bit definitions of the SDMA Command Reg */
enum sdcmr_bits {
! sdcmrERD = 1<<7,
! sdcmrAR = 1<<15,
! sdcmrSTDH = 1<<16,
! sdcmrSTDL = 1<<17,
! sdcmrTXDH = 1<<23,
! sdcmrTXDL = 1<<24,
! sdcmrAT = 1<<31
};
/* Bit definitions of the Interrupt Cause Reg */
enum icr_bits {
! icrRxBuffer = 1,
! icrTxBufferHigh = 1<<2,
! icrTxBufferLow = 1<<3,
! icrTxEndHigh = 1<<6,
! icrTxEndLow = 1<<7,
! icrRxError = 1<<8,
! icrTxErrorHigh = 1<<10,
! icrTxErrorLow = 1<<11,
! icrRxOVR = 1<<12,
! icrTxUdr = 1<<13,
! icrRxBufferQ0 = 1<<16,
! icrRxBufferQ1 = 1<<17,
! icrRxBufferQ2 = 1<<18,
! icrRxBufferQ3 = 1<<19,
! icrRxErrorQ0 = 1<<20,
! icrRxErrorQ1 = 1<<21,
! icrRxErrorQ2 = 1<<22,
! icrRxErrorQ3 = 1<<23,
! icrMIIPhySTC = 1<<28,
! icrSMIdone = 1<<29,
! icrEtherIntSum = 1<<31
};
/* The Rx and Tx descriptor lists. */
typedef struct {
! #ifdef DESC_BE
! u16 byte_cnt;
! u16 reserved;
! #else
! u16 reserved;
! u16 byte_cnt;
! #endif
! u32 cmdstat;
! u32 next;
! u32 buff_ptr;
! } gt96100_td_t __attribute__ ((packed));
typedef struct {
! #ifdef DESC_BE
! u16 buff_sz;
! u16 byte_cnt;
! #else
! u16 byte_cnt;
! u16 buff_sz;
! #endif
! u32 cmdstat;
! u32 next;
! u32 buff_ptr;
! } gt96100_rd_t __attribute__ ((packed));
/* Values for the Tx command-status descriptor entry. */
enum td_cmdstat {
! txOwn = 1<<31,
! txAutoMode = 1<<30,
! txEI = 1<<23,
! txGenCRC = 1<<22,
! txPad = 1<<18,
! txFirst = 1<<17,
! txLast = 1<<16,
! txErrorSummary = 1<<15,
! txReTxCntMask = 0x0f<<10,
! txReTxCntBit = 10,
! txCollision = 1<<9,
! txReTxLimit = 1<<8,
! txUnderrun = 1<<6,
! txLateCollision = 1<<5
};
/* Values for the Rx command-status descriptor entry. */
enum rd_cmdstat {
! rxOwn = 1<<31,
! rxAutoMode = 1<<30,
! rxEI = 1<<23,
! rxFirst = 1<<17,
! rxLast = 1<<16,
! rxErrorSummary = 1<<15,
! rxIGMP = 1<<14,
! rxHashExpired = 1<<13,
! rxMissedFrame = 1<<12,
! rxFrameType = 1<<11,
! rxShortFrame = 1<<8,
! rxMaxFrameLen = 1<<7,
! rxOverrun = 1<<6,
! rxCollision = 1<<4,
! rxCRCError = 1
};
/* Bit fields of a Hash Table Entry */
enum hash_table_entry {
! hteValid = 1,
! hteSkip = 2,
! hteRD = 4
};
// The MIB counters
typedef struct {
! u32 byteReceived;
! u32 byteSent;
! u32 framesReceived;
! u32 framesSent;
! u32 totalByteReceived;
! u32 totalFramesReceived;
! u32 broadcastFramesReceived;
! u32 multicastFramesReceived;
! u32 cRCError;
! u32 oversizeFrames;
! u32 fragments;
! u32 jabber;
! u32 collision;
! u32 lateCollision;
! u32 frames64;
! u32 frames65_127;
! u32 frames128_255;
! u32 frames256_511;
! u32 frames512_1023;
! u32 frames1024_MaxSize;
! u32 macRxError;
! u32 droppedFrames;
! u32 outMulticastFrames;
! u32 outBroadcastFrames;
! u32 undersizeFrames;
} mib_counters_t;
struct gt96100_private {
! gt96100_rd_t* rx_ring;
! gt96100_td_t* tx_ring;
! // The Rx and Tx rings must be 16-byte aligned
! dma_addr_t rx_ring_dma;
! dma_addr_t tx_ring_dma;
! char* hash_table;
! // The Hash Table must be 8-byte aligned
! dma_addr_t hash_table_dma;
! int hash_mode;
!
! // The Rx buffers must be 8-byte aligned
! char* rx_buff;
! dma_addr_t rx_buff_dma;
! // Tx buffers (tx_skbuff[i]->data) with less than 8 bytes
! // of payload must be 8-byte aligned
! struct sk_buff* tx_skbuff[TX_RING_SIZE];
! int rx_next_out; /* The next free ring entry to receive */
! int tx_next_in; /* The next free ring entry to send */
! int tx_next_out; /* The last ring entry the ISR processed */
! int tx_count; /* current # of pkts waiting to be sent in Tx ring */
! int intr_work_done; /* number of Rx and Tx pkts processed in the isr */
! int tx_full; /* Tx ring is full */
!
! mib_counters_t mib;
! struct net_device_stats stats;
! int io_size;
! int port_num; // 0 or 1
! int chip_rev;
! u32 port_offset;
!
! int phy_addr; // PHY address
! u32 last_psr; // last value of the port status register
! int options; /* User-settable misc. driver options. */
! int drv_flags;
! spinlock_t lock; /* Serialise access to device */
};
--- 129,324 ----
/* Bit definitions of the Port Status Reg */
enum psr_bits {
! psrSpeed = 1,
! psrDuplex = 2,
! psrFctl = 4,
! psrLink = 8,
! psrPause = 1 << 4,
! psrTxLow = 1 << 5,
! psrTxHigh = 1 << 6,
! psrTxInProg = 1 << 7
};
/* Bit definitions of the SDMA Config Reg */
enum sdcr_bits {
! sdcrRCMask = 0xf << 2,
! sdcrRCBit = 2,
! sdcrBLMR = 1 << 6,
! sdcrBLMT = 1 << 7,
! sdcrPOVR = 1 << 8,
! sdcrRIFB = 1 << 9,
! sdcrBSZMask = 0x3 << 12,
! sdcrBSZBit = 12
};
/* Bit definitions of the SDMA Command Reg */
enum sdcmr_bits {
! sdcmrERD = 1 << 7,
! sdcmrAR = 1 << 15,
! sdcmrSTDH = 1 << 16,
! sdcmrSTDL = 1 << 17,
! sdcmrTXDH = 1 << 23,
! sdcmrTXDL = 1 << 24,
! sdcmrAT = 1 << 31
};
/* Bit definitions of the Interrupt Cause Reg */
enum icr_bits {
! icrRxBuffer = 1,
! icrTxBufferHigh = 1 << 2,
! icrTxBufferLow = 1 << 3,
! icrTxEndHigh = 1 << 6,
! icrTxEndLow = 1 << 7,
! icrRxError = 1 << 8,
! icrTxErrorHigh = 1 << 10,
! icrTxErrorLow = 1 << 11,
! icrRxOVR = 1 << 12,
! icrTxUdr = 1 << 13,
! icrRxBufferQ0 = 1 << 16,
! icrRxBufferQ1 = 1 << 17,
! icrRxBufferQ2 = 1 << 18,
! icrRxBufferQ3 = 1 << 19,
! icrRxErrorQ0 = 1 << 20,
! icrRxErrorQ1 = 1 << 21,
! icrRxErrorQ2 = 1 << 22,
! icrRxErrorQ3 = 1 << 23,
! icrMIIPhySTC = 1 << 28,
! icrSMIdone = 1 << 29,
! icrEtherIntSum = 1 << 31
};
/* The Rx and Tx descriptor lists. */
+
typedef struct {
! u32 cmdstat;
! u32 byte_cnt;
! u32 buff_ptr;
! u32 next;
! } gt96100_td_t;
!
! #define tdByteCntBit 16
typedef struct {
! u32 cmdstat;
! u32 buff_cnt_sz;
! u32 buff_ptr;
! u32 next;
! } gt96100_rd_t;
!
! #define rdBuffSzBit 16
! #define rdByteCntMask 0xffff
/* Values for the Tx command-status descriptor entry. */
enum td_cmdstat {
! txOwn = 1 << 31,
! txAutoMode = 1 << 30,
! txEI = 1 << 23,
! txGenCRC = 1 << 22,
! txPad = 1 << 18,
! txFirst = 1 << 17,
! txLast = 1 << 16,
! txErrorSummary = 1 << 15,
! txReTxCntMask = 0x0f << 10,
! txReTxCntBit = 10,
! txCollision = 1 << 9,
! txReTxLimit = 1 << 8,
! txUnderrun = 1 << 6,
! txLateCollision = 1 << 5
};
+ #define TxReTxCntBit 10
/* Values for the Rx command-status descriptor entry. */
enum rd_cmdstat {
! rxOwn = 1 << 31,
! rxAutoMode = 1 << 30,
! rxEI = 1 << 23,
! rxFirst = 1 << 17,
! rxLast = 1 << 16,
! rxErrorSummary = 1 << 15,
! rxIGMP = 1 << 14,
! rxHashExpired = 1 << 13,
! rxMissedFrame = 1 << 12,
! rxFrameType = 1 << 11,
! rxShortFrame = 1 << 8,
! rxMaxFrameLen = 1 << 7,
! rxOverrun = 1 << 6,
! rxCollision = 1 << 4,
! rxCRCError = 1
};
/* Bit fields of a Hash Table Entry */
enum hash_table_entry {
! hteValid = 1,
! hteSkip = 2,
! hteRD = 4
};
// The MIB counters
typedef struct {
! u32 byteReceived;
! u32 byteSent;
! u32 framesReceived;
! u32 framesSent;
! u32 totalByteReceived;
! u32 totalFramesReceived;
! u32 broadcastFramesReceived;
! u32 multicastFramesReceived;
! u32 cRCError;
! u32 oversizeFrames;
! u32 fragments;
! u32 jabber;
! u32 collision;
! u32 lateCollision;
! u32 frames64;
! u32 frames65_127;
! u32 frames128_255;
! u32 frames256_511;
! u32 frames512_1023;
! u32 frames1024_MaxSize;
! u32 macRxError;
! u32 droppedFrames;
! u32 outMulticastFrames;
! u32 outBroadcastFrames;
! u32 undersizeFrames;
} mib_counters_t;
struct gt96100_private {
! gt96100_rd_t *rx_ring;
! gt96100_td_t *tx_ring;
! // The Rx and Tx rings must be 16-byte aligned
! dma_addr_t rx_ring_dma;
! dma_addr_t tx_ring_dma;
! char *hash_table;
! // The Hash Table must be 8-byte aligned
! dma_addr_t hash_table_dma;
! int hash_mode;
! // The Rx buffers must be 8-byte aligned
! char *rx_buff[RX_RING_SIZE];
! // Tx buffers (tx_skbuff[i]->data) with less than 8 bytes
! // of payload must be 8-byte aligned
! struct sk_buff *tx_skbuff[TX_RING_SIZE];
! int rx_next_out; /* The next free ring entry to receive */
! int tx_next_in; /* The next free ring entry to send */
! int tx_next_out; /* The last ring entry the ISR processed */
! int tx_count; /* current # of pkts waiting to be sent in Tx ring */
! mib_counters_t mib;
! struct net_device_stats stats;
!
! int io_size;
! int port_num; // 0 or 1
! u32 port_offset;
!
! int phy_addr; // PHY address
! u32 last_psr; // last value of the port status register
!
! int options; /* User-settable misc. driver options. */
! int drv_flags;
! unsigned char phys[2]; /* MII device addresses. */
! spinlock_t lock; /* Serialise access to device */
};
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/arch/mips64 In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips64 Modified Files: defconfig defconfig-ip22 defconfig-ip27 Log Message: Sync to 2.4.7 Index: defconfig =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** defconfig 2001/08/24 18:59:54 1.3 --- defconfig 2001/08/25 02:19:27 1.4 *************** *** 451,455 **** # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set - # CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set --- 451,454 ---- Index: defconfig-ip22 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig-ip22,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** defconfig-ip22 2001/08/24 18:59:54 1.3 --- defconfig-ip22 2001/08/25 02:19:27 1.4 *************** *** 455,459 **** # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set - # CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set --- 455,458 ---- Index: defconfig-ip27 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig-ip27,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** defconfig-ip27 2001/08/24 18:59:54 1.3 --- defconfig-ip27 2001/08/25 02:19:27 1.4 *************** *** 451,455 **** # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set - # CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set --- 451,454 ---- |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/arch/mips64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips64/kernel
Modified Files:
ptrace.c
Log Message:
Sync to 2.4.7
Index: ptrace.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/kernel/ptrace.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ptrace.c 2001/08/24 18:59:54 1.2
--- ptrace.c 2001/08/25 02:19:27 1.3
***************
*** 377,383 ****
case FPR_BASE ... FPR_BASE + 31:
if (child->used_math) {
- unsigned long long *fregs
- = (unsigned long long *)
- &child->thread.fpu.hard.fp_regs[0];
#ifndef CONFIG_SMP
if (last_task_used_math == child) {
--- 377,380 ----
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/char
Modified Files:
Config.in Makefile dz.c mem.c serial.c serial_tx3912.c
tty_io.c
Log Message:
Sync to 2.4.7
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Config.in 2001/08/10 18:21:24 1.4
--- Config.in 2001/08/25 02:19:27 1.5
***************
*** 43,48 ****
dep_tristate ' Multi-Tech multiport card support (EXPERIMENTAL)' CONFIG_ISI m
fi
! dep_tristate ' Microgate SyncLink card support' CONFIG_SYNCLINK m
! dep_tristate ' HDLC line discipline support' CONFIG_N_HDLC m
tristate ' SDL RISCom/8 card support' CONFIG_RISCOM8
tristate ' Specialix IO8+ card support' CONFIG_SPECIALIX
--- 43,48 ----
dep_tristate ' Multi-Tech multiport card support (EXPERIMENTAL)' CONFIG_ISI m
fi
! tristate ' Microgate SyncLink card support' CONFIG_SYNCLINK
! tristate ' HDLC line discipline support' CONFIG_N_HDLC
tristate ' SDL RISCom/8 card support' CONFIG_RISCOM8
tristate ' Specialix IO8+ card support' CONFIG_SPECIALIX
***************
*** 77,80 ****
--- 77,83 ----
bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1
fi
+ if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
+ tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
+ fi
if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then
bool 'DC21285 serial port support' CONFIG_SERIAL_21285
***************
*** 152,155 ****
--- 155,159 ----
tristate ' Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT
tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
+ tristate ' W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD
tristate ' Intel i810 TCO timer / Watchdog' CONFIG_I810_TCO
***************
*** 186,189 ****
--- 190,196 ----
tristate 'Siemens R3964 line discipline' CONFIG_R3964
tristate 'Applicom intelligent fieldbus card support' CONFIG_APPLICOM
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
+ fi
mainmenu_option next_comment
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile 2001/08/18 22:37:12 1.6
--- Makefile 2001/08/25 02:19:27 1.7
***************
*** 24,28 ****
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
! tty_io.o
mod-subdirs := joystick ftape drm pcmcia
--- 24,28 ----
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
! sonypi.o tty_io.o tty_ioctl.o
mod-subdirs := joystick ftape drm pcmcia
***************
*** 55,58 ****
--- 55,72 ----
endif
+ ifeq ($(ARCH),s390)
+ KEYMAP =
+ KEYBD =
+ CONSOLE =
+ SERIAL =
+ endif
+
+ ifeq ($(ARCH),s390x)
+ KEYMAP =
+ KEYBD =
+ CONSOLE =
+ SERIAL =
+ endif
+
ifeq ($(ARCH),m68k)
ifdef CONFIG_AMIGA
***************
*** 160,163 ****
--- 174,178 ----
obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
+ obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o
***************
*** 184,187 ****
--- 199,203 ----
obj-$(CONFIG_R3964) += n_r3964.o
obj-$(CONFIG_APPLICOM) += applicom.o
+ obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_MS_BUSMOUSE) += msbusmouse.o
obj-$(CONFIG_82C710_MOUSE) += qpmouse.o
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/dz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dz.c 2001/08/10 16:02:10 1.2
--- dz.c 2001/08/25 02:19:27 1.3
***************
*** 15,18 ****
--- 15,20 ----
* [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
+ Qua Jun 27 15:02:26 BRT 2001
+ * [27-JUN-2001] Arnaldo Carvalho de Melo <ac...@co...> - cleanups
*
* Parts (C) 1999 David Airlie, ai...@li...
***************
*** 882,886 ****
tmp.closing_wait = info->closing_wait;
! return copy_to_user (retinfo, &tmp, sizeof(*retinfo));
}
--- 884,888 ----
tmp.closing_wait = info->closing_wait;
! return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
}
***************
*** 1003,1009 ****
case TIOCSSOFTCAR:
! error = get_user (arg, (unsigned long *)arg);
! if (error)
! return error;
tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0);
--- 1005,1011 ----
case TIOCSSOFTCAR:
! if (get_user (arg, (unsigned long *)arg))
! return -EFAULT;
!
tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) |
(arg ? CLOCAL : 0);
***************
*** 1021,1039 ****
case TIOCSERGETLSR: /* Get line status register */
! error = verify_area(VERIFY_WRITE, (void *)arg,
! sizeof(unsigned int));
! if (error)
! return error;
! else
! return get_lsr_info (info, (unsigned int *)arg);
case TIOCSERGSTRUCT:
! error = verify_area(VERIFY_WRITE, (void *)arg,
! sizeof(struct dz_serial));
! if (error)
! return error;
! copy_to_user((struct dz_serial *)arg, info,
! sizeof(struct dz_serial));
! return 0;
default:
--- 1023,1031 ----
case TIOCSERGETLSR: /* Get line status register */
! return get_lsr_info (info, (unsigned int *)arg);
case TIOCSERGSTRUCT:
! return copy_to_user((struct dz_serial *)arg, info,
! sizeof(struct dz_serial)) ? -EFAULT : 0;
default:
***************
*** 1506,1510 ****
*
* dz_console_print is registered for printk.
! * The console_lock must be held when we get here.
* -------------------------------------------------------------------
*/
--- 1498,1502 ----
*
* dz_console_print is registered for printk.
! * The console must be locked when we get here.
* -------------------------------------------------------------------
*/
Index: mem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/mem.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mem.c 2001/06/22 02:29:32 1.1.1.1
--- mem.c 2001/08/25 02:19:27 1.2
***************
*** 629,635 ****
#endif
tty_init();
- #ifdef CONFIG_PRINTER
- lp_init();
- #endif
#ifdef CONFIG_M68K_PRINTER
lp_m68k_init();
--- 629,632 ----
Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** serial.c 2001/07/09 21:50:55 1.2
--- serial.c 2001/08/25 02:19:27 1.3
***************
*** 65,70 ****
*/
! static char *serial_version = "5.05a";
! static char *serial_revdate = "2001-03-20";
/*
--- 65,70 ----
*/
! static char *serial_version = "5.05c";
[...1397 lines suppressed...]
#ifdef SERIAL_DEBUG_PCI
***************
*** 5179,5187 ****
if (pnp_board->vendor) {
- board.vendor = pnp_board->vendor;
- board.device = pnp_board->device;
/* Special case that's more efficient to hardcode */
! if ((board.vendor == ISAPNP_VENDOR('A', 'K', 'Y') &&
! board.device == ISAPNP_DEVICE(0x1021)))
board.flags |= SPCI_FL_NO_SHIRQ;
} else {
--- 5307,5313 ----
if (pnp_board->vendor) {
/* Special case that's more efficient to hardcode */
! if ((pnp_board->vendor == ISAPNP_VENDOR('A', 'K', 'Y') &&
! pnp_board->device == ISAPNP_DEVICE(0x1021)))
board.flags |= SPCI_FL_NO_SHIRQ;
} else {
Index: serial_tx3912.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial_tx3912.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** serial_tx3912.c 2001/06/22 02:29:32 1.1.1.1
--- serial_tx3912.c 2001/08/25 02:19:27 1.2
***************
*** 74,87 ****
/*
- * FIXME: Redefines for IO macros in 'include/asm/io.h'
- */
- //#define inb(addr) readb(addr)
- //#define inw(addr) readw(addr)
- //#define inl(addr) readl(addr)
- //#define outb(b, addr) writeb(b, addr)
- //#define outw(b, addr) writew(b, addr)
- //#define outl(b, addr) writel(b, addr)
-
- /*
* ----------------------------------------------------------------------
*
--- 74,77 ----
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/tty_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tty_io.c 2001/08/22 18:18:14 1.4
--- tty_io.c 2001/08/25 02:19:27 1.5
***************
*** 214,220 ****
{
#ifdef TTY_PARANOIA_CHECK
! static const char *badmagic =
"Warning: bad magic number for tty struct (%s) in %s\n";
! static const char *badtty =
"Warning: null TTY for (%s) in %s\n";
--- 214,220 ----
{
#ifdef TTY_PARANOIA_CHECK
! static const char badmagic[] = KERN_WARNING
"Warning: bad magic number for tty struct (%s) in %s\n";
! static const char badtty[] = KERN_WARNING
"Warning: null TTY for (%s) in %s\n";
***************
*** 248,252 ****
count++;
if (tty->count != count) {
! printk("Warning: dev (%s) tty->count(%d) != #fd's(%d) in %s\n",
kdevname(tty->device), tty->count, count, routine);
return count;
--- 248,253 ----
count++;
if (tty->count != count) {
! printk(KERN_WARNING "Warning: dev (%s) tty->count(%d) "
! "!= #fd's(%d) in %s\n",
kdevname(tty->device), tty->count, count, routine);
return count;
***************
*** 359,363 ****
return 0;
if (tty->pgrp <= 0) {
! printk("tty_check_change: tty->pgrp <= 0!\n");
return 0;
}
--- 360,364 ----
return 0;
if (tty->pgrp <= 0) {
! printk(KERN_WARNING "tty_check_change: tty->pgrp <= 0!\n");
return 0;
}
***************
*** 497,502 ****
int i = (tty->ldisc.open)(tty);
if (i < 0)
! printk("do_tty_hangup: N_TTY open: error %d\n",
! -i);
}
}
--- 498,503 ----
int i = (tty->ldisc.open)(tty);
if (i < 0)
! printk(KERN_ERR "do_tty_hangup: N_TTY open: "
! "error %d\n", -i);
}
}
***************
*** 540,544 ****
char buf[64];
! printk("%s hangup...\n", tty_name(tty, buf));
#endif
schedule_task(&tty->tq_hangup);
--- 541,545 ----
char buf[64];
! printk(KERN_DEBUG "%s hangup...\n", tty_name(tty, buf));
#endif
schedule_task(&tty->tq_hangup);
***************
*** 550,554 ****
char buf[64];
! printk("%s vhangup...\n", tty_name(tty, buf));
#endif
do_tty_hangup((void *) tty);
--- 551,555 ----
char buf[64];
! printk(KERN_DEBUG "%s vhangup...\n", tty_name(tty, buf));
#endif
do_tty_hangup((void *) tty);
***************
*** 1002,1006 ****
/* call the tty release_mem routine to clean out this slot */
release_mem_out:
! printk("init_dev: ldisc open failed, clearing slot %d\n", idx);
release_mem(tty, idx);
goto end_init;
--- 1003,1008 ----
/* call the tty release_mem routine to clean out this slot */
release_mem_out:
! printk(KERN_INFO "init_dev: ldisc open failed, "
! "clearing slot %d\n", idx);
release_mem(tty, idx);
goto end_init;
***************
*** 1025,1028 ****
--- 1027,1031 ----
o_tty->magic = 0;
(*o_tty->driver.refcount)--;
+ list_del(&o_tty->tty_files);
free_tty_struct(o_tty);
}
***************
*** 1036,1039 ****
--- 1039,1043 ----
tty->magic = 0;
(*tty->driver.refcount)--;
+ list_del(&tty->tty_files);
free_tty_struct(tty);
}
***************
*** 1069,1083 ****
#ifdef TTY_PARANOIA_CHECK
if (idx < 0 || idx >= tty->driver.num) {
! printk("release_dev: bad idx when trying to free (%s)\n",
! kdevname(tty->device));
return;
}
if (tty != tty->driver.table[idx]) {
! printk("release_dev: driver.table[%d] not tty for (%s)\n",
! idx, kdevname(tty->device));
return;
}
if (tty->termios != tty->driver.termios[idx]) {
! printk("release_dev: driver.termios[%d] not termios "
"for (%s)\n",
idx, kdevname(tty->device));
--- 1073,1087 ----
#ifdef TTY_PARANOIA_CHECK
if (idx < 0 || idx >= tty->driver.num) {
! printk(KERN_DEBUG "release_dev: bad idx when trying to "
! "free (%s)\n", kdevname(tty->device));
return;
}
if (tty != tty->driver.table[idx]) {
! printk(KERN_DEBUG "release_dev: driver.table[%d] not tty "
! "for (%s)\n", idx, kdevname(tty->device));
return;
}
if (tty->termios != tty->driver.termios[idx]) {
! printk(KERN_DEBUG "release_dev: driver.termios[%d] not termios "
"for (%s)\n",
idx, kdevname(tty->device));
***************
*** 1085,1089 ****
}
if (tty->termios_locked != tty->driver.termios_locked[idx]) {
! printk("release_dev: driver.termios_locked[%d] not "
"termios_locked for (%s)\n",
idx, kdevname(tty->device));
--- 1089,1093 ----
}
if (tty->termios_locked != tty->driver.termios_locked[idx]) {
! printk(KERN_DEBUG "release_dev: driver.termios_locked[%d] not "
"termios_locked for (%s)\n",
idx, kdevname(tty->device));
***************
*** 1093,1098 ****
#ifdef TTY_DEBUG_HANGUP
! printk("release_dev of %s (tty count=%d)...", tty_name(tty, buf),
! tty->count);
#endif
--- 1097,1102 ----
#ifdef TTY_DEBUG_HANGUP
! printk(KERN_DEBUG "release_dev of %s (tty count=%d)...",
! tty_name(tty, buf), tty->count);
#endif
***************
*** 1100,1111 ****
if (tty->driver.other) {
if (o_tty != tty->driver.other->table[idx]) {
! printk("release_dev: other->table[%d] not o_tty for ("
! "%s)\n",
idx, kdevname(tty->device));
return;
}
if (o_tty->termios != tty->driver.other->termios[idx]) {
! printk("release_dev: other->termios[%d] not o_termios "
! "for (%s)\n",
idx, kdevname(tty->device));
return;
--- 1104,1115 ----
if (tty->driver.other) {
if (o_tty != tty->driver.other->table[idx]) {
! printk(KERN_DEBUG "release_dev: other->table[%d] "
! "not o_tty for (%s)\n",
idx, kdevname(tty->device));
return;
}
if (o_tty->termios != tty->driver.other->termios[idx]) {
! printk(KERN_DEBUG "release_dev: other->termios[%d] "
! "not o_termios for (%s)\n",
idx, kdevname(tty->device));
return;
***************
*** 1113,1123 ****
if (o_tty->termios_locked !=
tty->driver.other->termios_locked[idx]) {
! printk("release_dev: other->termios_locked[%d] not "
! "o_termios_locked for (%s)\n",
idx, kdevname(tty->device));
return;
}
if (o_tty->link != tty) {
! printk("release_dev: bad pty pointers\n");
return;
}
--- 1117,1127 ----
if (o_tty->termios_locked !=
tty->driver.other->termios_locked[idx]) {
! printk(KERN_DEBUG "release_dev: other->termios_locked["
! "%d] not o_termios_locked for (%s)\n",
idx, kdevname(tty->device));
return;
}
if (o_tty->link != tty) {
! printk(KERN_DEBUG "release_dev: bad pty pointers\n");
return;
}
***************
*** 1174,1179 ****
break;
! printk("release_dev: %s: read/write wait queue active!\n",
! tty_name(tty, buf));
schedule();
}
--- 1178,1183 ----
break;
! printk(KERN_WARNING "release_dev: %s: read/write wait queue "
! "active!\n", tty_name(tty, buf));
schedule();
}
***************
*** 1186,1190 ****
if (pty_master) {
if (--o_tty->count < 0) {
! printk("release_dev: bad pty slave count (%d) for %s\n",
o_tty->count, tty_name(o_tty, buf));
o_tty->count = 0;
--- 1190,1195 ----
if (pty_master) {
if (--o_tty->count < 0) {
! printk(KERN_WARNING "release_dev: bad pty slave count "
! "(%d) for %s\n",
o_tty->count, tty_name(o_tty, buf));
o_tty->count = 0;
***************
*** 1192,1196 ****
}
if (--tty->count < 0) {
! printk("release_dev: bad tty->count (%d) for %s\n",
tty->count, tty_name(tty, buf));
tty->count = 0;
--- 1197,1201 ----
}
if (--tty->count < 0) {
! printk(KERN_WARNING "release_dev: bad tty->count (%d) for %s\n",
tty->count, tty_name(tty, buf));
tty->count = 0;
***************
*** 1201,1205 ****
* filp->private_data, to break the link between the tty and
* the file descriptor. Otherwise if filp_close() blocks before
! * the the file descriptor is removed from the inuse_filp
* list, check_tty_count() could observe a discrepancy and
* printk a warning message to the user.
--- 1206,1210 ----
* filp->private_data, to break the link between the tty and
* the file descriptor. Otherwise if filp_close() blocks before
! * the file descriptor is removed from the inuse_filp
* list, check_tty_count() could observe a discrepancy and
* printk a warning message to the user.
***************
*** 1243,1247 ****
#ifdef TTY_DEBUG_HANGUP
! printk("freeing tty structure...");
#endif
--- 1248,1252 ----
#ifdef TTY_DEBUG_HANGUP
! printk(KERN_DEBUG "freeing tty structure...");
#endif
***************
*** 1371,1375 ****
noctty = 1;
#ifdef TTY_DEBUG_HANGUP
! printk("opening %s...", tty_name(tty, buf));
#endif
if (tty->driver.open)
--- 1376,1380 ----
noctty = 1;
#ifdef TTY_DEBUG_HANGUP
! printk(KERN_DEBUG "opening %s...", tty_name(tty, buf));
#endif
if (tty->driver.open)
***************
*** 1384,1388 ****
if (retval) {
#ifdef TTY_DEBUG_HANGUP
! printk("error %d in opening %s...", retval,
tty_name(tty, buf));
#endif
--- 1389,1393 ----
if (retval) {
#ifdef TTY_DEBUG_HANGUP
! printk(KERN_DEBUG "error %d in opening %s...", retval,
tty_name(tty, buf));
#endif
***************
*** 1608,1612 ****
(real_tty->session != current->session))
return -ENOTTY;
! get_user(pgrp, (pid_t *) arg);
if (pgrp < 0)
return -EINVAL;
--- 1613,1618 ----
(real_tty->session != current->session))
return -ENOTTY;
! if (get_user(pgrp, (pid_t *) arg))
! return -EFAULT;
if (pgrp < 0)
return -EINVAL;
***************
*** 1639,1647 ****
static int tiocsetd(struct tty_struct *tty, int *arg)
{
! int retval, ldisc;
! retval = get_user(ldisc, arg);
! if (retval)
! return retval;
return tty_set_ldisc(tty, ldisc);
}
--- 1645,1652 ----
static int tiocsetd(struct tty_struct *tty, int *arg)
{
! int ldisc;
! if (get_user(ldisc, arg))
! return -EFAULT;
return tty_set_ldisc(tty, ldisc);
}
***************
*** 1956,1960 ****
if (i==15 && tty->alt_speed) {
if (!tty->warned) {
! printk("Use of setserial/setrocket to set SPD_* flags is deprecated\n");
tty->warned = 1;
}
--- 1961,1966 ----
if (i==15 && tty->alt_speed) {
if (!tty->warned) {
! printk(KERN_WARNING "Use of setserial/setrocket to "
! "set SPD_* flags is deprecated\n");
tty->warned = 1;
}
***************
*** 2375,2378 ****
--- 2381,2387 ----
#ifdef CONFIG_HWC
hwc_tty_init();
+ #endif
+ #ifdef CONFIG_A2232
+ a2232board_init();
#endif
}
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/pci In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/pci Modified Files: Makefile Log Message: Sync to 2.4.7 Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/pci/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 2001/08/10 03:04:58 1.3 --- Makefile 2001/08/25 02:19:28 1.4 *************** *** 14,19 **** export-objs := pci.o ! obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o setup-res.o obj-$(CONFIG_PROC_FS) += proc.o # --- 14,23 ---- export-objs := pci.o ! obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o obj-$(CONFIG_PROC_FS) += proc.o + + ifndef CONFIG_SPARC64 + obj-$(CONFIG_PCI) += setup-res.o + endif # |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/arch/mips/sgi/kernel In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/sgi/kernel Modified Files: indy_int.c setup.c Log Message: Sync to 2.4.7 Index: indy_int.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/sgi/kernel/indy_int.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** indy_int.c 2001/06/22 02:29:31 1.1.1.1 --- indy_int.c 2001/08/25 02:19:27 1.2 *************** *** 70,75 **** extern asmlinkage void indyIRQ(void); - unsigned long spurious_count = 0; - /* Local IRQ's are layed out logically like this: * --- 70,73 ---- Index: setup.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/sgi/kernel/setup.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** setup.c 2001/06/22 02:29:31 1.1.1.1 --- setup.c 2001/08/25 02:19:27 1.2 *************** *** 25,28 **** --- 25,29 ---- #include <asm/sgi/sgihpc.h> #include <asm/sgi/sgint23.h> + #include <asm/time.h> #include <asm/gdb-stub.h> *************** *** 117,122 **** sgi_read_status }; - - void (*board_time_init)(struct irqaction *irq); static unsigned long dosample(volatile unsigned char *tcwp, --- 118,121 ---- |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:32
|
Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv13548/drivers/net/tulip
Modified Files:
interrupt.c media.c tulip.h tulip_core.c
Log Message:
Sync to 2.4.7
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/interrupt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interrupt.c 2001/07/11 20:55:18 1.2
--- interrupt.c 2001/08/25 02:19:28 1.3
***************
*** 75,79 ****
dma_addr_t mapping;
! skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ + PKT_BUF_FUDGE);
if (skb == NULL)
break;
--- 75,79 ----
dma_addr_t mapping;
! skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
if (skb == NULL)
break;
Index: media.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/media.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** media.c 2001/07/11 20:55:18 1.2
--- media.c 2001/08/25 02:19:28 1.3
***************
*** 233,237 ****
} else {
csr13val = 1;
! csr14val = 0x0003FFFF;
csr15dir = (setup[0]<<16) | 0x0008;
csr15val = (setup[1]<<16) | 0x0008;
--- 233,237 ----
} else {
csr13val = 1;
! csr14val = 0;
csr15dir = (setup[0]<<16) | 0x0008;
csr15val = (setup[1]<<16) | 0x0008;
***************
*** 401,405 ****
tp->csr6 = new_csr6 | (tp->csr6 & 0xfdff) | (tp->full_duplex ? 0x0200 : 0);
- udelay(1000);
return;
}
--- 401,404 ----
Index: tulip.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tulip.h 2001/08/10 21:32:26 1.5
--- tulip.h 2001/08/25 02:19:28 1.6
***************
*** 28,33 ****
/* undefine, or define to various debugging levels (>4 == obscene levels) */
! #define TULIP_DEBUG 1
/* undefine USE_IO_OPS for MMIO, define for PIO */
--- 28,34 ----
+
/* undefine, or define to various debugging levels (>4 == obscene levels) */
! #define TULIP_DEBUG 1
/* undefine USE_IO_OPS for MMIO, define for PIO */
Index: tulip_core.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tulip_core.c 2001/07/11 20:55:18 1.3
--- tulip_core.c 2001/08/25 02:19:28 1.4
***************
*** 687,691 ****
dev_alloc_skb() provides 16 byte alignment. But do *not*
use skb_reserve() to align the IP header! */
! struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ + PKT_BUF_FUDGE);
tp->rx_buffers[i].skb = skb;
if (skb == NULL)
--- 687,691 ----
dev_alloc_skb() provides 16 byte alignment. But do *not*
use skb_reserve() to align the IP header! */
! struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
tp->rx_buffers[i].skb = skb;
if (skb == NULL)
***************
*** 795,799 ****
}
! static void tulip_release_unconsumed_tx_buffers(struct tulip_private *tp)
{
unsigned int dirty_tx;
--- 795,799 ----
}
! static void tulip_clean_tx_ring(struct tulip_private *tp)
{
unsigned int dirty_tx;
***************
*** 804,811 ****
int status = le32_to_cpu(tp->tx_ring[entry].status);
! if (status > 0)
! break; /* It has been Txed */
! /* Check for Rx filter setup frames. */
if (tp->tx_buffers[entry].skb == NULL) {
/* test because dummy frames not mapped */
--- 804,813 ----
int status = le32_to_cpu(tp->tx_ring[entry].status);
! if (status < 0) {
! tp->stats.tx_errors++; /* It wasn't Txed */
! tp->tx_ring[entry].status = 0;
! }
! /* Check for Tx filter setup frames. */
if (tp->tx_buffers[entry].skb == NULL) {
/* test because dummy frames not mapped */
***************
*** 817,821 ****
continue;
}
- tp->stats.tx_errors++;
pci_unmap_single(tp->pdev, tp->tx_buffers[entry].mapping,
--- 819,822 ----
***************
*** 850,854 ****
/* release any unconsumed transmit buffers */
! tulip_release_unconsumed_tx_buffers(tp);
/* 21040 -- Leave the card in 10baseT state. */
--- 851,855 ----
/* release any unconsumed transmit buffers */
! tulip_clean_tx_ring(tp);
/* 21040 -- Leave the card in 10baseT state. */
***************
*** 1481,1487 ****
csr0 &= ~0xfff10000; /* zero reserved bits 31:20, 16 */
- if (chip_idx == DC21143 && chip_rev == 65)
- csr0 &= ~0x01000000;
-
/*
* And back to business
--- 1482,1485 ----
***************
*** 1499,1503 ****
irq = pdev->irq;
! /* init_etherdev ensures aligned and zeroed private structures */
dev = alloc_etherdev (sizeof (*tp));
if (!dev) {
--- 1497,1501 ----
irq = pdev->irq;
! /* alloc_etherdev ensures aligned and zeroed private structures */
dev = alloc_etherdev (sizeof (*tp));
if (!dev) {
***************
*** 1539,1543 ****
/*
* initialize private data structure 'tp'
! * it is zeroed and aligned in init_etherdev
*/
tp = dev->priv;
--- 1537,1541 ----
/*
* initialize private data structure 'tp'
! * it is zeroed and aligned in alloc_etherdev
*/
tp = dev->priv;
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:31
|
Update of /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/ite-boards/generic
Modified Files:
irq.c it8172_setup.c pmon_prom.c reset.c time.c
Log Message:
Sync to 2.4.7
Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/irq.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** irq.c 2001/06/22 02:29:31 1.1.1.1
--- irq.c 2001/08/25 02:19:27 1.2
***************
*** 76,80 ****
extern void mips_timer_interrupt(int irq, struct pt_regs *regs);
extern asmlinkage void it8172_IRQ(void);
- irq_cpustat_t irq_stat [NR_CPUS];
unsigned int local_bh_count[NR_CPUS];
unsigned int local_irq_count[NR_CPUS];
--- 76,79 ----
***************
*** 108,121 ****
void disable_irq(unsigned int irq_nr)
- {
- unsigned long flags;
-
- save_and_cli(flags);
- disable_it8172_irq(irq_nr);
- restore_flags(flags);
- }
-
- /* FIXME */
- void disable_irq_nosync(unsigned int irq_nr)
{
unsigned long flags;
--- 107,110 ----
Index: it8172_setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/it8172_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** it8172_setup.c 2001/07/07 19:41:39 1.3
--- it8172_setup.c 2001/08/25 02:19:27 1.4
***************
*** 67,71 ****
extern void InitLPCInterface(void);
extern char * __init prom_getcmdline(void);
! extern void it8172_restart(void);
extern void it8172_halt(void);
extern void it8172_power_off(void);
--- 67,71 ----
extern void InitLPCInterface(void);
extern char * __init prom_getcmdline(void);
! extern void it8172_restart(char *command);
extern void it8172_halt(void);
extern void it8172_power_off(void);
***************
*** 126,129 ****
--- 126,130 ----
#endif
+ clear_cp0_status(ST0_FR);
rtc_ops = &it8172_rtc_ops;
Index: pmon_prom.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/pmon_prom.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pmon_prom.c 2001/06/22 02:29:31 1.1.1.1
--- pmon_prom.c 2001/08/25 02:19:27 1.2
***************
*** 46,51 ****
char arcs_cmdline[COMMAND_LINE_SIZE];
! int prom_argc;
! char **prom_argv, **prom_envp;
typedef struct
--- 46,51 ----
char arcs_cmdline[COMMAND_LINE_SIZE];
! extern int prom_argc;
! extern char **prom_argv, **prom_envp;
typedef struct
Index: reset.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/reset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** reset.c 2001/07/07 19:41:39 1.2
--- reset.c 2001/08/25 02:19:27 1.3
***************
*** 40,44 ****
{
set_cp0_status(ST0_BEV | ST0_ERL);
! set_cp0_config(CONF_CM_UNCACHED);
flush_cache_all();
write_32bit_cp0_register(CP0_WIRED, 0);
--- 40,44 ----
{
set_cp0_status(ST0_BEV | ST0_ERL);
! change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
flush_cache_all();
write_32bit_cp0_register(CP0_WIRED, 0);
Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/time.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** time.c 2001/07/06 01:56:11 1.2
--- time.c 2001/08/25 02:19:27 1.3
***************
*** 47,53 ****
static unsigned int timer_tick_count=0;
- /* Cycle counter value at the previous timer interrupt.. */
- static unsigned int timerhi = 0, timerlo = 0;
-
static inline void ack_r4ktimer(unsigned long newval)
{
--- 47,50 ----
***************
*** 123,136 ****
void mips_timer_interrupt(struct pt_regs *regs)
{
- unsigned long count;
-
if (r4k_offset == 0)
goto null;
do {
- count = read_32bit_cp0_register(CP0_COUNT);
- timerhi += (count < timerlo); /* Wrap around */
- timerlo = count;
-
kstat.irqs[0][MIPS_CPU_TIMER_IRQ]++;
do_timer(regs);
--- 120,127 ----
***************
*** 266,269 ****
--- 257,263 ----
#define USECS_PER_JIFFY (1000000/HZ)
+ /* Cycle counter value at the previous timer interrupt.. */
+
+ static unsigned int timerhi = 0, timerlo = 0;
/*
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:31
|
Update of /cvsroot/linux-mips/linux/arch/mips In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips Modified Files: Makefile defconfig Log Message: Sync to 2.4.7 Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 2001/08/23 19:13:56 1.13 --- Makefile 2001/08/25 02:19:27 1.14 *************** *** 58,62 **** endif ifdef CONFIG_CPU_VR41XX ! GCCFLAGS += -mcpu=r4600 -mips2 -Wa,-m4100,--trap endif ifdef CONFIG_CPU_R4X00 --- 58,62 ---- endif ifdef CONFIG_CPU_VR41XX ! GCCFLAGS += -mcpu=r4600 -mips2 -Wa,--trap endif ifdef CONFIG_CPU_R4X00 *************** *** 76,79 **** --- 76,80 ---- endif ifdef CONFIG_CPU_NEVADA + # Cannot use -mmad with currently recommended tools GCCFLAGS += -mcpu=r5000 -mips2 -Wa,--trap endif Index: defconfig =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/defconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** defconfig 2001/08/22 16:23:37 1.5 --- defconfig 2001/08/25 02:19:27 1.6 *************** *** 288,291 **** --- 288,292 ---- # CONFIG_ACENIC is not set # CONFIG_ACENIC_OMIT_TIGON_I is not set + # CONFIG_DL2K is not set # CONFIG_MYRI_SBUS is not set # CONFIG_HAMACHI is not set *************** *** 378,381 **** --- 379,383 ---- # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set + # CONFIG_SONYPI is not set # |
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:31
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/kernel
Modified Files:
pci_auto.c proc.c ptrace.c setup.c time.c unaligned.c
Log Message:
Sync to 2.4.7
Index: pci_auto.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci_auto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pci_auto.c 2001/07/07 19:37:24 1.1
--- pci_auto.c 2001/08/25 02:19:27 1.2
***************
*** 1,5 ****
/*
- * arch/mips/kernel/pci_auto.c
- *
* PCI autoconfiguration library
*
--- 1,3 ----
***************
*** 38,43 ****
#endif
! /* These are used for config access before all the PCI probing
! has been done. */
int early_read_config_byte(struct pci_channel *hose, int bus, int dev_fn, int where, u8 *val);
int early_read_config_word(struct pci_channel *hose, int bus, int dev_fn, int where, u16 *val);
--- 36,40 ----
#endif
! /* These are used for config access before all the PCI probing has been done. */
int early_read_config_byte(struct pci_channel *hose, int bus, int dev_fn, int where, u8 *val);
int early_read_config_word(struct pci_channel *hose, int bus, int dev_fn, int where, u16 *val);
***************
*** 67,72 ****
current_bus, PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn) );
! for (bar = PCI_BASE_ADDRESS_0; bar <= PCI_BASE_ADDRESS_5; bar+=4)
! {
/* Tickle the BAR and get the response */
early_write_config_dword(hose,
--- 64,68 ----
current_bus, PCI_SLOT(pci_devfn), PCI_FUNC(pci_devfn) );
! for (bar = PCI_BASE_ADDRESS_0; bar <= PCI_BASE_ADDRESS_5; bar+=4) {
/* Tickle the BAR and get the response */
early_write_config_dword(hose,
***************
*** 86,100 ****
/* Check the BAR type and set our address mask */
! if (bar_response & PCI_BASE_ADDRESS_SPACE)
! {
addr_mask = PCI_BASE_ADDRESS_IO_MASK;
upper_limit = &pciauto_upper_iospc;
lower_limit = &pciauto_lower_iospc;
DBG("PCI Autoconfig: BAR %d, I/O, ", bar_nr);
! }
! else
! {
! if ( (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
! PCI_BASE_ADDRESS_MEM_TYPE_64)
found_mem64 = 1;
--- 82,93 ----
/* Check the BAR type and set our address mask */
! if (bar_response & PCI_BASE_ADDRESS_SPACE) {
addr_mask = PCI_BASE_ADDRESS_IO_MASK;
upper_limit = &pciauto_upper_iospc;
lower_limit = &pciauto_lower_iospc;
DBG("PCI Autoconfig: BAR %d, I/O, ", bar_nr);
! } else {
! if ((bar_response & PCI_BASE_ADDRESS_MEM_TYPE_MASK) ==
! PCI_BASE_ADDRESS_MEM_TYPE_64)
found_mem64 = 1;
***************
*** 110,121 ****
/* Allocate a base address */
bar_value = ((*lower_limit - 1) & ~(bar_size - 1)) + bar_size;
- MIPS_ASSERT(bar_value + bar_size <= *upper_limit);
/* Write it out and update our limit */
! early_write_config_dword(hose,
! current_bus,
! pci_devfn,
! bar,
! bar_value);
*lower_limit = bar_value + bar_size;
--- 103,110 ----
/* Allocate a base address */
bar_value = ((*lower_limit - 1) & ~(bar_size - 1)) + bar_size;
/* Write it out and update our limit */
! early_write_config_dword(hose, current_bus, pci_devfn,
! bar, bar_value);
*lower_limit = bar_value + bar_size;
***************
*** 126,131 ****
* in the lower 4GB of memory.
*/
! if (found_mem64)
! {
bar += 4;
early_write_config_dword(hose,
--- 115,119 ----
* in the lower 4GB of memory.
*/
! if (found_mem64) {
bar += 4;
early_write_config_dword(hose,
***************
*** 153,171 ****
/* Configure bus number registers */
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_PRIMARY_BUS,
! current_bus);
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_SECONDARY_BUS,
! sub_bus + 1);
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_SUBORDINATE_BUS,
! 0xff);
/* Round memory allocator to 1MB boundary */
--- 141,150 ----
/* Configure bus number registers */
! early_write_config_byte(hose, current_bus, pci_devfn,
! PCI_PRIMARY_BUS, current_bus);
! early_write_config_byte(hose, current_bus, pci_devfn,
! PCI_SECONDARY_BUS, sub_bus + 1);
! early_write_config_byte(hose, current_bus, pci_devfn,
! PCI_SUBORDINATE_BUS, 0xff);
/* Round memory allocator to 1MB boundary */
***************
*** 176,220 ****
/* Set up memory and I/O filter limits, assume 32-bit I/O space */
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_MEMORY_LIMIT,
((pciauto_upper_memspc - 1) & 0xfff00000) >> 16);
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_IO_LIMIT,
((pciauto_upper_iospc - 1) & 0x0000f000) >> 8);
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
PCI_IO_LIMIT_UPPER16,
((pciauto_upper_iospc - 1) & 0xffff0000) >> 16);
/* We don't support prefetchable memory for now, so disable */
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_PREF_MEMORY_BASE,
! 0x1000);
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_PREF_MEMORY_LIMIT,
! 0x1000);
/* Enable memory and I/O accesses, enable bus master */
! early_read_config_dword(hose,
! current_bus,
! pci_devfn,
! PCI_COMMAND,
&cmdstat);
! early_write_config_dword(hose,
! current_bus,
! pci_devfn,
! PCI_COMMAND,
! cmdstat |
! PCI_COMMAND_IO |
! PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER);
}
--- 155,177 ----
/* Set up memory and I/O filter limits, assume 32-bit I/O space */
! early_write_config_word(hose, current_bus, pci_devfn, PCI_MEMORY_LIMIT,
((pciauto_upper_memspc - 1) & 0xfff00000) >> 16);
! early_write_config_byte(hose, current_bus, pci_devfn, PCI_IO_LIMIT,
((pciauto_upper_iospc - 1) & 0x0000f000) >> 8);
! early_write_config_word(hose, current_bus, pci_devfn,
PCI_IO_LIMIT_UPPER16,
((pciauto_upper_iospc - 1) & 0xffff0000) >> 16);
/* We don't support prefetchable memory for now, so disable */
! early_write_config_word(hose, current_bus, pci_devfn,
! PCI_PREF_MEMORY_BASE, 0x1000);
! early_write_config_word(hose, current_bus, pci_devfn,
! PCI_PREF_MEMORY_LIMIT, 0x1000);
/* Enable memory and I/O accesses, enable bus master */
! early_read_config_dword(hose, current_bus, pci_devfn, PCI_COMMAND,
&cmdstat);
! early_write_config_dword(hose, current_bus, pci_devfn, PCI_COMMAND,
! cmdstat | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER);
}
***************
*** 227,256 ****
{
/* Configure bus number registers */
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_SUBORDINATE_BUS,
! sub_bus);
/* Round memory allocator to 1MB boundary */
pciauto_upper_memspc &= ~(0x100000 - 1);
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_MEMORY_BASE,
pciauto_upper_memspc >> 16);
/* Round I/O allocator to 4KB boundary */
pciauto_upper_iospc &= ~(0x1000 - 1);
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_IO_BASE,
(pciauto_upper_iospc & 0x0000f000) >> 8);
! early_write_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_IO_BASE_UPPER16,
! pciauto_upper_iospc >> 16);
}
--- 184,201 ----
{
/* Configure bus number registers */
! early_write_config_byte(hose, current_bus, pci_devfn,
! PCI_SUBORDINATE_BUS, sub_bus);
/* Round memory allocator to 1MB boundary */
pciauto_upper_memspc &= ~(0x100000 - 1);
! early_write_config_word(hose, current_bus, pci_devfn, PCI_MEMORY_BASE,
pciauto_upper_memspc >> 16);
/* Round I/O allocator to 4KB boundary */
pciauto_upper_iospc &= ~(0x1000 - 1);
! early_write_config_byte(hose, current_bus, pci_devfn, PCI_IO_BASE,
(pciauto_upper_iospc & 0x0000f000) >> 8);
! early_write_config_word(hose, current_bus, pci_devfn,
! PCI_IO_BASE_UPPER16, pciauto_upper_iospc >> 16);
}
***************
*** 279,314 ****
continue;
! early_read_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_HEADER_TYPE,
! &header_type);
if (!PCI_FUNC(pci_devfn))
found_multi = header_type & 0x80;
! early_read_config_word(hose,
! current_bus,
! pci_devfn,
! PCI_VENDOR_ID,
! &vid);
if (vid == 0xffff) continue;
! early_read_config_dword(hose,
! current_bus,
! pci_devfn,
PCI_CLASS_REVISION, &pci_class);
! if ( (pci_class >> 16) == PCI_CLASS_BRIDGE_PCI ) {
DBG("PCI Autoconfig: Found P2P bridge, device %d\n", PCI_SLOT(pci_devfn));
! pciauto_prescan_setup_bridge(hose,
! current_bus,
! pci_devfn,
! sub_bus);
sub_bus = pciauto_bus_scan(hose, sub_bus+1);
! pciauto_postscan_setup_bridge(hose,
! current_bus,
! pci_devfn,
! sub_bus);
} else if ((pci_class >> 16) == PCI_CLASS_STORAGE_IDE) {
--- 224,247 ----
continue;
! early_read_config_byte(hose, current_bus, pci_devfn,
! PCI_HEADER_TYPE, &header_type);
if (!PCI_FUNC(pci_devfn))
found_multi = header_type & 0x80;
! early_read_config_word(hose, current_bus, pci_devfn,
! PCI_VENDOR_ID, &vid);
if (vid == 0xffff) continue;
! early_read_config_dword(hose, current_bus, pci_devfn,
PCI_CLASS_REVISION, &pci_class);
! if ((pci_class >> 16) == PCI_CLASS_BRIDGE_PCI) {
DBG("PCI Autoconfig: Found P2P bridge, device %d\n", PCI_SLOT(pci_devfn));
! pciauto_prescan_setup_bridge(hose, current_bus,
! pci_devfn, sub_bus);
sub_bus = pciauto_bus_scan(hose, sub_bus+1);
! pciauto_postscan_setup_bridge(hose, current_bus,
! pci_devfn, sub_bus);
} else if ((pci_class >> 16) == PCI_CLASS_STORAGE_IDE) {
***************
*** 316,324 ****
unsigned char prg_iface;
! early_read_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_CLASS_PROG,
! &prg_iface);
if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
DBG("PCI Autoconfig: Skipping legacy mode IDE controller\n");
--- 249,254 ----
unsigned char prg_iface;
! early_read_config_byte(hose, current_bus, pci_devfn,
! PCI_CLASS_PROG, &prg_iface);
if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
DBG("PCI Autoconfig: Skipping legacy mode IDE controller\n");
***************
*** 331,357 ****
* settings
*/
! early_read_config_dword(hose,
! current_bus,
! pci_devfn,
! PCI_COMMAND,
! &cmdstat);
! early_write_config_dword(hose,
! current_bus,
! pci_devfn,
! PCI_COMMAND,
! cmdstat |
! PCI_COMMAND_IO |
PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER);
! early_write_config_byte(hose,
! current_bus,
! pci_devfn,
! PCI_LATENCY_TIMER,
! 0x80);
! /* Allocate PCI I/O and/or memory space */
! pciauto_setup_bars(hose,
! current_bus,
! pci_devfn);
}
return sub_bus;
--- 261,275 ----
* settings
*/
! early_read_config_dword(hose, current_bus, pci_devfn,
! PCI_COMMAND, &cmdstat);
! early_write_config_dword(hose, current_bus, pci_devfn,
! PCI_COMMAND, cmdstat | PCI_COMMAND_IO |
PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER);
! early_write_config_byte(hose, current_bus, pci_devfn,
! PCI_LATENCY_TIMER, 0x80);
! /* Allocate PCI I/O and/or memory space */
! pciauto_setup_bars(hose, current_bus, pci_devfn);
}
return sub_bus;
***************
*** 375,398 ****
* and all of the pci_dev and pci_bus structures have been created.
*/
! static struct pci_dev *
! fake_pci_dev(struct pci_channel *hose, int busnr, int devfn)
{
! static struct pci_dev dev;
! static struct pci_bus bus;
! dev.bus = &bus;
! dev.sysdata = hose;
! dev.devfn = devfn;
! bus.number = busnr;
! bus.ops = hose->pci_ops;
! return &dev;
}
! #define EARLY_PCI_OP(rw, size, type) \
! int early_##rw##_config_##size(struct pci_channel *hose, int bus, \
! int devfn, int offset, type value) \
! { \
! return pci_##rw##_config_##size(fake_pci_dev(hose, bus, devfn), \
! offset, value); \
}
--- 293,317 ----
* and all of the pci_dev and pci_bus structures have been created.
*/
! static struct pci_dev *fake_pci_dev(struct pci_channel *hose, int busnr,
! int devfn)
{
! static struct pci_dev dev;
! static struct pci_bus bus;
! dev.bus = &bus;
! dev.sysdata = hose;
! dev.devfn = devfn;
! bus.number = busnr;
! bus.ops = hose->pci_ops;
!
! return &dev;
}
! #define EARLY_PCI_OP(rw, size, type) \
! int early_##rw##_config_##size(struct pci_channel *hose, int bus, \
! int devfn, int offset, type value) \
! { \
! return pci_##rw##_config_##size(fake_pci_dev(hose, bus, devfn), \
! offset, value); \
}
Index: proc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/proc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** proc.c 2001/08/23 19:13:56 1.5
--- proc.c 2001/08/25 02:19:27 1.6
***************
*** 15,19 ****
#include <asm/watch.h>
! unsigned long unaligned_instructions;
unsigned int vced_count, vcei_count;
#ifndef CONFIG_CPU_HAS_LLSC
--- 15,19 ----
#include <asm/watch.h>
! extern unsigned long unaligned_instructions;
unsigned int vced_count, vcei_count;
#ifndef CONFIG_CPU_HAS_LLSC
Index: ptrace.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/ptrace.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ptrace.c 2001/07/16 18:00:30 1.3
--- ptrace.c 2001/08/25 02:19:27 1.4
***************
*** 67,98 ****
if (request == PTRACE_ATTACH) {
! if (child == current)
! goto out_tsk;
! if ((!child->dumpable ||
! (current->uid != child->euid) ||
! (current->uid != child->suid) ||
! (current->uid != child->uid) ||
! (current->gid != child->egid) ||
! (current->gid != child->sgid) ||
! (current->gid != child->gid) ||
! (!cap_issubset(child->cap_permitted,
! current->cap_permitted)) ||
! (current->gid != child->gid)) && !capable(CAP_SYS_PTRACE))
! goto out_tsk;
! /* the same process cannot be attached many times */
! if (child->ptrace & PT_PTRACED)
! goto out_tsk;
! child->ptrace |= PT_PTRACED;
!
! write_lock_irq(&tasklist_lock);
! if (child->p_pptr != current) {
! REMOVE_LINKS(child);
! child->p_pptr = current;
! SET_LINKS(child);
! }
! write_unlock_irq(&tasklist_lock);
!
! send_sig(SIGSTOP, child, 1);
! res = 0;
goto out_tsk;
}
--- 67,71 ----
if (request == PTRACE_ATTACH) {
! res = ptrace_attach(child);
goto out_tsk;
}
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** setup.c 2001/08/23 19:13:56 1.9
--- setup.c 2001/08/25 02:19:27 1.10
***************
*** 347,354 ****
}
break;
case PRID_COMP_ALCHEMY:
switch (mips_cpu.processor_id & 0xff00) {
! case PRID_IMP_AU1_REV1:
! case PRID_IMP_AU1_REV2:
mips_cpu.cputype = CPU_AU1000;
mips_cpu.isa_level = MIPS_CPU_ISA_M32;
--- 347,355 ----
}
break;
+ #endif
case PRID_COMP_ALCHEMY:
switch (mips_cpu.processor_id & 0xff00) {
! #ifdef CONFIG_CPU_MIPS32
! case PRID_IMP_AU1000:
mips_cpu.cputype = CPU_AU1000;
mips_cpu.isa_level = MIPS_CPU_ISA_M32;
***************
*** 365,368 ****
--- 366,370 ----
mips_cpu.scache.flags = MIPS_CACHE_NOT_PRESENT;
break;
+ #endif
default:
mips_cpu.cputype = CPU_UNKNOWN;
***************
*** 370,374 ****
}
break;
- #endif
case PRID_COMP_SIBYTE:
switch (mips_cpu.processor_id & 0xff00) {
--- 372,375 ----
Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/time.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** time.c 2001/08/23 04:20:15 1.6
--- time.c 2001/08/25 02:19:27 1.7
***************
*** 3,8 ****
* Author: Jun Sun, js...@mv... or js...@ju...
*
! * Common time service routines for MIPS machines. See
! * Documents/MIPS/README.txt.
*
* This program is free software; you can redistribute it and/or modify it
--- 3,7 ----
* Author: Jun Sun, js...@mv... or js...@ju...
*
! * Common time service routines for MIPS machines. See Documents/MIPS/time.txt.
*
* This program is free software; you can redistribute it and/or modify it
Index: unaligned.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/unaligned.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** unaligned.c 2001/08/10 18:02:27 1.3
--- unaligned.c 2001/08/25 02:19:27 1.4
***************
*** 73,76 ****
--- 73,77 ----
* Undo the partial store in this case.
*/
+ #include <linux/config.h>
#include <linux/mm.h>
#include <linux/signal.h>
***************
*** 379,400 ****
}
unsigned long unaligned_instructions;
asmlinkage void do_ade(struct pt_regs *regs)
{
unsigned long pc;
! extern int do_dsemulret(struct pt_regs *);
! /*
! * Address errors may be deliberately induced
! * by the FPU emulator to take retake control
! * of the CPU after executing the instruction
! * in the delay slot of an emulated branch.
! */
! if((unsigned long)regs->cp0_epc == current->thread.dsemul_aerpc) {
! (void)do_dsemulret(regs);
! return;
! }
/*
--- 380,403 ----
}
+ #ifdef CONFIG_PROC_FS
unsigned long unaligned_instructions;
+ #endif
asmlinkage void do_ade(struct pt_regs *regs)
{
unsigned long pc;
! extern int do_dsemulret(struct pt_regs *);
! /*
! * Address errors may be deliberately induced
! * by the FPU emulator to take retake control
! * of the CPU after executing the instruction
! * in the delay slot of an emulated branch.
! */
! if ((unsigned long)regs->cp0_epc == current->thread.dsemul_aerpc) {
! do_dsemulret(regs);
! return;
! }
/*
***************
*** 413,417 ****
--- 416,422 ----
emulate_load_store_insn(regs, regs->cp0_badvaddr, pc);
+ #ifdef CONFIG_PROC_FS
unaligned_instructions++;
+ #endif
return;
|
|
From: Paul M. <le...@us...> - 2001-08-25 02:19:30
|
Update of /cvsroot/linux-mips/linux/arch/mips/gt64120/momenco_ocelot
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/gt64120/momenco_ocelot
Modified Files:
setup.c
Log Message:
Sync to 2.4.7
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/gt64120/momenco_ocelot/setup.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** setup.c 2001/06/22 02:29:32 1.1.1.1
--- setup.c 2001/08/25 02:19:27 1.2
***************
*** 39,42 ****
--- 39,43 ----
#include <linux/kernel.h>
#include <linux/types.h>
+ #include <linux/mc146818rtc.h>
#include <linux/mm.h>
#include <linux/swap.h>
***************
*** 65,69 ****
extern struct rtc_ops no_rtc_ops;
- struct rtc_ops *rtc_ops;
unsigned long gt64120_base = KSEG1ADDR(GT_DEF_BASE);
--- 66,69 ----
***************
*** 73,78 ****
extern void momenco_ocelot_halt(void);
extern void momenco_ocelot_power_off(void);
-
- char arcs_cmdline[COMMAND_LINE_SIZE]= { ""/*console=ttyS0,9600"*/ };
extern void gt64120_time_init(void);
--- 73,76 ----
|
582 messages has been excluded from this view by a project administrator.
