BSD Commit Log Search

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Merge branch 'freebsd/current/main' into hardened/current/master

syscon: Move syscon code in dev/syscon

We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.

Reviewed by:    mhorne
Sponsored by:   Beckhoff Automation GmbH & Co. KG
Differential Revision:  https://reviews.freebsd.org/D43196

phy: Move phy code in dev/phy

We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.

Reviewed by:    emaste, imp
Sponsored by:   Beckhoff Automation GmbH & Co. KG
Differential Revision:  https://reviews.freebsd.org/D43195

hwreset: Move reset code in dev/hwreset

We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.

Reviewed by:    imp
Sponsored by:   Beckhoff Automation GmbH & Co. KG
Differential Revision:  https://reviews.freebsd.org/D43192

clk: Move clock code in dev/clk

We've removed kernel option EXT_RESOURCES almost two years ago.
While it was ok to have some code under a common 'extres' subdirectory
at first, we now have a lot of consumer of it and we made it mandatory
so no need to have it under a cryptic name.

Reviewed by:    mhorne
Sponsored by:   Beckhoff Automation GmbH & Co. KG
Differential Revision:  https://reviews.freebsd.org/D43191

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        share/mk/src.opts.mk (unresolved)

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/arm/arm/elf_machdep.c (unresolved)
        sys/arm64/arm64/elf_machdep.c (unresolved)
        sys/kern/imgact_aout.c (deleted)
        sys/kern/kern_environment.c (unresolved)
        sys/kern/kern_module.c (unresolved)
        sys/kern/kern_priv.c (unresolved)
        sys/kern/kern_procctl.c (unresolved)
        sys/kern/kern_resource.c (unresolved)
        sys/kern/sys_process.c (unresolved)
        sys/netlink/netlink_message_writer.c (unresolved)
        sys/riscv/riscv/elf_machdep.c (unresolved)
        sys/vm/vm_map.c (unresolved)

sys: Automated cleanup of cdefs and other formatting

Apply the following automated changes to try to eliminate
no-longer-needed sys/cdefs.h includes as well as now-empty
blank lines in a row.

Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/
Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/
Remove /\n+#if.*\n#endif.*\n+/
Remove /^#if.*\n#endif.*\n/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/

Sponsored by:           Netflix

Merge remote-tracking branch 'internal/freebsd/13-stable/main' into hardened/13-stable/master

Conflicts:
        bin/cat/cat.c
        lib/libc/gen/auxv.3
        libexec/rc/rc.d/archdep
        share/man/man5/src.conf.5
        sys/amd64/amd64/elf_machdep.c
        sys/amd64/cloudabi64/cloudabi64_sysvec.c
        sys/amd64/linux/linux_sysvec.c
        sys/amd64/linux32/linux32_sysvec.c
        sys/arm/arm/elf_machdep.c
        sys/arm64/linux/linux_sysvec.c
        sys/compat/ia32/ia32_sysvec.c
        sys/i386/cloudabi32/cloudabi32_sysvec.c
        sys/i386/linux/imgact_linux.c
        sys/i386/linux/linux_sysvec.c
        sys/kern/imgact_aout.c
        sys/kern/kern_module.c

    [22 lines not shown]

sys: Remove $FreeBSD$: one-line .c pattern

Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/

Similar commit in current:
(cherry picked from commit 685dc743dc3b)

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        tools/build/options/WITH_OFED_EXTRA (deleted)
        usr.sbin/rpc.yppasswdd/Makefile (unresolved)

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        bin/cat/cat.c (unresolved)
        lib/csu/aarch64/crt1_c.c (unresolved)
        lib/csu/amd64/crt1_c.c (unresolved)
        lib/csu/i386/crt1_c.c (unresolved)
        lib/csu/powerpc64/crt1_c.c (unresolved)
        lib/csu/powerpc64/reloc.c (unresolved)
        lib/csu/riscv/crt1_c.c (unresolved)
        lib/libc/gen/auxv.3 (unresolved)
        lib/libcasper/services/cap_net/cap_net.3 (unresolved)
        sys/amd64/amd64/elf_machdep.c (unresolved)
        sys/amd64/include/sgxreg.h (deleted)
        sys/amd64/linux/linux_sysvec.c (unresolved)
        sys/amd64/linux32/linux32_sysvec.c (unresolved)
        sys/amd64/sgx/sgx.c (deleted)
        sys/amd64/sgx/sgx_linux.c (deleted)
        sys/amd64/sgx/sgxvar.h (deleted)

    [29 lines not shown]

