Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys move DEV_BSIZE, DEV_BSHIFT out of MD param.h, they a...



details:   https://anonhg.NetBSD.org/src/rev/280cbde7622c
branches:  trunk
changeset: 995840:280cbde7622c
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Jan 07 22:00:30 2019 +0000

description:
move DEV_BSIZE, DEV_BSHIFT out of MD param.h, they are same on all ports

also move BLKDEV_IOSIZE, MAXPHYS, but allow override since some ports
have different value (powerpc uses NBPG for BLKDEV_IOSIZE, sun2/sun3
have lower MAXPHYS)

diffstat:

 sys/arch/aarch64/include/param.h      |  10 +---------
 sys/arch/algor/include/param.h        |   7 +------
 sys/arch/alpha/include/param.h        |   9 +--------
 sys/arch/amd64/include/param.h        |   9 +--------
 sys/arch/arc/include/param.h          |   7 +------
 sys/arch/arm/include/param.h          |  10 +---------
 sys/arch/cobalt/include/param.h       |   7 +------
 sys/arch/emips/include/param.h        |   7 +------
 sys/arch/evbmips/include/param.h      |   7 +------
 sys/arch/ews4800mips/include/param.h  |   7 +------
 sys/arch/hpcmips/include/param.h      |   7 +------
 sys/arch/hppa/include/param.h         |   7 +------
 sys/arch/i386/include/param.h         |   9 +--------
 sys/arch/ia64/include/param.h         |  10 +---------
 sys/arch/m68k/include/param.h         |   9 +--------
 sys/arch/mipsco/include/param.h       |   7 +------
 sys/arch/newsmips/include/param.h     |   7 +------
 sys/arch/or1k/include/param.h         |  10 +---------
 sys/arch/playstation2/include/param.h |   7 +------
 sys/arch/pmax/include/param.h         |   7 +------
 sys/arch/powerpc/include/param.h      |   7 +------
 sys/arch/riscv/include/param.h        |  10 +---------
 sys/arch/sbmips/include/param.h       |   7 +------
 sys/arch/sgimips/include/param.h      |   7 +------
 sys/arch/sh3/include/param.h          |   7 +------
 sys/arch/sparc/include/param.h        |   7 +------
 sys/arch/sparc64/include/param.h      |   7 +------
 sys/arch/vax/include/param.h          |   8 +-------
 sys/sys/param.h                       |  13 ++++++++++++-
 29 files changed, 40 insertions(+), 193 deletions(-)

diffs (truncated from 640 to 300 lines):

diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/aarch64/include/param.h
--- a/sys/arch/aarch64/include/param.h  Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/aarch64/include/param.h  Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.9 2019/01/04 21:39:38 rin Exp $ */
+/* $NetBSD: param.h,v 1.10 2019/01/07 22:00:30 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -89,14 +89,6 @@
 #define ALIGN32(p)             \
        (((uintptr_t)(p) + ALIGNBYTES32) & ~ALIGNBYTES32)
 
-#define DEV_BSHIFT             9       /* log2(DEV_BSIZE) */
-#define DEV_BSIZE              (1 << DEV_BSHIFT)
-#define BLKDEV_IOSIZE          2048
-
-#ifndef MAXPHYS
-#define MAXPHYS                        65536   /* max I/O transfer size */
-#endif
-
 #define NKMEMPAGES_MIN_DEFAULT         ((128UL * 1024 * 1024) >> PAGE_SHIFT)
 #define NKMEMPAGES_MAX_UNLIMITED       1
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/algor/include/param.h
--- a/sys/arch/algor/include/param.h    Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/algor/include/param.h    Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.11 2011/03/18 16:35:03 tsutsui Exp $       */
+/*     $NetBSD: param.h,v 1.12 2019/01/07 22:00:30 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,11 +50,6 @@
 
 #include <mips/mips_param.h>
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/alpha/include/param.h
--- a/sys/arch/alpha/include/param.h    Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/alpha/include/param.h    Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.44 2016/01/20 12:49:21 jklos Exp $ */
+/* $NetBSD: param.h,v 1.45 2019/01/07 22:00:30 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -60,13 +60,6 @@
 #define        KERNBASE        0xfffffc0000a00000      /* start of kernel virtual */
 #define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        BLKDEV_IOSIZE   2048
-#ifndef        MAXPHYS
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-#endif
-
 #define        SSIZE           1               /* initial stack size/NBPG */
 #define        SINCR           1               /* increment of stack/NBPG */
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/amd64/include/param.h
--- a/sys/arch/amd64/include/param.h    Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/amd64/include/param.h    Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.27 2018/12/02 21:00:13 maxv Exp $  */
+/*     $NetBSD: param.h,v 1.28 2019/01/07 22:00:30 jdolecek Exp $      */
 
 #ifdef __x86_64__
 
