openbsd
2 years agoFix leak of esnxf if esn ore noesn are configured explicitly.
tobhe [Mon, 11 Apr 2022 20:41:21 +0000 (20:41 +0000)]
Fix leak of esnxf if esn ore noesn are configured explicitly.

2 years agoRefactor on how the subprocesses are started.
claudio [Mon, 11 Apr 2022 18:59:23 +0000 (18:59 +0000)]
Refactor on how the subprocesses are started.

Move the unveil and pledges to the actuall subprocesses and put all the
common code to start these into process_start(). Reduces the lenght of
main() a fair bit.
OK tb@

2 years agoKeep `fdp' locked until we finish the second loop of unp_externalize().
mvs [Mon, 11 Apr 2022 18:18:17 +0000 (18:18 +0000)]
Keep `fdp' locked until we finish the second loop of unp_externalize().
This prevents descriptors from being closed concurrently on receiver side.

ok bluhm@ claudio@

2 years agoRemove trailing spaces.
mpi [Mon, 11 Apr 2022 16:43:49 +0000 (16:43 +0000)]
Remove trailing spaces.

2 years agogpio: Add missing device_unref() calls
visa [Mon, 11 Apr 2022 14:30:05 +0000 (14:30 +0000)]
gpio: Add missing device_unref() calls

device_lookup() returns a reference that the caller has to release.

OK jca@

2 years agoSimplify SIA extension parsing further
tb [Mon, 11 Apr 2022 10:39:45 +0000 (10:39 +0000)]
Simplify SIA extension parsing further

Inline sbgp_sia_resource_entry() into sbgp_sia(). Add sbgp_sia_location()
to deduplicate sbgp_sia_resource_{notify,mft,carepo}(). Pull the GEN_URI
check into sbgp_sia_location() now that it doesn't have to be repeated
three times.

ok claudio

2 years agoSort RTYPE in case alphabetically and mention ASPA in the comment.
claudio [Mon, 11 Apr 2022 10:03:12 +0000 (10:03 +0000)]
Sort RTYPE in case alphabetically and mention ASPA in the comment.
No functional change.