sys: Remove $FreeBSD$: one-line .c pattern

Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master

Conflicts:
        sys/i386/linux/imgact_linux.c (deleted)
        sys/kern/imgact_aout.c (deleted)

spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD

The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.

Discussed with:         pfg
MFC After:              3 days
Sponsored by:           Netflix

(cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b)

Merge remote-tracking branch 'internal/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

Merge remote-tracking branch 'freebsd/main' into hardened/current/master

Conflicts:
        lib/csu/common/csu_common.h (deleted)
        share/man/man5/src.conf.5 (unresolved)
        sys/i386/linux/imgact_linux.c (deleted)
        sys/kern/imgact_aout.c (deleted)

spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD

The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.

Discussed with:         pfg
MFC After:              3 days
Sponsored by:           Netflix

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)

Merge branch 'freebsd/current/main' into hardened/current/master

arm64 rockchip: Remove unused devclass arguments to DRIVER_MODULE.

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit

Merge remote-tracking branch 'tor/freebsd/12-stable/master' into hardened/12-stable/master

Conflicts:
        sys/conf/newvers.sh (unresolved)
        sys/x86/x86/cpu_machdep.c (unresolved)

MFC r354087, r354089, r354094, r354100, r354103, r354152

r354087:
arm64: rk3399: Add clock and gate for usb3 clocks

r354089:
arm64: rockchip: Add RK3399 TypeC phy driver

This is a driver for the USB3 PHY present in the RK3399.
While the phy support DP (Display Port) the driver doesn't has we have
no driver to test this with for now.
All the lane and pll configuration is just magic values from rockchip.
While the manual have some info on those registers it's really hard to
understand how to calculate those values (if there is a way).

r354094 by peterj:
Fix use of uninitialised variable.

The RK805 regs array was being allocated before it's required size was

    [31 lines not shown]

MFC r354087, r354089, r354094, r354100, r354103, r354152

r354087:
arm64: rk3399: Add clock and gate for usb3 clocks

r354089:
arm64: rockchip: Add RK3399 TypeC phy driver

This is a driver for the USB3 PHY present in the RK3399.
While the phy support DP (Display Port) the driver doesn't has we have
no driver to test this with for now.
All the lane and pll configuration is just magic values from rockchip.
While the manual have some info on those registers it's really hard to
understand how to calculate those values (if there is a way).

r354094 by peterj:
Fix use of uninitialised variable.

The RK805 regs array was being allocated before it's required size was

    [31 lines not shown]

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        gnu/lib/libgcc/Makefile (deleted)
        share/man/man5/src.conf.5 (unresolved)
        usr.bin/clang/lld/Makefile (unresolved)
        usr.sbin/rpc.statd/Makefile (unresolved)

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Fix column title alignment.
  arm64: rockchip: typec_phy: Rename timeout to retry
  libexecinfo test: Don't strip installed test
  There is a long standing problem with multicast programming for NICs and IPv6.  With IPv6 we may call if_addmulti() in context of processing of an incoming packet.  Usually this is interrupt context.  While most of the NIC drivers are able to reprogram multicast filters without sleeping, some of them can't.  An example is e1000 family of drivers. With iflib conversion the problem was somewhat hidden.  Iflib processes packets in private taskqueue, so going to sleep doesn't trigger an assertion.  However, the sleep would block operation of the driver and following incoming packets would fill the ring and eventually would start being dropped.  Enabling epoch for the full time of a packet processing again started to trigger assertions for e1000.
  Merge td_epochnest with td_no_sleeping.
  Augment macros that manipulate td_no_sleeping with assertions to check underleak and overflow of the counter.
  Pull in r373338 from upstream llvm trunk (by Simon Pilgrim):

arm64: rockchip: typec_phy: Rename timeout to retry

Declare retry in the function scope.
Rename it to retry as there is a timeout function which was
causing to code to compile.

Reported by:    jhibbits
MFC after:      1 month
X-MFC-WITH:     r354089

arm64: rockchip: typec_phy: Rename timeout to retry

Declare retry in the function scope.
Rename it to retry as there is a timeout function which was
causing to code to compile.

Reported by:    jhibbits
MFC after:      1 month
X-MFC-WITH:     r354089