CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: riastradh Date: Sun Jun 23 20:47:17 UTC 2024 Modified Files: src/sys/arch/xen/xen: xen_clock.c Log Message: xen_rtc_set: Zero-initialize op before passing to hypervisor. PR port-xen/58362 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/xen/xen_clock.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/arch/xen/xen/xen_clock.c diff -u src/sys/arch/xen/xen/xen_clock.c:1.18 src/sys/arch/xen/xen/xen_clock.c:1.19 --- src/sys/arch/xen/xen/xen_clock.c:1.18 Sun Sep 10 15:23:01 2023 +++ src/sys/arch/xen/xen/xen_clock.c Sun Jun 23 20:47:17 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_clock.c,v 1.18 2023/09/10 15:23:01 bouyer Exp $ */ +/* $NetBSD: xen_clock.c,v 1.19 2024/06/23 20:47:17 riastradh Exp $ */ /*- * Copyright (c) 2017, 2018 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: xen_clock.c,v 1.18 2023/09/10 15:23:01 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xen_clock.c,v 1.19 2024/06/23 20:47:17 riastradh Exp $"); #include #include @@ -1106,6 +1106,7 @@ xen_rtc_set(struct todr_chip_handle *tod systime_ns = xen_global_systime_ns(); /* Set the hypervisor wall clock time. */ + memset(, 0, sizeof(op)); op.cmd = XENPF_settime; op.u.settime.secs = tvp->tv_sec; op.u.settime.nsecs = tvp->tv_usec * 1000;
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: riastradh Date: Sun Jun 23 20:47:17 UTC 2024 Modified Files: src/sys/arch/xen/xen: xen_clock.c Log Message: xen_rtc_set: Zero-initialize op before passing to hypervisor. PR port-xen/58362 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/xen/xen_clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jun 23 20:06:51 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el Log Message: more GCC 12 vs mips n64 set list fixes To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base32/ad.mipsn64eb cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el 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/base32/ad.mipsn64eb diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.10 src/distrib/sets/lists/base32/ad.mipsn64eb:1.11 --- src/distrib/sets/lists/base32/ad.mipsn64eb:1.10 Sun Jun 23 18:29:14 2024 +++ src/distrib/sets/lists/base32/ad.mipsn64eb Sun Jun 23 20:06:51 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mipsn64eb,v 1.10 2024/06/23 18:29:14 mrg Exp $ +# $NetBSD: ad.mipsn64eb,v 1.11 2024/06/23 20:06:51 mrg Exp $ ./lib/n32 base-compat-shlib compat ./lib/n32/npf base-compat-shlib compat,npf ./lib/n32/npf/ext_log.so base-compat-shlib compat,npf @@ -99,9 +99,11 @@ ./usr/lib/n32/libarchive.so base-compat-shlib compat ./usr/lib/n32/libarchive.so.5 base-compat-shlib compat ./usr/lib/n32/libarchive.so.5.1 base-compat-shlib compat -./usr/lib/n32/libasan.so base-compat-shlib compat,gcc,cxx -./usr/lib/n32/libasan.so.5 base-compat-shlib compat,gcc,cxx -./usr/lib/n32/libasan.so.5.0 base-compat-shlib compat,gcc,cxx +./usr/lib/n32/libasan.so base-compat-shlib compat,cxx,gcc +./usr/lib/n32/libasan.so.5 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/n32/libasan.so.5.0 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/n32/libasan.so.6 base-compat-shlib compat,cxx,gcc=12 +./usr/lib/n32/libasan.so.6.0 base-compat-shlib compat,cxx,gcc=12 ./usr/lib/n32/libasn1.so base-compat-shlib compat,kerberos ./usr/lib/n32/libasn1.so.10 base-compat-shlib compat,kerberos ./usr/lib/n32/libasn1.so.10.0 base-compat-shlib compat,kerberos @@ -214,7 +216,8 @@ ./usr/lib/n32/libgnumalloc.so.1.0 base-compat-shlib compat ./usr/lib/n32/libgomp.so base-compat-shlib compat,gcc ./usr/lib/n32/libgomp.so.2 base-compat-shlib compat,gcc -./usr/lib/n32/libgomp.so.2.1 base-compat-shlib compat,gcc +./usr/lib/n32/libgomp.so.2.1 base-compat-shlib compat,gcc=10 +./usr/lib/n32/libgomp.so.2.2 base-compat-shlib compat,gcc=12 ./usr/lib/n32/libgssapi.so base-compat-shlib compat,kerberos ./usr/lib/n32/libgssapi.so.12 base-compat-shlib compat,kerberos ./usr/lib/n32/libgssapi.so.12.0 base-compat-shlib compat,kerberos @@ -285,8 +288,10 @@ ./usr/lib/n32/libldap_r.so.6 base-compat-shlib compat,ldap ./usr/lib/n32/libldap_r.so.6.0 base-compat-shlib compat,ldap ./usr/lib/n32/liblsan.so base-compat-shlib compat,cxx,gcc -./usr/lib/n32/liblsan.so.2 base-compat-shlib compat,cxx,gcc -./usr/lib/n32/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc +./usr/lib/n32/liblsan.so.2 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/n32/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/n32/liblsan.so.3 base-compat-shlib compat,cxx,gcc=12 +./usr/lib/n32/liblsan.so.3.0 base-compat-shlib compat,cxx,gcc=12 ./usr/lib/n32/liblua.so base-compat-shlib compat ./usr/lib/n32/liblua.so.6 base-compat-shlib compat ./usr/lib/n32/liblua.so.6.1 base-compat-shlib compat @@ -431,9 +436,10 @@ ./usr/lib/n32/libssl.so base-compat-shlib compat ./usr/lib/n32/libssl.so.15 base-compat-shlib compat ./usr/lib/n32/libssl.so.15.0 base-compat-shlib compat -./usr/lib/n32/libstdc++.so base-compat-shlib compat,gcc,cxx,libstdcxx -./usr/lib/n32/libstdc++.so.9 base-compat-shlib compat,gcc,cxx,libstdcxx -./usr/lib/n32/libstdc++.so.9.0 base-compat-shlib compat,gcc,cxx,libstdcxx +./usr/lib/n32/libstdc++.so base-compat-shlib compat,cxx,libstdcxx,gcc +./usr/lib/n32/libstdc++.so.9 base-compat-shlib compat,cxx,libstdcxx,gcc +./usr/lib/n32/libstdc++.so.9.0 base-compat-shlib compat,cxx,libstdcxx,gcc=10 +./usr/lib/n32/libstdc++.so.9.1 base-compat-shlib compat,cxx,libstdcxx,gcc=12 ./usr/lib/n32/libtermcap.so base-compat-shlib compat ./usr/lib/n32/libtermcap.so.0 base-compat-shlib compat ./usr/lib/n32/libtermcap.so.0.6 base-compat-shlib compat @@ -446,9 +452,11 @@ ./usr/lib/n32/libtre.so base-compat-shlib compat ./usr/lib/n32/libtre.so.0 base-compat-shlib compat ./usr/lib/n32/libtre.so.0.8 base-compat-shlib compat -./usr/lib/n32/libubsan.so base-compat-shlib compat,gcc,cxx -./usr/lib/n32/libubsan.so.4 base-compat-shlib compat,gcc,cxx -./usr/lib/n32/libubsan.so.4.0 base-compat-shlib compat,gcc,cxx +./usr/lib/n32/libubsan.so base-compat-shlib compat,cxx,gcc +./usr/lib/n32/libubsan.so.4 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/n32/libubsan.so.4.0
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jun 23 20:06:51 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el Log Message: more GCC 12 vs mips n64 set list fixes To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base32/ad.mipsn64eb cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 19:37:11 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Match Linux fault routine return code actions.
Omit needless EINTR interception -- this is now handled by
i915_error_to_vmf_fault.
Earlier revert was over a false alarm -- bisection shows the new
warnings arose from linux_pci.c 1.29 here:
https://mail-index.netbsd.org/source-changes/2024/06/23/msg151929.html
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.26 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.27
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.26 Sun Jun 23 14:37:41 2024
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Jun 23 19:37:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.26 2024/06/23 14:37:41 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.27 2024/06/23 19:37:11 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.26 2024/06/23 14:37:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.27 2024/06/23 19:37:11 riastradh Exp $");
#include
#include
@@ -252,14 +252,14 @@ compute_partial_view(const struct drm_i9
*/
int pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, unsigned);
#define pmap_enter pmap_enter_default
+#endif
+#ifdef __NetBSD__
static int
i915_error_to_vmf_fault(int err)
-{
- return err;
-}
#else
static vm_fault_t i915_error_to_vmf_fault(int err)
+#endif
{
switch (err) {
default:
@@ -269,11 +269,19 @@ static vm_fault_t i915_error_to_vmf_faul
case -EFAULT: /* purged object */
case -ENODEV: /* bad object, how did you get here! */
case -ENXIO: /* unable to access backing store (on device) */
+#ifdef __NetBSD__
+ return EINVAL; /* SIGBUS */
+#else
return VM_FAULT_SIGBUS;
+#endif
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+#ifdef __NetBSD__
+ return ENOMEM;
+#else
return VM_FAULT_OOM;
+#endif
case 0:
case -EAGAIN:
@@ -284,10 +292,13 @@ static vm_fault_t i915_error_to_vmf_faul
* EBUSY is ok: this just means that another thread
* already did the job.
*/
+#ifdef __NetBSD__
+ return 0; /* retry access in userland */
+#else
return VM_FAULT_NOPAGE;
+#endif
}
}
-#endif
#ifdef __NetBSD__
static int
@@ -313,7 +324,7 @@ static vm_fault_t vm_fault_cpu(struct vm
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) && write))
#ifdef __NetBSD__
- return -EFAULT;
+ return EINVAL; /* SIGBUS */
#else
return VM_FAULT_SIGBUS;
#endif
@@ -420,7 +431,7 @@ static vm_fault_t vm_fault_gtt(struct vm
/* Sanity check that we allow writing into this object */
if (i915_gem_object_is_readonly(obj) && write)
#ifdef __NetBSD__
- return -EFAULT;
+ return EINVAL; /* SIGBUS */
#else
return VM_FAULT_SIGBUS;
#endif
@@ -588,12 +599,11 @@ i915_gem_fault(struct uvm_faultinfo *ufi
case I915_MMAP_TYPE_WC:
case I915_MMAP_TYPE_WB:
case I915_MMAP_TYPE_UC:
- /* XXX errno Linux->NetBSD */
- error = -vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
+ error = vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
case I915_MMAP_TYPE_GTT:
- error = -vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
+ error = vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
default:
@@ -602,16 +612,8 @@ i915_gem_fault(struct uvm_faultinfo *ufi
}
uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
-
- /*
- * Remap EINTR to success, so that we return to userland.
- * On the way out, we'll deliver the signal, and if the signal
- * is not fatal then the user code which faulted will most likely
- * fault again, and we'll come back here for another try.
- */
- if (error == EINTR)
- error = 0;
-
+ KASSERT(error != EINTR);
+ KASSERT(error != ERESTART);
return error;
}
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src Committed By: riastradh Date: Sun Jun 23 19:37:11 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c Log Message: i915: Match Linux fault routine return code actions. Omit needless EINTR interception -- this is now handled by i915_error_to_vmf_fault. Earlier revert was over a false alarm -- bisection shows the new warnings arose from linux_pci.c 1.29 here: https://mail-index.netbsd.org/source-changes/2024/06/23/msg151929.html To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: riastradh Date: Sun Jun 23 18:36:06 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc/3RDPARTY: Update drm entry. To generate a diff of this commit: cvs rdiff -u -r1.2016 -r1.2017 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2016 src/doc/3RDPARTY:1.2017 --- src/doc/3RDPARTY:1.2016 Sat Jun 22 20:10:32 2024 +++ src/doc/3RDPARTY Sun Jun 23 18:36:05 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2016 2024/06/22 20:10:32 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.2017 2024/06/23 18:36:05 riastradh Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -368,33 +368,38 @@ Please submit all changes upstream. Import using the import-src make target. Package: drm -Version: Linux 3.15 -Current Vers: ? +Version: Linux 5.6-rc3, upstream tag v5.6-rc3 +Current Vers: Linux 6.6 (LTS), upstream branch linux-6.6.y, tag v6.6.35 Maintainer: Intel, AMD, Linux kernel developers -Archive Site: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -Home Page: http://dri.freedesktop.org/ +Archive Site: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +Home Page: https://dri.freedesktop.org/ Mailing List: dri-de...@lists.freedesktop.org Responsible: riastradh License: BSD Location: sys/external/bsd/drm2/dist +Vendor tag: LINUX +Release tag: linux-drm-vX-Y(-rcZ) (formerly linux-X-Y(-rcZ)-drm-bsd) Notes: Graphics drivers. Talk to riastradh@ about updates. When importing from Linux, we map drivers/gpu/drm -> sys/external/bsd/drm2/dist/drm include/drm -> sys/external/bsd/drm2/dist/include/drm - include/uapi/drm -> sys/external/bsd/drm2/dist/uapi/drm + include/uapi/drm -> sys/external/bsd/drm2/dist/include/uapi/drm GPL sources are excluded. In the future, we may import them into -external/gpl2/drm2 and build them as kernel modules. Nouveau sources -(drivers/gpu/drm/nouveau in Linux) must first be processed with the -script sys/external/bsd/drm2/nouveau/nouveau2netbsd, about which see -the source for details. -Vendor tag:LINUX -Release tag: linux-X-Y(-rcZ)-drm-bsd - (nouveau got reimported as linux-3-15-drm-bsd-reimport-nouveau) -I neglected to add RCSIDs in the last import (except for nouveau, for -which nouveau2netbsd adds them). For the next import, remember to add -them! - +external/gpl2/drm2 and build them as kernel modules. Sources are +processed with prepare-import.sh first, as well as: +- amdgpu/amdgpu2netbsd +- i915drm/i915drmkms2netbsd +- radeon/radeon2netbsd +- drm/drm2netbsd +- nouveau/nouveau2netbsd +- vmwgfx/vmwgfx2netbsd +Past vendor release tags: +- linux-3-6-rc8-drm2-bsd +- linux-3-15-drm-bsd +- linux-3-15-drm-bsd-reimport-nouveau +- linux-drm-v4-4-143 +- linux-drm-v5-6-rc3 Package: ekermit Version: 1.7
CVS commit: src/doc
Module Name:src Committed By: riastradh Date: Sun Jun 23 18:36:06 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc/3RDPARTY: Update drm entry. To generate a diff of this commit: cvs rdiff -u -r1.2016 -r1.2017 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jun 23 18:29:14 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/base64: ad.mips64eb ad.mips64el src/distrib/sets/lists/debug32: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug64: ad.mips64eb ad.mips64el Log Message: fix mips64 sets for MKPAM=no, MKDEBUG=yes, and HAVE_GCC=12. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/ad.mips64eb cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base32/ad.mips64el cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.mipsn64eb cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base64/ad.mips64eb \ src/distrib/sets/lists/base64/ad.mips64el cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug64/ad.mips64eb \ src/distrib/sets/lists/debug64/ad.mips64el 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/base32/ad.mips64eb diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.6 src/distrib/sets/lists/base32/ad.mips64eb:1.7 --- src/distrib/sets/lists/base32/ad.mips64eb:1.6 Mon Jun 10 07:57:10 2024 +++ src/distrib/sets/lists/base32/ad.mips64eb Sun Jun 23 18:29:14 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.6 2024/06/10 07:57:10 kre Exp $ +# $NetBSD: ad.mips64eb,v 1.7 2024/06/23 18:29:14 mrg Exp $ ./lib/64 base-compat-shlib compat ./lib/o32 base-compat-shlib compat ./lib/o32/npf base-compat-shlib compat,npf @@ -90,9 +90,11 @@ ./usr/lib/o32/libarchive.so base-compat-shlib compat ./usr/lib/o32/libarchive.so.5 base-compat-shlib compat ./usr/lib/o32/libarchive.so.5.1 base-compat-shlib compat -./usr/lib/o32/libasan.so base-compat-shlib compat,gcc,cxx -./usr/lib/o32/libasan.so.5 base-compat-shlib compat,gcc,cxx -./usr/lib/o32/libasan.so.5.0 base-compat-shlib compat,gcc,cxx +./usr/lib/o32/libasan.so base-compat-shlib compat,cxx,gcc +./usr/lib/o32/libasan.so.5 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/o32/libasan.so.5.0 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/o32/libasan.so.6 base-compat-shlib compat,cxx,gcc=12 +./usr/lib/o32/libasan.so.6.0 base-compat-shlib compat,cxx,gcc=12 ./usr/lib/o32/libasn1.so base-compat-shlib compat,kerberos ./usr/lib/o32/libasn1.so.10 base-compat-shlib compat,kerberos ./usr/lib/o32/libasn1.so.10.0 base-compat-shlib compat,kerberos @@ -205,7 +207,8 @@ ./usr/lib/o32/libgnumalloc.so.1.0 base-compat-shlib compat ./usr/lib/o32/libgomp.so base-compat-shlib compat,gcc ./usr/lib/o32/libgomp.so.2 base-compat-shlib compat,gcc -./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,gcc +./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,gcc=10 +./usr/lib/o32/libgomp.so.2.2 base-compat-shlib compat,gcc=12 ./usr/lib/o32/libgssapi.so base-compat-shlib compat,kerberos ./usr/lib/o32/libgssapi.so.12 base-compat-shlib compat,kerberos ./usr/lib/o32/libgssapi.so.12.0 base-compat-shlib compat,kerberos @@ -276,8 +279,10 @@ ./usr/lib/o32/libldap_r.so.6 base-compat-shlib compat,ldap ./usr/lib/o32/libldap_r.so.6.0 base-compat-shlib compat,ldap ./usr/lib/o32/liblsan.so base-compat-shlib compat,cxx,gcc -./usr/lib/o32/liblsan.so.2 base-compat-shlib compat,cxx,gcc -./usr/lib/o32/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc +./usr/lib/o32/liblsan.so.2 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/o32/liblsan.so.2.0 base-compat-shlib compat,cxx,gcc=10 +./usr/lib/o32/liblsan.so.3 base-compat-shlib compat,cxx,gcc=12 +./usr/lib/o32/liblsan.so.3.0 base-compat-shlib compat,cxx,gcc=12 ./usr/lib/o32/liblua.so base-compat-shlib compat ./usr/lib/o32/liblua.so.6 base-compat-shlib compat ./usr/lib/o32/liblua.so.6.1 base-compat-shlib compat @@ -323,9 +328,9 @@ ./usr/lib/o32/libp2k.so base-compat-shlib compat ./usr/lib/o32/libp2k.so.2 base-compat-shlib compat ./usr/lib/o32/libp2k.so.2.0 base-compat-shlib compat -./usr/lib/o32/libpam.so base-compat-shlib compat -./usr/lib/o32/libpam.so.4 base-compat-shlib compat -./usr/lib/o32/libpam.so.4.1 base-compat-shlib compat +./usr/lib/o32/libpam.so base-compat-shlib compat,pam +./usr/lib/o32/libpam.so.4 base-compat-shlib compat,pam +./usr/lib/o32/libpam.so.4.1 base-compat-shlib compat,pam ./usr/lib/o32/libpanel.so base-compat-shlib compat ./usr/lib/o32/libpanel.so.3 base-compat-shlib compat ./usr/lib/o32/libpanel.so.3.0 base-compat-shlib compat @@ -422,9 +427,10 @@ ./usr/lib/o32/libssl.so base-compat-shlib compat ./usr/lib/o32/libssl.so.15
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sun Jun 23 18:29:14 UTC 2024 Modified Files: src/distrib/sets/lists/base32: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/base64: ad.mips64eb ad.mips64el src/distrib/sets/lists/debug32: ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el src/distrib/sets/lists/debug64: ad.mips64eb ad.mips64el Log Message: fix mips64 sets for MKPAM=no, MKDEBUG=yes, and HAVE_GCC=12. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base32/ad.mips64eb cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base32/ad.mips64el cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.mipsn64eb cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base64/ad.mips64eb \ src/distrib/sets/lists/base64/ad.mips64el cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug64/ad.mips64eb \ src/distrib/sets/lists/debug64/ad.mips64el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Sun Jun 23 17:27:29 UTC 2024
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add Brainboxes puc(4) devices
>From Cameron Williams in PR 58358.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/pci/pucdata.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/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.115 src/sys/dev/pci/pucdata.c:1.116
--- src/sys/dev/pci/pucdata.c:1.115 Fri Feb 9 22:08:36 2024
+++ src/sys/dev/pci/pucdata.c Sun Jun 23 17:27:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.115 2024/02/09 22:08:36 andvar Exp $ */
+/* $NetBSD: pucdata.c,v 1.116 2024/06/23 17:27:29 jakllsch Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.115 2024/02/09 22:08:36 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.116 2024/06/23 17:27:29 jakllsch Exp $");
#include
#include
@@ -222,6 +222,438 @@ const struct puc_device_description puc_
},
/*
+ * Brainboxes Ltd
+ */
+ { "Brainboxes IS-100",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_IS100, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ },
+ },
+ { "Brainboxes IS-200",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_IS200, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes IS-300",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_IS300, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ },
+ },
+ { "Brainboxes IS-400",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_IS400, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0010, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0018, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-101",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC101, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-203",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC203, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-203",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC203R3, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-246",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC246, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-246",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC246R3, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-253",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC253, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-257",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC257, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-257",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC257R3, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-257",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC257R4, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-260",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC260, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0008, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0010, COM_FREQ },
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x0018, COM_FREQ },
+ },
+ },
+ { "Brainboxes UC-268",
+ { PCI_VENDOR_BRAINBOXES, PCI_PRODUCT_BRAINBOXES_UC268, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR2, 0x,
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sun Jun 23 17:27:29 UTC 2024 Modified Files: src/sys/dev/pci: pucdata.c Log Message: Add Brainboxes puc(4) devices >From Cameron Williams in PR 58358. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/pci/pucdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sun Jun 23 17:26:03 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. For PR 58358 To generate a diff of this commit: cvs rdiff -u -r1.1485 -r1.1486 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1484 -r1.1485 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sun Jun 23 17:26:03 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. For PR 58358 To generate a diff of this commit: cvs rdiff -u -r1.1485 -r1.1486 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1484 -r1.1485 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sun Jun 23 17:22:51 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Brainboxes and devices >From Cameron Williams in PR 58358. To generate a diff of this commit: cvs rdiff -u -r1.1506 -r1.1507 src/sys/dev/pci/pcidevs 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/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1506 src/sys/dev/pci/pcidevs:1.1507 --- src/sys/dev/pci/pcidevs:1.1506 Sun May 12 23:30:07 2024 +++ src/sys/dev/pci/pcidevs Sun Jun 23 17:22:51 2024 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1506 2024/05/12 23:30:07 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1507 2024/06/23 17:22:51 jakllsch Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -545,6 +545,7 @@ vendor FORTEMEDIA 0x1319 Forte Media vendor SIIG 0x131f Siig vendor MICROMEMORY 0x1332 Micro Memory vendor DOMEX 0x134a Domex +vendor BRAINBOXES 0x135a Brainboxes Ltd vendor QUATECH 0x135c Quatech vendor LMC 0x1376 LAN Media vendor NETGEAR 0x1385 Netgear @@ -2506,6 +2507,59 @@ product BIT3 PCIVME2706 0x0300 PCI-VME product BLUESTEEL 5501 0x 5501 product BLUESTEEL 5601 0x5601 5601 +/* Brainboxes products */ +product BRAINBOXES UC268 0x0841 Brainboxes UC-268 +product BRAINBOXES UC257 0x0861 Brainboxes UC-257 +product BRAINBOXES UC257R3 0x0862 Brainboxes UC-257 +product BRAINBOXES UC257R4 0x0863 Brainboxes UC-257 +product BRAINBOXES UC279 0x0881 Brainboxes UC-279 +product BRAINBOXES UC313 0x08a1 Brainboxes UC-313 +product BRAINBOXES UC313R3 0x08a2 Brainboxes UC-313 +product BRAINBOXES UC313R4 0x08a3 Brainboxes UC-313 +product BRAINBOXES UC310 0x08c1 Brainboxes UC-310 +product BRAINBOXES UC302 0x08e1 Brainboxes UC-302 +product BRAINBOXES UC302R3 0x08e2 Brainboxes UC-302 +product BRAINBOXES UC302R4 0x08e3 Brainboxes UC-302 +product BRAINBOXES UC431 0x0901 Brainboxes UC-431 +product BRAINBOXES UC420 0x0921 Brainboxes UC-420 +product BRAINBOXES UC475 0x0981 Brainboxes UC-475 +product BRAINBOXES UC475R3 0x0982 Brainboxes UC-475 +product BRAINBOXES UC607 0x09a1 Brainboxes UC-607 +product BRAINBOXES UC607R3 0x09a2 Brainboxes UC-607 +product BRAINBOXES UC607R4 0x09a3 Brainboxes UC-607 +product BRAINBOXES UC324 0x0a61 Brainboxes UC-324 +product BRAINBOXES UC357 0x0a81 Brainboxes UC-357 +product BRAINBOXES UC357R3 0x0a82 Brainboxes UC-357 +product BRAINBOXES UC357R4 0x0a83 Brainboxes UC-357 +product BRAINBOXES UC246 0x0aa1 Brainboxes UC-246 +product BRAINBOXES UC246R3 0x0aa2 Brainboxes UC-246 +product BRAINBOXES UP189 0x0ac1 Brainboxes UP-189 +product BRAINBOXES UP189R3 0x0ac2 Brainboxes UP-189 +product BRAINBOXES UP189R4 0x0ac3 Brainboxes UP-189 +product BRAINBOXES UC346 0x0b01 Brainboxes UC-346 +product BRAINBOXES UC346R3 0x0b02 Brainboxes UC-346 +product BRAINBOXES UP200 0x0b21 Brainboxes UP-200 +product BRAINBOXES UP200R3 0x0b22 Brainboxes UP-200 +product BRAINBOXES UP200R4 0x0b23 Brainboxes UP-200 +product BRAINBOXES UC101 0x0ba1 Brainboxes UC-101 +product BRAINBOXES UC203 0x0bc1 Brainboxes UC-203 +product BRAINBOXES UC203R3 0x0bc2 Brainboxes UC-203 +product BRAINBOXES UP869 0x0c01 Brainboxes UP-869 +product BRAINBOXES UP869R3 0x0c02 Brainboxes UP-869 +product BRAINBOXES UP869R4 0x0c03 Brainboxes UP-869 +product BRAINBOXES UP880 0x0c21 Brainboxes UP-880 +product BRAINBOXES UP880R3 0x0c22 Brainboxes UP-880 +product BRAINBOXES UP880R4 0x0c23 Brainboxes UP-880 +product BRAINBOXES UC368 0x0c41 Brainboxes UC-368 +product BRAINBOXES UC253 0x0ca1 Brainboxes UC-253 +product BRAINBOXES UC260 0x0d21 Brainboxes UC-260 +product BRAINBOXES UC836 0x0d41 Brainboxes UC-836 +product BRAINBOXES IS100 0x0d60 Intashield IS-100 +product BRAINBOXES IS200 0x0d80 Intashield IS-200 +product BRAINBOXES IS300 0x0da0 Intashield IS-300 +product BRAINBOXES IS400 0x0dc0 Intashield IS-400 +product BRAINBOXES UC414 0x0e61 Brainboxes UC-414 + /* Broadcom products */ product BROADCOM BCM5752 0x1600 BCM5752 NetXtreme 1000baseT Ethernet product BROADCOM BCM5752M 0x1601 BCM5752M NetXtreme 1000baseT Ethernet
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Sun Jun 23 17:22:51 UTC 2024 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Brainboxes and devices >From Cameron Williams in PR 58358. To generate a diff of this commit: cvs rdiff -u -r1.1506 -r1.1507 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi/acpica
Module Name:src Committed By: andvar Date: Sun Jun 23 15:21:52 UTC 2024 Modified Files: src/sys/dev/acpi/acpica: OsdHardware.c Log Message: s/machinde/machine/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpica/OsdHardware.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/acpi/acpica/OsdHardware.c diff -u src/sys/dev/acpi/acpica/OsdHardware.c:1.14 src/sys/dev/acpi/acpica/OsdHardware.c:1.15 --- src/sys/dev/acpi/acpica/OsdHardware.c:1.14 Tue May 31 20:28:57 2022 +++ src/sys/dev/acpi/acpica/OsdHardware.c Sun Jun 23 15:21:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: OsdHardware.c,v 1.14 2022/05/31 20:28:57 mrg Exp $ */ +/* $NetBSD: OsdHardware.c,v 1.15 2024/06/23 15:21:52 andvar Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -44,7 +44,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.14 2022/05/31 20:28:57 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.15 2024/06/23 15:21:52 andvar Exp $"); #include "pci.h" @@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: OsdHardware. /* * ACPICA doesn't provide much in the way of letting us know which * hardware resources it wants to use. We therefore have to resort - * to calling machinde-dependent code to do the access for us. + * to calling machine-dependent code to do the access for us. */ /*
CVS commit: src/sys/dev/acpi/acpica
Module Name:src Committed By: andvar Date: Sun Jun 23 15:21:52 UTC 2024 Modified Files: src/sys/dev/acpi/acpica: OsdHardware.c Log Message: s/machinde/machine/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpica/OsdHardware.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 14:37:41 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Omit needless i915_gem_object_pin/unpin_pages cycle in fault.
vm_fault_cpu and vm_fault_gtt, called by i915_gem_fault, already do
the pinning and unpinning internally, so there is no need for
i915_gem_fault to do it.
No functional change intended, except that the transient pin count
will be one lower than before during the fault routine (but it will
still be positive).
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.25 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.25 Sun Jun 23 13:01:44 2024
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Jun 23 14:37:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.25 2024/06/23 13:01:44 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.26 2024/06/23 14:37:41 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.25 2024/06/23 13:01:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.26 2024/06/23 14:37:41 riastradh Exp $");
#include
#include
@@ -565,7 +565,6 @@ i915_gem_fault(struct uvm_faultinfo *ufi
struct i915_mmap_offset *mmo =
container_of(uobj, struct i915_mmap_offset, uobj);
struct drm_i915_gem_object *obj = mmo->obj;
- bool pinned = false;
int error;
KASSERT(rw_lock_held(obj->base.filp->vmobjlock));
@@ -585,12 +584,6 @@ i915_gem_fault(struct uvm_faultinfo *ufi
*/
rw_exit(obj->base.filp->vmobjlock);
- /* XXX errno Linux->NetBSD */
- error = -i915_gem_object_pin_pages(obj);
- if (error)
- goto out;
- pinned = true;
-
switch (mmo->mmap_type) {
case I915_MMAP_TYPE_WC:
case I915_MMAP_TYPE_WB:
@@ -608,8 +601,6 @@ i915_gem_fault(struct uvm_faultinfo *ufi
mmo->mmap_type);
}
-out: if (pinned)
- i915_gem_object_unpin_pages(obj);
uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, NULL);
/*
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src Committed By: riastradh Date: Sun Jun 23 14:37:41 UTC 2024 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c Log Message: i915: Omit needless i915_gem_object_pin/unpin_pages cycle in fault. vm_fault_cpu and vm_fault_gtt, called by i915_gem_fault, already do the pinning and unpinning internally, so there is no need for i915_gem_fault to do it. No functional change intended, except that the transient pin count will be one lower than before during the fault routine (but it will still be positive). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 13:01:44 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
Revert "i915: Reduce diff in fault routine."
Evidently this had more side effects than I thought:
warning: ../../../../external/bsd/drm2/dist/drm/i915/intel_uncore.c:1197:
Unclaimed read from register 0x61204
...
{drm:netbsd:wait_panel_status+0x74} *ERROR* PPS state mismatch
...
warning: ../../../../external/bsd/drm2/dist/drm/i915/display/intel_dp.c:1175:
eDP powered off while attempting aux channel communication.
...
warning: ../../../../external/bsd/drm2/dist/drm/i915/display/intel_dp.c:5616:
Missing case (((&(dev_priv)->__info)->gen) == 9)
So let's roll it back until I have a better understanding of what
changed.
Between making the change and writing the commit message, I forgot
that the change affected the errno values returned by the fault
routine, which may affect how uvm handles the fault failure --
whether to retry, wait for memory and retry, or fail, or what.
Perhaps that explains the issue.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.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/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.24 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.25
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.24 Sun Jun 23 00:53:16 2024
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Jun 23 13:01:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.24 2024/06/23 00:53:16 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.25 2024/06/23 13:01:44 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.24 2024/06/23 00:53:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.25 2024/06/23 13:01:44 riastradh Exp $");
#include
#include
@@ -252,14 +252,14 @@ compute_partial_view(const struct drm_i9
*/
int pmap_enter_default(pmap_t, vaddr_t, paddr_t, vm_prot_t, unsigned);
#define pmap_enter pmap_enter_default
-#endif
-#ifdef __NetBSD__
static int
i915_error_to_vmf_fault(int err)
+{
+ return err;
+}
#else
static vm_fault_t i915_error_to_vmf_fault(int err)
-#endif
{
switch (err) {
default:
@@ -269,19 +269,11 @@ static vm_fault_t i915_error_to_vmf_faul
case -EFAULT: /* purged object */
case -ENODEV: /* bad object, how did you get here! */
case -ENXIO: /* unable to access backing store (on device) */
-#ifdef __NetBSD__
- return EINVAL; /* SIGBUS */
-#else
return VM_FAULT_SIGBUS;
-#endif
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
-#ifdef __NetBSD__
- return ENOMEM;
-#else
return VM_FAULT_OOM;
-#endif
case 0:
case -EAGAIN:
@@ -292,13 +284,10 @@ static vm_fault_t i915_error_to_vmf_faul
* EBUSY is ok: this just means that another thread
* already did the job.
*/
-#ifdef __NetBSD__
- return 0; /* retry access in userland */
-#else
return VM_FAULT_NOPAGE;
-#endif
}
}
+#endif
#ifdef __NetBSD__
static int
@@ -324,7 +313,7 @@ static vm_fault_t vm_fault_cpu(struct vm
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) && write))
#ifdef __NetBSD__
- return EINVAL; /* SIGBUS */
+ return -EFAULT;
#else
return VM_FAULT_SIGBUS;
#endif
@@ -431,7 +420,7 @@ static vm_fault_t vm_fault_gtt(struct vm
/* Sanity check that we allow writing into this object */
if (i915_gem_object_is_readonly(obj) && write)
#ifdef __NetBSD__
- return EINVAL; /* SIGBUS */
+ return -EFAULT;
#else
return VM_FAULT_SIGBUS;
#endif
@@ -576,6 +565,7 @@ i915_gem_fault(struct uvm_faultinfo *ufi
struct i915_mmap_offset *mmo =
container_of(uobj, struct i915_mmap_offset, uobj);
struct drm_i915_gem_object *obj = mmo->obj;
+ bool pinned = false;
int error;
KASSERT(rw_lock_held(obj->base.filp->vmobjlock));
@@ -595,15 +585,22 @@ i915_gem_fault(struct uvm_faultinfo *ufi
*/
rw_exit(obj->base.filp->vmobjlock);
+ /* XXX errno Linux->NetBSD */
+ error = -i915_gem_object_pin_pages(obj);
+ if (error)
+ goto out;
+ pinned = true;
+
switch (mmo->mmap_type) {
case I915_MMAP_TYPE_WC:
case I915_MMAP_TYPE_WB:
case I915_MMAP_TYPE_UC:
- error = vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
+ /* XXX errno Linux->NetBSD */
+ error = -vm_fault_cpu(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
case I915_MMAP_TYPE_GTT:
- error = vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
+ error = -vm_fault_gtt(ufi, mmo, vaddr, pps, npages, centeridx,
flags);
break;
default:
@@ -611,7 +608,19 @@
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915/gem
Module Name:src
Committed By: riastradh
Date: Sun Jun 23 13:01:44 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
Revert "i915: Reduce diff in fault routine."
Evidently this had more side effects than I thought:
warning: ../../../../external/bsd/drm2/dist/drm/i915/intel_uncore.c:1197:
Unclaimed read from register 0x61204
...
{drm:netbsd:wait_panel_status+0x74} *ERROR* PPS state mismatch
...
warning: ../../../../external/bsd/drm2/dist/drm/i915/display/intel_dp.c:1175:
eDP powered off while attempting aux channel communication.
...
warning: ../../../../external/bsd/drm2/dist/drm/i915/display/intel_dp.c:5616:
Missing case (((&(dev_priv)->__info)->gen) == 9)
So let's roll it back until I have a better understanding of what
changed.
Between making the change and writing the commit message, I forgot
that the change affected the errno values returned by the fault
routine, which may affect how uvm handles the fault failure --
whether to retry, wait for memory and retry, or fail, or what.
Perhaps that explains the issue.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sun Jun 23 06:27:38 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Explain HAVE_VIS situation in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/bsd/tmux/usr.bin/tmux/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/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.36
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35 Sat Jun 22 23:51:26 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sun Jun 23 06:27:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/06/22 23:51:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/06/23 06:27:38 wiz Exp $
.include
@@ -169,7 +169,18 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
-# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT necessary due to local patches
+# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually
+#
+# HAVE_BSD_GETOPT:
+# Use the NetBSD libc getopt functions instead of the compat functions
+# provided by tmux (done using a local patch).
+#
+# HAVE_VIS:
+# tmux assumes the OpenBSD variant of strnvis which has arguments
+# swapped compared to FreeBSD & NetBSD, see
+# https://github.com/tmux/tmux/pull/4015
+# We have a local patch that adapts the call to the NetBSD version,
+# so we don't need to use the compat code provided by tmux.
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sun Jun 23 06:27:38 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: Explain HAVE_VIS situation in a comment To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