2 years agoFix spamlogd's rc_pre to avoid creating pflog0 if spamd is disabled.
sthen [Mon, 11 Apr 2022 09:32:20 +0000 (09:32 +0000)]
Fix spamlogd's rc_pre to avoid creating pflog0 if spamd is disabled.
The conditional was not checked (prior to r1.2 the exit code from the
conditional was implicitly used as the exit code from the whole shell
function, but this wasn't adapted when pflog creation was added).
Reported/tested by Clint Pachl

2 years agoAdjust regress: test-cert now needs mft.c for rtype_from_file_extension().
tb [Mon, 11 Apr 2022 08:29:34 +0000 (08:29 +0000)]
Adjust regress: test-cert now needs mft.c for rtype_from_file_extension().

2 years agoMerge sbgp_sia() and sbgp_sia_resource()
tb [Mon, 11 Apr 2022 08:28:54 +0000 (08:28 +0000)]
Merge sbgp_sia() and sbgp_sia_resource()

These two functions are now short and easy, so there's no need for a split.
Also, pull the .mft extension check out of sbgp_sia_resource_mft() and use
rtype_from_file_extension() instead.

ok claudio

2 years agoSimplify cert_parse_pre()
tb [Mon, 11 Apr 2022 08:04:43 +0000 (08:04 +0000)]
Simplify cert_parse_pre()

Remove rc and c and check things the straightforward way. Avoids some
contorted code and shaves off a few lines.

ok claudio

2 years agodon't warn on output type 0 result in dm_edid_parser_send_cea()
jsg [Mon, 11 Apr 2022 06:50:58 +0000 (06:50 +0000)]
don't warn on output type 0 result in dm_edid_parser_send_cea()
shows on renoir when using HP ZR2440w display via hdmi
[drm] Unknown EDID CEA parser results

2 years agoLet the templated ASN.1 parse the SIA extension
tb [Mon, 11 Apr 2022 06:47:38 +0000 (06:47 +0000)]
Let the templated ASN.1 parse the SIA extension

Instead of using super low level ASN.1 fiddling, let libcrypto's templated
ASN.1 take care of parsing the SIA extension. This trivializes much of this
code.  Resolves one FIXME and adds a missing check for URI type of the SIA
repo resources.

ok claudio

2 years agodrm/connector: Fix typo in documentation
jsg [Mon, 11 Apr 2022 04:10:47 +0000 (04:10 +0000)]
drm/connector: Fix typo in documentation

From Maxime Ripard
b9cf1208af36f6552e6f3b8fdf364983e3cc8e60 in linux 5.15.y/5.15.33
dca384a3bf5af1c781cfa6aec63904bdb5018c36 in mainline linux

2 years agodrm/i915: Reject unsupported TMDS rates on ICL+
jsg [Mon, 11 Apr 2022 04:08:37 +0000 (04:08 +0000)]
drm/i915: Reject unsupported TMDS rates on ICL+

From Ville Syrjala
f5a0cf225f8d3cf06aff181b291a0ff32f4ad2c8 in linux 5.15.y/5.15.33
9cddf03b2af07443bebdc73cba21acb360c079e8 in mainline linux

2 years agodrm/i915: Fix PSF GV point mask when SAGV is not possible
jsg [Mon, 11 Apr 2022 04:06:32 +0000 (04:06 +0000)]
drm/i915: Fix PSF GV point mask when SAGV is not possible

From Ville Syrjala
beeebae6ea82979d0fdeaa5e2f8ce9949ec22a24 in linux 5.15.y/5.15.33
3ef8b5e19ead5a79600ea55f9549658281415893 in mainline linux

2 years agodrm/i915: Treat SAGV block time 0 as SAGV disabled
jsg [Mon, 11 Apr 2022 04:04:30 +0000 (04:04 +0000)]
drm/i915: Treat SAGV block time 0 as SAGV disabled

From Ville Syrjala
102cba6d5ae2378a8467504c71ac1008658f36c6 in linux 5.15.y/5.15.33
1937f3feb0e84089ae4065e09c871b8ab4676f01 in mainline linux

2 years agodrm/dp: Fix off-by-one in register cache size
jsg [Mon, 11 Apr 2022 04:01:52 +0000 (04:01 +0000)]
drm/dp: Fix off-by-one in register cache size

From Kees Cook
e912d697400c5f4bc8c1c8090416dad6c59cb28c in linux 5.15.y/5.15.33
d4da1f27396fb1dde079447a3612f4f512caed07 in mainline linux

2 years agodrm/i915/display: Fix HPD short pulse handling for eDP
jsg [Mon, 11 Apr 2022 03:57:39 +0000 (03:57 +0000)]
drm/i915/display: Fix HPD short pulse handling for eDP

From Jose Souza
7ff346ee019bcf3b008a56a43b7aac45e771479b in linux 5.15.y/5.15.33
3a84fd1ed53582b31e843a152ee3219e9e4ccb8c in mainline linux

2 years agodrm/amd/display: Remove vupdate_int_entry definition
jsg [Mon, 11 Apr 2022 03:55:26 +0000 (03:55 +0000)]
drm/amd/display: Remove vupdate_int_entry definition

From Maira Canal
bd443887ed2adbc7d89b12b6b2980024da1f8d31 in linux 5.15.y/5.15.33
3679b8518cd213c25d555553ef212e233faf698c in mainline linux

2 years agodrm/amd/display: Add affected crtcs to atomic state for dsc mst unplug
jsg [Mon, 11 Apr 2022 03:53:42 +0000 (03:53 +0000)]
drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug

From Roman Li
0f47edc22c2b7e4c1903d74c3992f09db9453d11 in linux 5.15.y/5.15.33
128f8ed5902a287a6bb4afe0ffdae8a80b2a64ec in mainline linux

2 years agodrm/amd/pm: enable pm sysfs write for one VF mode
jsg [Mon, 11 Apr 2022 03:51:41 +0000 (03:51 +0000)]
drm/amd/pm: enable pm sysfs write for one VF mode

From Yiqing Yao
ac98fdec111485b5eb88cb91d20473fb67631684 in linux 5.15.y/5.15.33
e610941c45bad75aa839af015c27d236ab6749e5 in mainline linux

2 years agodrm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function
jsg [Mon, 11 Apr 2022 03:50:08 +0000 (03:50 +0000)]
drm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function

From Tom Rix
b175bc58641032cfdb89f92afd76939be2ae22b4 in linux 5.15.y/5.15.33
430e6a0212b2a0eb1de5e9d47a016fa79edf3978 in mainline linux

2 years agodrm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
jsg [Mon, 11 Apr 2022 03:48:23 +0000 (03:48 +0000)]
drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()

From Zhou Qingyang
bdc7429708a0772d90c208975694f7c2133b1202 in linux 5.15.y/5.15.33
588a70177df3b1777484267584ef38ab2ca899a2 in mainline linux

2 years agodrm/edid: Split deep color modes between RGB and YUV444
jsg [Mon, 11 Apr 2022 03:46:07 +0000 (03:46 +0000)]
drm/edid: Split deep color modes between RGB and YUV444

From Maxime Ripard
da491fc54e4e387419948840636df15f4a611ec4 in linux 5.15.y/5.15.33
4adc33f36d80489339f1b43dfeee96bb9ea8e459 in mainline linux

2 years agodrm/edid: Don't clear formats if using deep color
jsg [Mon, 11 Apr 2022 03:41:03 +0000 (03:41 +0000)]
drm/edid: Don't clear formats if using deep color

From Maxime Ripard
19da408ab41c984d49c55582b265645b964b6619 in linux 5.15.y/5.15.33
75478b3b393bcbdca4e6da76fe3a9f1a4133ec5d in mainline linux

2 years agodrm/i915/gem: add missing boundary check in vm_access
jsg [Mon, 11 Apr 2022 03:38:46 +0000 (03:38 +0000)]
drm/i915/gem: add missing boundary check in vm_access

From Mastan Katragadda
312d3d4f49e12f97260bcf972c848c3562126a18 in linux 5.15.y/5.15.33
3886a86e7e6cc6ce2ce93c440fecd8f42aed0ce7 in mainline linux

2 years agodrm/i915/opregion: check port number bounds for SWSCI
jsg [Mon, 11 Apr 2022 03:36:37 +0000 (03:36 +0000)]
drm/i915/opregion: check port number bounds for SWSCI

From Jani Nikula
d8b8bd1d03ee7db8e7cb79748a70c2eef4dd706f in linux 5.15.y/5.15.33
24a644ebbfd3b13cda702f98907f9dd123e34bf9 in mainline linux

2 years agodrm/fb-helper: Mark screen buffers in system memory with FBINFO_VIRTFB
jsg [Mon, 11 Apr 2022 03:34:20 +0000 (03:34 +0000)]
drm/fb-helper: Mark screen buffers in system memory with FBINFO_VIRTFB

From Thomas Zimmermann
51f0af904fb621721d2c95c1eb349fb46af63a04 in linux 5.15.y/5.15.33
cd9f7f7ac5932129fe81b4c7559cfcb226ec7c5c in mainline linux

2 years agodrm/syncobj: flatten dma_fence_chains on transfer
jsg [Mon, 11 Apr 2022 03:31:42 +0000 (03:31 +0000)]
drm/syncobj: flatten dma_fence_chains on transfer

From Christian Koenig
7585d0f56f29b5a7900ba21ff9a1a9d48cbe9860 in linux 5.15.y/5.15.33
721255b52700b320c4ae2e23d57f7d9ad1db50b9 in mainline linux

2 years agodrm/edid: check basic audio support on CEA extension block
jsg [Mon, 11 Apr 2022 03:29:27 +0000 (03:29 +0000)]
drm/edid: check basic audio support on CEA extension block

From Cooper Chiou
6e72980d588e220adbc2469181735399ceb9f9a8 in linux 5.15.y/5.15.33
5662abf6e21338be6d085d6375d3732ac6147fd2 in mainline linux

2 years agodrm/amdgpu: only check for _PR3 on dGPUs
jsg [Mon, 11 Apr 2022 03:27:24 +0000 (03:27 +0000)]
drm/amdgpu: only check for _PR3 on dGPUs

From Alex Deucher
fe953e0f77e55d004a5b0c533262e389d01e3198 in linux 5.15.y/5.15.33
85ac2021fe3ace59cc0afd6edf005abad35625b0 in mainline linux

2 years agodrm/amdgpu: move PX checking into amdgpu_device_ip_early_init
jsg [Mon, 11 Apr 2022 03:24:33 +0000 (03:24 +0000)]
drm/amdgpu: move PX checking into amdgpu_device_ip_early_init

From Alex Deucher
0884abb259f180bc737cdb2c681d907b86f266e8 in linux 5.15.y/5.15.33
901e2be20dc55079997ea1885ea77fc72e6826e7 in mainline linux

2 years agoadd pci_upstream_bridge() and pci_pr3_present()
jsg [Mon, 11 Apr 2022 03:02:40 +0000 (03:02 +0000)]
add pci_upstream_bridge() and pci_pr3_present()
needed for changes to amdgpu_device.c in 5.15.y
for now always return false when checking for ACPI _PR3 method

2 years agoinclude dma-fence-array.h
jsg [Mon, 11 Apr 2022 01:28:50 +0000 (01:28 +0000)]
include dma-fence-array.h
needed for changes to drm_syncobj.c in 5.15.y

2 years agoFree vm_info_result in error paths.
dv [Sun, 10 Apr 2022 19:36:58 +0000 (19:36 +0000)]
Free vm_info_result in error paths.

vmd(8)'s get_info_vm() mallocs vm_info_result structs when using
the VMM_IOC_INFO ioctl. The error paths failed to free the resulting
objects.

Diff adapted from suggestions by jca@. ok mlarkin@.

2 years agoPrint a more accurate message when -v is used with -k
jca [Sun, 10 Apr 2022 18:05:39 +0000 (18:05 +0000)]
Print a more accurate message when -v is used with -k

Report and different proposal by "prx", ok millert@

2 years agoAdd more missing archs to "categories": aarch64, mips64el and powerpc64
jca [Sun, 10 Apr 2022 17:47:54 +0000 (17:47 +0000)]
Add more missing archs to "categories": aarch64, mips64el and powerpc64

The categories listing is long and maybe adding archs in there isn't
very relevant (any more?).

2 years agoPrint the strerror of the expected error. errno is not valid here since
claudio [Sun, 10 Apr 2022 14:08:35 +0000 (14:08 +0000)]
Print the strerror of the expected error. errno is not valid here since
bind(2) succeeded.

2 years agomips64: Enforce memory ordering on SMP rendezvous
visa [Sun, 10 Apr 2022 13:23:14 +0000 (13:23 +0000)]
mips64: Enforce memory ordering on SMP rendezvous

Make sure that each CPU sees the initiator's pre-action state when
running the action function, and that the initiator sees the combined
post-action state.

Use CPU_BUSY_CYCLE() when busy-waiting.

2 years agoSet ASN1_OBJECT_FLAG_DYNAMIC_DATA flag with t2i_ASN1_OBJECT_internal
inoguchi [Sun, 10 Apr 2022 12:42:33 +0000 (12:42 +0000)]
Set ASN1_OBJECT_FLAG_DYNAMIC_DATA flag with t2i_ASN1_OBJECT_internal

'flags' should have ASN1_OBJECT_FLAG_DYNAMIC_DATA bit to free 'data'
by ASN1_OBJECT_free as c2i_ASN1_OBJECT_cbs does.

ok jsing@ tb@

2 years agoFix definition of "local" IPI system register. Spotted by Kyle Evans.
kettenis [Sun, 10 Apr 2022 10:43:34 +0000 (10:43 +0000)]
Fix definition of "local" IPI system register.  Spotted by Kyle Evans.

ok patrick@, jsg@

2 years agoatascsi: constify method tables
naddy [Sat, 9 Apr 2022 20:10:26 +0000 (20:10 +0000)]
atascsi: constify method tables

ok miod@

2 years agoconstify method tables in OAK USB sensor drivers
naddy [Sat, 9 Apr 2022 20:09:03 +0000 (20:09 +0000)]
constify method tables in OAK USB sensor drivers

ok miod@

2 years agoconstify method tables in USB serial drivers
naddy [Sat, 9 Apr 2022 20:07:44 +0000 (20:07 +0000)]
constify method tables in USB serial drivers

ok miod@

2 years agofix grammar in comment: successfully -> successful
dv [Sat, 9 Apr 2022 15:40:55 +0000 (15:40 +0000)]
fix grammar in comment: successfully -> successful

2 years agoRelease PF und NET lock before calling copyin for DIOCXROLLBACK.
mbuhl [Sat, 9 Apr 2022 13:15:44 +0000 (13:15 +0000)]
Release PF und NET lock before calling copyin for DIOCXROLLBACK.
OK bluhm@
Reported-by: syzbot+2945769fc3e6fd9ee413@syzkaller.appspotmail.com
2 years agoSimplify vmx instruction error handling.
dv [Sat, 9 Apr 2022 01:49:43 +0000 (01:49 +0000)]
Simplify vmx instruction error handling.

Removes jumps and shortens the code while keeping functionality the
same.

ok mlarkin@

2 years agoRename the pf state assert locked macro consistently.
bluhm [Fri, 8 Apr 2022 18:17:24 +0000 (18:17 +0000)]
Rename the pf state assert locked macro consistently.
OK sashan@

2 years agoWhen calculating the with of spanned columns, which for example matters
schwarze [Fri, 8 Apr 2022 16:53:40 +0000 (16:53 +0000)]
When calculating the with of spanned columns, which for example matters
for centering text spanning multiple tbl(7) columns, correctly account
for the spacing between columns instead of wrongly assuming the default
spacing of 3n.

Patch from Simon Branch <simonmbranch at gmail dot com>.

2 years agoBump because of the last minute mktime -> timegm fix
claudio [Fri, 8 Apr 2022 15:30:27 +0000 (15:30 +0000)]
Bump because of the last minute mktime -> timegm fix

2 years agoAll times in the x509 are UTC so use timegm() and not mktime().
claudio [Fri, 8 Apr 2022 15:29:59 +0000 (15:29 +0000)]
All times in the x509 are UTC so use timegm() and not mktime().
The latter will apply the timezone offset and so the further west
the more probable you are to have problems with valid_from times.
Fix from tb@
OK job@, benno@ and me

2 years agolm, uguru, fins, wbenv: constify sensor tables
naddy [Fri, 8 Apr 2022 15:02:28 +0000 (15:02 +0000)]
lm, uguru, fins, wbenv: constify sensor tables

ok miod@

2 years agofix leaking memory in get_sdr on failure.
mbuhl [Fri, 8 Apr 2022 13:13:14 +0000 (13:13 +0000)]
fix leaking memory in get_sdr on failure.
Found by LLVM scan-build.
ok sthen@

2 years agoregen
kevlo [Fri, 8 Apr 2022 06:07:38 +0000 (06:07 +0000)]
regen

2 years agoAdd MT7921K.
kevlo [Fri, 8 Apr 2022 06:07:01 +0000 (06:07 +0000)]
Add MT7921K.

ok deraadt@

2 years agoNote that curve25519-sha256 was later published in RFC8731. ok djm@
dtucker [Fri, 8 Apr 2022 05:43:39 +0000 (05:43 +0000)]
Note that curve25519-sha256 was later published in RFC8731.  ok djm@

2 years agotwo defensive changes from Tobias Stoeckmann via GHPR287
djm [Fri, 8 Apr 2022 04:40:40 +0000 (04:40 +0000)]
two defensive changes from Tobias Stoeckmann via GHPR287

enforce stricter invarient for sshbuf_set_parent() - never allow
a buffer to have a previously-set parent changed.

In sshbuf_reset(), if the reallocation fails, then zero the entire
buffer and not the (potentially smaller) default initial alloc size.

2 years agochange "PSP runtime database doesn't exist" from warn to info
jsg [Fri, 8 Apr 2022 01:25:34 +0000 (01:25 +0000)]
change "PSP runtime database doesn't exist" from warn to info
suggested by kettenis@

2 years agoRelease PF und NET lock before calling copyin and copyout for
mbuhl [Thu, 7 Apr 2022 19:27:24 +0000 (19:27 +0000)]
Release PF und NET lock before calling copyin and copyout for
DIOCXBEGIN.
OK bluhm@
OK sashan@
Reported-by: syzbot+b22ec16c5bf937578937@syzkaller.appspotmail.com
2 years agoAvoid infinite loop on parsing DSA private keys
tb [Thu, 7 Apr 2022 17:38:24 +0000 (17:38 +0000)]
Avoid infinite loop on parsing DSA private keys

DSA private keys with ill-chosen g could cause an infinite
loop on deserializing. Add a few sanity checks that ensure
that g is according to the FIPS 186-4: check 1 < g < p and
g^q == 1 (mod p). This is enough to ascertain that g is a
generator of a multiplicative group of order q once we know
that q is prime (which is checked a bit later).

Issue reported with reproducers by Hanno Boeck.
Additional variants and analysis by David Benjamin.

ok beck jsing

2 years agoAvoid infinite loop for custom curves of order 1
tb [Thu, 7 Apr 2022 17:37:25 +0000 (17:37 +0000)]
Avoid infinite loop for custom curves of order 1

If a private key encoded with EC parameters happens to have
order 1 and is used for ECDSA signatures, this causes an
infinite loop since a random integer x in the interval [0,1)
will be 0, so do ... while (x == 0); will loop indefinitely.

Found and reported with a reproducer by Hanno Boeck.
Helpful comments and analysis from David Benjamin.

ok beck jsing

2 years agoSupport more power sensors in IPMI. Tested on several Supermicro and Dell
sthen [Thu, 7 Apr 2022 17:36:38 +0000 (17:36 +0000)]
Support more power sensors in IPMI. Tested on several Supermicro and Dell
amd64 boxes and Lenovo (Ampere) aarch64. tweak/OK mbuhl@

2 years agoconstify ifmedia descriptions; ok deraadt@ miod@
naddy [Thu, 7 Apr 2022 16:41:13 +0000 (16:41 +0000)]
constify ifmedia descriptions; ok deraadt@ miod@

2 years agopf_rollback_rules always has the same return value, make it void.
mbuhl [Thu, 7 Apr 2022 14:13:01 +0000 (14:13 +0000)]
pf_rollback_rules always has the same return value, make it void.
OK sashan
OK bluhm@

2 years agoIn pfsync(4) sc_len is modified with atomic operations except in
bluhm [Thu, 7 Apr 2022 13:38:54 +0000 (13:38 +0000)]
In pfsync(4) sc_len is modified with atomic operations except in
one place.  Use atomic_add_long() there.  Call the local variable
sclen, that makes it easier to grep for the struct field sc_len.
OK sashan@

2 years agoAdjust mkioconf so the emitted extern struct cfattach are const.
tb [Thu, 7 Apr 2022 10:11:27 +0000 (10:11 +0000)]
Adjust mkioconf so the emitted extern struct cfattach are const.

tweak/ok miod

2 years agoFix kernel builds with pseudo-device rd
tb [Thu, 7 Apr 2022 09:37:32 +0000 (09:37 +0000)]
Fix kernel builds with pseudo-device rd

Make the cf_attach member of struct cfdata const and sprinkle a few
const into subr_autoconf.c to make this work. Fixes the compilation
of sys/dev/rd.c with newly const rd_ca.

ok miod (who had a similar diff)

2 years agodrm/vrr: Set VRR capable prop only if it is attached to connector
jsg [Thu, 7 Apr 2022 09:36:23 +0000 (09:36 +0000)]
drm/vrr: Set VRR capable prop only if it is attached to connector

From Manasi Navare
3534c5c005ef99a1804ed50b8a72cdae254cabb5 in linux 5.15.y/5.15.30
62929726ef0ec72cbbe9440c5d125d4278b99894 in mainline linux

2 years agodrm/i915: Workaround broken BIOS DBUF configuration on TGL/RKL
jsg [Thu, 7 Apr 2022 09:32:08 +0000 (09:32 +0000)]
drm/i915: Workaround broken BIOS DBUF configuration on TGL/RKL

From Ville Syrjala
074c88751dc121eb9a7fbcbd632001b8d2b09efa in linux 5.15.y/5.15.29
4e6f55120c7eccf6f9323bb681632e23cbcb3f3c in mainline linux

2 years agodrm/amdgpu: bypass tiling flag check in virtual display case (v2)
jsg [Thu, 7 Apr 2022 09:28:23 +0000 (09:28 +0000)]
drm/amdgpu: bypass tiling flag check in virtual display case (v2)

From Guchun Chen
fcd1d79aa943fff4fbaa0cce1d576995a7960699 in linux 5.15.y/5.15.29
e2b993302f40c4eb714ecf896dd9e1c5be7d4cd7 in mainline linux

2 years agodrm/amdgpu: fix suspend/resume hang regression
jsg [Thu, 7 Apr 2022 07:59:24 +0000 (07:59 +0000)]
drm/amdgpu: fix suspend/resume hang regression

From Qiang Yu
46eed3a37dee87b9c35c7419e1820797121893a0 in linux 5.15.y/5.15.27
f1ef17011c765495c876fa75435e59eecfdc1ee4 in mainline linux

2 years agodrm/i915/guc/slpc: Correct the param count for unset param
jsg [Thu, 7 Apr 2022 07:57:39 +0000 (07:57 +0000)]
drm/i915/guc/slpc: Correct the param count for unset param

From Vinay Belgaumkar
d675c05b792e166a5dd6ab9498a137bfd9bc8570 in linux 5.15.y/5.15.27
1b279f6ad467535c3b8a66b4edefaca2cdd5bdc3 in mainline linux

2 years agodrm/amd/display: Reduce dmesg error to a debug print
jsg [Thu, 7 Apr 2022 07:56:04 +0000 (07:56 +0000)]
drm/amd/display: Reduce dmesg error to a debug print

From Leo (Hanghong) Ma
dab06be16184b087228a55efec878546ffeda491 in linux 5.15.y/5.15.27
1d925758ba1a5d2716a847903e2fd04efcbd9862 in mainline linux

2 years agodrm/i915: s/JSP2/ICP2/ PCH
jsg [Thu, 7 Apr 2022 07:53:31 +0000 (07:53 +0000)]
drm/i915: s/JSP2/ICP2/ PCH

From Ville Syrjala
7508ac360d1e0e6a2b9578226eaffc384b4eb036 in linux 5.15.y/5.15.27
08783aa7693f55619859f4f63f384abf17cb58c5 in mainline linux

2 years agodrm/amd/display: Fix stream->link_enc unassigned during stream removal
jsg [Thu, 7 Apr 2022 07:50:31 +0000 (07:50 +0000)]
drm/amd/display: Fix stream->link_enc unassigned during stream removal

From Nicholas Kazlauskas
10dd26349edf901539d066b866490676cbfad73c in linux 5.15.y/5.15.27
3743e7f6fcb938b7d8b7967e6a9442805e269b3d in mainline linux

2 years agodrm/i915: Disable DRRS on IVB/HSW port != A
jsg [Thu, 7 Apr 2022 07:48:23 +0000 (07:48 +0000)]
drm/i915: Disable DRRS on IVB/HSW port != A

From Ville Syrjala
5c66161cceaabc68912950893394e04c164ef7ad in linux 5.15.y/5.15.27
ee59792c97176f12c1da31f29fc4c2aab187f06e in mainline linux

2 years agodrm/i915/display: Move DRRS code its own file
jsg [Thu, 7 Apr 2022 07:46:04 +0000 (07:46 +0000)]
drm/i915/display: Move DRRS code its own file

From Jose Roberto de Souza
e2b3d1bf6ec3bc4d3687f77731eef349cef54495 in linux 5.15.y/5.15.27
a1b63119ee839c8ff622407aab25c9723943638a in mainline linux

2 years agodrm/i915/display: split out dpt out of intel_display.c
jsg [Thu, 7 Apr 2022 07:39:54 +0000 (07:39 +0000)]
drm/i915/display: split out dpt out of intel_display.c

From Jani Nikula
23eb29281f1e1bc3e33f75186b16c961e62effe6 in linux 5.15.y/5.15.27
dc6d6158a6e8b11a11544a541583296d9323050f in mainline linux

2 years agodrm/amd/display: Update watermark values for DCN301
jsg [Thu, 7 Apr 2022 07:34:02 +0000 (07:34 +0000)]
drm/amd/display: Update watermark values for DCN301

From Agustin Gutierrez
ed4488d8307f282bdf30c333fc028d80d404ff05 in linux 5.15.y/5.15.27
2d8ae25d233767171942a9fba5fd8f4a620996be in mainline linux

2 years agodrm/amd/display: move FPU associated DSC code to DML folder
jsg [Thu, 7 Apr 2022 07:30:54 +0000 (07:30 +0000)]
drm/amd/display: move FPU associated DSC code to DML folder

From Qingqing Zhuo
27e01f10d183cd444eb4a0919934391de4db4ff5 in linux 5.15.y/5.15.27
d738db6883df3e3c513f9e777c842262693f951b in mainline linux

2 years agodrm/amd/display: Use adjusted DCN301 watermarks
jsg [Thu, 7 Apr 2022 07:15:07 +0000 (07:15 +0000)]
drm/amd/display: Use adjusted DCN301 watermarks

From Nikola Cornij
691c0030be65dffc5005bbcdece29f6d65e1eb75 in linux 5.15.y/5.15.27
808643ea56a2f96a42873d5e11c399957d6493aa in mainline linux

2 years agodrm/amdgpu: filter out radeon secondary ids as well
jsg [Thu, 7 Apr 2022 07:13:07 +0000 (07:13 +0000)]
drm/amdgpu: filter out radeon secondary ids as well

From Alex Deucher
2157e509e5b2b21176a9fd33b6035996ef1a2895 in linux 5.15.y/5.15.27
9e5a14bce2402e84251a10269df0235cd7ce9234 in mainline linux

2 years agodrm/amdgpu: filter out radeon PCI device IDs
jsg [Thu, 7 Apr 2022 07:11:21 +0000 (07:11 +0000)]
drm/amdgpu: filter out radeon PCI device IDs

From Alex Deucher
f724a438d986701536d68d29ad2b5248385e35ab in linux 5.15.y/5.15.27
bdbeb0dde4258586bb2f481b12da1e83aa4766f3 in mainline linux

2 years agodrm/amd/display: For vblank_disable_immediate, check PSR is really used
jsg [Thu, 7 Apr 2022 07:08:48 +0000 (07:08 +0000)]
drm/amd/display: For vblank_disable_immediate, check PSR is really used

From Michel Daenzer
35afd8ae1184c5201ccc4d32b80d17dcd87f5bda in linux 5.15.y/5.15.27
4d22336f903930eb94588b939c310743a3640276 in mainline linux

2 years agodrm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled
jsg [Thu, 7 Apr 2022 07:08:07 +0000 (07:08 +0000)]
drm/amdgpu/display: Only set vblank_disable_immediate when PSR is not enabled

From Nicholas Kazlauskas
48cf33ee6b04ccd1a188ac692a6f260b3682fe9f in linux 5.15.y/5.15.27
70897848730470cc477d5d89e6222c0f6a9ac173 in mainline linux

2 years agodrm/amdkfd: Check for null pointer after calling kmemdup
jsg [Thu, 7 Apr 2022 06:51:19 +0000 (06:51 +0000)]
drm/amdkfd: Check for null pointer after calling kmemdup

From Jiasheng Jiang
5609b7803947eea1711516dd8659c7ed39f5a868 in linux 5.15.y/5.15.27
abfaf0eee97925905e742aa3b0b72e04a918fa9e in mainline linux

2 years agodrm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self...
jsg [Thu, 7 Apr 2022 06:49:11 +0000 (06:49 +0000)]
drm/atomic: Check new_crtc_state->active to determine if CRTC needs disable in self refresh mode

From Liu Ying
cd07b19fbf37b96a9885fd6e8545c355dba59ac3 in linux 5.15.y/5.15.27
69e630016ef4e4a1745310c446f204dc6243e907 in mainline linux

2 years agodrm/i915: don't call free_mmap_offset when purging
jsg [Thu, 7 Apr 2022 06:46:27 +0000 (06:46 +0000)]
drm/i915: don't call free_mmap_offset when purging

From Matthew Auld
d3f67ceaeb3f7ddabad1d6e8da29e44fd2634f65 in linux 5.15.y/5.15.27
4c2602ba8d74c35d550ed3d518809c697de08d88 in mainline linux

2 years agodrm/amdgpu: check vm ready by amdgpu_vm->evicting flag
jsg [Thu, 7 Apr 2022 06:44:25 +0000 (06:44 +0000)]
drm/amdgpu: check vm ready by amdgpu_vm->evicting flag

From Qiang Yu
a9c6e02d223e327fa928fab3263aa47b9ba20253 in linux 5.15.y/5.15.27
c1a66c3bc425ff93774fb2f6eefa67b83170dd7e in mainline linux

2 years agodrm/amd/pm: correct UMD pstate clocks for Dimgrey Cavefish and Beige Goby
jsg [Thu, 7 Apr 2022 06:42:01 +0000 (06:42 +0000)]
drm/amd/pm: correct UMD pstate clocks for Dimgrey Cavefish and Beige Goby

From Evan Quan
4543426cd7b855cde2c3623ede652652b905635c in linux 5.15.y/5.15.27
0136f5844b006e2286f873457c3fcba8c45a3735 in mainline linux

2 years agoMention Allwinner H6
kevlo [Thu, 7 Apr 2022 02:44:51 +0000 (02:44 +0000)]
Mention Allwinner H6

ok jsg@

2 years agoAdd instructions on how to prepare Apple arm64 machines for installing
kettenis [Wed, 6 Apr 2022 23:01:05 +0000 (23:01 +0000)]
Add instructions on how to prepare Apple arm64 machines for installing
OpenBSD.

2 years agoSupport switching from glass console to serial console on systems that
kettenis [Wed, 6 Apr 2022 21:27:03 +0000 (21:27 +0000)]
Support switching from glass console to serial console on systems that
default to glass console.

ok miod@, patrick@

2 years agoconstify struct cfattach
naddy [Wed, 6 Apr 2022 18:59:26 +0000 (18:59 +0000)]
constify struct cfattach

2 years agoAvoid traversing SLIST twice to remove a link.
krw [Wed, 6 Apr 2022 17:39:13 +0000 (17:39 +0000)]
Avoid traversing SLIST twice to remove a link.

From millert@

2 years ago- document where dependency tree is built
espie [Wed, 6 Apr 2022 14:15:27 +0000 (14:15 +0000)]
- document where dependency tree is built
- remove future code that was never used.
- reformat

2 years agoRecognize LUN 0 device if SID_QUAL_LU_OFFLINE and T_NODEVICE are
krw [Wed, 6 Apr 2022 13:23:58 +0000 (13:23 +0000)]
Recognize LUN 0 device if SID_QUAL_LU_OFFLINE and T_NODEVICE are
true. This enables the discovery and probing of other LUNs the
target has to offer.

Add uk* to amd64 RAMDISK_CD so such devices are configured.

Allows bsd.rd as well as bsd[.mp] to boot on Oracle Cloud amd64
instances.

Issue reported by Ryan Kavanagh and Scott Nicholas via bugs@.

Original diff and much subsequent testing by Scott. Thanks!

ok dlg@ jmatthew@

2 years agore-enable POOL_DEBUG
naddy [Tue, 5 Apr 2022 18:38:07 +0000 (18:38 +0000)]
re-enable POOL_DEBUG

2 years agoZap emacs version in the pkg_add example
jca [Tue, 5 Apr 2022 18:07:46 +0000 (18:07 +0000)]
Zap emacs version in the pkg_add example

Instead of updating/forgetting the emacs version at each release cycle.
ok tb@ deraadt@