@@ -52,13 +52,6 @@
 #define KERNBASE_HI    0xffffffff
 #define KERNBASE_LO    0x80000000
 
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        DEV_BSIZE       (1 << DEV_BSHIFT)
-#define        BLKDEV_IOSIZE   2048
-#ifndef        MAXPHYS
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-#endif
-
 #define        SSIZE           1               /* initial stack size/NBPG */
 #define        SINCR           1               /* increment of stack/NBPG */
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/arc/include/param.h
--- a/sys/arch/arc/include/param.h      Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/arc/include/param.h      Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.30 2016/07/13 00:04:28 maya Exp $  */
+/*     $NetBSD: param.h,v 1.31 2019/01/07 22:00:30 jdolecek Exp $      */
 /*      $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */
 
 /*
@@ -59,11 +59,6 @@
 #define        KERNBASE        0x80000000      /* start of kernel virtual */
 #define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 #define        SSIZE           1               /* initial stack size/NBPG */
 #define        SINCR           1               /* increment of stack/NBPG */
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/arm/include/param.h
--- a/sys/arch/arm/include/param.h      Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/arm/include/param.h      Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.21 2018/10/18 09:01:52 skrll Exp $ */
+/*     $NetBSD: param.h,v 1.22 2019/01/07 22:00:30 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -157,14 +157,6 @@
 #define        ALIGNBYTES32    7
 #endif
 
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        DEV_BSIZE       (1 << DEV_BSHIFT)
-#define        BLKDEV_IOSIZE   2048
-
-#ifndef MAXPHYS
-#define        MAXPHYS         65536           /* max I/O transfer size */
-#endif
-
 /*
  * Constants related to network buffer management.
  * MCLBYTES must be no larger than NBPG (the software page size), and,
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/cobalt/include/param.h
--- a/sys/arch/cobalt/include/param.h   Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/cobalt/include/param.h   Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.19 2011/03/18 16:19:13 tsutsui Exp $       */
+/*     $NetBSD: param.h,v 1.20 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,11 +42,6 @@
 
 #include <mips/mips_param.h>
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* Maximum raw I/O transfer size */
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/emips/include/param.h
--- a/sys/arch/emips/include/param.h    Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/emips/include/param.h    Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.3 2011/03/18 16:39:58 tsutsui Exp $        */
+/*     $NetBSD: param.h,v 1.4 2019/01/07 22:00:31 jdolecek Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,11 +50,6 @@
 
 #include <mips/mips_param.h>
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 /*
  * Constants related to network buffer management.
  * MCLBYTES must be no larger than NBPG (the software page size), and,
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/evbmips/include/param.h
--- a/sys/arch/evbmips/include/param.h  Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/evbmips/include/param.h  Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.10 2017/07/24 09:56:45 mrg Exp $   */
+/*     $NetBSD: param.h,v 1.11 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -46,11 +46,6 @@
 
 #include <mips/mips_param.h>
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/ews4800mips/include/param.h
--- a/sys/arch/ews4800mips/include/param.h      Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/ews4800mips/include/param.h      Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.5 2011/03/18 16:23:09 tsutsui Exp $        */
+/*     $NetBSD: param.h,v 1.6 2019/01/07 22:00:31 jdolecek Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -42,11 +42,6 @@
 
 #include <mips/mips_param.h>
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        BLKDEV_IOSIZE   2048
-#define        MAXPHYS         (64 * 1024)     /* Maximum raw I/O transfer size */
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/hpcmips/include/param.h
--- a/sys/arch/hpcmips/include/param.h  Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/hpcmips/include/param.h  Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.16 2011/03/18 16:36:50 tsutsui Exp $       */
+/*     $NetBSD: param.h,v 1.17 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -54,11 +54,6 @@
 #define KERNTEXTOFF    0x80001000      /* start of kernel text for kvm_mkdb */
 #define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 #ifdef _KERNEL
 #ifndef _LOCORE
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/hppa/include/param.h
--- a/sys/arch/hppa/include/param.h     Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/hppa/include/param.h     Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.21 2015/10/27 22:28:56 mrg Exp $   */
+/*     $NetBSD: param.h,v 1.22 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*     $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $       */
 
@@ -50,11 +50,6 @@
 #define        KERNBASE        0x00000000      /* start of kernel virtual */
 #define        BTOPKERNBASE    ((u_long)KERNBASE >> PGSHIFT)
 
-#define        DEV_BSIZE       512
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE  2048
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-
 #define        SSIZE           (1)             /* initial stack size/NBPG */
 #define        SINCR           (1)             /* increment of stack/NBPG */
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/i386/include/param.h
--- a/sys/arch/i386/include/param.h     Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/i386/include/param.h     Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.83 2018/02/19 13:02:47 sborrill Exp $      */
+/*     $NetBSD: param.h,v 1.84 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -87,13 +87,6 @@
 #define        KERNTEXTOFF     (KERNBASE + 0x100000) /* start of kernel text */
 #define        BTOPKERNBASE    (KERNBASE >> PGSHIFT)
 
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        DEV_BSIZE       (1 << DEV_BSHIFT)
-#define        BLKDEV_IOSIZE   2048
-#ifndef        MAXPHYS
-#define        MAXPHYS         (64 * 1024)     /* max raw I/O transfer size */
-#endif
-
 #define        SSIZE           1               /* initial stack size/NBPG */
 #define        SINCR           1               /* increment of stack/NBPG */
 
diff -r e6b2c499cbc6 -r 280cbde7622c sys/arch/ia64/include/param.h
--- a/sys/arch/ia64/include/param.h     Mon Jan 07 21:04:35 2019 +0000
+++ b/sys/arch/ia64/include/param.h     Mon Jan 07 22:00:30 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.9 2017/04/08 18:03:33 scole Exp $  */
+/*     $NetBSD: param.h,v 1.10 2019/01/07 22:00:31 jdolecek Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -57,14 +57,6 @@
 #define MAXCPU         1
 #endif
 
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        DEV_BSIZE       (1<<DEV_BSHIFT)



Home | Main Index | Thread Index | Old Index