Re: CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
On 2020-11-28, Yorick Hardy wrote: > Module Name: src > Committed By: yhardy > Date: Sat Nov 28 22:53:06 UTC 2020 > > Modified Files: > src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c > > Log Message: > Use vn_close to release the vnodes in the error handling blocks, since > the vnodes were opened for writing. Fix proposed on current-users > and improved by hannken@. > > > To generate a diff of this commit: > cvs rdiff -u -r1.18 -r1.19 \ > src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. Oops, that should have been "proposed on tech-kern": http://mail-index.netbsd.org/tech-kern/2020/11/28/msg026984.html -- Kind regards, Yorick Hardy
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: yhardy
Date: Sat Nov 28 22:53:06 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c
Log Message:
Use vn_close to release the vnodes in the error handling blocks, since
the vnodes were opened for writing. Fix proposed on current-users
and improved by hannken@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.18 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.19
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c:1.18 Thu Jun 25 09:39:15 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Sat Nov 28 22:53:06 2020
@@ -215,7 +215,11 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
return (SET_ERROR(error));
}
if (vp->v_type != VBLK) {
+#ifdef __NetBSD__
+ vn_close(vp, FREAD|FWRITE, kcred);
+#else
vrele(vp);
+#endif
vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED;
return (SET_ERROR(EINVAL));
}
@@ -247,7 +251,11 @@ vdev_disk_open(vdev_t *vd, uint64_t *psi
error = workqueue_create(>vd_wq, "vdevsync",
vdev_disk_flush, dvd, PRI_NONE, IPL_NONE, WQ_MPSAFE);
if (error != 0) {
+#ifdef __NetBSD__
+ vn_close(vp, FREAD|FWRITE, kcred);
+#else
vrele(vp);
+#endif
return (SET_ERROR(error));
}
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: yhardy Date: Sat Nov 28 22:53:06 UTC 2020 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev_disk.c Log Message: Use vn_close to release the vnodes in the error handling blocks, since the vnodes were opened for writing. Fix proposed on current-users and improved by hannken@. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/uvm
Module Name:src Committed By: yhardy Date: Fri Nov 27 22:32:43 UTC 2020 Modified Files: src/sys/uvm: uvm_mremap.c Log Message: uvm_mremap: reference the appropriate backing object. The previous approach was appropriate for anonymous memory and device objects, which continue to work in the same way. OK: chs@ Fixes: PR 55237 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/uvm_mremap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_mremap.c diff -u src/sys/uvm/uvm_mremap.c:1.20 src/sys/uvm/uvm_mremap.c:1.21 --- src/sys/uvm/uvm_mremap.c:1.20 Sun Feb 23 15:46:43 2020 +++ src/sys/uvm/uvm_mremap.c Fri Nov 27 22:32:43 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_mremap.c,v 1.20 2020/02/23 15:46:43 ad Exp $ */ +/* $NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $ */ /*- * Copyright (c)2006,2007,2009 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.20 2020/02/23 15:46:43 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $"); #include #include @@ -80,10 +80,8 @@ uvm_mapent_extend(struct vm_map *map, va error = E2BIG; /* XXX */ goto done; } - rw_enter(uobj->vmobjlock, RW_WRITER); - KASSERT(uobj->uo_refs > 0); - atomic_inc_uint(>uo_refs); - rw_exit(uobj->vmobjlock); + if (uobj->pgops->pgo_reference) + uobj->pgops->pgo_reference(uobj); reserved_entry->object.uvm_obj = uobj; reserved_entry->offset = newoffset; }
CVS commit: src/sys/uvm
Module Name:src Committed By: yhardy Date: Fri Nov 27 22:32:43 UTC 2020 Modified Files: src/sys/uvm: uvm_mremap.c Log Message: uvm_mremap: reference the appropriate backing object. The previous approach was appropriate for anonymous memory and device objects, which continue to work in the same way. OK: chs@ Fixes: PR 55237 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/uvm_mremap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: yhardy
Date: Mon May 11 21:51:25 UTC 2020
Modified Files:
src/distrib/sets/lists/debug: md.amd64
src/distrib/sets/lists/tests: md.amd64
src/tests/lib/libi386: Makefile
Log Message:
Fix the build for MKCOMPAT=no.
The t_user_ldt test needs the i386 compat library which is only built
when MKCOMPAT=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/tests/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libi386/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.108 src/distrib/sets/lists/debug/md.amd64:1.109
--- src/distrib/sets/lists/debug/md.amd64:1.108 Sun Apr 26 09:08:40 2020
+++ src/distrib/sets/lists/debug/md.amd64 Mon May 11 21:51:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.108 2020/04/26 09:08:40 maxv Exp $
+# $NetBSD: md.amd64,v 1.109 2020/05/11 21:51:25 yhardy Exp $
./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx
./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat
./usr/lib/i386/libiberty_g.a comp-obsolete obsolete
@@ -25,7 +25,7 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug debug,atf,compat
./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug debug,atf
Index: src/distrib/sets/lists/tests/md.amd64
diff -u src/distrib/sets/lists/tests/md.amd64:1.10 src/distrib/sets/lists/tests/md.amd64:1.11
--- src/distrib/sets/lists/tests/md.amd64:1.10 Tue Apr 28 13:43:45 2020
+++ src/distrib/sets/lists/tests/md.amd64 Mon May 11 21:51:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.10 2020/04/28 13:43:45 rjs Exp $
+# $NetBSD: md.amd64,v 1.11 2020/05/11 21:51:25 yhardy Exp $
./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete
@@ -7,7 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
-./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf
+./usr/tests/lib/libi386/t_user_ldt tests-lib-tests compattestfile,atf,compat
./usr/tests/lib/libnvmm/h_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/t_io_assist tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf
Index: src/tests/lib/libi386/Makefile
diff -u src/tests/lib/libi386/Makefile:1.3 src/tests/lib/libi386/Makefile:1.4
--- src/tests/lib/libi386/Makefile:1.3 Mon Apr 20 12:08:08 2020
+++ src/tests/lib/libi386/Makefile Mon May 11 21:51:25 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2020/04/20 12:08:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/11 21:51:25 yhardy Exp $
.include
TESTSDIR= ${TESTSBASE}/lib/libi386
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPAT} == "yes"
SHLIBINSTALLDIR= /usr/lib/i386
COPTS+= -m32
LDFLAGS+= -m32
CVS commit: src
Module Name:src Committed By: yhardy Date: Mon May 11 21:51:25 UTC 2020 Modified Files: src/distrib/sets/lists/debug: md.amd64 src/distrib/sets/lists/tests: md.amd64 src/tests/lib/libi386: Makefile Log Message: Fix the build for MKCOMPAT=no. The t_user_ldt test needs the i386 compat library which is only built when MKCOMPAT=yes. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/tests/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libi386/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
Dear Martin,
On 2020-05-08, Martin Husemann wrote:
> On Thu, May 07, 2020 at 10:52:26PM +0200, Yorick Hardy wrote:
> > Thanks! It took a while for this to sink in ...
> >
> > So I think the test should only be built if MKCOMPAT=yes ?
> > (It does fail to build for me, because I usually have MKCOMPAT=no).
>
> Yes, either the Makefile needs a conditional, or the SUBDIR+= in the
> makefile above.
>
> Martin
I think it may be better in the Makefile, since the test for amd64 already
happens there and because the libi386 directory could conceivably
also contain i386/non-amd64 tests.
I successfully completed a build with MKCOMPAT=no, using the patch below.
Is it okay to commit?
--
Kind regards,
Yorick Hardy
Index: distrib/sets/lists/debug/md.amd64
==
--- distrib/sets/lists/debug/md.amd64
+++ distrib/sets/lists/debug/md.amd64
@@ -23,9 +23,9 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait4.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug
tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug
debug,atf
+./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug
debug,atf,compat
./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debugtests-lib-debug
debug,atf
./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug
debug,atf
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug
debug,atf
Index: distrib/sets/lists/tests/md.amd64
==
--- distrib/sets/lists/tests/md.amd64
+++ distrib/sets/lists/tests/md.amd64
@@ -5,13 +5,13 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait3 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait4 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitidtests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
-./usr/tests/lib/libi386/t_user_ldt tests-lib-tests
compattestfile,atf
+./usr/tests/lib/libi386/t_user_ldt tests-lib-tests
compattestfile,atf,compat
./usr/tests/lib/libnvmm/h_io_assisttests-lib-tests
compattestfile,atf
./usr/tests/lib/libnvmm/t_io_assisttests-lib-tests
compattestfile,atf
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests
compattestfile,atf
./usr/tests/lib/libnvmm/t_mem_assist tests-lib-tests
compattestfile,atf
./usr/tests/modules/t_x86_pte tests-sys-tests atf,kmod
./usr/tests/modules/x86_pte_tester tests-sys-tests atf,kmod
./usr/tests/modules/x86_pte_tester/x86_pte_tester.kmod tests-sys-tests atf,kmod
Index: tests/lib/libi386/Makefile
==
--- tests/lib/libi386/Makefile
+++ tests/lib/libi386/Makefile
@@ -2,14 +2,14 @@
.include
TESTSDIR= ${TESTSBASE}/lib/libi386
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPAT} == "yes"
SHLIBINSTALLDIR= /usr/lib/i386
COPTS+=-m32
LDFLAGS+= -m32
LDADD+=-li386
TESTS_C+= t_user_ldt
.endif
.include
Re: CVS commit: src
Dear Martin,
On 2020-05-07, Martin Husemann wrote:
> On Thu, May 07, 2020 at 12:31:12AM +0200, Yorick Hardy wrote:
> > I think this test depends on MKCOMPAT=yes. Does the attached the patch
> > below look reasonable?
> [..]
> > -.if ${MACHINE} == "amd64"
> > +.if ${MACHINE} == "amd64" && ${MKCOMPATTESTS} == "yes"
>
> MKCOMPATTESTS is something slightly different. It is used to build e.g. the
> "native" i386 tests (as 32bit binaries) when building an amd64 distribution.
>
> This is usually set to "no".
>
> MKCOMPAT=yes means to build i386 libraries, so you can build 32bit binaries
> on amd64 with -m32. It is usually set to "yes".
>
> Martin
Thanks! It took a while for this to sink in ...
So I think the test should only be built if MKCOMPAT=yes ?
(It does fail to build for me, because I usually have MKCOMPAT=no).
--
Kind regards,
Yorick Hardy
Re: CVS commit: src
Dear Maxime,
On 2020-04-19, Maxime Villard wrote:
> Module Name: src
> Committed By: maxv
> Date: Sun Apr 19 13:22:58 UTC 2020
>
> Modified Files:
> src/distrib/sets/lists/debug: md.amd64
> src/distrib/sets/lists/tests: md.amd64 mi
> src/etc/mtree: NetBSD.dist.tests
> src/tests/lib: Makefile
> Added Files:
> src/tests/lib/libi386: Makefile t_user_ldt.c
>
> Log Message:
> Add tests for USER_LDT.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/debug/md.amd64
> cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/tests/md.amd64
> cvs rdiff -u -r1.835 -r1.836 src/distrib/sets/lists/tests/mi
> cvs rdiff -u -r1.161 -r1.162 src/etc/mtree/NetBSD.dist.tests
> cvs rdiff -u -r1.32 -r1.33 src/tests/lib/Makefile
> cvs rdiff -u -r0 -r1.1 src/tests/lib/libi386/Makefile \
> src/tests/lib/libi386/t_user_ldt.c
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
I think this test depends on MKCOMPAT=yes. Does the attached the patch
below look reasonable?
--
Kind regards,
Yorick Hardy
Index: distrib/sets/lists/debug/md.amd64
===
RCS file: /cvsroot/src/distrib/sets/lists/debug/md.amd64,v
retrieving revision 1.108
diff -u -r1.108 md.amd64
--- distrib/sets/lists/debug/md.amd64 26 Apr 2020 09:08:40 - 1.108
+++ distrib/sets/lists/debug/md.amd64 6 May 2020 22:28:04 -
@@ -25,7 +25,7 @@
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait6.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitid.debug
tests-obsolete obsolete
./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_waitpid.debug
tests-obsolete obsolete
-./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug
debug,atf
+./usr/libdata/debug/usr/tests/lib/libi386/t_user_ldt.debug tests-lib-debug
debug,atf,compat
./usr/libdata/debug/usr/tests/lib/libnvmm/h_io_assist.debugtests-lib-debug
debug,atf
./usr/libdata/debug/usr/tests/lib/libnvmm/h_mem_assist.debug tests-lib-debug
debug,atf
./usr/libdata/debug/usr/tests/modules/t_x86_pte.debug tests-sys-debug
debug,atf
Index: distrib/sets/lists/tests/md.amd64
===
RCS file: /cvsroot/src/distrib/sets/lists/tests/md.amd64,v
retrieving revision 1.10
diff -u -r1.10 md.amd64
--- distrib/sets/lists/tests/md.amd64 28 Apr 2020 13:43:45 - 1.10
+++ distrib/sets/lists/tests/md.amd64 6 May 2020 22:28:04 -
@@ -7,7 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitidtests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
-./usr/tests/lib/libi386/t_user_ldt tests-lib-tests
compattestfile,atf
+./usr/tests/lib/libi386/t_user_ldt tests-lib-tests
compattestfile,atf,compat
./usr/tests/lib/libnvmm/h_io_assisttests-lib-tests
compattestfile,atf
./usr/tests/lib/libnvmm/t_io_assisttests-lib-tests
compattestfile,atf
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests
compattestfile,atf
Index: tests/lib/libi386/Makefile
===
RCS file: /cvsroot/src/tests/lib/libi386/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- tests/lib/libi386/Makefile 20 Apr 2020 12:08:08 - 1.3
+++ tests/lib/libi386/Makefile 6 May 2020 22:28:04 -
@@ -4,7 +4,7 @@
TESTSDIR= ${TESTSBASE}/lib/libi386
-.if ${MACHINE} == "amd64"
+.if ${MACHINE} == "amd64" && ${MKCOMPATTESTS} == "yes"
SHLIBINSTALLDIR= /usr/lib/i386
COPTS+=-m32
LDFLAGS+= -m32
Re: CVS commit: src/sys/arch/x86/acpi
Dear Andrew, On 2020-03-14, Andrew Doran wrote: > Module Name: src > Committed By: ad > Date: Sat Mar 14 13:50:46 UTC 2020 > > Modified Files: > src/sys/arch/x86/acpi: acpi_cpu_md.c > > Log Message: > Put ACPI idle under ACPICPU_ENABLE_C3 until the wrinkles are ironed out. > This seems well written and basically all good, but currently doesn't enter > a low power state, and imposes a big performance penalty. Proposed on > port-i386 & port-amd64. > > > To generate a diff of this commit: > cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/acpi/acpi_cpu_md.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. This change seems to cause my machine to hang while booting. Reverting the change seems to fix the problem. Here are the details: $ cpuctl identify 0 cpu0: highest basic info 0005 cpu0: highest extended info 801b cpu0: "AMD Athlon(tm) II X3 450 Processor" cpu0: AMD Family 10h (686-class), 3200.22 MHz cpu0: family 0x10 model 0x5 stepping 0x3 (id 0x100f53) cpu0: features 0x178bfbff cpu0: features 0x178bfbff cpu0: features1 0x802009 cpu0: features2 0xefd3fbff cpu0: features2 0xefd3fbff cpu0: features3 0x37ff cpu0: features3 0x37ff cpu0: I-cache 64KB 64B/line 2-way, D-cache 64KB 64B/line 2-way cpu0: L2 cache 512KB 64B/line 16-way cpu0: ITLB 32 4KB entries fully associative, 16 2MB entries fully associative cpu0: DTLB 48 4KB entries fully associative, 48 2MB entries fully associative cpu0: L2 ITLB 512 4KB entries 4-way cpu0: L2 DTLB 512 4KB entries 4-way, 128 2MB entries 2-way cpu0: L1 1GB page DTLB 48 1GB entries fully associative cpu0: L2 1GB page DTLB 16 1GB entries 8-way cpu0: Initial APIC ID 0 cpu0: Cluster/Package ID 0 cpu0: Core ID 0 cpu0: SMT ID 0 cpu0: MONITOR/MWAIT extensions 0x3 cpu0: monitor-line size 64 cpu0: AMD Power Management features: 0x1f9 cpu0: SVM Rev. 1 cpu0: SVM NASID 64 cpu0: SVM features 0xf cpu0: UCode version: 0x1c8 $ dmesg | fgrep acpicpu [ 1.014781] acpicpu0 at cpu0: ACPI CPU [ 1.014781] acpicpu0: C1: HLT, lat 0 us, pow 0 mW [ 1.014781] acpicpu0: P0: FFH, lat 4 us, pow 34375 mW, 3200 MHz [ 1.014781] acpicpu0: P1: FFH, lat 4 us, pow 25245 mW, 2500 MHz [ 1.014781] acpicpu0: P2: FFH, lat 4 us, pow 22200 mW, 2000 MHz [ 1.014781] acpicpu0: P3: FFH, lat 4 us, pow 12095 mW, 800 MHz [ 1.014781] acpicpu0: T0: I/O, lat 1 us, pow 0 mW, 100 % [ 1.014781] acpicpu0: T1: I/O, lat 1 us, pow 0 mW, 88 % [ 1.014781] acpicpu0: T2: I/O, lat 1 us, pow 0 mW, 76 % [ 1.014781] acpicpu0: T3: I/O, lat 1 us, pow 0 mW, 64 % [ 1.014781] acpicpu0: T4: I/O, lat 1 us, pow 0 mW, 52 % [ 1.014781] acpicpu0: T5: I/O, lat 1 us, pow 0 mW, 40 % [ 1.014781] acpicpu0: T6: I/O, lat 1 us, pow 0 mW, 28 % [ 1.014781] acpicpu0: T7: I/O, lat 1 us, pow 0 mW, 16 % [ 1.014781] acpicpu1 at cpu1: ACPI CPU [ 1.014781] acpicpu2 at cpu2: ACPI CPU [ 1.017385] acpicpu0 at cpu0: ACPI CPU [ 1.017385] acpicpu0: C1: HLT, lat 0 us, pow 0 mW [ 1.017385] acpicpu0: P0: FFH, lat 4 us, pow 34375 mW, 3200 MHz [ 1.017385] acpicpu0: P1: FFH, lat 4 us, pow 25245 mW, 2500 MHz [ 1.017385] acpicpu0: P2: FFH, lat 4 us, pow 22200 mW, 2000 MHz [ 1.017385] acpicpu0: P3: FFH, lat 4 us, pow 12095 mW, 800 MHz [ 1.017385] acpicpu0: T0: I/O, lat 1 us, pow 0 mW, 100 % [ 1.017385] acpicpu0: T1: I/O, lat 1 us, pow 0 mW, 88 % [ 1.017385] acpicpu0: T2: I/O, lat 1 us, pow 0 mW, 76 % [ 1.017385] acpicpu0: T3: I/O, lat 1 us, pow 0 mW, 64 % [ 1.017385] acpicpu0: T4: I/O, lat 1 us, pow 0 mW, 52 % [ 1.017385] acpicpu0: T5: I/O, lat 1 us, pow 0 mW, 40 % [ 1.017385] acpicpu0: T6: I/O, lat 1 us, pow 0 mW, 28 % [ 1.017385] acpicpu0: T7: I/O, lat 1 us, pow 0 mW, 16 % [ 1.017385] acpicpu1 at cpu1: ACPI CPU [ 1.017385] acpicpu2 at cpu2: ACPI CPU -- Kind regards, Yorick Hardy
Re: CVS commit: src/sys/dev
Dear Ryo, On 2019-07-26, Ryo ONODERA wrote: > Hi, > > O.k. > I will commit your fix later. > > Thank you. Thanks! I can commit again, and I commited this change. Please let me know if I broke anything! (src/sys/dev/usb/ums.c v1.94) > Yorick Hardy writes: > > > Dear Ryo, > > > > On 2019-07-25, Ryo ONODERA wrote: > >> Hi, > >> > >> Yorick Hardy writes: > >> > >> > Dear Ryo, > >> > > >> > On 2019-07-09, Ryo ONODERA wrote: > >> >> Module Name:src > >> >> Committed By: ryoon > >> >> Date: Tue Jul 9 12:52:51 UTC 2019 > >> >> > >> >> Modified Files: > >> >> src/sys/dev/hid: hidms.c hidms.h > >> >> src/sys/dev/i2c: ims.c > >> >> > >> >> Log Message: > >> >> Add tpcalib, touch panel calibration to ims(4) > >> >> > >> >> Suggested by ryo@ at Japan NetBSD Users' Group BOF 2019-07-06. > >> >> > >> >> > >> >> To generate a diff of this commit: > >> >> cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hid/hidms.c > >> >> cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hid/hidms.h > >> >> cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/ims.c > >> >> > >> >> Please note that diffs are not public domain; they are subject to the > >> >> copyright notices on the relevant files. > >> > > >> > I think this change has the side effect that ums(4) devices which > >> > report absolute coordinates seem to stop "moving" because > >> > tcpalib_init is never called for these devices. > >> > > >> > Is the patch below okay? Or, should hidms call tcpalib_init? > >> > (I tested the patch with an ACECAD digimemo.) > >> > >> Sorry for breakage. > >> It looks good to me. > >> And I feel tpcalib_init should be called from ums.c like your patch. > >> Could you commit it? > > > > I am very sorry, but I retired my commit privilege because I was > > contributing very little to NetBSD. Otherwise I would be happy to do so! > > > >> Thank you. > >> > >> > -- > >> > Kind regards, > >> > > >> > Yorick Hardy > >> > > >> > Index: sys/dev/usb/ums.c > >> > === > >> > RCS file: /cvsroot/src/sys/dev/usb/ums.c,v > >> > retrieving revision 1.93 > >> > diff -u -r1.93 ums.c > >> > --- sys/dev/usb/ums.c5 May 2019 03:17:54 - 1.93 > >> > +++ sys/dev/usb/ums.c24 Jul 2019 21:29:35 - > >> > @@ -192,6 +192,7 @@ > >> > } > >> > } > >> > > >> > +tpcalib_init(>sc_ms.sc_tpcalib); > >> > hidms_attach(self, >sc_ms, _accessops); > >> > } > >> > > >> > >> -- > >> Ryo ONODERA // r...@tetera.org > >> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3 -- Kind regards, Yorick Hardy
CVS commit: src/sys/dev/usb
Module Name:src Committed By: yhardy Date: Sat Aug 10 06:30:26 UTC 2019 Modified Files: src/sys/dev/usb: ums.c Log Message: Initialize tcpalib for ums devices. In r1.3 of src/sys/dev/hid/hidms.c, tpcalib is used for any hidms device reporting absolute coordinates. So ums devices reporting absolute coordinates also need to initialize tcpalib - do it for all ums devices. An uninitialized tcpalib stops a mouse with absolute coordinates from "moving". OK: ryoon@ To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/ums.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ums.c diff -u src/sys/dev/usb/ums.c:1.93 src/sys/dev/usb/ums.c:1.94 --- src/sys/dev/usb/ums.c:1.93 Sun May 5 03:17:54 2019 +++ src/sys/dev/usb/ums.c Sat Aug 10 06:30:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ums.c,v 1.93 2019/05/05 03:17:54 mrg Exp $ */ +/* $NetBSD: ums.c,v 1.94 2019/08/10 06:30:26 yhardy Exp $ */ /* * Copyright (c) 1998, 2017 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.93 2019/05/05 03:17:54 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.94 2019/08/10 06:30:26 yhardy Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -192,6 +192,7 @@ ums_attach(device_t parent, device_t sel } } + tpcalib_init(>sc_ms.sc_tpcalib); hidms_attach(self, >sc_ms, _accessops); }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: yhardy Date: Sat Aug 10 06:30:26 UTC 2019 Modified Files: src/sys/dev/usb: ums.c Log Message: Initialize tcpalib for ums devices. In r1.3 of src/sys/dev/hid/hidms.c, tpcalib is used for any hidms device reporting absolute coordinates. So ums devices reporting absolute coordinates also need to initialize tcpalib - do it for all ums devices. An uninitialized tcpalib stops a mouse with absolute coordinates from "moving". OK: ryoon@ To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/dev/usb/ums.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev
Dear Ryo, On 2019-07-25, Ryo ONODERA wrote: > Hi, > > Yorick Hardy writes: > > > Dear Ryo, > > > > On 2019-07-09, Ryo ONODERA wrote: > >> Module Name: src > >> Committed By: ryoon > >> Date: Tue Jul 9 12:52:51 UTC 2019 > >> > >> Modified Files: > >>src/sys/dev/hid: hidms.c hidms.h > >>src/sys/dev/i2c: ims.c > >> > >> Log Message: > >> Add tpcalib, touch panel calibration to ims(4) > >> > >> Suggested by ryo@ at Japan NetBSD Users' Group BOF 2019-07-06. > >> > >> > >> To generate a diff of this commit: > >> cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hid/hidms.c > >> cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hid/hidms.h > >> cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/ims.c > >> > >> Please note that diffs are not public domain; they are subject to the > >> copyright notices on the relevant files. > > > > I think this change has the side effect that ums(4) devices which > > report absolute coordinates seem to stop "moving" because > > tcpalib_init is never called for these devices. > > > > Is the patch below okay? Or, should hidms call tcpalib_init? > > (I tested the patch with an ACECAD digimemo.) > > Sorry for breakage. > It looks good to me. > And I feel tpcalib_init should be called from ums.c like your patch. > Could you commit it? I am very sorry, but I retired my commit privilege because I was contributing very little to NetBSD. Otherwise I would be happy to do so! > Thank you. > > > -- > > Kind regards, > > > > Yorick Hardy > > > > Index: sys/dev/usb/ums.c > > === > > RCS file: /cvsroot/src/sys/dev/usb/ums.c,v > > retrieving revision 1.93 > > diff -u -r1.93 ums.c > > --- sys/dev/usb/ums.c 5 May 2019 03:17:54 - 1.93 > > +++ sys/dev/usb/ums.c 24 Jul 2019 21:29:35 - > > @@ -192,6 +192,7 @@ > > } > > } > > > > + tpcalib_init(>sc_ms.sc_tpcalib); > > hidms_attach(self, >sc_ms, _accessops); > > } > > > > -- > Ryo ONODERA // r...@tetera.org > PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3 -- Kind regards, Yorick Hardy
Re: CVS commit: src/sys/dev
Dear Ryo, On 2019-07-09, Ryo ONODERA wrote: > Module Name: src > Committed By: ryoon > Date: Tue Jul 9 12:52:51 UTC 2019 > > Modified Files: > src/sys/dev/hid: hidms.c hidms.h > src/sys/dev/i2c: ims.c > > Log Message: > Add tpcalib, touch panel calibration to ims(4) > > Suggested by ryo@ at Japan NetBSD Users' Group BOF 2019-07-06. > > > To generate a diff of this commit: > cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hid/hidms.c > cvs rdiff -u -r1.1 -r1.2 src/sys/dev/hid/hidms.h > cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/ims.c > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. I think this change has the side effect that ums(4) devices which report absolute coordinates seem to stop "moving" because tcpalib_init is never called for these devices. Is the patch below okay? Or, should hidms call tcpalib_init? (I tested the patch with an ACECAD digimemo.) -- Kind regards, Yorick Hardy Index: sys/dev/usb/ums.c === RCS file: /cvsroot/src/sys/dev/usb/ums.c,v retrieving revision 1.93 diff -u -r1.93 ums.c --- sys/dev/usb/ums.c 5 May 2019 03:17:54 - 1.93 +++ sys/dev/usb/ums.c 24 Jul 2019 21:29:35 - @@ -192,6 +192,7 @@ } } + tpcalib_init(>sc_ms.sc_tpcalib); hidms_attach(self, >sc_ms, _accessops); }
CVS commit: src/share/mk
Module Name:src Committed By: yhardy Date: Fri Oct 22 16:48:38 UTC 2010 Modified Files: src/share/mk: bsd.x11.mk Log Message: Fix pkg-config substitution for glu To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.89 src/share/mk/bsd.x11.mk:1.90 --- src/share/mk/bsd.x11.mk:1.89 Tue Aug 17 08:40:57 2010 +++ src/share/mk/bsd.x11.mk Fri Oct 22 16:48:38 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.89 2010/08/17 08:40:57 christos Exp $ +# $NetBSD: bsd.x11.mk,v 1.90 2010/10/22 16:48:38 yhardy Exp $ .include bsd.init.mk @@ -310,7 +310,7 @@ s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \ s,@GL_PC_CFLAGS@,,; \ s,@GLU_LIB@,GLU,; \ - s,@GLU_PC_REQ@,osmesa,; \ + s,@GLU_PC_REQ@,gl,; \ s,@GLU_PC_REQ_PRIV@,,; \ s,@GLU_PC_LIB_PRIV@,-lGLU,; \ s,@GLU_PC_CFLAGS@,,; \
CVS commit: src/share/mk
Module Name:src Committed By: yhardy Date: Fri Oct 22 16:48:38 UTC 2010 Modified Files: src/share/mk: bsd.x11.mk Log Message: Fix pkg-config substitution for glu To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 19:56:01 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
Don't link libOSMesa, this functionality is provided by mesa_dri.so.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/i965/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.6 src/external/mit/xorg/lib/dri/i915/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.6 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/07 19:56:01 yhardy Exp $
MODULE= i915
@@ -59,6 +59,5 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.8 src/external/mit/xorg/lib/dri/i965/Makefile:1.9
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.8 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/07 19:56:01 yhardy Exp $
MODULE= i965
@@ -90,6 +90,5 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 20:04:16 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/libmesa: Makefile
Log Message:
i915 and i965 dri modules need glapi.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/libmesa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.5
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Wed Apr 7 20:04:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile,v 1.5 2010/04/07 20:04:16 yhardy Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
+MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: yhardy Date: Wed Apr 7 19:56:01 UTC 2010 Modified Files: src/external/mit/xorg/lib/dri/i915: Makefile src/external/mit/xorg/lib/dri/i965: Makefile Log Message: Don't link libOSMesa, this functionality is provided by mesa_dri.so. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i915/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/i965/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: yhardy Date: Tue Feb 2 19:42:32 UTC 2010 Modified Files: src/distrib/notes/common: main Log Message: Add my name, as specified in the welcome message. To generate a diff of this commit: cvs rdiff -u -r1.455 -r1.456 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
