From 62073e029519c59f49bfa24eac01334b566e58ba Mon Sep 17 00:00:00 2001 From: purplerain Date: Sat, 13 May 2023 14:25:18 +0000 Subject: [PATCH] sync --- etc/examples/acme-client.conf | 4 +- etc/root/root.mail | 4 +- etc/skel/dot.version | 2 +- games/backgammon/teachgammon/tutor.c | 5 +- gnu/gcc/gcc/config/arm/secbsd.h | 215 ++ gnu/gcc/gcc/config/arm/secbsd1.h | 61 + gnu/gcc/gcc/config/arm/unwind-arm.h | 3 +- gnu/gcc/gcc/config/host-secbsd.c | 107 + gnu/gcc/gcc/config/i386/secbsd.h | 102 + gnu/gcc/gcc/config/i386/secbsd64.h | 130 ++ gnu/gcc/gcc/config/i386/secbsdelf.h | 132 ++ gnu/gcc/gcc/config/i386/t-secbsd | 6 + gnu/gcc/gcc/config/ia64/secbsd.h | 19 + gnu/gcc/gcc/config/secbsd-libpthread.h | 23 + gnu/gcc/gcc/config/secbsd-oldgas.h | 23 + gnu/gcc/gcc/config/secbsd.h | 357 ++++ gnu/gcc/gcc/config/t-secbsd | 2 + gnu/gcc/gcc/config/t-secbsd-thread | 5 + gnu/gcc/include/libiberty.h | 2 +- gnu/lib/libiberty/include/ansidecl.h | 4 +- gnu/lib/libiberty/include/libiberty.h | 2 +- gnu/lib/libreadline/support/shobj-conf | 2 +- gnu/llvm/clang/lib/Driver/CMakeLists.txt | 1 - gnu/llvm/clang/lib/Driver/Driver.cpp | 1 - .../clang/lib/Driver/ToolChains/SecBSD.cpp | 338 --- gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.h | 109 - .../cmake/Modules/SanitizerUtils.cmake | 2 +- .../Python/lldbsuite/test/lldbtest.py | 6 +- .../lldb/tools/lldb-server/CMakeLists.txt | 4 - gnu/llvm/llvm/cmake/config.guess | 4 - gnu/llvm/llvm/cmake/modules/AddLLVM.cmake | 4 +- .../cmake/modules/HandleLLVMOptions.cmake | 2 +- gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h | 1 - .../llvm/tools/llvm-readobj/ELFDumper.cpp | 1 - gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt | 1 - gnu/llvm/llvm/unittests/ADT/TripleTest.cpp | 4 - gnu/llvm/llvm/unittests/Support/Path.cpp | 4 +- .../gn/secondary/clang/lib/Driver/BUILD.gn | 1 - gnu/share/config.guess | 4 + gnu/share/config.sub | 2 +- gnu/share/ltconfig | 4 +- gnu/usr.bin/Makefile | 5 +- gnu/usr.bin/binutils-2.17/include/libiberty.h | 2 +- gnu/usr.bin/binutils/gdb/rdi-share/unixcomm.c | 2 +- gnu/usr.bin/binutils/include/libiberty.h | 2 +- gnu/usr.bin/cc/Makefile.tgt | 26 +- gnu/usr.bin/cc/cc_int/Makefile | 2 +- gnu/usr.bin/cc/cc_tools/Makefile | 24 +- gnu/usr.bin/cc/cc_tools/secbsd-native.h | 52 + gnu/usr.bin/clang/Makefile.inc | 4 +- gnu/usr.bin/clang/libclangDriver/Makefile | 1 - gnu/usr.bin/gcc/Makefile.bsd-wrapper | 8 +- gnu/usr.bin/gcc/config.guess | 4 + gnu/usr.bin/gcc/config.sub | 2 +- gnu/usr.bin/gcc/gcc/config.gcc | 35 + gnu/usr.bin/gcc/gcc/config/arm/aout.h | 14 +- gnu/usr.bin/gcc/gcc/config/arm/arm.h | 82 +- gnu/usr.bin/gcc/gcc/config/arm/secbsd.h | 270 +++ gnu/usr.bin/gcc/gcc/config/arm/secbsd1.h | 22 + gnu/usr.bin/gcc/gcc/config/arm/t-secbsd | 7 + gnu/usr.bin/gcc/gcc/config/i386/secbsd.h | 105 + gnu/usr.bin/gcc/gcc/config/i386/secbsd64.h | 127 ++ gnu/usr.bin/gcc/gcc/config/i386/secbsdelf.h | 139 ++ gnu/usr.bin/gcc/gcc/config/i386/t-secbsd | 6 + .../gcc/gcc/config/secbsd-libpthread.h | 23 + gnu/usr.bin/gcc/gcc/config/secbsd-oldgas.h | 23 + gnu/usr.bin/gcc/gcc/config/secbsd.h | 345 +++ gnu/usr.bin/gcc/gcc/config/sh/lib1funcs.asm | 4 +- gnu/usr.bin/gcc/gcc/config/t-secbsd | 11 + gnu/usr.bin/gcc/gcc/config/t-secbsd-thread | 5 + gnu/usr.bin/gcc/gcc/config/x-secbsd | 11 + gnu/usr.bin/gcc/gcc/ginclude/stddef.h | 4 +- gnu/usr.bin/perl/perlio.c | 2 +- gnu/usr.bin/perl/reentr.h | 2 +- gnu/usr.bin/perl/regen/reentr.pl | 2 +- gnu/usr.bin/perl/util.c | 2 +- gnu/usr.bin/texinfo/config.rpath | 6 +- gnu/usr.sbin/mkhybrid/src/apple.h | 2 +- gnu/usr.sbin/mkhybrid/src/defaults.h | 16 +- lib/libc/arch/amd64/sys/syscall.S | 18 +- lib/libc/stdlib/malloc.c | 24 +- lib/libcrypto/Makefile | 5 +- lib/libcrypto/bn/bn_bpsw.c | 178 +- lib/libcrypto/bn/bn_convert.c | 190 +- lib/libcrypto/bn/bn_exp.c | 12 +- lib/libcrypto/bn/bn_local.h | 4 +- lib/libcrypto/bn/bn_prime.c | 16 +- lib/libcrypto/cert.pem | 821 ++++---- lib/libcrypto/crypto_init.c | 1 + lib/libcrypto/ec/ec_asn1.c | 20 +- lib/libcrypto/ec/ec_lib.c | 19 +- lib/libcrypto/ec/ec_oct.c | 4 +- lib/libcrypto/man/BN_generate_prime.3 | 31 +- lib/libcrypto/man/EVP_AEAD_CTX_init.3 | 13 +- lib/libcrypto/man/RSA_pkey_ctx_ctrl.3 | 13 +- .../man/X509_NAME_get_index_by_NID.3 | 30 +- lib/libcrypto/man/s2i_ASN1_INTEGER.3 | 11 +- lib/libcrypto/modes/xts128.c | 10 +- lib/libcrypto/rsa/rsa.h | 4 +- lib/libcrypto/rsa/rsa_eay.c | 30 +- lib/libcrypto/rsa/rsa_local.h | 8 +- lib/libcrypto/rsa/rsa_pmeth.c | 154 +- lib/libcrypto/rsa/rsa_x931.c | 164 ++ lib/libcrypto/sha/sha512.c | 135 +- lib/libcrypto/x509/x509_local.h | 4 +- lib/libcrypto/x509/x509_prn.c | 4 +- lib/libcrypto/x509/x509_utl.c | 195 +- lib/libcrypto/x509/x509_verify.c | 3 +- lib/libcrypto/x509/x509_vfy.c | 23 +- lib/libcrypto/x509/x509name.c | 37 +- lib/libssl/Makefile | 4 +- lib/libtls/Makefile | 4 +- lib/libtls/tls_verify.c | 30 +- libexec/mail.local/mail.local.c | 5 +- libexec/tradcpp/config.h | 2 + regress/lib/libc/malloc/Makefile | 4 +- regress/lib/libc/malloc/malloc_errs/Makefile | 5 + .../lib/libc/malloc/malloc_errs/malloc_errs.c | 286 +++ .../lib/libc/malloc/malloc_general/Makefile | 30 +- regress/lib/libcrypto/asn1/Makefile | 3 +- regress/lib/libcrypto/asn1/asn1oct.c | 278 +++ regress/lib/libcrypto/bn/bn_mod_exp.c | 63 +- regress/lib/libcrypto/ecdsa/ecdsatest.c | 76 +- regress/lib/libcrypto/symbols/symbols.awk | 6 +- regress/lib/libcrypto/x509/x509_asn1.c | 79 +- .../sys/arch/amd64/dump_tables/dump_tables.c | 19 +- regress/usr.bin/ssh/forcecommand.sh | 8 +- regress/usr.bin/ssh/sftp-chroot.sh | 23 +- sbin/disklabel/disklabel.c | 10 +- sbin/fdisk/fdisk.8 | 12 +- sbin/fdisk/gpt.c | 23 +- sbin/fdisk/part.c | 4 +- sbin/ifconfig/ifconfig.c | 222 +- sbin/pflogd/pflogd.c | 6 +- share/btrace/Makefile | 4 +- share/btrace/uprofile.bt | 17 + share/man/man4/man4.amd64/intro.4 | 6 +- share/man/man4/man4.arm64/intro.4 | 8 +- share/man/man4/man4.armv7/intro.4 | 8 +- share/man/man4/man4.i386/intro.4 | 6 +- share/man/man4/man4.riscv64/intro.4 | 6 +- share/man/man4/udl.4 | 5 +- share/man/man4/ure.4 | 10 +- share/man/man4/usb.4 | 6 +- share/man/man5/port-modules.5 | 18 +- sys/Makefile | 6 +- sys/arch/arm64/conf/RAMDISK | 6 +- sys/arch/arm64/dev/aplcpu.c | 4 +- sys/arch/arm64/dev/apldc.c | 151 +- sys/arch/arm64/stand/efiboot/conf.c | 4 +- sys/arch/arm64/stand/efiboot/efiboot.c | 14 +- sys/dev/fdt/dwpcie.c | 5 +- sys/dev/pci/aac_pci.c | 2 +- sys/dev/pci/agp.c | 8 +- sys/dev/pci/agp_ali.c | 6 +- sys/dev/pci/agp_i810.c | 8 +- sys/dev/pci/agp_intel.c | 10 +- sys/dev/pci/agp_sis.c | 6 +- sys/dev/pci/agp_via.c | 2 +- sys/dev/pci/agpreg.h | 2 +- sys/dev/pci/agpvar.h | 2 +- sys/dev/pci/ahc_pci.c | 16 +- sys/dev/pci/ahd_pci.c | 26 +- sys/dev/pci/drm/amd/amdgpu/ObjectID.h | 24 +- sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c | 23 +- sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c | 2 +- sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c | 2 +- sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c | 2 +- sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c | 4 +- sys/dev/pci/drm/amd/amdgpu/imu_v11_0.c | 8 +- sys/dev/pci/drm/amd/amdgpu/mxgpu_ai.c | 2 +- sys/dev/pci/drm/amd/amdgpu/sdma_v5_0.c | 2 +- .../pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 3 + .../dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h | 4 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 16 +- .../drm/amd/display/dc/dcn30/dcn30_resource.h | 3 +- .../drm/amd/display/dc/dcn31/dcn31_resource.c | 2 +- .../amd/display/dc/dcn314/dcn314_resource.c | 77 +- .../amd/display/dc/dcn314/dcn314_resource.h | 4 + .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- .../amd/display/modules/power/power_helpers.c | 35 + .../amd/display/modules/power/power_helpers.h | 3 + sys/dev/pci/drm/amd/include/amd_shared.h | 2 +- sys/dev/pci/drm/amd/include/atomfirmware.h | 534 ++--- sys/dev/pci/drm/amd/include/atomfirmwareid.h | 4 +- sys/dev/pci/drm/amd/include/displayobject.h | 22 +- .../pci/drm/amd/include/navi10_ip_offset.h | 2 +- sys/dev/pci/drm/amd/include/pptable.h | 42 +- .../pm/powerplay/inc/vega12/smu9_driver_if.h | 10 +- sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c | 40 +- sys/dev/pci/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 4 +- sys/dev/pci/drm/drm_drv.c | 12 +- sys/dev/pci/drm/drm_gem.c | 8 +- sys/dev/pci/drm/drm_linux.c | 36 +- sys/dev/pci/drm/drm_lock.c | 2 +- sys/dev/pci/drm/drm_managed.c | 2 +- sys/dev/pci/drm/drm_mm.c | 2 +- sys/dev/pci/drm/drm_probe_helper.c | 5 +- sys/dev/pci/drm/i915/display/intel_display.c | 2 +- sys/dev/pci/drm/i915/gt/agp_intel_gtt.c | 2 +- sys/dev/pci/drm/i915/gt/shmem_utils.c | 2 +- sys/dev/pci/drm/include/drm/i915_pciids.h | 1 - sys/dev/pci/drm/include/linux/apple-gmux.h | 12 + sys/dev/pci/drm/include/linux/atomic.h | 6 +- sys/dev/pci/drm/include/linux/capability.h | 6 +- sys/dev/pci/drm/include/linux/dma-buf.h | 2 +- sys/dev/pci/drm/include/linux/file.h | 2 +- sys/dev/pci/drm/include/linux/interrupt.h | 2 +- sys/dev/pci/drm/include/linux/io.h | 2 +- sys/dev/pci/drm/include/linux/pci.h | 12 +- sys/dev/pci/drm/include/linux/rbtree.h | 2 +- sys/dev/pci/drm/include/linux/scatterlist.h | 2 +- sys/dev/pci/drm/include/linux/seqlock.h | 2 +- sys/dev/pci/drm/include/linux/string.h | 2 +- sys/dev/pci/drm/include/linux/swap.h | 4 +- sys/dev/pci/drm/include/linux/types.h | 10 +- sys/dev/pci/drm/include/linux/wait.h | 4 +- sys/dev/pci/drm/include/linux/ww_mutex.h | 4 +- sys/dev/pci/drm/include/uapi/drm/radeon_drm.h | 2 +- sys/dev/pci/drm/linux_sort.c | 4 +- sys/dev/pci/drm/radeon/ObjectID.h | 24 +- sys/dev/pci/drm/radeon/atombios.h | 1842 ++++++++--------- sys/dev/pci/drm/ttm/ttm_pool.c | 167 +- sys/dev/pci/if_iwx.c | 13 +- sys/dev/pci/pcidevs | 12 +- sys/dev/pci/pcidevs.h | 12 +- sys/dev/pci/pcidevs_data.h | 18 +- sys/dev/usb/if_ure.c | 77 +- sys/dev/usb/if_urereg.h | 30 +- sys/dev/usb/udl.c | 5 +- sys/dev/usb/umass_scsi.c | 7 +- sys/dev/usb/usbdevs | 3 +- sys/dev/usb/usbdevs.h | 5 +- sys/dev/usb/usbdevs_data.h | 8 +- sys/kern/init_sysent.c | 6 +- sys/kern/kern_ktrace.c | 4 +- sys/kern/kern_sysctl.c | 17 +- sys/kern/sys_generic.c | 12 +- sys/kern/sys_pipe.c | 12 +- sys/kern/syscalls.c | 4 +- sys/kern/syscalls.master | 4 +- sys/kern/uipc_domain.c | 24 +- sys/kern/uipc_mbuf.c | 17 +- sys/net/if.c | 63 +- sys/net/if_bridge.c | 10 +- sys/net/if_var.h | 8 +- sys/net/pf.c | 73 +- sys/net/pf_ioctl.c | 13 +- sys/net/pf_lb.c | 14 +- sys/net/pf_norm.c | 8 +- sys/net/pf_osfp.c | 70 +- sys/net/pfvar_priv.h | 8 +- sys/netinet/if_ether.c | 15 +- sys/netinet/in.h | 3 +- sys/netinet/ip_output.c | 110 +- sys/netinet/tcp_output.c | 219 +- sys/netinet/tcp_subr.c | 3 +- sys/netinet/tcp_usrreq.c | 11 +- sys/netinet/tcp_var.h | 19 +- sys/netinet6/ip6_output.c | 100 +- sys/netinet6/nd6.c | 200 +- sys/netinet6/nd6.h | 11 +- sys/netinet6/nd6_nbr.c | 6 +- sys/scsi/scsiconf.h | 3 +- sys/scsi/sd.c | 20 +- sys/sys/mbuf.h | 20 +- sys/sys/syscall.h | 4 +- sys/sys/syscallargs.h | 4 +- sys/uvm/uvm_mmap.c | 8 +- usr.bin/doas/doas.conf.5 | 6 +- usr.bin/file/Makefile | 3 +- usr.bin/file/magdir/SecBSD | 269 +++ usr.bin/netstat/inet.c | 6 +- usr.bin/openssl/openssl.1 | 14 +- usr.bin/openssl/rsautl.c | 11 +- usr.bin/passwd/local_passwd.c | 6 +- usr.bin/passwd/pwd_check.c | 10 +- usr.bin/ssh/monitor.c | 5 +- usr.bin/tmux/grid.c | 4 +- usr.bin/tmux/tmux.h | 4 +- usr.bin/tr/str.c | 20 +- usr.sbin/bgpctl/bgpctl.8 | 10 +- usr.sbin/bgpctl/json.c | 56 +- usr.sbin/bgpctl/json.h | 3 +- usr.sbin/bgpctl/output_json.c | 181 +- usr.sbin/bgpctl/parser.c | 4 +- usr.sbin/bgpd/rde_filter.c | 8 +- usr.sbin/bgpd/rtr.c | 5 +- usr.sbin/bgpd/session.c | 25 +- usr.sbin/bgplgd/qs.c | 4 +- usr.sbin/btrace/btrace.c | 71 +- usr.sbin/btrace/btrace.h | 14 +- usr.sbin/btrace/ksyms.c | 105 +- usr.sbin/cron/crontab.5 | 19 +- usr.sbin/cron/crontab.c | 61 +- usr.sbin/cron/entry.c | 35 +- usr.sbin/cron/macros.h | 4 +- usr.sbin/pkg_add/OpenBSD/RequiredBy.pm | 6 +- usr.sbin/rpki-client/cert.c | 3 +- usr.sbin/rpki-client/extern.h | 3 +- usr.sbin/rpki-client/filemode.c | 3 +- usr.sbin/rpki-client/http.c | 3 +- usr.sbin/rpki-client/json.c | 56 +- usr.sbin/rpki-client/json.h | 3 +- usr.sbin/rpki-client/output-json.c | 18 +- usr.sbin/rpki-client/parser.c | 5 +- usr.sbin/rpki-client/rrdp.c | 4 +- usr.sbin/rpki-client/validate.c | 48 +- usr.sbin/smtpd/bounce.c | 6 +- usr.sbin/smtpd/lka_filter.c | 13 +- usr.sbin/smtpd/mail.maildir.c | 1 + usr.sbin/smtpd/mda.c | 4 +- usr.sbin/smtpd/parse.y | 4 +- usr.sbin/smtpd/to.c | 8 +- usr.sbin/snmpd/usm.c | 6 +- usr.sbin/vmd/vm.conf.5 | 6 +- usr.sbin/vmd/vmd.c | 57 +- 318 files changed, 8112 insertions(+), 4346 deletions(-) create mode 100644 gnu/gcc/gcc/config/arm/secbsd.h create mode 100644 gnu/gcc/gcc/config/arm/secbsd1.h create mode 100644 gnu/gcc/gcc/config/host-secbsd.c create mode 100644 gnu/gcc/gcc/config/i386/secbsd.h create mode 100644 gnu/gcc/gcc/config/i386/secbsd64.h create mode 100644 gnu/gcc/gcc/config/i386/secbsdelf.h create mode 100644 gnu/gcc/gcc/config/i386/t-secbsd create mode 100644 gnu/gcc/gcc/config/ia64/secbsd.h create mode 100644 gnu/gcc/gcc/config/secbsd-libpthread.h create mode 100644 gnu/gcc/gcc/config/secbsd-oldgas.h create mode 100644 gnu/gcc/gcc/config/secbsd.h create mode 100644 gnu/gcc/gcc/config/t-secbsd create mode 100644 gnu/gcc/gcc/config/t-secbsd-thread delete mode 100644 gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.cpp delete mode 100644 gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.h create mode 100644 gnu/usr.bin/cc/cc_tools/secbsd-native.h create mode 100644 gnu/usr.bin/gcc/gcc/config/arm/secbsd.h create mode 100644 gnu/usr.bin/gcc/gcc/config/arm/secbsd1.h create mode 100644 gnu/usr.bin/gcc/gcc/config/arm/t-secbsd create mode 100644 gnu/usr.bin/gcc/gcc/config/i386/secbsd.h create mode 100644 gnu/usr.bin/gcc/gcc/config/i386/secbsd64.h create mode 100644 gnu/usr.bin/gcc/gcc/config/i386/secbsdelf.h create mode 100644 gnu/usr.bin/gcc/gcc/config/i386/t-secbsd create mode 100644 gnu/usr.bin/gcc/gcc/config/secbsd-libpthread.h create mode 100644 gnu/usr.bin/gcc/gcc/config/secbsd-oldgas.h create mode 100644 gnu/usr.bin/gcc/gcc/config/secbsd.h create mode 100644 gnu/usr.bin/gcc/gcc/config/t-secbsd create mode 100644 gnu/usr.bin/gcc/gcc/config/t-secbsd-thread create mode 100644 gnu/usr.bin/gcc/gcc/config/x-secbsd create mode 100644 lib/libcrypto/rsa/rsa_x931.c create mode 100644 regress/lib/libc/malloc/malloc_errs/Makefile create mode 100644 regress/lib/libc/malloc/malloc_errs/malloc_errs.c create mode 100644 regress/lib/libcrypto/asn1/asn1oct.c create mode 100644 share/btrace/uprofile.bt create mode 100644 sys/dev/pci/drm/include/linux/apple-gmux.h create mode 100644 usr.bin/file/magdir/SecBSD diff --git a/etc/examples/acme-client.conf b/etc/examples/acme-client.conf index 31dd96f00..842f2f3d8 100644 --- a/etc/examples/acme-client.conf +++ b/etc/examples/acme-client.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $ +# $OpenBSD: acme-client.conf,v 1.5 2023/05/10 07:34:57 tb Exp $ # authority letsencrypt { api url "https://acme-v02.api.letsencrypt.org/directory" @@ -27,5 +27,7 @@ domain example.com { alternative names { secure.example.com } domain key "/etc/ssl/private/example.com.key" domain full chain certificate "/etc/ssl/example.com.fullchain.pem" + # Test with the staging server to avoid aggressive rate-limiting. + #sign with letsencrypt-staging sign with letsencrypt } diff --git a/etc/root/root.mail b/etc/root/root.mail index 792f8a869..ba38b2237 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,6 +1,6 @@ -From purplerain@secbsd.org Tue May 2 00:00:00 UTC 2023 +From purplerain@secbsd.org Sat May 13 00:00:00 UTC 2023 Return-Path: root -Date: May 2 00:00:00 UTC 2023 +Date: May 13 00:00:00 UTC 2023 From: purplerain@secbsd.org (Purple Rain) To: root Subject: Welcome to SecBSD 1.3! diff --git a/etc/skel/dot.version b/etc/skel/dot.version index 70a024f66..9d277a216 100644 --- a/etc/skel/dot.version +++ b/etc/skel/dot.version @@ -1 +1 @@ -# SecBSD 1.3-8bfda6e: Mon May 2 00:00:00 UTC 2023 (Quetzalcoatl) +# SecBSD 1.3-025fffe: Sat May 13 00:00:00 UTC 2023 (Quetzalcoatl) diff --git a/games/backgammon/teachgammon/tutor.c b/games/backgammon/teachgammon/tutor.c index bd0fab398..26ff46037 100644 --- a/games/backgammon/teachgammon/tutor.c +++ b/games/backgammon/teachgammon/tutor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tutor.c,v 1.9 2017/01/20 01:12:44 krw Exp $ */ +/* $OpenBSD: tutor.c,v 1.10 2023/05/05 10:26:50 tb Exp $ */ /* * Copyright (c) 1980, 1993 @@ -146,8 +146,7 @@ clrest(void) } int -brdeq(b1, b2) - const int *b1, *b2; +brdeq(const int *b1, const int *b2) { const int *e; diff --git a/gnu/gcc/gcc/config/arm/secbsd.h b/gnu/gcc/gcc/config/arm/secbsd.h new file mode 100644 index 000000000..b148a64e1 --- /dev/null +++ b/gnu/gcc/gcc/config/arm/secbsd.h @@ -0,0 +1,215 @@ +/* Definitions of target machine for GNU compiler, OpenBSD/arm ELF version. + Copyright (C) 2002 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Run-time Target Specification. */ +#undef TARGET_VERSION +#define TARGET_VERSION fputs (" (OpenBSD/arm)", stderr); + +/* This is used in ASM_FILE_START. */ +#undef ARM_OS_NAME +#define ARM_OS_NAME "OpenBSD" + +/* Unsigned chars produces much better code than signed. */ +#define DEFAULT_SIGNED_CHAR 0 + + +/* This defaults us to little-endian. */ +#ifndef TARGET_ENDIAN_DEFAULT +#define TARGET_ENDIAN_DEFAULT 0 +#endif + +#undef MULTILIB_DEFAULTS + +/* armv6k default cpu. */ +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_mpcore + +/* We default to a soft-float ABI so that binaries can run on all + target hardware. */ +#undef TARGET_DEFAULT_FLOAT_ABI +#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT + +/* We default to the "aapcs-linux" ABI so that enums are int-sized by + default. */ +#undef ARM_DEFAULT_ABI +#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \ + OPENBSD_OS_CPP_BUILTINS_ELF(); \ + } \ + while (0) + +#undef SUBTARGET_CPP_SPEC +#define SUBTARGET_CPP_SPEC OBSD_CPP_SPEC + +/* OBSD_LINK_SPEC appropriate for OpenBSD. Support for GCC options + -static, -assert, and -nostdlib. */ +#undef OBSD_LINK_SPEC +#ifdef OBSD_NO_DYNAMIC_LIBRARIES +#define OBSD_LINK_SPEC \ + "%{!nostdlib:%{!r*:%{!e*:-e __start}}} %{assert*}" +#else +#define OBSD_LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{rdynamic:-export-dynamic} \ + %{assert*} \ + %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \ + %{!nostdlib:-L/usr/lib}" +#endif + +#undef SUBTARGET_EXTRA_ASM_SPEC +#define SUBTARGET_EXTRA_ASM_SPEC \ + "%{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu;:-meabi=4} %{fpic|fPIC|fpie|fPIE:-k}" + +/* Default floating point model is soft-VFP. + FIXME: -mhard-float currently implies FPA. */ +#undef SUBTARGET_ASM_FLOAT_SPEC +#define SUBTARGET_ASM_FLOAT_SPEC \ + "%{mhard-float:-mfpu=fpa} \ + %{msoft-float:-mfpu=softvfp} \ + %{!mhard-float: \ + %{!msoft-float:-mfpu=softvfp}}" + +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS \ + { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \ + { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \ + { "openbsd_link_spec", OBSD_LINK_SPEC }, \ + { "openbsd_entry_point", OPENBSD_ENTRY_POINT }, + +#define OPENBSD_ENTRY_POINT "__start" + +/* Pass -X to the linker so that it will strip symbols starting with 'L' */ +#undef LINK_SPEC +#define LINK_SPEC \ + "-X %{mbig-endian:-EB} %{mlittle-endian:-EL} \ + %(openbsd_link_spec)" + +/* Make GCC agree with . */ + +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +/* We don't have any limit on the length as out debugger is GDB. */ +#undef DBX_CONTIN_LENGTH + +/* OpenBSD and NetBSD do their profiling differently to the Acorn compiler. We + don't need a word following the mcount call; and to skip it + requires either an assembly stub or use of fomit-frame-pointer when + compiling the profiling functions. Since we break Acorn CC + compatibility below a little more won't hurt. */ + +#undef ARM_FUNCTION_PROFILER +#define ARM_FUNCTION_PROFILER(STREAM,LABELNO) \ +{ \ + asm_fprintf (STREAM, "\tmov\t%Rip, %Rlr\n"); \ + asm_fprintf (STREAM, "\tbl\t__mcount%s\n", \ + NEED_PLT_RELOC ? "(PLT)" : ""); \ +} + +/* On the ARM `@' introduces a comment, so we must use something else + for .type directives. */ +#undef TYPE_OPERAND_FMT +#define TYPE_OPERAND_FMT "%%%s" + +#undef FPUTYPE_DEFAULT +#define FPUTYPE_DEFAULT FPUTYPE_VFP + +/* VERY BIG NOTE: Change of structure alignment for OpenBSD|NetBSD/arm. + There are consequences you should be aware of... + + Normally GCC/arm uses a structure alignment of 32 for compatibility + with armcc. This means that structures are padded to a word + boundary. However this causes problems with bugged OpenBSD|NetBSD kernel + code (possibly userland code as well - I have not checked every + binary). The nature of this bugged code is to rely on sizeof() + returning the correct size of various structures rounded to the + nearest byte (SCSI and ether code are two examples, the vm system + is another). This code breaks when the structure alignment is 32 + as sizeof() will report a word=rounded size. By changing the + structure alignment to 8. GCC will conform to what is expected by + OpenBSD|NetBSD. + + This has several side effects that should be considered. + 1. Structures will only be aligned to the size of the largest member. + i.e. structures containing only bytes will be byte aligned. + structures containing shorts will be half word alinged. + structures containing ints will be word aligned. + + This means structures should be padded to a word boundary if + alignment of 32 is required for byte structures etc. + + 2. A potential performance penalty may exist if strings are no longer + word aligned. GCC will not be able to use word load/stores to copy + short strings. + + This modification is not encouraged but with the present state of the + OpenBSD|NetBSD source tree it is currently the only solution that meets the + requirements. */ + +#undef DEFAULT_STRUCTURE_SIZE_BOUNDARY +#define DEFAULT_STRUCTURE_SIZE_BOUNDARY 8 + +/* Clear the instruction cache from `BEG' to `END'. This makes a + call to the ARM_SYNC_ICACHE architecture specific syscall. */ +#define CLEAR_INSN_CACHE(BEG, END) \ +do \ + { \ + extern int sysarch(int number, void *args); \ + struct { \ + unsigned int addr; \ + int len; \ + } s; \ + s.addr = (unsigned int)(BEG); \ + s.len = (END) - (BEG); \ + (void) sysarch (0, &s); \ + } \ +while (0) + +/* As an elf system, we need crtbegin/crtend stuff. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ + %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \ + %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \ + %{!nopie:rcrt0%O%s}}}} \ + crtbegin%O%s} %{shared:crtbeginS%O%s}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" diff --git a/gnu/gcc/gcc/config/arm/secbsd1.h b/gnu/gcc/gcc/config/arm/secbsd1.h new file mode 100644 index 000000000..cc1352b5a --- /dev/null +++ b/gnu/gcc/gcc/config/arm/secbsd1.h @@ -0,0 +1,61 @@ +/* Definitions of target machine for GNU compiler, SecBSD/arm ELF version. + Copyright (C) 2002 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define SBSD_HAS_DECLARE_FUNCTION_NAME +#define SBSD_HAS_DECLARE_FUNCTION_SIZE + +/* use EABI frame unwinding tables. */ +#define TARGET_UNWIND_INFO 1 + +#if defined (__thumb__) +#define RENAME_LIBRARY_SET ".thumb_set" +#else +#define RENAME_LIBRARY_SET ".set" +#endif + +/* Make __aeabi_AEABI_NAME an alias for __GCC_NAME. */ +#define RENAME_LIBRARY(GCC_NAME, AEABI_NAME) \ + __asm__ (".globl\t__aeabi_" #AEABI_NAME "\n" \ + RENAME_LIBRARY_SET "\t__aeabi_" #AEABI_NAME \ + ", __" #GCC_NAME "\n"); + +/* Give some libgcc functions an additional __aeabi name. */ +#ifdef L_muldi3 +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (muldi3, lmul) +#endif +#ifdef L_fixdfdi +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixdfdi, d2lz) +#endif +#ifdef L_fixunsdfdi +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunsdfdi, d2ulz) +#endif +#ifdef L_fixsfdi +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixsfdi, f2lz) +#endif +#ifdef L_fixunssfdi +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunssfdi, f2ulz) +#endif +#ifdef L_floatdidf +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdidf, l2d) +#endif +#ifdef L_floatdisf +#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdisf, l2f) +#endif diff --git a/gnu/gcc/gcc/config/arm/unwind-arm.h b/gnu/gcc/gcc/config/arm/unwind-arm.h index 8a1bf2494..5557fbae7 100644 --- a/gnu/gcc/gcc/config/arm/unwind-arm.h +++ b/gnu/gcc/gcc/config/arm/unwind-arm.h @@ -225,7 +225,8 @@ extern "C" { if (!tmp) return 0; -#if defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__SecBSD__) /* Pc-relative indirect. */ tmp += ptr; tmp = *(_Unwind_Word *) tmp; diff --git a/gnu/gcc/gcc/config/host-secbsd.c b/gnu/gcc/gcc/config/host-secbsd.c new file mode 100644 index 000000000..a57c64c3f --- /dev/null +++ b/gnu/gcc/gcc/config/host-secbsd.c @@ -0,0 +1,107 @@ +/* SecBSD host-specific hook definitions. + Copyright (C) 2005 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. */ + +#include +#include + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "hosthooks.h" +#include "hosthooks-def.h" + +#undef HOST_HOOKS_GT_PCH_GET_ADDRESS +#define HOST_HOOKS_GT_PCH_GET_ADDRESS openbsd_gt_pch_get_address + +#undef HOST_HOOKS_GT_PCH_USE_ADDRESS +#define HOST_HOOKS_GT_PCH_USE_ADDRESS openbsd_gt_pch_use_address + +/* Return the address of the PCH address space, if the PCH will fit in it. */ + +void * +openbsd_gt_pch_get_address (size_t size, int fd ATTRIBUTE_UNUSED) +{ + void *base, *addr; + size_t pgsz; + + if (size > INT_MAX) + return NULL; + + pgsz = sysconf(_SC_PAGESIZE); + if (pgsz == (size_t)-1) + return NULL; + + base = sbrk(0); + + /* round up to nearest page */ + base = (void *)(((long)base + (pgsz - 1)) & ~(pgsz - 1)); + if (brk(base) != 0) + return NULL; + + /* attempt to allocate size */ + addr = sbrk(size); + if (addr == (void *)-1) + return NULL; + + /* deallocate the memory */ + if (brk(base) != 0) + return NULL; + + /* confirm addr is as expected */ + if (addr != base) + return NULL; + + return base; +} + +/* Return 0 if we can reserve the PCH address space. */ + +int +openbsd_gt_pch_use_address (void *base, size_t size, int fd ATTRIBUTE_UNUSED, size_t off ATTRIBUTE_UNUSED) +{ + void *addr; + + if (size == 0) + return -1; + + /* sanity check base address */ + addr = sbrk(0); + if (addr == (void *)-1 || base < addr) + return -1; + + /* set base for sbrk */ + if (brk(base) != 0) + return -1; + + /* attempt to get the memory */ + addr = sbrk(size); + if (addr == (void *)-1) + return -1; + + /* sanity check the result */ + if (addr != base) { + brk(base); + return -1; + } + + return 0; +} + +const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; diff --git a/gnu/gcc/gcc/config/i386/secbsd.h b/gnu/gcc/gcc/config/i386/secbsd.h new file mode 100644 index 000000000..1bdcec35e --- /dev/null +++ b/gnu/gcc/gcc/config/i386/secbsd.h @@ -0,0 +1,102 @@ +/* Configuration for an SecBSD i386 target. + Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + + +#define TARGET_VERSION fprintf (stderr, " (SecBSD/i386)"); + +/* This goes away when the math-emulator is fixed */ +#undef TARGET_SUBTARGET_DEFAULT +#define TARGET_SUBTARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__unix__"); \ + builtin_define ("__SecBSD__"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=SecBSD"); \ + } \ + while (0) + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +/* Kludgy test: when gas is upgraded, it will have p2align, and no problems + with nops. */ +#ifndef HAVE_GAS_MAX_SKIP_P2ALIGN +/* i386 SecBSD still uses an older gas that doesn't insert nops by default + when the .align directive demands to insert extra space in the text + segment. */ +#undef ASM_OUTPUT_ALIGN +#define ASM_OUTPUT_ALIGN(FILE,LOG) \ + if ((LOG)!=0) fprintf ((FILE), "\t.align %d,0x90\n", (LOG)) +#endif + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall mcount@PLT\n": "\tcall mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* All configurations that don't use elf must be explicit about not using + dwarf unwind information. */ +#define DWARF2_UNWIND_INFO 0 + +#undef ASM_PREFERRED_EH_DATA_FORMAT + +#undef ASM_COMMENT_START +#define ASM_COMMENT_START ";#" + +/* SecBSD gas currently does not support quad, so do not use it. */ +#undef ASM_QUAD diff --git a/gnu/gcc/gcc/config/i386/secbsd64.h b/gnu/gcc/gcc/config/i386/secbsd64.h new file mode 100644 index 000000000..38c33bd2a --- /dev/null +++ b/gnu/gcc/gcc/config/i386/secbsd64.h @@ -0,0 +1,130 @@ +/* Configuration for an SecBSD x86-64 target. + + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#undef TARGET_VERSION +#define TARGET_VERSION fprintf (stderr, " (SecBSD/x86-64 ELF)") + +/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using + libraries compiled with the native cc, so undef it. */ +#undef NO_DOLLAR_IN_LABEL + +/* Override the default comment-starter of "/". */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + +/* Run-time target specifications */ + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_ELF(); \ + if (TARGET_64BIT) \ + SECBSD_OS_CPP_BUILTINS_LP64(); \ + } \ + while (0) + +/* As an elf system, we need crtbegin/crtend stuff. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ + %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \ + %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \ + %{!nopie:rcrt0%O%s}}}} crtbegin%O%s} %{shared:crtbeginS%O%s}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +#undef SET_ASM_OP +#define SET_ASM_OP "\t.set\t" + +/* The following macros were originally stolen from i386v4.h. + These have to be defined to get PIC code correct. */ + +/* Assembler format: dispatch tables. */ + +/* Assembler format: sections. */ + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* Assembler format: alignment output. */ + +/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */ + +/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */ + +#undef LINK_SPEC +#define LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{rdynamic:-export-dynamic} \ + %{assert*} \ + %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \ + %{!nostdlib:-L/usr/lib}" + +#define SBSD_HAS_CORRECT_SPECS + +#undef JUMP_TABLES_IN_TEXT_SECTION +#define JUMP_TABLES_IN_TEXT_SECTION 0 diff --git a/gnu/gcc/gcc/config/i386/secbsdelf.h b/gnu/gcc/gcc/config/i386/secbsdelf.h new file mode 100644 index 000000000..90c365195 --- /dev/null +++ b/gnu/gcc/gcc/config/i386/secbsdelf.h @@ -0,0 +1,132 @@ +/* Configuration for an SecBSD i386 target. + + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using + libraries compiled with the native cc, so undef it. */ +#undef NO_DOLLAR_IN_LABEL + +/* Override the default comment-starter of "/". */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + +#undef DBX_REGISTER_NUMBER +#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n] + +/* This goes away when the math-emulator is fixed */ +#undef TARGET_DEFAULT +#define TARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) + +/* Run-time target specifications */ + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS(); \ + } \ + while (0) + +/* As an elf system, we need crtbegin/crtend stuff. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ + %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \ + %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \ + %{!nopie:rcrt0%O%s}}}} crtbegin%O%s} %{shared:crtbeginS%O%s}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +#undef SET_ASM_OP +#define SET_ASM_OP "\t.set\t" + +/* The following macros were originally stolen from i386v4.h. + These have to be defined to get PIC code correct. */ + +/* Assembler format: dispatch tables. */ + +/* Assembler format: sections. */ + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN +#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ + if ((LOG) != 0) {\ + if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ + } +#endif + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* Assembler format: alignment output. */ + +/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */ + +/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */ + +#undef LINK_SPEC +#define LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{rdynamic:-export-dynamic} \ + %{assert*} \ + %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \ + %{!nostdlib:-L/usr/lib}" + +#define SBSD_HAS_CORRECT_SPECS diff --git a/gnu/gcc/gcc/config/i386/t-secbsd b/gnu/gcc/gcc/config/i386/t-secbsd new file mode 100644 index 000000000..183046340 --- /dev/null +++ b/gnu/gcc/gcc/config/i386/t-secbsd @@ -0,0 +1,6 @@ +# gdb gets confused if pic code is linked with non pic +# We cope by building variants of libgcc. +MULTILIB_OPTIONS = fpic +MULTILIB_MATCHES=fpic=fPIC +LIBGCC = stmp-multilib +INSTALL_LIBGCC = install-multilib diff --git a/gnu/gcc/gcc/config/ia64/secbsd.h b/gnu/gcc/gcc/config/ia64/secbsd.h new file mode 100644 index 000000000..54acc3a30 --- /dev/null +++ b/gnu/gcc/gcc/config/ia64/secbsd.h @@ -0,0 +1,19 @@ +/* Definitions for ia64-linux target. */ + +/* This macro is a C statement to print on `stderr' a string describing the + particular machine description choice. */ + +#define TARGET_VERSION fprintf (stderr, " (SecBSD/ia64)"); + +/* Target OS builtins. */ +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__unix__"); \ + builtin_define ("__SecBSD__"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=SecBSD"); \ + } \ + while (0) + diff --git a/gnu/gcc/gcc/config/secbsd-libpthread.h b/gnu/gcc/gcc/config/secbsd-libpthread.h new file mode 100644 index 000000000..43895c1d1 --- /dev/null +++ b/gnu/gcc/gcc/config/secbsd-libpthread.h @@ -0,0 +1,23 @@ +/* LIB_SPEC appropriate for SecBSD. Include -lpthread if -pthread is + specified on the command line. */ +/* Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define SBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} %{!shared:-lc%{p|pg:_p}}" + diff --git a/gnu/gcc/gcc/config/secbsd-oldgas.h b/gnu/gcc/gcc/config/secbsd-oldgas.h new file mode 100644 index 000000000..b812cecff --- /dev/null +++ b/gnu/gcc/gcc/config/secbsd-oldgas.h @@ -0,0 +1,23 @@ +/* Generic settings for a.out SecBSD systems. + Copyright (C) 2002 Free Software Foundation, Inc. + Contributed by David E. O'Brien . + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + + +#define SBSD_OLD_GAS diff --git a/gnu/gcc/gcc/config/secbsd.h b/gnu/gcc/gcc/config/secbsd.h new file mode 100644 index 000000000..7fb2e794e --- /dev/null +++ b/gnu/gcc/gcc/config/secbsd.h @@ -0,0 +1,357 @@ +/* Base configuration file for all SecBSD targets. + Copyright (C) 1999, 2000, 2004, 2005, 2007 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not see +. */ + +/* Common SecBSD configuration. + All SecBSD architectures include this file, which is intended as + a repository for common defines. + + Some defines are common to all architectures, a few of them are + triggered by SBSD_* guards, so that we won't override architecture + defaults by mistakes. + + SBSD_HAS_CORRECT_SPECS: + another mechanism provides correct specs already. + SBSD_NO_DYNAMIC_LIBRARIES: + no implementation of dynamic libraries. + SBSD_OLD_GAS: + older flavor of gas which needs help for PIC. + SBSD_HAS_DECLARE_FUNCTION_NAME, SBSD_HAS_DECLARE_FUNCTION_SIZE, + SBSD_HAS_DECLARE_OBJECT: + PIC support, FUNCTION_NAME/FUNCTION_SIZE are independent, whereas + the corresponding logic for OBJECTS is necessarily coupled. + + There are also a few `default' defines such as ASM_WEAKEN_LABEL, + intended as common ground for arch that don't provide + anything suitable. */ + +/* SECBSD_NATIVE is defined only when gcc is configured as part of + the SecBSD source tree, specifically through Makefile.bsd-wrapper. + + In such a case the include path can be trimmed as there is no + distinction between system includes and gcc includes. */ + +/* This configuration method, namely Makefile.bsd-wrapper and + SECBSD_NATIVE is NOT recommended for building cross-compilers. */ + +#ifdef SECBSD_NATIVE + +/* The compiler is configured with ONLY the gcc/g++ standard headers. */ +#undef INCLUDE_DEFAULTS +#ifdef CROSS_COMPILE +#define INCLUDE_DEFAULTS \ + { \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 }, \ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ + { GPLUSPLUS_INCLUDE_DIR "/..", STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ + { 0, 0, 0, 0 } \ + } +#else +#define INCLUDE_DEFAULTS \ + { \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 }, \ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ + { 0, 0, 0, 0 } \ + } +#endif + +/* Under SecBSD, the normal location of the various *crt*.o files is the + /usr/lib directory. */ +#undef STANDARD_STARTFILE_PREFIX +#define STANDARD_STARTFILE_PREFIX "/usr/local/lib/" + +#endif + +/* Controlling the compilation driver. */ +/* TARGET_OS_CPP_BUILTINS() common to all SecBSD targets. */ +#define SECBSD_OS_CPP_BUILTINS_COMMON() \ + do \ + { \ + builtin_define ("__SecBSD__"); \ + builtin_define ("__unix__"); \ + builtin_define ("__ANSI_COMPAT"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=SecBSD"); \ + } \ + while (0) + +/* TARGET_OS_CPP_BUILTINS() common to all SecBSD ELF targets. */ +#define SECBSD_OS_CPP_BUILTINS_ELF() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_COMMON(); \ + builtin_define ("__ELF__"); \ + } \ + while (0) + +/* TARGET_OS_CPP_BUILTINS() common to all LP64 SecBSD targets. */ +#define SECBSD_OS_CPP_BUILTINS_LP64() \ + do \ + { \ + builtin_define ("_LP64"); \ + builtin_define ("__LP64__"); \ + } \ + while (0) + +/* XXX old stuff TARGET_OS_CPP_BUILTINS() common to all SecBSD targets. */ +#define SECBSD_OS_CPP_BUILTINS() \ + do \ + { \ + builtin_define ("__SecBSD__"); \ + builtin_define ("__unix__"); \ + builtin_define ("__ANSI_COMPAT"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=SecBSD"); \ + } \ + while (0) + +/* CPP_SPEC appropriate for SecBSD. We deal with -posix and -pthread. + XXX the way threads are handled currently is not very satisfying, + since all code must be compiled with -pthread to work. + This two-stage defines makes it easy to pick that for targets that + have subspecs. */ +#ifdef CPP_CPU_SPEC +#define SBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#else +#define SBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#endif + +#undef LIB_SPEC +#define LIB_SPEC SBSD_LIB_SPEC + +#ifndef SBSD_HAS_CORRECT_SPECS + +#ifndef SBSD_NO_DYNAMIC_LIBRARIES +#undef SWITCH_TAKES_ARG +#define SWITCH_TAKES_ARG(CHAR) \ + (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ + || (CHAR) == 'R') +#endif + +#undef CPP_SPEC +#define CPP_SPEC SBSD_CPP_SPEC + +#ifdef SBSD_OLD_GAS +/* ASM_SPEC appropriate for SecBSD. For some architectures, SecBSD + still uses a special flavor of gas that needs to be told when generating + pic code. */ +#undef ASM_SPEC +#define ASM_SPEC "%{fpic|fpie:-k} %{fPIC|fPIE:-k -K}" +#endif + +/* Since we use gas, stdin -> - is a good idea. */ +#define AS_NEEDS_DASH_FOR_PIPED_INPUT + +/* LINK_SPEC appropriate for SecBSD. Support for GCC options + -static, -assert, and -nostdlib. */ +#undef LINK_SPEC +#ifdef SBSD_NO_DYNAMIC_LIBRARIES +#define LINK_SPEC \ + "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{assert*}" +#else +#define LINK_SPEC \ + "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}}} %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic} %{assert*}" +#endif + +#if defined(HAVE_LD_EH_FRAME_HDR) +#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " +#endif + +#undef LIB_SPEC +#define LIB_SPEC SBSD_LIB_SPEC +#endif + + +/* Runtime target specification. */ + +/* Miscellaneous parameters. */ + +/* Controlling debugging info: dbx options. */ + +/* Don't use the `xsTAG;' construct in DBX output; SecBSD systems that + use DBX don't support it. */ +#define DBX_NO_XREFS + + +/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ +/* Two differences from svr4.h: + - we use . - _func instead of a local label, + - we put extra spaces in expressions such as + .type _func , @function + This is more readable for a human being and confuses c++filt less. */ + +/* Assembler format: output and generation of labels. */ + +/* Define the strings used for the .type and .size directives. + These strings generally do not vary from one system running SecBSD + to another, but if a given system needs to use different pseudo-op + names for these, they may be overridden in the arch specific file. */ + +/* SecBSD assembler is hacked to have .type & .size support even in a.out + format object files. Functions size are supported but not activated + yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). + SET_ASM_OP is needed for attribute alias to work. */ + +#undef TYPE_ASM_OP +#undef SIZE_ASM_OP +#undef SET_ASM_OP +#undef GLOBAL_ASM_OP + +#define TYPE_ASM_OP "\t.type\t" +#define SIZE_ASM_OP "\t.size\t" +#define SET_ASM_OP "\t.set\t" +#define GLOBAL_ASM_OP "\t.globl\t" + +/* The following macro defines the format used to output the second + operand of the .type assembler directive. */ +#undef TYPE_OPERAND_FMT +#define TYPE_OPERAND_FMT "@%s" + +/* Provision if extra assembler code is needed to declare a function's result + (taken from svr4, not needed yet actually). */ +#ifndef ASM_DECLARE_RESULT +#define ASM_DECLARE_RESULT(FILE, RESULT) +#endif + +/* These macros generate the special .type and .size directives which + are used to set the corresponding fields of the linker symbol table + entries under SecBSD. These macros also have to output the starting + labels for the relevant functions/objects. */ + +#ifndef SBSD_HAS_DECLARE_FUNCTION_NAME +/* Extra assembler code needed to declare a function properly. + Some assemblers may also need to also have something extra said + about the function's return value. We allow for that here. */ +#undef ASM_DECLARE_FUNCTION_NAME +#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \ + do { \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "function"); \ + ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL)); \ + ASM_OUTPUT_LABEL(FILE, NAME); \ + } while (0) +#endif + +#ifndef SBSD_HAS_DECLARE_FUNCTION_SIZE +/* Declare the size of a function. */ +#undef ASM_DECLARE_FUNCTION_SIZE +#define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL) \ + do { \ + if (!flag_inhibit_size_directive) \ + ASM_OUTPUT_MEASURED_SIZE (FILE, FNAME); \ + } while (0) +#endif + +#ifndef SBSD_HAS_DECLARE_OBJECT +/* Extra assembler code needed to declare an object properly. */ +#undef ASM_DECLARE_OBJECT_NAME +#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ + do { \ + HOST_WIDE_INT size; \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ + size_directive_output = 0; \ + if (!flag_inhibit_size_directive \ + && (DECL) && DECL_SIZE (DECL)) \ + { \ + size_directive_output = 1; \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ + } \ + ASM_OUTPUT_LABEL (FILE, NAME); \ + } while (0) + +/* Output the size directive for a decl in rest_of_decl_compilation + in the case where we did not do so before the initializer. + Once we find the error_mark_node, we know that the value of + size_directive_output was set by ASM_DECLARE_OBJECT_NAME + when it was run for the same decl. */ +#undef ASM_FINISH_DECLARE_OBJECT +#define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ +do { \ + const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ + HOST_WIDE_INT size; \ + if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ + && ! AT_END && TOP_LEVEL \ + && DECL_INITIAL (DECL) == error_mark_node \ + && !size_directive_output) \ + { \ + size_directive_output = 1; \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ + } \ + } while (0) +#endif + + +/* Those are `generic' ways to weaken/globalize a label. We shouldn't need + to override a processor specific definition. Hence, #ifndef ASM_* + In case overriding turns out to be needed, one can always #undef ASM_* + before including this file. */ + +/* Tell the assembler that a symbol is weak. */ +/* Note: netbsd arm32 assembler needs a .globl here. An override may + be needed when/if we go for arm32 support. */ +#ifndef ASM_WEAKEN_LABEL +#define ASM_WEAKEN_LABEL(FILE,NAME) \ + do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ + fputc ('\n', FILE); } while (0) +#endif + +/* Storage layout. */ + + +/* bug work around: we don't want to support #pragma weak, but the current + code layout needs HANDLE_PRAGMA_WEAK asserted for __attribute((weak)) to + work. On the other hand, we don't define HANDLE_PRAGMA_WEAK directly, + as this depends on a few other details as well... */ +#define HANDLE_SYSV_PRAGMA 1 + +/* Define this so we can compile MS code for use with WINE. */ +#define HANDLE_PRAGMA_PACK_PUSH_POP + +/* Stack is explicitly denied execution rights on SecBSD platforms. */ +#define ENABLE_EXECUTE_STACK \ +extern void __enable_execute_stack (void *); \ +void \ +__enable_execute_stack (void *addr) \ +{ \ + long size = getpagesize (); \ + long mask = ~(size-1); \ + char *page = (char *) (((long) addr) & mask); \ + char *end = (char *) ((((long) (addr + TRAMPOLINE_SIZE)) & mask) + size); \ + \ + if (mprotect (page, end - page, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) \ + perror ("mprotect of trampoline code"); \ +} + +/* + * Disable the use of unsafe builtin functions, (strcat, strcpy, stpcpy), + * making them easier to spot in the object files. + */ +#define NO_UNSAFE_BUILTINS + +/* The system headers on SecBSD are C++-aware. */ +#undef NO_IMPLICIT_EXTERN_C +#define NO_IMPLICIT_EXTERN_C + +#include +#include diff --git a/gnu/gcc/gcc/config/t-secbsd b/gnu/gcc/gcc/config/t-secbsd new file mode 100644 index 000000000..2289f154e --- /dev/null +++ b/gnu/gcc/gcc/config/t-secbsd @@ -0,0 +1,2 @@ +# We don't need GCC's own include files. +USER_H = diff --git a/gnu/gcc/gcc/config/t-secbsd-thread b/gnu/gcc/gcc/config/t-secbsd-thread new file mode 100644 index 000000000..4b25f25a4 --- /dev/null +++ b/gnu/gcc/gcc/config/t-secbsd-thread @@ -0,0 +1,5 @@ +# This is currently needed to compile libgcc2 for threads support +TARGET_LIBGCC2_CFLAGS=-pthread +#T_CFLAGS=-pthread +#T_CPPFLAGS=-pthread + diff --git a/gnu/gcc/include/libiberty.h b/gnu/gcc/include/libiberty.h index c25667cc9..4e49706fe 100644 --- a/gnu/gcc/include/libiberty.h +++ b/gnu/gcc/include/libiberty.h @@ -97,7 +97,7 @@ extern void expandargv PARAMS ((int *, char ***)); to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_BASENAME -#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__SecBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) extern char *basename (const char *); #else /* Do not allow basename to be used if there is no prototype seen. We diff --git a/gnu/lib/libiberty/include/ansidecl.h b/gnu/lib/libiberty/include/ansidecl.h index 57a30b6ae..aa39a4886 100644 --- a/gnu/lib/libiberty/include/ansidecl.h +++ b/gnu/lib/libiberty/include/ansidecl.h @@ -283,7 +283,7 @@ So instead we use the macro below and test it against specific values. */ /* Attribute `nonnull' was valid as of gcc 3.3. */ #ifndef ATTRIBUTE_NONNULL -# if (GCC_VERSION >= 3003) || defined(__OpenBSD__) +# if (GCC_VERSION >= 3003) || defined(__OpenBSD__) || defined(__SecBSD__) # define ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m))) # else # define ATTRIBUTE_NONNULL(m) @@ -345,7 +345,7 @@ So instead we use the macro below and test it against specific values. */ /* Attribute `sentinel' was valid as of gcc 3.5. */ #ifndef ATTRIBUTE_SENTINEL -# if (GCC_VERSION >= 3005) || defined(__OpenBSD__) +# if (GCC_VERSION >= 3005) || defined(__OpenBSD__) || defined(__SecBSD__) # define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) # else # define ATTRIBUTE_SENTINEL diff --git a/gnu/lib/libiberty/include/libiberty.h b/gnu/lib/libiberty/include/libiberty.h index e69aeb283..742562fd1 100644 --- a/gnu/lib/libiberty/include/libiberty.h +++ b/gnu/lib/libiberty/include/libiberty.h @@ -97,7 +97,7 @@ extern void expandargv PARAMS ((int *, char ***)); to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_BASENAME -#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__SecBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) extern char *basename (const char *); #else /* Do not allow basename to be used if there is no prototype seen. We diff --git a/gnu/lib/libreadline/support/shobj-conf b/gnu/lib/libreadline/support/shobj-conf index 6bd7fb120..8f08710d4 100644 --- a/gnu/lib/libreadline/support/shobj-conf +++ b/gnu/lib/libreadline/support/shobj-conf @@ -151,7 +151,7 @@ darwin*|macosx*) SHLIB_LIBS='-lSystem' ;; -openbsd*) +openbsd* | secbsd*) SHOBJ_CFLAGS=-fPIC SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared' diff --git a/gnu/llvm/clang/lib/Driver/CMakeLists.txt b/gnu/llvm/clang/lib/Driver/CMakeLists.txt index 5db18358e..08be9f011 100644 --- a/gnu/llvm/clang/lib/Driver/CMakeLists.txt +++ b/gnu/llvm/clang/lib/Driver/CMakeLists.txt @@ -67,7 +67,6 @@ add_clang_library(clangDriver ToolChains/OpenBSD.cpp ToolChains/PS4CPU.cpp ToolChains/RISCVToolchain.cpp - ToolChains/SecBSD.cpp ToolChains/Solaris.cpp ToolChains/TCE.cpp ToolChains/VEToolchain.cpp diff --git a/gnu/llvm/clang/lib/Driver/Driver.cpp b/gnu/llvm/clang/lib/Driver/Driver.cpp index 5ac33bfb2..399c37d15 100644 --- a/gnu/llvm/clang/lib/Driver/Driver.cpp +++ b/gnu/llvm/clang/lib/Driver/Driver.cpp @@ -41,7 +41,6 @@ #include "ToolChains/PPCLinux.h" #include "ToolChains/PS4CPU.h" #include "ToolChains/RISCVToolchain.h" -#include "ToolChains/SecBSD.h" #include "ToolChains/Solaris.h" #include "ToolChains/TCE.h" #include "ToolChains/VEToolchain.h" diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.cpp deleted file mode 100644 index 130f6ca7d..000000000 --- a/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.cpp +++ /dev/null @@ -1,338 +0,0 @@ -//===--- SecBSD.cpp - SecBSD ToolChain Implementations --------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "SecBSD.h" -#include "Arch/Mips.h" -#include "Arch/Sparc.h" -#include "CommonArgs.h" -#include "clang/Config/config.h" -#include "clang/Driver/Compilation.h" -#include "clang/Driver/Options.h" -#include "clang/Driver/SanitizerArgs.h" -#include "llvm/Option/ArgList.h" -#include "llvm/Support/Path.h" -#include "llvm/Support/VirtualFileSystem.h" - -using namespace clang::driver; -using namespace clang::driver::tools; -using namespace clang::driver::toolchains; -using namespace clang; -using namespace llvm::opt; - -void secbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) const { - claimNoWarnArgs(Args); - ArgStringList CmdArgs; - - switch (getToolChain().getArch()) { - case llvm::Triple::x86: - // When building 32-bit code on SecBSD/amd64, we have to explicitly - // instruct as in the base system to assemble 32-bit code. - CmdArgs.push_back("--32"); - break; - - case llvm::Triple::ppc: - CmdArgs.push_back("-mppc"); - CmdArgs.push_back("-many"); - break; - - case llvm::Triple::sparcv9: { - CmdArgs.push_back("-64"); - std::string CPU = getCPUName(Args, getToolChain().getTriple()); - CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple())); - AddAssemblerKPIC(getToolChain(), Args, CmdArgs); - break; - } - - case llvm::Triple::mips64: - case llvm::Triple::mips64el: { - StringRef CPUName; - StringRef ABIName; - mips::getMipsCPUAndABI(Args, getToolChain().getTriple(), CPUName, ABIName); - - CmdArgs.push_back("-mabi"); - CmdArgs.push_back(mips::getGnuCompatibleMipsABIName(ABIName).data()); - - if (getToolChain().getTriple().isLittleEndian()) - CmdArgs.push_back("-EL"); - else - CmdArgs.push_back("-EB"); - - AddAssemblerKPIC(getToolChain(), Args, CmdArgs); - break; - } - - default: - break; - } - - Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, options::OPT_Xassembler); - - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - - for (const auto &II : Inputs) - CmdArgs.push_back(II.getFilename()); - - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("as")); - C.addCommand(std::make_unique(JA, *this, - ResponseFileSupport::AtFileCurCP(), - Exec, CmdArgs, Inputs, Output)); -} - -void secbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, - const InputInfoList &Inputs, - const ArgList &Args, - const char *LinkingOutput) const { - const toolchains::SecBSD &ToolChain = - static_cast(getToolChain()); - const Driver &D = getToolChain().getDriver(); - ArgStringList CmdArgs; - - // Silence warning for "clang -g foo.o -o foo" - Args.ClaimAllArgs(options::OPT_g_Group); - // and "clang -emit-llvm foo.o -o foo" - Args.ClaimAllArgs(options::OPT_emit_llvm); - // and for "clang -w foo.o -o foo". Other warning options are already - // handled somewhere else. - Args.ClaimAllArgs(options::OPT_w); - - if (ToolChain.getArch() == llvm::Triple::mips64) - CmdArgs.push_back("-EB"); - else if (ToolChain.getArch() == llvm::Triple::mips64el) - CmdArgs.push_back("-EL"); - - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_shared)) { - CmdArgs.push_back("-e"); - CmdArgs.push_back("__start"); - } - - CmdArgs.push_back("--eh-frame-hdr"); - if (Args.hasArg(options::OPT_static)) { - CmdArgs.push_back("-Bstatic"); - } else { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); - CmdArgs.push_back("-Bdynamic"); - if (Args.hasArg(options::OPT_shared)) { - CmdArgs.push_back("-shared"); - } else { - CmdArgs.push_back("-dynamic-linker"); - CmdArgs.push_back("/usr/libexec/ld.so"); - } - } - - if (Args.hasArg(options::OPT_pie)) - CmdArgs.push_back("-pie"); - if (Args.hasArg(options::OPT_nopie) || Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-nopie"); - - if (Output.isFilename()) { - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - } else { - assert(Output.isNothing() && "Invalid output."); - } - - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) { - const char *crt0 = nullptr; - const char *crtbegin = nullptr; - if (!Args.hasArg(options::OPT_shared)) { - if (Args.hasArg(options::OPT_pg)) - crt0 = "gcrt0.o"; - else if (Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_nopie)) - crt0 = "rcrt0.o"; - else - crt0 = "crt0.o"; - crtbegin = "crtbegin.o"; - } else { - crtbegin = "crtbeginS.o"; - } - - if (crt0) - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crt0))); - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin))); - } - - Args.AddAllArgs(CmdArgs, options::OPT_L); - ToolChain.AddFilePathLibArgs(Args, CmdArgs); - Args.AddAllArgs(CmdArgs, {options::OPT_T_Group, options::OPT_e, - options::OPT_s, options::OPT_t, - options::OPT_Z_Flag, options::OPT_r}); - - bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs); - bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs); - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); - - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { - // Use the static OpenMP runtime with -static-openmp - bool StaticOpenMP = Args.hasArg(options::OPT_static_openmp) && - !Args.hasArg(options::OPT_static); - addOpenMPRuntime(CmdArgs, ToolChain, Args, StaticOpenMP); - - if (D.CCCIsCXX()) { - if (ToolChain.ShouldLinkCXXStdlib(Args)) - ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); - if (Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lm_p"); - else - CmdArgs.push_back("-lm"); - } - if (NeedsSanitizerDeps) { - CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins")); - linkSanitizerRuntimeDeps(ToolChain, CmdArgs); - } - if (NeedsXRayDeps) { - CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins")); - linkXRayRuntimeDeps(ToolChain, CmdArgs); - } - // FIXME: For some reason GCC passes -lgcc before adding - // the default system libraries. Just mimic this for now. - CmdArgs.push_back("-lcompiler_rt"); - - if (Args.hasArg(options::OPT_pthread)) { - if (!Args.hasArg(options::OPT_shared) && Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lpthread_p"); - else - CmdArgs.push_back("-lpthread"); - } - - if (!Args.hasArg(options::OPT_shared)) { - if (Args.hasArg(options::OPT_pg)) - CmdArgs.push_back("-lc_p"); - else - CmdArgs.push_back("-lc"); - } - - CmdArgs.push_back("-lcompiler_rt"); - } - - if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) { - const char *crtend = nullptr; - if (!Args.hasArg(options::OPT_shared)) - crtend = "crtend.o"; - else - crtend = "crtendS.o"; - - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend))); - } - - ToolChain.addProfileRTLibs(Args, CmdArgs); - - const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath()); - C.addCommand(std::make_unique(JA, *this, - ResponseFileSupport::AtFileCurCP(), - Exec, CmdArgs, Inputs, Output)); -} - -SanitizerMask SecBSD::getSupportedSanitizers() const { - const bool IsX86 = getTriple().getArch() == llvm::Triple::x86; - const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64; - - // For future use, only UBsan at the moment - SanitizerMask Res = ToolChain::getSupportedSanitizers(); - - if (IsX86 || IsX86_64) { - Res |= SanitizerKind::Vptr; - Res |= SanitizerKind::Fuzzer; - Res |= SanitizerKind::FuzzerNoLink; - } - - if (IsX86_64) { - Res |= SanitizerKind::KernelAddress; - } - - return Res; -} - -/// SecBSD - SecBSD tool chain which can call as(1) and ld(1) directly. - -SecBSD::SecBSD(const Driver &D, const llvm::Triple &Triple, - const ArgList &Args) - : Generic_ELF(D, Triple, Args) { - getFilePaths().push_back(getDriver().SysRoot + "/usr/lib"); -} - -void SecBSD::AddClangSystemIncludeArgs( - const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - const Driver &D = getDriver(); - - if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) - return; - - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - SmallString<128> Dir(D.ResourceDir); - llvm::sys::path::append(Dir, "include"); - addSystemInclude(DriverArgs, CC1Args, Dir.str()); - } - - if (DriverArgs.hasArg(options::OPT_nostdlibinc)) - return; - - // Check for configure-time C include directories. - StringRef CIncludeDirs(C_INCLUDE_DIRS); - if (CIncludeDirs != "") { - SmallVector dirs; - CIncludeDirs.split(dirs, ":"); - for (StringRef dir : dirs) { - StringRef Prefix = - llvm::sys::path::is_absolute(dir) ? StringRef(D.SysRoot) : ""; - addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir); - } - return; - } - - addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); -} - -void SecBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - addSystemInclude(DriverArgs, CC1Args, - getDriver().SysRoot + "/usr/include/c++/v1"); -} - -void SecBSD::AddCXXStdlibLibArgs(const ArgList &Args, - ArgStringList &CmdArgs) const { - bool Profiling = Args.hasArg(options::OPT_pg); - - CmdArgs.push_back(Profiling ? "-lc++_p" : "-lc++"); - CmdArgs.push_back(Profiling ? "-lc++abi_p" : "-lc++abi"); - CmdArgs.push_back(Profiling ? "-lpthread_p" : "-lpthread"); -} - -std::string SecBSD::getCompilerRT(const ArgList &Args, - StringRef Component, - FileType Type) const { - if (Component == "builtins") { - SmallString<128> Path(getDriver().SysRoot); - llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a"); - return std::string(Path.str()); - } else { - SmallString<128> P(getDriver().ResourceDir); - std::string CRTBasename = - buildCompilerRTBasename(Args, Component, Type, /*AddArch=*/false); - llvm::sys::path::append(P, "lib", CRTBasename); - if (getVFS().exists(P)) - return std::string(P.str()); - return ToolChain::getCompilerRT(Args, Component, Type); - } -} - -Tool *SecBSD::buildAssembler() const { - return new tools::secbsd::Assembler(*this); -} - -Tool *SecBSD::buildLinker() const { return new tools::secbsd::Linker(*this); } - -bool SecBSD::HasNativeLLVMSupport() const { return true; } diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.h b/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.h deleted file mode 100644 index bbfc9bd77..000000000 --- a/gnu/llvm/clang/lib/Driver/ToolChains/SecBSD.h +++ /dev/null @@ -1,109 +0,0 @@ -//===--- SecBSD.h - SecBSD ToolChain Implementations ----------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_OPENBSD_H -#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_OPENBSD_H - -#include "Gnu.h" -#include "clang/Basic/LangOptions.h" -#include "clang/Driver/Tool.h" -#include "clang/Driver/ToolChain.h" - -namespace clang { -namespace driver { -namespace tools { - -/// secbsd -- Directly call GNU Binutils assembler and linker -namespace secbsd { -class LLVM_LIBRARY_VISIBILITY Assembler : public Tool { -public: - Assembler(const ToolChain &TC) - : Tool("secbsd::Assembler", "assembler", TC) {} - - bool hasIntegratedCPP() const override { return false; } - - void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const override; -}; - -class LLVM_LIBRARY_VISIBILITY Linker : public Tool { -public: - Linker(const ToolChain &TC) : Tool("secbsd::Linker", "linker", TC) {} - - bool hasIntegratedCPP() const override { return false; } - bool isLinkJob() const override { return true; } - - void ConstructJob(Compilation &C, const JobAction &JA, - const InputInfo &Output, const InputInfoList &Inputs, - const llvm::opt::ArgList &TCArgs, - const char *LinkingOutput) const override; -}; -} // end namespace secbsd -} // end namespace tools - -namespace toolchains { - -class LLVM_LIBRARY_VISIBILITY SecBSD : public Generic_ELF { -public: - SecBSD(const Driver &D, const llvm::Triple &Triple, - const llvm::opt::ArgList &Args); - - bool HasNativeLLVMSupport() const override; - - bool IsMathErrnoDefault() const override { return false; } - bool IsObjCNonFragileABIDefault() const override { return true; } - bool isPIEDefault() const override { return true; } - - RuntimeLibType GetDefaultRuntimeLibType() const override { - return ToolChain::RLT_CompilerRT; - } - CXXStdlibType GetDefaultCXXStdlibType() const override { - return ToolChain::CST_Libcxx; - } - - void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const override; - - void addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const override; - void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, - llvm::opt::ArgStringList &CmdArgs) const override; - - std::string getCompilerRT(const llvm::opt::ArgList &Args, StringRef Component, - FileType Type = ToolChain::FT_Static) const override; - - bool IsUnwindTablesDefault(const llvm::opt::ArgList &Args) const override { - switch (getArch()) { - case llvm::Triple::arm: - return false; - default: - return true; - } - } - - LangOptions::StackProtectorMode - GetDefaultStackProtectorLevel(bool KernelOrKext) const override { - return LangOptions::SSPStrong; - } - unsigned GetDefaultDwarfVersion() const override { return 2; } - - SanitizerMask getSupportedSanitizers() const override; - -protected: - Tool *buildAssembler() const override; - Tool *buildLinker() const override; -}; - -} // end namespace toolchains -} // end namespace driver -} // end namespace clang - -#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_OPENBSD_H diff --git a/gnu/llvm/compiler-rt/cmake/Modules/SanitizerUtils.cmake b/gnu/llvm/compiler-rt/cmake/Modules/SanitizerUtils.cmake index ff30d6fc5..6c8651df3 100644 --- a/gnu/llvm/compiler-rt/cmake/Modules/SanitizerUtils.cmake +++ b/gnu/llvm/compiler-rt/cmake/Modules/SanitizerUtils.cmake @@ -97,7 +97,7 @@ macro(add_sanitizer_rt_version_list name) endmacro() # Add target to check code style for sanitizer runtimes. -if(CMAKE_HOST_UNIX AND NOT OS_NAME MATCHES "SecBSD") +if(CMAKE_HOST_UNIX AND NOT OS_NAME MATCHES "OpenBSD") add_custom_target(SanitizerLintCheck COMMAND env LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR= PYTHON_EXECUTABLE=${Python3_EXECUTABLE} diff --git a/gnu/llvm/lldb/packages/Python/lldbsuite/test/lldbtest.py b/gnu/llvm/lldb/packages/Python/lldbsuite/test/lldbtest.py index 2d1b45de3..7e1fdce36 100644 --- a/gnu/llvm/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/gnu/llvm/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1471,7 +1471,7 @@ class Base(unittest2.TestCase): def getstdlibFlag(self): """ Returns the proper -stdlib flag, or empty if not required.""" - if self.platformIsDarwin() or self.getPlatform() == "freebsd" or self.getPlatform() == "openbsd" or self.getPlatform() == "secbsd": + if self.platformIsDarwin() or self.getPlatform() == "freebsd" or self.getPlatform() == "openbsd": stdlibflag = "-stdlib=libc++" else: # this includes NetBSD stdlibflag = "" @@ -1734,7 +1734,7 @@ class Base(unittest2.TestCase): cflags += "c++11" if self.platformIsDarwin() or self.getPlatform() == "freebsd": cflags += " -stdlib=libc++" - elif self.getPlatform() == "openbsd" or self.getPlatform() == "secbsd": + elif self.getPlatform() == "openbsd": cflags += " -stdlib=libc++" elif self.getPlatform() == "netbsd": # NetBSD defaults to libc++ @@ -1782,7 +1782,7 @@ class Base(unittest2.TestCase): return configuration.lldb_libs_dir def getLibcPlusPlusLibs(self): - if self.getPlatform() in ('freebsd', 'linux', 'netbsd', 'openbsd', 'secbsd'): + if self.getPlatform() in ('freebsd', 'linux', 'netbsd', 'openbsd'): return ['libc++.so.1'] else: return ['libc++.1.dylib', 'libc++abi.'] diff --git a/gnu/llvm/lldb/tools/lldb-server/CMakeLists.txt b/gnu/llvm/lldb/tools/lldb-server/CMakeLists.txt index 495623bc4..98c0a331f 100644 --- a/gnu/llvm/lldb/tools/lldb-server/CMakeLists.txt +++ b/gnu/llvm/lldb/tools/lldb-server/CMakeLists.txt @@ -21,10 +21,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") list(APPEND LLDB_PLUGINS lldbPluginProcessOpenBSD) endif() -if(CMAKE_SYSTEM_NAME MATCHES "SecBSD") - list(APPEND LLDB_PLUGINS lldbPluginProcessOpenBSD) -endif() - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") list(APPEND LLDB_PLUGINS lldbPluginObjectFileMachO) elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") diff --git a/gnu/llvm/llvm/cmake/config.guess b/gnu/llvm/llvm/cmake/config.guess index 4fbd09b3d..60d3f588d 100644 --- a/gnu/llvm/llvm/cmake/config.guess +++ b/gnu/llvm/llvm/cmake/config.guess @@ -206,10 +206,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE} - exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; diff --git a/gnu/llvm/llvm/cmake/modules/AddLLVM.cmake b/gnu/llvm/llvm/cmake/modules/AddLLVM.cmake index 29cf77e01..29e40f45f 100644 --- a/gnu/llvm/llvm/cmake/modules/AddLLVM.cmake +++ b/gnu/llvm/llvm/cmake/modules/AddLLVM.cmake @@ -99,7 +99,7 @@ function(add_llvm_symbol_exports target_name export_file) elseif(LLVM_HAVE_LINK_VERSION_SCRIPT) # Gold and BFD ld require a version script rather than a plain list. set(native_export_file "${target_name}.exports") - # FIXME: Don't write the "local:" line on OpenBSD/SecBSD. + # FIXME: Don't write the "local:" line on OpenBSD. # in the export file, also add a linker script to version LLVM symbols (form: LLVM_N.M) add_custom_command(OUTPUT ${native_export_file} COMMAND echo "LLVM_${LLVM_VERSION_MAJOR} {" > ${native_export_file} @@ -263,7 +263,7 @@ function(add_link_opts target_name) set_property(TARGET ${target_name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,discard-unused=sections") endif() - elseif(NOT MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD|SecBSD|AIX|OS390") + elseif(NOT MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD|AIX|OS390") # TODO Revisit this later on z/OS. set_property(TARGET ${target_name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--gc-sections") diff --git a/gnu/llvm/llvm/cmake/modules/HandleLLVMOptions.cmake b/gnu/llvm/llvm/cmake/modules/HandleLLVMOptions.cmake index 8eefa5b23..0c3419390 100644 --- a/gnu/llvm/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/gnu/llvm/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -228,7 +228,7 @@ endif() # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO # build might work on ELF but fail on MachO/COFF. -if(NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin|FreeBSD|OpenBSD|SecBSD|DragonFly|AIX|SunOS|OS390" OR +if(NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin|FreeBSD|OpenBSD|DragonFly|AIX|SunOS|OS390" OR WIN32 OR CYGWIN) AND NOT LLVM_USE_SANITIZER) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs") diff --git a/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h b/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h index 7b8f4e49c..71cf3a614 100644 --- a/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h +++ b/gnu/llvm/llvm/include/llvm/BinaryFormat/ELF.h @@ -356,7 +356,6 @@ enum { ELFOSABI_AROS = 15, // AROS ELFOSABI_FENIXOS = 16, // FenixOS ELFOSABI_CLOUDABI = 17, // Nuxi CloudABI - ELFOSABI_SECBSD = 19, // SecBSD ELFOSABI_FIRST_ARCH = 64, // First architecture-specific OS ABI ELFOSABI_AMDGPU_HSA = 64, // AMD HSA runtime ELFOSABI_AMDGPU_PAL = 65, // AMD PAL runtime diff --git a/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp b/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp index 419bf10f8..97e6e2584 100644 --- a/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp +++ b/gnu/llvm/llvm/tools/llvm-readobj/ELFDumper.cpp @@ -1001,7 +1001,6 @@ static const EnumEntry ElfOSABI[] = { {"AROS", "AROS", ELF::ELFOSABI_AROS}, {"FenixOS", "FenixOS", ELF::ELFOSABI_FENIXOS}, {"CloudABI", "CloudABI", ELF::ELFOSABI_CLOUDABI}, - {"SecBSD", "UNIX - SecBSD", ELF::ELFOSABI_SECBSD}, {"Standalone", "Standalone App", ELF::ELFOSABI_STANDALONE} }; diff --git a/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt b/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt index 31cd49232..76b9a25cb 100644 --- a/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt +++ b/gnu/llvm/llvm/tools/llvm-shlib/CMakeLists.txt @@ -37,7 +37,6 @@ if(LLVM_BUILD_LLVM_DYLIB) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD") - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SecBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf" diff --git a/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp b/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp index fb4836c2e..f9ff7dd58 100644 --- a/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp +++ b/gnu/llvm/llvm/unittests/ADT/TripleTest.cpp @@ -1480,10 +1480,6 @@ TEST(TripleTest, getARMCPUForArch) { llvm::Triple Triple("arm--openbsd"); EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch()); } - { - llvm::Triple Triple("arm--secbsd"); - EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch()); - } { llvm::Triple Triple("armv6-unknown-freebsd"); EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch()); diff --git a/gnu/llvm/llvm/unittests/Support/Path.cpp b/gnu/llvm/llvm/unittests/Support/Path.cpp index 805d2bd9e..7f95e6cae 100644 --- a/gnu/llvm/llvm/unittests/Support/Path.cpp +++ b/gnu/llvm/llvm/unittests/Support/Path.cpp @@ -2156,7 +2156,7 @@ TEST_F(FileSystemTest, permissions) { // AIX and Solaris without root will mask off (i.e., lose) the sticky bit // on files. #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \ - !defined(__SecBSD__) && !defined(_AIX) && !(defined(__sun__) && defined(__svr4__)) + !defined(_AIX) && !(defined(__sun__) && defined(__svr4__)) EXPECT_EQ(fs::setPermissions(TempPath, fs::sticky_bit), NoError); EXPECT_TRUE(CheckPermissions(fs::sticky_bit)); @@ -2176,7 +2176,7 @@ TEST_F(FileSystemTest, permissions) { EXPECT_EQ(fs::setPermissions(TempPath, fs::all_perms), NoError); EXPECT_TRUE(CheckPermissions(fs::all_perms)); -#endif // !FreeBSD && !NetBSD && !OpenBSD && !SecBSD && !AIX +#endif // !FreeBSD && !NetBSD && !OpenBSD && !AIX EXPECT_EQ(fs::setPermissions(TempPath, fs::all_perms & ~fs::sticky_bit), NoError); diff --git a/gnu/llvm/llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn b/gnu/llvm/llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn index 6692ba42a..73cdf4abb 100644 --- a/gnu/llvm/llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn +++ b/gnu/llvm/llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn @@ -86,7 +86,6 @@ static_library("Driver") { "ToolChains/PPCLinux.cpp", "ToolChains/PS4CPU.cpp", "ToolChains/RISCVToolchain.cpp", - "ToolChains/SecBSD.cpp", "ToolChains/Solaris.cpp", "ToolChains/TCE.cpp", "ToolChains/VEToolchain.cpp", diff --git a/gnu/share/config.guess b/gnu/share/config.guess index 4d336c303..385ab36f7 100644 --- a/gnu/share/config.guess +++ b/gnu/share/config.guess @@ -682,6 +682,10 @@ EOF UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE} + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; diff --git a/gnu/share/config.sub b/gnu/share/config.sub index 5abb3a5e2..41fd007fd 100644 --- a/gnu/share/config.sub +++ b/gnu/share/config.sub @@ -1032,7 +1032,7 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -secbsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ diff --git a/gnu/share/ltconfig b/gnu/share/ltconfig index a01334f92..6b6134524 100644 --- a/gnu/share/ltconfig +++ b/gnu/share/ltconfig @@ -1395,7 +1395,7 @@ else hardcode_shlibpath_var=no ;; - openbsd*) + openbsd* | secbsd*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -1995,7 +1995,7 @@ netbsd*) shlibpath_var=LD_LIBRARY_PATH ;; -openbsd*) +openbsd* | secbsd*) version_type=sunos if test "$with_gnu_ld" = yes; then need_lib_prefix=no diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 0b9f85b77..dc9957acd 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -28,7 +28,8 @@ SUBDIR+= binutils SUBDIR+= binutils-2.17 # Do these last; texinfo builds the info 'dir' file, perl must be after binutils -SUBDIR+= perl texinfo +SUBDIR+= texinfo +SUBDIR+= perl maninstall: ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ @@ -36,4 +37,4 @@ maninstall: @rm -f ${DESTDIR}${MANDIR}1/unprotoize.1 ln ${DESTDIR}${MANDIR}1/protoize.1 ${DESTDIR}${MANDIR}1/unprotoize.1 -.include +.include \ No newline at end of file diff --git a/gnu/usr.bin/binutils-2.17/include/libiberty.h b/gnu/usr.bin/binutils-2.17/include/libiberty.h index 6bd318e0f..b96875ba5 100644 --- a/gnu/usr.bin/binutils-2.17/include/libiberty.h +++ b/gnu/usr.bin/binutils-2.17/include/libiberty.h @@ -97,7 +97,7 @@ extern void expandargv PARAMS ((int *, char ***)); to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_BASENAME -#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__SecBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME) extern char *basename (const char *); #else /* Do not allow basename to be used if there is no prototype seen. We diff --git a/gnu/usr.bin/binutils/gdb/rdi-share/unixcomm.c b/gnu/usr.bin/binutils/gdb/rdi-share/unixcomm.c index 62c14a8ec..58c3f41a3 100644 --- a/gnu/usr.bin/binutils/gdb/rdi-share/unixcomm.c +++ b/gnu/usr.bin/binutils/gdb/rdi-share/unixcomm.c @@ -36,7 +36,7 @@ #include #include -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (bsdi) +#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__SecBSD__) || defined (bsdi) #undef BSD #include #endif diff --git a/gnu/usr.bin/binutils/include/libiberty.h b/gnu/usr.bin/binutils/include/libiberty.h index 2da373863..57467d3a0 100644 --- a/gnu/usr.bin/binutils/include/libiberty.h +++ b/gnu/usr.bin/binutils/include/libiberty.h @@ -77,7 +77,7 @@ extern void expandargv PARAMS ((int *, char ***)); to find the declaration so provide a fully prototyped one. If it is 1, we found it so don't provide any declaration at all. */ #if !HAVE_DECL_BASENAME -#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME) +#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__SecBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (HAVE_DECL_BASENAME) extern char *basename PARAMS ((const char *)); #else extern char *basename (); diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt index df248fbe6..49b3d70e9 100644 --- a/gnu/usr.bin/cc/Makefile.tgt +++ b/gnu/usr.bin/cc/Makefile.tgt @@ -3,32 +3,8 @@ TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "alpha" -GCC_CPU= alpha -.elif ${TARGET_ARCH} == "arm" +.if ${TARGET_ARCH} == "arm" GCC_CPU= arm .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" GCC_CPU= i386 -.elif ${TARGET_ARCH} == "ia64" -GCC_CPU= ia64 -.elif ${TARGET_ARCH} == "hppa" -GCC_CPU= pa -TARGET_CPU_DEFAULT= MASK_PA_11 -.elif ${TARGET_ARCH} == "hppa64" -GCC_CPU= pa -TARGET_CPU_DEFAULT= MASK_PA_11|MASK_PA_20 -.elif ${TARGET_ARCH} == "m88k" -GCC_CPU= m88k -.elif ${TARGET_ARCH} == "mips64" || ${TARGET_ARCH} == "mips64el" -GCC_CPU= mips -.elif ${TARGET_ARCH} == "powerpc" -GCC_CPU= rs6000 -.elif ${TARGET_ARCH} == "sh" -GCC_CPU= sh -.elif ${TARGET_ARCH} == "sparc" -GCC_CPU= sparc -TARGET_CPU_DEFAULT= TARGET_CPU_v7 -.elif ${TARGET_ARCH} == "sparc64" -GCC_CPU= sparc -TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 34d73d867..5272c702f 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -14,7 +14,7 @@ NOPIC= Yes EXTRA_OBJS= GGC= ggc-page.o -host_hook_obj= host-openbsd.o +host_hook_obj= host-secbsd.o # # Most lists copied verbatim from GCC Makefiles. diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 4260536c9..2c3f52981 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -51,15 +51,15 @@ TARGET_INC+= elfos.h .if ${TARGET_ARCH} == "arm" TARGET_INC+= arm/elf.h TARGET_INC+= arm/aout.h -TARGET_INC+= arm/openbsd1.h +TARGET_INC+= arm/secbsd1.h TARGET_INC+= arm/arm.h .endif .if ${TARGET_ARCH} == "sh" TARGET_INC+= sh/elf.h .endif -TARGET_INC+= openbsd.h -TARGET_INC+= openbsd-libpthread.h -TARGET_INC+= openbsd-native.h +TARGET_INC+= secbsd.h +TARGET_INC+= secbsd-libpthread.h +TARGET_INC+= secbsd-native.h .if ${TARGET_ARCH} == "powerpc" TARGET_INC+= rs6000/secureplt.h TARGET_INC+= freebsd-spec.h @@ -78,17 +78,17 @@ TM_DEFINES+= TARGET_ENDIAN_DEFAULT=0 .endif .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h -TARGET_INC+= ${GCC_CPU}/openbsd64.h +TARGET_INC+= ${GCC_CPU}/secbsd64.h .elif ${TARGET_ARCH} == "hppa64" TARGET_INC+= ${GCC_CPU}/openbsd64.h .elif ${TARGET_ARCH} == "sparc64" TARGET_INC+= ${GCC_CPU}/openbsd64.h .elif ${TARGET_ARCH} == "i386" -TARGET_INC+= ${GCC_CPU}/openbsdelf.h +TARGET_INC+= ${GCC_CPU}/secbsdelf.h .elif ${TARGET_ARCH} == "m88k" TARGET_INC+= ${GCC_CPU}/openbsdelf.h .else -TARGET_INC+= ${GCC_CPU}/openbsd.h +TARGET_INC+= ${GCC_CPU}/secbsd.h .endif TARGET_INC+= defaults.h @@ -182,8 +182,8 @@ OPT_FILES= c.opt common.opt OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt .endif -.if exists(${.CURDIR}/${GCC_CPU}-openbsd.opt) -OPT_FILES+= ${.CURDIR}/${GCC_CPU}-openbsd.opt +.if exists(${.CURDIR}/${GCC_CPU}-secbsd.opt) +OPT_FILES+= ${.CURDIR}/${GCC_CPU}-secbsd.opt .endif .if ${TARGET_ARCH} == "powerpc" @@ -194,8 +194,8 @@ OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/sysv4.opt OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt .endif -.if exists(${.CURDIR}/openbsd.opt) -OPT_FILES+= ${.CURDIR}/openbsd.opt +.if exists(${.CURDIR}/secbsd.opt) +OPT_FILES+= ${.CURDIR}/secbsd.opt .endif #----------------------------------------------------------------------- @@ -334,7 +334,7 @@ GENSRCS+= multilib.h configargs.h: echo 'static const char configuration_arguments[] =' > ${.TARGET} - echo ' "OpenBSD/${TARGET_ARCH} system compiler";' >> ${.TARGET} + echo ' "SecBSD/${TARGET_ARCH} system compiler";' >> ${.TARGET} echo 'static const char thread_model[] = "posix";' >> ${.TARGET} echo 'static const struct {' >> ${.TARGET} echo ' const char *name, *value;' >> ${.TARGET} diff --git a/gnu/usr.bin/cc/cc_tools/secbsd-native.h b/gnu/usr.bin/cc/cc_tools/secbsd-native.h new file mode 100644 index 000000000..e144aaa01 --- /dev/null +++ b/gnu/usr.bin/cc/cc_tools/secbsd-native.h @@ -0,0 +1,52 @@ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.28.8.1 2009/04/15 03:14:26 kensmith Exp $ */ +/* $OpenBSD: secbsd-native.h,v 1.3 2011/03/06 20:18:22 guenther Exp $ */ + +/* SECBSD_NATIVE is defined when gcc is integrated into the SecBSD + source tree so it can be configured appropriately without using + the GNU configure/build mechanism. */ + +#define SECBSD_NATIVE 1 + +#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ +#undef TOOL_INCLUDE_DIR /* We don't need one for now. */ +#undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */ + +/* Look for the include files in the system-defined places. */ +#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/g++" +#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/g++/backward" +#define GCC_INCLUDE_DIR PREFIX"/include" +#ifdef CROSS_COMPILE +#define CROSS_INCLUDE_DIR PREFIX"/include" +#else +#define STANDARD_INCLUDE_DIR PREFIX"/include" +#endif + +/* Under SecBSD, the normal location of the compiler back ends is the + /usr/libexec directory. + + ``cc --print-search-dirs'' gives: + install: STANDARD_EXEC_PREFIX/ + programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX + libraries: STANDARD_STARTFILE_PREFIX +*/ +#undef STANDARD_BINDIR_PREFIX /* We don't need one for now. */ +#define STANDARD_EXEC_PREFIX PREFIX"/lib/gcc-lib/" +#define STANDARD_LIBEXEC_PREFIX PREFIX"/lib/gcc-lib/" +#define TOOLDIR_BASE_PREFIX PREFIX"/" +#undef MD_EXEC_PREFIX /* We don't want one. */ +#define FBSD_DATA_PREFIX PREFIX"/libdata/gcc/" + +/* Under SecBSD, the normal location of the various *crt*.o files is the + /usr/lib directory. */ + +#undef MD_STARTFILE_PREFIX /* We don't need one for now. */ +#define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" +#define STARTFILE_PREFIX_SPEC PREFIX"/lib/" +#ifdef CROSS_COMPILE +#define STANDARD_BINDIR_PREFIX PREFIX"/"DEFAULT_TARGET_MACHINE "/bin/" +#else +#define STANDARD_BINDIR_PREFIX PREFIX"/bin/" +#endif + +/* SecBSD is 4.4BSD derived */ +#define bsd4_4 diff --git a/gnu/usr.bin/clang/Makefile.inc b/gnu/usr.bin/clang/Makefile.inc index 3289d9fbd..1453b5e27 100644 --- a/gnu/usr.bin/clang/Makefile.inc +++ b/gnu/usr.bin/clang/Makefile.inc @@ -45,9 +45,9 @@ CPPFLAGS+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS .if ${MACHINE_ARCH} == "arm" -TRIPLE= armv7-unknown-secbsd${OSREV}-gnueabi +TRIPLE= armv7-unknown-openbsd${OSREV}-gnueabi .else -TRIPLE= ${MACHINE_ARCH}-unknown-secbsd${OSREV} +TRIPLE= ${MACHINE_ARCH}-unknown-openbsd${OSREV} .endif CPPFLAGS+= -DLLVM_PREFIX=\"/usr\" .include "Makefile.arch" diff --git a/gnu/usr.bin/clang/libclangDriver/Makefile b/gnu/usr.bin/clang/libclangDriver/Makefile index 7a1198e48..cb1ecca8e 100644 --- a/gnu/usr.bin/clang/libclangDriver/Makefile +++ b/gnu/usr.bin/clang/libclangDriver/Makefile @@ -60,7 +60,6 @@ SRCS+= AIX.cpp \ OpenBSD.cpp \ PS4CPU.cpp \ RISCVToolchain.cpp \ - SecBSD.cpp \ Solaris.cpp \ TCE.cpp \ VEToolchain.cpp \ diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index d9d9b8494..3eeb88ff0 100644 --- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper +++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper @@ -11,7 +11,7 @@ LANGUAGES=--enable-languages='c,c++,objc' V=3.3.6 LIBIBERTY_INCLUDES=${.CURDIR}/../../lib/libiberty/include -GNUCFLAGS= ${CFLAGS} ${COPTS} -DOPENBSD_NATIVE \ +GNUCFLAGS= ${CFLAGS} ${COPTS} -DSECBSD_NATIVE \ -I${LIBIBERTY_INCLUDES} MAKE_FLAGS= CFLAGS="${GNUCFLAGS}" \ @@ -45,8 +45,8 @@ CONFIGTARGET= --build=${CROSS_HOST}-unknown-secbsd${OSREV} \ CONFIGPREFIX= ${CROSSDIR}/usr PATH= /bin:/usr/bin:/sbin:/usr/sbin:${CROSSDIR}/usr/bin GXX_INCDIR= ${CROSSDIR}/usr/include/g++ -GNUCFLAGS= ${CFLAGS} ${COPTS} -DOPENBSD_CROSS -I${LIBIBERTY_INCLUDES} -HOSTCFLAGS= ${CFLAGS} ${COPTS} -DOPENBSD_CROSS -I${LIBIBERTY_INCLUDES} +GNUCFLAGS= ${CFLAGS} ${COPTS} -DSECBSD_CROSS -I${LIBIBERTY_INCLUDES} +HOSTCFLAGS= ${CFLAGS} ${COPTS} -DSECBSD_CROSS -I${LIBIBERTY_INCLUDES} HOST_CC=cc MAKE_FLAGS+= CFLAGS_FOR_BUILD="${HOSTCFLAGS}" HOST_CC=cc .elif defined(TARGET_ARCH) && defined(CROSSDIR) @@ -55,7 +55,7 @@ CONFIGPREFIX= ${CROSSDIR}/usr MAKE_FLAGS+= GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" PATH= /bin:/usr/bin:/sbin:/usr/sbin:${CROSSDIR}/usr/bin GXX_INCDIR= ${CROSSDIR}/usr/include/g++ -GNUCFLAGS= ${CFLAGS} ${COPTS} -DOPENBSD_CROSS -I${LIBIBERTY_INCLUDES} +GNUCFLAGS= ${CFLAGS} ${COPTS} -DSECBSD_CROSS -I${LIBIBERTY_INCLUDES} .else CONFIGTARGET= CONFIGPREFIX= /usr diff --git a/gnu/usr.bin/gcc/config.guess b/gnu/usr.bin/gcc/config.guess index c989465ab..96401c1c1 100644 --- a/gnu/usr.bin/gcc/config.guess +++ b/gnu/usr.bin/gcc/config.guess @@ -200,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE} + exit 0 ;; *:MicroBSD:*:*) echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} exit 0 ;; diff --git a/gnu/usr.bin/gcc/config.sub b/gnu/usr.bin/gcc/config.sub index 53f9660a5..2095cf642 100644 --- a/gnu/usr.bin/gcc/config.sub +++ b/gnu/usr.bin/gcc/config.sub @@ -1112,7 +1112,7 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -secbsd* | -freebsd* | -riscix* \ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ diff --git a/gnu/usr.bin/gcc/gcc/config.gcc b/gnu/usr.bin/gcc/gcc/config.gcc index a08cfe511..3bd97c8a3 100644 --- a/gnu/usr.bin/gcc/gcc/config.gcc +++ b/gnu/usr.bin/gcc/gcc/config.gcc @@ -420,6 +420,22 @@ case $machine in tmake_file="${tmake_file} t-openbsd-thread" fi ;; +*-*-secbsd*) + case $machine in + *) + secbsd_libspec="secbsd-libpthread.h" + ;; + esac + tm_file="${secbsd_libspec} ${cpu_type}/secbsd.h" + tmake_file="t-libc-ok t-secbsd t-libgcc-pic" + xm_defines=POSIX + # for gcc in tree, we use our own fragment + xmake_file=x-secbsd + if test x$enable_threads = xyes; then + thread_file='posix' + tmake_file="${tmake_file} t-secbsd-thread" + fi + ;; *-*-netbsd*) tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd" xm_defines=POSIX @@ -708,6 +724,11 @@ arm*-*-openbsd*) tm_file="${tm_file} exec-stack.h" tmake_file="${tmake_file} arm/t-openbsd" ;; +arm*-*-secbsd*) + tm_file="dbxelf.h elfos.h arm/secbsd1.h arm/elf.h arm/aout.h arm/arm.h secbsd.h ${tm_file}" + tm_file="${tm_file} exec-stack.h" + tmake_file="${tmake_file} arm/t-secbsd" + ;; arm*-*-netbsd*) tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h" tmake_file="t-netbsd arm/t-netbsd" @@ -1187,6 +1208,20 @@ x86_64-*-openbsd*) tm_file="${tm_file} exec-stack.h" tmake_file="t-libc-ok t-openbsd i386/t-openbsd" ;; +i[34567]86-*-secbsd*) + # needed to unconfuse gdb + tmake_file="t-libc-ok t-secbsd i386/t-secbsd" + tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h" + tm_file="${tm_file} exec-stack.h" + tm_file="${tm_file} secbsd.h secbsd-libpthread.h i386/secbsdelf.h" + gas=yes + gnu_ld=yes + ;; +x86_64-*-secbsd*) + tm_file="i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h elfos.h secbsd.h secbsd-libpthread.h i386/x86-64.h i386/secbsd64.h" + tm_file="${tm_file} exec-stack.h" + tmake_file="t-libc-ok t-secbsd i386/t-secbsd" + ;; i[34567]86-*-coff*) tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h" ;; diff --git a/gnu/usr.bin/gcc/gcc/config/arm/aout.h b/gnu/usr.bin/gcc/gcc/config/arm/aout.h index 8f4a6056f..525a01e4f 100644 --- a/gnu/usr.bin/gcc/gcc/config/arm/aout.h +++ b/gnu/usr.bin/gcc/gcc/config/arm/aout.h @@ -2,7 +2,7 @@ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by Richard Earnshaw (rearnsha@armltd.co.uk). - + This file is part of GNU CC. GNU CC is free software; you can redistribute it and/or modify @@ -130,7 +130,7 @@ Boston, MA 02111-1307, USA. */ ASM_OUTPUT_INTERNAL_LABEL (STREAM, "Ltext", 0); \ } \ while (0) - + /* Output a function label definition. */ #ifndef ASM_DECLARE_FUNCTION_NAME #define ASM_DECLARE_FUNCTION_NAME(STREAM, NAME, DECL) \ @@ -150,7 +150,7 @@ Boston, MA 02111-1307, USA. */ #define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \ sprintf (STRING, "*%s%s%u", LOCAL_LABEL_PREFIX, PREFIX, (unsigned int)(NUM)) #endif - + /* Construct a private name. */ #define ASM_FORMAT_PRIVATE_NAME(OUTVAR, NAME, NUMBER) \ ((OUTVAR) = (char *) alloca (strlen (NAME) + 10), \ @@ -207,7 +207,7 @@ Boston, MA 02111-1307, USA. */ } \ while (0) #endif - + /* Output a local common block. /bin/as can't do this, so hack a `.space' into the bss segment. Note that this is *bad* practice, which is guaranteed NOT to work since it doesn't define STATIC @@ -223,13 +223,13 @@ Boston, MA 02111-1307, USA. */ } \ while (0) #endif - + /* Output a zero-initialized block. */ #ifndef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(STREAM, DECL, NAME, SIZE, ALIGN) \ asm_output_aligned_bss (STREAM, DECL, NAME, SIZE, ALIGN) #endif - + /* Output a source line for the debugger. */ /* #define ASM_OUTPUT_SOURCE_LINE(STREAM,LINE) */ @@ -238,7 +238,7 @@ Boston, MA 02111-1307, USA. */ #define ASM_OUTPUT_IDENT(STREAM,STRING) \ asm_fprintf (STREAM, "%@ - - - ident %s\n", STRING) #endif - + #ifndef ASM_COMMENT_START #define ASM_COMMENT_START "@" #endif diff --git a/gnu/usr.bin/gcc/gcc/config/arm/arm.h b/gnu/usr.bin/gcc/gcc/config/arm/arm.h index 039960cdd..516212208 100644 --- a/gnu/usr.bin/gcc/gcc/config/arm/arm.h +++ b/gnu/usr.bin/gcc/gcc/config/arm/arm.h @@ -158,7 +158,7 @@ extern GTY(()) rtx aof_pic_label; #if TARGET_CPU_DEFAULT == TARGET_CPU_arm7tdmi || TARGET_CPU_DEFAULT == TARGET_CPU_arm9 || TARGET_CPU_DEFAULT == TARGET_CPU_arm9tdmi #define CPP_ARCH_DEFAULT_SPEC "-D__ARM_ARCH_4T__" #else -#if TARGET_CPU_DEFAULT == TARGET_CPU_arm8 || TARGET_CPU_DEFAULT == TARGET_CPU_arm810 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm110 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm1100 +#if TARGET_CPU_DEFAULT == TARGET_CPU_arm8 || TARGET_CPU_DEFAULT == TARGET_CPU_arm810 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm110 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm1100 #define CPP_ARCH_DEFAULT_SPEC "-D__ARM_ARCH_4__" #else #if TARGET_CPU_DEFAULT == TARGET_CPU_xscale @@ -341,7 +341,7 @@ Unrecognized value in TARGET_CPU_DEFAULT. /* Nonzero if we need to protect the prolog from scheduling */ #define ARM_FLAG_NO_SCHED_PRO (1 << 12) -/* Nonzero if a call to abort should be generated if a noreturn +/* Nonzero if a call to abort should be generated if a noreturn function tries to return. */ #define ARM_FLAG_ABORT_NORETURN (1 << 13) @@ -350,7 +350,7 @@ Unrecognized value in TARGET_CPU_DEFAULT. /* Nonzero if all call instructions should be indirect. */ #define ARM_FLAG_LONG_CALLS (1 << 15) - + /* Nonzero means that the target ISA is the THUMB, not the ARM. */ #define ARM_FLAG_THUMB (1 << 16) @@ -605,13 +605,13 @@ extern int arm_is_6_or_7; /* Nonzero if we need to refer to the GOT with a PC-relative offset. In other words, generate - .word _GLOBAL_OFFSET_TABLE_ - [. - (.Lxx + 8)] + .word _GLOBAL_OFFSET_TABLE_ - [. - (.Lxx + 8)] rather than .word _GLOBAL_OFFSET_TABLE_ - (.Lxx + 8) - The default is true, which matches NetBSD. Subtargets can + The default is true, which matches NetBSD. Subtargets can override this if required. */ #ifndef GOT_PCREL #define GOT_PCREL 1 @@ -662,7 +662,7 @@ extern int arm_is_6_or_7; in instructions that operate on numbered bit-fields. */ #define BITS_BIG_ENDIAN 0 -/* Define this if most significant byte of a word is the lowest numbered. +/* Define this if most significant byte of a word is the lowest numbered. Most ARM processors are run in little endian mode, so that is the default. If you want to have it run-time selectable, change the definition in a cover file to be TARGET_BIG_ENDIAN. */ @@ -707,7 +707,7 @@ extern int arm_is_6_or_7; /* Make strings word-aligned so strcpy from constants will be faster. */ #define CONSTANT_ALIGNMENT_FACTOR (TARGET_THUMB || ! arm_arch_xscale ? 1 : 2) - + #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ ((TREE_CODE (EXP) == STRING_CST \ && (ALIGN) < BITS_PER_WORD * CONSTANT_ALIGNMENT_FACTOR) \ @@ -747,7 +747,7 @@ extern const char * structure_size_string; r4-r8 S register variable r9 S (rfp) register variable (real frame pointer) - + r10 F S (sl) stack limit (used by -mapcs-stack-check) r11 F S (fp) argument pointer r12 (ip) temp workspace @@ -811,7 +811,7 @@ extern const char * structure_size_string; The latter must include the registers where values are returned and the register where structure-value addresses are passed. Aside from that, you can include as many other registers as you like. - The CC is not preserved over function calls on the ARM 6, so it is + The CC is not preserved over function calls on the ARM 6, so it is easier to assume this for all. SFP is preserved, since FP is. */ #define CALL_USED_REGISTERS \ { \ @@ -852,7 +852,7 @@ extern const char * structure_size_string; } \ SUBTARGET_CONDITIONAL_REGISTER_USAGE \ } - + /* These are a couple of extensions to the formats accecpted by asm_fprintf: %@ prints out ASM_COMMENT_START @@ -963,7 +963,7 @@ extern const char * structure_size_string; /* Value should be nonzero if functions must have frame pointers. Zero means the frame pointer need not be set up (and parms may be accessed - via the stack pointer) in functions that seem suitable. + via the stack pointer) in functions that seem suitable. If we have to have a frame pointer we might as well make use of it. APCS says that the frame pointer does not need to be pushed in leaf functions, or simple tail call functions. */ @@ -999,7 +999,7 @@ extern const char * structure_size_string; /* The order in which register should be allocated. It is good to use ip since no saving is required (though calls clobber it) and it never contains function parameters. It is quite good to use lr since other calls may - clobber it anyway. Allocate r0 through r3 in reverse order since r3 is + clobber it anyway. Allocate r0 through r3 in reverse order since r3 is least likely to contain a function parameter; in addition results are returned in r0. */ #define REG_ALLOC_ORDER \ @@ -1111,9 +1111,9 @@ enum reg_class C is the letter, and VALUE is a constant value. Return 1 if VALUE is in the range specified by C. I: immediate arithmetic operand (i.e. 8 bits shifted as required). - J: valid indexing constants. + J: valid indexing constants. K: ~value ok in rhs argument of data operand. - L: -value ok in rhs argument of data operand. + L: -value ok in rhs argument of data operand. M: 0..32, or a power of 2 (for shifts, or mult done by shift). */ #define CONST_OK_FOR_ARM_LETTER(VALUE, C) \ ((C) == 'I' ? const_ok_for_arm (VALUE) : \ @@ -1138,8 +1138,8 @@ enum reg_class #define CONST_OK_FOR_LETTER_P(VALUE, C) \ (TARGET_ARM ? \ CONST_OK_FOR_ARM_LETTER (VALUE, C) : CONST_OK_FOR_THUMB_LETTER (VALUE, C)) - -/* Constant letter 'G' for the FPU immediate constants. + +/* Constant letter 'G' for the FPU immediate constants. 'H' means the same constant negated. */ #define CONST_DOUBLE_OK_FOR_ARM_LETTER(X, C) \ ((C) == 'G' ? const_double_rtx_ok_for_fpu (X) : \ @@ -1150,7 +1150,7 @@ enum reg_class CONST_DOUBLE_OK_FOR_ARM_LETTER (X, C) : 0) /* For the ARM, `Q' means that this is a memory operand that is just - an offset from a register. + an offset from a register. `S' means any symbol that has the SYMBOL_REF_FLAG set or a CONSTANT_POOL address. This means that the symbol is in the text segment and can be accessed without using a load. */ @@ -1202,7 +1202,7 @@ enum reg_class (((MODE) == HImode && ! arm_arch4 && true_regnum (X) == -1) \ ? GENERAL_REGS : NO_REGS) \ : THUMB_SECONDARY_OUTPUT_RELOAD_CLASS (CLASS, MODE, X)) - + /* If we need to load shorts byte-at-a-time, then we need a scratch. */ #define SECONDARY_INPUT_RELOAD_CLASS(CLASS, MODE, X) \ (TARGET_ARM ? \ @@ -1301,7 +1301,7 @@ enum reg_class ARM_LEGITIMIZE_RELOAD_ADDRESS (X, MODE, OPNUM, TYPE, IND_LEVELS, WIN); \ else \ THUMB_LEGITIMIZE_RELOAD_ADDRESS (X, MODE, OPNUM, TYPE, IND_LEVELS, WIN) - + /* Return the maximum number of consecutive registers needed to represent mode MODE in a register of class CLASS. ARM regs are UNITS_PER_WORD bits while FPU regs can hold any FP mode */ @@ -1658,7 +1658,7 @@ typedef struct && (! call_used_regs [reg] \ || (flag_pic && (reg) == PIC_OFFSET_TABLE_REGNUM)) \ && !(TARGET_SINGLE_PIC_BASE && ((reg) == arm_pic_register))) - + /* Define the offset between two registers, one to be eliminated, and the other its replacement, at the start of a routine. */ #define ARM_INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \ @@ -1707,10 +1707,10 @@ typedef struct ARM_INITIAL_ELIMINATION_OFFSET (FROM, TO, OFFSET); \ else \ THUMB_INITIAL_ELIMINATION_OFFSET (FROM, TO, OFFSET) - + /* Special case handling of the location of arguments passed on the stack. */ #define DEBUGGER_ARG_OFFSET(value, addr) value ? value : arm_debugger_arg_offset (value, addr) - + /* Initialize data used by insn expanders. This is called from insn_emit, once for every function before code is generated. */ #define INIT_EXPANDERS arm_init_expanders () @@ -1763,7 +1763,7 @@ typedef struct ARM_TRAMPOLINE_TEMPLATE (FILE) \ else \ THUMB_TRAMPOLINE_TEMPLATE (FILE) - + /* Length in units of the trampoline for entering a nested function. */ #define TRAMPOLINE_SIZE (TARGET_ARM ? 16 : 24) @@ -1852,7 +1852,7 @@ typedef struct On the ARM, allow any integer (invalid ones are removed later by insn patterns), nice doubles and symbol_refs which refer to the function's constant pool XXX. - + When generating pic allow anything. */ #define ARM_LEGITIMATE_CONSTANT_P(X) (flag_pic || ! label_mentioned_p (X)) @@ -1889,7 +1889,7 @@ typedef struct case SHORT_CALL_FLAG_CHAR: return 1; \ case LONG_CALL_FLAG_CHAR: return 1; \ case '*': return 1; \ - SUBTARGET_NAME_ENCODING_LENGTHS + SUBTARGET_NAME_ENCODING_LENGTHS /* This is how to output a reference to a user-level label named NAME. `assemble_name' uses this. */ @@ -1960,7 +1960,7 @@ typedef struct that wants to use this address. The other macros defined here are used only in GO_IF_LEGITIMATE_ADDRESS. */ - + /* --------------------------------arm version----------------------------- */ #define ARM_BASE_REGISTER_RTX_P(X) \ (GET_CODE (X) == REG && ARM_REG_OK_FOR_BASE_P (X)) @@ -2095,8 +2095,8 @@ typedef struct && ARM_REG_OK_FOR_BASE_P (XEXP (X, 0))) \ goto LABEL; \ } - -/* ---------------------thumb version----------------------------------*/ + +/* ---------------------thumb version----------------------------------*/ #define THUMB_LEGITIMATE_OFFSET(MODE, VAL) \ (GET_MODE_SIZE (MODE) == 1 ? ((unsigned HOST_WIDE_INT) (VAL) < 32) \ : GET_MODE_SIZE (MODE) == 2 ? ((unsigned HOST_WIDE_INT) (VAL) < 64 \ @@ -2209,7 +2209,7 @@ typedef struct if (TARGET_ARM) \ ARM_GO_IF_LEGITIMATE_ADDRESS (MODE, X, WIN) \ else /* if (TARGET_THUMB) */ \ - THUMB_GO_IF_LEGITIMATE_ADDRESS (MODE, X, WIN) + THUMB_GO_IF_LEGITIMATE_ADDRESS (MODE, X, WIN) /* ------------------------------------------------------------------- */ /* Try machine-dependent ways of modifying an illegitimate address @@ -2292,14 +2292,14 @@ typedef struct #define THUMB_LEGITIMIZE_ADDRESS(X, OLDX, MODE, WIN) \ if (flag_pic) \ - (X) = legitimize_pic_address (OLDX, MODE, NULL_RTX); - + (X) = legitimize_pic_address (OLDX, MODE, NULL_RTX); + #define LEGITIMIZE_ADDRESS(X, OLDX, MODE, WIN) \ if (TARGET_ARM) \ ARM_LEGITIMIZE_ADDRESS (X, OLDX, MODE, WIN) \ else \ THUMB_LEGITIMIZE_ADDRESS (X, OLDX, MODE, WIN) - + /* Go to LABEL if ADDR (a legitimate address expression) has an effect that depends on the machine mode it is used for. */ #define ARM_GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \ @@ -2312,8 +2312,8 @@ typedef struct /* Nothing helpful to do for the Thumb */ #define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL) \ if (TARGET_ARM) \ - ARM_GO_IF_MODE_DEPENDENT_ADDRESS (ADDR, LABEL) - + ARM_GO_IF_MODE_DEPENDENT_ADDRESS (ADDR, LABEL) + /* Specify the machine mode that this machine uses for the index in the tablejump instruction. */ @@ -2358,7 +2358,7 @@ typedef struct #define SLOW_BYTE_ACCESS 0 #define SLOW_UNALIGNED_ACCESS(MODE, ALIGN) 1 - + /* Immediate shift counts are truncated by the output routines (or was it the assembler?). Shift counts in a register are truncated by ARM. Note that the native compiler puts too large (> 32) immediate shift counts @@ -2395,7 +2395,7 @@ typedef struct (TARGET_ARM ? 10 : \ ((GET_MODE_SIZE (M) < 4 ? 8 : 2 * GET_MODE_SIZE (M)) \ * (CLASS == LO_REGS ? 1 : 2))) - + /* All address computations that can be done are free, but rtx cost returns the same for practically all of them. So we weight the different types of address here in the order (most pref first): @@ -2415,16 +2415,16 @@ typedef struct || GET_RTX_CLASS (GET_CODE (XEXP (X, 1))) == 'c') \ ? 1 : 0)) \ : 4))))) - + #define THUMB_ADDRESS_COST(X) \ ((GET_CODE (X) == REG \ || (GET_CODE (X) == PLUS && GET_CODE (XEXP (X, 0)) == REG \ && GET_CODE (XEXP (X, 1)) == CONST_INT)) \ ? 1 : 2) - + #define ADDRESS_COST(X) \ (TARGET_ARM ? ARM_ADDRESS_COST (X) : THUMB_ADDRESS_COST (X)) - + /* Try to generate sequences that don't involve branches, we can then use conditional instructions */ #define BRANCH_COST \ @@ -2727,14 +2727,14 @@ extern int making_const_table; ARM_PRINT_OPERAND_ADDRESS (STREAM, X) \ else \ THUMB_PRINT_OPERAND_ADDRESS (STREAM, X) - + /* A C expression whose value is RTL representing the value of the return address for the frame COUNT steps up from the current frame. */ #define RETURN_ADDR_RTX(COUNT, FRAME) \ arm_return_addr (COUNT, FRAME) -/* Mask of the bits in the PC that contain the real return address +/* Mask of the bits in the PC that contain the real return address when running in 26-bit mode. */ #define RETURN_ADDR_MASK26 (0x03fffffc) diff --git a/gnu/usr.bin/gcc/gcc/config/arm/secbsd.h b/gnu/usr.bin/gcc/gcc/config/arm/secbsd.h new file mode 100644 index 000000000..a5c3dcc2c --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/arm/secbsd.h @@ -0,0 +1,270 @@ +/* Definitions of target machine for GNU compiler, SecBSD/arm ELF version. + Copyright (C) 2002 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Run-time Target Specification. */ +#undef TARGET_VERSION +#define TARGET_VERSION fputs (" (SecBSD/arm)", stderr); + +/* This is used in ASM_FILE_START. */ +#undef ARM_OS_NAME +#define ARM_OS_NAME "SecBSD" + +/* Unsigned chars produces much better code than signed. */ +#define DEFAULT_SIGNED_CHAR 0 + + +/* This defaults us to little-endian. */ +#ifndef TARGET_ENDIAN_DEFAULT +#define TARGET_ENDIAN_DEFAULT 0 +#endif + +#undef MULTILIB_DEFAULTS + +/* strongarm family default cpu. */ +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_strongarm + +/* Default is to use APCS-32 mode. */ + +/* Default it to use ATPCS with soft-VFP. */ +#undef TARGET_DEFAULT +/* Default it to use ATPCS with soft-VFP. */ +#undef TARGET_DEFAULT +#define TARGET_DEFAULT \ + (ARM_FLAG_APCS_32 \ + | ARM_FLAG_SOFT_FLOAT \ + | ARM_FLAG_APCS_FRAME \ + | ARM_FLAG_ATPCS \ + | ARM_FLAG_VFP \ + | ARM_FLAG_MMU_TRAPS \ + | TARGET_ENDIAN_DEFAULT) + + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_ELF(); \ + } \ + while (0) + +#undef SUBTARGET_CPP_SPEC +#define SUBTARGET_CPP_SPEC SBSD_CPP_SPEC + +/* Because TARGET_DEFAULT sets ARM_FLAG_APCS_32 */ +#undef CPP_APCS_PC_DEFAULT_SPEC +#define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__" + +/* Because TARGET_DEFAULT sets ARM_FLAG_SOFT_FLOAT */ +#undef CPP_FLOAT_DEFAULT_SPEC +#define CPP_FLOAT_DEFAULT_SPEC "-D__SOFTFP__" + +/* SBSD_LINK_SPEC appropriate for SecBSD. Support for GCC options + -static, -assert, and -nostdlib. */ +#undef SBSD_LINK_SPEC +#ifdef SBSD_NO_DYNAMIC_LIBRARIES +#define SBSD_LINK_SPEC \ + "%{!nostdlib:%{!r*:%{!e*:-e __start}}} %{assert*}" +#else +#define SBSD_LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{assert*} \ + %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" +#endif + +#undef SUBTARGET_EXTRA_ASM_SPEC +#define SUBTARGET_EXTRA_ASM_SPEC \ + "-matpcs %{fpic|fPIC|fpie|fPIE:-k}" + +/* Default floating point model is soft-VFP. + FIXME: -mhard-float currently implies FPA. */ +#undef SUBTARGET_ASM_FLOAT_SPEC +#define SUBTARGET_ASM_FLOAT_SPEC \ + "%{mhard-float:-mfpu=fpa} \ + %{msoft-float:-mfpu=softvfp} \ + %{!mhard-float: \ + %{!msoft-float:-mfpu=softvfp}}" + +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS \ + { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \ + { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \ + { "secbsd_link_spec", SBSD_LINK_SPEC }, \ + { "secbsd_entry_point", SECBSD_ENTRY_POINT }, + +#define SECBSD_ENTRY_POINT "__start" + +/* Pass -X to the linker so that it will strip symbols starting with 'L' */ +#undef LINK_SPEC +#define LINK_SPEC \ + "-X %{mbig-endian:-EB} %{mlittle-endian:-EL} \ + %(secbsd_link_spec)" + +/* Make GCC agree with . */ + +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +/* We don't have any limit on the length as out debugger is GDB. */ +#undef DBX_CONTIN_LENGTH + +/* OpenBSD, SecBSD and NetBSD do their profiling differently to the Acorn compiler. We + don't need a word following the mcount call; and to skip it + requires either an assembly stub or use of fomit-frame-pointer when + compiling the profiling functions. Since we break Acorn CC + compatibility below a little more won't hurt. */ + +#undef ARM_FUNCTION_PROFILER +#define ARM_FUNCTION_PROFILER(STREAM,LABELNO) \ +{ \ + asm_fprintf (STREAM, "\tmov\t%Rip, %Rlr\n"); \ + asm_fprintf (STREAM, "\tbl\t__mcount%s\n", \ + NEED_PLT_RELOC ? "(PLT)" : ""); \ +} + +/* On the ARM `@' introduces a comment, so we must use something else + for .type directives. */ +#undef TYPE_OPERAND_FMT +#define TYPE_OPERAND_FMT "%%%s" + +/* OpenBSD, SecBSD and NetBSD use the old PCC style aggregate returning conventions. */ +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 1 + +/* Although not normally relevant (since by default, all aggregates + are returned in memory) compiling some parts of libc requires + non-APCS style struct returns. */ +#undef RETURN_IN_MEMORY + + +/* VERY BIG NOTE: Change of structure alignment for OpenBSD|NetBSD/arm. + There are consequences you should be aware of... + + Normally GCC/arm uses a structure alignment of 32 for compatibility + with armcc. This means that structures are padded to a word + boundary. However this causes problems with bugged OpenBSD|NetBSD kernel + code (possibly userland code as well - I have not checked every + binary). The nature of this bugged code is to rely on sizeof() + returning the correct size of various structures rounded to the + nearest byte (SCSI and ether code are two examples, the vm system + is another). This code breaks when the structure alignment is 32 + as sizeof() will report a word=rounded size. By changing the + structure alignment to 8. GCC will conform to what is expected by + OpenBSD|NetBSD. + + This has several side effects that should be considered. + 1. Structures will only be aligned to the size of the largest member. + i.e. structures containing only bytes will be byte aligned. + structures containing shorts will be half word alinged. + structures containing ints will be word aligned. + + This means structures should be padded to a word boundary if + alignment of 32 is required for byte structures etc. + + 2. A potential performance penalty may exist if strings are no longer + word aligned. GCC will not be able to use word load/stores to copy + short strings. + + This modification is not encouraged but with the present state of the + OpenBSD|NetBSD source tree it is currently the only solution that meets the + requirements. */ + +#undef DEFAULT_STRUCTURE_SIZE_BOUNDARY +#define DEFAULT_STRUCTURE_SIZE_BOUNDARY 8 + +/* Emit code to set up a trampoline and synchronize the caches. */ +#undef INITIALIZE_TRAMPOLINE +#define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \ +do \ + { \ + emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 8)), \ + (CXT)); \ + emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 12)), \ + (FNADDR)); \ + emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__clear_cache"), \ + 0, VOIDmode, 2, TRAMP, Pmode, \ + plus_constant (TRAMP, TRAMPOLINE_SIZE), Pmode); \ + } \ +while (0) + +/* Clear the instruction cache from `BEG' to `END'. This makes a + call to the ARM_SYNC_ICACHE architecture specific syscall. */ +#define CLEAR_INSN_CACHE(BEG, END) \ +do \ + { \ + extern int sysarch(int number, void *args); \ + struct { \ + unsigned int addr; \ + int len; \ + } s; \ + s.addr = (unsigned int)(BEG); \ + s.len = (END) - (BEG); \ + (void) sysarch (0, &s); \ + } \ +while (0) + +/* Provide a STARTFILE_SPEC appropriate for SecBSD ELF. Here we + provide support for the special GCC option -static. On ELF + targets, we also add the crtbegin.o file, which provides part + of the support for getting C++ file-scope static objects + constructed before entering "main". */ + +#define SECBSD_STARTFILE_SPEC \ + "%{!shared: \ + %{pg:gcrt0%O%s} \ + %{!pg: \ + %{p:gcrt0%O%s} \ + %{!p:crt0%O%s}}} \ + %:if-exists(crti%O%s) \ + %{static:%:if-exists-else(crtbeginT%O%s crtbegin%O%s)} \ + %{!static: \ + %{!shared:crtbegin%O%s} %{shared:crtbeginS%O%s}}" + +#undef STARTFILE_SPEC +#define STARTFILE_SPEC SECBSD_STARTFILE_SPEC + +/* Provide an ENDFILE_SPEC appropriate for SecBSD ELF. Here we +add crtend.o, which provides part of the support for getting +C++ file-scope static objects deconstructed after exiting "main". */ + +#define SECBSD_ENDFILE_SPEC \ + "%{!shared:crtend%O%s} %{shared:crtendS%O%s} \ + %:if-exists(crtn%O%s)" + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC SECBSD_ENDFILE_SPEC + diff --git a/gnu/usr.bin/gcc/gcc/config/arm/secbsd1.h b/gnu/usr.bin/gcc/gcc/config/arm/secbsd1.h new file mode 100644 index 000000000..dd362ae2b --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/arm/secbsd1.h @@ -0,0 +1,22 @@ +/* Definitions of target machine for GNU compiler, SecBSD/arm ELF version. + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* StrongARM family default cpu. */ +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_strongarm diff --git a/gnu/usr.bin/gcc/gcc/config/arm/t-secbsd b/gnu/usr.bin/gcc/gcc/config/arm/t-secbsd new file mode 100644 index 000000000..ef40825ad --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/arm/t-secbsd @@ -0,0 +1,7 @@ +# Just for these, we omit the frame pointer since it makes such a big +# difference. It is then pointless adding debugging. +TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fpic +LIBGCC2_DEBUG_CFLAGS = -g0 + +# Don't build enquire +ENQUIRE= diff --git a/gnu/usr.bin/gcc/gcc/config/i386/secbsd.h b/gnu/usr.bin/gcc/gcc/config/i386/secbsd.h new file mode 100644 index 000000000..181153b2d --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/i386/secbsd.h @@ -0,0 +1,105 @@ +/* Configuration for an SecBSD i386 target. + Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +#define TARGET_VERSION fprintf (stderr, " (SecBSD/i386)"); + +/* This goes away when the math-emulator is fixed */ +#undef TARGET_SUBTARGET_DEFAULT +#define TARGET_SUBTARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_COMMON(); \ + } \ + while (0) + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +/* Kludgy test: when gas is upgraded, it will have p2align, and no problems + with nops. */ +#ifndef HAVE_GAS_MAX_SKIP_P2ALIGN +/* i386 SecBSD still uses an older gas that doesn't insert nops by default + when the .align directive demands to insert extra space in the text + segment. */ +#undef ASM_OUTPUT_ALIGN +#define ASM_OUTPUT_ALIGN(FILE,LOG) \ + if ((LOG)!=0) fprintf ((FILE), "\t.align %d,0x90\n", (LOG)) +#endif + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall mcount@PLT\n": "\tcall mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* All configurations that don't use elf must be explicit about not using + dwarf unwind information. egcs doesn't try too hard to check internal + configuration files... */ +#define DWARF2_UNWIND_INFO 0 + +#undef ASM_PREFERRED_EH_DATA_FORMAT + +#undef ASM_COMMENT_START +#define ASM_COMMENT_START ";#" + +/* SecBSD gas currently does not support quad, so do not use it. */ +#undef ASM_QUAD diff --git a/gnu/usr.bin/gcc/gcc/config/i386/secbsd64.h b/gnu/usr.bin/gcc/gcc/config/i386/secbsd64.h new file mode 100644 index 000000000..08d032c9d --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/i386/secbsd64.h @@ -0,0 +1,127 @@ +/* Configuration for an SecBSD x86-64 target. + + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#undef TARGET_VERSION +#define TARGET_VERSION fprintf (stderr, " (SecBSD/x86-64 ELF)") + +/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using + libraries compiled with the native cc, so undef it. */ +#undef NO_DOLLAR_IN_LABEL + +/* Override the default comment-starter of "/". */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + +/* Run-time target specifications */ + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_ELF(); \ + if (TARGET_64BIT) \ + SECBSD_OS_CPP_BUILTINS_LP64(); \ + } \ + while (0) + +/* As an elf system, we need crtbegin/crtend stuff. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ + %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \ + crtbegin%O%s} %{shared:crtbeginS%O%s}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +#undef SET_ASM_OP +#define SET_ASM_OP "\t.set\t" + +/* The following macros were originally stolen from i386v4.h. + These have to be defined to get PIC code correct. */ + +/* Assembler format: dispatch tables. */ + +/* Assembler format: sections. */ + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* Assembler format: alignment output. */ + +/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */ + +/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */ + +#undef LINK_SPEC +#define LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{assert*} \ + %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" + +#define SBSD_HAS_CORRECT_SPECS + +#undef JUMP_TABLES_IN_TEXT_SECTION +#define JUMP_TABLES_IN_TEXT_SECTION (flag_pic) diff --git a/gnu/usr.bin/gcc/gcc/config/i386/secbsdelf.h b/gnu/usr.bin/gcc/gcc/config/i386/secbsdelf.h new file mode 100644 index 000000000..cb76e81d6 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/i386/secbsdelf.h @@ -0,0 +1,139 @@ +/* Configuration for an SecBSD i386 target. + + Copyright (C) 1999 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using + libraries compiled with the native cc, so undef it. */ +#undef NO_DOLLAR_IN_LABEL + +/* Override the default comment-starter of "/". */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + +#undef DBX_REGISTER_NUMBER +#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n] + +/* This goes away when the math-emulator is fixed */ +#undef TARGET_DEFAULT +#define TARGET_DEFAULT \ + (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) + +/* Run-time target specifications */ + +#define TARGET_OS_CPP_BUILTINS() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_ELF(); \ + } \ + while (0) + +/* As an elf system, we need crtbegin/crtend stuff. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC "\ + %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \ + crtbegin%O%s} %{shared:crtbeginS%O%s}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}" + +/* Layout of source language data types. */ + +/* This must agree with */ +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef INTMAX_TYPE +#define INTMAX_TYPE "long long int" + +#undef UINTMAX_TYPE +#define UINTMAX_TYPE "long long unsigned int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + +/* Assembler format: overall framework. */ + +#undef ASM_APP_ON +#define ASM_APP_ON "#APP\n" + +#undef ASM_APP_OFF +#define ASM_APP_OFF "#NO_APP\n" + +#undef SET_ASM_OP +#define SET_ASM_OP "\t.set\t" + +/* The following macros were originally stolen from i386v4.h. + These have to be defined to get PIC code correct. */ + +/* Assembler format: dispatch tables. */ + +/* Assembler format: sections. */ + +/* Stack & calling: aggregate returns. */ + +/* Don't default to pcc-struct-return, because gcc is the only compiler, and + we want to retain compatibility with older gcc versions. */ +#define DEFAULT_PCC_STRUCT_RETURN 0 + +/* Assembler format: alignment output. */ + +#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN +#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ + if ((LOG) != 0) {\ + if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ + } +#endif + +/* Stack & calling: profiling. */ + +/* SecBSD's profiler recovers all information from the stack pointer. + The icky part is not here, but in machine/profile.h. */ +#undef FUNCTION_PROFILER +#define FUNCTION_PROFILER(FILE, LABELNO) \ + fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE); + +/* Assembler format: exception region output. */ + +/* Assembler format: alignment output. */ + +/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */ + +/* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h. */ + +#undef LINK_SPEC +#define LINK_SPEC \ + "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \ + %{shared:-shared} %{R*} \ + %{static:-Bstatic} \ + %{!static:-Bdynamic} \ + %{assert*} \ + %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" + +#define OBSD_HAS_CORRECT_SPECS + +/* pick up defines for mprotect (used in TRANSFER_FROM_TRANPOLINE) */ +#include +#include diff --git a/gnu/usr.bin/gcc/gcc/config/i386/t-secbsd b/gnu/usr.bin/gcc/gcc/config/i386/t-secbsd new file mode 100644 index 000000000..183046340 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/i386/t-secbsd @@ -0,0 +1,6 @@ +# gdb gets confused if pic code is linked with non pic +# We cope by building variants of libgcc. +MULTILIB_OPTIONS = fpic +MULTILIB_MATCHES=fpic=fPIC +LIBGCC = stmp-multilib +INSTALL_LIBGCC = install-multilib diff --git a/gnu/usr.bin/gcc/gcc/config/secbsd-libpthread.h b/gnu/usr.bin/gcc/gcc/config/secbsd-libpthread.h new file mode 100644 index 000000000..43895c1d1 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/secbsd-libpthread.h @@ -0,0 +1,23 @@ +/* LIB_SPEC appropriate for SecBSD. Include -lpthread if -pthread is + specified on the command line. */ +/* Copyright (C) 2004 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#define SBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} %{!shared:-lc%{p|pg:_p}}" + diff --git a/gnu/usr.bin/gcc/gcc/config/secbsd-oldgas.h b/gnu/usr.bin/gcc/gcc/config/secbsd-oldgas.h new file mode 100644 index 000000000..3edd81a07 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/secbsd-oldgas.h @@ -0,0 +1,23 @@ +/* Generic settings for a.out SecBSD systems. + Copyright (C) 2002 Free Software Foundation, Inc. + Contributed by David E. O'Brien . + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +#define SBSD_OLD_GAS diff --git a/gnu/usr.bin/gcc/gcc/config/secbsd.h b/gnu/usr.bin/gcc/gcc/config/secbsd.h new file mode 100644 index 000000000..3425345f4 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/secbsd.h @@ -0,0 +1,345 @@ +/* Base configuration file for all SecBSD targets. + Copyright (C) 1999, 2000 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU CC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Common SecBSD configuration. + All SecBSD architectures include this file, which is intended as + a repository for common defines. + + Some defines are common to all architectures, a few of them are + triggered by SBSD_* guards, so that we won't override architecture + defaults by mistakes. + + SBSD_HAS_CORRECT_SPECS: + another mechanism provides correct specs already. + SBSD_NO_DYNAMIC_LIBRARIES: + no implementation of dynamic libraries. + SBSD_OLD_GAS: + older flavor of gas which needs help for PIC. + SBSD_HAS_DECLARE_FUNCTION_NAME, SBSD_HAS_DECLARE_FUNCTION_SIZE, + SBSD_HAS_DECLARE_OBJECT: + PIC support, FUNCTION_NAME/FUNCTION_SIZE are independent, whereas + the corresponding logic for OBJECTS is necessarily coupled. + SBSD_HAS_CORRECT_ASM_OPS: + another mechanism provides correct ASM_OP values already. + + There are also a few `default' defines such as ASM_WEAKEN_LABEL, + intended as common ground for arch that don't provide + anything suitable. */ + +/* SECBSD_NATIVE is defined only when gcc is configured as part of + the SecBSD source tree, specifically through Makefile.bsd-wrapper. + + In such a case the include path can be trimmed as there is no + distinction between system includes and gcc includes. */ + +/* This configuration method, namely Makefile.bsd-wrapper and + SECBSD_NATIVE is NOT recommended for building cross-compilers. */ + +/* SECBSD_CROSS is only recommended for building cross-compilers which + target a SecBSD system (kernel/userland) */ + +#if defined(SECBSD_NATIVE) || defined(SECBSD_CROSS) + +/* The compiler is configured with ONLY the gcc/g++ standard headers. */ +#undef INCLUDE_DEFAULTS +#ifdef CROSS_COMPILE +#define INCLUDE_DEFAULTS \ + { \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 },\ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_INCLUDE_DIR "/..", STANDARD_INCLUDE_COMPONENT, 0, 0, 0 }, \ + { 0, 0, 0, 0, 0 } \ + } +#else +#define INCLUDE_DEFAULTS \ + { \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 },\ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 0 }, \ + { 0, 0, 0, 0, 0 } \ + } +#endif + +/* Under SecBSD, the normal location of the various *crt*.o files is the + /usr/lib directory. */ +#undef STANDARD_STARTFILE_PREFIX +#define STANDARD_STARTFILE_PREFIX "/usr/lib/" + +#endif + + +/* Controlling the compilation driver. */ + +/* TARGET_OS_CPP_BUILTINS() common to all SecBSD targets. */ +#define SECBSD_OS_CPP_BUILTINS_COMMON() \ + do \ + { \ + builtin_define ("__SecBSD__"); \ + builtin_define ("__unix__"); \ + builtin_define ("__ANSI_COMPAT"); \ + builtin_assert ("system=unix"); \ + builtin_assert ("system=bsd"); \ + builtin_assert ("system=SecBSD"); \ + } \ + while (0) + +/* TARGET_OS_CPP_BUILTINS() common to all SecBSD ELF targets. */ +#define SECBSD_OS_CPP_BUILTINS_ELF() \ + do \ + { \ + SECBSD_OS_CPP_BUILTINS_COMMON(); \ + builtin_define ("__ELF__"); \ + } \ + while (0) + +/* TARGET_OS_CPP_BUILTINS() common to all LP64 SecBSD targets. */ +#define SECBSD_OS_CPP_BUILTINS_LP64() \ + do \ + { \ + builtin_define ("_LP64"); \ + builtin_define ("__LP64__"); \ + } \ + while (0) + +/* CPP_SPEC appropriate for SecBSD. We deal with -posix and -pthread. + XXX the way threads are handled currently is not very satisfying, + since all code must be compiled with -pthread to work. + This two-stage defines makes it easy to pick that for targets that + have subspecs. */ +#ifdef CPP_CPU_SPEC +#define SBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#else +#define SBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" +#endif + +#ifndef SBSD_HAS_CORRECT_SPECS + +#ifndef SBSD_NO_DYNAMIC_LIBRARIES +#undef SWITCH_TAKES_ARG +#define SWITCH_TAKES_ARG(CHAR) \ + (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ + || (CHAR) == 'R') +#endif + +#undef CPP_SPEC +#define CPP_SPEC SBSD_CPP_SPEC + +#ifdef SBSD_OLD_GAS +/* ASM_SPEC appropriate for SecBSD. For some architectures, SecBSD + still uses a special flavor of gas that needs to be told when generating + pic code. */ +#undef ASM_SPEC +#define ASM_SPEC "%{fpic:-k} %{fPIC:-k -K} %|" + +#else +/* Since we use gas, stdin -> - is a good idea, but we don't want to + override native specs just for that. */ +#ifndef ASM_SPEC +#define ASM_SPEC "%|" +#endif +#endif + +/* LINK_SPEC appropriate for SecBSD. Support for GCC options + -static, -assert, and -nostdlib. */ +#undef LINK_SPEC +#ifdef SBSD_NO_DYNAMIC_LIBRARIES +#define LINK_SPEC \ + "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{assert*}" +#else +#define LINK_SPEC \ + "%{g:%{!nostdlib:-L/usr/lib/debug}} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}}} %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic} %{assert*}" +#endif + +#if defined(HAVE_LD_EH_FRAME_HDR) +#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " +#endif + +#undef LIB_SPEC +#define LIB_SPEC SBSD_LIB_SPEC +#endif + + +/* Runtime target specification. */ + +/* You must redefine CPP_PREDEFINES in any arch specific file. */ +#undef CPP_PREDEFINES + +/* Implicit calls to library routines. */ + +/* Use memcpy and memset instead of bcopy and bzero. */ +#ifndef TARGET_MEM_FUNCTIONS +#define TARGET_MEM_FUNCTIONS +#endif + +/* Miscellaneous parameters. */ + +/* Controlling debugging info: dbx options. */ + +/* Don't use the `xsTAG;' construct in DBX output; SecBSD systems that + use DBX don't support it. */ +#define DBX_NO_XREFS + + +/* Support of shared libraries, mostly imported from svr4.h through netbsd. */ +/* Two differences from svr4.h: + - we use . - _func instead of a local label, + - we put extra spaces in expressions such as + .type _func , @function + This is more readable for a human being and confuses c++filt less. */ + +/* Assembler format: output and generation of labels. */ + +/* Define the strings used for the .type and .size directives. + These strings generally do not vary from one system running SecBSD + to another, but if a given system needs to use different pseudo-op + names for these, they may be overridden in the arch specific file. */ + +/* SecBSD assembler is hacked to have .type & .size support even in a.out + format object files. Functions size are supported but not activated + yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c). + SET_ASM_OP is needed for attribute alias to work. */ + +#ifndef SBSD_HAS_CORRECT_ASM_OPS + +#undef TYPE_ASM_OP +#undef SIZE_ASM_OP +#undef SET_ASM_OP +#undef GLOBAL_ASM_OP + +#define TYPE_ASM_OP "\t.type\t" +#define SIZE_ASM_OP "\t.size\t" +#define SET_ASM_OP "\t.set\t" +#define GLOBAL_ASM_OP "\t.globl\t" + +#endif + +/* The following macro defines the format used to output the second + operand of the .type assembler directive. */ +#undef TYPE_OPERAND_FMT +#define TYPE_OPERAND_FMT "@%s" + +/* Provision if extra assembler code is needed to declare a function's result + (taken from svr4, not needed yet actually). */ +#ifndef ASM_DECLARE_RESULT +#define ASM_DECLARE_RESULT(FILE, RESULT) +#endif + +/* These macros generate the special .type and .size directives which + are used to set the corresponding fields of the linker symbol table + entries under SecBSD. These macros also have to output the starting + labels for the relevant functions/objects. */ + +#ifndef SBSD_HAS_DECLARE_FUNCTION_NAME +/* Extra assembler code needed to declare a function properly. + Some assemblers may also need to also have something extra said + about the function's return value. We allow for that here. */ +#undef ASM_DECLARE_FUNCTION_NAME +#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL) \ + do { \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "function"); \ + ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL)); \ + ASM_OUTPUT_LABEL(FILE, NAME); \ + } while (0) +#endif + +#ifndef SBSD_HAS_DECLARE_FUNCTION_SIZE +/* Declare the size of a function. */ +#undef ASM_DECLARE_FUNCTION_SIZE +#define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL) \ + do { \ + if (!flag_inhibit_size_directive) \ + ASM_OUTPUT_MEASURED_SIZE (FILE, FNAME); \ + } while (0) +#endif + +#ifndef SBSD_HAS_DECLARE_OBJECT +/* Extra assembler code needed to declare an object properly. */ +#undef ASM_DECLARE_OBJECT_NAME +#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ + do { \ + HOST_WIDE_INT size; \ + ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \ + size_directive_output = 0; \ + if (!flag_inhibit_size_directive \ + && (DECL) && DECL_SIZE (DECL)) \ + { \ + size_directive_output = 1; \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size); \ + } \ + ASM_OUTPUT_LABEL (FILE, NAME); \ + } while (0) + +/* Output the size directive for a decl in rest_of_decl_compilation + in the case where we did not do so before the initializer. + Once we find the error_mark_node, we know that the value of + size_directive_output was set by ASM_DECLARE_OBJECT_NAME + when it was run for the same decl. */ +#undef ASM_FINISH_DECLARE_OBJECT +#define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END) \ +do { \ + const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0); \ + HOST_WIDE_INT size; \ + if (!flag_inhibit_size_directive && DECL_SIZE (DECL) \ + && ! AT_END && TOP_LEVEL \ + && DECL_INITIAL (DECL) == error_mark_node \ + && !size_directive_output) \ + { \ + size_directive_output = 1; \ + size = int_size_in_bytes (TREE_TYPE (DECL)); \ + ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size); \ + } \ + } while (0) +#endif + + +/* Those are `generic' ways to weaken/globalize a label. We shouldn't need + to override a processor specific definition. Hence, #ifndef ASM_* + In case overriding turns out to be needed, one can always #undef ASM_* + before including this file. */ + +/* Tell the assembler that a symbol is weak. */ +/* Note: netbsd arm32 assembler needs a .globl here. An override may + be needed when/if we go for arm32 support. */ +#ifndef ASM_WEAKEN_LABEL +#define ASM_WEAKEN_LABEL(FILE,NAME) \ + do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ + fputc ('\n', FILE); } while (0) +#endif + +/* Storage layout. */ + + +/* bug work around: we don't want to support #pragma weak, but the current + code layout needs HANDLE_PRAGMA_WEAK asserted for __attribute((weak)) to + work. On the other hand, we don't define HANDLE_PRAGMA_WEAK directly, + as this depends on a few other details as well... */ +#define HANDLE_SYSV_PRAGMA 1 + +/* Disable the use of unsafe builtin functions, (strcat, strcpy), making + * them easier to spot in the object files. + */ +#define NO_UNSAFE_BUILTINS + +/* pick up defines for mprotect (used in TRANSFER_FROM_TRAMPOLINE) */ +#include +#include diff --git a/gnu/usr.bin/gcc/gcc/config/sh/lib1funcs.asm b/gnu/usr.bin/gcc/gcc/config/sh/lib1funcs.asm index 91e03469c..87b4eaee3 100644 --- a/gnu/usr.bin/gcc/gcc/config/sh/lib1funcs.asm +++ b/gnu/usr.bin/gcc/gcc/config/sh/lib1funcs.asm @@ -1003,7 +1003,7 @@ GLOBAL(sdivsi3_i4): #ifdef L_sdivsi3 /* __SH4_SINGLE_ONLY__ keeps this part for link compatibility with sh3e code. */ -#if (! defined(__SH4__) && ! defined (__SH4_SINGLE__)) || defined (__linux__) || defined (__OpenBSD__) +#if (! defined(__SH4__) && ! defined (__SH4_SINGLE__)) || defined (__linux__) || defined (__OpenBSD__) || defined (__SecBSD__) !! !! Steve Chamberlain !! sac@cygnus.com @@ -1389,7 +1389,7 @@ L1: #ifdef L_udivsi3 /* __SH4_SINGLE_ONLY__ keeps this part for link compatibility with sh3e code. */ -#if (! defined(__SH4__) && ! defined (__SH4_SINGLE__)) || defined (__linux__) || defined (__OpenBSD__) +#if (! defined(__SH4__) && ! defined (__SH4_SINGLE__)) || defined (__linux__) || defined (__OpenBSD__) || defined (__SecBSD__) !! args in r4 and r5, result in r0, clobbers r4, pr, and t bit .global GLOBAL(udivsi3) diff --git a/gnu/usr.bin/gcc/gcc/config/t-secbsd b/gnu/usr.bin/gcc/gcc/config/t-secbsd new file mode 100644 index 000000000..91d7b7ede --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/t-secbsd @@ -0,0 +1,11 @@ +# Don't run fixproto +STMP_FIXPROTO = + +# We don't need GCC's own include files. +USER_H = + +# Use unwind-dw2-fde-openbsd +LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-openbsd.c \ + $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c +LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c \ + unwind-dw2-fde-glibc.c diff --git a/gnu/usr.bin/gcc/gcc/config/t-secbsd-thread b/gnu/usr.bin/gcc/gcc/config/t-secbsd-thread new file mode 100644 index 000000000..4b25f25a4 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/t-secbsd-thread @@ -0,0 +1,5 @@ +# This is currently needed to compile libgcc2 for threads support +TARGET_LIBGCC2_CFLAGS=-pthread +#T_CFLAGS=-pthread +#T_CPPFLAGS=-pthread + diff --git a/gnu/usr.bin/gcc/gcc/config/x-secbsd b/gnu/usr.bin/gcc/gcc/config/x-secbsd new file mode 100644 index 000000000..e08981bb5 --- /dev/null +++ b/gnu/usr.bin/gcc/gcc/config/x-secbsd @@ -0,0 +1,11 @@ +# enforce yacc... +BISON=yacc +# no built libiberty +LIBIBERTY= +BUILD_LIBIBERTY= +# because it's a `system lib' +CLIB=-liberty +# and so, we get obstack from there too +OBSTACK= +# don't build c++filt from there +DEMANGLER_PROG= diff --git a/gnu/usr.bin/gcc/gcc/ginclude/stddef.h b/gnu/usr.bin/gcc/gcc/ginclude/stddef.h index 8b37c5e7c..7f640f29b 100644 --- a/gnu/usr.bin/gcc/gcc/ginclude/stddef.h +++ b/gnu/usr.bin/gcc/gcc/ginclude/stddef.h @@ -57,7 +57,7 @@ Boston, MA 02111-1307, USA. */ #include #endif /* On FreeBSD 5 and OpenBSD 3.9, machine/ansi.h does not exist anymore... */ -#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined(__OpenBSD__) +#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined(__OpenBSD__) || defined(__SecBSD__) #include #endif @@ -201,7 +201,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; #define ___int_size_t_h #define _GCC_SIZE_T #define _SIZET_ -#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined(__OpenBSD__) +#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined(__OpenBSD__) || defined(__SecBSD__) /* __size_t is a typedef on FreeBSD 5 and OpenBSD 3.9!, must not trash it. */ #else #define __size_t diff --git a/gnu/usr.bin/perl/perlio.c b/gnu/usr.bin/perl/perlio.c index f2803a402..4763a735e 100644 --- a/gnu/usr.bin/perl/perlio.c +++ b/gnu/usr.bin/perl/perlio.c @@ -3187,7 +3187,7 @@ PerlIOStdio_invalidate_fileno(pTHX_ FILE *f) */ f->_file = -1; return 1; -#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__) || defined(__SecBSD__) /* There may be a better way on OpenBSD: - we could insert a dummy func in the _close function entry f->_close = (int (*)(void *)) dummy_close; diff --git a/gnu/usr.bin/perl/reentr.h b/gnu/usr.bin/perl/reentr.h index fefb3f065..f40cfab75 100644 --- a/gnu/usr.bin/perl/reentr.h +++ b/gnu/usr.bin/perl/reentr.h @@ -81,7 +81,7 @@ * incompatible with everyone else. To make OpenBSD happy, we have to * memzero out certain structures before calling the functions. */ -# if defined(__OpenBSD__) +# if defined(__OpenBSD__) || defined(__SecBSD__) # define REENTR_MEMZERO(a,b) memzero(a,b) # else # define REENTR_MEMZERO(a,b) 0 diff --git a/gnu/usr.bin/perl/regen/reentr.pl b/gnu/usr.bin/perl/regen/reentr.pl index 5742278fe..563e3fa15 100644 --- a/gnu/usr.bin/perl/regen/reentr.pl +++ b/gnu/usr.bin/perl/regen/reentr.pl @@ -131,7 +131,7 @@ print $h < #else -#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__OpenBSD__) || defined(__SecBSD__) #include #else #if defined(_IBMR2) diff --git a/gnu/usr.sbin/mkhybrid/src/defaults.h b/gnu/usr.sbin/mkhybrid/src/defaults.h index 2003f9ad8..41f74616f 100644 --- a/gnu/usr.sbin/mkhybrid/src/defaults.h +++ b/gnu/usr.sbin/mkhybrid/src/defaults.h @@ -62,6 +62,10 @@ #define SYSTEM_ID_DEFAULT "OpenBSD" #endif +#ifdef __SecBSD__ +#define SYSTEM_ID_DEFAULT "SecBSD" +#endif + #ifdef __NetBSD__ #define SYSTEM_ID_DEFAULT "NetBSD" #endif @@ -70,18 +74,6 @@ #define SYSTEM_ID_DEFAULT "LINUX" #endif -#ifdef __FreeBSD__ -#define SYSTEM_ID_DEFAULT "FreeBSD" -#endif - -#ifdef __OpenBSD__ -#define SYSTEM_ID_DEFAULT "OpenBSD" -#endif - -#ifdef __NetBSD__ -#define SYSTEM_ID_DEFAULT "NetBSD" -#endif - #ifndef SYSTEM_ID_DEFAULT #define SYSTEM_ID_DEFAULT "Unknown" #endif diff --git a/lib/libc/arch/amd64/sys/syscall.S b/lib/libc/arch/amd64/sys/syscall.S index 6568ecc55..99d502ecc 100644 --- a/lib/libc/arch/amd64/sys/syscall.S +++ b/lib/libc/arch/amd64/sys/syscall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.S,v 1.8 2016/05/07 19:05:21 guenther Exp $ */ +/* $OpenBSD: syscall.S,v 1.9 2023/05/11 19:35:50 guenther Exp $ */ /* $NetBSD: syscall.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */ /*- @@ -39,4 +39,18 @@ #include "SYS.h" -RSYSCALL(syscall) +SYSENTRY(syscall) + RETGUARD_SETUP(_thread_sys_syscall, r11) +#ifdef _RET_PROTECTOR + pushq 8(%rsp) /* repush 6th argument */ +#endif + RETGUARD_PUSH(r11) + SYSTRAP(syscall) + HANDLE_ERRNO; + RETGUARD_POP(r11) +#ifdef _RET_PROTECTOR + addq $8,%rsp /* repush 6th argument */ +#endif + RETGUARD_CHECK(_thread_sys_syscall, r11) + ret +SYSCALL_END(syscall) diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 5cd7ff876..a6728b260 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.282 2023/04/21 06:19:40 jsg Exp $ */ +/* $OpenBSD: malloc.c,v 1.283 2023/05/10 07:58:06 otto Exp $ */ /* * Copyright (c) 2008, 2010, 2011, 2016, 2023 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -264,24 +264,6 @@ static void malloc_exit(void); (sz) = (uintptr_t)(r)->p & MALLOC_PAGEMASK, \ (sz) = ((sz) == 0 ? (r)->size : B2SIZE((sz) - 1)) -static inline void -_MALLOC_LEAVE(struct dir_info *d) -{ - if (d->malloc_mt) { - d->active--; - _MALLOC_UNLOCK(d->mutex); - } -} - -static inline void -_MALLOC_ENTER(struct dir_info *d) -{ - if (d->malloc_mt) { - _MALLOC_LOCK(d->mutex); - d->active++; - } -} - static inline size_t hash(void *p) { @@ -879,9 +861,7 @@ map(struct dir_info *d, size_t sz, int zero_fill) return p; } if (psz <= 1) { - _MALLOC_LEAVE(d); p = MMAP(cache->max * sz, d->mmap_flag); - _MALLOC_ENTER(d); if (p != MAP_FAILED) { STATS_ADD(d->malloc_used, cache->max * sz); cache->length = cache->max - 1; @@ -901,9 +881,7 @@ map(struct dir_info *d, size_t sz, int zero_fill) } } - _MALLOC_LEAVE(d); p = MMAP(sz, d->mmap_flag); - _MALLOC_ENTER(d); if (p != MAP_FAILED) STATS_ADD(d->malloc_used, sz); /* zero fill not needed */ diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 4238e6df9..4c782918e 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.125 2023/04/28 16:30:14 tb Exp $ +# $OpenBSD: Makefile,v 1.129 2023/05/07 14:39:55 tb Exp $ LIB= crypto LIBREBUILD=y @@ -16,7 +16,7 @@ LCRYPTO_SRC= ${.CURDIR} CFLAGS+= -Wall -Wundef .if ${COMPILER_VERSION:L} == "clang" -CFLAGS+= -Werror +CFLAGS+= -Werror -Wshadow .endif CFLAGS+= -DLIBRESSL_INTERNAL -DLIBRESSL_CRYPTO_INTERNAL .ifdef NAMESPACE @@ -606,6 +606,7 @@ SRCS+= rsa_prn.c SRCS+= rsa_pss.c SRCS+= rsa_saos.c SRCS+= rsa_sign.c +SRCS+= rsa_x931.c # sha/ SRCS+= sha1.c diff --git a/lib/libcrypto/bn/bn_bpsw.c b/lib/libcrypto/bn/bn_bpsw.c index 9220339f1..82a4e8714 100644 --- a/lib/libcrypto/bn/bn_bpsw.c +++ b/lib/libcrypto/bn/bn_bpsw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_bpsw.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */ +/* $OpenBSD: bn_bpsw.c,v 1.10 2023/05/10 21:05:24 tb Exp $ */ /* * Copyright (c) 2022 Martin Grenouilloux * Copyright (c) 2022 Theo Buehler @@ -156,7 +156,7 @@ bn_lucas(BIGNUM *U, BIGNUM *V, const BIGNUM *k, const BIGNUM *D, */ static int -bn_strong_lucas_test(int *is_prime, const BIGNUM *n, const BIGNUM *D, +bn_strong_lucas_test(int *is_pseudoprime, const BIGNUM *n, const BIGNUM *D, BN_CTX *ctx) { BIGNUM *k, *U, *V; @@ -194,7 +194,7 @@ bn_strong_lucas_test(int *is_prime, const BIGNUM *n, const BIGNUM *D, goto err; if (BN_is_zero(U) || BN_is_zero(V)) { - *is_prime = 1; + *is_pseudoprime = 1; goto done; } @@ -208,7 +208,7 @@ bn_strong_lucas_test(int *is_prime, const BIGNUM *n, const BIGNUM *D, goto err; if (BN_is_zero(V)) { - *is_prime = 1; + *is_pseudoprime = 1; goto done; } } @@ -217,7 +217,7 @@ bn_strong_lucas_test(int *is_prime, const BIGNUM *n, const BIGNUM *D, * If we got here, n is definitely composite. */ - *is_prime = 0; + *is_pseudoprime = 0; done: ret = 1; @@ -235,7 +235,7 @@ bn_strong_lucas_test(int *is_prime, const BIGNUM *n, const BIGNUM *D, */ static int -bn_strong_lucas_selfridge(int *is_prime, const BIGNUM *n, BN_CTX *ctx) +bn_strong_lucas_selfridge(int *is_pseudoprime, const BIGNUM *n, BN_CTX *ctx) { BIGNUM *D, *two; int is_perfect_square, jacobi_symbol, sign; @@ -247,7 +247,7 @@ bn_strong_lucas_selfridge(int *is_prime, const BIGNUM *n, BN_CTX *ctx) if (!bn_is_perfect_square(&is_perfect_square, n, ctx)) goto err; if (is_perfect_square) { - *is_prime = 0; + *is_pseudoprime = 0; goto done; } @@ -278,7 +278,7 @@ bn_strong_lucas_selfridge(int *is_prime, const BIGNUM *n, BN_CTX *ctx) /* n and D have prime factors in common. */ if (jacobi_symbol == 0) { - *is_prime = 0; + *is_pseudoprime = 0; goto done; } @@ -288,7 +288,7 @@ bn_strong_lucas_selfridge(int *is_prime, const BIGNUM *n, BN_CTX *ctx) BN_set_negative(D, sign == -1); } - if (!bn_strong_lucas_test(is_prime, n, D, ctx)) + if (!bn_strong_lucas_test(is_pseudoprime, n, D, ctx)) goto err; done: @@ -301,32 +301,113 @@ bn_strong_lucas_selfridge(int *is_prime, const BIGNUM *n, BN_CTX *ctx) } /* - * Miller-Rabin primality test for base 2. + * Fermat criterion in Miller-Rabin test. + * + * Check whether 1 < base < n - 1 witnesses that n is composite. For prime n: + * + * * Fermat's little theorem: base^(n-1) = 1 (mod n). + * * The only square roots of 1 (mod n) are 1 and -1. + * + * Calculate base^((n-1)/2) by writing n - 1 = k * 2^s with odd k. Iteratively + * compute power = (base^k)^(2^(s-1)) by successive squaring of base^k. + * + * If power ever reaches -1, base^(n-1) is equal to 1 and n is a pseudoprime + * for base. If power reaches 1 before -1 during successive squaring, we have + * an unexpected square root of 1 and n is composite. Otherwise base^(n-1) != 1, + * and n is composite. */ static int -bn_miller_rabin_base_2(int *is_prime, const BIGNUM *n, BN_CTX *ctx) +bn_fermat(int *is_pseudoprime, const BIGNUM *n, const BIGNUM *n_minus_one, + const BIGNUM *k, int s, const BIGNUM *base, BN_CTX *ctx, BN_MONT_CTX *mctx) { - BIGNUM *n_minus_one, *k, *x; - int i, s; + BIGNUM *power; + int ret = 0; + int i; + + BN_CTX_start(ctx); + + if ((power = BN_CTX_get(ctx)) == NULL) + goto err; + + /* Sanity check: ensure that 1 < base < n - 1. */ + if (BN_cmp(base, BN_value_one()) <= 0 || BN_cmp(base, n_minus_one) >= 0) + goto err; + + if (!BN_mod_exp_mont_ct(power, base, k, n, ctx, mctx)) + goto err; + + if (BN_is_one(power) || BN_cmp(power, n_minus_one) == 0) { + *is_pseudoprime = 1; + goto done; + } + + /* Loop invariant: power is neither 1 nor -1 (mod n). */ + for (i = 1; i < s; i++) { + if (!BN_mod_sqr(power, power, n, ctx)) + goto err; + + /* n is a pseudoprime for base. */ + if (BN_cmp(power, n_minus_one) == 0) { + *is_pseudoprime = 1; + goto done; + } + + /* n is composite: there's a square root of unity != 1 or -1. */ + if (BN_is_one(power)) { + *is_pseudoprime = 0; + goto done; + } + } + + /* + * If we get here, n is definitely composite: base^(n-1) != 1. + */ + + *is_pseudoprime = 0; + + done: + ret = 1; + + err: + BN_CTX_end(ctx); + + return ret; +} + +/* + * Miller-Rabin primality test for base 2 and for |rounds| of random bases. + * On success: is_pseudoprime == 0 implies that n is composite. + */ + +static int +bn_miller_rabin(int *is_pseudoprime, const BIGNUM *n, BN_CTX *ctx, + size_t rounds) +{ + BN_MONT_CTX *mctx = NULL; + BIGNUM *base, *k, *n_minus_one, *three; + size_t i; + int s; int ret = 0; BN_CTX_start(ctx); - if ((n_minus_one = BN_CTX_get(ctx)) == NULL) + if ((base = BN_CTX_get(ctx)) == NULL) goto err; if ((k = BN_CTX_get(ctx)) == NULL) goto err; - if ((x = BN_CTX_get(ctx)) == NULL) + if ((n_minus_one = BN_CTX_get(ctx)) == NULL) + goto err; + if ((three = BN_CTX_get(ctx)) == NULL) goto err; if (BN_is_word(n, 2) || BN_is_word(n, 3)) { - *is_prime = 1; + *is_pseudoprime = 1; goto done; } if (BN_cmp(n, BN_value_one()) <= 0 || !BN_is_odd(n)) { - *is_prime = 0; + *is_pseudoprime = 0; goto done; } @@ -344,43 +425,57 @@ bn_miller_rabin_base_2(int *is_prime, const BIGNUM *n, BN_CTX *ctx) goto err; /* - * If 2^k is 1 or -1 (mod n) then n is a 2-pseudoprime. + * Montgomery setup for n. */ - if (!BN_set_word(x, 2)) - goto err; - if (!BN_mod_exp_ct(x, x, k, n, ctx)) + if ((mctx = BN_MONT_CTX_new()) == NULL) goto err; - if (BN_is_one(x) || BN_cmp(x, n_minus_one) == 0) { - *is_prime = 1; + if (!BN_MONT_CTX_set(mctx, n, ctx)) + goto err; + + /* + * Perform a Miller-Rabin test for base 2 as required by BPSW. + */ + + if (!BN_set_word(base, 2)) + goto err; + + if (!bn_fermat(is_pseudoprime, n, n_minus_one, k, s, base, ctx, mctx)) + goto err; + if (!*is_pseudoprime) goto done; - } /* - * If 2^{2^i k} == -1 (mod n) for some 1 <= i < s, then n is a - * 2-pseudoprime. + * Perform Miller-Rabin tests with random 3 <= base < n - 1 to reduce + * risk of false positives in BPSW. */ - for (i = 1; i < s; i++) { - if (!BN_mod_sqr(x, x, n, ctx)) + if (!BN_set_word(three, 3)) + goto err; + + for (i = 0; i < rounds; i++) { + if (!bn_rand_interval(base, three, n_minus_one)) goto err; - if (BN_cmp(x, n_minus_one) == 0) { - *is_prime = 1; + + if (!bn_fermat(is_pseudoprime, n, n_minus_one, k, s, base, ctx, + mctx)) + goto err; + if (!*is_pseudoprime) goto done; - } } /* - * If we got here, n is definitely composite. + * If we got here, we have a Miller-Rabin pseudoprime. */ - *is_prime = 0; + *is_pseudoprime = 1; done: ret = 1; err: + BN_MONT_CTX_free(mctx); BN_CTX_end(ctx); return ret; @@ -392,7 +487,8 @@ bn_miller_rabin_base_2(int *is_prime, const BIGNUM *n, BN_CTX *ctx) */ int -bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *in_ctx) +bn_is_prime_bpsw(int *is_pseudoprime, const BIGNUM *n, BN_CTX *in_ctx, + size_t rounds) { BN_CTX *ctx = NULL; BN_ULONG mod; @@ -400,12 +496,12 @@ bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *in_ctx) int ret = 0; if (BN_is_word(n, 2)) { - *is_prime = 1; + *is_pseudoprime = 1; goto done; } if (BN_cmp(n, BN_value_one()) <= 0 || !BN_is_odd(n)) { - *is_prime = 0; + *is_pseudoprime = 0; goto done; } @@ -414,7 +510,7 @@ bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *in_ctx) if ((mod = BN_mod_word(n, primes[i])) == (BN_ULONG)-1) goto err; if (mod == 0) { - *is_prime = BN_is_word(n, primes[i]); + *is_pseudoprime = BN_is_word(n, primes[i]); goto done; } } @@ -424,14 +520,12 @@ bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *in_ctx) if (ctx == NULL) goto err; - if (!bn_miller_rabin_base_2(is_prime, n, ctx)) + if (!bn_miller_rabin(is_pseudoprime, n, ctx, rounds)) goto err; - if (!*is_prime) + if (!*is_pseudoprime) goto done; - /* XXX - Miller-Rabin for random bases? See FIPS 186-4, Table C.1. */ - - if (!bn_strong_lucas_selfridge(is_prime, n, ctx)) + if (!bn_strong_lucas_selfridge(is_pseudoprime, n, ctx)) goto err; done: diff --git a/lib/libcrypto/bn/bn_convert.c b/lib/libcrypto/bn/bn_convert.c index bfb5a566a..65834ffd1 100644 --- a/lib/libcrypto/bn/bn_convert.c +++ b/lib/libcrypto/bn/bn_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_convert.c,v 1.6 2023/04/19 11:14:04 jsing Exp $ */ +/* $OpenBSD: bn_convert.c,v 1.8 2023/05/09 05:15:55 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -68,6 +68,7 @@ #include #include "bn_local.h" +#include "bytestring.h" static const char hex_digits[] = "0123456789ABCDEF"; @@ -270,85 +271,82 @@ BN_asc2bn(BIGNUM **bn, const char *a) return 1; } -/* Must 'free' the returned data */ char * -BN_bn2dec(const BIGNUM *a) +BN_bn2dec(const BIGNUM *bn) { - int i = 0, num, bn_data_num, ok = 0; - char *buf = NULL; - char *p; - BIGNUM *t = NULL; - BN_ULONG *bn_data = NULL, *lp; + int started = 0; + BIGNUM *tmp = NULL; + uint8_t *data = NULL; + size_t data_len = 0; + uint8_t *s = NULL; + size_t s_len; + BN_ULONG v, w; + uint8_t c; + CBB cbb; + CBS cbs; + int i; - if (BN_is_zero(a)) { - buf = malloc(BN_is_negative(a) + 2); - if (buf == NULL) { - BNerror(ERR_R_MALLOC_FAILURE); - goto err; - } - p = buf; - if (BN_is_negative(a)) - *p++ = '-'; - *p++ = '0'; - *p++ = '\0'; - return (buf); - } + if (!CBB_init(&cbb, 0)) + goto err; - /* get an upper bound for the length of the decimal integer - * num <= (BN_num_bits(a) + 1) * log(2) - * <= 3 * BN_num_bits(a) * 0.1001 + log(2) + 1 (rounding error) - * <= BN_num_bits(a)/10 + BN_num_bits/1000 + 1 + 1 + if ((tmp = BN_dup(bn)) == NULL) + goto err; + + /* + * Divide the BIGNUM by a large multiple of 10, then break the remainder + * into decimal digits. This produces a reversed string of digits, + * potentially with leading zeroes. */ - i = BN_num_bits(a) * 3; - num = (i / 10 + i / 1000 + 1) + 1; - bn_data_num = num / BN_DEC_NUM + 1; - bn_data = reallocarray(NULL, bn_data_num, sizeof(BN_ULONG)); - buf = malloc(num + 3); - if ((buf == NULL) || (bn_data == NULL)) { - BNerror(ERR_R_MALLOC_FAILURE); - goto err; + while (!BN_is_zero(tmp)) { + if ((w = BN_div_word(tmp, BN_DEC_CONV)) == -1) + goto err; + for (i = 0; i < BN_DEC_NUM; i++) { + v = w % 10; + if (!CBB_add_u8(&cbb, '0' + v)) + goto err; + w /= 10; + } } - if ((t = BN_dup(a)) == NULL) + if (!CBB_finish(&cbb, &data, &data_len)) goto err; -#define BUF_REMAIN (num+3 - (size_t)(p - buf)) - p = buf; - lp = bn_data; - if (BN_is_negative(t)) - *p++ = '-'; + if (data_len > SIZE_MAX - 3) + goto err; + if (!CBB_init(&cbb, data_len + 3)) + goto err; - while (!BN_is_zero(t)) { - if (lp - bn_data >= bn_data_num) + if (BN_is_negative(bn)) { + if (!CBB_add_u8(&cbb, '-')) goto err; - *lp = BN_div_word(t, BN_DEC_CONV); - if (*lp == (BN_ULONG)-1) + } + + /* Reverse digits and trim leading zeroes. */ + CBS_init(&cbs, data, data_len); + while (CBS_len(&cbs) > 0) { + if (!CBS_get_last_u8(&cbs, &c)) goto err; - lp++; - } - lp--; - /* We now have a series of blocks, BN_DEC_NUM chars - * in length, where the last one needs truncation. - * The blocks need to be reversed in order. */ - snprintf(p, BUF_REMAIN, BN_DEC_FMT1, *lp); - while (*p) - p++; - while (lp != bn_data) { - lp--; - snprintf(p, BUF_REMAIN, BN_DEC_FMT2, *lp); - while (*p) - p++; - } - ok = 1; - -err: - free(bn_data); - BN_free(t); - if (!ok && buf) { - free(buf); - buf = NULL; + if (!started && c == '0') + continue; + if (!CBB_add_u8(&cbb, c)) + goto err; + started = 1; } - return (buf); + if (!started) { + if (!CBB_add_u8(&cbb, '0')) + goto err; + } + if (!CBB_add_u8(&cbb, '\0')) + goto err; + if (!CBB_finish(&cbb, &s, &s_len)) + goto err; + + err: + BN_free(tmp); + CBB_cleanup(&cbb); + freezero(data, data_len); + + return s; } int @@ -420,39 +418,49 @@ err: return (0); } -/* Must 'free' the returned data */ char * -BN_bn2hex(const BIGNUM *a) +BN_bn2hex(const BIGNUM *bn) { - int i, j, v, z = 0; - char *buf; - char *p; + int started = 0; + uint8_t *s = NULL; + size_t s_len; + BN_ULONG v, w; + int i, j; + CBB cbb; - buf = malloc(BN_is_negative(a) + a->top * BN_BYTES * 2 + 2); - if (buf == NULL) { - BNerror(ERR_R_MALLOC_FAILURE); + if (!CBB_init(&cbb, 0)) goto err; + + if (BN_is_negative(bn)) { + if (!CBB_add_u8(&cbb, '-')) + goto err; } - p = buf; - if (BN_is_negative(a)) - *p++ = '-'; - if (BN_is_zero(a)) - *p++ = '0'; - for (i = a->top - 1; i >=0; i--) { + if (BN_is_zero(bn)) { + if (!CBB_add_u8(&cbb, '0')) + goto err; + } + for (i = bn->top - 1; i >= 0; i--) { + w = bn->d[i]; for (j = BN_BITS2 - 8; j >= 0; j -= 8) { - /* strip leading zeros */ - v = ((int)(a->d[i] >> (long)j)) & 0xff; - if (z || (v != 0)) { - *p++ = hex_digits[v >> 4]; - *p++ = hex_digits[v & 0x0f]; - z = 1; - } + v = (w >> j) & 0xff; + if (!started && v == 0) + continue; + if (!CBB_add_u8(&cbb, hex_digits[v >> 4])) + goto err; + if (!CBB_add_u8(&cbb, hex_digits[v & 0xf])) + goto err; + started = 1; } } - *p = '\0'; + if (!CBB_add_u8(&cbb, '\0')) + goto err; + if (!CBB_finish(&cbb, &s, &s_len)) + goto err; -err: - return (buf); + err: + CBB_cleanup(&cbb); + + return s; } int diff --git a/lib/libcrypto/bn/bn_exp.c b/lib/libcrypto/bn/bn_exp.c index ff9933578..9e5d1fd26 100644 --- a/lib/libcrypto/bn/bn_exp.c +++ b/lib/libcrypto/bn/bn_exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_exp.c,v 1.45 2023/03/30 14:21:10 tb Exp $ */ +/* $OpenBSD: bn_exp.c,v 1.46 2023/05/09 05:38:11 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -194,7 +194,7 @@ BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(r); } else @@ -402,7 +402,7 @@ BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else @@ -658,7 +658,7 @@ BN_mod_exp_mont_internal(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, const BIG bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else @@ -843,7 +843,7 @@ BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, const BIGNUM *m, bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(rr); } else @@ -968,7 +968,7 @@ BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, bits = BN_num_bits(p); if (bits == 0) { /* x**0 mod 1 is still zero. */ - if (BN_is_one(m)) { + if (BN_abs_is_word(m, 1)) { ret = 1; BN_zero(r); } else diff --git a/lib/libcrypto/bn/bn_local.h b/lib/libcrypto/bn/bn_local.h index 24d91af46..78b4157d1 100644 --- a/lib/libcrypto/bn/bn_local.h +++ b/lib/libcrypto/bn/bn_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_local.h,v 1.21 2023/04/25 17:59:41 tb Exp $ */ +/* $OpenBSD: bn_local.h,v 1.22 2023/05/10 12:21:55 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -324,7 +324,7 @@ int bn_copy(BIGNUM *dst, const BIGNUM *src); int bn_isqrt(BIGNUM *out_sqrt, int *out_perfect, const BIGNUM *n, BN_CTX *ctx); int bn_is_perfect_square(int *out_perfect, const BIGNUM *n, BN_CTX *ctx); -int bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *in_ctx); +int bn_is_prime_bpsw(int *is_prime, const BIGNUM *n, BN_CTX *ctx, size_t rounds); __END_HIDDEN_DECLS #endif /* !HEADER_BN_LOCAL_H */ diff --git a/lib/libcrypto/bn/bn_prime.c b/lib/libcrypto/bn/bn_prime.c index c2fd0fc2e..b8f0eb69c 100644 --- a/lib/libcrypto/bn/bn_prime.c +++ b/lib/libcrypto/bn/bn_prime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_prime.c,v 1.31 2023/04/25 19:57:59 tb Exp $ */ +/* $OpenBSD: bn_prime.c,v 1.32 2023/05/10 12:21:55 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -195,12 +195,12 @@ BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add, goto err; if (!safe) { - if (!bn_is_prime_bpsw(&is_prime, ret, ctx)) + if (!bn_is_prime_bpsw(&is_prime, ret, ctx, 1)) goto err; if (!is_prime) goto loop; } else { - if (!bn_is_prime_bpsw(&is_prime, ret, ctx)) + if (!bn_is_prime_bpsw(&is_prime, ret, ctx, 1)) goto err; if (!is_prime) goto loop; @@ -213,7 +213,7 @@ BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add, if (!BN_rshift1(p, ret)) goto err; - if (!bn_is_prime_bpsw(&is_prime, p, ctx)) + if (!bn_is_prime_bpsw(&is_prime, p, ctx, 1)) goto err; if (!is_prime) goto loop; @@ -243,8 +243,14 @@ BN_is_prime_fasttest_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed, { int is_prime; + if (checks < 0) + return -1; + + if (checks == BN_prime_checks) + checks = BN_prime_checks_for_size(BN_num_bits(a)); + /* XXX - tickle BN_GENCB in bn_is_prime_bpsw(). */ - if (!bn_is_prime_bpsw(&is_prime, a, ctx_passed)) + if (!bn_is_prime_bpsw(&is_prime, a, ctx_passed, checks)) return -1; return is_prime; diff --git a/lib/libcrypto/cert.pem b/lib/libcrypto/cert.pem index 94a66a014..e5215f3cb 100644 --- a/lib/libcrypto/cert.pem +++ b/lib/libcrypto/cert.pem @@ -1,4 +1,4 @@ -# $OpenBSD: cert.pem,v 1.25 2022/07/11 09:05:16 sthen Exp $ +# $OpenBSD: cert.pem,v 1.26 2023/05/06 17:55:38 tb Exp $ ### /C=ES/CN=Autoridad de Certificacion Firmaprofesional CIF A62634068 === /C=ES/CN=Autoridad de Certificacion Firmaprofesional CIF A62634068 @@ -932,6 +932,93 @@ u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq 4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc= -----END CERTIFICATE----- +### Certainly + +=== /C=US/O=Certainly/CN=Certainly Root E1 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8 + Signature Algorithm: ecdsa-with-SHA384 + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C=US, O=Certainly, CN=Certainly Root E1 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + F3:28:18:CB:64:75:EE:29:2A:EB:ED:AE:23:58:38:85:EB:C8:22:07 +SHA1 Fingerprint=F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B +SHA256 Fingerprint=B4:58:5F:22:E4:AC:75:6A:4E:86:12:A1:36:1C:5D:9D:03:1A:93:FD:84:FE:BB:77:8F:A3:06:8B:0F:C4:2D:C2 +-----BEGIN CERTIFICATE----- +MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQsw +CQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlu +bHkgUm9vdCBFMTAeFw0yMTA0MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJ +BgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlubHkxGjAYBgNVBAMTEUNlcnRhaW5s +eSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4fxzf7flHh4axpMCK ++IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9YBk2 +QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4 +hevIIgcwCgYIKoZIzj0EAwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozm +ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG +BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR +-----END CERTIFICATE----- +=== /C=US/O=Certainly/CN=Certainly Root R1 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 8e:0f:f9:4b:90:71:68:65:33:54:f4:d4:44:39:b7:e0 + Signature Algorithm: sha256WithRSAEncryption + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C=US, O=Certainly, CN=Certainly Root R1 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + E0:AA:3F:25:8D:9F:44:5C:C1:3A:E8:2E:AE:77:4C:84:3E:67:0C:F4 +SHA1 Fingerprint=A0:50:EE:0F:28:71:F4:27:B2:12:6D:6F:50:96:25:BA:CC:86:42:AF +SHA256 Fingerprint=77:B8:2C:D8:64:4C:43:05:F7:AC:C5:CB:15:6B:45:67:50:04:03:3D:51:C6:0C:62:02:A8:E0:C3:34:67:D3:A0 +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAw +PTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2Vy +dGFpbmx5IFJvb3QgUjEwHhcNMjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9 +MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0 +YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANA2 +1B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O5MQT +vqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbed +aFySpvXl8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b0 +1C7jcvk2xusVtyWMOvwlDbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5 +r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGIXsXwClTNSaa/ApzSRKft43jvRl5tcdF5 +cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkNKPl6I7ENPT2a/Z2B7yyQ +wHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQAjeZjOVJ +6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA +2CnbrlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyH +Wyf5QBGenDPBt+U1VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMR +eiFPCyEQtkA6qyI6BJyLm4SGcprSp6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTgqj8ljZ9EXME66C6u +d0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAszHQNTVfSVcOQr +PbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d +8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi +1wrykXprOQ4vMMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrd +rRT90+7iIgXr0PK3aBLXWopBGsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9di +taY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+gjwN/KUD+nsa2UUeYNrEjvn8K8l7 +lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgHJBu6haEaBQmAupVj +yTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7fpYn +Kx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLy +yCwzk5Iwx06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5n +wXARPbv0+Em34yaXOp/SX3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6 +OV+KmalBWQewLK8= +-----END CERTIFICATE----- + ### certSIGN === /C=RO/O=certSIGN/OU=certSIGN ROOT CA @@ -1193,6 +1280,61 @@ W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D hNQ+IIX3Sj0rnP0qCglN6oH4EZw= -----END CERTIFICATE----- +### Comodo CA Limited + +=== /C=GB/ST=Greater Manchester/L=Salford/O=Comodo CA Limited/CN=AAA Certificate Services +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha1WithRSAEncryption + Validity + Not Before: Jan 1 00:00:00 2004 GMT + Not After : Dec 31 23:59:59 2028 GMT + Subject: C=GB, ST=Greater Manchester, L=Salford, O=Comodo CA Limited, CN=AAA Certificate Services + X509v3 extensions: + X509v3 Subject Key Identifier: + A0:11:0A:23:3E:96:F1:07:EC:E2:AF:29:EF:82:A5:7F:D0:30:A4:B4 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 CRL Distribution Points: + + Full Name: + URI:http://crl.comodoca.com/AAACertificateServices.crl + + Full Name: + URI:http://crl.comodo.net/AAACertificateServices.crl + +SHA1 Fingerprint=D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49 +SHA256 Fingerprint=D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4 +-----BEGIN CERTIFICATE----- +MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb +MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow +GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj +YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL +MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE +BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM +GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua +BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe +3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 +YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR +rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm +ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU +oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF +MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v +QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t +b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF +AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q +GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz +Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 +G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi +l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 +smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== +-----END CERTIFICATE----- + ### COMODO CA Limited === /C=GB/ST=Greater Manchester/L=Salford/O=COMODO CA Limited/CN=COMODO Certification Authority @@ -1336,61 +1478,6 @@ QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl NVOFBkpdn627G190 -----END CERTIFICATE----- -### Comodo CA Limited - -=== /C=GB/ST=Greater Manchester/L=Salford/O=Comodo CA Limited/CN=AAA Certificate Services -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Validity - Not Before: Jan 1 00:00:00 2004 GMT - Not After : Dec 31 23:59:59 2028 GMT - Subject: C=GB, ST=Greater Manchester, L=Salford, O=Comodo CA Limited, CN=AAA Certificate Services - X509v3 extensions: - X509v3 Subject Key Identifier: - A0:11:0A:23:3E:96:F1:07:EC:E2:AF:29:EF:82:A5:7F:D0:30:A4:B4 - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 CRL Distribution Points: - - Full Name: - URI:http://crl.comodoca.com/AAACertificateServices.crl - - Full Name: - URI:http://crl.comodo.net/AAACertificateServices.crl - -SHA1 Fingerprint=D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49 -SHA256 Fingerprint=D7:A7:A0:FB:5D:7E:27:31:D7:71:E9:48:4E:BC:DE:F7:1D:5F:0C:3E:0A:29:48:78:2B:C8:3E:E0:EA:69:9E:F4 ------BEGIN CERTIFICATE----- -MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj -YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL -MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM -GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua -BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe -3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 -YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR -rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm -ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU -oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF -MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v -QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t -b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF -AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q -GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz -Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 -G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi -l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 -smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== ------END CERTIFICATE----- - ### D-Trust GmbH === /C=DE/O=D-Trust GmbH/CN=D-TRUST BR Root CA 1 2020 @@ -2058,6 +2145,94 @@ r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1 gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+ -----END CERTIFICATE----- +### DigiCert, Inc. + +=== /C=US/O=DigiCert, Inc./CN=DigiCert TLS ECC P384 Root G5 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3 + Signature Algorithm: ecdsa-with-SHA384 + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C=US, O=DigiCert, Inc., CN=DigiCert TLS ECC P384 Root G5 + X509v3 extensions: + X509v3 Subject Key Identifier: + C1:51:45:50:59:AB:3E:E7:2C:5A:FA:20:22:12:07:80:88:7C:11:6A + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE +SHA1 Fingerprint=17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE +SHA256 Fingerprint=01:8E:13:F0:77:25:32:CF:80:9B:D1:B1:72:81:86:72:83:FC:48:C6:E1:3B:E9:C6:98:12:85:4A:49:0C:1B:05 +-----BEGIN CERTIFICATE----- +MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp +Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2 +MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ +bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS +7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp +0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS +B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49 +BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ +LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4 +DXZDjC5Ty3zfDBeWUA== +-----END CERTIFICATE----- +=== /C=US/O=DigiCert, Inc./CN=DigiCert TLS RSA4096 Root G5 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a + Signature Algorithm: sha384WithRSAEncryption + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C=US, O=DigiCert, Inc., CN=DigiCert TLS RSA4096 Root G5 + X509v3 extensions: + X509v3 Subject Key Identifier: + 51:33:1C:ED:36:40:AF:17:D3:25:CD:69:68:F2:AF:4E:23:3E:B3:41 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE +SHA1 Fingerprint=A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35 +SHA256 Fingerprint=37:1A:00:DC:05:33:B3:72:1A:7E:EB:40:E8:41:9E:70:79:9D:2B:0A:0F:2C:1D:80:69:31:65:F7:CE:C4:AD:75 +-----BEGIN CERTIFICATE----- +MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBN +MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMT +HERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN +NDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs +IEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS87IE+ +ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG0 +2C+JFvuUAT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgp +wgscONyfMXdcvyej/Cestyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZM +pG2T6T867jp8nVid9E6P/DsjyG244gXazOvswzH016cpVIDPRFtMbzCe88zdH5RD +nU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnVDdXifBBiqmvwPXbzP6Po +sMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9qTXeXAaDx +Zre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cd +Lvvyz6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvX +KyY//SovcfXWJL5/MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNe +XoVPzthwiHvOAbWWl9fNff2C+MIkwcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPL +tgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4EFgQUUTMc7TZArxfTJc1paPKv +TiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN +AQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw +GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7H +PNtQOa27PShNlnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLF +O4uJ+DQtpBflF+aZfTCIITfNMBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQ +REtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/u4cnYiWB39yhL/btp/96j1EuMPik +AdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9GOUrYU9DzLjtxpdRv +/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh47a+ +p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilw +MUc/dNAUFvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WF +qUITVuwhd4GTWgzqltlJyqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCK +ovfepEWFJqgejF0pW8hL2JpqA15w8oVPbEtoL8pU9ozaMv7Da4M/OMZ+ +-----END CERTIFICATE----- + ### Disig a.s. === /C=SK/L=Bratislava/O=Disig a.s./CN=CA Disig Root R2 @@ -2170,65 +2345,104 @@ aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg== -----END CERTIFICATE----- -### E-Tu\U011Fra EBG Bili\U015Fim Teknolojileri ve Hizmetleri A.\U015E. +### E-Tugra EBG A.S. -=== /C=TR/L=Ankara/O=E-Tu\xC4\x9Fra EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E./OU=E-Tugra Sertifikasyon Merkezi/CN=E-Tugra Certification Authority +=== /C=TR/L=Ankara/O=E-Tugra EBG A.S./OU=E-Tugra Trust Center/CN=E-Tugra Global Root CA ECC v3 Certificate: Data: Version: 3 (0x2) - Serial Number: 7667447206703254355 (0x6a683e9c519bcb53) - Signature Algorithm: sha256WithRSAEncryption + Serial Number: + 26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1 + Signature Algorithm: ecdsa-with-SHA384 Validity - Not Before: Mar 5 12:09:48 2013 GMT - Not After : Mar 3 12:09:48 2023 GMT - Subject: C=TR, L=Ankara, O=E-Tu\xC4\x9Fra EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., OU=E-Tugra Sertifikasyon Merkezi, CN=E-Tugra Certification Authority + Not Before: Mar 18 09:46:58 2020 GMT + Not After : Mar 12 09:46:58 2045 GMT + Subject: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA ECC v3 X509v3 extensions: - X509v3 Subject Key Identifier: - 2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 + keyid:FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + X509v3 Subject Key Identifier: + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 X509v3 Key Usage: critical Certificate Sign, CRL Sign -SHA1 Fingerprint=51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39 -SHA256 Fingerprint=B0:BF:D5:2B:B0:D7:D9:BD:92:BF:5D:4D:C1:3D:A2:55:C0:2C:54:2F:37:83:65:EA:89:39:11:F5:5E:55:F2:3C +SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 +SHA256 Fingerprint=87:3F:46:85:FA:7F:56:36:25:25:2E:6D:36:BC:D7:F1:6F:C2:49:51:F2:64:E4:7E:1B:95:4F:49:08:CD:CA:13 -----BEGIN CERTIFICATE----- -MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV -BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC -aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV -BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1 -Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz -MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+ -BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp -em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN -ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY -B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH -D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF -Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo -q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D -k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH -fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut -dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM -ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8 -zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn -rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX -U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6 -Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5 -XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF -Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR -HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY -GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c -77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3 -+GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK -vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6 -FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl -yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P -AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD -y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d -NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA== +MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw +gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn +cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD +VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2 +NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r +YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh +IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF +Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ +KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK +fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB +Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C +MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp +ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 +7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx +vmjkI6TZraE3 +-----END CERTIFICATE----- +=== /C=TR/L=Ankara/O=E-Tugra EBG A.S./OU=E-Tugra Trust Center/CN=E-Tugra Global Root CA RSA v3 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34 + Signature Algorithm: sha256WithRSAEncryption + Validity + Not Before: Mar 18 09:07:17 2020 GMT + Not After : Mar 12 09:07:17 2045 GMT + Subject: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA RSA v3 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF + + X509v3 Subject Key Identifier: + B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF + X509v3 Key Usage: critical + Certificate Sign, CRL Sign +SHA1 Fingerprint=E9:A8:5D:22:14:52:1C:5B:AA:0A:B4:BE:24:6A:23:8A:C9:BA:E2:A9 +SHA256 Fingerprint=EF:66:B0:B1:0A:3C:DB:9F:2E:36:48:C7:6B:D2:AF:18:EA:D2:BF:E6:F1:17:65:5E:28:C4:06:0D:A1:A3:F4:C2 +-----BEGIN CERTIFICATE----- +MIIF8zCCA9ugAwIBAgIUDU3FzRYilZYIfrgLfxUGNPt5EDQwDQYJKoZIhvcNAQEL +BQAwgYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUt +VHVncmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYw +JAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIFJTQSB2MzAeFw0yMDAzMTgw +OTA3MTdaFw00NTAzMTIwOTA3MTdaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMG +QW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1 +Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBD +QSBSU0EgdjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiZvCJt3J7 +7gnJY9LTQ91ew6aEOErxjYG7FL1H6EAX8z3DeEVypi6Q3po61CBxyryfHUuXCscx +uj7X/iWpKo429NEvx7epXTPcMHD4QGxLsqYxYdE0PD0xesevxKenhOGXpOhL9hd8 +7jwH7eKKV9y2+/hDJVDqJ4GohryPUkqWOmAalrv9c/SF/YP9f4RtNGx/ardLAQO/ +rWm31zLZ9Vdq6YaCPqVmMbMWPcLzJmAy01IesGykNz709a/r4d+ABs8qQedmCeFL +l+d3vSFtKbZnwy1+7dZ5ZdHPOrbRsV5WYVB6Ws5OUDGAA5hH5+QYfERaxqSzO8bG +wzrwbMOLyKSRBfP12baqBqG3q+Sx6iEUXIOk/P+2UNOMEiaZdnDpwA+mdPy70Bt4 +znKS4iicvObpCdg604nmvi533wEKb5b25Y08TVJ2Glbhc34XrD2tbKNSEhhw5oBO +M/J+JjKsBY04pOZ2PJ8QaQ5tndLBeSBrW88zjdGUdjXnXVXHt6woq0bM5zshtQoK +5EpZ3IE1S0SVEgpnpaH/WwAH0sDM+T/8nzPyAPiMbIedBi3x7+PmBvrFZhNb/FAH +nnGGstpvdDDPk1Po3CLW3iAfYY2jLqN4MpBs3KwytQXk9TwzDdbgh3cXTJ2w2Amo +DVf3RIXwyAS+XF1a4xeOVGNpf0l0ZAWMowIDAQABo2MwYTAPBgNVHRMBAf8EBTAD +AQH/MB8GA1UdIwQYMBaAFLK0ruYt9ybVqnUtdkvAG1Mh0EjvMB0GA1UdDgQWBBSy +tK7mLfcm1ap1LXZLwBtTIdBI7zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEL +BQADggIBAImocn+M684uGMQQgC0QDP/7FM0E4BQ8Tpr7nym/Ip5XuYJzEmMmtcyQ +6dIqKe6cLcwsmb5FJ+Sxce3kOJUxQfJ9emN438o2Fi+CiJ+8EUdPdk3ILY7r3y18 +Tjvarvbj2l0Upq7ohUSdBm6O++96SmotKygY/r+QLHUWnw/qln0F7psTpURs+APQ +3SPh/QMSEgj0GDSz4DcLdxEBSL9htLX4GdnLTeqjjO/98Aa1bZL0SmFQhO3sSdPk +vmjmLuMxC1QLGpLWgti2omU8ZgT5Vdps+9u1FGZNlIM7zR6mK7L+d0CGq+ffCsn9 +9t2HVhjYsCxVYJb6CH5SkPVLpi6HfMsg2wY+oF0Dd32iPBMbKaITVaA9FCKvb7jQ +mhty3QUBjYZgv6Rn7rWlDdF/5horYmbDB7rnoEgcOMPpRfunf/ztAmgayncSd6YA +VSgU7NbHEqIbZULpkejLPoeJVF3Zr52XnGnnCv8PWniLYypMfUeUP95L6VPQMPHF +9p5J3zugkaOj/s1YzOrfr28oO6Bpm4/srK4rVJ2bBLFHIK+WEj5jlB0E5y67hscM +moi/dkfv97ALl2bSRM9gUgfh1SxKOidhd8rXj+eHDjD/DLsE4mHDosiXYY60MGo8 +bcIHX0pzLz/5FooBZu+6kcpSV3uu1OYP3Qt6f4ueJiDPO++BcYNZ -----END CERTIFICATE----- ### eMudhra Inc @@ -3471,61 +3685,6 @@ pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGaJI7ZjnHK e7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0 vm9qp/UsQu0yrbYhnr68 -----END CERTIFICATE----- -=== /C=GR/O=Hellenic Academic and Research Institutions Cert. Authority/CN=Hellenic Academic and Research Institutions RootCA 2011 -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 0 (0x0) - Signature Algorithm: sha1WithRSAEncryption - Validity - Not Before: Dec 6 13:49:52 2011 GMT - Not After : Dec 1 13:49:52 2031 GMT - Subject: C=GR, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2011 - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: - Certificate Sign, CRL Sign - X509v3 Subject Key Identifier: - A6:91:42:FD:13:61:4A:23:9E:08:A4:29:E5:D8:13:04:23:EE:41:25 - X509v3 Name Constraints: - Permitted: - DNS:.gr - DNS:.eu - DNS:.edu - DNS:.org - email:.gr - email:.eu - email:.edu - email:.org - -SHA1 Fingerprint=FE:45:65:9B:79:03:5B:98:A1:61:B5:51:2E:AC:DA:58:09:48:22:4D -SHA256 Fingerprint=BC:10:4F:15:A4:8B:E7:09:DC:A5:42:A7:E1:D4:B9:DF:6F:05:45:27:E8:02:EA:A9:2D:59:54:44:25:8A:FE:71 ------BEGIN CERTIFICATE----- -MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix -RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1 -dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p -YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw -NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK -EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl -cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl -c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz -dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ -fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns -bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD -75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP -FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV -HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp -5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu -b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA -A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p -6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8 -TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7 -dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys -Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI -l7WdmplNsDz4SgCbZN2fOUvRJ9e4 ------END CERTIFICATE----- ### Hongkong Post @@ -4338,57 +4497,6 @@ uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2 XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= -----END CERTIFICATE----- -### Network Solutions L.L.C. - -=== /C=US/O=Network Solutions L.L.C./CN=Network Solutions Certificate Authority -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0 - Signature Algorithm: sha1WithRSAEncryption - Validity - Not Before: Dec 1 00:00:00 2006 GMT - Not After : Dec 31 23:59:59 2029 GMT - Subject: C=US, O=Network Solutions L.L.C., CN=Network Solutions Certificate Authority - X509v3 extensions: - X509v3 Subject Key Identifier: - 21:30:C9:FB:00:D7:4E:98:DA:87:AA:2A:D0:A7:2E:B1:40:31:A7:4C - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 CRL Distribution Points: - - Full Name: - URI:http://crl.netsolssl.com/NetworkSolutionsCertificateAuthority.crl - -SHA1 Fingerprint=74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE -SHA256 Fingerprint=15:F0:BA:00:A3:AC:7A:F3:AC:88:4C:07:2B:10:11:A0:77:BD:77:C0:97:F4:01:64:B2:F8:59:8A:BD:83:86:0C ------BEGIN CERTIFICATE----- -MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi -MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu -MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp -dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV -UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO -ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz -c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP -OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl -mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF -BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4 -qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw -gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB -BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu -bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp -dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8 -6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/ -h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH -/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv -wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN -pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey ------END CERTIFICATE----- - ### QuoVadis Limited === /C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 1 G3 @@ -4672,6 +4780,92 @@ ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0 ### SECOM Trust Systems CO.,LTD. +=== /C=JP/O=SECOM Trust Systems CO.,LTD./CN=Security Communication ECC RootCA1 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + d6:5d:9b:b3:78:81:2e:eb + Signature Algorithm: ecdsa-with-SHA384 + Validity + Not Before: Jun 16 05:15:28 2016 GMT + Not After : Jan 18 05:15:28 2038 GMT + Subject: C=JP, O=SECOM Trust Systems CO.,LTD., CN=Security Communication ECC RootCA1 + X509v3 extensions: + X509v3 Subject Key Identifier: + 86:1C:E7:FE:2D:A5:4A:8B:08:FE:28:11:FA:BE:A3:66:F8:60:59:2F + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE +SHA1 Fingerprint=B8:0E:26:A9:BF:D2:B2:3B:C0:EF:46:C9:BA:C7:BB:F6:1D:0D:41:41 +SHA256 Fingerprint=E7:4F:BD:A5:5B:D5:64:C4:73:A3:6B:44:1A:A7:99:C8:A6:8E:07:74:40:E8:28:8B:9F:A1:E5:0E:4B:BA:CA:11 +-----BEGIN CERTIFICATE----- +MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYT +AkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYD +VQQDEyJTZWN1cml0eSBDb21tdW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYx +NjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTELMAkGA1UEBhMCSlAxJTAjBgNVBAoT +HFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNVBAMTIlNlY3VyaXR5 +IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQAIgNi +AASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+Cnnfdl +dB9sELLo5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpK +ULGjQjBAMB0GA1UdDgQWBBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu +9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3LsnNdo4gIxwwCMQDAqy0O +be0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70eN9k= +-----END CERTIFICATE----- +=== /C=JP/O=SECOM Trust Systems CO.,LTD./CN=Security Communication RootCA3 +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + e1:7c:37:40:fd:1b:fe:67 + Signature Algorithm: sha384WithRSAEncryption + Validity + Not Before: Jun 16 06:17:16 2016 GMT + Not After : Jan 18 06:17:16 2038 GMT + Subject: C=JP, O=SECOM Trust Systems CO.,LTD., CN=Security Communication RootCA3 + X509v3 extensions: + X509v3 Subject Key Identifier: + 64:14:7C:FC:58:72:16:A6:0A:29:34:15:6F:2A:CB:BC:FC:AF:A8:AB + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE +SHA1 Fingerprint=C3:03:C8:22:74:92:E5:61:A2:9C:5F:79:91:2B:1E:44:13:91:30:3A +SHA256 Fingerprint=24:A5:5C:2A:B0:51:44:2D:06:17:76:65:41:23:9A:4A:D0:32:D7:C5:51:75:AA:34:FF:DE:2F:BC:4F:5C:52:94 +-----BEGIN CERTIFICATE----- +MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV +BAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScw +JQYDVQQDEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2 +MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc +U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UEAxMeU2VjdXJpdHkg +Q29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4r +CmDvu20rhvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzA +lrenfna84xtSGc4RHwsENPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MG +TfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF7 +9+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGmnpjKIG58u4iFW/vAEGK7 +8vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtYXLVqAvO4 +g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3we +GVPKp7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst ++3A7caoreyYn8xrC3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M +0V9hvqG8OmpI6iZVIhZdXw3/JzOfGAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQ +T9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0VcwCBEF/VfR2ccCAwEAAaNCMEAw +HQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS +YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PA +FNr0Y/Dq9HHuTofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd +9XbXv8S2gVj/yP9kaWJ5rW4OH3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQI +UYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASxYfQAW0q3nHE3GYV5v4GwxxMOdnE+ +OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZXSEIx2C/pHF7uNke +gr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml+LLf +iAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUV +nuiZIesnKwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD +2NCcnWXL0CsnMQMeNuE9dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI// +1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm6Vwdp6POXiUyK+OVrCoHzrQoeIY8Laad +TdJ0MN1kURXbg4NR16/9M51NZg== +-----END CERTIFICATE----- === /C=JP/O=SECOM Trust Systems CO.,LTD./OU=Security Communication RootCA2 Certificate: Data: @@ -5051,60 +5245,6 @@ oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY Ic2wBlX7Jz9TkHCpBB5XJ7k= -----END CERTIFICATE----- -### Staat der Nederlanden - -=== /C=NL/O=Staat der Nederlanden/CN=Staat der Nederlanden EV Root CA -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 10000013 (0x98968d) - Signature Algorithm: sha256WithRSAEncryption - Validity - Not Before: Dec 8 11:19:29 2010 GMT - Not After : Dec 8 11:10:28 2022 GMT - Subject: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Subject Key Identifier: - FE:AB:00:90:98:9E:24:FC:A9:CC:1A:8A:FB:27:B8:BF:30:6E:A8:3B -SHA1 Fingerprint=76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB -SHA256 Fingerprint=4D:24:91:41:4C:FE:95:67:46:EC:4C:EF:A6:CF:6F:72:E2:8A:13:29:43:2F:9D:8A:90:7A:C4:CB:5D:AD:C1:5A ------BEGIN CERTIFICATE----- -MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO -TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh -dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y -MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg -TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS -b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS -M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC -UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d -Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p -rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l -pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb -j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC -KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS -/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X -cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH -1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP -px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB -/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7 -MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI -eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u -2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS -v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC -wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy -CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e -vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6 -Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa -Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL -eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8 -FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc -7uzXLg== ------END CERTIFICATE----- - ### Starfield Technologies, Inc. === /C=US/O=Starfield Technologies, Inc./OU=Starfield Class 2 Certification Authority @@ -5792,163 +5932,6 @@ L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG jjxDah2nGN59PRbxYvnKkKj9 -----END CERTIFICATE----- -### TrustCor Systems S. de R.L. - -=== /C=PA/ST=Panama/L=Panama City/O=TrustCor Systems S. de R.L./OU=TrustCor Certificate Authority/CN=TrustCor ECA-1 -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 84:82:2c:5f:1c:62:d0:40 - Signature Algorithm: sha256WithRSAEncryption - Validity - Not Before: Feb 4 12:32:33 2016 GMT - Not After : Dec 31 17:28:07 2029 GMT - Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor ECA-1 - X509v3 extensions: - X509v3 Subject Key Identifier: - 44:9E:48:F5:CC:6D:48:D4:A0:4B:7F:FE:59:24:2F:83:97:99:9A:86 - X509v3 Authority Key Identifier: - keyid:44:9E:48:F5:CC:6D:48:D4:A0:4B:7F:FE:59:24:2F:83:97:99:9A:86 - - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: critical - Digital Signature, Certificate Sign, CRL Sign -SHA1 Fingerprint=58:D1:DF:95:95:67:6B:63:C0:F0:5B:1C:17:4D:8B:84:0B:C8:78:BD -SHA256 Fingerprint=5A:88:5D:B1:9C:01:D9:12:C5:75:93:88:93:8C:AF:BB:DF:03:1A:B2:D4:8E:91:EE:15:58:9B:42:97:1D:03:9C ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD -VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk -MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U -cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDlRydXN0Q29y -IEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3MjgwN1owgZwxCzAJBgNV -BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw -IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy -dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3Ig -RUNBLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb -3w9U73NjKYKtR8aja+3+XzP4Q1HpGjORMRegdMTUpwHmspI+ap3tDvl0mEDTPwOA -BoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23xFUfJ3zSCNV2HykVh0A5 -3ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmcp0yJF4Ou -owReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/ -wZ0+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZF -ZtS6mFjBAgMBAAGjYzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAf -BgNVHSMEGDAWgBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABT41XBVwm8nHc2Fv -civUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u/ukZMjgDfxT2 -AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F -hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50 -soIipX1TH0XsJ5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BI -WJZpTdwHjFGTot+fDz2LYLSCjaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1Wi -tJ/X5g== ------END CERTIFICATE----- -=== /C=PA/ST=Panama/L=Panama City/O=TrustCor Systems S. de R.L./OU=TrustCor Certificate Authority/CN=TrustCor RootCert CA-1 -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - da:9b:ec:71:f3:03:b0:19 - Signature Algorithm: sha256WithRSAEncryption - Validity - Not Before: Feb 4 12:32:16 2016 GMT - Not After : Dec 31 17:23:16 2029 GMT - Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-1 - X509v3 extensions: - X509v3 Subject Key Identifier: - EE:6B:49:3C:7A:3F:0D:E3:B1:09:B7:8A:C8:AB:19:9F:73:33:50:E7 - X509v3 Authority Key Identifier: - keyid:EE:6B:49:3C:7A:3F:0D:E3:B1:09:B7:8A:C8:AB:19:9F:73:33:50:E7 - - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: critical - Digital Signature, Certificate Sign, CRL Sign -SHA1 Fingerprint=FF:BD:CD:E7:82:C8:43:5E:3C:6F:26:86:5C:CA:A8:3A:45:5B:C3:0A -SHA256 Fingerprint=D4:0E:9C:86:CD:8F:E4:68:C1:77:69:59:F4:9E:A7:74:FA:54:86:84:B6:C4:06:F3:90:92:61:F4:DC:E2:57:5C ------BEGIN CERTIFICATE----- -MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD -VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk -MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U -cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29y -IFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkxMjMxMTcyMzE2WjCB -pDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFuYW1h -IENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUG -A1UECwweVHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZU -cnVzdENvciBSb290Q2VydCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAv463leLCJhJrMxnHQFgKq1mqjQCj/IDHUHuO1CAmujIS2CNUSSUQIpid -RtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4pQa81QBeCQryJ3pS/C3V -seq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0JEsq1pme -9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CV -EY4hgLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorW -hnAbJN7+KIor0Gqw/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/ -DeOxCbeKyKsZn3MzUOcwHwYDVR0jBBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcw -DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD -ggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5mDo4Nvu7Zp5I -/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf -ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZ -yonnMlo2HD6CqFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djts -L1Ac59v2Z3kf9YKVmgenFK+P3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdN -zl/HHk484IkzlQsPpTLWPFp5LBk= ------END CERTIFICATE----- -=== /C=PA/ST=Panama/L=Panama City/O=TrustCor Systems S. de R.L./OU=TrustCor Certificate Authority/CN=TrustCor RootCert CA-2 -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 2711694510199101698 (0x25a1dfca33cb5902) - Signature Algorithm: sha256WithRSAEncryption - Validity - Not Before: Feb 4 12:32:23 2016 GMT - Not After : Dec 31 17:26:39 2034 GMT - Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-2 - X509v3 extensions: - X509v3 Subject Key Identifier: - D9:FE:21:40:6E:94:9E:BC:9B:3D:9C:7D:98:20:19:E5:8C:30:62:B2 - X509v3 Authority Key Identifier: - keyid:D9:FE:21:40:6E:94:9E:BC:9B:3D:9C:7D:98:20:19:E5:8C:30:62:B2 - - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: critical - Digital Signature, Certificate Sign, CRL Sign -SHA1 Fingerprint=B8:BE:6D:CB:56:F1:55:B9:63:D4:12:CA:4E:06:34:C7:94:B2:1C:C0 -SHA256 Fingerprint=07:53:E9:40:37:8C:1B:D5:E3:83:6E:39:5D:AE:A5:CB:83:9E:50:46:F1:BD:0E:AE:19:51:CF:10:FE:C7:C9:65 ------BEGIN CERTIFICATE----- -MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNV -BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw -IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy -dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEfMB0GA1UEAwwWVHJ1c3RDb3Ig -Um9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEyMzExNzI2MzlaMIGk -MQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEg -Q2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYD -VQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRy -dXN0Q29yIFJvb3RDZXJ0IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK -AoICAQCnIG7CKqJiJJWQdsg4foDSq8GbZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+ -QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9NkRvRUqdw6VC0xK5mC8tkq -1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1oYxOdqHp -2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nK -DOObXUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hape -az6LMvYHL1cEksr1/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF -3wP+TfSvPd9cW436cOGlfifHhi5qjxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88 -oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQPeSghYA2FFn3XVDjxklb9tTNM -g9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+CtgrKAmrhQhJ8Z3 -mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh -8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAd -BgNVHQ4EFgQU2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6U -nrybPZx9mCAZ5YwwYrIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYw -DQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/hOsh80QA9z+LqBrWyOrsGS2h60COX -dKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnpkpfbsEZC89NiqpX+ -MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv2wnL -/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RX -CI/hOWB3S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYa -ZH9bDTMJBzN7Bj8RpFxwPIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW -2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dvDDqPys/cA8GiCcjl/YBeyGBCARsaU1q7 -N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYURpFHmygk71dSTlxCnKr3 -Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANExdqtvArB -As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp -5KeXRKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu -1uwJ ------END CERTIFICATE----- - ### Trustwave Holdings, Inc. === /C=US/ST=Illinois/L=Chicago/O=Trustwave Holdings, Inc./CN=Trustwave Global Certification Authority diff --git a/lib/libcrypto/crypto_init.c b/lib/libcrypto/crypto_init.c index 351b8ce09..ccf60223b 100644 --- a/lib/libcrypto/crypto_init.c +++ b/lib/libcrypto/crypto_init.c @@ -1,3 +1,4 @@ +/* $OpenBSD: crypto_init.c,v 1.8 2023/05/08 13:53:26 tb Exp $ */ /* * Copyright (c) 2018 Bob Beck * diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c index c62ba226f..36a413a99 100644 --- a/lib/libcrypto/ec/ec_asn1.c +++ b/lib/libcrypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.42 2023/04/25 19:53:30 tb Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.45 2023/05/04 05:59:38 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -225,7 +225,6 @@ static const ASN1_ADB_TABLE X9_62_CHARACTERISTIC_TWO_adbtbl[] = { .field_name = "p.onBasis", .item = &ASN1_NULL_it, }, - }, { .value = NID_X9_62_tpBasis, @@ -236,7 +235,6 @@ static const ASN1_ADB_TABLE X9_62_CHARACTERISTIC_TWO_adbtbl[] = { .field_name = "p.tpBasis", .item = &ASN1_INTEGER_it, }, - }, { .value = NID_X9_62_ppBasis, @@ -327,7 +325,6 @@ static const ASN1_ADB_TABLE X9_62_FIELDID_adbtbl[] = { .field_name = "p.prime", .item = &ASN1_INTEGER_it, }, - }, { .value = NID_X9_62_characteristic_two_field, @@ -338,7 +335,6 @@ static const ASN1_ADB_TABLE X9_62_FIELDID_adbtbl[] = { .field_name = "p.char_two", .item = &X9_62_CHARACTERISTIC_TWO_it, }, - }, }; @@ -619,7 +615,7 @@ EC_PRIVATEKEY_free(EC_PRIVATEKEY *a) /* some declarations of internal function */ -/* ec_asn1_group2field() sets the values in a X9_62_FIELDID object */ +/* ec_asn1_group2fieldid() sets the values in a X9_62_FIELDID object */ static int ec_asn1_group2fieldid(const EC_GROUP *, X9_62_FIELDID *); /* ec_asn1_group2curve() sets the values in a X9_62_CURVE object */ static int ec_asn1_group2curve(const EC_GROUP *, X9_62_CURVE *); @@ -912,8 +908,8 @@ ec_asn1_group2pkparameters(const EC_GROUP *group, ECPKPARAMETERS *params) } else { /* use the ECPARAMETERS structure */ ret->type = 1; - if ((ret->value.parameters = ec_asn1_group2parameters( - group, NULL)) == NULL) + if ((ret->value.parameters = ec_asn1_group2parameters(group, + NULL)) == NULL) ok = 0; } @@ -1098,7 +1094,7 @@ ec_asn1_pkparameters2group(const ECPKPARAMETERS *params) /* EC_GROUP <-> DER encoding of ECPKPARAMETERS */ EC_GROUP * -d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len) +d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len) { EC_GROUP *group = NULL; ECPKPARAMETERS *params; @@ -1143,7 +1139,7 @@ i2d_ECPKParameters(const EC_GROUP *a, unsigned char **out) /* some EC_KEY functions */ EC_KEY * -d2i_ECPrivateKey(EC_KEY ** a, const unsigned char **in, long len) +d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len) { EC_KEY *ret = NULL; EC_PRIVATEKEY *priv_key = NULL; @@ -1329,7 +1325,7 @@ i2d_ECParameters(EC_KEY *a, unsigned char **out) } EC_KEY * -d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len) +d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len) { EC_KEY *ret; @@ -1358,7 +1354,7 @@ d2i_ECParameters(EC_KEY ** a, const unsigned char **in, long len) } EC_KEY * -o2i_ECPublicKey(EC_KEY ** a, const unsigned char **in, long len) +o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len) { EC_KEY *ret = NULL; diff --git a/lib/libcrypto/ec/ec_lib.c b/lib/libcrypto/ec/ec_lib.c index f560aa999..308a0f006 100644 --- a/lib/libcrypto/ec/ec_lib.c +++ b/lib/libcrypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.56 2023/04/25 19:53:30 tb Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.57 2023/05/04 13:51:59 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -1459,15 +1459,20 @@ ec_group_simple_order_bits(const EC_GROUP *group) EC_KEY * ECParameters_dup(EC_KEY *key) { - unsigned char *p = NULL; - EC_KEY *k = NULL; + const unsigned char *p; + unsigned char *der = NULL; + EC_KEY *dup = NULL; int len; if (key == NULL) - return (NULL); + return NULL; - if ((len = i2d_ECParameters(key, &p)) > 0) - k = d2i_ECParameters(NULL, (const unsigned char **)&p, len); + if ((len = i2d_ECParameters(key, &der)) <= 0) + return NULL; - return (k); + p = der; + dup = d2i_ECParameters(NULL, &p, len); + freezero(der, len); + + return dup; } diff --git a/lib/libcrypto/ec/ec_oct.c b/lib/libcrypto/ec/ec_oct.c index f1b8bc5ff..f9de2f13a 100644 --- a/lib/libcrypto/ec/ec_oct.c +++ b/lib/libcrypto/ec/ec_oct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_oct.c,v 1.13 2023/05/01 21:15:26 tb Exp $ */ +/* $OpenBSD: ec_oct.c,v 1.14 2023/05/04 06:45:51 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -113,7 +113,7 @@ EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx_in) { BN_CTX *ctx; - int ret = 0; + size_t ret = 0; if ((ctx = ctx_in) == NULL) ctx = BN_CTX_new(); diff --git a/lib/libcrypto/man/BN_generate_prime.3 b/lib/libcrypto/man/BN_generate_prime.3 index 268bc02a0..a7551390e 100644 --- a/lib/libcrypto/man/BN_generate_prime.3 +++ b/lib/libcrypto/man/BN_generate_prime.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: BN_generate_prime.3,v 1.22 2023/04/30 20:17:59 tb Exp $ +.\" $OpenBSD: BN_generate_prime.3,v 1.24 2023/05/12 08:18:13 jsg Exp $ .\" full merge up to: OpenSSL f987a4dd Jun 27 10:12:08 2019 +0200 .\" .\" This file is a derived work. @@ -67,7 +67,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 30 2023 $ +.Dd $Mdocdate: May 12 2023 $ .Dt BN_GENERATE_PRIME 3 .Os .Sh NAME @@ -81,7 +81,7 @@ .Nm BN_GENCB_get_arg , .Nm BN_GENCB_set_old .\" Nm BN_prime_checks_for_size is intentionally undocumented -.\" because it is no longer used by LibreSSL. +.\" because it should not be used outside of libcrypto. .Nd generate primes and test for primality .Sh SYNOPSIS .In openssl/bn.h @@ -147,13 +147,14 @@ and test whether the number .Fa a is prime. -In LibreSSL, both functions behave identically, -use the Baillie-Pomerance-Selfridge-Wagstaff algorithm, -and ignore the +In LibreSSL, both functions behave identically +and use the Baillie-Pomerance-Selfridge-Wagstaff algorithm +combined with .Fa checks -and +Miller-Rabin rounds. +The .Fa do_trial_division -arguments. +argument is ignored. .Pp It is unknown whether any composite number exists that the Baillie-PSW algorithm misclassifies as a prime. @@ -161,6 +162,20 @@ Some suspect that there may be infinitely many such numbers, but not a single one is currently known. It is known that no such number exists below 2\(ha64. .Pp +In order to reduce the likelihood of a composite number +passing the primality tests +.Fn BN_is_prime_fasttest_ex +and +.Fn BN_is_prime_ex , +a number of rounds of the probabilistic Miller-Rabin test is performed. +If +.Fa checks +is positive, it is used as the number of rounds; +if it is zero or the special value +.Dv BN_prime_checks , +a suitable number of rounds is calculated from the bit length of +.Fa a . +.Pp If .Dv NULL is passed for the diff --git a/lib/libcrypto/man/EVP_AEAD_CTX_init.3 b/lib/libcrypto/man/EVP_AEAD_CTX_init.3 index b6e872be0..269dcbd9f 100644 --- a/lib/libcrypto/man/EVP_AEAD_CTX_init.3 +++ b/lib/libcrypto/man/EVP_AEAD_CTX_init.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.10 2022/01/10 22:44:22 tb Exp $ +.\" $OpenBSD: EVP_AEAD_CTX_init.3,v 1.11 2023/05/09 07:19:24 tb Exp $ .\" .\" Copyright (c) 2014, Google Inc. .\" Parts of the text were written by Adam Langley and David Benjamin. @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 10 2022 $ +.Dd $Mdocdate: May 9 2023 $ .Dt EVP_AEAD_CTX_INIT 3 .Os .Sh NAME @@ -266,9 +266,14 @@ It is also safer to use as it prevents common mistakes with the native APIs. .Fn EVP_AEAD_CTX_new returns the new .Vt EVP_AEAD_CTX -object or +object on success; +otherwise .Dv NULL -on failure. +is returned and +.Va errno +is set to +.Er ENOMEM . +.Pp .Fn EVP_AEAD_CTX_init , .Fn EVP_AEAD_CTX_open , and diff --git a/lib/libcrypto/man/RSA_pkey_ctx_ctrl.3 b/lib/libcrypto/man/RSA_pkey_ctx_ctrl.3 index d6fcf1a8c..cf16977e7 100644 --- a/lib/libcrypto/man/RSA_pkey_ctx_ctrl.3 +++ b/lib/libcrypto/man/RSA_pkey_ctx_ctrl.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: RSA_pkey_ctx_ctrl.3,v 1.6 2023/04/16 23:19:28 tb Exp $ +.\" $OpenBSD: RSA_pkey_ctx_ctrl.3,v 1.7 2023/05/05 12:22:21 tb Exp $ .\" full merge up to: .\" OpenSSL man3/EVP_PKEY_CTX_ctrl.pod 99d63d46 Oct 26 13:56:48 2016 -0400 .\" OpenSSL man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.pod @@ -55,7 +55,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 16 2023 $ +.Dd $Mdocdate: May 5 2023 $ .Dt RSA_PKEY_CTX_CTRL 3 .Os .Sh NAME @@ -189,15 +189,12 @@ for PKCS#1 padding, for no padding, .Dv RSA_PKCS1_OAEP_PADDING for OAEP padding (encrypt and decrypt only), -and +.Dv RSA_X931_PADDING +for X9.31 padding (signature operations only) and .Dv RSA_PKCS1_PSS_PADDING (sign and verify only). Only the last one can be used with keys of the type .Dv EVP_PKEY_RSA_PSS . -X9.31 padding mode is unsupported. -.Dv RSA_X931_PADDING -is provided for backward compatibility with some existing -application software. .Pp Two RSA padding modes behave differently if .Xr EVP_PKEY_CTX_set_signature_md 3 @@ -209,6 +206,8 @@ structure according to PKCS#1 when signing and this structure is expected (and stripped off) when verifying. If this control is not used with RSA and PKCS#1 padding then the supplied data is used directly and not encapsulated. +In the case of X9.31 padding for RSA the algorithm identifier byte is +added or checked and removed if this control is called. If it is not called then the first byte of the plaintext buffer is expected to be the algorithm identifier byte. .Pp diff --git a/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 b/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 index 19a123a4a..20730fb52 100644 --- a/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 +++ b/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: X509_NAME_get_index_by_NID.3,v 1.14 2023/05/02 14:13:05 beck Exp $ +.\" $OpenBSD: X509_NAME_get_index_by_NID.3,v 1.15 2023/05/03 08:10:23 beck Exp $ .\" OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 2 2023 $ +.Dd $Mdocdate: May 3 2023 $ .Dt X509_NAME_GET_INDEX_BY_NID 3 .Os .Sh NAME @@ -136,32 +136,22 @@ run from 0 to .Fn X509_NAME_get_text_by_NID and .Fn X509_NAME_get_text_by_OBJ -retrieve the bytes encoded as UTF-8 from the first entry in +retrieve the "text" from the first entry in .Fa name which matches .Fa nid or .Fa obj . +At most +.Fa len +bytes will be written and the text written to +.Fa buf +will be NUL terminated. If .Fa buf is .Dv NULL , nothing is written, but the return value is calculated as usual. -If -.Fa buf -is not -.Dv NULL , -no more than -.Fa len -bytes will be written and the text written to -.Fa buf -will be NUL terminated. -.Pp -Nothing is written and it is a failure if -.Fa len -is not large enough to hold the NUL byte terminated UTF-8 encoding of -the text, or if the UTF-8 encoding ot the text would contins a NUL -byte. .Pp All relevant .Dv NID_* @@ -199,8 +189,8 @@ if the index is invalid. .Fn X509_NAME_get_text_by_NID and .Fn X509_NAME_get_text_by_OBJ -return the length of the output UTF-8 string written, not counting the -terminating NUL, or -1 in the case of an error or no match being found. +return the length of the output string written, not counting the +terminating NUL, or -1 if no match is found. .Pp In some cases of failure of .Fn X509_NAME_get_index_by_NID diff --git a/lib/libcrypto/man/s2i_ASN1_INTEGER.3 b/lib/libcrypto/man/s2i_ASN1_INTEGER.3 index 39257d4a1..87a3d006a 100644 --- a/lib/libcrypto/man/s2i_ASN1_INTEGER.3 +++ b/lib/libcrypto/man/s2i_ASN1_INTEGER.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: s2i_ASN1_INTEGER.3,v 1.4 2023/04/21 13:08:16 tb Exp $ +.\" $OpenBSD: s2i_ASN1_INTEGER.3,v 1.5 2023/05/12 08:12:09 tb Exp $ .\" .\" Copyright (c) 2023 Theo Buehler .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 21 2023 $ +.Dd $Mdocdate: May 12 2023 $ .Dt I2S_ASN1_INTEGER 3 .Os .Sh NAME @@ -135,8 +135,9 @@ The and .Fa ctx arguments are ignored. -Every pair of hexadecimal digits is converted into an octet, while -any number of colons separating two pairs are ignored. +Every pair of hexadecimal digits is converted into an octet. +Colons are ignored if they are at the start, the end or +if they separate two pairs of digits. .Pp .Fn i2s_ASN1_ENUMERATED_TABLE uses strings provided in the usr_data field of the non-NULL @@ -187,7 +188,7 @@ or NULL on error. Error conditions are memory allocation failure or if .Fa value contains an odd number of hexadecimal digits or anything except -colons between pairs of hexadecimal digits. +colons at the start, the end or between pairs of hexadecimal digits. .Pp Error codes can sometimes be obtained by .Xr ERR_get_error 3 . diff --git a/lib/libcrypto/modes/xts128.c b/lib/libcrypto/modes/xts128.c index dfd3bc434..71881227f 100644 --- a/lib/libcrypto/modes/xts128.c +++ b/lib/libcrypto/modes/xts128.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xts128.c,v 1.9 2022/11/26 16:08:53 tb Exp $ */ +/* $OpenBSD: xts128.c,v 1.10 2023/05/07 14:38:04 tb Exp $ */ /* ==================================================================== * Copyright (c) 2011 The OpenSSL Project. All rights reserved. * @@ -120,9 +120,9 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], } if (enc) { for (i=0;in, ret)) + goto err; + if (BN_cmp(ret, f) > 0) + res = f; + else + res = ret; + } else + res = ret; /* put in leading 0 bytes if the number is less than the * length of the modulus */ @@ -661,10 +667,9 @@ RSA_eay_public_decrypt(int flen, const unsigned char *from, unsigned char *to, rsa->_method_mod_n)) goto err; - if (padding == RSA_X931_PADDING) { - RSAerror(RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE); - goto err; - } + if (padding == RSA_X931_PADDING && (ret->d[0] & 0xf) != 12) + if (!BN_sub(ret, rsa->n, ret)) + goto err; p = buf; i = BN_bn2bin(ret, p); @@ -673,6 +678,9 @@ RSA_eay_public_decrypt(int flen, const unsigned char *from, unsigned char *to, case RSA_PKCS1_PADDING: r = RSA_padding_check_PKCS1_type_1(to, num, buf, i, num); break; + case RSA_X931_PADDING: + r = RSA_padding_check_X931(to, num, buf, i, num); + break; case RSA_NO_PADDING: r = RSA_padding_check_none(to, num, buf, i, num); break; diff --git a/lib/libcrypto/rsa/rsa_local.h b/lib/libcrypto/rsa/rsa_local.h index b438ab4ee..4bc2cee8c 100644 --- a/lib/libcrypto/rsa/rsa_local.h +++ b/lib/libcrypto/rsa/rsa_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_local.h,v 1.1 2022/11/26 16:08:54 tb Exp $ */ +/* $OpenBSD: rsa_local.h,v 1.2 2023/05/05 12:21:44 tb Exp $ */ __BEGIN_HIDDEN_DECLS @@ -91,4 +91,10 @@ extern int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, unsigned char *rm, size_t *prm_len, const unsigned char *sigbuf, size_t siglen, RSA *rsa); +int RSA_padding_add_X931(unsigned char *to, int tlen, + const unsigned char *f, int fl); +int RSA_padding_check_X931(unsigned char *to, int tlen, + const unsigned char *f, int fl, int rsa_len); +int RSA_X931_hash_id(int nid); + __END_HIDDEN_DECLS diff --git a/lib/libcrypto/rsa/rsa_pmeth.c b/lib/libcrypto/rsa/rsa_pmeth.c index 8e0636556..429524d73 100644 --- a/lib/libcrypto/rsa/rsa_pmeth.c +++ b/lib/libcrypto/rsa/rsa_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pmeth.c,v 1.37 2023/04/25 15:48:48 tb Exp $ */ +/* $OpenBSD: rsa_pmeth.c,v 1.38 2023/05/05 12:21:44 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -187,7 +187,7 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, const unsigned char *tbs, size_t tbslen) { - int ret = -1; + int ret; RSA_PKEY_CTX *rctx = ctx->data; RSA *rsa = ctx->pkey->pkey.rsa; @@ -197,11 +197,21 @@ pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, return -1; } - if (rctx->pad_mode != RSA_PKCS1_PADDING && - rctx->pad_mode != RSA_PKCS1_PSS_PADDING) - return -1; - - if (rctx->pad_mode == RSA_PKCS1_PADDING) { + if (rctx->pad_mode == RSA_X931_PADDING) { + if ((size_t)EVP_PKEY_size(ctx->pkey) < tbslen + 1) { + RSAerror(RSA_R_KEY_SIZE_TOO_SMALL); + return -1; + } + if (!setup_tbuf(rctx, ctx)) { + RSAerror(ERR_R_MALLOC_FAILURE); + return -1; + } + memcpy(rctx->tbuf, tbs, tbslen); + rctx->tbuf[tbslen] = + RSA_X931_hash_id(EVP_MD_type(rctx->md)); + ret = RSA_private_encrypt(tbslen + 1, rctx->tbuf, sig, + rsa, RSA_X931_PADDING); + } else if (rctx->pad_mode == RSA_PKCS1_PADDING) { unsigned int sltmp; ret = RSA_sign(EVP_MD_type(rctx->md), tbs, tbslen, sig, @@ -217,6 +227,8 @@ pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, return -1; ret = RSA_private_encrypt(RSA_size(rsa), rctx->tbuf, sig, rsa, RSA_NO_PADDING); + } else { + return -1; } } else { ret = RSA_private_encrypt(tbslen, tbs, sig, ctx->pkey->pkey.rsa, @@ -236,16 +248,36 @@ pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx, unsigned char *rout, size_t *routlen, RSA_PKEY_CTX *rctx = ctx->data; if (rctx->md) { - size_t sltmp; + if (rctx->pad_mode == RSA_X931_PADDING) { + if (!setup_tbuf(rctx, ctx)) + return -1; + ret = RSA_public_decrypt(siglen, sig, rctx->tbuf, + ctx->pkey->pkey.rsa, RSA_X931_PADDING); + if (ret < 1) + return 0; + ret--; + if (rctx->tbuf[ret] != + RSA_X931_hash_id(EVP_MD_type(rctx->md))) { + RSAerror(RSA_R_ALGORITHM_MISMATCH); + return 0; + } + if (ret != EVP_MD_size(rctx->md)) { + RSAerror(RSA_R_INVALID_DIGEST_LENGTH); + return 0; + } + if (rout) + memcpy(rout, rctx->tbuf, ret); + } else if (rctx->pad_mode == RSA_PKCS1_PADDING) { + size_t sltmp; - if (rctx->pad_mode != RSA_PKCS1_PADDING) + ret = int_rsa_verify(EVP_MD_type(rctx->md), NULL, 0, + rout, &sltmp, sig, siglen, ctx->pkey->pkey.rsa); + if (ret <= 0) + return 0; + ret = sltmp; + } else { return -1; - - ret = int_rsa_verify(EVP_MD_type(rctx->md), NULL, 0, - rout, &sltmp, sig, siglen, ctx->pkey->pkey.rsa); - if (ret <= 0) - return 0; - ret = sltmp; + } } else { ret = RSA_public_decrypt(siglen, sig, rout, ctx->pkey->pkey.rsa, rctx->pad_mode); @@ -263,7 +295,6 @@ pkey_rsa_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen, RSA_PKEY_CTX *rctx = ctx->data; RSA *rsa = ctx->pkey->pkey.rsa; size_t rslen; - int ret; if (rctx->md) { if (rctx->pad_mode == RSA_PKCS1_PADDING) @@ -273,22 +304,30 @@ pkey_rsa_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen, RSAerror(RSA_R_INVALID_DIGEST_LENGTH); return -1; } + if (rctx->pad_mode == RSA_X931_PADDING) { + if (pkey_rsa_verifyrecover(ctx, NULL, &rslen, sig, + siglen) <= 0) + return 0; + } else if (rctx->pad_mode == RSA_PKCS1_PSS_PADDING) { + int ret; - if (rctx->pad_mode != RSA_PKCS1_PSS_PADDING) + if (!setup_tbuf(rctx, ctx)) + return -1; + ret = RSA_public_decrypt(siglen, sig, rctx->tbuf, + rsa, RSA_NO_PADDING); + if (ret <= 0) + return 0; + ret = RSA_verify_PKCS1_PSS_mgf1(rsa, tbs, rctx->md, + rctx->mgf1md, rctx->tbuf, rctx->saltlen); + if (ret <= 0) + return 0; + return 1; + } else { return -1; - - if (!setup_tbuf(rctx, ctx)) - return -1; - ret = RSA_public_decrypt(siglen, sig, rctx->tbuf, - rsa, RSA_NO_PADDING); - if (ret <= 0) - return 0; - ret = RSA_verify_PKCS1_PSS_mgf1(rsa, tbs, rctx->md, - rctx->mgf1md, rctx->tbuf, rctx->saltlen); - if (ret <= 0) - return 0; - return 1; + } } else { + int ret; + if (!setup_tbuf(rctx, ctx)) return -1; @@ -365,34 +404,41 @@ check_padding_md(const EVP_MD *md, int padding) if (md == NULL) return 1; - if (padding == RSA_NO_PADDING || padding == RSA_X931_PADDING) { - RSAerror(RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE); + if (padding == RSA_NO_PADDING) { + RSAerror(RSA_R_INVALID_PADDING_MODE); return 0; } - /* List of all supported RSA digests. */ - /* RFC 8017 and NIST CSOR. */ - switch(EVP_MD_type(md)) { - case NID_sha1: - case NID_sha224: - case NID_sha256: - case NID_sha384: - case NID_sha512: - case NID_sha512_224: - case NID_sha512_256: - case NID_sha3_224: - case NID_sha3_256: - case NID_sha3_384: - case NID_sha3_512: - case NID_md5: - case NID_md5_sha1: - case NID_md4: - case NID_ripemd160: - return 1; + if (padding == RSA_X931_PADDING) { + if (RSA_X931_hash_id(EVP_MD_type(md)) == -1) { + RSAerror(RSA_R_INVALID_X931_DIGEST); + return 0; + } + } else { + /* List of all supported RSA digests. */ + /* RFC 8017 and NIST CSOR. */ + switch(EVP_MD_type(md)) { + case NID_sha1: + case NID_sha224: + case NID_sha256: + case NID_sha384: + case NID_sha512: + case NID_sha512_224: + case NID_sha512_256: + case NID_sha3_224: + case NID_sha3_256: + case NID_sha3_384: + case NID_sha3_512: + case NID_md5: + case NID_md5_sha1: + case NID_md4: + case NID_ripemd160: + return 1; - default: - RSAerror(RSA_R_INVALID_DIGEST); - return 0; + default: + RSAerror(RSA_R_INVALID_DIGEST); + return 0; + } } return 1; @@ -598,6 +644,8 @@ pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value) pm = RSA_PKCS1_OAEP_PADDING; else if (!strcmp(value, "oaep")) pm = RSA_PKCS1_OAEP_PADDING; + else if (!strcmp(value, "x931")) + pm = RSA_X931_PADDING; else if (!strcmp(value, "pss")) pm = RSA_PKCS1_PSS_PADDING; else { diff --git a/lib/libcrypto/rsa/rsa_x931.c b/lib/libcrypto/rsa/rsa_x931.c new file mode 100644 index 000000000..52f3f803b --- /dev/null +++ b/lib/libcrypto/rsa/rsa_x931.c @@ -0,0 +1,164 @@ +/* $OpenBSD: rsa_x931.c,v 1.12 2023/05/05 12:19:37 tb Exp $ */ +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL + * project 2005. + */ +/* ==================================================================== + * Copyright (c) 2005 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +#include +#include + +#include +#include +#include +#include + +int +RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *from, + int flen) +{ + int j; + unsigned char *p; + + /* + * Absolute minimum amount of padding is 1 header nibble, 1 padding + * nibble and 2 trailer bytes: but 1 hash if is already in 'from'. + */ + j = tlen - flen - 2; + + if (j < 0) { + RSAerror(RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE); + return -1; + } + + p = (unsigned char *)to; + + /* If no padding start and end nibbles are in one byte */ + if (j == 0) + *p++ = 0x6A; + else { + *p++ = 0x6B; + if (j > 1) { + memset(p, 0xBB, j - 1); + p += j - 1; + } + *p++ = 0xBA; + } + memcpy(p, from, flen); + p += flen; + *p = 0xCC; + return 1; +} + +int +RSA_padding_check_X931(unsigned char *to, int tlen, const unsigned char *from, + int flen, int num) +{ + int i = 0, j; + const unsigned char *p = from; + + if (num != flen || (*p != 0x6A && *p != 0x6B)) { + RSAerror(RSA_R_INVALID_HEADER); + return -1; + } + + if (*p++ == 0x6B) { + j = flen - 3; + for (i = 0; i < j; i++) { + unsigned char c = *p++; + if (c == 0xBA) + break; + if (c != 0xBB) { + RSAerror(RSA_R_INVALID_PADDING); + return -1; + } + } + + if (i == 0) { + RSAerror(RSA_R_INVALID_PADDING); + return -1; + } + + j -= i; + } else + j = flen - 2; + + if (j < 0 || p[j] != 0xCC) { + RSAerror(RSA_R_INVALID_TRAILER); + return -1; + } + + memcpy(to, p, j); + + return j; +} + +/* Translate between X931 hash ids and NIDs */ + +int +RSA_X931_hash_id(int nid) +{ + switch (nid) { + case NID_sha1: + return 0x33; + case NID_sha256: + return 0x34; + case NID_sha384: + return 0x36; + case NID_sha512: + return 0x35; + } + + return -1; +} diff --git a/lib/libcrypto/sha/sha512.c b/lib/libcrypto/sha/sha512.c index 4a4194350..2840fa944 100644 --- a/lib/libcrypto/sha/sha512.c +++ b/lib/libcrypto/sha/sha512.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha512.c,v 1.34 2023/04/14 10:45:15 jsing Exp $ */ +/* $OpenBSD: sha512.c,v 1.35 2023/05/12 10:10:55 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. * @@ -153,137 +153,6 @@ static const SHA_LONG64 K512[80] = { #define Ch(x, y, z) (((x) & (y)) ^ ((~(x)) & (z))) #define Maj(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z))) - -#if defined(__i386) || defined(__i386__) || defined(_M_IX86) -/* - * This code should give better results on 32-bit CPU with less than - * ~24 registers, both size and performance wise... - */ -static void -sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num) -{ - const SHA_LONG64 *W = in; - SHA_LONG64 A, E, T; - SHA_LONG64 X[9 + 80], *F; - int i; - - while (num--) { - - F = X + 80; - A = ctx->h[0]; - F[1] = ctx->h[1]; - F[2] = ctx->h[2]; - F[3] = ctx->h[3]; - E = ctx->h[4]; - F[5] = ctx->h[5]; - F[6] = ctx->h[6]; - F[7] = ctx->h[7]; - - for (i = 0; i < 16; i++, F--) { - T = PULL64(W[i]); - F[0] = A; - F[4] = E; - F[8] = T; - T += F[7] + Sigma1(E) + Ch(E, F[5], F[6]) + K512[i]; - E = F[3] + T; - A = T + Sigma0(A) + Maj(A, F[1], F[2]); - } - - for (; i < 80; i++, F--) { - T = sigma0(F[8 + 16 - 1]); - T += sigma1(F[8 + 16 - 14]); - T += F[8 + 16] + F[8 + 16 - 9]; - - F[0] = A; - F[4] = E; - F[8] = T; - T += F[7] + Sigma1(E) + Ch(E, F[5], F[6]) + K512[i]; - E = F[3] + T; - A = T + Sigma0(A) + Maj(A, F[1], F[2]); - } - - ctx->h[0] += A; - ctx->h[1] += F[1]; - ctx->h[2] += F[2]; - ctx->h[3] += F[3]; - ctx->h[4] += E; - ctx->h[5] += F[5]; - ctx->h[6] += F[6]; - ctx->h[7] += F[7]; - - W += SHA_LBLOCK; - } -} - -#elif defined(OPENSSL_SMALL_FOOTPRINT) - -static void -sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num) -{ - const SHA_LONG64 *W = in; - SHA_LONG64 a, b, c, d, e, f, g, h, s0, s1, T1, T2; - SHA_LONG64 X[16]; - int i; - - while (num--) { - - a = ctx->h[0]; - b = ctx->h[1]; - c = ctx->h[2]; - d = ctx->h[3]; - e = ctx->h[4]; - f = ctx->h[5]; - g = ctx->h[6]; - h = ctx->h[7]; - - for (i = 0; i < 16; i++) { - T1 = X[i] = PULL64(W[i]); - T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i]; - T2 = Sigma0(a) + Maj(a, b, c); - h = g; - g = f; - f = e; - e = d + T1; - d = c; - c = b; - b = a; - a = T1 + T2; - } - - for (; i < 80; i++) { - s0 = X[(i + 1)&0x0f]; - s0 = sigma0(s0); - s1 = X[(i + 14)&0x0f]; - s1 = sigma1(s1); - - T1 = X[i&0xf] += s0 + s1 + X[(i + 9)&0xf]; - T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i]; - T2 = Sigma0(a) + Maj(a, b, c); - h = g; - g = f; - f = e; - e = d + T1; - d = c; - c = b; - b = a; - a = T1 + T2; - } - - ctx->h[0] += a; - ctx->h[1] += b; - ctx->h[2] += c; - ctx->h[3] += d; - ctx->h[4] += e; - ctx->h[5] += f; - ctx->h[6] += g; - ctx->h[7] += h; - - W += SHA_LBLOCK; - } -} - -#else - #define ROUND_00_15(i, a, b, c, d, e, f, g, h) do { \ T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i]; \ h = Sigma0(a) + Maj(a, b, c); \ @@ -379,8 +248,6 @@ sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num) } } -#endif - #endif /* SHA512_ASM */ int diff --git a/lib/libcrypto/x509/x509_local.h b/lib/libcrypto/x509/x509_local.h index 374cba3d5..9ce1b58ed 100644 --- a/lib/libcrypto/x509/x509_local.h +++ b/lib/libcrypto/x509/x509_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_local.h,v 1.7 2023/04/28 16:30:14 tb Exp $ */ +/* $OpenBSD: x509_local.h,v 1.8 2023/05/08 14:51:00 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2013. */ @@ -327,10 +327,10 @@ struct x509_store_ctx_st { /* The following are set by the caller */ X509 *cert; /* The cert to check */ STACK_OF(X509) *untrusted; /* chain of X509s - untrusted - passed in */ + STACK_OF(X509) *trusted; /* trusted stack for use with get_issuer() */ STACK_OF(X509_CRL) *crls; /* set of CRLs passed in */ X509_VERIFY_PARAM *param; - void *other_ctx; /* Other info for use with get_issuer() */ /* Callbacks for various operations */ int (*verify)(X509_STORE_CTX *ctx); /* called to verify a certificate */ diff --git a/lib/libcrypto/x509/x509_prn.c b/lib/libcrypto/x509/x509_prn.c index 2d7afb9fc..3bf7c803e 100644 --- a/lib/libcrypto/x509/x509_prn.c +++ b/lib/libcrypto/x509/x509_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_prn.c,v 1.5 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: x509_prn.c,v 1.6 2023/05/08 05:30:38 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -178,7 +178,7 @@ X509V3_extensions_print(BIO *bp, const char *title, obj = X509_EXTENSION_get_object(ex); i2a_ASN1_OBJECT(bp, obj); j = X509_EXTENSION_get_critical(ex); - if (BIO_printf(bp, ": %s\n",j?"critical":"") <= 0) + if (BIO_printf(bp, ":%s\n", j ? " critical" : "") <= 0) return 0; if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) { BIO_printf(bp, "%*s", indent + 4, ""); diff --git a/lib/libcrypto/x509/x509_utl.c b/lib/libcrypto/x509/x509_utl.c index 0cc5fb406..14b43e8b6 100644 --- a/lib/libcrypto/x509/x509_utl.c +++ b/lib/libcrypto/x509/x509_utl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_utl.c,v 1.14 2023/04/23 11:52:14 tb Exp $ */ +/* $OpenBSD: x509_utl.c,v 1.17 2023/05/12 19:02:10 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -55,9 +55,9 @@ * Hudson (tjh@cryptsoft.com). * */ -/* X509 v3 extension utilities */ #include +#include #include #include @@ -67,6 +67,8 @@ #include #include +#include "bytestring.h" + static char *bn_to_string(const BIGNUM *bn); static char *strip_spaces(char *name); static int sk_strcmp(const char * const *a, const char * const *b); @@ -459,97 +461,148 @@ strip_spaces(char *name) return p; } -/* hex string utilities */ +static const char hex_digits[] = "0123456789ABCDEF"; -/* Given a buffer of length 'len' return a malloc'ed string with its - * hex representation - */ char * hex_to_string(const unsigned char *buffer, long len) { - char *tmp, *q; - const unsigned char *p; - int i; - static const char hexdig[] = "0123456789ABCDEF"; + CBB cbb; + CBS cbs; + uint8_t *out = NULL; + uint8_t c; + size_t out_len; + + if (!CBB_init(&cbb, 0)) + goto err; if (len < 0) - return NULL; - if (len == 0) - return calloc(1, 1); - if ((tmp = calloc(len, 3)) == NULL) { - X509V3error(ERR_R_MALLOC_FAILURE); - return NULL; + goto err; + + CBS_init(&cbs, buffer, len); + while (CBS_len(&cbs) > 0) { + if (!CBS_get_u8(&cbs, &c)) + goto err; + if (!CBB_add_u8(&cbb, hex_digits[c >> 4])) + goto err; + if (!CBB_add_u8(&cbb, hex_digits[c & 0xf])) + goto err; + if (CBS_len(&cbs) > 0) { + if (!CBB_add_u8(&cbb, ':')) + goto err; + } } - q = tmp; - for (i = 0, p = buffer; i < len; i++, p++) { - *q++ = hexdig[(*p >> 4) & 0xf]; - *q++ = hexdig[*p & 0xf]; - *q++ = ':'; - } - q[-1] = 0; - return tmp; + + if (!CBB_add_u8(&cbb, '\0')) + goto err; + + if (!CBB_finish(&cbb, &out, &out_len)) + goto err; + + err: + CBB_cleanup(&cbb); + + return out; } LCRYPTO_ALIAS(hex_to_string); -/* Give a string of hex digits convert to - * a buffer - */ +static int +x509_skip_colons_cbs(CBS *cbs) +{ + uint8_t c; + + while (CBS_len(cbs) > 0) { + if (!CBS_peek_u8(cbs, &c)) + return 0; + if (c != ':') + return 1; + if (!CBS_get_u8(cbs, &c)) + return 0; + } + + return 1; +} + +static int +x509_get_xdigit_nibble_cbs(CBS *cbs, uint8_t *out_nibble) +{ + uint8_t c; + + if (!CBS_get_u8(cbs, &c)) + return 0; + + if (c >= '0' && c <= '9') { + *out_nibble = c - '0'; + return 1; + } + if (c >= 'a' && c <= 'f') { + *out_nibble = c - 'a' + 10; + return 1; + } + if (c >= 'A' && c <= 'F') { + *out_nibble = c - 'A' + 10; + return 1; + } + + X509V3error(X509V3_R_ILLEGAL_HEX_DIGIT); + return 0; +} unsigned char * string_to_hex(const char *str, long *len) { - unsigned char *hexbuf, *q; - unsigned char ch, cl, *p; - if (!str) { - X509V3error(X509V3_R_INVALID_NULL_ARGUMENT); - return NULL; - } - if (!(hexbuf = malloc(strlen(str) >> 1))) + CBB cbb; + CBS cbs; + uint8_t *out = NULL; + size_t out_len; + uint8_t hi, lo; + + *len = 0; + + if (!CBB_init(&cbb, 0)) goto err; - for (p = (unsigned char *)str, q = hexbuf; *p; ) { - ch = *p++; - if (ch == ':') - continue; - cl = *p++; - if (!cl) { - X509V3error(X509V3_R_ODD_NUMBER_OF_DIGITS); - free(hexbuf); - return NULL; - } - ch = tolower(ch); - cl = tolower(cl); - if ((ch >= '0') && (ch <= '9')) - ch -= '0'; - else if ((ch >= 'a') && (ch <= 'f')) - ch -= 'a' - 10; - else - goto badhex; - - if ((cl >= '0') && (cl <= '9')) - cl -= '0'; - else if ((cl >= 'a') && (cl <= 'f')) - cl -= 'a' - 10; - else - goto badhex; - - *q++ = (ch << 4) | cl; + if (str == NULL) { + X509V3error(X509V3_R_INVALID_NULL_ARGUMENT); + goto err; } - if (len) - *len = q - hexbuf; + CBS_init(&cbs, str, strlen(str)); + while (CBS_len(&cbs) > 0) { + /* + * Skipping only a single colon between two pairs of digits + * would make more sense - history... + */ + if (!x509_skip_colons_cbs(&cbs)) + goto err; + /* Another historic idiocy. */ + if (CBS_len(&cbs) == 0) + break; + if (!x509_get_xdigit_nibble_cbs(&cbs, &hi)) + goto err; + if (CBS_len(&cbs) == 0) { + X509V3error(X509V3_R_ODD_NUMBER_OF_DIGITS); + goto err; + } + if (!x509_get_xdigit_nibble_cbs(&cbs, &lo)) + goto err; + if (!CBB_add_u8(&cbb, hi << 4 | lo)) + goto err; + } - return hexbuf; + if (!CBB_finish(&cbb, &out, &out_len)) + goto err; + if (out_len > LONG_MAX) { + freezero(out, out_len); + out = NULL; + goto err; + } + + *len = out_len; err: - free(hexbuf); - X509V3error(ERR_R_MALLOC_FAILURE); - return NULL; + CBB_cleanup(&cbb); - badhex: - free(hexbuf); - X509V3error(X509V3_R_ILLEGAL_HEX_DIGIT); - return NULL; + return out; } LCRYPTO_ALIAS(string_to_hex); diff --git a/lib/libcrypto/x509/x509_verify.c b/lib/libcrypto/x509/x509_verify.c index ccdf256a1..ca4814d93 100644 --- a/lib/libcrypto/x509/x509_verify.c +++ b/lib/libcrypto/x509/x509_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_verify.c,v 1.65 2023/04/28 16:50:16 beck Exp $ */ +/* $OpenBSD: x509_verify.c,v 1.66 2023/05/07 07:11:50 tb Exp $ */ /* * Copyright (c) 2020-2021 Bob Beck * @@ -275,7 +275,6 @@ x509_verify_ctx_cert_is_root(struct x509_verify_ctx *ctx, X509 *cert, cert)) != NULL) { X509_free(match); return x509_verify_check_chain_end(cert, full_chain); - } } else { /* Check the provided roots */ diff --git a/lib/libcrypto/x509/x509_vfy.c b/lib/libcrypto/x509/x509_vfy.c index bb94d55da..2410d39b8 100644 --- a/lib/libcrypto/x509/x509_vfy.c +++ b/lib/libcrypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.120 2023/04/30 14:59:52 tb Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.122 2023/05/08 14:51:00 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -144,7 +144,7 @@ static int X509_cmp_time_internal(const ASN1_TIME *ctm, time_t *cmp_time, int clamp_notafter); static int internal_verify(X509_STORE_CTX *ctx); -static int get_issuer_sk(X509 **issuer, X509_STORE_CTX *ctx, X509 *x); +static int get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x); static int check_key_level(X509_STORE_CTX *ctx, X509 *cert); static int verify_cb_cert(X509_STORE_CTX *ctx, X509 *x, int depth, int err); @@ -592,7 +592,6 @@ X509_verify_cert_legacy(X509_STORE_CTX *ctx) int X509_verify_cert(X509_STORE_CTX *ctx) { - STACK_OF(X509) *roots = NULL; struct x509_verify_ctx *vctx = NULL; int chain_count = 0; @@ -656,8 +655,6 @@ X509_verify_cert(X509_STORE_CTX *ctx) } x509_verify_ctx_free(vctx); - sk_X509_pop_free(roots, X509_free); - /* if we succeed we have a chain in ctx->chain */ return (chain_count > 0 && ctx->chain != NULL); } @@ -697,12 +694,12 @@ check_issued(X509_STORE_CTX *ctx, X509 *subject, X509 *issuer) return X509_check_issued(issuer, subject) == X509_V_OK; } -/* Alternative lookup method: look from a STACK stored in other_ctx */ +/* Alternative lookup method: look from a STACK stored in ctx->trusted */ static int -get_issuer_sk(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) +get_trusted_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x) { - *issuer = find_issuer(ctx, ctx->other_ctx, x, 1); + *issuer = find_issuer(ctx, ctx->trusted, x, 1); if (*issuer) { CRYPTO_add(&(*issuer)->references, 1, CRYPTO_LOCK_X509); return 1; @@ -2437,17 +2434,17 @@ LCRYPTO_ALIAS(X509_STORE_CTX_init); */ void -X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk) +X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *trusted) { - ctx->other_ctx = sk; - ctx->get_issuer = get_issuer_sk; + X509_STORE_CTX_set0_trusted_stack(ctx, trusted); } LCRYPTO_ALIAS(X509_STORE_CTX_trusted_stack); void -X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk) +X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *trusted) { - X509_STORE_CTX_trusted_stack(ctx, sk); + ctx->trusted = trusted; + ctx->get_issuer = get_trusted_issuer; } LCRYPTO_ALIAS(X509_STORE_CTX_set0_trusted_stack); diff --git a/lib/libcrypto/x509/x509name.c b/lib/libcrypto/x509/x509name.c index 3c9e224c1..ecdf473ea 100644 --- a/lib/libcrypto/x509/x509name.c +++ b/lib/libcrypto/x509/x509name.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509name.c,v 1.32 2023/05/02 14:13:05 beck Exp $ */ +/* $OpenBSD: x509name.c,v 1.34 2023/05/03 08:10:23 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,7 +66,6 @@ #include #include -#include "bytestring.h" #include "x509_local.h" int @@ -85,37 +84,21 @@ int X509_NAME_get_text_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, char *buf, int len) { - unsigned char *text = NULL; + int i; ASN1_STRING *data; - int i, text_len; - int ret = -1; - CBS cbs; i = X509_NAME_get_index_by_OBJ(name, obj, -1); if (i < 0) - goto err; + return (-1); data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i)); - /* - * Fail if we cannot encode as UTF-8, or if the UTF-8 encoding of the - * string contains a 0 byte, because mortal callers seldom handle the - * length difference correctly - */ - if ((text_len = ASN1_STRING_to_UTF8(&text, data)) < 0) - goto err; - CBS_init(&cbs, text, text_len); - if (CBS_contains_zero_byte(&cbs)) - goto err; - /* We still support the "pass NULL to find out how much" API */ - if (buf != NULL) { - if (!CBS_write_bytes(&cbs, buf, len - 1, NULL)) - goto err; - /* It must be a C string */ - buf[text_len] = '\0'; + i = (data->length > (len - 1)) ? (len - 1) : data->length; + if (buf == NULL) + return (data->length); + if (i >= 0) { + memcpy(buf, data->data, i); + buf[i] = '\0'; } - ret = text_len; - err: - free(text); - return (ret); + return (i); } LCRYPTO_ALIAS(X509_NAME_get_text_by_OBJ); diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile index a6ee26a66..b5b4ff4d3 100644 --- a/lib/libssl/Makefile +++ b/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2022/11/11 11:25:18 beck Exp $ +# $OpenBSD: Makefile,v 1.79 2023/05/05 21:23:02 tb Exp $ .include .ifndef NOMAN @@ -13,7 +13,7 @@ LIB= ssl CFLAGS+= -Wall -Wundef .if ${COMPILER_VERSION:L} == "clang" -CFLAGS+= -Werror +CFLAGS+= -Werror -Wshadow .endif CFLAGS+= -DLIBRESSL_INTERNAL .ifdef NAMESPACE diff --git a/lib/libtls/Makefile b/lib/libtls/Makefile index 78ff99b58..8287fec8f 100644 --- a/lib/libtls/Makefile +++ b/lib/libtls/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2022/01/25 21:51:24 eric Exp $ +# $OpenBSD: Makefile,v 1.38 2023/05/05 21:23:02 tb Exp $ .include .ifndef NOMAN @@ -7,7 +7,7 @@ SUBDIR= man CFLAGS+= -Wall -Wimplicit -Wundef .if ${COMPILER_VERSION:L} == "clang" -CFLAGS+= -Werror +CFLAGS+= -Werror -Wshadow .endif CFLAGS+= -DLIBRESSL_INTERNAL diff --git a/lib/libtls/tls_verify.c b/lib/libtls/tls_verify.c index acbe163ff..0cb86f686 100644 --- a/lib/libtls/tls_verify.c +++ b/lib/libtls/tls_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_verify.c,v 1.20 2018/02/05 00:52:24 jsing Exp $ */ +/* $OpenBSD: tls_verify.c,v 1.23 2023/05/11 07:35:27 tb Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas * @@ -115,7 +115,7 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name, count = sk_GENERAL_NAME_num(altname_stack); for (i = 0; i < count; i++) { - GENERAL_NAME *altname; + GENERAL_NAME *altname; altname = sk_GENERAL_NAME_value(altname_stack, i); @@ -126,12 +126,12 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name, continue; if (type == GEN_DNS) { - unsigned char *data; - int format, len; + const unsigned char *data; + int format, len; format = ASN1_STRING_type(altname->d.dNSName); if (format == V_ASN1_IA5STRING) { - data = ASN1_STRING_data(altname->d.dNSName); + data = ASN1_STRING_get0_data(altname->d.dNSName); len = ASN1_STRING_length(altname->d.dNSName); if (len < 0 || (size_t)len != strlen(data)) { @@ -171,11 +171,11 @@ tls_check_subject_altname(struct tls *ctx, X509 *cert, const char *name, } } else if (type == GEN_IPADD) { - unsigned char *data; - int datalen; + const unsigned char *data; + int datalen; datalen = ASN1_STRING_length(altname->d.iPAddress); - data = ASN1_STRING_data(altname->d.iPAddress); + data = ASN1_STRING_get0_data(altname->d.iPAddress); if (datalen < 0) { tls_set_errorx(ctx, @@ -209,7 +209,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, char *common_name = NULL; union tls_addr addrbuf; int common_name_len; - int rv = 0; + int rv = -1; *cn_match = 0; @@ -223,8 +223,10 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, goto done; common_name = calloc(common_name_len + 1, 1); - if (common_name == NULL) - goto done; + if (common_name == NULL) { + tls_set_error(ctx, "out of memory"); + goto err; + } X509_NAME_get_text_by_NID(subject_name, NID_commonName, common_name, common_name_len + 1); @@ -235,8 +237,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, tls_set_errorx(ctx, "error verifying name '%s': " "NUL byte in Common Name field, " "probably a malicious certificate", name); - rv = -1; - goto done; + goto err; } /* @@ -254,6 +255,9 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name, *cn_match = 1; done: + rv = 0; + + err: free(common_name); return rv; } diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c index a0d38b1a7..8a27d03c8 100644 --- a/libexec/mail.local/mail.local.c +++ b/libexec/mail.local/mail.local.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mail.local.c,v 1.39 2020/02/09 14:59:20 millert Exp $ */ +/* $OpenBSD: mail.local.c,v 1.40 2023/05/10 08:03:49 op Exp $ */ /*- * Copyright (c) 1996-1998 Theo de Raadt @@ -243,7 +243,8 @@ retry: } curoff = lseek(mbfd, 0, SEEK_END); - (void)snprintf(biffmsg, sizeof biffmsg, "%s@%lld\n", name, curoff); + (void)snprintf(biffmsg, sizeof biffmsg, "%s@%lld\n", name, + (long long int)curoff); if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { mwarn("temporary file: %s", strerror(errno)); goto bad; diff --git a/libexec/tradcpp/config.h b/libexec/tradcpp/config.h index c42dcc5ac..e74e6cc21 100644 --- a/libexec/tradcpp/config.h +++ b/libexec/tradcpp/config.h @@ -58,6 +58,8 @@ #define CONFIG_OS_2 "__unix__" #elif defined(__OpenBSD__) #define CONFIG_OS "__OpenBSD__" +#elif defined(__SecBSD__) +#define CONFIG_OS "__SecBSD__" #define CONFIG_OS_2 "__unix__" #elif defined(__DragonFly__) #define CONFIG_OS "__DragonFly__" diff --git a/regress/lib/libc/malloc/Makefile b/regress/lib/libc/malloc/Makefile index 7eb84f6a6..546d67f6c 100644 --- a/regress/lib/libc/malloc/Makefile +++ b/regress/lib/libc/malloc/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2018/01/28 13:42:17 otto Exp $ +# $OpenBSD: Makefile,v 1.8 2023/05/08 11:13:30 otto Exp $ SUBDIR+= malloc_general malloc0test malloc_errno malloc_ulimit1 malloc_ulimit2 -SUBDIR+= malloc_threaderr +SUBDIR+= malloc_threaderr malloc_errs install: diff --git a/regress/lib/libc/malloc/malloc_errs/Makefile b/regress/lib/libc/malloc/malloc_errs/Makefile new file mode 100644 index 000000000..150f30e67 --- /dev/null +++ b/regress/lib/libc/malloc/malloc_errs/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 2023/05/08 11:12:44 otto Exp $ + +PROG= malloc_errs + +.include diff --git a/regress/lib/libc/malloc/malloc_errs/malloc_errs.c b/regress/lib/libc/malloc/malloc_errs/malloc_errs.c new file mode 100644 index 000000000..e0efb6ebf --- /dev/null +++ b/regress/lib/libc/malloc/malloc_errs/malloc_errs.c @@ -0,0 +1,286 @@ +/* $OpenBSD: malloc_errs.c,v 1.2 2023/05/09 19:07:37 otto Exp $ */ +/* + * Copyright (c) 2023 Otto Moerbeek + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include + +/* Test erroneous use of API and heap that malloc should catch */ + +void +clearq(void *p) +{ + int i; + void *q; + + /* Clear delayed free queue */ + for (i = 0; i < 400; i++) { + q = malloc(100); + free(q); + if (p == q) { + fprintf(stderr, "Re-use\n"); + abort(); + } + } +} + +/* test the test setup */ +void +t0(void) +{ + abort(); +} + +/* double free >= page size */ +void +t1(void) +{ + void *p = malloc(10000); + free(p); + free(p); +} + +/* double free chunks are different, have a delayed free list */ +void +t2(void) +{ + void *p, *q; + int i; + + p = malloc(100); + free(p); + clearq(p); + free(p); +} + +/* double free without clearing delayed free list, needs F */ +void +t3(void) +{ + void *p = malloc(100); + free(p); + free(p); +} + +/* free without prior allocation */ +void +t4(void) +{ + free((void*)1); +} + +/* realloc of bogus pointer */ +void +t5(void) +{ + realloc((void*)1, 10); +} + +/* write after free for chunk */ +void +t6(void) +{ + char *p = malloc(32); + free(p); + p[0] = ~p[0]; + clearq(NULL); +} + +/* write after free large alloction */ +void +t7(void) +{ + char *p, *q; + int i; + + p = malloc(10000); + free(p); + p[0] = ~p[0]; + /* force re-use from the cache */ + for (i = 0; i < 100; i++) { + q = malloc(10000); + free(q); + } +} + +/* write after free for chunk, no clearing of delayed free queue */ +void +t8(void) +{ + char *p, *q; + + p = malloc(32); + q = malloc(32); + free(p); + p[0] = ~p[0]; + free(q); +} + +/* canary check */ +void +t9(void) +{ + char *p; + + p = malloc(100); + p[100] = 0; + free(p); +} + +/* t10 is the same as t9 with different flags */ + +/* modified chunk pointer */ +void +t11(void) +{ + char *p = malloc(100); + free(p + 1); +} + +/* free chunk pointer */ +void +t12(void) +{ + char *p = malloc(16); + free(p + 16); +} + +/* freezero with wrong size */ +void +t13(void) +{ + char *p = malloc(16); + freezero(p, 17); +} + +/* freezero with wrong size 2 */ +void +t14(void) +{ + char *p = malloc(15); + freezero(p, 16); +} + +/* freezero with wrong size, pages */ +void +t15(void) +{ + char *p = malloc(getpagesize()); + freezero(p, getpagesize() + 1); +} + +/* recallocarray with wrong size */ +void +t16(void) +{ + abort(); /* not yet */ + char *p = recallocarray(NULL, 0, 16, 1); + char *q = recallocarray(p, 2, 3, 16); +} + +/* recallocarray with wrong size 2 */ +void +t17(void) +{ + char *p = recallocarray(NULL, 0, 15, 1); + char *q = recallocarray(p, 2, 3, 15); +} + +/* recallocarray with wrong size, pages */ +void +t18(void) +{ + abort(); /* not yet */ + char *p = recallocarray(NULL, 0, 1, getpagesize()); + char *q = recallocarray(p, 2, 3, getpagesize()); +} + +struct test { + void (*test)(void); + const char *flags; +}; + +struct test tests[] = { + { t0, "" }, + { t1, "" }, + { t2, "" }, + { t3, "F" }, + { t4, "" }, + { t5, "" }, + { t6, "J" }, + { t7, "JJ" }, + { t8, "FJ" }, + { t9, "C" }, + { t9, "JC" }, /* t10 re-uses code from t9 */ + { t11, "" }, + { t12, "" }, + { t13, "" }, + { t14, "C" }, + { t15, "" }, + { t16, "" }, + { t17, "C" }, + { t18, "" }, +}; + +int main(int argc, char *argv[]) +{ + + const struct rlimit lim = {0, 0}; + int i, status; + pid_t pid; + char num[10]; + char options[10]; + extern char* malloc_options; + + if (argc == 3) { + malloc_options = argv[2]; + /* prevent coredumps */ + setrlimit(RLIMIT_CORE, &lim); + i = atoi(argv[1]); + fprintf(stderr, "Test %d\n", i); + (*tests[i].test)(); + return 0; + } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + pid = fork(); + switch (pid) { + case 0: + snprintf(options, sizeof(options), "us%s", tests[i].flags); + snprintf(num, sizeof(num), "%d", i); + execl(argv[0], argv[0], num, options, NULL); + err(1, "exec"); + break; + case -1: + err(1, "fork"); + break; + default: + if (waitpid(pid, &status, 0) == -1) + err(1, "wait"); + if (!WIFSIGNALED(status) || + WTERMSIG(status) != SIGABRT) + errx(1, "Test %d did not abort", i); + break; + } + } + return 0; +} + diff --git a/regress/lib/libc/malloc/malloc_general/Makefile b/regress/lib/libc/malloc/malloc_general/Makefile index b06609f6f..367b33b9c 100644 --- a/regress/lib/libc/malloc/malloc_general/Makefile +++ b/regress/lib/libc/malloc/malloc_general/Makefile @@ -1,39 +1,43 @@ -# $OpenBSD: Makefile,v 1.6 2022/03/30 05:22:31 anton Exp $ +# $OpenBSD: Makefile,v 1.7 2023/05/09 19:07:37 otto Exp $ -REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 +REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 PROG= malloc_general .include t1: malloc_general - MALLOC_OPTIONS=cfgju ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=su ${.OBJDIR}/malloc_general t2: malloc_general - MALLOC_OPTIONS=cfgjuC ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suC ${.OBJDIR}/malloc_general t3: malloc_general - MALLOC_OPTIONS=cfgjuJ ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suJ ${.OBJDIR}/malloc_general t4: malloc_general - MALLOC_OPTIONS=cfgjuF ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suF ${.OBJDIR}/malloc_general t5: malloc_general - MALLOC_OPTIONS=cfgjuG ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suG ${.OBJDIR}/malloc_general t6: malloc_general - MALLOC_OPTIONS=cfgjuS ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suS ${.OBJDIR}/malloc_general t7: malloc_general - MALLOC_OPTIONS=cfgjuFGJ ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suFGJ ${.OBJDIR}/malloc_general t8: malloc_general - MALLOC_OPTIONS=cfgjuCJ ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suCJ ${.OBJDIR}/malloc_general t9: malloc_general - MALLOC_OPTIONS=cfgjuCJJ ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suCJJ ${.OBJDIR}/malloc_general t10: malloc_general - MALLOC_OPTIONS=cfgjuJS ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suJS ${.OBJDIR}/malloc_general t11: malloc_general - MALLOC_OPTIONS=cfgjuFGJJ ${.OBJDIR}/malloc_general + MALLOC_OPTIONS=suFGJJ ${.OBJDIR}/malloc_general + +t12: malloc_general + MALLOC_OPTIONS=suFCJJ ${.OBJDIR}/malloc_general + diff --git a/regress/lib/libcrypto/asn1/Makefile b/regress/lib/libcrypto/asn1/Makefile index e1a260634..0ecc85790 100644 --- a/regress/lib/libcrypto/asn1/Makefile +++ b/regress/lib/libcrypto/asn1/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2022/12/02 00:47:32 tb Exp $ +# $OpenBSD: Makefile,v 1.24 2023/05/12 08:28:05 tb Exp $ PROGS = \ asn1api \ @@ -6,6 +6,7 @@ PROGS = \ asn1complex \ asn1evp \ asn1object \ + asn1oct \ asn1string_copy \ asn1_string_to_utf8 \ asn1time \ diff --git a/regress/lib/libcrypto/asn1/asn1oct.c b/regress/lib/libcrypto/asn1/asn1oct.c new file mode 100644 index 000000000..fef312d73 --- /dev/null +++ b/regress/lib/libcrypto/asn1/asn1oct.c @@ -0,0 +1,278 @@ +/* $OpenBSD: asn1oct.c,v 1.3 2023/05/12 10:43:28 tb Exp $ */ + +/* + * Copyright (c) 2023 Theo Buehler + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#include +#include + +#define TESTBUFFER_SIZE 20 + +static const struct i2s_asn1_octet_string_test { + const char *desc; + const uint8_t buf[TESTBUFFER_SIZE]; + long len; + const char *want; +} i2s_test[] = { + { + .desc = "Empty buffer gives empty string", + .buf = { 0x00, }, + .len = 0, + .want = "", + }, + { + .desc = "all hex digits", + .buf = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, }, + .len = 8, + .want = "01:23:45:67:89:AB:CD:EF", + }, + { + .desc = "all hex digits, scrambled", + .buf = { 0x98, 0x24, 0xbf, 0x3a, 0xc7, 0xd6, 0x01, 0x5e, }, + .len = 8, + .want = "98:24:BF:3A:C7:D6:01:5E", + }, + { + .desc = "Embedded 0 byte", + .buf = { 0x7a, 0x00, 0xbb, }, + .len = 3, + .want = "7A:00:BB", + }, + { + .desc = "All zeroes", + .buf = { 0x00, 0x00, 0x00, 0x00, 0x00, }, + .len = 4, + .want = "00:00:00:00", + }, + { + .desc = "All bits set", + .buf = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }, + .len = 8, + .want = "FF:FF:FF:FF:FF:FF:FF:FF", + }, + { + .desc = "negative length", + .buf = { 0x00, }, + .len = -1, + }, +}; + +#define N_I2S_TESTS (sizeof(i2s_test) / sizeof(i2s_test[0])) + +static int +test_i2s_ASN1_OCTET_STRING(const struct i2s_asn1_octet_string_test *test) +{ + ASN1_OCTET_STRING *aos = NULL; + int should_fail = test->want == NULL; + char *got = NULL; + int failed = 0; + + if ((aos = ASN1_OCTET_STRING_new()) == NULL) + errx(1, "ASN1_OCTET_STRING_new"); + + if (!ASN1_STRING_set(aos, (void *)test->buf, test->len)) + errx(1, "ASN1_STRING_set"); + + if ((got = i2s_ASN1_OCTET_STRING(NULL, aos)) == NULL) { + if (!should_fail) + errx(1, "i2s_ASN1_OCTET_STRING"); + } + + if (!should_fail && strcmp(test->want, got) != 0) { + fprintf(stderr, "%s: \"%s\" failed: want \"%s\", got \"%s\"\n", + __func__, test->desc, test->want, got); + failed |= 1; + } + + ASN1_OCTET_STRING_free(aos); + free(got); + + return failed; +} + +static int +test_new_ASN1_OCTET_STRING(void) +{ + ASN1_OCTET_STRING *aos = NULL; + char *got; + int failed = 0; + + if ((aos = ASN1_OCTET_STRING_new()) == NULL) + errx(1, "%s: ASN1_OCTET_STRING_new", __func__); + if ((got = i2s_ASN1_OCTET_STRING(NULL, aos)) == NULL) + errx(1, "%s: i2s_ASN1_OCTET_STRING", __func__); + + if (strcmp("", got) != 0) { + fprintf(stderr, "%s failed: want \"\", got \"%s\"\n", + __func__, got); + failed |= 1; + } + + ASN1_OCTET_STRING_free(aos); + free(got); + + return failed; +} + +static int +run_i2s_ASN1_OCTET_STRING_tests(void) +{ + size_t i; + int failed = 0; + + failed |= test_new_ASN1_OCTET_STRING(); + + for (i = 0; i < N_I2S_TESTS; i++) + failed |= test_i2s_ASN1_OCTET_STRING(&i2s_test[i]); + + return failed; +} + +static const struct s2i_asn1_octet_string_test { + const char *desc; + const char *in; + const char *want; +} s2i_test[] = { + /* Tests that should succeed. */ + { + .desc = "empty string", + .in = "", + .want = "", + }, + { + .desc = "only colons", + .in = ":::::::", + .want = "", + }, + { + .desc = "a 0 octet", + .in = "00", + .want = "00", + }, + { + .desc = "a 0 octet with stupid colons", + .in = ":::00:::::", + .want = "00", + }, + { + .desc = "more stupid colons", + .in = ":::C0fF::Ee:::::", + .want = "C0:FF:EE", + }, + { + .desc = "all hex digits", + .in = "0123456789abcdef", + .want = "01:23:45:67:89:AB:CD:EF", + }, + + /* Tests that should fail. */ + { + .desc = "colons between hex digits", + .in = "A:F", + }, + { + .desc = "more colons between hex digits", + .in = "5:7", + }, + { + .desc = "one hex digit", + .in = "1", + }, + { + .desc = "three hex digits", + .in = "bad", + }, + { + .desc = "three hex digits, colon after first digit", + .in = "b:ad", + }, + { + .desc = "three hex digits, colon after second digit", + .in = "ba:d", + }, + { + .desc = "non-hex digit", + .in = "g00d", + }, + { + .desc = "non-hex digits", + .in = "d0gged", + }, + { + .desc = "trailing non-hex digit", + .in = "d00der", + }, +}; + +#define N_S2I_TESTS (sizeof(s2i_test) / sizeof(s2i_test[0])) + +static int +test_s2i_ASN1_OCTET_STRING(const struct s2i_asn1_octet_string_test *test) +{ + ASN1_OCTET_STRING *aos = NULL; + char *got = NULL; + int should_fail = test->want == NULL; + int failed = 0; + + if ((aos = s2i_ASN1_OCTET_STRING(NULL, NULL, test->in)) == NULL) { + if (!should_fail) + errx(1, "%s: s2i_ASN1_OCTET_STRING", test->desc); + goto done; + } + + if ((got = i2s_ASN1_OCTET_STRING(NULL, aos)) == NULL) + errx(1, "%s: i2s_ASN1_OCTET_STRING", test->desc); + + if (strcmp(test->want, got) != 0) { + fprintf(stderr, "%s: \"%s\" failed: want \"%s\", got \"%s\"\n", + __func__, test->desc, test->want, got); + failed |= 1; + } + + done: + ASN1_OCTET_STRING_free(aos); + free(got); + + return failed; +} + +static int +run_s2i_ASN1_OCTET_STRING_tests(void) +{ + size_t i; + int failed = 0; + + failed |= test_new_ASN1_OCTET_STRING(); + + for (i = 0; i < N_S2I_TESTS; i++) + failed |= test_s2i_ASN1_OCTET_STRING(&s2i_test[i]); + + return failed; +} + +int +main(void) +{ + int failed = 0; + + failed |= run_i2s_ASN1_OCTET_STRING_tests(); + failed |= run_s2i_ASN1_OCTET_STRING_tests(); + + return failed; +} diff --git a/regress/lib/libcrypto/bn/bn_mod_exp.c b/regress/lib/libcrypto/bn/bn_mod_exp.c index c20ad7244..14e188397 100644 --- a/regress/lib/libcrypto/bn/bn_mod_exp.c +++ b/regress/lib/libcrypto/bn/bn_mod_exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_mod_exp.c,v 1.37 2023/04/25 17:17:21 tb Exp $ */ +/* $OpenBSD: bn_mod_exp.c,v 1.38 2023/05/09 05:39:24 tb Exp $ */ /* * Copyright (c) 2022,2023 Theo Buehler @@ -86,19 +86,21 @@ bn_print(const char *name, const BIGNUM *bn) } static void -print_zero_test_failure(const BIGNUM *got, const BIGNUM *a, const char *name) +print_zero_test_failure(const BIGNUM *got, const BIGNUM *a, const BIGNUM *m, + const char *name) { fprintf(stderr, "%s() zero test failed:\n", name); bn_print("a", a); + bn_print("m", m); bn_print("got", got); } static int -bn_mod_exp_zero_test(const struct mod_exp_test *test, BN_CTX *ctx, int use_random) +bn_mod_exp_zero_test(const struct mod_exp_test *test, BN_CTX *ctx, + int neg_modulus, int random_base) { - const BIGNUM *one; - BIGNUM *a, *p, *got; + BIGNUM *a, *m, *p, *got; int mod_exp_ret; int failed = 1; @@ -106,24 +108,29 @@ bn_mod_exp_zero_test(const struct mod_exp_test *test, BN_CTX *ctx, int use_rando if ((a = BN_CTX_get(ctx)) == NULL) errx(1, "BN_CTX_get"); + if ((m = BN_CTX_get(ctx)) == NULL) + errx(1, "BN_CTX_get"); if ((p = BN_CTX_get(ctx)) == NULL) errx(1, "BN_CTX_get"); if ((got = BN_CTX_get(ctx)) == NULL) errx(1, "BN_CTX_get"); - one = BN_value_one(); + if (!BN_one(m)) + errx(1, "BN_one"); + if (neg_modulus) + BN_set_negative(m, 1); BN_zero(a); BN_zero(p); - if (use_random) { + if (random_base) { if (!BN_rand(a, 1024, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY)) errx(1, "BN_rand"); } if (test->mod_exp_fn != NULL) { - mod_exp_ret = test->mod_exp_fn(got, a, p, one, ctx); + mod_exp_ret = test->mod_exp_fn(got, a, p, m, ctx); } else { - mod_exp_ret = test->mod_exp_mont_fn(got, a, p, one, ctx, NULL); + mod_exp_ret = test->mod_exp_mont_fn(got, a, p, m, ctx, NULL); } if (!mod_exp_ret) { @@ -133,7 +140,7 @@ bn_mod_exp_zero_test(const struct mod_exp_test *test, BN_CTX *ctx, int use_rando } if (!BN_is_zero(got)) { - print_zero_test_failure(got, a, test->name); + print_zero_test_failure(got, a, m, test->name); goto err; } @@ -146,31 +153,35 @@ bn_mod_exp_zero_test(const struct mod_exp_test *test, BN_CTX *ctx, int use_rando } static int -bn_mod_exp_zero_word_test(BN_CTX *ctx) +bn_mod_exp_zero_word_test(BN_CTX *ctx, int neg_modulus) { const char *name = "BN_mod_exp_mont_word"; - const BIGNUM *one; - BIGNUM *p, *got; + BIGNUM *m, *p, *got; int failed = 1; BN_CTX_start(ctx); + if ((m = BN_CTX_get(ctx)) == NULL) + errx(1, "BN_CTX_get"); if ((p = BN_CTX_get(ctx)) == NULL) errx(1, "BN_CTX_get"); if ((got = BN_CTX_get(ctx)) == NULL) errx(1, "BN_CTX_get"); - one = BN_value_one(); + if (!BN_one(m)) + errx(1, "BN_one"); + if (neg_modulus) + BN_set_negative(m, neg_modulus); BN_zero(p); - if (!BN_mod_exp_mont_word(got, 1, p, one, ctx, NULL)) { + if (!BN_mod_exp_mont_word(got, 1, p, m, ctx, NULL)) { fprintf(stderr, "%s failed\n", name); ERR_print_errors_fp(stderr); goto err; } if (!BN_is_zero(got)) { - print_zero_test_failure(got, one, name); + print_zero_test_failure(got, p, m, name); goto err; } @@ -186,22 +197,24 @@ static int test_bn_mod_exp_zero(void) { BN_CTX *ctx; - size_t i; - int use_random; + size_t i, j; int failed = 0; if ((ctx = BN_CTX_new()) == NULL) errx(1, "BN_CTX_new"); - use_random = 1; - for (i = 0; i < N_MOD_EXP_FN; i++) - failed |= bn_mod_exp_zero_test(&mod_exp_fn[i], ctx, use_random); + for (i = 0; i < N_MOD_EXP_FN; i++) { + for (j = 0; j < 4; j++) { + int neg_modulus = (j >> 0) & 1; + int random_base = (j >> 1) & 1; - use_random = 0; - for (i = 0; i < N_MOD_EXP_FN; i++) - failed |= bn_mod_exp_zero_test(&mod_exp_fn[i], ctx, use_random); + failed |= bn_mod_exp_zero_test(&mod_exp_fn[i], ctx, + neg_modulus, random_base); + } + } - failed |= bn_mod_exp_zero_word_test(ctx); + failed |= bn_mod_exp_zero_word_test(ctx, 0); + failed |= bn_mod_exp_zero_word_test(ctx, 1); BN_CTX_free(ctx); diff --git a/regress/lib/libcrypto/ecdsa/ecdsatest.c b/regress/lib/libcrypto/ecdsa/ecdsatest.c index 64815812b..b0b9bd006 100644 --- a/regress/lib/libcrypto/ecdsa/ecdsatest.c +++ b/regress/lib/libcrypto/ecdsa/ecdsatest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecdsatest.c,v 1.14 2022/09/02 11:47:25 tb Exp $ */ +/* $OpenBSD: ecdsatest.c,v 1.17 2023/05/04 13:50:14 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -83,79 +83,8 @@ #endif #include -/* declaration of the test functions */ -int x9_62_test_internal(int nid, const char *r, const char *s); int test_builtin(void); -/* some tests from the X9.62 draft */ -int -x9_62_test_internal(int nid, const char *r_in, const char *s_in) -{ - EVP_MD_CTX *md_ctx = NULL; - const char message[] = "abc"; - unsigned char digest[20]; - unsigned int dgst_len = 0; - EC_KEY *key = NULL; - ECDSA_SIG *signature = NULL; - BIGNUM *r = NULL, *s = NULL; - int failed = 1; - - if ((md_ctx = EVP_MD_CTX_new()) == NULL) - goto err; - - if (!EVP_DigestInit(md_ctx, EVP_sha1())) - goto err; - if (!EVP_DigestUpdate(md_ctx, message, 3)) - goto err; - if (!EVP_DigestFinal(md_ctx, digest, &dgst_len)) - goto err; - - printf("testing %s: ", OBJ_nid2sn(nid)); - - if ((key = EC_KEY_new_by_curve_name(nid)) == NULL) - goto err; - if (!EC_KEY_generate_key(key)) - goto err; - - printf("."); - fflush(stdout); - - if ((signature = ECDSA_do_sign(digest, 20, key)) == NULL) - goto err; - - printf("."); - fflush(stdout); - - if (!BN_dec2bn(&r, r_in) || !BN_dec2bn(&s, s_in)) - goto err; - if (BN_cmp(ECDSA_SIG_get0_r(signature), r) || - BN_cmp(ECDSA_SIG_get0_s(signature), s)) - goto err; - - printf("."); - fflush(stdout); - - if (ECDSA_do_verify(digest, 20, signature, key) != 1) - goto err; - - printf("."); - fflush(stdout); - - printf(" ok\n"); - - failed = 0; - - err: - if (failed) - printf(" failed\n"); - EC_KEY_free(key); - ECDSA_SIG_free(signature); - BN_free(r); - BN_free(s); - EVP_MD_CTX_free(md_ctx); - return failed; -} - int test_builtin(void) { @@ -225,7 +154,8 @@ test_builtin(void) goto err; } - if ((wrong_eckey = EC_KEY_new()) == NULL) + /* Exercise ECParameters_dup() and let ASAN test for leaks. */ + if ((wrong_eckey = ECParameters_dup(eckey)) == NULL) goto err; group = EC_GROUP_new_by_curve_name(nid); if (group == NULL) diff --git a/regress/lib/libcrypto/symbols/symbols.awk b/regress/lib/libcrypto/symbols/symbols.awk index 9d7f5ceee..c5ae77070 100644 --- a/regress/lib/libcrypto/symbols/symbols.awk +++ b/regress/lib/libcrypto/symbols/symbols.awk @@ -1,4 +1,4 @@ -# $OpenBSD: symbols.awk,v 1.7 2022/09/21 15:24:45 tb Exp $ +# $OpenBSD: symbols.awk,v 1.8 2023/05/04 20:15:27 tb Exp $ # Copyright (c) 2018,2020 Theo Buehler # @@ -116,9 +116,7 @@ BEGIN { symbols[$0] = $0 # Undefine aliases, so we don't accidentally leave them in Symbols.list. - # The _cfb ciphers are aliased to _cfb64, so skip them. - if ($0 !~ "^EVP_.*cfb$") - printf("#ifdef %s\n#undef %s\n#endif\n", $0, $0) + printf("#ifdef %s\n#undef %s\n#endif\n", $0, $0) } END { diff --git a/regress/lib/libcrypto/x509/x509_asn1.c b/regress/lib/libcrypto/x509/x509_asn1.c index 1ce8ed3aa..d96a51880 100644 --- a/regress/lib/libcrypto/x509/x509_asn1.c +++ b/regress/lib/libcrypto/x509/x509_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_asn1.c,v 1.17 2023/05/02 14:13:05 beck Exp $ */ +/* $OpenBSD: x509_asn1.c,v 1.18 2023/05/03 08:10:23 beck Exp $ */ /* * Copyright (c) 2023 Job Snijders * @@ -512,88 +512,13 @@ test_x509_req_setters(void) return failed; } -static const struct testcase { - char *data; - int len; - int len_to_pass; - int encode_type; - int expected_result; - char *expected_string; -} testCases[] = { - /* should work */ - {"fozzie", 6, 80, MBSTRING_ASC, 6, "fozzie"}, - /* should work */ - {"fozzie", 6, -1, MBSTRING_ASC, 6, ""}, - /* should fail, truncation */ - {"muppet", 6, 5, MBSTRING_ASC, -1, ""}, - /* should fail, contains 0 byte */ - {"g\0nzo", 5, 80, MBSTRING_ASC, -1, ""}, - /* should fail, can't encode as utf-8 */ - {"\x30\x00", 2, 80, V_ASN1_SEQUENCE, -1, ""}, -}; - -#define NUM_TEST_CASES (sizeof(testCases) / sizeof(testCases[0])) - -static int -test_x509_name_get(void) -{ - int failed = 0; - size_t i; - - for (i = 0; i < NUM_TEST_CASES; i++) { - const struct testcase *test = testCases + i; - X509_NAME_ENTRY *entry = NULL; - X509_NAME *name = NULL; - char textbuf[80]; - int result; - - textbuf[0] = '\0'; - if ((name = X509_NAME_new()) == NULL) - err(1, "X509_NAME_new"); - if ((entry = X509_NAME_ENTRY_new()) == NULL) - err(1, "X509_NAME_ENTRY_new"); - if (!X509_NAME_ENTRY_set_object(entry, - OBJ_nid2obj(NID_commonName))) - err(1, "X509_NAME_ENTRY_set_object"); - if (!X509_NAME_ENTRY_set_data(entry, test->encode_type, - test->data, test->len)) - err(1, "X509_NAME_ENTRY_set_data"); - if (!X509_NAME_add_entry(name, entry, -1, 0)) - err(1, "X509_NAME_add_entry"); - if (test->len_to_pass == -1) - result = X509_NAME_get_text_by_NID(name, NID_commonName, - NULL, 0); - else - result = X509_NAME_get_text_by_NID(name, NID_commonName, - textbuf, test->len_to_pass); - if (result != test->expected_result) { - fprintf(stderr, - "Test %zu X509_GET_text_by_NID returned %d," - "expected %d\n", i, result, test->expected_result); - failed++; - } - if (result != -1 && - strcmp(test->expected_string, textbuf) != 0) { - fprintf(stderr, - "Test %zu, X509_GET_text_by_NID returned bytes do" - "not match \n", i); - failed++; - } - X509_NAME_ENTRY_free(entry); - X509_NAME_free(name); - } - return failed; -} - -int -main(void) +int main(void) { int failed = 0; failed |= test_x509_setters(); /* failed |= */ test_x509_crl_setters(); /* failed |= */ test_x509_req_setters(); - failed |= test_x509_name_get(); OPENSSL_cleanup(); diff --git a/regress/sys/arch/amd64/dump_tables/dump_tables.c b/regress/sys/arch/amd64/dump_tables/dump_tables.c index 634e72c9e..6266be6d4 100644 --- a/regress/sys/arch/amd64/dump_tables/dump_tables.c +++ b/regress/sys/arch/amd64/dump_tables/dump_tables.c @@ -1,6 +1,6 @@ -/* $OpenBSD: dump_tables.c,v 1.7 2021/12/13 16:56:49 deraadt Exp $ */ +/* $OpenBSD: dump_tables.c,v 1.8 2023/05/11 22:28:38 guenther Exp $ */ /* - * Copyright (c) 2019 Philip Guenther + * Copyright (c) 2019,2023 Philip Guenther * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -35,6 +35,9 @@ #define PG_1GFRAME 0x000fffffc0000000UL /* should be in pmap.h */ +#define PG_PK_SHIFT 59 + + #include #include #include @@ -141,14 +144,17 @@ l4type(int i) return T_NORMAL; } +const char pk_name[16] = "R-23456789abcdef"; void pflags(pd_entry_t e, pd_entry_t inherited) { + int pk = (e & PG_PKMASK) >> PG_PK_SHIFT; if (reproducible) e &= ~(PG_M|PG_U); inherited &= e; - printf("[%c%c%c%c""%c%c%c%c][%c%c%c]", + printf("[%c%c%c%c%c""%c%c%c%c][%c%c%c%c]", e & PG_NX ? 'X' : '-', /* reversed */ + pk_name[pk], e & PG_G ? 'G' : '-', e & PG_M ? 'M' : '-', e & PG_U ? 'U' : '-', @@ -156,9 +162,10 @@ pflags(pd_entry_t e, pd_entry_t inherited) e & PG_WT ? 'w' : '-', e & PG_u ? 'u' : '-', e & PG_RW ? 'W' : '-', - inherited & PG_NX ? 'X' : '-', /* reversed */ inherited & PG_u ? 'u' : '-', - inherited & PG_RW ? 'W' : '-'); + pk_name[pk], + inherited & PG_RW ? 'W' : '-', + inherited & PG_NX ? 'X' : '-'); /* reversed */ } const char * const prefix[] = { @@ -307,7 +314,7 @@ main(int argc, char **argv) check_mbz(cr3, mbz_normal[5]); } printf("\ -VA lvl idx PA sz entry-attr eff L4-slot\ +VA lvl idx PA sz entry-attr eff L4-slot\ \n"); for (i = 0; i < PAGE_SIZE / sizeof(pd_entry_t); i++) { enum l4_type l4_type = l4type(i); diff --git a/regress/usr.bin/ssh/forcecommand.sh b/regress/usr.bin/ssh/forcecommand.sh index e059f1fdb..e756600a6 100644 --- a/regress/usr.bin/ssh/forcecommand.sh +++ b/regress/usr.bin/ssh/forcecommand.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forcecommand.sh,v 1.4 2017/04/30 23:34:55 djm Exp $ +# $OpenBSD: forcecommand.sh,v 1.5 2023/05/12 06:36:27 djm Exp $ # Placed in the Public Domain. tid="forced command" @@ -12,7 +12,7 @@ for t in ${SSH_KEYTYPES}; do done trace "forced command in key option" -${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key" +${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key option" cp /dev/null $OBJ/authorized_keys_$USER for t in ${SSH_KEYTYPES}; do @@ -24,7 +24,7 @@ cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy echo "ForceCommand true" >> $OBJ/sshd_proxy trace "forced command in sshd_config overrides key option" -${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key" +${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command config" cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy echo "ForceCommand false" >> $OBJ/sshd_proxy @@ -32,4 +32,4 @@ echo "Match User $USER" >> $OBJ/sshd_proxy echo " ForceCommand true" >> $OBJ/sshd_proxy trace "forced command with match" -${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key" +${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command match" diff --git a/regress/usr.bin/ssh/sftp-chroot.sh b/regress/usr.bin/ssh/sftp-chroot.sh index f9a7743ea..5dc360f57 100644 --- a/regress/usr.bin/ssh/sftp-chroot.sh +++ b/regress/usr.bin/ssh/sftp-chroot.sh @@ -1,4 +1,4 @@ -# $OpenBSD: sftp-chroot.sh,v 1.8 2021/09/01 00:50:27 dtucker Exp $ +# $OpenBSD: sftp-chroot.sh,v 1.9 2023/05/12 06:37:42 djm Exp $ # Placed in the Public Domain. tid="sftp in chroot" @@ -15,10 +15,29 @@ fi $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \ fatal "create $PRIVDATA failed" -start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /" +echo "ForceCommand internal-sftp -d /" >> $OBJ/sshd_config + +start_sshd -oChrootDirectory=$CHROOT verbose "test $tid: get" ${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ >>$TEST_REGRESS_LOGFILE 2>&1 || \ fatal "Fetch ${FILENAME} failed" cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" + +stop_sshd + +verbose "test $tid: match" +cat << EOF >> $OBJ/sshd_config +Match All + ChrootDirectory $CHROOT +EOF +start_sshd +$SUDO sh -c "echo orpheanbeholder > $PRIVDATA" || \ + fatal "create $PRIVDATA failed" +${SFTP} -S "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY \ + >>$TEST_REGRESS_LOGFILE 2>&1 || \ + fatal "Fetch ${FILENAME} failed" +cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" + +stop_sshd diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index b43b3caa3..7d7e4396b 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.247 2023/01/04 21:08:08 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.248 2023/05/06 15:07:02 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -1038,19 +1038,19 @@ checklabel(struct disklabel *lp) char part; if (lp->d_secsize == 0) { - warnx("sector size %d", lp->d_secsize); + warnx("sector size 0"); return (1); } if (lp->d_nsectors == 0) { - warnx("sectors/track %d", lp->d_nsectors); + warnx("sectors/track 0"); return (1); } if (lp->d_ntracks == 0) { - warnx("tracks/cylinder %d", lp->d_ntracks); + warnx("tracks/cylinder 0"); return (1); } if (lp->d_ncylinders == 0) { - warnx("cylinders/unit %d", lp->d_ncylinders); + warnx("cylinders/unit 0"); errors++; } if (lp->d_secpercyl == 0) diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 02a632d3f..52fe8b470 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fdisk.8,v 1.117 2022/07/18 15:06:22 krw Exp $ +.\" $OpenBSD: fdisk.8,v 1.118 2023/05/07 13:03:03 krw Exp $ .\" .\" .\" Copyright (c) 1997 Tobias Weingartner @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 18 2022 $ +.Dd $Mdocdate: May 7 2023 $ .Dt FDISK 8 .Os .Sh NAME @@ -51,9 +51,11 @@ to put all available space not taken by into a single .Ox partition. -The available space is first maximized by deleting all existing partition -entries except those for APFS ISC, APFS, APFS Recovery, BIOS Boot, -HiFive FSBL and HiFive BBL partitions. +The available space is maximized by deleting all existing partition +entries except for partition types APFS ISC, APFS, APFS Recovery, BIOS Boot, +HiFive FSBL, HiFive BBL and partitions with the +.Sq Required +GPT attribute set. .Pp If APFS ISC, APFS, or APFS Recovery diff --git a/sbin/fdisk/gpt.c b/sbin/fdisk/gpt.c index b0fc72fa0..e1f9aef26 100644 --- a/sbin/fdisk/gpt.c +++ b/sbin/fdisk/gpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpt.c,v 1.89 2023/04/07 16:34:41 krw Exp $ */ +/* $OpenBSD: gpt.c,v 1.90 2023/05/10 12:59:47 krw Exp $ */ /* * Copyright (c) 2015 Markus Muller * Copyright (c) 2015 Kenneth R Westerback @@ -436,9 +436,7 @@ GPT_print_parthdr(const int verbosity) void GPT_print_part(const unsigned int pn, const char *units, const int verbosity) { - const uint8_t gpt_uuid_msdos[] = GPT_UUID_MSDOS; const struct unit_type *ut; - struct uuid uuid; char *guidstr = NULL; double size; uint64_t attrs, end, start; @@ -468,17 +466,14 @@ GPT_print_part(const unsigned int pn, const char *units, const int verbosity) printf("Ignore "); if (attrs & GPTPARTATTR_BOOTABLE) printf("Bootable "); - uuid_dec_be(gpt_uuid_msdos, &uuid); - if (uuid_compare(&uuid, &gp[pn].gp_type, NULL) == 0) { - if (attrs & GPTPARTATTR_MS_READONLY) - printf("ReadOnly " ); - if (attrs & GPTPARTATTR_MS_SHADOW) - printf("Shadow "); - if (attrs & GPTPARTATTR_MS_HIDDEN) - printf("Hidden "); - if (attrs & GPTPARTATTR_MS_NOAUTOMOUNT) - printf("NoAutoMount "); - } + if (attrs & GPTPARTATTR_MS_READONLY) + printf("MSReadOnly " ); + if (attrs & GPTPARTATTR_MS_SHADOW) + printf("MSShadow "); + if (attrs & GPTPARTATTR_MS_HIDDEN) + printf("MSHidden "); + if (attrs & GPTPARTATTR_MS_NOAUTOMOUNT) + printf("MSNoAutoMount "); printf("\n"); } } diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index cab9e08a6..bb9929aa8 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.160 2023/04/12 13:11:37 krw Exp $ */ +/* $OpenBSD: part.c,v 1.161 2023/05/10 13:45:49 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -386,7 +386,7 @@ const struct gpt_type gpt_types[] = { { 0, NULL, /* EFI Sys */ EFI_SYSTEM_PARTITION_GUID }, { 0, NULL, /* Win Recovery*/ WIN_RECOVERY_GUID }, { 0, NULL, /* Linux VM */ LINUX_LVM_GUID }, - { 0, NULL, /* MS basic data */ MICROSOFT_BASIC_DATA_GUID }, + { 0, "Microsoft basic data", MICROSOFT_BASIC_DATA_GUID }, { 0, NULL, /* ChromeKernel */ CHROME_KERNEL_GUID }, #if 0 /* Sorted as in https://en.wikipedia.org/wiki/GUID_Partition_Table */ diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 6ce4d5a0f..0785b90f9 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.462 2023/03/08 04:43:06 guenther Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.463 2023/05/12 18:24:13 jan Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -1070,14 +1070,14 @@ printgroup(char *groupname, int ifaliases) errno == ENOENT) return (-1); else - err(1, "SIOCGIFGMEMB"); + err(1, "%s: SIOCGIFGMEMB", ifgr.ifgr_name); } len = ifgr.ifgr_len; if ((ifgr.ifgr_groups = calloc(1, len)) == NULL) err(1, "printgroup"); if (ioctl(sock, SIOCGIFGMEMB, (caddr_t)&ifgr) == -1) - err(1, "SIOCGIFGMEMB"); + err(1, "%s: SIOCGIFGMEMB", ifgr.ifgr_name); for (ifg = ifgr.ifgr_groups; ifg && len >= sizeof(struct ifg_req); ifg++) { @@ -1099,7 +1099,7 @@ printgroupattribs(char *groupname) bzero(&ifgr, sizeof(ifgr)); strlcpy(ifgr.ifgr_name, groupname, sizeof(ifgr.ifgr_name)); if (ioctl(sock, SIOCGIFGATTR, (caddr_t)&ifgr) == -1) - err(1, "SIOCGIFGATTR"); + err(1, "%s: SIOCGIFGATTR", ifgr.ifgr_name); printf("%s:", groupname); printf(" carp demote count %d", ifgr.ifgr_attrib.ifg_carp_demoted); @@ -1122,7 +1122,8 @@ setgroupattribs(char *groupname, int argc, char *argv[]) if (argc > 1) { neg = strtonum(argv[1], 0, 128, &errstr); if (errstr) - errx(1, "invalid carp demotion: %s", errstr); + errx(1, "%s: invalid carp demotion: %s", ifgr.ifgr_name, + errstr); } if (p[0] == '-') { @@ -1135,7 +1136,7 @@ setgroupattribs(char *groupname, int argc, char *argv[]) usage(); if (ioctl(sock, SIOCSIFGATTR, (caddr_t)&ifgr) == -1) - err(1, "SIOCSIFGATTR"); + err(1, "%s: SIOCSIFGATTR", ifgr.ifgr_name); } void @@ -1249,7 +1250,7 @@ clone_create(const char *addr, int param) (void) strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sock, SIOCIFCREATE, &ifr) == -1) - err(1, "SIOCIFCREATE"); + err(1, "%s: SIOCIFCREATE", ifr.ifr_name); } void @@ -1258,7 +1259,7 @@ clone_destroy(const char *addr, int param) (void) strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(sock, SIOCIFDESTROY, &ifr) == -1) - err(1, "SIOCIFDESTROY"); + err(1, "%s: SIOCIFDESTROY", ifr.ifr_name); } struct if_clonereq * @@ -1422,7 +1423,7 @@ setifflags(const char *vname, int value) bcopy((char *)&ifr, (char *)&my_ifr, sizeof(struct ifreq)); if (ioctl(sock, SIOCGIFFLAGS, (caddr_t)&my_ifr) == -1) - err(1, "SIOCGIFFLAGS"); + err(1, "%s: SIOCGIFFLAGS", my_ifr.ifr_name); (void) strlcpy(my_ifr.ifr_name, ifname, sizeof(my_ifr.ifr_name)); flags = my_ifr.ifr_flags; @@ -1433,7 +1434,7 @@ setifflags(const char *vname, int value) flags |= value; my_ifr.ifr_flags = flags; if (ioctl(sock, SIOCSIFFLAGS, (caddr_t)&my_ifr) == -1) - err(1, "SIOCSIFFLAGS"); + err(1, "%s: SIOCSIFFLAGS", my_ifr.ifr_name); } void @@ -1444,7 +1445,7 @@ setifxflags(const char *vname, int value) bcopy((char *)&ifr, (char *)&my_ifr, sizeof(struct ifreq)); if (ioctl(sock, SIOCGIFXFLAGS, (caddr_t)&my_ifr) == -1) - warn("SIOCGIFXFLAGS"); + warn("%s: SIOCGIFXFLAGS", my_ifr.ifr_name); (void) strlcpy(my_ifr.ifr_name, ifname, sizeof(my_ifr.ifr_name)); xflags = my_ifr.ifr_flags; @@ -1455,7 +1456,7 @@ setifxflags(const char *vname, int value) xflags |= value; my_ifr.ifr_flags = xflags; if (ioctl(sock, SIOCSIFXFLAGS, (caddr_t)&my_ifr) == -1) - warn("SIOCSIFXFLAGS"); + warn("%s: SIOCSIFXFLAGS", my_ifr.ifr_name); } void @@ -1466,7 +1467,7 @@ addaf(const char *vname, int value) strlcpy(ifar.ifar_name, ifname, sizeof(ifar.ifar_name)); ifar.ifar_af = value; if (ioctl(sock, SIOCIFAFATTACH, (caddr_t)&ifar) == -1) - warn("SIOCIFAFATTACH"); + warn("%s: SIOCIFAFATTACH", ifar.ifar_name); } void @@ -1477,7 +1478,7 @@ removeaf(const char *vname, int value) strlcpy(ifar.ifar_name, ifname, sizeof(ifar.ifar_name)); ifar.ifar_af = value; if (ioctl(sock, SIOCIFAFDETACH, (caddr_t)&ifar) == -1) - warn("SIOCIFAFDETACH"); + warn("%s: SIOCIFAFDETACH", ifar.ifar_name); } void @@ -1659,7 +1660,7 @@ setifgroup(const char *group_name, int dummy) strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ); if (ioctl(sock, SIOCAIFGROUP, (caddr_t)&ifgr) == -1) { if (errno != EEXIST) - err(1," SIOCAIFGROUP"); + err(1,"%s: SIOCAIFGROUP", group_name); } } @@ -1674,7 +1675,7 @@ unsetifgroup(const char *group_name, int dummy) if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ) errx(1, "unsetifgroup: group name too long"); if (ioctl(sock, SIOCDIFGROUP, (caddr_t)&ifgr) == -1) - err(1, "SIOCDIFGROUP"); + err(1, "%s: SIOCDIFGROUP", group_name); } const char * @@ -1820,7 +1821,7 @@ process_join_commands(void) ifr.ifr_data = (caddr_t)&join; if (ioctl(sock, SIOCS80211JOIN, (caddr_t)&ifr) == -1) - err(1, "SIOCS80211JOIN"); + err(1, "%s: SIOCS80211JOIN", ifr.ifr_name); } void @@ -1867,7 +1868,7 @@ delifjoin(const char *val, int d) if (d == -1) { ifr.ifr_data = (caddr_t)&join; if (ioctl(sock, SIOCS80211JOIN, (caddr_t)&ifr) == -1) - err(1, "SIOCS80211JOIN"); + err(1, "%s: SIOCS80211JOIN", ifr.ifr_name); } len = sizeof(join.i_nwid); @@ -1879,7 +1880,7 @@ delifjoin(const char *val, int d) (void)strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); ifr.ifr_data = (caddr_t)&join; if (ioctl(sock, SIOCS80211JOIN, (caddr_t)&ifr) == -1) - err(1, "SIOCS80211JOIN"); + err(1, "%s: SIOCS80211JOIN", ifr.ifr_name); } void @@ -1892,7 +1893,7 @@ delifjoinlist(const char *val, int d) ifr.ifr_data = (caddr_t)&join; if (ioctl(sock, SIOCS80211JOIN, (caddr_t)&ifr) == -1) - err(1, "SIOCS80211JOIN"); + err(1, "%s: SIOCS80211JOIN", ifr.ifr_name); } void @@ -1916,7 +1917,7 @@ setifbssid(const char *val, int d) } strlcpy(bssid.i_name, ifname, sizeof(bssid.i_name)); if (ioctl(sock, SIOCS80211BSSID, &bssid) == -1) - warn("SIOCS80211BSSID"); + warn("%s: SIOCS80211BSSID", bssid.i_name); } void @@ -2015,7 +2016,7 @@ setifnwkey(const char *val, int d) } if (ioctl(sock, SIOCS80211NWKEY, (caddr_t)&nwkey) == -1) - err(1, "SIOCS80211NWKEY"); + err(1, "%s: SIOCS80211NWKEY", nwkey.i_name); } void @@ -2035,7 +2036,7 @@ setifwpa(const char *val, int d) } if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", wpa.i_name); } void @@ -2068,14 +2069,14 @@ setifwpaprotos(const char *val, int d) memset(&wpa, 0, sizeof(wpa)); (void)strlcpy(wpa.i_name, ifname, sizeof(wpa.i_name)); if (ioctl(sock, SIOCG80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCG80211WPAPARMS"); + err(1, "%s: SIOCG80211WPAPARMS", wpa.i_name); wpa.i_protos = rval; /* Let the kernel set up the appropriate default ciphers. */ wpa.i_ciphers = 0; wpa.i_groupcipher = 0; if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", wpa.i_name); } void @@ -2110,13 +2111,13 @@ setifwpaakms(const char *val, int d) memset(&wpa, 0, sizeof(wpa)); (void)strlcpy(wpa.i_name, ifname, sizeof(wpa.i_name)); if (ioctl(sock, SIOCG80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCG80211WPAPARMS"); + err(1, "%s: SIOCG80211WPAPARMS", wpa.i_name); wpa.i_akms = rval; /* Enable WPA for 802.1x here. PSK case is handled in setifwpakey(). */ wpa.i_enabled = ((rval & IEEE80211_WPA_AKM_8021X) != 0); if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", wpa.i_name); } static const struct { @@ -2170,11 +2171,11 @@ setifwpaciphers(const char *val, int d) memset(&wpa, 0, sizeof(wpa)); (void)strlcpy(wpa.i_name, ifname, sizeof(wpa.i_name)); if (ioctl(sock, SIOCG80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCG80211WPAPARMS"); + err(1, "%s: SIOCG80211WPAPARMS", wpa.i_name); wpa.i_ciphers = rval; if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", wpa.i_name); } void @@ -2190,7 +2191,7 @@ setifwpagroupcipher(const char *val, int d) memset(&wpa, 0, sizeof(wpa)); (void)strlcpy(wpa.i_name, ifname, sizeof(wpa.i_name)); if (ioctl(sock, SIOCG80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCG80211WPAPARMS"); + err(1, "%s: SIOCG80211WPAPARMS", wpa.i_name); wpa.i_groupcipher = cipher; if (actions & A_JOIN) { @@ -2200,7 +2201,7 @@ setifwpagroupcipher(const char *val, int d) } if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", wpa.i_name); } void @@ -2228,7 +2229,7 @@ setifwpakey(const char *val, int d) warnx("no nwid or join command, guessing nwid to use"); if (ioctl(sock, SIOCG80211NWID, (caddr_t)&ifr) == -1) - err(1, "SIOCG80211NWID"); + err(1, "%s: SIOCG80211NWID", ifr.ifr_name); } passlen = strlen(val); @@ -2265,16 +2266,16 @@ setifwpakey(const char *val, int d) } if (ioctl(sock, SIOCS80211WPAPSK, (caddr_t)&psk) == -1) - err(1, "SIOCS80211WPAPSK"); + err(1, "%s: SIOCS80211WPAPSK", psk.i_name); /* And ... automatically enable or disable WPA */ memset(&wpa, 0, sizeof(wpa)); (void)strlcpy(wpa.i_name, ifname, sizeof(wpa.i_name)); if (ioctl(sock, SIOCG80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCG80211WPAPARMS"); + err(1, "%s: SIOCG80211WPAPARMS", psk.i_name); wpa.i_enabled = psk.i_enabled; if (ioctl(sock, SIOCS80211WPAPARMS, (caddr_t)&wpa) == -1) - err(1, "SIOCS80211WPAPARMS"); + err(1, "%s: SIOCS80211WPAPARMS", psk.i_name); } void @@ -2303,7 +2304,7 @@ setifchan(const char *val, int d) strlcpy(channel.i_name, ifname, sizeof(channel.i_name)); channel.i_channel = (u_int16_t)chan; if (ioctl(sock, SIOCS80211CHANNEL, (caddr_t)&channel) == -1) - warn("SIOCS80211CHANNEL"); + warn("%s: SIOCS80211CHANNEL", channel.i_name); } void @@ -2332,7 +2333,7 @@ setifnwflag(const char *val, int d) errx(1, "Invalid nwflag: %s", val); if (ioctl(sock, SIOCG80211FLAGS, (caddr_t)&ifr) != 0) - err(1, "SIOCG80211FLAGS"); + err(1, "%s: SIOCG80211FLAGS", ifr.ifr_name); if (d) ifr.ifr_flags &= ~flag; @@ -2340,7 +2341,7 @@ setifnwflag(const char *val, int d) ifr.ifr_flags |= flag; if (ioctl(sock, SIOCS80211FLAGS, (caddr_t)&ifr) != 0) - err(1, "SIOCS80211FLAGS"); + err(1, "%s: SIOCS80211FLAGS", ifr.ifr_name); } void @@ -2357,7 +2358,7 @@ setifpowersave(const char *val, int d) (void)strlcpy(power.i_name, ifname, sizeof(power.i_name)); if (ioctl(sock, SIOCG80211POWER, (caddr_t)&power) == -1) { - warn("SIOCG80211POWER"); + warn("%s: SIOCG80211POWER", power.i_name); return; } @@ -2369,7 +2370,7 @@ setifpowersave(const char *val, int d) power.i_enabled = d == -1 ? 0 : 1; if (ioctl(sock, SIOCS80211POWER, (caddr_t)&power) == -1) - warn("SIOCS80211POWER"); + warn("%s: SIOCS80211POWER", power.i_name); } #endif @@ -2590,7 +2591,7 @@ join_status(void) ojsz = jsz; continue; } else if (errno != ENOENT) - warn("SIOCG80211JOINALL"); + warn("%s: SIOCG80211JOINALL", ja.ja_ifname); return; } break; @@ -2662,7 +2663,7 @@ ieee80211_listchans(void) strlcpy(ca.i_name, ifname, sizeof(ca.i_name)); if (ioctl(sock, SIOCG80211ALLCHANS, &ca) != 0) { - warn("SIOCG80211ALLCHANS"); + warn("%s: SIOCG80211ALLCHANS", ca.i_name); return; } printf("\t\t%4s %-8s %s\n", "chan", "freq", "properties"); @@ -2718,7 +2719,7 @@ ieee80211_listnodes(void) strlcpy(na.na_ifname, ifname, sizeof(na.na_ifname)); if (ioctl(sock, SIOCG80211ALLNODES, &na) != 0) { - warn("SIOCG80211ALLNODES"); + warn("%s: SIOCG80211ALLNODES", na.na_ifname); return; } @@ -2837,7 +2838,7 @@ init_current_media(void) * that there are more, so we can ignore it. */ if (errno != E2BIG) - err(1, "SIOCGIFMEDIA"); + err(1, "%s: SIOCGIFMEDIA", ifmr.ifm_name); } media_current = ifmr.ifm_current; @@ -2868,7 +2869,7 @@ process_media_commands(void) ifr.ifr_media = media_current; if (ioctl(sock, SIOCSIFMEDIA, (caddr_t)&ifr) == -1) - err(1, "SIOCSIFMEDIA"); + err(1, "%s: SIOCSIFMEDIA", ifr.ifr_name); } void @@ -3397,7 +3398,7 @@ status(int link, struct sockaddr_dl *sdl, int ls, int ifaliases) ifmr.ifm_ulist = media_list; if (ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmr) == -1) - err(1, "SIOCGIFMEDIA"); + err(1, "%s: SIOCGIFMEDIA", ifmr.ifm_name); printf("\tmedia: "); print_media_word(ifmr.ifm_current, 1, 0); @@ -4207,7 +4208,7 @@ setifparent(const char *id, int param) errx(1, "parent: parent too long"); if (ioctl(sock, SIOCSIFPARENT, (caddr_t)&ifp) == -1) - warn("SIOCSIFPARENT"); + warn("%s: %s: SIOCSIFPARENT", ifp.ifp_name, ifp.ifp_parent); } void @@ -4408,7 +4409,7 @@ settrunkport(const char *val, int d) strlcpy(rp.rp_portname, val, sizeof(rp.rp_portname)); if (ioctl(sock, SIOCSTRUNKPORT, &rp) == -1) - err(1, "SIOCSTRUNKPORT"); + err(1, "%s %s: SIOCSTRUNKPORT", rp.rp_ifname, rp.rp_portname); } void @@ -4421,7 +4422,8 @@ unsettrunkport(const char *val, int d) strlcpy(rp.rp_portname, val, sizeof(rp.rp_portname)); if (ioctl(sock, SIOCSTRUNKDELPORT, &rp) == -1) - err(1, "SIOCSTRUNKDELPORT"); + err(1, "%s: %s: SIOCSTRUNKDELPORT", rp.rp_ifname, + rp.rp_portname); } void @@ -4445,7 +4447,7 @@ settrunkproto(const char *val, int d) strlcpy(ra.ra_ifname, ifname, sizeof(ra.ra_ifname)); if (ioctl(sock, SIOCSTRUNK, &ra) != 0) - err(1, "SIOCSTRUNK"); + err(1, "%s: SIOCSTRUNK", ra.ra_ifname); } void @@ -4458,7 +4460,7 @@ settrunklacpmode(const char *val, int d) strlcpy(ra.ra_ifname, ifname, sizeof(ra.ra_ifname)); if (ioctl(sock, SIOCGTRUNK, &ra) != 0) - err(1, "SIOCGTRUNK"); + err(1, "%s: SIOCGTRUNK", ra.ra_ifname); if (ra.ra_proto != TRUNK_PROTO_LACP) errx(1, "Invalid option for trunk: %s", ifname); @@ -4478,7 +4480,7 @@ settrunklacpmode(const char *val, int d) tops.to_lacpopts.lacp_mode = 0; if (ioctl(sock, SIOCSTRUNKOPTS, &tops) != 0) - err(1, "SIOCSTRUNKOPTS"); + err(1, "%s: SIOCSTRUNKOPTS", tops.to_ifname); } void @@ -4491,7 +4493,7 @@ settrunklacptimeout(const char *val, int d) strlcpy(ra.ra_ifname, ifname, sizeof(ra.ra_ifname)); if (ioctl(sock, SIOCGTRUNK, &ra) != 0) - err(1, "SIOCGTRUNK"); + err(1, "%s SIOCGTRUNK", ra.ra_ifname); if (ra.ra_proto != TRUNK_PROTO_LACP) errx(1, "Invalid option for trunk: %s", ifname); @@ -4511,7 +4513,7 @@ settrunklacptimeout(const char *val, int d) tops.to_lacpopts.lacp_timeout = 0; if (ioctl(sock, SIOCSTRUNKOPTS, &tops) != 0) - err(1, "SIOCSTRUNKOPTS"); + err(1, "%s: SIOCSTRUNKOPTS", tops.to_ifname); } void @@ -4682,13 +4684,13 @@ setcarp_passwd(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); bzero(carpr.carpr_key, CARP_KEY_LEN); strlcpy((char *)carpr.carpr_key, val, CARP_KEY_LEN); if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4706,13 +4708,13 @@ setcarp_vhid(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); carpr.carpr_vhids[0] = vhid; carpr.carpr_vhids[1] = 0; if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4730,12 +4732,12 @@ setcarp_advskew(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); carpr.carpr_advskews[0] = advskew; if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4753,12 +4755,12 @@ setcarp_advbase(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); carpr.carpr_advbase = advbase; if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4772,7 +4774,7 @@ setcarppeer(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); bzero(&hints, sizeof(hints)); hints.ai_family = AF_INET; @@ -4789,7 +4791,7 @@ setcarppeer(const char *val, int d) peerres->ai_addr)->sin_addr.s_addr; if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); freeaddrinfo(peerres); } @@ -4803,12 +4805,12 @@ unsetcarppeer(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); bzero(&carpr.carpr_peer, sizeof(carpr.carpr_peer)); if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4821,7 +4823,7 @@ setcarp_state(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); for (i = 0; i <= CARP_MAXSTATE; i++) { if (!strcasecmp(val, carp_states[i])) { @@ -4831,7 +4833,7 @@ setcarp_state(const char *val, int d) } if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4843,12 +4845,12 @@ setcarpdev(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); strlcpy(carpr.carpr_carpdev, val, sizeof(carpr.carpr_carpdev)); if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4862,7 +4864,7 @@ setcarp_nodes(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); bzero(carpr.carpr_vhids, sizeof(carpr.carpr_vhids)); bzero(carpr.carpr_advskews, sizeof(carpr.carpr_advskews)); @@ -4892,7 +4894,7 @@ setcarp_nodes(const char *val, int d) free(optlist); if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4905,7 +4907,7 @@ setcarp_balancing(const char *val, int d) ifr.ifr_data = (caddr_t)&carpr; if (ioctl(sock, SIOCGVH, (caddr_t)&ifr) == -1) - err(1, "SIOCGVH"); + err(1, "%s: SIOCGVH", ifr.ifr_name); for (i = 0; i <= CARP_BAL_MAXID; i++) if (!strcasecmp(val, carp_bal_modes[i])) @@ -4917,7 +4919,7 @@ setcarp_balancing(const char *val, int d) carpr.carpr_balancing = i; if (ioctl(sock, SIOCSVH, (caddr_t)&ifr) == -1) - err(1, "SIOCSVH"); + err(1, "%s: SIOCSVH", ifr.ifr_name); } void @@ -4929,12 +4931,12 @@ setpfsync_syncdev(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); strlcpy(preq.pfsyncr_syncdev, val, sizeof(preq.pfsyncr_syncdev)); if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); } void @@ -4946,12 +4948,12 @@ unsetpfsync_syncdev(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); bzero(&preq.pfsyncr_syncdev, sizeof(preq.pfsyncr_syncdev)); if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); } void @@ -4965,7 +4967,7 @@ setpfsync_syncpeer(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET; @@ -4982,7 +4984,7 @@ setpfsync_syncpeer(const char *val, int d) peerres->ai_addr)->sin_addr.s_addr; if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); freeaddrinfo(peerres); } @@ -4996,12 +4998,12 @@ unsetpfsync_syncpeer(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); preq.pfsyncr_syncpeer.s_addr = 0; if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); } void @@ -5019,12 +5021,12 @@ setpfsync_maxupd(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); preq.pfsyncr_maxupdates = maxupdates; if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); } void @@ -5036,11 +5038,11 @@ setpfsync_defer(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCGETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCGETPFSYNC"); + err(1, "%s: SIOCGETPFSYNC", ifr.ifr_name); preq.pfsyncr_defer = d; if (ioctl(sock, SIOCSETPFSYNC, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFSYNC"); + err(1, "%s: SIOCSETPFSYNC", ifr.ifr_name); } void @@ -5208,7 +5210,7 @@ setpflow_sender(const char *val, int d) pflow_addr(val, &preq.flowsrc); if (ioctl(sock, SIOCSETPFLOW, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFLOW"); + err(1, "%s: SIOCSETPFLOW", ifr.ifr_name); } void @@ -5220,7 +5222,7 @@ unsetpflow_sender(const char *val, int d) preq.addrmask |= PFLOW_MASK_SRCIP; ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCSETPFLOW, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFLOW"); + err(1, "%s: SIOCSETPFLOW", ifr.ifr_name); } void @@ -5234,7 +5236,7 @@ setpflow_receiver(const char *val, int d) pflow_addr(val, &preq.flowdst); if (ioctl(sock, SIOCSETPFLOW, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFLOW"); + err(1, "%s: SIOCSETPFLOW", ifr.ifr_name); } void @@ -5246,7 +5248,7 @@ unsetpflow_receiver(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; preq.addrmask |= PFLOW_MASK_DSTIP; if (ioctl(sock, SIOCSETPFLOW, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFLOW"); + err(1, "%s: SIOCSETPFLOW", ifr.ifr_name); } /* PFLOWPROTO XXX */ @@ -5274,7 +5276,7 @@ setpflowproto(const char *val, int d) ifr.ifr_data = (caddr_t)&preq; if (ioctl(sock, SIOCSETPFLOW, (caddr_t)&ifr) == -1) - err(1, "SIOCSETPFLOW"); + err(1, "%s: SIOCSETPFLOW", ifr.ifr_name); } void @@ -5407,7 +5409,7 @@ spppauthinfo(struct sauthreq *spa, int d) ifr.ifr_data = (caddr_t)spa; spa->cmd = d == 0 ? SPPPIOGMAUTH : SPPPIOGHAUTH; if (ioctl(sock, SIOCGSPPPPARAMS, &ifr) == -1) - err(1, "SIOCGSPPPPARAMS(SPPPIOGXAUTH)"); + err(1, "%s: SIOCGSPPPPARAMS(SPPPIOGXAUTH)", ifr.ifr_name); } void @@ -5418,7 +5420,7 @@ spppdnsinfo(struct sdnsreq *spd) ifr.ifr_data = (caddr_t)spd; spd->cmd = SPPPIOGDNS; if (ioctl(sock, SIOCGSPPPPARAMS, &ifr) == -1) - err(1, "SIOCGSPPPPARAMS(SPPPIOGDNS)"); + err(1, "%s: SIOCGSPPPPARAMS(SPPPIOGDNS)", ifr.ifr_name); } void @@ -5439,7 +5441,7 @@ setspppproto(const char *val, int d) spa.cmd = d == 0 ? SPPPIOSMAUTH : SPPPIOSHAUTH; if (ioctl(sock, SIOCSSPPPPARAMS, &ifr) == -1) - err(1, "SIOCSSPPPPARAMS(SPPPIOSXAUTH)"); + err(1, "%s: SIOCSSPPPPARAMS(SPPPIOSXAUTH)", ifr.ifr_name); } void @@ -5462,7 +5464,7 @@ setspppname(const char *val, int d) spa.cmd = d == 0 ? SPPPIOSMAUTH : SPPPIOSHAUTH; if (ioctl(sock, SIOCSSPPPPARAMS, &ifr) == -1) - err(1, "SIOCSSPPPPARAMS(SPPPIOSXAUTH)"); + err(1, "%s: SIOCSSPPPPARAMS(SPPPIOSXAUTH)", ifr.ifr_name); } void @@ -5485,7 +5487,7 @@ setspppkey(const char *val, int d) spa.cmd = d == 0 ? SPPPIOSMAUTH : SPPPIOSHAUTH; if (ioctl(sock, SIOCSSPPPPARAMS, &ifr) == -1) - err(1, "SIOCSSPPPPARAMS(SPPPIOSXAUTH)"); + err(1, "%s: SIOCSSPPPPARAMS(SPPPIOSXAUTH)", ifr.ifr_name); } void @@ -5518,7 +5520,7 @@ setsppppeerflag(const char *val, int d) spa.cmd = SPPPIOSHAUTH; if (ioctl(sock, SIOCSSPPPPARAMS, &ifr) == -1) - err(1, "SIOCSSPPPPARAMS(SPPPIOSXAUTH)"); + err(1, "%s: SIOCSSPPPPARAMS(SPPPIOSXAUTH)", ifr.ifr_name); } void @@ -5859,7 +5861,7 @@ process_wg_commands(void) strlcpy(wgdata.wgd_name, ifname, sizeof(wgdata.wgd_name)); if (ioctl(sock, SIOCSWG, (caddr_t)&wgdata) == -1) - err(1, "SIOCSWG"); + err(1, "%s: SIOCSWG", wgdata.wgd_name); } } @@ -5878,7 +5880,7 @@ wg_status(int ifaliases) if (ioctl(sock, SIOCGWG, (caddr_t)&wgdata) < 0) { if (errno == ENOTTY) goto out; - err(1, "SIOCGWG"); + err(1, "%s: SIOCGWG", wgdata.wgd_name); } if (last_size >= wgdata.wgd_size) break; @@ -6230,7 +6232,7 @@ umb_pinop(int op, int is_puk, const char *pin, const char *newpin) memset(&mp, 0, sizeof (mp)); ifr.ifr_data = (caddr_t)∓ if (ioctl(sock, SIOCGUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCGUMBPARAM"); + err(1, "%s: SIOCGUMBPARAM", ifr.ifr_name); mp.op = op; mp.is_puk = is_puk; @@ -6245,7 +6247,7 @@ umb_pinop(int op, int is_puk, const char *pin, const char *newpin) } if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCSUMBPARAM"); + err(1, "%s: SIOCSUMBPARAM", ifr.ifr_name); } void @@ -6256,7 +6258,7 @@ umb_apn(const char *apn, int d) memset(&mp, 0, sizeof (mp)); ifr.ifr_data = (caddr_t)∓ if (ioctl(sock, SIOCGUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCGUMBPARAM"); + err(1, "%s: SIOCGUMBPARAM", ifr.ifr_name); if (d != 0) memset(mp.apn, 0, sizeof (mp.apn)); @@ -6265,7 +6267,7 @@ umb_apn(const char *apn, int d) errx(1, "APN too long"); if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCSUMBPARAM"); + err(1, "%s: SIOCSUMBPARAM", ifr.ifr_name); } void @@ -6283,13 +6285,13 @@ umb_setclass(const char *val, int d) memset(&mp, 0, sizeof (mp)); ifr.ifr_data = (caddr_t)∓ if (ioctl(sock, SIOCGUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCGUMBPARAM"); + err(1, "%s: SIOCGUMBPARAM", ifr.ifr_name); if (d != -1) mp.preferredclasses = umb_parse_classes(val); else mp.preferredclasses = MBIM_DATACLASS_NONE; if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCSUMBPARAM"); + err(1, "%s: SIOCSUMBPARAM", ifr.ifr_name); } void @@ -6300,10 +6302,10 @@ umb_roaming(const char *val, int d) memset(&mp, 0, sizeof (mp)); ifr.ifr_data = (caddr_t)∓ if (ioctl(sock, SIOCGUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCGUMBPARAM"); + err(1, "%s: SIOCGUMBPARAM", ifr.ifr_name); mp.roaming = d; if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1) - err(1, "SIOCSUMBPARAM"); + err(1, "%s: SIOCSUMBPARAM", ifr.ifr_name); } void @@ -6589,7 +6591,7 @@ getifgroups(void) if (errno == EINVAL || errno == ENOTTY) return; else - err(1, "SIOCGIFGROUP"); + err(1, "%s: SIOCGIFGROUP", ifgr.ifgr_name); } len = ifgr.ifgr_len; @@ -6598,7 +6600,7 @@ getifgroups(void) if (ifgr.ifgr_groups == NULL) err(1, "getifgroups"); if (ioctl(sock, SIOCGIFGROUP, (caddr_t)&ifgr) == -1) - err(1, "SIOCGIFGROUP"); + err(1, "%s: SIOCGIFGROUP", ifgr.ifgr_name); cnt = 0; ifg = ifgr.ifgr_groups; @@ -6632,7 +6634,7 @@ printifhwfeatures(const char *unused, int show) bzero(&ifrdat, sizeof(ifrdat)); ifr.ifr_data = (caddr_t)&ifrdat; if (ioctl(sock, SIOCGIFDATA, (caddr_t)&ifr) == -1) - err(1, "SIOCGIFDATA"); + err(1, "%s: SIOCGIFDATA", ifr.ifr_name); printb("\thwfeatures", (u_int)ifrdat.ifi_capabilities, HWFEATURESBITS); if (ioctl(sock, SIOCGIFHARDMTU, (caddr_t)&ifr) != -1) { diff --git a/sbin/pflogd/pflogd.c b/sbin/pflogd/pflogd.c index f464d80cd..f1ba9c850 100644 --- a/sbin/pflogd/pflogd.c +++ b/sbin/pflogd/pflogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pflogd.c,v 1.62 2019/07/25 17:32:33 brynet Exp $ */ +/* $OpenBSD: pflogd.c,v 1.63 2023/05/09 00:01:59 dlg Exp $ */ /* * Copyright (c) 2001 Theo de Raadt @@ -251,8 +251,8 @@ pflog_read_live(const char *source, int slen, int promisc, int to_ms, struct timeval to; to.tv_sec = to_ms / 1000; to.tv_usec = (to_ms * 1000) % 1000000; - if (ioctl(p->fd, BIOCSRTIMEOUT, &to) == -1) { - snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSRTIMEOUT: %s", + if (ioctl(p->fd, BIOCSWTIMEOUT, &to) == -1) { + snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCSWTIMEOUT: %s", pcap_strerror(errno)); goto bad; } diff --git a/share/btrace/Makefile b/share/btrace/Makefile index 900b5f695..acca2897a 100644 --- a/share/btrace/Makefile +++ b/share/btrace/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2021/10/23 19:37:35 mpi Exp $ +# $OpenBSD: Makefile,v 1.2 2023/05/12 14:34:00 claudio Exp $ -FILES= kprofile.bt runqlat.bt +FILES= kprofile.bt runqlat.bt uprofile.bt NOOBJ= noobj install: diff --git a/share/btrace/uprofile.bt b/share/btrace/uprofile.bt new file mode 100644 index 000000000..17ce622ee --- /dev/null +++ b/share/btrace/uprofile.bt @@ -0,0 +1,17 @@ +/* $OpenBSD: uprofile.bt,v 1.1 2023/05/12 14:34:00 claudio Exp $ */ + +/* + * uprofile.bt Userland profiling (stack sampling) at 100Hz. + * + * To produce a FlameGraph process the output with stackcollapse-bpftrace.pl + * and flamegraph.pl found in: + * https://github.com/brendangregg/FlameGraph + * + * The PID of the to be monitored process is the first optional argument to + * btrace(8). + * This only works for a single static binary where everything was compiled + * with -fno-omit-frame-pointer. + */ +profile:hz:100 / pid == $1 / { + @[ustack] = count(); +} diff --git a/share/man/man4/man4.amd64/intro.4 b/share/man/man4/man4.amd64/intro.4 index b8ad86584..9e35f84d7 100644 --- a/share/man/man4/man4.amd64/intro.4 +++ b/share/man/man4/man4.amd64/intro.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.4,v 1.39 2023/05/01 06:04:46 jmc Exp $ +.\" $OpenBSD: intro.4,v 1.40 2023/05/03 22:03:17 jmc Exp $ .\" .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 1 2023 $ +.Dd $Mdocdate: May 3 2023 $ .Dt INTRO 4 amd64 .Os .Sh NAME @@ -107,6 +107,8 @@ introduction to PCI bus support introduction to PCMCIA (PC Card) support .It Xr usb 4 introduction to Universal Serial Bus support +.It Xr virtio 4 +VirtIO support driver .El .Sh SEE ALSO .Xr autoconf 4 , diff --git a/share/man/man4/man4.arm64/intro.4 b/share/man/man4/man4.arm64/intro.4 index 47ab38730..03ba0ef7a 100644 --- a/share/man/man4/man4.arm64/intro.4 +++ b/share/man/man4/man4.arm64/intro.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.4,v 1.3 2023/05/01 06:04:46 jmc Exp $ +.\" $OpenBSD: intro.4,v 1.5 2023/05/03 22:03:17 jmc Exp $ .\" .\" Copyright (c) 2014 Sylvestre Gallon .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 1 2023 $ +.Dd $Mdocdate: May 3 2023 $ .Dt INTRO 4 arm64 .Os .Sh NAME @@ -97,10 +97,14 @@ The following buses and controllers list these devices: Advanced Configuration and Power Interface .It Xr iic 4 Inter IC (I2C) bus +.It Xr onewire 4 +1-Wire bus .It Xr pci 4 introduction to PCI bus support .It Xr usb 4 introduction to Universal Serial Bus support +.It Xr virtio 4 +VirtIO support driver .El .Sh SEE ALSO .Xr autoconf 4 , diff --git a/share/man/man4/man4.armv7/intro.4 b/share/man/man4/man4.armv7/intro.4 index d4dc6608b..fdad4a2a9 100644 --- a/share/man/man4/man4.armv7/intro.4 +++ b/share/man/man4/man4.armv7/intro.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.4,v 1.5 2022/03/31 17:27:21 naddy Exp $ +.\" $OpenBSD: intro.4,v 1.7 2023/05/03 22:03:17 jmc Exp $ .\" .\" Copyright (c) 2014 Sylvestre Gallon .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California. @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: May 3 2023 $ .Dt INTRO 4 armv7 .Os .Sh NAME @@ -97,10 +97,14 @@ The following buses and controllers list these devices: Inter IC (I2C) bus .It Xr omap 4 omap3, omap4, am335x SoCs device bus +.It Xr onewire 4 +1-Wire bus .It Xr pci 4 introduction to PCI bus support .It Xr usb 4 introduction to Universal Serial Bus support +.It Xr virtio 4 +VirtIO support driver .El .Sh SEE ALSO .Xr autoconf 4 , diff --git a/share/man/man4/man4.i386/intro.4 b/share/man/man4/man4.i386/intro.4 index 96a949076..43d4d77f5 100644 --- a/share/man/man4/man4.i386/intro.4 +++ b/share/man/man4/man4.i386/intro.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.4,v 1.86 2023/05/01 06:04:46 jmc Exp $ +.\" $OpenBSD: intro.4,v 1.87 2023/05/03 22:03:18 jmc Exp $ .\" .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 1 2023 $ +.Dd $Mdocdate: May 3 2023 $ .Dt INTRO 4 i386 .Os .Sh NAME @@ -112,6 +112,8 @@ introduction to PCI bus support introduction to PCMCIA (PC Card) support .It Xr usb 4 introduction to Universal Serial Bus support +.It Xr virtio 4 +VirtIO support driver .El .Sh SEE ALSO .Xr autoconf 4 , diff --git a/share/man/man4/man4.riscv64/intro.4 b/share/man/man4/man4.riscv64/intro.4 index ff129065d..af8baca60 100644 --- a/share/man/man4/man4.riscv64/intro.4 +++ b/share/man/man4/man4.riscv64/intro.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.4,v 1.2 2022/03/31 17:27:22 naddy Exp $ +.\" $OpenBSD: intro.4,v 1.3 2023/05/03 22:03:18 jmc Exp $ .\" .\" Copyright (c) 1983, 1986, 1991 Regents of the University of California. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: May 3 2023 $ .Dt INTRO 4 riscv64 .Os .Sh NAME @@ -99,6 +99,8 @@ Inter IC (I2C) bus introduction to PCI bus support .It Xr usb 4 introduction to Universal Serial Bus support +.It Xr virtio 4 +VirtIO support driver .El .Sh SEE ALSO .Xr autoconf 4 , diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index 48e03a01f..0c9e81200 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: udl.4,v 1.22 2023/03/31 13:48:34 jmc Exp $ +.\" $OpenBSD: udl.4,v 1.24 2023/05/10 22:23:25 jmc Exp $ .\" .\" Copyright (c) 2009 Marcus Glocker .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 31 2023 $ +.Dd $Mdocdate: May 10 2023 $ .Dt UDL 4 .Os .Sh NAME @@ -48,6 +48,7 @@ The following devices should work: .It Samsung LD220 .It StarTech CONV-USB2DVI .It Sunweit USB to DVI +.It Toshiba Video Dock .It Unitek Y-2240 USB to DVI .It VideoHome NBdock1920 .El diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 03cba31c4..ff45d3566 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ure.4,v 1.9 2021/09/08 20:29:21 jmc Exp $ +.\" $OpenBSD: ure.4,v 1.10 2023/05/06 08:14:26 kevlo Exp $ .\" .\" Copyright (c) 2015 Kevin Lo .\" All rights reserved. @@ -26,12 +26,12 @@ .\" .\" $FreeBSD: head/share/man/man4/ure.4 291557 2015-12-01 05:12:13Z kevlo $ .\" -.Dd $Mdocdate: September 8 2021 $ +.Dd $Mdocdate: May 6 2023 $ .Dt URE 4 .Os .Sh NAME .Nm ure -.Nd Realtek RTL8152/RTL8153/RTL8153B/RTL8156 10/100/1Gb/2.5Gb USB Ethernet device +.Nd Realtek RTL8152/RTL8153/RTL8153B/RTL8153D/RTL8156 10/100/1Gb/2.5Gb USB Ethernet device .Sh SYNOPSIS .Cd "ure* at uhub?" .Cd "rgephy* at mii?" @@ -40,11 +40,11 @@ The .Nm driver provides support for USB Ethernet adapters based on the Realtek -RTL8152, RTL8153, RTL8153B and RTL8156 chipsets. +RTL8152, RTL8153, RTL8153B, RTL8153D and RTL8156 chipsets. .Pp The RTL8152 contains an integrated Fast Ethernet MAC, which supports both 10 and 100Mbps speeds in either full or half duplex. -The RTL8153 and RTL8153B have Gigabit Ethernet MACs and additionally +The RTL8153, RTL8153B and RTL8153D have Gigabit Ethernet MACs and additionally support 1000Mbps speeds. NICs based on the RTL8156 are capable of 10, 100, 1000 and 2500Mbps operation. .Pp diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index f65bc86f4..f27b45486 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: usb.4,v 1.215 2023/04/28 01:24:14 kevlo Exp $ +.\" $OpenBSD: usb.4,v 1.216 2023/05/06 08:14:26 kevlo Exp $ .\" $NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 28 2023 $ +.Dd $Mdocdate: May 6 2023 $ .Dt USB 4 .Os .Sh NAME @@ -130,7 +130,7 @@ Aquantia AQC111U/AQC112U 100/1Gb/2.5Gb/5Gb USB Ethernet device .It Xr udav 4 Davicom DM9601 10/100 USB Ethernet device .It Xr ure 4 -Realtek RTL8152/RTL8153/RTL8153B/RTL8156 10/100/1Gb/2.5Gb USB Ethernet device +Realtek RTL8152/RTL8153/RTL8153B/RTL8153D/RTL8156 10/100/1Gb/2.5Gb USB Ethernet device .It Xr url 4 Realtek RTL8150L 10/100 USB Ethernet device .It Xr urndis 4 diff --git a/share/man/man5/port-modules.5 b/share/man/man5/port-modules.5 index 36e2d4742..6d62a5e47 100644 --- a/share/man/man5/port-modules.5 +++ b/share/man/man5/port-modules.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: port-modules.5,v 1.262 2023/04/26 19:12:48 jmc Exp $ +.\" $OpenBSD: port-modules.5,v 1.264 2023/05/09 19:44:06 jmc Exp $ .\" .\" Copyright (c) 2008 Marc Espie .\" @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 26 2023 $ +.Dd $Mdocdate: May 9 2023 $ .Dt PORT-MODULES 5 .Os .Sh NAME @@ -701,14 +701,16 @@ should be set to the name of the typeface. This sets .Ev FONTDIR using said typeface name. -.Ev FONTTYPES -defaults to `ttf' but can be set to include the extensions of -fonts which are to be installed. -Also sets -.Ev FONT_DISTDIR . A .Cm do-install -target is provided if the port tself does not provide it. +target is provided if the port itself does not provide it. +This installs fonts from +.Ev FONT_DISTSUBDIR +in the distribution. +If one or more file extensions are listed in +.Ev FONTTYPES , +files of those types will be used. +Otherwise, otf files are preferred, with a fallback to ttf. .It fortran Sets .Ev MODFORTRAN_LIB_DEPENDS , diff --git a/sys/Makefile b/sys/Makefile index 145e7df4e..5aa703819 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -2,11 +2,7 @@ # $NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $ SUBDIR= dev/microcode \ - arch/alpha arch/amd64 arch/arm64 arch/armv7 \ - arch/hppa arch/i386 \ - arch/landisk arch/loongson arch/luna88k \ - arch/macppc arch/octeon arch/powerpc64 \ - arch/riscv64 arch/sparc64 + arch/amd64 arch/arm64 arch/armv7 tags: cd ${.CURDIR}/kern; make tags diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK index 6d162d175..f312c3a8c 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.199 2023/04/28 05:13:37 phessler Exp $ +# $OpenBSD: RAMDISK,v 1.200 2023/05/12 21:32:49 uaa Exp $ machine arm64 maxusers 4 @@ -269,12 +269,13 @@ gpio* at sxipio? sxiccmu* at fdt? early 1 # Clock Control Module/Unit sxidog* at fdt? sxirsb* at fdt? early 1 # Reduced Serial Bus +axppmic* at rsb? sxirtc* at fdt? early 1 # Real Time Clock sximmc* at fdt? # SD/MMC card controller sdmmc* at sximmc? # SD/MMC bus sxisid* at fdt? early 1 sxisyscon* at fdt? early 1 # System controller -sxitwi* at fdt? # I2C controller +sxitwi* at fdt? early 1 # I2C controller iic* at sxitwi? # I2C bus dwxe* at fdt? @@ -372,6 +373,7 @@ ytphy* at mii? # MotorComm YT8511 PHY # I2C devices abcrtc* at iic? # Abracon x80x RTC +axppmic* at iic? # AXP80x PMIC dsxrtc* at iic? # DS3231 RTC fusbtc* at iic? # USB Type-C controller ihidev* at iic? # HID-over-I2C diff --git a/sys/arch/arm64/dev/aplcpu.c b/sys/arch/arm64/dev/aplcpu.c index 18a28a90c..97fa69df9 100644 --- a/sys/arch/arm64/dev/aplcpu.c +++ b/sys/arch/arm64/dev/aplcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aplcpu.c,v 1.6 2023/04/16 08:02:45 kettenis Exp $ */ +/* $OpenBSD: aplcpu.c,v 1.7 2023/05/09 10:13:23 kettenis Exp $ */ /* * Copyright (c) 2022 Mark Kettenis * @@ -396,9 +396,7 @@ aplcpu_setperf(int level) /* Set desired P-state. */ reg &= ~DVFS_CMD_PS1_MASK; - reg &= ~DVFS_CMD_PS2_MASK; reg |= (opp_level << DVFS_CMD_PS1_SHIFT); - reg |= (opp_level << DVFS_CMD_PS2_SHIFT); reg |= DVFS_CMD_SET; bus_space_write_8(sc->sc_iot, sc->sc_ioh[j], DVFS_CMD, reg); diff --git a/sys/arch/arm64/dev/apldc.c b/sys/arch/arm64/dev/apldc.c index 58112860e..bdf1c95f3 100644 --- a/sys/arch/arm64/dev/apldc.c +++ b/sys/arch/arm64/dev/apldc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apldc.c,v 1.7 2023/04/10 15:14:04 tobhe Exp $ */ +/* $OpenBSD: apldc.c,v 1.8 2023/05/02 19:39:10 kettenis Exp $ */ /* * Copyright (c) 2022 Mark Kettenis * @@ -963,17 +963,79 @@ struct mtp_fwhdr { uint32_t iface_off; }; -void -apldchidev_attachhook(struct device *self) +int +apldchidev_load_firmware(struct apldchidev_softc *sc, const char *name) { - struct apldchidev_softc *sc = (struct apldchidev_softc *)self; - struct apldchidev_attach_args aa; + struct mtp_fwhdr *hdr; uint8_t *ucode; size_t ucode_size; uint8_t *data; size_t size; int error; + error = loadfirmware(name, &ucode, &ucode_size); + if (error) { + printf("%s: error %d, could not read firmware %s\n", + sc->sc_dev.dv_xname, error, name); + return error; + } + + hdr = (struct mtp_fwhdr *)ucode; + if (sizeof(hdr) > ucode_size || + hdr->hdr_len + hdr->data_len > ucode_size) { + printf("%s: loaded firmware is too small\n", + sc->sc_dev.dv_xname); + return EINVAL; + } + if (hdr->magic != MTP_FW_MAGIC) { + printf("%s: wrong firmware magic number 0x%08x\n", + sc->sc_dev.dv_xname, hdr->magic); + return EINVAL; + } + if (hdr->version != MTP_FW_VERSION) { + printf("%s: wrong firmware version %d\n", + sc->sc_dev.dv_xname, hdr->version); + return EINVAL; + } + data = ucode + hdr->hdr_len; + if (hdr->iface_off) + data[hdr->iface_off] = sc->sc_iface_mt; + size = hdr->data_len; + + apldchidev_send_firmware(sc, sc->sc_iface_mt, data, size); + apldchidev_reset(sc, sc->sc_iface_mt, 0); + apldchidev_reset(sc, sc->sc_iface_mt, 2); + + /* Wait until ready. */ + while (sc->sc_mt_ready == 0) { + error = tsleep_nsec(sc, PZERO, "apldcmt", SEC_TO_NSEC(2)); + if (error == EWOULDBLOCK) + return error; + } + + return 0; +} + +void +apldchidev_attachhook(struct device *self) +{ + struct apldchidev_softc *sc = (struct apldchidev_softc *)self; + struct apldchidev_attach_args aa; + char *firmware_name; + int node, len; + int retry; + int error; + + /* Enable interface. */ + apldchidev_enable(sc, sc->sc_iface_mt); + + node = OF_getnodebyname(sc->sc_node, "multi-touch"); + if (node == -1) + return; + len = OF_getproplen(node, "firmware-name"); + if (len <= 0) + return; + /* Wait until we have received the multi-touch HID descriptor. */ while (sc->sc_mtdesclen == 0) { error = tsleep_nsec(sc, PZERO, "apldcmt", SEC_TO_NSEC(1)); @@ -981,71 +1043,24 @@ apldchidev_attachhook(struct device *self) return; } - if (sc->sc_mtdesclen > 0) { - struct mtp_fwhdr *hdr; - char *firmware_name; - int node, len; + firmware_name = malloc(len, M_TEMP, M_WAITOK); + OF_getprop(node, "firmware-name", firmware_name, len); - /* Enable interface. */ - apldchidev_enable(sc, sc->sc_iface_mt); - - node = OF_getnodebyname(sc->sc_node, "multi-touch"); - if (node == -1) - return; - len = OF_getproplen(node, "firmware-name"); - if (len <= 0) - return; - firmware_name = malloc(len, M_TEMP, M_WAITOK); - OF_getprop(node, "firmware-name", firmware_name, len); - - error = loadfirmware(firmware_name, &ucode, &ucode_size); - if (error) { - printf("%s: error %d, could not read firmware %s\n", - sc->sc_dev.dv_xname, error, firmware_name); - free(firmware_name, M_TEMP, len); - return; - } - free(firmware_name, M_TEMP, len); - - hdr = (struct mtp_fwhdr *)ucode; - if (sizeof(hdr) > ucode_size || - hdr->hdr_len + hdr->data_len > ucode_size) { - printf("%s: loaded firmware is too small\n", - sc->sc_dev.dv_xname); - return; - } - if (hdr->magic != MTP_FW_MAGIC) { - printf("%s: wrong firmware magic number 0x%08x\n", - sc->sc_dev.dv_xname, hdr->magic); - return; - } - if (hdr->version != MTP_FW_VERSION) { - printf("%s: wrong firmware version %d\n", - sc->sc_dev.dv_xname, hdr->version); - return; - } - data = ucode + hdr->hdr_len; - if (hdr->iface_off) - data[hdr->iface_off] = sc->sc_iface_mt; - size = hdr->data_len; - - apldchidev_send_firmware(sc, sc->sc_iface_mt, data, size); - apldchidev_reset(sc, sc->sc_iface_mt, 0); - apldchidev_reset(sc, sc->sc_iface_mt, 2); - - /* Wait until ready. */ - while (sc->sc_mt_ready == 0) { - error = tsleep_nsec(sc, PZERO, "apldcmt", - SEC_TO_NSEC(10)); - if (error == EWOULDBLOCK) - return; - } - - aa.aa_name = "multi-touch"; - aa.aa_desc = sc->sc_mtdesc; - aa.aa_desclen = sc->sc_mtdesclen; - sc->sc_mt = config_found(self, &aa, NULL); + for (retry = 5; retry > 0; retry--) { + error = apldchidev_load_firmware(sc, firmware_name); + if (error != EWOULDBLOCK) + break; } + if (error) + goto out; + + aa.aa_name = "multi-touch"; + aa.aa_desc = sc->sc_mtdesc; + aa.aa_desclen = sc->sc_mtdesclen; + sc->sc_mt = config_found(self, &aa, NULL); + +out: + free(firmware_name, M_TEMP, len); } #endif diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c index 3e489c817..a74bf79fa 100644 --- a/sys/arch/arm64/stand/efiboot/conf.c +++ b/sys/arch/arm64/stand/efiboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.45 2023/04/18 23:11:56 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.46 2023/05/12 16:43:00 kettenis Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -46,7 +46,7 @@ #include "efipxe.h" #include "softraid_arm64.h" -const char version[] = "1.17"; +const char version[] = "1.18"; int debug = 0; struct fs_ops file_system[] = { diff --git a/sys/arch/arm64/stand/efiboot/efiboot.c b/sys/arch/arm64/stand/efiboot/efiboot.c index c74526320..2754f192f 100644 --- a/sys/arch/arm64/stand/efiboot/efiboot.c +++ b/sys/arch/arm64/stand/efiboot/efiboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: efiboot.c,v 1.47 2023/02/15 14:13:38 kettenis Exp $ */ +/* $OpenBSD: efiboot.c,v 1.48 2023/05/12 16:43:00 kettenis Exp $ */ /* * Copyright (c) 2015 YASUOKA Masahiko @@ -831,6 +831,15 @@ devboot(dev_t dev, char *p) return; } + /* + * If there is no BSD disklabel on the boot device, boot from + * the ESP instead. + */ + if ((bootdev_dip->flags & DISKINFO_FLAG_GOODLABEL) == 0) { + strlcpy(p, "esp0a", 6); + return; + } + TAILQ_FOREACH(dip, &disklist, list) { if (bootdev_dip == dip) break; @@ -841,8 +850,7 @@ devboot(dev_t dev, char *p) * Determine the partition type for the 'a' partition of the * boot device. */ - if ((bootdev_dip->flags & DISKINFO_FLAG_GOODLABEL) != 0) - part_type = bootdev_dip->disklabel.d_partitions[0].p_fstype; + part_type = bootdev_dip->disklabel.d_partitions[0].p_fstype; /* * See if we booted from a disk that is a member of a bootable diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c index d1fb8e578..bfcd83f76 100644 --- a/sys/dev/fdt/dwpcie.c +++ b/sys/dev/fdt/dwpcie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwpcie.c,v 1.48 2023/04/27 09:03:06 kettenis Exp $ */ +/* $OpenBSD: dwpcie.c,v 1.49 2023/05/03 15:25:25 jsg Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -1480,13 +1480,14 @@ dwpcie_rk3568_intr_disestablish(void *cookie) evcount_detach(&di->di_count); TAILQ_REMOVE(&sc->sc_intx[di->di_pin], di, di_next); - free(di, M_DEVBUF, sizeof(*di)); if (!TAILQ_EMPTY(&sc->sc_intx[di->di_pin])) { /* Unmask the interrupt. */ bus_space_write_4(sc->sc_iot, sc->sc_glue_ioh, PCIE_CLIENT_INTR_MASK_LEGACY, mask << 16); } + + free(di, M_DEVBUF, sizeof(*di)); } void diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index 52840060d..480ad4e15 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -285,7 +285,7 @@ aac_pci_attach(parent, self, aux) printf("%s\n", intrstr); sc->aac_dmat = pa->pa_dmat; - + for (m = aac_identifiers; m->vendor != 0; m++) if (m->vendor == PCI_VENDOR(pa->pa_id) && m->device == PCI_PRODUCT(pa->pa_id)) { diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c index bf6fa2774..a0bab2839 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -64,7 +64,7 @@ agpbus_probe(struct agp_attach_args *aa) struct pci_attach_args *pa = aa->aa_pa; if (strncmp(aa->aa_busname, "agp", 3) == 0 && - PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE && + PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_HOST) return (1); return (0); @@ -215,7 +215,7 @@ agp_generic_enable(struct agp_softc *sc, u_int32_t mode) struct pci_attach_args pa; pcireg_t tstatus, mstatus, command; int rq, sba, fw, rate, capoff; - + if (pci_find_device(&pa, agpvga_match) == 0 || pci_get_capability(pa.pa_pc, pa.pa_tag, PCI_CAP_AGP, &capoff, NULL) == 0) { @@ -359,7 +359,7 @@ agp_acquire(void *dev) { struct agp_softc *sc = (struct agp_softc *)dev; - if (sc->sc_chipc == NULL) + if (sc->sc_chipc == NULL) return (EINVAL); if (sc->sc_state != AGP_ACQUIRE_FREE) @@ -377,7 +377,7 @@ agp_release(void *dev) if (sc->sc_state == AGP_ACQUIRE_FREE) return (0); - if (sc->sc_state != AGP_ACQUIRE_KERNEL) + if (sc->sc_state != AGP_ACQUIRE_KERNEL) return (EBUSY); sc->sc_state = AGP_ACQUIRE_FREE; diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c index db2c64316..308299f66 100644 --- a/sys/dev/pci/agp_ali.c +++ b/sys/dev/pci/agp_ali.c @@ -96,7 +96,7 @@ agp_ali_probe(struct device *parent, void *match, void *aux) return (0); } -void +void agp_ali_attach(struct device *parent, struct device *self, void *aux) { struct agp_ali_softc *asc = (struct agp_ali_softc *)self; @@ -135,7 +135,7 @@ agp_ali_attach(struct device *parent, struct device *self, void *aux) reg = pci_conf_read(asc->asc_pc, asc->asc_tag, AGP_ALI_ATTBASE); reg = (reg & 0xff) | gatt->ag_physical; pci_conf_write(asc->asc_pc, asc->asc_tag, AGP_ALI_ATTBASE, reg); - + /* Enable the TLB. */ reg = pci_conf_read(asc->asc_pc, asc->asc_tag, AGP_ALI_TLBCTRL); reg = (reg & ~0xff) | 0x10; @@ -179,7 +179,7 @@ agp_ali_restore(struct agp_ali_softc *asc) /* Install the gatt and aperture size. */ pci_conf_write(asc->asc_pc, asc->asc_tag, AGP_ALI_ATTBASE, asc->asc_attbase); - + /* Enable the TLB. */ pci_conf_write(asc->asc_pc, asc->asc_tag, AGP_ALI_TLBCTRL, asc->asc_tlbctrl); diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index 274e707e2..f0863f0b4 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -59,7 +59,7 @@ /* I810/I815 only, memory is in dcache */ #define INTEL_LOCAL 0x2 /* Memory is snooped, must not be accessed through gtt from the cpu. */ -#define INTEL_COHERENT 0x6 +#define INTEL_COHERENT 0x6 enum { CHIP_NONE = 0, /* not integrated graphics */ @@ -194,7 +194,7 @@ agp_i810_get_chiptype(struct pci_attach_args *pa) return (CHIP_IRONLAKE); break; } - + return (CHIP_NONE); } @@ -379,7 +379,7 @@ agp_i810_attach(struct device *parent, struct device *self, void *aux) /* FALLTHROUGH */ case CHIP_I915: /* FALLTHROUGH */ - case CHIP_I965: + case CHIP_I965: /* FALLTHROUGH */ case CHIP_G33: /* FALLTHROUGH */ @@ -559,7 +559,7 @@ agp_i810_configure(struct agp_i810_softc *isc) tmp = isc->isc_apaddr; if (isc->chiptype == CHIP_I810) { tmp += isc->dcache_size; - } else { + } else { tmp += isc->stolen << AGP_PAGE_SHIFT; } diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c index 0ff430869..628b12218 100644 --- a/sys/dev/pci/agp_intel.c +++ b/sys/dev/pci/agp_intel.c @@ -59,7 +59,7 @@ struct agp_intel_softc { CHIP_I845, CHIP_I850, CHIP_I865 - } chiptype; + } chiptype; /* registers saved during a suspend/resume cycle. */ pcireg_t savectrl; pcireg_t savecmd; @@ -115,7 +115,7 @@ agp_intel_probe(struct device *parent, void *match, void *aux) case PCI_PRODUCT_INTEL_82840_HB: case PCI_PRODUCT_INTEL_82845_HB: case PCI_PRODUCT_INTEL_82845G_HB: - case PCI_PRODUCT_INTEL_82850_HB: + case PCI_PRODUCT_INTEL_82850_HB: case PCI_PRODUCT_INTEL_82855PM_HB: case PCI_PRODUCT_INTEL_82855GM_HB: case PCI_PRODUCT_INTEL_82860_HB: @@ -202,7 +202,7 @@ agp_intel_attach(struct device *parent, struct device *self, void *aux) /* Install the gatt. */ pci_conf_write(pa->pa_pc, pa->pa_tag, AGP_INTEL_ATTBASE, gatt->ag_physical); - + /* Enable the GLTB and setup the control register. */ switch (isc->chiptype) { case CHIP_I443: @@ -262,7 +262,7 @@ agp_intel_attach(struct device *parent, struct device *self, void *aux) pci_conf_write(isc->isc_pc, isc->isc_tag, AGP_INTEL_ERRCMD, reg); } - + isc->agpdev = (struct agp_softc *)agp_attach_bus(pa, &agp_intel_methods, isc->isc_apaddr, isc->isc_apsize, &isc->dev); return; @@ -329,7 +329,7 @@ agp_intel_restore(struct agp_intel_softc *isc) /* Install the gatt. */ pci_conf_write(isc->isc_pc, isc->isc_tag, AGP_INTEL_ATTBASE, isc->gatt->ag_physical); - + /* Enable the GLTB and setup the control register. */ switch (isc->chiptype) { case CHIP_I443: diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c index 145dcfe1d..f0d59d054 100644 --- a/sys/dev/pci/agp_sis.c +++ b/sys/dev/pci/agp_sis.c @@ -135,7 +135,7 @@ agp_sis_attach(struct device *parent, struct device *self, void *aux) /* Install the gatt. */ pci_conf_write(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_ATTBASE, gatt->ag_physical); - + /* Enable the aperture and auto-tlb-inval */ reg = pci_conf_read(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_WINCTRL); reg |= (0x05 << 24) | 3; @@ -176,7 +176,7 @@ agp_sis_restore(struct agp_sis_softc *ssc) /* Install the gatt. */ pci_conf_write(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_ATTBASE, ssc->gatt->ag_physical); - + /* * Enable the aperture, reset the aperture size and enable and * auto-tlb-inval. @@ -217,7 +217,7 @@ agp_sis_set_aperture(void *sc, bus_size_t aperture) gws = ffs(aperture / 4*1024*1024) - 1; - reg = pci_conf_read(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_WINCTRL); + reg = pci_conf_read(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_WINCTRL); reg &= ~0x00000070; reg |= gws << 4; pci_conf_write(ssc->ssc_pc, ssc->ssc_tag, AGP_SIS_WINCTRL, reg); diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c index d0e27d5ef..75828c10a 100644 --- a/sys/dev/pci/agp_via.c +++ b/sys/dev/pci/agp_via.c @@ -238,7 +238,7 @@ agp_via_get_aperture(void *sc) struct agp_via_softc *vsc = sc; bus_size_t apsize; - apsize = pci_conf_read(vsc->vsc_pc, vsc->vsc_tag, + apsize = pci_conf_read(vsc->vsc_pc, vsc->vsc_tag, vsc->regs[REG_APSIZE]) & 0x1f; /* diff --git a/sys/dev/pci/agpreg.h b/sys/dev/pci/agpreg.h index 0f1e2b920..1d8924d58 100644 --- a/sys/dev/pci/agpreg.h +++ b/sys/dev/pci/agpreg.h @@ -210,7 +210,7 @@ #define AGP_I810_MISCC_RPTC 0x00c0 #define AGP_I810_MISCC_RPTC_NOLIMIT 0x0000 #define AGP_I810_MISCC_RPTC_62 0x0040 -#define AGP_I810_MISCC_RPTC_50 0x0080 +#define AGP_I810_MISCC_RPTC_50 0x0080 #define AGP_I810_MISCC_RPTC_37 0x00c0 /* diff --git a/sys/dev/pci/agpvar.h b/sys/dev/pci/agpvar.h index 569df51f2..522d1dd1b 100644 --- a/sys/dev/pci/agpvar.h +++ b/sys/dev/pci/agpvar.h @@ -105,7 +105,7 @@ struct agp_softc { pcireg_t sc_id; int sc_opened; - int sc_capoff; + int sc_capoff; int sc_nextid; /* next mem block id */ enum agp_acquire_state sc_state; diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 6f95e9b20..373e87e89 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -459,7 +459,7 @@ const struct ahc_pci_identity ahc_pci_ident_table [] = ID_ALL_MASK, ahc_aic7892_setup }, - /* aic7895 based controllers */ + /* aic7895 based controllers */ { ID_AHA_2940U_DUAL, ID_ALL_MASK, @@ -480,7 +480,7 @@ const struct ahc_pci_identity ahc_pci_ident_table [] = ID_AIC7895_ARO_MASK, ahc_aic7895_setup }, - /* aic7896/97 based controllers */ + /* aic7896/97 based controllers */ { ID_AHA_3950U2B_0, ID_ALL_MASK, @@ -506,7 +506,7 @@ const struct ahc_pci_identity ahc_pci_ident_table [] = ID_ALL_MASK, ahc_aic7896_setup }, - /* aic7899 based controllers */ + /* aic7899 based controllers */ { ID_AHA_3960D, ID_ALL_MASK, @@ -665,7 +665,7 @@ ahc_find_pci_device(pcireg_t id, pcireg_t subid, u_int func) * ID as valid. */ if (func > 0 - && ahc_9005_subdevinfo_valid(PCI_VENDOR(id), PCI_PRODUCT(id), + && ahc_9005_subdevinfo_valid(PCI_VENDOR(id), PCI_PRODUCT(id), PCI_VENDOR(subid), PCI_PRODUCT(subid)) && SUBID_9005_MFUNCENB(PCI_PRODUCT(subid)) == 0) return (NULL); @@ -834,7 +834,7 @@ ahc_pci_attach(struct device *parent, struct device *self, void *aux) ahc_name(ahc)); devconfig |= DACEN; } - + /* Ensure that pci error generation, a test feature, is disabled. */ devconfig |= PCIERRGENDIS; @@ -963,7 +963,7 @@ ahc_pci_attach(struct device *parent, struct device *self, void *aux) M_NOWAIT | M_ZERO); if (ahc->seep_config == NULL) goto error_out; - + /* See if we have a SEEPROM and perform auto-term */ ahc_check_extport(ahc, &sxfrctl1); @@ -1208,7 +1208,7 @@ ahc_probe_ext_scbram(struct ahc_softc *ahc) fast = FALSE; large = FALSE; num_scbs = 0; - + if (ahc_ext_scbram_present(ahc) == 0) goto done; @@ -1402,7 +1402,7 @@ ahc_pci_intr(struct ahc_softc *ahc) if ((status1 & (DPE|SSE|RMA|RTA|STA|DPR)) == 0) { printf("%s: Latched PCIERR interrupt with " - "no status bits set\n", ahc_name(ahc)); + "no status bits set\n", ahc_name(ahc)); } else { ahc_outb(ahc, CLRINT, CLRPARERR); } diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index 171579a72..b6b6affaf 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -170,7 +170,7 @@ const struct ahd_pci_identity ahd_pci_ident_table[] = ID_ALL_MASK, ahd_aic7901A_setup }, - /* aic7902 based controllers */ + /* aic7902 based controllers */ { ID_AHA_29320, ID_ALL_MASK, @@ -240,7 +240,7 @@ const struct ahd_pci_identity ahd_pci_ident_table[] = }; const u_int ahd_num_pci_devs = NUM_ELEMENTS(ahd_pci_ident_table); - + #define DEVCONFIG 0x40 #define PCIXINITPAT 0x0000E000ul #define PCIXINIT_PCI33_66 0x0000E000ul @@ -342,7 +342,7 @@ ahd_pci_attach(struct device *parent, struct device *self, void *aux) pci_intr_handle_t ih; const char *intrstr; pcireg_t devconfig, memtype, subid; - uint16_t device, subvendor; + uint16_t device, subvendor; int error, ioh_valid, ioh2_valid, l, memh_valid; ahd->dev_softc = pa; @@ -373,10 +373,10 @@ ahd_pci_attach(struct device *parent, struct device *self, void *aux) error = entry->setup(ahd, pa); if (error != 0) return; - + /* XXX ahc on sparc64 needs this twice */ devconfig = pci_conf_read(pa->pa_pc, pa->pa_tag, DEVCONFIG); - + if ((devconfig & PCIXINITPAT) == PCIXINIT_PCI33_66) { ahd->chip |= AHD_PCI; /* Disable PCIX workarounds when running in PCI mode. */ @@ -482,7 +482,7 @@ ahd_pci_attach(struct device *parent, struct device *self, void *aux) devconfig |= DACEN; pci_conf_write(pa->pa_pc, pa->pa_tag, DEVCONFIG, devconfig); } - + ahd_softc_init(ahd); /* @@ -514,7 +514,7 @@ ahd_pci_attach(struct device *parent, struct device *self, void *aux) } if (intrstr != NULL) printf(": %s\n", intrstr); - + /* Get the size of the cache */ ahd->pci_cachesize = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_BHLC_REG); ahd->pci_cachesize *= 4; @@ -668,7 +668,7 @@ ahd_check_extport(struct ahd_softc *ahd) /* * Fetch VPD for this function and parse it. */ - if (bootverbose) + if (bootverbose) printf("%s: Reading VPD from SEEPROM...", ahd_name(ahd)); @@ -681,12 +681,12 @@ ahd_check_extport(struct ahd_softc *ahd) /*bytestream*/TRUE); if (error == 0) error = ahd_parse_vpddata(ahd, &vpd); - if (bootverbose) + if (bootverbose) printf("%s: VPD parsing %s\n", ahd_name(ahd), error == 0 ? "successful" : "failed"); - if (bootverbose) + if (bootverbose) printf("%s: Reading SEEPROM...", ahd_name(ahd)); /* Address is always in units of 16bit words */ @@ -941,7 +941,7 @@ ahd_pci_intr(struct ahd_softc *ahd) u_int intstat; u_int i; u_int reg; - + intstat = ahd_inb(ahd, INTSTAT); if ((intstat & SPLTINT) != 0) @@ -965,7 +965,7 @@ ahd_pci_intr(struct ahd_softc *ahd) for (i = 0; i < 8; i++) { u_int bit; - + if (i == 5) continue; @@ -980,7 +980,7 @@ ahd_pci_intr(struct ahd_softc *ahd) pci_status_strings[bit], pci_status_source[i]); } - } + } } pci_status1 = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG); pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG , pci_status1); diff --git a/sys/dev/pci/drm/amd/amdgpu/ObjectID.h b/sys/dev/pci/drm/amd/amdgpu/ObjectID.h index 361559756..a0f0a17e2 100644 --- a/sys/dev/pci/drm/amd/amdgpu/ObjectID.h +++ b/sys/dev/pci/drm/amd/amdgpu/ObjectID.h @@ -1,5 +1,5 @@ /* -* Copyright 2006-2007 Advanced Micro Devices, Inc. +* Copyright 2006-2007 Advanced Micro Devices, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -37,13 +37,13 @@ #define GRAPH_OBJECT_TYPE_CONNECTOR 0x3 #define GRAPH_OBJECT_TYPE_ROUTER 0x4 /* deleted */ -#define GRAPH_OBJECT_TYPE_DISPLAY_PATH 0x6 +#define GRAPH_OBJECT_TYPE_DISPLAY_PATH 0x6 #define GRAPH_OBJECT_TYPE_GENERIC 0x7 /****************************************************/ /* Encoder Object ID Definition */ /****************************************************/ -#define ENCODER_OBJECT_ID_NONE 0x00 +#define ENCODER_OBJECT_ID_NONE 0x00 /* Radeon Class Display Hardware */ #define ENCODER_OBJECT_ID_INTERNAL_LVDS 0x01 @@ -96,7 +96,7 @@ /****************************************************/ /* Connector Object ID Definition */ /****************************************************/ -#define CONNECTOR_OBJECT_ID_NONE 0x00 +#define CONNECTOR_OBJECT_ID_NONE 0x00 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I 0x01 #define CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I 0x02 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D 0x03 @@ -158,7 +158,7 @@ #define RESERVED1_ID_MASK 0x0800 #define OBJECT_TYPE_MASK 0x7000 #define RESERVED2_ID_MASK 0x8000 - + #define OBJECT_ID_SHIFT 0x00 #define ENUM_ID_SHIFT 0x08 #define OBJECT_TYPE_SHIFT 0x0C @@ -179,14 +179,14 @@ /* Encoder Object ID definition - Shared with BIOS */ /****************************************************/ /* -#define ENCODER_INTERNAL_LVDS_ENUM_ID1 0x2101 +#define ENCODER_INTERNAL_LVDS_ENUM_ID1 0x2101 #define ENCODER_INTERNAL_TMDS1_ENUM_ID1 0x2102 #define ENCODER_INTERNAL_TMDS2_ENUM_ID1 0x2103 #define ENCODER_INTERNAL_DAC1_ENUM_ID1 0x2104 #define ENCODER_INTERNAL_DAC2_ENUM_ID1 0x2105 #define ENCODER_INTERNAL_SDVOA_ENUM_ID1 0x2106 #define ENCODER_INTERNAL_SDVOB_ENUM_ID1 0x2107 -#define ENCODER_SIL170B_ENUM_ID1 0x2108 +#define ENCODER_SIL170B_ENUM_ID1 0x2108 #define ENCODER_CH7303_ENUM_ID1 0x2109 #define ENCODER_CH7301_ENUM_ID1 0x210A #define ENCODER_INTERNAL_DVO1_ENUM_ID1 0x210B @@ -200,8 +200,8 @@ #define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1 0x2113 #define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1 0x2114 #define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1 0x2115 -#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 0x2116 -#define ENCODER_SI178_ENUM_ID1 0x2117 +#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 0x2116 +#define ENCODER_SI178_ENUM_ID1 0x2117 #define ENCODER_MVPU_FPGA_ENUM_ID1 0x2118 #define ENCODER_INTERNAL_DDI_ENUM_ID1 0x2119 #define ENCODER_VT1625_ENUM_ID1 0x211A @@ -316,7 +316,7 @@ #define ENCODER_SI178_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT) #define ENCODER_MVPU_FPGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ @@ -324,7 +324,7 @@ #define ENCODER_INTERNAL_DDI_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT) #define ENCODER_VT1625_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ @@ -352,7 +352,7 @@ #define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT) #define ENCODER_INTERNAL_UNIPHY1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c index 5552fa3c7..a15539e21 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_device.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -4023,12 +4024,15 @@ fence_driver_init: vga_client_register(adev->pdev, amdgpu_device_vga_set_decode); #endif - if (amdgpu_device_supports_px(ddev)) { - px = true; + px = amdgpu_device_supports_px(ddev); + + if (px || (!pci_is_thunderbolt_attached(adev->pdev) && + apple_gmux_detect(NULL, NULL))) vga_switcheroo_register_client(adev->pdev, &amdgpu_switcheroo_ops, px); + + if (px) vga_switcheroo_init_domain_pm_ops(adev->dev, &adev->vga_pm_domain); - } if (adev->gmc.xgmi.pending_reset) queue_delayed_work(system_wq, &mgpu_info.delayed_reset_work, @@ -4152,6 +4156,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) void amdgpu_device_fini_sw(struct amdgpu_device *adev) { int idx; + bool px; amdgpu_fence_driver_sw_fini(adev); amdgpu_device_ip_fini(adev); @@ -4171,10 +4176,16 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev) kfree(adev->bios); adev->bios = NULL; - if (amdgpu_device_supports_px(adev_to_drm(adev))) { + + px = amdgpu_device_supports_px(adev_to_drm(adev)); + + if (px || (!pci_is_thunderbolt_attached(adev->pdev) && + apple_gmux_detect(NULL, NULL))) vga_switcheroo_unregister_client(adev->pdev); + + if (px) vga_switcheroo_fini_domain_pm_ops(adev->dev); - } + if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA) vga_client_unregister(adev->pdev); @@ -6137,7 +6148,7 @@ int amdgpu_in_reset(struct amdgpu_device *adev) { return atomic_read(&adev->reset_domain->in_gpu_reset); } - + /** * amdgpu_device_halt() - bring hardware to some kind of halt state * diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c index ef9debc9c..d54444f92 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c @@ -3418,7 +3418,7 @@ amdgpu_init_backlight(struct amdgpu_device *adev) if (bd == NULL) return; - + drm_connector_list_iter_begin(dev, &conn_iter); drm_for_each_connector_iter(connector, &conn_iter) { if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS && diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c index 118580123..2c1285b26 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_object.c @@ -1100,7 +1100,7 @@ void amdgpu_bo_fini(struct amdgpu_device *adev) arch_io_free_memtype_wc(adev->gmc.aper_base, adev->gmc.aper_size); #else drm_mtrr_del(0, adev->gmc.aper_base, adev->gmc.aper_size, DRM_MTRR_WC); - + #endif } drm_dev_exit(idx); diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c index 00bb631d5..a1c8f2dc2 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vm.c @@ -101,7 +101,7 @@ amdgpu_vm_it_iter_next(struct amdgpu_bo_va_mapping *node, uint64_t start, static void amdgpu_vm_it_remove(struct amdgpu_bo_va_mapping *node, - struct rb_root_cached *root) + struct rb_root_cached *root) { rb_erase_cached(&node->rb, root); } diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c index 68e31cd1a..5c2050dac 100644 --- a/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v11_0.c @@ -1906,7 +1906,7 @@ static int gfx_v11_0_rlc_load_microcode(struct amdgpu_device *adev) if (version_minor == 3) gfx_v11_0_load_rlcp_rlcv_microcode(adev); } - + return 0; } @@ -3348,7 +3348,7 @@ static int gfx_v11_0_cp_compute_load_microcode(struct amdgpu_device *adev) } memcpy(fw, fw_data, fw_size); - + amdgpu_bo_kunmap(adev->gfx.mec.mec_fw_obj); amdgpu_bo_unreserve(adev->gfx.mec.mec_fw_obj); diff --git a/sys/dev/pci/drm/amd/amdgpu/imu_v11_0.c b/sys/dev/pci/drm/amd/amdgpu/imu_v11_0.c index d588a4939..8ec1b9699 100644 --- a/sys/dev/pci/drm/amd/amdgpu/imu_v11_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/imu_v11_0.c @@ -58,7 +58,7 @@ static int imu_v11_0_init_microcode(struct amdgpu_device *adev) imu_hdr = (const struct imu_firmware_header_v1_0 *)adev->gfx.imu_fw->data; adev->gfx.imu_fw_version = le32_to_cpu(imu_hdr->header.ucode_version); //adev->gfx.imu_feature_version = le32_to_cpu(imu_hdr->ucode_feature_version); - + if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { info = &adev->firmware.ucode[AMDGPU_UCODE_ID_IMU_I]; info->ucode_id = AMDGPU_UCODE_ID_IMU_I; @@ -240,9 +240,9 @@ static const struct imu_rlc_ram_golden imu_rlc_ram_golden_11[] = IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regGCMC_VM_AGP_BOT, 0x00000002, 0xe0000000), IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regGCMC_VM_AGP_TOP, 0x00000000, 0xe0000000), IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regGCVM_L2_PROTECTION_FAULT_CNTL2, 0x00020000, 0xe0000000), - IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regSDMA0_UCODE_SELFLOAD_CONTROL, 0x00000210, 0), - IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regSDMA1_UCODE_SELFLOAD_CONTROL, 0x00000210, 0), - IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regCPC_PSP_DEBUG, CPC_PSP_DEBUG__GPA_OVERRIDE_MASK, 0), + IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regSDMA0_UCODE_SELFLOAD_CONTROL, 0x00000210, 0), + IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regSDMA1_UCODE_SELFLOAD_CONTROL, 0x00000210, 0), + IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regCPC_PSP_DEBUG, CPC_PSP_DEBUG__GPA_OVERRIDE_MASK, 0), IMU_RLC_RAM_GOLDEN_VALUE(GC, 0, regCPG_PSP_DEBUG, CPG_PSP_DEBUG__GPA_OVERRIDE_MASK, 0) }; diff --git a/sys/dev/pci/drm/amd/amdgpu/mxgpu_ai.c b/sys/dev/pci/drm/amd/amdgpu/mxgpu_ai.c index f2b487573..0c16f2977 100644 --- a/sys/dev/pci/drm/amd/amdgpu/mxgpu_ai.c +++ b/sys/dev/pci/drm/amd/amdgpu/mxgpu_ai.c @@ -186,7 +186,7 @@ static int xgpu_ai_send_access_requests(struct amdgpu_device *adev, /* Dummy REQ_GPU_INIT_DATA handling */ r = xgpu_ai_poll_msg(adev, IDH_REQ_GPU_INIT_DATA_READY); /* version set to 0 since dummy */ - adev->virt.req_init_data_ver = 0; + adev->virt.req_init_data_ver = 0; } return 0; diff --git a/sys/dev/pci/drm/amd/amdgpu/sdma_v5_0.c b/sys/dev/pci/drm/amd/amdgpu/sdma_v5_0.c index 8a9b9786a..4c9e51093 100644 --- a/sys/dev/pci/drm/amd/amdgpu/sdma_v5_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/sdma_v5_0.c @@ -273,7 +273,7 @@ static int sdma_v5_0_init_microcode(struct amdgpu_device *adev) if (ret) return ret; } - + return ret; } diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 83013ee79..0345a52e5 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1765,7 +1765,8 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) dc_deinit_callbacks(adev->dm.dc); #endif - dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv); + if (adev->dm.dc) + dc_dmub_srv_destroy(&adev->dm.dc->ctx->dmub_srv); if (dc_enable_dmub_notifications(adev->dm.dc)) { kfree(adev->dm.dmub_notify); diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c index 26291db0a..872d06fe1 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c @@ -122,6 +122,9 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) psr_config.allow_multi_disp_optimizations = (amdgpu_dc_feature_mask & DC_PSR_ALLOW_MULTI_DISP_OPT); + if (!psr_su_set_y_granularity(dc, link, stream, &psr_config)) + return false; + ret = dc_link_setup_psr(link, stream, &psr_config, &psr_context); } diff --git a/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h b/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h index 3e5df27aa..1ce19d875 100644 --- a/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h +++ b/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.h @@ -26,6 +26,8 @@ #ifndef DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_ #define DAL_DC_RN_CLK_MGR_VBIOS_SMU_H_ +enum dcn_pwr_state; + int rn_vbios_smu_get_smu_version(struct clk_mgr_internal *clk_mgr); int rn_vbios_smu_set_dispclk(struct clk_mgr_internal *clk_mgr, int requested_dispclk_khz); int rn_vbios_smu_set_dprefclk(struct clk_mgr_internal *clk_mgr); @@ -33,7 +35,7 @@ int rn_vbios_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int reque int rn_vbios_smu_set_min_deep_sleep_dcfclk(struct clk_mgr_internal *clk_mgr, int requested_min_ds_dcfclk_khz); void rn_vbios_smu_set_phyclk(struct clk_mgr_internal *clk_mgr, int requested_phyclk_khz); int rn_vbios_smu_set_dppclk(struct clk_mgr_internal *clk_mgr, int requested_dpp_khz); -void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, int display_count); +void rn_vbios_smu_set_dcn_low_power_state(struct clk_mgr_internal *clk_mgr, enum dcn_pwr_state); void rn_vbios_smu_enable_48mhz_tmdp_refclk_pwrdwn(struct clk_mgr_internal *clk_mgr, bool enable); void rn_vbios_smu_enable_pme_wa(struct clk_mgr_internal *clk_mgr); int rn_vbios_smu_is_periodic_retraining_disabled(struct clk_mgr_internal *clk_mgr); diff --git a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c index 020f512e9..e958f838c 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.c @@ -1641,7 +1641,8 @@ noinline bool dcn30_internal_validate_bw( display_e2e_pipe_params_st *pipes, int *pipe_cnt_out, int *vlevel_out, - bool fast_validate) + bool fast_validate, + bool allow_self_refresh_only) { bool out = false; bool repopulate_pipes = false; @@ -1668,7 +1669,7 @@ noinline bool dcn30_internal_validate_bw( dml_log_pipe_params(&context->bw_ctx.dml, pipes, pipe_cnt); - if (!fast_validate) { + if (!fast_validate || !allow_self_refresh_only) { /* * DML favors voltage over p-state, but we're more interested in * supporting p-state over voltage. We can't support p-state in @@ -1681,11 +1682,12 @@ noinline bool dcn30_internal_validate_bw( if (vlevel < context->bw_ctx.dml.soc.num_states) vlevel = dcn20_validate_apply_pipe_split_flags(dc, context, vlevel, split, merge); } - if (fast_validate || vlevel == context->bw_ctx.dml.soc.num_states || - vba->DRAMClockChangeSupport[vlevel][vba->maxMpcComb] == dm_dram_clock_change_unsupported) { + if (allow_self_refresh_only && + (fast_validate || vlevel == context->bw_ctx.dml.soc.num_states || + vba->DRAMClockChangeSupport[vlevel][vba->maxMpcComb] == dm_dram_clock_change_unsupported)) { /* - * If mode is unsupported or there's still no p-state support then - * fall back to favoring voltage. + * If mode is unsupported or there's still no p-state support + * then fall back to favoring voltage. * * We don't actually support prefetch mode 2, so require that we * at least support prefetch mode 1. @@ -2056,7 +2058,7 @@ bool dcn30_validate_bandwidth(struct dc *dc, BW_VAL_TRACE_COUNT(); DC_FP_START(); - out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate); + out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate, true); DC_FP_END(); if (pipe_cnt == 0) diff --git a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.h b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.h index 7d063c7d6..8e6b8b736 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.h +++ b/sys/dev/pci/drm/amd/display/dc/dcn30/dcn30_resource.h @@ -64,7 +64,8 @@ bool dcn30_internal_validate_bw( display_e2e_pipe_params_st *pipes, int *pipe_cnt_out, int *vlevel_out, - bool fast_validate); + bool fast_validate, + bool allow_self_refresh_only); void dcn30_calculate_wm_and_dlg( struct dc *dc, struct dc_state *context, display_e2e_pipe_params_st *pipes, diff --git a/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c index fddc21a5a..d825f11b4 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c @@ -1770,7 +1770,7 @@ bool dcn31_validate_bandwidth(struct dc *dc, BW_VAL_TRACE_COUNT(); DC_FP_START(); - out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate); + out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate, true); DC_FP_END(); // Disable fast_validate to set min dcfclk in alculate_wm_and_dlg diff --git a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c index 9918bccd6..ffaa4e5b3 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c @@ -1689,6 +1689,81 @@ static void dcn314_get_panel_config_defaults(struct dc_panel_config *panel_confi *panel_config = panel_config_defaults; } +static bool filter_modes_for_single_channel_workaround(struct dc *dc, + struct dc_state *context) +{ + // Filter 2K@240Hz+8K@24fps above combination timing if memory only has single dimm LPDDR + if (dc->clk_mgr->bw_params->vram_type == 34 && dc->clk_mgr->bw_params->num_channels < 2) { + int total_phy_pix_clk = 0; + + for (int i = 0; i < context->stream_count; i++) + if (context->res_ctx.pipe_ctx[i].stream) + total_phy_pix_clk += context->res_ctx.pipe_ctx[i].stream->phy_pix_clk; + + if (total_phy_pix_clk >= (1148928+826260)) //2K@240Hz+8K@24fps + return true; + } + return false; +} + +bool dcn314_validate_bandwidth(struct dc *dc, + struct dc_state *context, + bool fast_validate) +{ + bool out = false; + + BW_VAL_TRACE_SETUP(); + + int vlevel = 0; + int pipe_cnt = 0; + display_e2e_pipe_params_st *pipes = kzalloc(dc->res_pool->pipe_count * sizeof(display_e2e_pipe_params_st), GFP_KERNEL); + DC_LOGGER_INIT(dc->ctx->logger); + + BW_VAL_TRACE_COUNT(); + + if (filter_modes_for_single_channel_workaround(dc, context)) + goto validate_fail; + + DC_FP_START(); + // do not support self refresh only + out = dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, fast_validate, false); + DC_FP_END(); + + // Disable fast_validate to set min dcfclk in calculate_wm_and_dlg + if (pipe_cnt == 0) + fast_validate = false; + + if (!out) + goto validate_fail; + + BW_VAL_TRACE_END_VOLTAGE_LEVEL(); + + if (fast_validate) { + BW_VAL_TRACE_SKIP(fast); + goto validate_out; + } + + dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel); + + BW_VAL_TRACE_END_WATERMARKS(); + + goto validate_out; + +validate_fail: + DC_LOG_WARNING("Mode Validation Warning: %s failed validation.\n", + dml_get_status_message(context->bw_ctx.dml.vba.ValidationStatus[context->bw_ctx.dml.vba.soc.num_states])); + + BW_VAL_TRACE_SKIP(fail); + out = false; + +validate_out: + kfree(pipes); + + BW_VAL_TRACE_FINISH(); + + return out; +} + static struct resource_funcs dcn314_res_pool_funcs = { .destroy = dcn314_destroy_resource_pool, .link_enc_create = dcn31_link_encoder_create, @@ -1696,7 +1771,7 @@ static struct resource_funcs dcn314_res_pool_funcs = { .link_encs_assign = link_enc_cfg_link_encs_assign, .link_enc_unassign = link_enc_cfg_link_enc_unassign, .panel_cntl_create = dcn31_panel_cntl_create, - .validate_bandwidth = dcn31_validate_bandwidth, + .validate_bandwidth = dcn314_validate_bandwidth, .calculate_wm_and_dlg = dcn31_calculate_wm_and_dlg, .update_soc_for_wm_a = dcn31_update_soc_for_wm_a, .populate_dml_pipes = dcn314_populate_dml_pipes_from_context, diff --git a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.h b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.h index 0dd3153aa..49ffe7101 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.h +++ b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.h @@ -39,6 +39,10 @@ struct dcn314_resource_pool { struct resource_pool base; }; +bool dcn314_validate_bandwidth(struct dc *dc, + struct dc_state *context, + bool fast_validate); + struct resource_pool *dcn314_create_resource_pool( const struct dc_init_data *init_data, struct dc *dc); diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c b/sys/dev/pci/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c index e1e92daba..990dbd736 100644 --- a/sys/dev/pci/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +++ b/sys/dev/pci/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c @@ -636,7 +636,7 @@ int dcn30_find_dummy_latency_index_for_fw_based_mclk_switch(struct dc *dc, while (dummy_latency_index < max_latency_table_entries) { context->bw_ctx.dml.soc.dram_clock_change_latency_us = dc->clk_mgr->bw_params->dummy_pstate_table[dummy_latency_index].dummy_pstate_latency_us; - dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, false); + dcn30_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, false, true); if (context->bw_ctx.dml.soc.allow_dram_self_refresh_or_dram_clock_change_in_vblank == dm_allow_self_refresh_and_mclk_switch) diff --git a/sys/dev/pci/drm/amd/display/modules/power/power_helpers.c b/sys/dev/pci/drm/amd/display/modules/power/power_helpers.c index 235259d6c..9edd39322 100644 --- a/sys/dev/pci/drm/amd/display/modules/power/power_helpers.c +++ b/sys/dev/pci/drm/amd/display/modules/power/power_helpers.c @@ -907,3 +907,38 @@ bool mod_power_only_edp(const struct dc_state *context, const struct dc_stream_s { return context && context->stream_count == 1 && dc_is_embedded_signal(stream->signal); } + +bool psr_su_set_y_granularity(struct dc *dc, struct dc_link *link, + struct dc_stream_state *stream, + struct psr_config *config) +{ + uint16_t pic_height; + uint8_t slice_height; + + if ((link->connector_signal & SIGNAL_TYPE_EDP) && + (!dc->caps.edp_dsc_support || + link->panel_config.dsc.disable_dsc_edp || + !link->dpcd_caps.dsc_caps.dsc_basic_caps.fields.dsc_support.DSC_SUPPORT || + !stream->timing.dsc_cfg.num_slices_v)) + return true; + + pic_height = stream->timing.v_addressable + + stream->timing.v_border_top + stream->timing.v_border_bottom; + + if (stream->timing.dsc_cfg.num_slices_v == 0) + return false; + + slice_height = pic_height / stream->timing.dsc_cfg.num_slices_v; + + if (slice_height) { + if (config->su_y_granularity && + (slice_height % config->su_y_granularity)) { + ASSERT(0); + return false; + } + + config->su_y_granularity = slice_height; + } + + return true; +} diff --git a/sys/dev/pci/drm/amd/display/modules/power/power_helpers.h b/sys/dev/pci/drm/amd/display/modules/power/power_helpers.h index 316452e9d..bb16b37b8 100644 --- a/sys/dev/pci/drm/amd/display/modules/power/power_helpers.h +++ b/sys/dev/pci/drm/amd/display/modules/power/power_helpers.h @@ -59,4 +59,7 @@ void mod_power_calc_psr_configs(struct psr_config *psr_config, const struct dc_stream_state *stream); bool mod_power_only_edp(const struct dc_state *context, const struct dc_stream_state *stream); +bool psr_su_set_y_granularity(struct dc *dc, struct dc_link *link, + struct dc_stream_state *stream, + struct psr_config *config); #endif /* MODULES_POWER_POWER_HELPERS_H_ */ diff --git a/sys/dev/pci/drm/amd/include/amd_shared.h b/sys/dev/pci/drm/amd/include/amd_shared.h index 46ed216f0..f175e65b8 100644 --- a/sys/dev/pci/drm/amd/include/amd_shared.h +++ b/sys/dev/pci/drm/amd/include/amd_shared.h @@ -60,7 +60,7 @@ enum amd_apu_flags { * acquires the list of IP blocks for the GPU in use on initialization. * It can then operate on this list to perform standard driver operations * such as: init, fini, suspend, resume, etc. -* +* * * IP block implementations are named using the following convention: * _v (E.g.: gfx_v6_0). diff --git a/sys/dev/pci/drm/amd/include/atomfirmware.h b/sys/dev/pci/drm/amd/include/atomfirmware.h index 4eb42d4df..ff855cb21 100644 --- a/sys/dev/pci/drm/amd/include/atomfirmware.h +++ b/sys/dev/pci/drm/amd/include/atomfirmware.h @@ -1,5 +1,5 @@ /****************************************************************************\ -* +* * File Name atomfirmware.h * Project This is an interface header file between atombios and OS GPU drivers for SoC15 products * @@ -7,7 +7,7 @@ * * Copyright 2014 Advanced Micro Devices, Inc. * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software * and associated documentation files (the "Software"), to deal in the Software without restriction, * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, @@ -49,7 +49,7 @@ enum atom_bios_header_version_def{ typedef unsigned short uint16_t; #endif - #ifndef uint8_t + #ifndef uint8_t typedef unsigned char uint8_t; #endif #endif @@ -203,7 +203,7 @@ enum atom_dp_vs_preemph_def{ /* enum atom_string_def{ -asic_bus_type_pcie_string = "PCI_EXPRESS", +asic_bus_type_pcie_string = "PCI_EXPRESS", atom_fire_gl_string = "FGL", atom_bios_string = "ATOM" }; @@ -222,26 +222,26 @@ enum atombios_image_offset{ OFFSET_TO_VBIOS_DATE = 0x50, }; -/**************************************************************************** +/**************************************************************************** * Common header for all tables (Data table, Command function). -* Every table pointed in _ATOM_MASTER_DATA_TABLE has this common header. +* Every table pointed in _ATOM_MASTER_DATA_TABLE has this common header. * And the pointer actually points to this header. -****************************************************************************/ +****************************************************************************/ struct atom_common_table_header { uint16_t structuresize; - uint8_t format_revision; //mainly used for a hw function, when the parser is not backward compatible - uint8_t content_revision; //change it when a data table has a structure change, or a hw function has a input/output parameter change + uint8_t format_revision; //mainly used for a hw function, when the parser is not backward compatible + uint8_t content_revision; //change it when a data table has a structure change, or a hw function has a input/output parameter change }; -/**************************************************************************** +/**************************************************************************** * Structure stores the ROM header. -****************************************************************************/ +****************************************************************************/ struct atom_rom_header_v2_2 { struct atom_common_table_header table_header; - uint8_t atom_bios_string[4]; //enum atom_string_def atom_bios_string; //Signature to distinguish between Atombios and non-atombios, + uint8_t atom_bios_string[4]; //enum atom_string_def atom_bios_string; //Signature to distinguish between Atombios and non-atombios, uint16_t bios_segment_address; uint16_t protectedmodeoffset; uint16_t configfilenameoffset; @@ -262,33 +262,33 @@ struct atom_rom_header_v2_2 /*==============================hw function portion======================================================================*/ -/**************************************************************************** +/**************************************************************************** * Structures used in Command.mtb, each function name is not given here since those function could change from time to time * The real functionality of each function is associated with the parameter structure version when defined * For all internal cmd function definitions, please reference to atomstruct.h -****************************************************************************/ +****************************************************************************/ struct atom_master_list_of_command_functions_v2_1{ uint16_t asic_init; //Function uint16_t cmd_function1; //used as an internal one uint16_t cmd_function2; //used as an internal one uint16_t cmd_function3; //used as an internal one - uint16_t digxencodercontrol; //Function + uint16_t digxencodercontrol; //Function uint16_t cmd_function5; //used as an internal one - uint16_t cmd_function6; //used as an internal one + uint16_t cmd_function6; //used as an internal one uint16_t cmd_function7; //used as an internal one uint16_t cmd_function8; //used as an internal one uint16_t cmd_function9; //used as an internal one uint16_t setengineclock; //Function uint16_t setmemoryclock; //Function uint16_t setpixelclock; //Function - uint16_t enabledisppowergating; //Function - uint16_t cmd_function14; //used as an internal one + uint16_t enabledisppowergating; //Function + uint16_t cmd_function14; //used as an internal one uint16_t cmd_function15; //used as an internal one uint16_t cmd_function16; //used as an internal one uint16_t cmd_function17; //used as an internal one uint16_t cmd_function18; //used as an internal one - uint16_t cmd_function19; //used as an internal one - uint16_t cmd_function20; //used as an internal one + uint16_t cmd_function19; //used as an internal one + uint16_t cmd_function20; //used as an internal one uint16_t cmd_function21; //used as an internal one uint16_t cmd_function22; //used as an internal one uint16_t cmd_function23; //used as an internal one @@ -315,20 +315,20 @@ struct atom_master_list_of_command_functions_v2_1{ uint16_t cmd_function44; //used as an internal one uint16_t cmd_function45; //used as an internal one uint16_t setdceclock; //Function - uint16_t getmemoryclock; //Function - uint16_t getengineclock; //Function + uint16_t getmemoryclock; //Function + uint16_t getengineclock; //Function uint16_t setcrtc_usingdtdtiming; //Function - uint16_t externalencodercontrol; //Function + uint16_t externalencodercontrol; //Function uint16_t cmd_function51; //used as an internal one uint16_t cmd_function52; //used as an internal one uint16_t cmd_function53; //used as an internal one - uint16_t processi2cchanneltransaction;//Function + uint16_t processi2cchanneltransaction;//Function uint16_t cmd_function55; //used as an internal one uint16_t cmd_function56; //used as an internal one uint16_t cmd_function57; //used as an internal one uint16_t cmd_function58; //used as an internal one uint16_t cmd_function59; //used as an internal one - uint16_t computegpuclockparam; //Function + uint16_t computegpuclockparam; //Function uint16_t cmd_function61; //used as an internal one uint16_t cmd_function62; //used as an internal one uint16_t dynamicmemorysettings; //Function function @@ -338,7 +338,7 @@ struct atom_master_list_of_command_functions_v2_1{ uint16_t setvoltage; //Function uint16_t cmd_function68; //used as an internal one uint16_t readefusevalue; //Function - uint16_t cmd_function70; //used as an internal one + uint16_t cmd_function70; //used as an internal one uint16_t cmd_function71; //used as an internal one uint16_t cmd_function72; //used as an internal one uint16_t cmd_function73; //used as an internal one @@ -357,26 +357,26 @@ struct atom_master_command_function_v2_1 struct atom_master_list_of_command_functions_v2_1 listofcmdfunctions; }; -/**************************************************************************** +/**************************************************************************** * Structures used in every command function -****************************************************************************/ +****************************************************************************/ struct atom_function_attribute { - uint16_t ws_in_bytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), - uint16_t ps_in_bytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), + uint16_t ws_in_bytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), + uint16_t ps_in_bytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), uint16_t updated_by_util:1; //[15]=flag to indicate the function is updated by util }; -/**************************************************************************** +/**************************************************************************** * Common header for all hw functions. -* Every function pointed by _master_list_of_hw_function has this common header. +* Every function pointed by _master_list_of_hw_function has this common header. * And the pointer actually points to this header. -****************************************************************************/ +****************************************************************************/ struct atom_rom_hw_function_header { struct atom_common_table_header func_header; - struct atom_function_attribute func_attrib; + struct atom_function_attribute func_attrib; }; @@ -387,25 +387,25 @@ struct atom_rom_hw_function_header ****************************************************************************/ struct atom_master_list_of_data_tables_v2_1{ uint16_t utilitypipeline; /* Offest for the utility to get parser info,Don't change this position!*/ - uint16_t multimedia_info; + uint16_t multimedia_info; uint16_t smc_dpm_info; - uint16_t sw_datatable3; + uint16_t sw_datatable3; uint16_t firmwareinfo; /* Shared by various SW components */ uint16_t sw_datatable5; uint16_t lcd_info; /* Shared by various SW components */ uint16_t sw_datatable7; - uint16_t smu_info; + uint16_t smu_info; uint16_t sw_datatable9; - uint16_t sw_datatable10; + uint16_t sw_datatable10; uint16_t vram_usagebyfirmware; /* Shared by various SW components */ uint16_t gpio_pin_lut; /* Shared by various SW components */ - uint16_t sw_datatable13; + uint16_t sw_datatable13; uint16_t gfx_info; uint16_t powerplayinfo; /* Shared by various SW components */ - uint16_t sw_datatable16; + uint16_t sw_datatable16; uint16_t sw_datatable17; uint16_t sw_datatable18; - uint16_t sw_datatable19; + uint16_t sw_datatable19; uint16_t sw_datatable20; uint16_t sw_datatable21; uint16_t displayobjectinfo; /* Shared by various SW components */ @@ -425,7 +425,7 @@ struct atom_master_list_of_data_tables_v2_1{ struct atom_master_data_table_v2_1 -{ +{ struct atom_common_table_header table_header; struct atom_master_list_of_data_tables_v2_1 listOfdatatables; }; @@ -468,7 +468,7 @@ enum atom_dtd_format_modemiscinfo{ */ -/* +/* *************************************************************************** Data Table firmwareinfo structure *************************************************************************** @@ -482,12 +482,12 @@ struct atom_firmware_info_v3_1 uint32_t bootup_mclk_in10khz; uint32_t firmware_capability; // enum atombios_firmware_capability uint32_t main_call_parser_entry; /* direct address of main parser call in VBIOS binary. */ - uint32_t bios_scratch_reg_startaddr; // 1st bios scratch register dword address + uint32_t bios_scratch_reg_startaddr; // 1st bios scratch register dword address uint16_t bootup_vddc_mv; - uint16_t bootup_vddci_mv; + uint16_t bootup_vddci_mv; uint16_t bootup_mvddc_mv; uint16_t bootup_vddgfx_mv; - uint8_t mem_module_id; + uint8_t mem_module_id; uint8_t coolingsolution_id; /*0: Air cooling; 1: Liquid cooling ... */ uint8_t reserved1[2]; uint32_t mc_baseaddr_high; @@ -609,7 +609,7 @@ struct atom_firmware_info_v3_4 { uint32_t reserved[2]; }; -/* +/* *************************************************************************** Data Table lcd_info structure *************************************************************************** @@ -652,13 +652,13 @@ enum atom_lcd_info_panel_misc{ //uceDPToLVDSRxId enum atom_lcd_info_dptolvds_rx_id { - eDP_TO_LVDS_RX_DISABLE = 0x00, // no eDP->LVDS translator chip + eDP_TO_LVDS_RX_DISABLE = 0x00, // no eDP->LVDS translator chip eDP_TO_LVDS_COMMON_ID = 0x01, // common eDP->LVDS translator chip without AMD SW init eDP_TO_LVDS_REALTEK_ID = 0x02, // Realtek tansaltor which require AMD SW init }; - -/* + +/* *************************************************************************** Data Table gpio_pin_lut structure *************************************************************************** @@ -676,7 +676,7 @@ struct atom_gpio_pin_assignment /* atom_gpio_pin_assignment.gpio_id definition */ enum atom_gpio_pin_assignment_gpio_id { I2C_HW_LANE_MUX =0x0f, /* only valid when bit7=1 */ - I2C_HW_ENGINE_ID_MASK =0x70, /* only valid when bit7=1 */ + I2C_HW_ENGINE_ID_MASK =0x70, /* only valid when bit7=1 */ I2C_HW_CAP =0x80, /*only when the I2C_HW_CAP is set, the pin ID is assigned to an I2C pin pair, otherwise, it's an generic GPIO pin */ /* gpio_id pre-define id for multiple usage */ @@ -705,7 +705,7 @@ struct atom_gpio_pin_lut_v2_1 }; -/* +/* *************************************************************************** Data Table vram_usagebyfirmware structure *************************************************************************** @@ -716,11 +716,11 @@ struct vram_usagebyfirmware_v2_1 struct atom_common_table_header table_header; uint32_t start_address_in_kb; uint16_t used_by_firmware_in_kb; - uint16_t used_by_driver_in_kb; + uint16_t used_by_driver_in_kb; }; -/* +/* *************************************************************************** Data Table displayobjectinfo structure *************************************************************************** @@ -751,14 +751,14 @@ struct atom_common_record_header struct atom_i2c_record { struct atom_common_record_header record_header; //record_type = ATOM_I2C_RECORD_TYPE - uint8_t i2c_id; + uint8_t i2c_id; uint8_t i2c_slave_addr; //The slave address, it's 0 when the record is attached to connector for DDC }; struct atom_hpd_int_record { struct atom_common_record_header record_header; //record_type = ATOM_HPD_INT_RECORD_TYPE - uint8_t pin_id; //Corresponding block in GPIO_PIN_INFO table gives the pin info + uint8_t pin_id; //Corresponding block in GPIO_PIN_INFO table gives the pin info uint8_t plugin_pin_state; }; @@ -779,10 +779,10 @@ struct atom_connector_speed_record { enum atom_encoder_caps_def { ATOM_ENCODER_CAP_RECORD_HBR2 =0x01, // DP1.2 HBR2 is supported by HW encoder, it is retired in NI. the real meaning from SI is MST_EN - ATOM_ENCODER_CAP_RECORD_MST_EN =0x01, // from SI, this bit means DP MST is enable or not. - ATOM_ENCODER_CAP_RECORD_HBR2_EN =0x02, // DP1.2 HBR2 setting is qualified and HBR2 can be enabled - ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN =0x04, // HDMI2.0 6Gbps enable or not. - ATOM_ENCODER_CAP_RECORD_HBR3_EN =0x08, // DP1.3 HBR3 is supported by board. + ATOM_ENCODER_CAP_RECORD_MST_EN =0x01, // from SI, this bit means DP MST is enable or not. + ATOM_ENCODER_CAP_RECORD_HBR2_EN =0x02, // DP1.2 HBR2 setting is qualified and HBR2 can be enabled + ATOM_ENCODER_CAP_RECORD_HDMI6Gbps_EN =0x04, // HDMI2.0 6Gbps enable or not. + ATOM_ENCODER_CAP_RECORD_HBR3_EN =0x08, // DP1.3 HBR3 is supported by board. ATOM_ENCODER_CAP_RECORD_DP2 =0x10, // DP2 is supported by ASIC/board. ATOM_ENCODER_CAP_RECORD_UHBR10_EN =0x20, // DP2.0 UHBR10 settings is supported by board ATOM_ENCODER_CAP_RECORD_UHBR13_5_EN =0x40, // DP2.0 UHBR13.5 settings is supported by board @@ -799,13 +799,13 @@ struct atom_encoder_caps_record enum atom_connector_caps_def { ATOM_CONNECTOR_CAP_INTERNAL_DISPLAY = 0x01, //a cap bit to indicate that this non-embedded display connector is an internal display - ATOM_CONNECTOR_CAP_INTERNAL_DISPLAY_BL = 0x02, //a cap bit to indicate that this internal display requires BL control from GPU, refers to lcd_info for BL PWM freq + ATOM_CONNECTOR_CAP_INTERNAL_DISPLAY_BL = 0x02, //a cap bit to indicate that this internal display requires BL control from GPU, refers to lcd_info for BL PWM freq }; struct atom_disp_connector_caps_record { struct atom_common_record_header record_header; - uint32_t connectcaps; + uint32_t connectcaps; }; //The following generic object gpio pin control record type will replace JTAG_RECORD/FPGA_CONTROL_RECORD/DVI_EXT_INPUT_RECORD above gradually @@ -823,21 +823,21 @@ struct atom_object_gpio_cntl_record struct atom_gpio_pin_control_pair gpio[1]; // the real gpio pin pair determined by number of pins ucNumberOfPins }; -//Definitions for GPIO pin state +//Definitions for GPIO pin state enum atom_gpio_pin_control_pinstate_def { GPIO_PIN_TYPE_INPUT = 0x00, GPIO_PIN_TYPE_OUTPUT = 0x10, GPIO_PIN_TYPE_HW_CONTROL = 0x20, -//For GPIO_PIN_TYPE_OUTPUT the following is defined +//For GPIO_PIN_TYPE_OUTPUT the following is defined GPIO_PIN_OUTPUT_STATE_MASK = 0x01, GPIO_PIN_OUTPUT_STATE_SHIFT = 0, GPIO_PIN_STATE_ACTIVE_LOW = 0x0, GPIO_PIN_STATE_ACTIVE_HIGH = 0x1, }; -// Indexes to GPIO array in GLSync record +// Indexes to GPIO array in GLSync record // GLSync record is for Frame Lock/Gen Lock feature. enum atom_glsync_record_gpio_index_def { @@ -857,7 +857,7 @@ enum atom_glsync_record_gpio_index_def struct atom_connector_hpdpin_lut_record //record for ATOM_CONNECTOR_HPDPIN_LUT_RECORD_TYPE { struct atom_common_record_header record_header; - uint8_t hpd_pin_map[8]; + uint8_t hpd_pin_map[8]; }; struct atom_connector_auxddc_lut_record //record for ATOM_CONNECTOR_AUXDDC_LUT_RECORD_TYPE @@ -872,7 +872,7 @@ struct atom_connector_forced_tmds_cap_record // override TMDS capability on this connector when it operate in TMDS mode. usMaxTmdsClkRate = max TMDS Clock in Mhz/2.5 uint8_t maxtmdsclkrate_in2_5mhz; uint8_t reserved; -}; +}; struct atom_connector_layout_info { @@ -885,7 +885,7 @@ struct atom_connector_layout_info enum atom_connector_layout_info_connector_type_def { CONNECTOR_TYPE_DVI_D = 1, - + CONNECTOR_TYPE_HDMI = 4, CONNECTOR_TYPE_DISPLAY_PORT = 5, CONNECTOR_TYPE_MINI_DISPLAY_PORT = 6, @@ -936,7 +936,7 @@ struct atom_display_object_path_v2 uint16_t extencoderobjid; //2nd encoder after the first encoder, from the connector point of view; uint16_t encoder_recordoffset; uint16_t extencoder_recordoffset; - uint16_t device_tag; //a supported device vector, each display path starts with this.the paths are enumerated in the way of priority, a path appears first + uint16_t device_tag; //a supported device vector, each display path starts with this.the paths are enumerated in the way of priority, a path appears first uint8_t priority_id; uint8_t reserved; }; @@ -973,7 +973,7 @@ struct display_object_info_table_v1_5 { struct atom_display_object_path_v3 display_path[8]; }; -/* +/* *************************************************************************** Data Table dce_info structure *************************************************************************** @@ -986,18 +986,18 @@ struct atom_display_controller_info_v4_1 uint16_t dce_refclk_10khz; uint16_t i2c_engine_refclk_10khz; uint16_t dvi_ss_percentage; // in unit of 0.001% - uint16_t dvi_ss_rate_10hz; + uint16_t dvi_ss_rate_10hz; uint16_t hdmi_ss_percentage; // in unit of 0.001% uint16_t hdmi_ss_rate_10hz; uint16_t dp_ss_percentage; // in unit of 0.001% uint16_t dp_ss_rate_10hz; uint8_t dvi_ss_mode; // enum of atom_spread_spectrum_mode uint8_t hdmi_ss_mode; // enum of atom_spread_spectrum_mode - uint8_t dp_ss_mode; // enum of atom_spread_spectrum_mode + uint8_t dp_ss_mode; // enum of atom_spread_spectrum_mode uint8_t ss_reserved; uint8_t hardcode_mode_num; // a hardcode mode number defined in StandardVESA_TimingTable when a CRT or DFP EDID is not available uint8_t reserved1[3]; - uint16_t dpphy_refclk_10khz; + uint16_t dpphy_refclk_10khz; uint16_t reserved2; uint8_t dceip_min_ver; uint8_t dceip_max_ver; @@ -1013,11 +1013,11 @@ struct atom_display_controller_info_v4_1 struct atom_display_controller_info_v4_2 { struct atom_common_table_header table_header; - uint32_t display_caps; + uint32_t display_caps; uint32_t bootup_dispclk_10khz; uint16_t dce_refclk_10khz; uint16_t i2c_engine_refclk_10khz; - uint16_t dvi_ss_percentage; // in unit of 0.001% + uint16_t dvi_ss_percentage; // in unit of 0.001% uint16_t dvi_ss_rate_10hz; uint16_t hdmi_ss_percentage; // in unit of 0.001% uint16_t hdmi_ss_rate_10hz; @@ -1025,13 +1025,13 @@ struct atom_display_controller_info_v4_2 uint16_t dp_ss_rate_10hz; uint8_t dvi_ss_mode; // enum of atom_spread_spectrum_mode uint8_t hdmi_ss_mode; // enum of atom_spread_spectrum_mode - uint8_t dp_ss_mode; // enum of atom_spread_spectrum_mode + uint8_t dp_ss_mode; // enum of atom_spread_spectrum_mode uint8_t ss_reserved; uint8_t dfp_hardcode_mode_num; // DFP hardcode mode number defined in StandardVESA_TimingTable when EDID is not available uint8_t dfp_hardcode_refreshrate;// DFP hardcode mode refreshrate defined in StandardVESA_TimingTable when EDID is not available uint8_t vga_hardcode_mode_num; // VGA hardcode mode number defined in StandardVESA_TimingTable when EDID is not avablable uint8_t vga_hardcode_refreshrate;// VGA hardcode mode number defined in StandardVESA_TimingTable when EDID is not avablable - uint16_t dpphy_refclk_10khz; + uint16_t dpphy_refclk_10khz; uint16_t reserved2; uint8_t dcnip_min_ver; uint8_t dcnip_max_ver; @@ -1201,15 +1201,15 @@ struct atom_display_controller_info_v4_5 uint32_t reserved[26]; }; -/* +/* *************************************************************************** Data Table ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO structure *************************************************************************** */ struct atom_ext_display_path { - uint16_t device_tag; //A bit vector to show what devices are supported - uint16_t device_acpi_enum; //16bit device ACPI id. + uint16_t device_tag; //A bit vector to show what devices are supported + uint16_t device_acpi_enum; //16bit device ACPI id. uint16_t connectorobjid; //A physical connector for displays to plug in, using object connector definitions uint8_t auxddclut_index; //An index into external AUX/DDC channel LUT uint8_t hpdlut_index; //An index into external HPD pin LUT @@ -1217,7 +1217,7 @@ struct atom_ext_display_path uint8_t channelmapping; // if ucChannelMapping=0, using default one to one mapping uint8_t chpninvert; // bit vector for up to 8 lanes, =0: P and N is not invert, =1 P and N is inverted uint16_t caps; - uint16_t reserved; + uint16_t reserved; }; //usCaps @@ -1235,7 +1235,7 @@ struct atom_external_display_connection_info struct atom_common_table_header table_header; uint8_t guid[16]; // a GUID is a 16 byte long string struct atom_ext_display_path path[7]; // total of fixed 7 entries. - uint8_t checksum; // a simple Checksum of the sum of whole structure equal to 0x0. + uint8_t checksum; // a simple Checksum of the sum of whole structure equal to 0x0. uint8_t stereopinid; // use for eDP panel uint8_t remotedisplayconfig; uint8_t edptolvdsrxid; @@ -1243,7 +1243,7 @@ struct atom_external_display_connection_info uint8_t reserved[3]; // for potential expansion }; -/* +/* *************************************************************************** Data Table integratedsysteminfo structure *************************************************************************** @@ -1287,7 +1287,7 @@ struct atom_14nm_dpphy_dvihdmi_tuningset { uint32_t max_symclk_in10khz; uint8_t encoder_mode; //atom_encode_mode_def, =2: DVI, =3: HDMI mode - uint8_t phy_sel; //bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf + uint8_t phy_sel; //bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf uint16_t margindeemph; //COMMON_MAR_DEEMPH_NOM[7:0]tx_margin_nom [15:8]deemph_gen1_nom uint8_t deemph_6db_4; //COMMON_SELDEEMPH60[31:24]deemph_6db_4 uint8_t boostadj; //CMD_BUS_GLOBAL_FOR_TX_LANE0 [19:16]tx_boost_adj [20]tx_boost_en [23:22]tx_binary_ron_code_offset @@ -1303,16 +1303,16 @@ struct atom_14nm_dpphy_dp_setting{ }; struct atom_14nm_dpphy_dp_tuningset{ - uint8_t phy_sel; // bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf + uint8_t phy_sel; // bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf uint8_t version; uint16_t table_size; // size of atom_14nm_dpphy_dp_tuningset uint16_t reserved; struct atom_14nm_dpphy_dp_setting dptuning[10]; }; -struct atom_14nm_dig_transmitter_info_header_v4_0{ - struct atom_common_table_header table_header; - uint16_t pcie_phy_tmds_hdmi_macro_settings_offset; // offset of PCIEPhyTMDSHDMIMacroSettingsTbl +struct atom_14nm_dig_transmitter_info_header_v4_0{ + struct atom_common_table_header table_header; + uint16_t pcie_phy_tmds_hdmi_macro_settings_offset; // offset of PCIEPhyTMDSHDMIMacroSettingsTbl uint16_t uniphy_vs_emph_lookup_table_offset; // offset of UniphyVSEmphLookUpTbl uint16_t uniphy_xbar_settings_table_offset; // offset of UniphyXbarSettingsTbl }; @@ -1326,14 +1326,14 @@ struct atom_14nm_combphy_tmds_vs_set uint8_t common_seldeemph60__deemph_6db_4_val; uint8_t cmd_bus_global_for_tx_lane0__boostadj_val ; uint8_t common_zcalcode_ctrl__tx_driver_fifty_ohms_val; - uint8_t margin_deemph_lane0__deemph_sel_val; + uint8_t margin_deemph_lane0__deemph_sel_val; }; struct atom_DCN_dpphy_dvihdmi_tuningset { uint32_t max_symclk_in10khz; uint8_t encoder_mode; //atom_encode_mode_def, =2: DVI, =3: HDMI mode - uint8_t phy_sel; //bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf + uint8_t phy_sel; //bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf uint8_t tx_eq_main; // map to RDPCSTX_PHY_FUSE0/1/2/3[5:0](EQ_MAIN) uint8_t tx_eq_pre; // map to RDPCSTX_PHY_FUSE0/1/2/3[11:6](EQ_PRE) uint8_t tx_eq_post; // map to RDPCSTX_PHY_FUSE0/1/2/3[17:12](EQ_POST) @@ -1351,7 +1351,7 @@ struct atom_DCN_dpphy_dp_setting{ }; struct atom_DCN_dpphy_dp_tuningset{ - uint8_t phy_sel; // bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf + uint8_t phy_sel; // bit vector of phy, bit0= phya, bit1=phyb, ....bit5 = phyf uint8_t version; uint16_t table_size; // size of atom_14nm_dpphy_dp_setting uint16_t reserved; @@ -1375,10 +1375,10 @@ struct atom_integrated_system_info_v1_11 { struct atom_common_table_header table_header; uint32_t vbios_misc; //enum of atom_system_vbiosmisc_def - uint32_t gpucapinfo; //enum of atom_system_gpucapinf_def - uint32_t system_config; + uint32_t gpucapinfo; //enum of atom_system_gpucapinf_def + uint32_t system_config; uint32_t cpucapinfo; - uint16_t gpuclk_ss_percentage; //unit of 0.001%, 1000 mean 1% + uint16_t gpuclk_ss_percentage; //unit of 0.001%, 1000 mean 1% uint16_t gpuclk_ss_type; uint16_t lvds_ss_percentage; //unit of 0.001%, 1000 mean 1% uint16_t lvds_ss_rate_10hz; @@ -1424,10 +1424,10 @@ struct atom_integrated_system_info_v1_12 { struct atom_common_table_header table_header; uint32_t vbios_misc; //enum of atom_system_vbiosmisc_def - uint32_t gpucapinfo; //enum of atom_system_gpucapinf_def - uint32_t system_config; + uint32_t gpucapinfo; //enum of atom_system_gpucapinf_def + uint32_t system_config; uint32_t cpucapinfo; - uint16_t gpuclk_ss_percentage; //unit of 0.001%, 1000 mean 1% + uint16_t gpuclk_ss_percentage; //unit of 0.001%, 1000 mean 1% uint16_t gpuclk_ss_type; uint16_t lvds_ss_percentage; //unit of 0.001%, 1000 mean 1% uint16_t lvds_ss_rate_10hz; @@ -1457,7 +1457,7 @@ struct atom_integrated_system_info_v1_12 struct atom_DCN_dpphy_dvihdmi_tuningset hdmiCLK5_tuningset; struct atom_DCN_dpphy_dvihdmi_tuningset hdmiCLK8_tuningset; struct atom_DCN_dpphy_dp_tuningset rbr_tuningset; // rbr 1.62G dp tuning set - struct atom_DCN_dpphy_dp_tuningset hbr3_tuningset; // HBR3 dp tuning set + struct atom_DCN_dpphy_dp_tuningset hbr3_tuningset; // HBR3 dp tuning set struct atom_camera_data camera_info; struct atom_hdmi_retimer_redriver_set dp0_retimer_set; //for DP0 struct atom_hdmi_retimer_redriver_set dp1_retimer_set; //for DP1 @@ -1596,7 +1596,7 @@ enum atom_sysinfo_dpphy_override_def{ ATOM_ENABLE_HDMI_TUNINGSET = 0x02, ATOM_ENABLE_HDMI6G_TUNINGSET = 0x04, ATOM_ENABLE_DP_TUNINGSET = 0x08, - ATOM_ENABLE_DP_HBR3_TUNINGSET = 0x10, + ATOM_ENABLE_DP_HBR3_TUNINGSET = 0x10, }; //lvds_misc @@ -1645,15 +1645,15 @@ enum atom_dmi_t17_mem_type_def{ }; -// this Table is used starting from NL/AM, used by SBIOS and pass the IntegratedSystemInfoTable/PowerPlayInfoTable/SystemCameraInfoTable +// this Table is used starting from NL/AM, used by SBIOS and pass the IntegratedSystemInfoTable/PowerPlayInfoTable/SystemCameraInfoTable struct atom_fusion_system_info_v4 { struct atom_integrated_system_info_v1_11 sysinfo; // refer to ATOM_INTEGRATED_SYSTEM_INFO_V1_8 definition uint32_t powerplayinfo[256]; // Reserve 1024 bytes space for PowerPlayInfoTable -}; +}; -/* +/* *************************************************************************** Data Table gfx_info structure *************************************************************************** @@ -1674,10 +1674,10 @@ struct atom_gfx_info_v2_2 uint32_t regaddr_cp_dma_src_addr_hi; uint32_t regaddr_cp_dma_dst_addr; uint32_t regaddr_cp_dma_dst_addr_hi; - uint32_t regaddr_cp_dma_command; + uint32_t regaddr_cp_dma_command; uint32_t regaddr_cp_status; uint32_t regaddr_rlc_gpu_clock_32; - uint32_t rlc_gpu_timer_refclk; + uint32_t rlc_gpu_timer_refclk; }; struct atom_gfx_info_v2_3 { @@ -1814,7 +1814,7 @@ struct atom_gfx_info_v3_0 { uint32_t reserved[8]; }; -/* +/* *************************************************************************** Data Table smu_info structure *************************************************************************** @@ -1836,7 +1836,7 @@ struct atom_smu_info_v3_1 uint8_t vr0hot_gpio_bit; // GPIO bit shift in SMU_GPIOPAD_A configured for VR0 HOT event, =0xff means invalid uint8_t vr0hot_polarity; // GPIO polarity for VR0 HOT event uint8_t vr1hot_gpio_bit; // GPIO bit shift in SMU_GPIOPAD_A configured for VR1 HOT event , =0xff means invalid - uint8_t vr1hot_polarity; // GPIO polarity for VR1 HOT event + uint8_t vr1hot_polarity; // GPIO polarity for VR1 HOT event uint8_t fw_ctf_gpio_bit; // GPIO bit shift in SMU_GPIOPAD_A configured for CTF, =0xff means invalid uint8_t fw_ctf_polarity; // GPIO polarity for CTF }; @@ -2446,8 +2446,8 @@ struct atom_smc_dpm_info_v4_5 uint8_t VR0HotGpio; // GPIO pin configured for VR0 HOT event uint8_t VR0HotPolarity; // GPIO polarity for VR0 HOT event - uint8_t VR1HotGpio; // GPIO pin configured for VR1 HOT event - uint8_t VR1HotPolarity; // GPIO polarity for VR1 HOT event + uint8_t VR1HotGpio; // GPIO pin configured for VR1 HOT event + uint8_t VR1HotPolarity; // GPIO polarity for VR1 HOT event uint8_t GthrGpio; // GPIO pin configured for GTHR Event uint8_t GthrPolarity; // replace GPIO polarity for GTHR @@ -2479,11 +2479,11 @@ struct atom_smc_dpm_info_v4_5 // Total board power uint16_t TotalBoardPower; //Only needed for TCP Estimated case, where TCP = TGP+Total Board Power - uint16_t BoardPadding; + uint16_t BoardPadding; // Mvdd Svi2 Div Ratio Setting uint32_t MvddRatio; // This is used for MVDD Vid workaround. It has 16 fractional bits (Q16.16) - + uint32_t BoardReserved[9]; }; @@ -2696,7 +2696,7 @@ struct atom_smc_dpm_info_v4_9 //uint32_t GamingClk[6]; // SECTION: I2C Control - struct smudpm_i2c_controller_config_v3 I2cControllers[16]; + struct smudpm_i2c_controller_config_v3 I2cControllers[16]; uint8_t GpioScl; // GPIO Number for SCL Line, used only for CKSVII2C1 uint8_t GpioSda; // GPIO Number for SDA Line, used only for CKSVII2C1 @@ -2726,21 +2726,21 @@ struct atom_smc_dpm_info_v4_9 uint16_t Mem0MaxCurrent; // in Amps uint8_t Mem0Offset; // in Amps uint8_t Padding_TelemetryMem0; - + uint16_t Mem1MaxCurrent; // in Amps uint8_t Mem1Offset; // in Amps uint8_t Padding_TelemetryMem1; uint32_t MvddRatio; // This is used for MVDD Svi2 Div Ratio workaround. It has 16 fractional bits (Q16.16) - + // SECTION: GPIO Settings uint8_t AcDcGpio; // GPIO pin configured for AC/DC switching uint8_t AcDcPolarity; // GPIO polarity for AC/DC switching uint8_t VR0HotGpio; // GPIO pin configured for VR0 HOT event uint8_t VR0HotPolarity; // GPIO polarity for VR0 HOT event - uint8_t VR1HotGpio; // GPIO pin configured for VR1 HOT event - uint8_t VR1HotPolarity; // GPIO polarity for VR1 HOT event + uint8_t VR1HotGpio; // GPIO pin configured for VR1 HOT event + uint8_t VR1HotPolarity; // GPIO polarity for VR1 HOT event uint8_t GthrGpio; // GPIO pin configured for GTHR Event uint8_t GthrPolarity; // replace GPIO polarity for GTHR @@ -2755,7 +2755,7 @@ struct atom_smc_dpm_info_v4_9 uint8_t LedSpare1[2]; // SECTION: Clock Spread Spectrum - + // GFXCLK PLL Spread Spectrum uint8_t PllGfxclkSpreadEnabled; // on or off uint8_t PllGfxclkSpreadPercent; // Q4.4 @@ -2765,7 +2765,7 @@ struct atom_smc_dpm_info_v4_9 uint8_t DfllGfxclkSpreadEnabled; // on or off uint8_t DfllGfxclkSpreadPercent; // Q4.4 uint16_t DfllGfxclkSpreadFreq; // kHz - + // UCLK Spread Spectrum uint8_t UclkSpreadEnabled; // on or off uint8_t UclkSpreadPercent; // Q4.4 @@ -2775,17 +2775,17 @@ struct atom_smc_dpm_info_v4_9 uint8_t FclkSpreadEnabled; // on or off uint8_t FclkSpreadPercent; // Q4.4 uint16_t FclkSpreadFreq; // kHz - + // Section: Memory Config - uint32_t MemoryChannelEnabled; // For DRAM use only, Max 32 channels enabled bit mask. - + uint32_t MemoryChannelEnabled; // For DRAM use only, Max 32 channels enabled bit mask. + uint8_t DramBitWidth; // For DRAM use only. See Dram Bit width type defines uint8_t PaddingMem1[3]; // Section: Total Board Power uint16_t TotalBoardPower; //Only needed for TCP Estimated case, where TCP = TGP+Total Board Power - uint16_t BoardPowerPadding; - + uint16_t BoardPowerPadding; + // SECTION: XGMI Training uint8_t XgmiLinkSpeed [4]; uint8_t XgmiLinkWidth [4]; @@ -2852,7 +2852,7 @@ struct atom_smc_dpm_info_v4_10 uint32_t reserved[16]; }; -/* +/* *************************************************************************** Data Table asic_profiling_info structure *************************************************************************** @@ -2860,8 +2860,8 @@ struct atom_smc_dpm_info_v4_10 struct atom_asic_profiling_info_v4_1 { struct atom_common_table_header table_header; - uint32_t maxvddc; - uint32_t minvddc; + uint32_t maxvddc; + uint32_t minvddc; uint32_t avfs_meannsigma_acontant0; uint32_t avfs_meannsigma_acontant1; uint32_t avfs_meannsigma_acontant2; @@ -2877,7 +2877,7 @@ struct atom_asic_profiling_info_v4_1 uint32_t avfsgb_fuse_table_cksoff_m1; uint32_t avfsgb_fuse_table_cksoff_m2; uint32_t avfsgb_fuse_table_cksoff_b; - uint32_t avfsgb_fuse_table_ckson_m1; + uint32_t avfsgb_fuse_table_ckson_m1; uint32_t avfsgb_fuse_table_ckson_m2; uint32_t avfsgb_fuse_table_ckson_b; uint16_t max_voltage_0_25mv; @@ -2966,7 +2966,7 @@ struct atom_asic_profiling_info_v4_2 { uint32_t acg_phyclk2gfxclk_c; }; -/* +/* *************************************************************************** Data Table multimedia_info structure *************************************************************************** @@ -2981,13 +2981,13 @@ struct atom_multimedia_info_v2_1 uint16_t uvd_enc_max_input_width_pixels; uint16_t uvd_enc_max_input_height_pixels; uint16_t vce_enc_max_input_width_pixels; - uint16_t vce_enc_max_input_height_pixels; + uint16_t vce_enc_max_input_height_pixels; uint32_t uvd_enc_max_bandwidth; // 16x16 pixels/sec, codec independent uint32_t vce_enc_max_bandwidth; // 16x16 pixels/sec, codec independent }; -/* +/* *************************************************************************** Data Table umc_info structure *************************************************************************** @@ -3071,7 +3071,7 @@ enum atom_umc_config1_def { UMC_CONFIG1__ENABLE_ECC_CAPABLE = 0x00010000, }; -/* +/* *************************************************************************** Data Table vram_info structure *************************************************************************** @@ -3089,12 +3089,12 @@ struct atom_vram_module_v9 { uint8_t channel_num; // Number of mem. channels supported in this module uint8_t channel_width; // CHANNEL_16BIT/CHANNEL_32BIT/CHANNEL_64BIT uint8_t density; // _8Mx32, _16Mx32, _16Mx16, _32Mx16 - uint8_t tunningset_id; // MC phy registers set per. + uint8_t tunningset_id; // MC phy registers set per. uint8_t vender_rev_id; // [7:4] Revision, [3:0] Vendor code uint8_t refreshrate; // [1:0]=RefreshFactor (00=8ms, 01=16ms, 10=32ms,11=64ms) uint8_t hbm_ven_rev_id; // hbm_ven_rev_id uint8_t vram_rsd2; // reserved - char dram_pnstring[20]; // part number end with '0'. + char dram_pnstring[20]; // part number end with '0'. }; struct atom_vram_info_header_v2_3 { @@ -3189,12 +3189,12 @@ union atom_umc_reg_setting_id_config_access struct atom_umc_reg_setting_data_block{ union atom_umc_reg_setting_id_config_access block_id; - uint32_t u32umc_reg_data[1]; + uint32_t u32umc_reg_data[1]; }; struct atom_umc_init_reg_block{ uint16_t umc_reg_num; - uint16_t reserved; + uint16_t reserved; union atom_umc_register_addr_info_access umc_reg_list[1]; //for allocation purpose, the real number come from umc_reg_num; struct atom_umc_reg_setting_data_block umc_reg_setting_list[1]; }; @@ -3381,7 +3381,7 @@ struct atom_vram_info_header_v2_6 { uint8_t mc_phy_tile_num; struct atom_vram_module_v9 vram_module[16]; }; -/* +/* *************************************************************************** Data Table voltageobject_info structure *************************************************************************** @@ -3394,18 +3394,18 @@ struct atom_i2c_data_entry struct atom_voltage_object_header_v4{ uint8_t voltage_type; //enum atom_voltage_type - uint8_t voltage_mode; //enum atom_voltage_object_mode + uint8_t voltage_mode; //enum atom_voltage_object_mode uint16_t object_size; //Size of Object }; // atom_voltage_object_header_v4.voltage_mode -enum atom_voltage_object_mode +enum atom_voltage_object_mode { VOLTAGE_OBJ_GPIO_LUT = 0, //VOLTAGE and GPIO Lookup table ->atom_gpio_voltage_object_v4 VOLTAGE_OBJ_VR_I2C_INIT_SEQ = 3, //VOLTAGE REGULATOR INIT sequece through I2C -> atom_i2c_voltage_object_v4 VOLTAGE_OBJ_PHASE_LUT = 4, //Set Vregulator Phase lookup table ->atom_gpio_voltage_object_v4 VOLTAGE_OBJ_SVID2 = 7, //Indicate voltage control by SVID2 ->atom_svid2_voltage_object_v4 - VOLTAGE_OBJ_EVV = 8, + VOLTAGE_OBJ_EVV = 8, VOLTAGE_OBJ_MERGED_POWER = 9, }; @@ -3415,9 +3415,9 @@ struct atom_i2c_voltage_object_v4 uint8_t regulator_id; //Indicate Voltage Regulator Id uint8_t i2c_id; uint8_t i2c_slave_addr; - uint8_t i2c_control_offset; + uint8_t i2c_control_offset; uint8_t i2c_flag; // Bit0: 0 - One byte data; 1 - Two byte data - uint8_t i2c_speed; // =0, use default i2c speed, otherwise use it in unit of kHz. + uint8_t i2c_speed; // =0, use default i2c speed, otherwise use it in unit of kHz. uint8_t reserved[2]; struct atom_i2c_data_entry i2cdatalut[1]; // end with 0xff }; @@ -3439,10 +3439,10 @@ struct atom_voltage_gpio_map_lut struct atom_gpio_voltage_object_v4 { struct atom_voltage_object_header_v4 header; // voltage mode = VOLTAGE_OBJ_GPIO_LUT or VOLTAGE_OBJ_PHASE_LUT - uint8_t gpio_control_id; // default is 0 which indicate control through CG VID mode + uint8_t gpio_control_id; // default is 0 which indicate control through CG VID mode uint8_t gpio_entry_num; // indiate the entry numbers of Votlage/Gpio value Look up table uint8_t phase_delay_us; // phase delay in unit of micro second - uint8_t reserved; + uint8_t reserved; uint32_t gpio_mask_val; // GPIO Mask value struct atom_voltage_gpio_map_lut voltage_gpio_lut[1]; }; @@ -3452,10 +3452,10 @@ struct atom_svid2_voltage_object_v4 struct atom_voltage_object_header_v4 header; // voltage mode = VOLTAGE_OBJ_SVID2 uint8_t loadline_psi1; // bit4:0= loadline setting ( Core Loadline trim and offset trim ), bit5=0:PSI1_L disable =1: PSI1_L enable uint8_t psi0_l_vid_thresd; // VR PSI0_L VID threshold - uint8_t psi0_enable; + uint8_t psi0_enable; // uint8_t maxvstep; uint8_t telemetry_offset; - uint8_t telemetry_gain; + uint8_t telemetry_gain; uint16_t reserved1; }; @@ -3475,22 +3475,22 @@ union atom_voltage_object_v4{ struct atom_voltage_objects_info_v4_1 { - struct atom_common_table_header table_header; + struct atom_common_table_header table_header; union atom_voltage_object_v4 voltage_object[1]; //Info for Voltage control }; -/* +/* *************************************************************************** - All Command Function structure definition - *************************************************************************** -*/ + All Command Function structure definition + *************************************************************************** +*/ -/* +/* *************************************************************************** Structures used by asic_init - *************************************************************************** -*/ + *************************************************************************** +*/ struct asic_init_engine_parameters { @@ -3530,11 +3530,11 @@ enum atom_asic_init_mem_flag b3DRAM_SELF_REFRESH_EXIT =0x20, }; -/* +/* *************************************************************************** Structures used by setengineclock - *************************************************************************** -*/ + *************************************************************************** +*/ struct set_engine_clock_parameters_v2_1 { @@ -3557,22 +3557,22 @@ enum atom_set_engine_mem_clock_flag b3STORE_DPM_TRAINGING = 0x40, //Applicable to memory clock change,when set, it store specific DPM mode training result }; -/* +/* *************************************************************************** Structures used by getengineclock - *************************************************************************** -*/ + *************************************************************************** +*/ struct get_engine_clock_parameter { uint32_t sclk_10khz; // current engine speed in 10KHz unit uint32_t reserved; }; -/* +/* *************************************************************************** Structures used by setmemoryclock - *************************************************************************** -*/ + *************************************************************************** +*/ struct set_memory_clock_parameters_v2_1 { uint32_t mclkfreqin10khz:24; @@ -3587,11 +3587,11 @@ struct set_memory_clock_ps_allocation_v2_1 }; -/* +/* *************************************************************************** Structures used by getmemoryclock - *************************************************************************** -*/ + *************************************************************************** +*/ struct get_memory_clock_parameter { uint32_t mclk_10khz; // current engine speed in 10KHz unit @@ -3600,11 +3600,11 @@ struct get_memory_clock_parameter -/* +/* *************************************************************************** Structures used by setvoltage - *************************************************************************** -*/ + *************************************************************************** +*/ struct set_voltage_parameters_v1_4 { @@ -3628,14 +3628,14 @@ struct set_voltage_ps_allocation_v1_4 }; -/* +/* *************************************************************************** Structures used by computegpuclockparam - *************************************************************************** -*/ + *************************************************************************** +*/ //ATOM_COMPUTE_CLOCK_FREQ.ulComputeClockFlag -enum atom_gpu_clock_type +enum atom_gpu_clock_type { COMPUTE_GPUCLK_INPUT_FLAG_DEFAULT_GPUCLK =0x00, COMPUTE_GPUCLK_INPUT_FLAG_GFXCLK =0x01, @@ -3644,7 +3644,7 @@ enum atom_gpu_clock_type struct compute_gpu_clock_input_parameter_v1_8 { - uint32_t gpuclock_10khz:24; //Input= target clock, output = actual clock + uint32_t gpuclock_10khz:24; //Input= target clock, output = actual clock uint32_t gpu_clock_type:8; //Input indicate clock type: enum atom_gpu_clock_type uint32_t reserved[5]; }; @@ -3652,7 +3652,7 @@ struct compute_gpu_clock_input_parameter_v1_8 struct compute_gpu_clock_output_parameter_v1_8 { - uint32_t gpuclock_10khz:24; //Input= target clock, output = actual clock + uint32_t gpuclock_10khz:24; //Input= target clock, output = actual clock uint32_t dfs_did:8; //return parameter: DFS divider which is used to program to register directly uint32_t pll_fb_mult; //Feedback Multiplier, bit 8:0 int, bit 15:12 post_div, bit 31:16 frac uint32_t pll_ss_fbsmult; // Spread FB Mult: bit 8:0 int, bit 31:16 frac @@ -3664,11 +3664,11 @@ struct compute_gpu_clock_output_parameter_v1_8 -/* +/* *************************************************************************** Structures used by ReadEfuseValue - *************************************************************************** -*/ + *************************************************************************** +*/ struct read_efuse_input_parameters_v3_1 { @@ -3685,20 +3685,20 @@ union read_efuse_value_parameters_v3_1 }; -/* +/* *************************************************************************** Structures used by getsmuclockinfo - *************************************************************************** -*/ + *************************************************************************** +*/ struct atom_get_smu_clock_info_parameters_v3_1 { - uint8_t syspll_id; // 0= syspll0, 1=syspll1, 2=syspll2 + uint8_t syspll_id; // 0= syspll0, 1=syspll1, 2=syspll2 uint8_t clk_id; // atom_smu9_syspll0_clock_id (only valid when command == GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ ) uint8_t command; // enum of atom_get_smu_clock_info_command uint8_t dfsdid; // =0: get DFS DID from register, >0, give DFS divider, (only valid when command == GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ ) }; -enum atom_get_smu_clock_info_command +enum atom_get_smu_clock_info_command { GET_SMU_CLOCK_INFO_V3_1_GET_CLOCK_FREQ = 0, GET_SMU_CLOCK_INFO_V3_1_GET_PLLVCO_FREQ = 1, @@ -3819,13 +3819,13 @@ struct atom_get_smu_clock_info_output_parameters_v3_1 -/* +/* *************************************************************************** Structures used by dynamicmemorysettings - *************************************************************************** -*/ + *************************************************************************** +*/ -enum atom_dynamic_memory_setting_command +enum atom_dynamic_memory_setting_command { COMPUTE_MEMORY_PLL_PARAM = 1, COMPUTE_ENGINE_PLL_PARAM = 2, @@ -3857,11 +3857,11 @@ union dynamic_memory_settings_parameters_v2_1 -/* +/* *************************************************************************** Structures used by memorytraining - *************************************************************************** -*/ + *************************************************************************** +*/ enum atom_umc6_0_ucode_function_call_enum_id { @@ -3879,24 +3879,24 @@ struct memory_training_parameters_v2_1 }; -/* +/* *************************************************************************** Structures used by setpixelclock - *************************************************************************** -*/ + *************************************************************************** +*/ struct set_pixel_clock_parameter_v1_7 { - uint32_t pixclk_100hz; // target the pixel clock to drive the CRTC timing in unit of 100Hz. + uint32_t pixclk_100hz; // target the pixel clock to drive the CRTC timing in unit of 100Hz. uint8_t pll_id; // ATOM_PHY_PLL0/ATOM_PHY_PLL1/ATOM_PPLL0 - uint8_t encoderobjid; // ASIC encoder id defined in objectId.h, - // indicate which graphic encoder will be used. - uint8_t encoder_mode; // Encoder mode: + uint8_t encoderobjid; // ASIC encoder id defined in objectId.h, + // indicate which graphic encoder will be used. + uint8_t encoder_mode; // Encoder mode: uint8_t miscinfo; // enum atom_set_pixel_clock_v1_7_misc_info uint8_t crtc_id; // enum of atom_crtc_def uint8_t deep_color_ratio; // HDMI panel bit depth: enum atom_set_pixel_clock_v1_7_deepcolor_ratio - uint8_t reserved1[2]; + uint8_t reserved1[2]; uint32_t reserved2; }; @@ -3911,7 +3911,7 @@ enum atom_set_pixel_clock_v1_7_misc_info PIXEL_CLOCK_V7_MISC_REF_DIV_SRC_XTALIN = 0x00, PIXEL_CLOCK_V7_MISC_REF_DIV_SRC_PCIE = 0x10, PIXEL_CLOCK_V7_MISC_REF_DIV_SRC_GENLK = 0x20, - PIXEL_CLOCK_V7_MISC_REF_DIV_SRC_REFPAD = 0x30, + PIXEL_CLOCK_V7_MISC_REF_DIV_SRC_REFPAD = 0x30, PIXEL_CLOCK_V7_MISC_ATOMIC_UPDATE = 0x40, PIXEL_CLOCK_V7_MISC_FORCE_SS_DIS = 0x80, }; @@ -3919,22 +3919,22 @@ enum atom_set_pixel_clock_v1_7_misc_info /* deep_color_ratio */ enum atom_set_pixel_clock_v1_7_deepcolor_ratio { - PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_DIS = 0x00, //00 - DCCG_DEEP_COLOR_DTO_DISABLE: Disable Deep Color DTO - PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_5_4 = 0x01, //01 - DCCG_DEEP_COLOR_DTO_5_4_RATIO: Set Deep Color DTO to 5:4 - PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_3_2 = 0x02, //02 - DCCG_DEEP_COLOR_DTO_3_2_RATIO: Set Deep Color DTO to 3:2 - PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_2_1 = 0x03, //03 - DCCG_DEEP_COLOR_DTO_2_1_RATIO: Set Deep Color DTO to 2:1 + PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_DIS = 0x00, //00 - DCCG_DEEP_COLOR_DTO_DISABLE: Disable Deep Color DTO + PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_5_4 = 0x01, //01 - DCCG_DEEP_COLOR_DTO_5_4_RATIO: Set Deep Color DTO to 5:4 + PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_3_2 = 0x02, //02 - DCCG_DEEP_COLOR_DTO_3_2_RATIO: Set Deep Color DTO to 3:2 + PIXEL_CLOCK_V7_DEEPCOLOR_RATIO_2_1 = 0x03, //03 - DCCG_DEEP_COLOR_DTO_2_1_RATIO: Set Deep Color DTO to 2:1 }; -/* +/* *************************************************************************** Structures used by setdceclock - *************************************************************************** -*/ + *************************************************************************** +*/ -// SetDCEClock input parameter for DCE11.2( ELM and BF ) and above +// SetDCEClock input parameter for DCE11.2( ELM and BF ) and above struct set_dce_clock_parameters_v2_1 { - uint32_t dceclk_10khz; // target DCE frequency in unit of 10KHZ, return real DISPCLK/DPREFCLK frequency. + uint32_t dceclk_10khz; // target DCE frequency in unit of 10KHZ, return real DISPCLK/DPREFCLK frequency. uint8_t dceclktype; // =0: DISPCLK =1: DPREFCLK =2: PIXCLK uint8_t dceclksrc; // ATOM_PLL0 or ATOM_GCK_DFS or ATOM_FCH_CLK or ATOM_COMBOPHY_PLLx uint8_t dceclkflag; // Bit [1:0] = PPLL ref clock source ( when ucDCEClkSrc= ATOM_PPLL0 ) @@ -3946,10 +3946,10 @@ enum atom_set_dce_clock_clock_type { DCE_CLOCK_TYPE_DISPCLK = 0, DCE_CLOCK_TYPE_DPREFCLK = 1, - DCE_CLOCK_TYPE_PIXELCLK = 2, // used by VBIOS internally, called by SetPixelClock + DCE_CLOCK_TYPE_PIXELCLK = 2, // used by VBIOS internally, called by SetPixelClock }; -//ucDCEClkFlag when ucDCEClkType == DPREFCLK +//ucDCEClkFlag when ucDCEClkType == DPREFCLK enum atom_set_dce_clock_dprefclk_flag { DCE_CLOCK_FLAG_PLL_REFCLK_SRC_MASK = 0x03, @@ -3959,14 +3959,14 @@ enum atom_set_dce_clock_dprefclk_flag DCE_CLOCK_FLAG_PLL_REFCLK_SRC_XTALIN = 0x03, }; -//ucDCEClkFlag when ucDCEClkType == PIXCLK +//ucDCEClkFlag when ucDCEClkType == PIXCLK enum atom_set_dce_clock_pixclk_flag { DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_MASK = 0x03, - DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_DIS = 0x00, //00 - DCCG_DEEP_COLOR_DTO_DISABLE: Disable Deep Color DTO - DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_5_4 = 0x01, //01 - DCCG_DEEP_COLOR_DTO_5_4_RATIO: Set Deep Color DTO to 5:4 - DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_3_2 = 0x02, //02 - DCCG_DEEP_COLOR_DTO_3_2_RATIO: Set Deep Color DTO to 3:2 - DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_2_1 = 0x03, //03 - DCCG_DEEP_COLOR_DTO_2_1_RATIO: Set Deep Color DTO to 2:1 + DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_DIS = 0x00, //00 - DCCG_DEEP_COLOR_DTO_DISABLE: Disable Deep Color DTO + DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_5_4 = 0x01, //01 - DCCG_DEEP_COLOR_DTO_5_4_RATIO: Set Deep Color DTO to 5:4 + DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_3_2 = 0x02, //02 - DCCG_DEEP_COLOR_DTO_3_2_RATIO: Set Deep Color DTO to 3:2 + DCE_CLOCK_FLAG_PCLK_DEEPCOLOR_RATIO_2_1 = 0x03, //03 - DCCG_DEEP_COLOR_DTO_2_1_RATIO: Set Deep Color DTO to 2:1 DCE_CLOCK_FLAG_PIXCLK_YUV420_MODE = 0x04, }; @@ -3977,9 +3977,9 @@ struct set_dce_clock_ps_allocation_v2_1 }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by BlankCRTC -/****************************************************************************/ +/****************************************************************************/ struct blank_crtc_parameters { uint8_t crtc_id; // enum atom_crtc_def @@ -3994,20 +3994,20 @@ enum atom_blank_crtc_command ATOM_BLANKING_OFF = 0, }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by enablecrtc -/****************************************************************************/ +/****************************************************************************/ struct enable_crtc_parameters { uint8_t crtc_id; // enum atom_crtc_def - uint8_t enable; // ATOM_ENABLE or ATOM_DISABLE + uint8_t enable; // ATOM_ENABLE or ATOM_DISABLE uint8_t padding[2]; }; -/****************************************************************************/ +/****************************************************************************/ // Structure used by EnableDispPowerGating -/****************************************************************************/ +/****************************************************************************/ struct enable_disp_power_gating_parameters_v2_1 { uint8_t disp_pipe_id; // ATOM_CRTC1, ATOM_CRTC2, ... @@ -4015,15 +4015,15 @@ struct enable_disp_power_gating_parameters_v2_1 uint8_t padding[2]; }; -struct enable_disp_power_gating_ps_allocation +struct enable_disp_power_gating_ps_allocation { struct enable_disp_power_gating_parameters_v2_1 param; uint32_t ulReserved[4]; }; -/****************************************************************************/ +/****************************************************************************/ // Structure used in setcrtc_usingdtdtiming -/****************************************************************************/ +/****************************************************************************/ struct set_crtc_using_dtd_timing_parameters { uint16_t h_size; @@ -4034,7 +4034,7 @@ struct set_crtc_using_dtd_timing_parameters uint16_t h_syncwidth; uint16_t v_syncoffset; uint16_t v_syncwidth; - uint16_t modemiscinfo; + uint16_t modemiscinfo; uint8_t h_border; uint8_t v_border; uint8_t crtc_id; // enum atom_crtc_def @@ -4043,9 +4043,9 @@ struct set_crtc_using_dtd_timing_parameters }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by processi2cchanneltransaction -/****************************************************************************/ +/****************************************************************************/ struct process_i2c_channel_transaction_parameters { uint8_t i2cspeed_khz; @@ -4077,9 +4077,9 @@ enum atom_process_i2c_status }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by processauxchanneltransaction -/****************************************************************************/ +/****************************************************************************/ struct process_aux_channel_transaction_parameters_v1_2 { @@ -4095,9 +4095,9 @@ struct process_aux_channel_transaction_parameters_v1_2 }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by selectcrtc_source -/****************************************************************************/ +/****************************************************************************/ struct select_crtc_source_parameters_v2_3 { @@ -4108,9 +4108,9 @@ struct select_crtc_source_parameters_v2_3 }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by digxencodercontrol -/****************************************************************************/ +/****************************************************************************/ // ucAction: enum atom_dig_encoder_control_action @@ -4126,8 +4126,8 @@ enum atom_dig_encoder_control_action ATOM_ENCODER_CMD_DP_VIDEO_ON = 0x0d, ATOM_ENCODER_CMD_SETUP_PANEL_MODE = 0x10, ATOM_ENCODER_CMD_DP_LINK_TRAINING_PATTERN4 = 0x14, - ATOM_ENCODER_CMD_STREAM_SETUP = 0x0F, - ATOM_ENCODER_CMD_LINK_SETUP = 0x11, + ATOM_ENCODER_CMD_STREAM_SETUP = 0x0F, + ATOM_ENCODER_CMD_LINK_SETUP = 0x11, ATOM_ENCODER_CMD_ENCODER_BLANK = 0x12, }; @@ -4157,7 +4157,7 @@ struct dig_encoder_stream_setup_parameters_v1_5 uint8_t digid; // 0~6 map to DIG0~DIG6 enum atom_dig_encoder_control_v5_digid uint8_t action; // = ATOM_ENOCODER_CMD_STREAM_SETUP uint8_t digmode; // ATOM_ENCODER_MODE_DP/ATOM_ENCODER_MODE_DVI/ATOM_ENCODER_MODE_HDMI - uint8_t lanenum; // Lane number + uint8_t lanenum; // Lane number uint32_t pclk_10khz; // Pixel Clock in 10Khz uint8_t bitpercolor; uint8_t dplinkrate_270mhz;//= DP link rate/270Mhz, =6: 1.62G = 10: 2.7G, =20: 5.4Ghz, =30: 8.1Ghz etc @@ -4167,12 +4167,12 @@ struct dig_encoder_stream_setup_parameters_v1_5 struct dig_encoder_link_setup_parameters_v1_5 { uint8_t digid; // 0~6 map to DIG0~DIG6 enum atom_dig_encoder_control_v5_digid - uint8_t action; // = ATOM_ENOCODER_CMD_LINK_SETUP + uint8_t action; // = ATOM_ENOCODER_CMD_LINK_SETUP uint8_t digmode; // ATOM_ENCODER_MODE_DP/ATOM_ENCODER_MODE_DVI/ATOM_ENCODER_MODE_HDMI - uint8_t lanenum; // Lane number + uint8_t lanenum; // Lane number uint8_t symclk_10khz; // Symbol Clock in 10Khz uint8_t hpd_sel; - uint8_t digfe_sel; // DIG stream( front-end ) selection, bit0 means DIG0 FE is enable, + uint8_t digfe_sel; // DIG stream( front-end ) selection, bit0 means DIG0 FE is enable, uint8_t reserved[2]; }; @@ -4181,15 +4181,15 @@ struct dp_panel_mode_set_parameters_v1_5 uint8_t digid; // 0~6 map to DIG0~DIG6 enum atom_dig_encoder_control_v5_digid uint8_t action; // = ATOM_ENCODER_CMD_DPLINK_SETUP uint8_t panelmode; // enum atom_dig_encoder_control_panelmode - uint8_t reserved1; + uint8_t reserved1; uint32_t reserved2[2]; }; -struct dig_encoder_generic_cmd_parameters_v1_5 +struct dig_encoder_generic_cmd_parameters_v1_5 { uint8_t digid; // 0~6 map to DIG0~DIG6 enum atom_dig_encoder_control_v5_digid uint8_t action; // = rest of generic encoder command which does not carry any parameters - uint8_t reserved1[2]; + uint8_t reserved1[2]; uint32_t reserved2[2]; }; @@ -4201,11 +4201,11 @@ union dig_encoder_control_parameters_v1_5 struct dp_panel_mode_set_parameters_v1_5 dppanel_param; }; -/* +/* *************************************************************************** Structures used by dig1transmittercontrol - *************************************************************************** -*/ + *************************************************************************** +*/ struct dig_transmitter_control_parameters_v1_6 { uint8_t phyid; // 0=UNIPHYA, 1=UNIPHYB, 2=UNIPHYC, 3=UNIPHYD, 4= UNIPHYE 5=UNIPHYF @@ -4214,10 +4214,10 @@ struct dig_transmitter_control_parameters_v1_6 uint8_t digmode; // enum atom_encode_mode_def uint8_t dplaneset; // DP voltage swing and pre-emphasis value defined in DPCD DP_LANE_SET, "DP_LANE_SET__xDB_y_zV" } mode_laneset; - uint8_t lanenum; // Lane number 1, 2, 4, 8 + uint8_t lanenum; // Lane number 1, 2, 4, 8 uint32_t symclk_10khz; // Symbol Clock in 10Khz uint8_t hpdsel; // =1: HPD1, =2: HPD2, .... =6: HPD6, =0: HPD is not assigned - uint8_t digfe_sel; // DIG stream( front-end ) selection, bit0 means DIG0 FE is enable, + uint8_t digfe_sel; // DIG stream( front-end ) selection, bit0 means DIG0 FE is enable, uint8_t connobj_id; // Connector Object Id defined in ObjectId.h uint8_t reserved; uint32_t reserved1; @@ -4280,29 +4280,29 @@ enum atom_dig_transmitter_control_dplaneset DP_LANE_SET__0DB_0_6V = 0x01, DP_LANE_SET__0DB_0_8V = 0x02, DP_LANE_SET__0DB_1_2V = 0x03, - DP_LANE_SET__3_5DB_0_4V = 0x08, + DP_LANE_SET__3_5DB_0_4V = 0x08, DP_LANE_SET__3_5DB_0_6V = 0x09, DP_LANE_SET__3_5DB_0_8V = 0x0a, DP_LANE_SET__6DB_0_4V = 0x10, DP_LANE_SET__6DB_0_6V = 0x11, - DP_LANE_SET__9_5DB_0_4V = 0x18, + DP_LANE_SET__9_5DB_0_4V = 0x18, }; -/****************************************************************************/ +/****************************************************************************/ // Structures used by ExternalEncoderControl V2.4 -/****************************************************************************/ +/****************************************************************************/ struct external_encoder_control_parameters_v2_4 { - uint16_t pixelclock_10khz; // pixel clock in 10Khz, valid when ucAction=SETUP/ENABLE_OUTPUT - uint8_t config; // indicate which encoder, and DP link rate when ucAction = SETUP/ENABLE_OUTPUT - uint8_t action; // + uint16_t pixelclock_10khz; // pixel clock in 10Khz, valid when ucAction=SETUP/ENABLE_OUTPUT + uint8_t config; // indicate which encoder, and DP link rate when ucAction = SETUP/ENABLE_OUTPUT + uint8_t action; // uint8_t encodermode; // encoder mode, only used when ucAction = SETUP/ENABLE_OUTPUT - uint8_t lanenum; // lane number, only used when ucAction = SETUP/ENABLE_OUTPUT + uint8_t lanenum; // lane number, only used when ucAction = SETUP/ENABLE_OUTPUT uint8_t bitpercolor; // output bit per color, only valid when ucAction = SETUP/ENABLE_OUTPUT and ucEncodeMode= DP - uint8_t hpd_id; + uint8_t hpd_id; }; @@ -4326,7 +4326,7 @@ enum external_encoder_control_v2_4_config_def EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_1_62GHZ = 0x00, EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_2_70GHZ = 0x01, EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_5_40GHZ = 0x02, - EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_3_24GHZ = 0x03, + EXTERNAL_ENCODER_CONFIG_V3_DPLINKRATE_3_24GHZ = 0x03, EXTERNAL_ENCODER_CONFIG_V3_ENCODER_SEL_MAKS = 0x70, EXTERNAL_ENCODER_CONFIG_V3_ENCODER1 = 0x00, EXTERNAL_ENCODER_CONFIG_V3_ENCODER2 = 0x10, @@ -4340,12 +4340,12 @@ struct external_encoder_control_ps_allocation_v2_4 }; -/* +/* *************************************************************************** AMD ACPI Table - - *************************************************************************** -*/ + + *************************************************************************** +*/ struct amd_acpi_description_header{ uint32_t signature; @@ -4392,13 +4392,13 @@ struct gop_lib1_content { -/* +/* *************************************************************************** Scratch Register definitions - Each number below indicates which scratch regiser request, Active and + Each number below indicates which scratch regiser request, Active and Connect all share the same definitions as display_device_tag defines - *************************************************************************** -*/ + *************************************************************************** +*/ enum scratch_register_def{ ATOM_DEVICE_CONNECT_INFO_DEF = 0, @@ -4480,12 +4480,12 @@ enum scratch_pre_os_mode_info_bits_def{ -/* +/* *************************************************************************** ATOM firmware ID header file !! Please keep it at end of the atomfirmware.h !! - *************************************************************************** -*/ + *************************************************************************** +*/ #include "atomfirmwareid.h" #pragma pack() diff --git a/sys/dev/pci/drm/amd/include/atomfirmwareid.h b/sys/dev/pci/drm/amd/include/atomfirmwareid.h index a64fb1173..e6256efd0 100644 --- a/sys/dev/pci/drm/amd/include/atomfirmwareid.h +++ b/sys/dev/pci/drm/amd/include/atomfirmwareid.h @@ -1,12 +1,12 @@ /****************************************************************************\ -* +* * File Name atomfirmwareid.h * * Description ATOM BIOS command/data table ID definition header file * * Copyright 2016 Advanced Micro Devices, Inc. * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software * and associated documentation files (the "Software"), to deal in the Software without restriction, * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, diff --git a/sys/dev/pci/drm/amd/include/displayobject.h b/sys/dev/pci/drm/amd/include/displayobject.h index 687be3437..67e23ff9c 100644 --- a/sys/dev/pci/drm/amd/include/displayobject.h +++ b/sys/dev/pci/drm/amd/include/displayobject.h @@ -1,14 +1,14 @@ /****************************************************************************\ -* +* * Module Name displayobjectsoc15.h -* Project -* Device +* Project +* Device * * Description Contains the common definitions for display objects for SoC15 products. * * Copyright 2014 Advanced Micro Devices, Inc. * -* Permission is hereby granted, free of charge, to any person obtaining a copy of this software +* Permission is hereby granted, free of charge, to any person obtaining a copy of this software * and associated documentation files (the "Software"), to deal in the Software without restriction, * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, @@ -35,7 +35,7 @@ /**************************************************** -* Display Object Type Definition +* Display Object Type Definition *****************************************************/ enum display_object_type{ DISPLAY_OBJECT_TYPE_NONE =0x00, @@ -45,7 +45,7 @@ DISPLAY_OBJECT_TYPE_CONNECTOR =0x03 }; /**************************************************** -* Encorder Object Type Definition +* Encorder Object Type Definition *****************************************************/ enum encoder_object_type{ ENCODER_OBJECT_ID_NONE =0x00, @@ -56,11 +56,11 @@ ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 =0x03, /**************************************************** -* Connector Object ID Definition +* Connector Object ID Definition *****************************************************/ enum connector_object_type{ -CONNECTOR_OBJECT_ID_NONE =0x00, +CONNECTOR_OBJECT_ID_NONE =0x00, CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D =0x01, CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D =0x02, CONNECTOR_OBJECT_ID_HDMI_TYPE_A =0x03, @@ -72,12 +72,12 @@ CONNECTOR_OBJECT_ID_OPM =0x07 /**************************************************** -* Protection Object ID Definition +* Protection Object ID Definition *****************************************************/ //No need /**************************************************** -* Object ENUM ID Definition +* Object ENUM ID Definition *****************************************************/ enum object_enum_id{ @@ -90,7 +90,7 @@ OBJECT_ENUM_ID6 =0x06 }; /**************************************************** -*Object ID Bit definition +*Object ID Bit definition *****************************************************/ enum object_id_bit{ OBJECT_ID_MASK =0x00FF, diff --git a/sys/dev/pci/drm/amd/include/navi10_ip_offset.h b/sys/dev/pci/drm/amd/include/navi10_ip_offset.h index 3a4723c4a..d6824bb61 100644 --- a/sys/dev/pci/drm/amd/include/navi10_ip_offset.h +++ b/sys/dev/pci/drm/amd/include/navi10_ip_offset.h @@ -28,7 +28,7 @@ struct IP_BASE_INSTANCE { unsigned int segment[MAX_SEGMENT]; }; - + struct IP_BASE { struct IP_BASE_INSTANCE instance[MAX_INSTANCE]; } __maybe_unused; diff --git a/sys/dev/pci/drm/amd/include/pptable.h b/sys/dev/pci/drm/amd/include/pptable.h index 0e54e1317..0b6a057e0 100644 --- a/sys/dev/pci/drm/amd/include/pptable.h +++ b/sys/dev/pci/drm/amd/include/pptable.h @@ -133,7 +133,7 @@ typedef struct _ATOM_PPLIB_EXTENDEDHEADER USHORT usUVDTableOffset; //points to ATOM_PPLIB_UVD_Table USHORT usSAMUTableOffset; //points to ATOM_PPLIB_SAMU_Table USHORT usPPMTableOffset; //points to ATOM_PPLIB_PPM_Table - USHORT usACPTableOffset; //points to ATOM_PPLIB_ACP_Table + USHORT usACPTableOffset; //points to ATOM_PPLIB_ACP_Table /* points to ATOM_PPLIB_POWERTUNE_Table */ USHORT usPowerTuneTableOffset; /* points to ATOM_PPLIB_CLOCK_Voltage_Dependency_Table for sclkVddgfxTable */ @@ -223,14 +223,14 @@ typedef struct _ATOM_PPLIB_POWERPLAYTABLE3 typedef struct _ATOM_PPLIB_POWERPLAYTABLE4 { ATOM_PPLIB_POWERPLAYTABLE3 basicTable3; - ULONG ulGoldenPPID; // PPGen use only + ULONG ulGoldenPPID; // PPGen use only ULONG ulGoldenRevision; // PPGen use only USHORT usVddcDependencyOnSCLKOffset; USHORT usVddciDependencyOnMCLKOffset; USHORT usVddcDependencyOnMCLKOffset; USHORT usMaxClockVoltageOnDCOffset; USHORT usVddcPhaseShedLimitsTableOffset; // Points to ATOM_PPLIB_PhaseSheddingLimits_Table - USHORT usMvddDependencyOnMCLKOffset; + USHORT usMvddDependencyOnMCLKOffset; } ATOM_PPLIB_POWERPLAYTABLE4, *LPATOM_PPLIB_POWERPLAYTABLE4; typedef struct _ATOM_PPLIB_POWERPLAYTABLE5 @@ -376,21 +376,21 @@ typedef struct _ATOM_PPLIB_RS780_CLOCK_INFO UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). - ULONG ulFlags; + ULONG ulFlags; } ATOM_PPLIB_RS780_CLOCK_INFO; -#define ATOM_PPLIB_RS780_VOLTAGE_NONE 0 -#define ATOM_PPLIB_RS780_VOLTAGE_LOW 1 -#define ATOM_PPLIB_RS780_VOLTAGE_HIGH 2 -#define ATOM_PPLIB_RS780_VOLTAGE_VARIABLE 3 +#define ATOM_PPLIB_RS780_VOLTAGE_NONE 0 +#define ATOM_PPLIB_RS780_VOLTAGE_LOW 1 +#define ATOM_PPLIB_RS780_VOLTAGE_HIGH 2 +#define ATOM_PPLIB_RS780_VOLTAGE_VARIABLE 3 #define ATOM_PPLIB_RS780_SPMCLK_NONE 0 // We cannot change the side port memory clock, leave it as it is. #define ATOM_PPLIB_RS780_SPMCLK_LOW 1 #define ATOM_PPLIB_RS780_SPMCLK_HIGH 2 -#define ATOM_PPLIB_RS780_HTLINKFREQ_NONE 0 -#define ATOM_PPLIB_RS780_HTLINKFREQ_LOW 1 -#define ATOM_PPLIB_RS780_HTLINKFREQ_HIGH 2 +#define ATOM_PPLIB_RS780_HTLINKFREQ_NONE 0 +#define ATOM_PPLIB_RS780_HTLINKFREQ_LOW 1 +#define ATOM_PPLIB_RS780_HTLINKFREQ_HIGH 2 typedef struct _ATOM_PPLIB_EVERGREEN_CLOCK_INFO { @@ -432,14 +432,14 @@ typedef struct _ATOM_PPLIB_CI_CLOCK_INFO USHORT usMemoryClockLow; UCHAR ucMemoryClockHigh; - + UCHAR ucPCIEGen; USHORT usPCIELane; } ATOM_PPLIB_CI_CLOCK_INFO; typedef struct _ATOM_PPLIB_SUMO_CLOCK_INFO{ USHORT usEngineClockLow; //clockfrequency & 0xFFFF. The unit is in 10khz - UCHAR ucEngineClockHigh; //clockfrequency >> 16. + UCHAR ucEngineClockHigh; //clockfrequency >> 16. UCHAR vddcIndex; //2-bit vddc index; USHORT tdpLimit; //please initalize to 0 @@ -464,10 +464,10 @@ typedef struct _ATOM_PPLIB_CZ_CLOCK_INFO { typedef struct _ATOM_PPLIB_STATE_V2 { - //number of valid dpm levels in this state; Driver uses it to calculate the whole + //number of valid dpm levels in this state; Driver uses it to calculate the whole //size of the state: sizeof(ATOM_PPLIB_STATE_V2) + (ucNumDPMLevels - 1) * sizeof(UCHAR) UCHAR ucNumDPMLevels; - + //a index to the array of nonClockInfos UCHAR nonClockInfoIndex; /** @@ -477,9 +477,9 @@ typedef struct _ATOM_PPLIB_STATE_V2 } ATOM_PPLIB_STATE_V2; typedef struct _StateArray{ - //how many states we have + //how many states we have UCHAR ucNumEntries; - + ATOM_PPLIB_STATE_V2 states[1]; }StateArray; @@ -487,10 +487,10 @@ typedef struct _StateArray{ typedef struct _ClockInfoArray{ //how many clock levels we have UCHAR ucNumEntries; - + //sizeof(ATOM_PPLIB_CLOCK_INFO) UCHAR ucEntrySize; - + UCHAR clockInfo[1]; }ClockInfoArray; @@ -500,7 +500,7 @@ typedef struct _NonClockInfoArray{ UCHAR ucNumEntries; //sizeof(ATOM_PPLIB_NONCLOCK_INFO) UCHAR ucEntrySize; - + ATOM_PPLIB_NONCLOCK_INFO nonClockInfo[1]; }NonClockInfoArray; @@ -722,7 +722,7 @@ typedef struct _ATOM_PPLIB_PPM_Table ULONG ulPlatformTDC; ULONG ulSmallACPlatformTDC; ULONG ulApuTDP; - ULONG ulDGpuTDP; + ULONG ulDGpuTDP; ULONG ulDGpuUlvPower; ULONG ulTjmax; } ATOM_PPLIB_PPM_Table; diff --git a/sys/dev/pci/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h b/sys/dev/pci/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h index 5cf62a929..6456bea5d 100644 --- a/sys/dev/pci/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h +++ b/sys/dev/pci/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h @@ -365,7 +365,7 @@ typedef struct { uint16_t FanMaximumRpm; uint16_t FanTargetTemperature; uint16_t FanTargetGfxclk; - uint8_t FanZeroRpmEnable; + uint8_t FanZeroRpmEnable; uint8_t FanTachEdgePerRev; @@ -659,8 +659,8 @@ typedef struct { uint8_t Gfx_IdleHystLimit; uint8_t Gfx_FPS; uint8_t Gfx_MinActiveFreqType; - uint8_t Gfx_BoosterFreqType; - uint8_t Gfx_UseRlcBusy; + uint8_t Gfx_BoosterFreqType; + uint8_t Gfx_UseRlcBusy; uint16_t Gfx_MinActiveFreq; uint16_t Gfx_BoosterFreq; uint16_t Gfx_PD_Data_time_constant; @@ -674,7 +674,7 @@ typedef struct { uint8_t Soc_IdleHystLimit; uint8_t Soc_FPS; uint8_t Soc_MinActiveFreqType; - uint8_t Soc_BoosterFreqType; + uint8_t Soc_BoosterFreqType; uint8_t Soc_UseRlcBusy; uint16_t Soc_MinActiveFreq; uint16_t Soc_BoosterFreq; @@ -690,7 +690,7 @@ typedef struct { uint8_t Mem_FPS; uint8_t Mem_MinActiveFreqType; uint8_t Mem_BoosterFreqType; - uint8_t Mem_UseRlcBusy; + uint8_t Mem_UseRlcBusy; uint16_t Mem_MinActiveFreq; uint16_t Mem_BoosterFreq; uint16_t Mem_PD_Data_time_constant; diff --git a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c index 1e071db5f..192ab5df7 100644 --- a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c @@ -161,10 +161,15 @@ int smu_get_dpm_freq_range(struct smu_context *smu, int smu_set_gfx_power_up_by_imu(struct smu_context *smu) { - if (!smu->ppt_funcs && !smu->ppt_funcs->set_gfx_power_up_by_imu) - return -EOPNOTSUPP; + int ret = 0; + struct amdgpu_device *adev = smu->adev; - return smu->ppt_funcs->set_gfx_power_up_by_imu(smu); + if (smu->ppt_funcs->set_gfx_power_up_by_imu) { + ret = smu->ppt_funcs->set_gfx_power_up_by_imu(smu); + if (ret) + dev_err(adev->dev, "Failed to enable gfx imu!\n"); + } + return ret; } static u32 smu_get_mclk(void *handle, bool low) @@ -195,6 +200,19 @@ static u32 smu_get_sclk(void *handle, bool low) return clk_freq * 100; } +static int smu_set_gfx_imu_enable(struct smu_context *smu) +{ + struct amdgpu_device *adev = smu->adev; + + if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) + return 0; + + if (amdgpu_in_reset(smu->adev) || adev->in_s0ix) + return 0; + + return smu_set_gfx_power_up_by_imu(smu); +} + static int smu_dpm_set_vcn_enable(struct smu_context *smu, bool enable) { @@ -1386,15 +1404,9 @@ static int smu_hw_init(void *handle) } if (smu->is_apu) { - if ((smu->ppt_funcs->set_gfx_power_up_by_imu) && - likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) { - ret = smu->ppt_funcs->set_gfx_power_up_by_imu(smu); - if (ret) { - dev_err(adev->dev, "Failed to Enable gfx imu!\n"); - return ret; - } - } - + ret = smu_set_gfx_imu_enable(smu); + if (ret) + return ret; smu_dpm_set_vcn_enable(smu, true); smu_dpm_set_jpeg_enable(smu, true); smu_set_gfx_cgpg(smu, true); @@ -1670,6 +1682,10 @@ static int smu_resume(void *handle) return ret; } + ret = smu_set_gfx_imu_enable(smu); + if (ret) + return ret; + smu_set_gfx_cgpg(smu, true); smu->disable_uclk_switch = 0; diff --git a/sys/dev/pci/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/sys/dev/pci/drm/amd/pm/swsmu/inc/amdgpu_smu.h index d3b79f211..adcf99148 100644 --- a/sys/dev/pci/drm/amd/pm/swsmu/inc/amdgpu_smu.h +++ b/sys/dev/pci/drm/amd/pm/swsmu/inc/amdgpu_smu.h @@ -1312,8 +1312,8 @@ struct pptable_funcs { * @get_ecc_table: message SMU to get ECC INFO table. */ ssize_t (*get_ecc_info)(struct smu_context *smu, void *table); - - + + /** * @stb_collect_info: Collects Smart Trace Buffers data. */ diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c index 02b0e50c7..940830493 100644 --- a/sys/dev/pci/drm/drm_drv.c +++ b/sys/dev/pci/drm/drm_drv.c @@ -90,7 +90,7 @@ DEFINE_STATIC_SRCU(drm_unplug_srcu); * Some functions are only called once on init regardless of how many times * drm attaches. In linux this is handled via module_init()/module_exit() */ -int drm_refcnt; +int drm_refcnt; struct drm_softc { struct device sc_dev; @@ -1225,7 +1225,7 @@ drm_attach_pci(const struct drm_driver *driver, struct pci_attach_args *pa, sc = (struct drm_softc *)config_found_sm(dev, &arg, drmprint, drmsubmatch); if (sc == NULL) return NULL; - + return sc->sc_drm; } @@ -1522,7 +1522,7 @@ const struct pci_device_id * drm_find_description(int vendor, int device, const struct pci_device_id *idlist) { int i = 0; - + for (i = 0; idlist[i].vendor != 0; i++) { if ((idlist[i].vendor == vendor) && (idlist[i].device == device || @@ -1546,7 +1546,7 @@ struct drm_file * drm_find_file_by_minor(struct drm_device *dev, int minor) { struct drm_file key; - + key.fminor = minor; return (SPLAY_FIND(drm_file_tree, &dev->files, &key)); } @@ -1886,7 +1886,7 @@ drm_dmamem_alloc(bus_dma_tag_t dmat, bus_size_t size, bus_size_t alignment, struct drm_dmamem *mem; size_t strsize; /* - * segs is the last member of the struct since we modify the size + * segs is the last member of the struct since we modify the size * to allow extra segments if more than one are allowed. */ strsize = sizeof(*mem) + (sizeof(bus_dma_segment_t) * (nsegments - 1)); @@ -1904,7 +1904,7 @@ drm_dmamem_alloc(bus_dma_tag_t dmat, bus_size_t size, bus_size_t alignment, &mem->nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO) != 0) goto destroy; - if (bus_dmamem_map(dmat, mem->segs, mem->nsegs, size, + if (bus_dmamem_map(dmat, mem->segs, mem->nsegs, size, &mem->kva, BUS_DMA_NOWAIT | mapflags) != 0) goto free; diff --git a/sys/dev/pci/drm/drm_gem.c b/sys/dev/pci/drm/drm_gem.c index fb701923f..b91420bf2 100644 --- a/sys/dev/pci/drm/drm_gem.c +++ b/sys/dev/pci/drm/drm_gem.c @@ -102,7 +102,7 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, * we do not allow device mappings to be mapped copy-on-write * so we kill any attempt to do so here. */ - + if (UVM_ET_ISCOPYONWRITE(entry)) { uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj); return(VM_PAGER_ERROR); @@ -144,7 +144,7 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, return (ret); } -boolean_t +boolean_t drm_flush(struct uvm_object *uobj, voff_t start, voff_t stop, int flags) { return (TRUE); @@ -309,10 +309,10 @@ int drm_gem_object_init(struct drm_device *dev, printf("%s size too big %lu\n", __func__, size); return -ENOMEM; } - + obj->uao = uao_create(size, 0); uvm_obj_init(&obj->uobj, &drm_pgops, 1); - + return 0; } diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c index f97ba022d..bcec033e2 100644 --- a/sys/dev/pci/drm/drm_linux.c +++ b/sys/dev/pci/drm/drm_linux.c @@ -251,7 +251,7 @@ kthread_run(int (*func)(void *), void *data, const char *name) thread->func = func; thread->data = data; thread->flags = 0; - + if (kthread_create(kthread_func, thread, &thread->proc, name)) { free(thread, M_DRM, sizeof(*thread)); return ERR_PTR(-ENOMEM); @@ -272,7 +272,7 @@ kthread_create_worker(unsigned int flags, const char *fmt, ...) vsnprintf(name, sizeof(name), fmt, ap); va_end(ap); w->tq = taskq_create(name, 1, IPL_HIGH, 0); - + return w; } @@ -281,7 +281,7 @@ kthread_destroy_worker(struct kthread_worker *worker) { taskq_destroy(worker->tq); free(worker, M_DRM, sizeof(*worker)); - + } void @@ -551,7 +551,7 @@ __free_pages(struct vm_page *page, unsigned int order) { struct pglist mlist; int i; - + TAILQ_INIT(&mlist); for (i = 0; i < (1 << order); i++) TAILQ_INSERT_TAIL(&mlist, &page[i], pageq); @@ -623,7 +623,7 @@ void kunmap_atomic(void *addr) { KASSERT(kmap_atomic_inuse); - + pmap_kremove(kmap_atomic_va, PAGE_SIZE); kmap_atomic_inuse = 0; } @@ -1193,7 +1193,7 @@ retry: int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) { - int ret; + int ret; if (adap->lock_ops) adap->lock_ops->lock_bus(adap, 0); @@ -1497,7 +1497,7 @@ backlight_device_register(const char *name, void *kdev, void *data, bd->data = data; task_set(&bd->task, backlight_do_update_status, bd); - + return bd; } @@ -1720,7 +1720,7 @@ dma_fence_wait(struct dma_fence *fence, bool intr) ret = dma_fence_wait_timeout(fence, intr, MAX_SCHEDULE_TIMEOUT); if (ret < 0) return ret; - + return 0; } @@ -1880,7 +1880,7 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout) list_del(&cb.base.node); out: mtx_leave(fence->lock); - + return ret; } @@ -1926,7 +1926,7 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count, cb = mallocarray(count, sizeof(*cb), M_DRM, M_WAITOK|M_CANFAIL|M_ZERO); if (cb == NULL) return -ENOMEM; - + for (i = 0; i < count; i++) { struct dma_fence *fence = fences[i]; cb[i].proc = curproc; @@ -2022,7 +2022,7 @@ dma_fence_array_cb_func(struct dma_fence *f, struct dma_fence_cb *cb) struct dma_fence_array_cb *array_cb = container_of(cb, struct dma_fence_array_cb, cb); struct dma_fence_array *dfa = array_cb->array; - + if (atomic_dec_and_test(&dfa->num_pending)) timeout_add(&dfa->to, 1); else @@ -2046,7 +2046,7 @@ dma_fence_array_enable_signaling(struct dma_fence *fence) return false; } } - + return true; } @@ -2526,7 +2526,7 @@ pcie_get_speed_cap(struct pci_dev *pdev) tag = pdev->tag; if (!pci_get_capability(pc, tag, PCI_CAP_PCIEXPRESS, - &pos, NULL)) + &pos, NULL)) return PCI_SPEED_UNKNOWN; id = pci_conf_read(pc, tag, PCI_ID_REG); @@ -2582,7 +2582,7 @@ pcie_get_width_cap(struct pci_dev *pdev) int bus, device, function; if (!pci_get_capability(pc, tag, PCI_CAP_PCIEXPRESS, - &pos, NULL)) + &pos, NULL)) return PCIE_LNK_WIDTH_UNKNOWN; id = pci_conf_read(pc, tag, PCI_ID_REG); @@ -2607,13 +2607,13 @@ pcie_aspm_enabled(struct pci_dev *pdev) pcireg_t lcsr; if (!pci_get_capability(pc, tag, PCI_CAP_PCIEXPRESS, - &pos, NULL)) + &pos, NULL)) return false; lcsr = pci_conf_read(pc, tag, pos + PCI_PCIE_LCSR); if ((lcsr & (PCI_PCIE_LCSR_ASPM_L0S | PCI_PCIE_LCSR_ASPM_L1)) != 0) return true; - + return false; } @@ -2896,7 +2896,7 @@ interval_tree_iter_first(struct rb_root_cached *root, unsigned long start, void interval_tree_remove(struct interval_tree_node *node, - struct rb_root_cached *root) + struct rb_root_cached *root) { rb_erase_cached(&node->rb, root); } @@ -3021,7 +3021,7 @@ fput(struct file *fp) { if (fp->f_type != DTYPE_SYNC) return; - + FRELE(fp, curproc); } diff --git a/sys/dev/pci/drm/drm_lock.c b/sys/dev/pci/drm/drm_lock.c index 168c977ca..1efbd5389 100644 --- a/sys/dev/pci/drm/drm_lock.c +++ b/sys/dev/pci/drm/drm_lock.c @@ -223,7 +223,7 @@ int drm_legacy_lock(struct drm_device *dev, void *data, ret ? "interrupted" : "has lock"); if (ret) return ret; - /* don't set the block all signals on the master process for now + /* don't set the block all signals on the master process for now * really probably not the correct answer but lets us debug xkb * xserver for now */ if (!drm_is_current_master(file_priv)) { diff --git a/sys/dev/pci/drm/drm_managed.c b/sys/dev/pci/drm/drm_managed.c index 003a1e112..5f5176672 100644 --- a/sys/dev/pci/drm/drm_managed.c +++ b/sys/dev/pci/drm/drm_managed.c @@ -95,7 +95,7 @@ drmm_kfree(struct drm_device *dev, void *p) } } mtx_leave(&dev->managed.lock); - + if (m != NULL) { free(m->p, M_DRM, m->size); free(m, M_DRM, sizeof(*m)); diff --git a/sys/dev/pci/drm/drm_mm.c b/sys/dev/pci/drm/drm_mm.c index b3b1a355c..17c3fffcd 100644 --- a/sys/dev/pci/drm/drm_mm.c +++ b/sys/dev/pci/drm/drm_mm.c @@ -174,7 +174,7 @@ drm_mm_interval_tree_iter_first(const struct rb_root_cached *root, static void drm_mm_interval_tree_remove(struct drm_mm_node *node, - struct rb_root_cached *root) + struct rb_root_cached *root) { rb_erase_cached(&node->rb, root); } diff --git a/sys/dev/pci/drm/drm_probe_helper.c b/sys/dev/pci/drm/drm_probe_helper.c index 041c7f596..4de1e5122 100644 --- a/sys/dev/pci/drm/drm_probe_helper.c +++ b/sys/dev/pci/drm/drm_probe_helper.c @@ -557,8 +557,9 @@ retry: */ dev->mode_config.delayed_event = true; if (dev->mode_config.poll_enabled) - schedule_delayed_work(&dev->mode_config.output_poll_work, - 0); + mod_delayed_work(system_wq, + &dev->mode_config.output_poll_work, + 0); } /* Re-enable polling in case the global poll config changed. */ diff --git a/sys/dev/pci/drm/i915/display/intel_display.c b/sys/dev/pci/drm/i915/display/intel_display.c index 5bb5abf38..83fe57121 100644 --- a/sys/dev/pci/drm/i915/display/intel_display.c +++ b/sys/dev/pci/drm/i915/display/intel_display.c @@ -1079,7 +1079,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state, num_encoders++; } - drm_WARN(encoder->base.dev, num_encoders != 1, + drm_WARN(state->base.dev, num_encoders != 1, "%d encoders for pipe %c\n", num_encoders, pipe_name(master_crtc->pipe)); diff --git a/sys/dev/pci/drm/i915/gt/agp_intel_gtt.c b/sys/dev/pci/drm/i915/gt/agp_intel_gtt.c index 0a52e575f..5b3d56e7d 100644 --- a/sys/dev/pci/drm/i915/gt/agp_intel_gtt.c +++ b/sys/dev/pci/drm/i915/gt/agp_intel_gtt.c @@ -177,7 +177,7 @@ intel_gmch_gtt_get(u64 *gtt_total, { struct inteldrm_softc *dev_priv = (void *)inteldrm_cd.cd_devs[0]; struct agp_info *ai = &dev_priv->drm.agp->info; - + *gtt_total = ai->ai_aperture_size; *mappable_base = ai->ai_aperture_base; *mappable_end = ai->ai_aperture_size; diff --git a/sys/dev/pci/drm/i915/gt/shmem_utils.c b/sys/dev/pci/drm/i915/gt/shmem_utils.c index 193f110f1..d41ffb782 100644 --- a/sys/dev/pci/drm/i915/gt/shmem_utils.c +++ b/sys/dev/pci/drm/i915/gt/shmem_utils.c @@ -228,7 +228,7 @@ static int __uao_rw(struct uvm_object *uao, loff_t off, unsigned int this = min_t(size_t, PAGE_SIZE - offset_in_page(off), len); void *vaddr = kmap(page); - + if (write) { memcpy(vaddr + offset_in_page(off), ptr, this); set_page_dirty(page); diff --git a/sys/dev/pci/drm/include/drm/i915_pciids.h b/sys/dev/pci/drm/include/drm/i915_pciids.h index 92205054e..9c325c6b8 100644 --- a/sys/dev/pci/drm/include/drm/i915_pciids.h +++ b/sys/dev/pci/drm/include/drm/i915_pciids.h @@ -707,7 +707,6 @@ INTEL_VGA_DEVICE(0x5693, info), \ INTEL_VGA_DEVICE(0x5694, info), \ INTEL_VGA_DEVICE(0x5695, info), \ - INTEL_VGA_DEVICE(0x5698, info), \ INTEL_VGA_DEVICE(0x56A5, info), \ INTEL_VGA_DEVICE(0x56A6, info), \ INTEL_VGA_DEVICE(0x56B0, info), \ diff --git a/sys/dev/pci/drm/include/linux/apple-gmux.h b/sys/dev/pci/drm/include/linux/apple-gmux.h new file mode 100644 index 000000000..1db2b95a4 --- /dev/null +++ b/sys/dev/pci/drm/include/linux/apple-gmux.h @@ -0,0 +1,12 @@ +/* Public domain. */ + +#ifndef _LINUX_APPLE_GMUX_H +#define _LINUX_APPLE_GMUX_H + +static inline bool +apple_gmux_detect(void *a, void *b) +{ + return false; +} + +#endif diff --git a/sys/dev/pci/drm/include/linux/atomic.h b/sys/dev/pci/drm/include/linux/atomic.h index 3e13af4dc..fb785a0c9 100644 --- a/sys/dev/pci/drm/include/linux/atomic.h +++ b/sys/dev/pci/drm/include/linux/atomic.h @@ -2,7 +2,7 @@ /** * \file drm_atomic.h * Atomic operations used in the DRM which may or may not be provided by the OS. - * + * * \author Eric Anholt */ @@ -298,7 +298,7 @@ __test_and_set_bit(u_int b, volatile void *p) volatile u_int *ptr = (volatile u_int *)p; unsigned int prev = ptr[b >> 5]; ptr[b >> 5] |= m; - + return (prev & m) != 0; } @@ -428,7 +428,7 @@ find_next_bit(const volatile void *p, int max, int b) #define wmb() __membar("dsb sy") #define mb() __membar("dsb sy") #elif defined(__mips64__) -#define rmb() mips_sync() +#define rmb() mips_sync() #define wmb() mips_sync() #define mb() mips_sync() #elif defined(__powerpc64__) diff --git a/sys/dev/pci/drm/include/linux/capability.h b/sys/dev/pci/drm/include/linux/capability.h index 5accf04f7..c91b233d9 100644 --- a/sys/dev/pci/drm/include/linux/capability.h +++ b/sys/dev/pci/drm/include/linux/capability.h @@ -12,8 +12,8 @@ #define CAP_SYS_NICE 0x2 static inline bool -capable(int cap) -{ +capable(int cap) +{ switch (cap) { case CAP_SYS_ADMIN: case CAP_SYS_NICE: @@ -21,7 +21,7 @@ capable(int cap) default: panic("unhandled capability"); } -} +} static inline bool perfmon_capable(void) diff --git a/sys/dev/pci/drm/include/linux/dma-buf.h b/sys/dev/pci/drm/include/linux/dma-buf.h index f789e8d20..32f05c309 100644 --- a/sys/dev/pci/drm/include/linux/dma-buf.h +++ b/sys/dev/pci/drm/include/linux/dma-buf.h @@ -61,7 +61,7 @@ struct dma_buf_export_info { struct dma_resv *resv; }; -#define DEFINE_DMA_BUF_EXPORT_INFO(x) struct dma_buf_export_info x +#define DEFINE_DMA_BUF_EXPORT_INFO(x) struct dma_buf_export_info x struct dma_buf *dma_buf_export(const struct dma_buf_export_info *); diff --git a/sys/dev/pci/drm/include/linux/file.h b/sys/dev/pci/drm/include/linux/file.h index e27bfaddf..f59981db1 100644 --- a/sys/dev/pci/drm/include/linux/file.h +++ b/sys/dev/pci/drm/include/linux/file.h @@ -4,7 +4,7 @@ #define _LINUX_FILE_H /* both for printf */ -#include +#include #include void fd_install(int, struct file *); diff --git a/sys/dev/pci/drm/include/linux/interrupt.h b/sys/dev/pci/drm/include/linux/interrupt.h index 13a154522..b555183c9 100644 --- a/sys/dev/pci/drm/include/linux/interrupt.h +++ b/sys/dev/pci/drm/include/linux/interrupt.h @@ -106,7 +106,7 @@ tasklet_hi_schedule(struct tasklet_struct *ts) task_add(taskletq, &ts->task); } -static inline void +static inline void tasklet_disable_nosync(struct tasklet_struct *ts) { atomic_inc(&ts->count); diff --git a/sys/dev/pci/drm/include/linux/io.h b/sys/dev/pci/drm/include/linux/io.h index 201772580..08e20aa0c 100644 --- a/sys/dev/pci/drm/include/linux/io.h +++ b/sys/dev/pci/drm/include/linux/io.h @@ -119,7 +119,7 @@ static inline u32 ioread32(const volatile void __iomem *addr) { uint32_t val; - + iobarrier(); val = lemtoh32(addr); rmb(); diff --git a/sys/dev/pci/drm/include/linux/pci.h b/sys/dev/pci/drm/include/linux/pci.h index 1021bb7ee..3f8de6b86 100644 --- a/sys/dev/pci/drm/include/linux/pci.h +++ b/sys/dev/pci/drm/include/linux/pci.h @@ -135,7 +135,7 @@ pci_read_config_dword(struct pci_dev *pdev, int reg, u32 *val) { *val = pci_conf_read(pdev->pc, pdev->tag, reg); return 0; -} +} static inline int pci_read_config_word(struct pci_dev *pdev, int reg, u16 *val) @@ -145,7 +145,7 @@ pci_read_config_word(struct pci_dev *pdev, int reg, u16 *val) v = pci_conf_read(pdev->pc, pdev->tag, (reg & ~0x2)); *val = (v >> ((reg & 0x2) * 8)); return 0; -} +} static inline int pci_read_config_byte(struct pci_dev *pdev, int reg, u8 *val) @@ -155,14 +155,14 @@ pci_read_config_byte(struct pci_dev *pdev, int reg, u8 *val) v = pci_conf_read(pdev->pc, pdev->tag, (reg & ~0x3)); *val = (v >> ((reg & 0x3) * 8)); return 0; -} +} static inline int pci_write_config_dword(struct pci_dev *pdev, int reg, u32 val) { pci_conf_write(pdev->pc, pdev->tag, reg, val); return 0; -} +} static inline int pci_write_config_word(struct pci_dev *pdev, int reg, u16 val) @@ -174,7 +174,7 @@ pci_write_config_word(struct pci_dev *pdev, int reg, u16 val) v |= (val << ((reg & 0x2) * 8)); pci_conf_write(pdev->pc, pdev->tag, (reg & ~0x2), v); return 0; -} +} static inline int pci_write_config_byte(struct pci_dev *pdev, int reg, u8 val) @@ -319,7 +319,7 @@ static inline int pcie_set_readrq(struct pci_dev *pdev, int rrq) { uint16_t val; - + pcie_capability_read_word(pdev, PCI_PCIE_DCSR, &val); val &= ~PCI_PCIE_DCSR_MPS; val |= (ffs(rrq) - 8) << 12; diff --git a/sys/dev/pci/drm/include/linux/rbtree.h b/sys/dev/pci/drm/include/linux/rbtree.h index 40cbdf7fb..39d013afd 100644 --- a/sys/dev/pci/drm/include/linux/rbtree.h +++ b/sys/dev/pci/drm/include/linux/rbtree.h @@ -99,7 +99,7 @@ __rb_deepest_left(struct rb_node *node) else node = RB_RIGHT(node, __entry); } - return parent; + return parent; } static inline struct rb_node * diff --git a/sys/dev/pci/drm/include/linux/scatterlist.h b/sys/dev/pci/drm/include/linux/scatterlist.h index afbb0180a..b2c0cb50d 100644 --- a/sys/dev/pci/drm/include/linux/scatterlist.h +++ b/sys/dev/pci/drm/include/linux/scatterlist.h @@ -77,7 +77,7 @@ static inline bool __sg_page_iter_next(struct sg_page_iter *iter) { iter->sg_pgoffset++; - while (iter->__nents > 0 && + while (iter->__nents > 0 && iter->sg_pgoffset >= (iter->sg->length / PAGE_SIZE)) { iter->sg_pgoffset -= (iter->sg->length / PAGE_SIZE); iter->sg++; diff --git a/sys/dev/pci/drm/include/linux/seqlock.h b/sys/dev/pci/drm/include/linux/seqlock.h index f2d0f9dd8..e3dabf2c9 100644 --- a/sys/dev/pci/drm/include/linux/seqlock.h +++ b/sys/dev/pci/drm/include/linux/seqlock.h @@ -91,7 +91,7 @@ typedef struct { static inline void seqlock_init(seqlock_t *sl, int wantipl) -{ +{ sl->seq = 0; mtx_init(&sl->lock, wantipl); } diff --git a/sys/dev/pci/drm/include/linux/string.h b/sys/dev/pci/drm/include/linux/string.h index 6dc172235..f76ddf6f6 100644 --- a/sys/dev/pci/drm/include/linux/string.h +++ b/sys/dev/pci/drm/include/linux/string.h @@ -74,7 +74,7 @@ match_string(const char * const *array, size_t n, const char *str) for (i = 0; i < n; i++) { if (array[i] == NULL) break; - if (!strcmp(array[i], str)) + if (!strcmp(array[i], str)) return i; } diff --git a/sys/dev/pci/drm/include/linux/swap.h b/sys/dev/pci/drm/include/linux/swap.h index 7a16f8006..dcfb9c9d1 100644 --- a/sys/dev/pci/drm/include/linux/swap.h +++ b/sys/dev/pci/drm/include/linux/swap.h @@ -30,11 +30,11 @@ static inline long get_nr_swap_pages(void) -{ +{ return uvmexp.swpages - uvmexp.swpginuse; } -/* +/* * XXX For now, we don't want the shrinker to be too aggressive, so * pretend we're not called from the pagedaemon even if we are. */ diff --git a/sys/dev/pci/drm/include/linux/types.h b/sys/dev/pci/drm/include/linux/types.h index de79e778b..6b3de73cd 100644 --- a/sys/dev/pci/drm/include/linux/types.h +++ b/sys/dev/pci/drm/include/linux/types.h @@ -30,12 +30,12 @@ typedef uint32_t u32; typedef int64_t s64; typedef uint64_t u64; -typedef uint16_t __le16; -typedef uint16_t __be16; -typedef uint32_t __le32; +typedef uint16_t __le16; +typedef uint16_t __be16; +typedef uint32_t __le32; typedef uint32_t __be32; -typedef uint64_t __le64; -typedef uint64_t __be64; +typedef uint64_t __le64; +typedef uint64_t __be64; typedef bus_addr_t dma_addr_t; typedef paddr_t phys_addr_t; diff --git a/sys/dev/pci/drm/include/linux/wait.h b/sys/dev/pci/drm/include/linux/wait.h index 7983854a9..758c0b1e5 100644 --- a/sys/dev/pci/drm/include/linux/wait.h +++ b/sys/dev/pci/drm/include/linux/wait.h @@ -221,7 +221,7 @@ wake_up(wait_queue_head_t *wqh) wait_queue_entry_t *wqe; wait_queue_entry_t *tmp; mtx_enter(&wqh->lock); - + list_for_each_entry_safe(wqe, tmp, &wqh->head, entry) { KASSERT(wqe->func != NULL); if (wqe->func != NULL) @@ -255,7 +255,7 @@ wake_up_all_locked(wait_queue_head_t *wqh) .private = curproc, \ .func = autoremove_wake_function, \ .entry = LIST_HEAD_INIT((name).entry), \ - } + } static inline void prepare_to_wait(wait_queue_head_t *wqh, wait_queue_entry_t *wqe, int state) diff --git a/sys/dev/pci/drm/include/linux/ww_mutex.h b/sys/dev/pci/drm/include/linux/ww_mutex.h index d5b1ac263..d2b9b3834 100644 --- a/sys/dev/pci/drm/include/linux/ww_mutex.h +++ b/sys/dev/pci/drm/include/linux/ww_mutex.h @@ -209,7 +209,7 @@ static inline int ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) { return __ww_mutex_lock(lock, ctx, false, false); } - + static inline void ww_mutex_lock_slow(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) { (void)__ww_mutex_lock(lock, ctx, true, false); @@ -219,7 +219,7 @@ static inline int ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) { return __ww_mutex_lock(lock, ctx, false, true); } - + static inline int __must_check ww_mutex_lock_slow_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx) { return __ww_mutex_lock(lock, ctx, true, true); diff --git a/sys/dev/pci/drm/include/uapi/drm/radeon_drm.h b/sys/dev/pci/drm/include/uapi/drm/radeon_drm.h index e38d07eb0..490a59cc4 100644 --- a/sys/dev/pci/drm/include/uapi/drm/radeon_drm.h +++ b/sys/dev/pci/drm/include/uapi/drm/radeon_drm.h @@ -233,7 +233,7 @@ typedef union { # define R300_WAIT_3D 0x2 /* these two defines are DOING IT WRONG - however * we have userspace which relies on using these. - * The wait interface is backwards compat new + * The wait interface is backwards compat new * code should use the NEW_WAIT defines below * THESE ARE NOT BIT FIELDS */ diff --git a/sys/dev/pci/drm/linux_sort.c b/sys/dev/pci/drm/linux_sort.c index e7497a4c7..402295335 100644 --- a/sys/dev/pci/drm/linux_sort.c +++ b/sys/dev/pci/drm/linux_sort.c @@ -56,7 +56,7 @@ static __inline void swapfunc(char *, char *, size_t, int); static __inline void swapfunc(char *a, char *b, size_t n, int swaptype) { - if (swaptype <= 1) + if (swaptype <= 1) swapcode(long, a, b, n) else swapcode(char, a, b, n) @@ -167,7 +167,7 @@ loop: SWAPINIT(a, es); void sort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *), - void *x) + void *x) { KASSERT(x == NULL); qsort(a, n, es, cmp); diff --git a/sys/dev/pci/drm/radeon/ObjectID.h b/sys/dev/pci/drm/radeon/ObjectID.h index bf5b73388..06192698b 100644 --- a/sys/dev/pci/drm/radeon/ObjectID.h +++ b/sys/dev/pci/drm/radeon/ObjectID.h @@ -1,5 +1,5 @@ /* -* Copyright 2006-2007 Advanced Micro Devices, Inc. +* Copyright 2006-2007 Advanced Micro Devices, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -37,13 +37,13 @@ #define GRAPH_OBJECT_TYPE_CONNECTOR 0x3 #define GRAPH_OBJECT_TYPE_ROUTER 0x4 /* deleted */ -#define GRAPH_OBJECT_TYPE_DISPLAY_PATH 0x6 +#define GRAPH_OBJECT_TYPE_DISPLAY_PATH 0x6 #define GRAPH_OBJECT_TYPE_GENERIC 0x7 /****************************************************/ /* Encoder Object ID Definition */ /****************************************************/ -#define ENCODER_OBJECT_ID_NONE 0x00 +#define ENCODER_OBJECT_ID_NONE 0x00 /* Radeon Class Display Hardware */ #define ENCODER_OBJECT_ID_INTERNAL_LVDS 0x01 @@ -96,7 +96,7 @@ /****************************************************/ /* Connector Object ID Definition */ /****************************************************/ -#define CONNECTOR_OBJECT_ID_NONE 0x00 +#define CONNECTOR_OBJECT_ID_NONE 0x00 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I 0x01 #define CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I 0x02 #define CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D 0x03 @@ -156,7 +156,7 @@ #define RESERVED1_ID_MASK 0x0800 #define OBJECT_TYPE_MASK 0x7000 #define RESERVED2_ID_MASK 0x8000 - + #define OBJECT_ID_SHIFT 0x00 #define ENUM_ID_SHIFT 0x08 #define OBJECT_TYPE_SHIFT 0x0C @@ -177,14 +177,14 @@ /* Encoder Object ID definition - Shared with BIOS */ /****************************************************/ /* -#define ENCODER_INTERNAL_LVDS_ENUM_ID1 0x2101 +#define ENCODER_INTERNAL_LVDS_ENUM_ID1 0x2101 #define ENCODER_INTERNAL_TMDS1_ENUM_ID1 0x2102 #define ENCODER_INTERNAL_TMDS2_ENUM_ID1 0x2103 #define ENCODER_INTERNAL_DAC1_ENUM_ID1 0x2104 #define ENCODER_INTERNAL_DAC2_ENUM_ID1 0x2105 #define ENCODER_INTERNAL_SDVOA_ENUM_ID1 0x2106 #define ENCODER_INTERNAL_SDVOB_ENUM_ID1 0x2107 -#define ENCODER_SIL170B_ENUM_ID1 0x2108 +#define ENCODER_SIL170B_ENUM_ID1 0x2108 #define ENCODER_CH7303_ENUM_ID1 0x2109 #define ENCODER_CH7301_ENUM_ID1 0x210A #define ENCODER_INTERNAL_DVO1_ENUM_ID1 0x210B @@ -198,8 +198,8 @@ #define ENCODER_INTERNAL_KLDSCP_TMDS1_ENUM_ID1 0x2113 #define ENCODER_INTERNAL_KLDSCP_DVO1_ENUM_ID1 0x2114 #define ENCODER_INTERNAL_KLDSCP_DAC1_ENUM_ID1 0x2115 -#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 0x2116 -#define ENCODER_SI178_ENUM_ID1 0x2117 +#define ENCODER_INTERNAL_KLDSCP_DAC2_ENUM_ID1 0x2116 +#define ENCODER_SI178_ENUM_ID1 0x2117 #define ENCODER_MVPU_FPGA_ENUM_ID1 0x2118 #define ENCODER_INTERNAL_DDI_ENUM_ID1 0x2119 #define ENCODER_VT1625_ENUM_ID1 0x211A @@ -314,7 +314,7 @@ #define ENCODER_SI178_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_SI178 << OBJECT_ID_SHIFT) #define ENCODER_MVPU_FPGA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ @@ -322,7 +322,7 @@ #define ENCODER_INTERNAL_DDI_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_INTERNAL_DDI << OBJECT_ID_SHIFT) #define ENCODER_VT1625_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ @@ -350,7 +350,7 @@ #define ENCODER_INTERNAL_KLDSCP_LVTMA_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ - ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT) + ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA << OBJECT_ID_SHIFT) #define ENCODER_INTERNAL_UNIPHY1_ENUM_ID1 ( GRAPH_OBJECT_TYPE_ENCODER << OBJECT_TYPE_SHIFT |\ GRAPH_OBJECT_ENUM_ID1 << ENUM_ID_SHIFT |\ diff --git a/sys/dev/pci/drm/radeon/atombios.h b/sys/dev/pci/drm/radeon/atombios.h index 85ae68ba5..da35a970f 100644 --- a/sys/dev/pci/drm/radeon/atombios.h +++ b/sys/dev/pci/drm/radeon/atombios.h @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 Advanced Micro Devices, Inc. + * Copyright 2006-2007 Advanced Micro Devices, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +21,7 @@ */ -/****************************************************************************/ +/****************************************************************************/ /*Portion I: Definitions shared between VBIOS and Driver */ /****************************************************************************/ @@ -42,7 +42,7 @@ #endif #ifdef _H2INC - #ifndef ULONG + #ifndef ULONG typedef unsigned long ULONG; #endif @@ -50,12 +50,12 @@ typedef unsigned char UCHAR; #endif - #ifndef USHORT + #ifndef USHORT typedef unsigned short USHORT; #endif #endif - -#define ATOM_DAC_A 0 + +#define ATOM_DAC_A 0 #define ATOM_DAC_B 1 #define ATOM_EXT_DAC 2 @@ -81,7 +81,7 @@ #define ATOM_EXT_CLOCK 10 #define ATOM_PPLL_INVALID 0xFF -#define ENCODER_REFCLK_SRC_P1PLL 0 +#define ENCODER_REFCLK_SRC_P1PLL 0 #define ENCODER_REFCLK_SRC_P2PLL 1 #define ENCODER_REFCLK_SRC_DCPLL 2 #define ENCODER_REFCLK_SRC_EXTCLK 3 @@ -90,10 +90,10 @@ #define ATOM_SCALER1 0 #define ATOM_SCALER2 1 -#define ATOM_SCALER_DISABLE 0 -#define ATOM_SCALER_CENTER 1 -#define ATOM_SCALER_EXPANSION 2 -#define ATOM_SCALER_MULTI_EX 3 +#define ATOM_SCALER_DISABLE 0 +#define ATOM_SCALER_CENTER 1 +#define ATOM_SCALER_EXPANSION 2 +#define ATOM_SCALER_MULTI_EX 3 #define ATOM_DISABLE 0 #define ATOM_ENABLE 1 @@ -137,7 +137,7 @@ #define ATOM_DAC2_CV ATOM_DAC1_CV #define ATOM_DAC2_NTSC ATOM_DAC1_NTSC #define ATOM_DAC2_PAL ATOM_DAC1_PAL - + #define ATOM_PM_ON 0 #define ATOM_PM_STANDBY 1 #define ATOM_PM_SUSPEND 2 @@ -173,7 +173,7 @@ #define ATOM_MAX_SIZE_OF_FIREGL_FLAG_STRING 3 //sizeof( ATOM_FIREGL_FLAG_STRING ) #define ATOM_FAKE_DESKTOP_STRING "DSK" //Flag used to enable mobile ASIC on Desktop -#define ATOM_MAX_SIZE_OF_FAKE_DESKTOP_STRING ATOM_MAX_SIZE_OF_FIREGL_FLAG_STRING +#define ATOM_MAX_SIZE_OF_FAKE_DESKTOP_STRING ATOM_MAX_SIZE_OF_FIREGL_FLAG_STRING #define ATOM_M54T_FLAG_STRING "M54T" //Flag used to enable M54T Support #define ATOM_MAX_SIZE_OF_M54T_FLAG_STRING 4 //sizeof( ATOM_M54T_FLAG_STRING ) @@ -194,7 +194,7 @@ #define OFFSET_TO_GET_ATOMBIOS_STRINGS_START 0x006e /* Common header for all ROM Data tables. - Every table pointed _ATOM_MASTER_DATA_TABLE has this common header. + Every table pointed _ATOM_MASTER_DATA_TABLE has this common header. And the pointer actually points to this header. */ typedef struct _ATOM_COMMON_TABLE_HEADER @@ -205,13 +205,13 @@ typedef struct _ATOM_COMMON_TABLE_HEADER /*Image can't be updated, while Driver needs to carry the new table! */ }ATOM_COMMON_TABLE_HEADER; -/****************************************************************************/ +/****************************************************************************/ // Structure stores the ROM header. -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_ROM_HEADER { ATOM_COMMON_TABLE_HEADER sHeader; - UCHAR uaFirmWareSignature[4]; /*Signature to distinguish between Atombios and non-atombios, + UCHAR uaFirmWareSignature[4]; /*Signature to distinguish between Atombios and non-atombios, atombios should init it as "ATOM", don't change the position */ USHORT usBiosRuntimeSegmentAddress; USHORT usProtectedModeInfoOffset; @@ -223,7 +223,7 @@ typedef struct _ATOM_ROM_HEADER USHORT usIoBaseAddress; USHORT usSubsystemVendorID; USHORT usSubsystemID; - USHORT usPCI_InfoOffset; + USHORT usPCI_InfoOffset; USHORT usMasterCommandTableOffset; /*Offset for SW to get all command table offsets, Don't change the position */ USHORT usMasterDataTableOffset; /*Offset for SW to get all data table offsets, Don't change the position */ UCHAR ucExtendedFunctionCode; @@ -237,9 +237,9 @@ typedef struct _ATOM_ROM_HEADER #define USHORT void* #endif -/****************************************************************************/ -// Structures used in Command.mtb -/****************************************************************************/ +/****************************************************************************/ +// Structures used in Command.mtb +/****************************************************************************/ typedef struct _ATOM_MASTER_LIST_OF_COMMAND_TABLES{ USHORT ASIC_Init; //Function Table, used by various SW components,latest version 1.1 USHORT GetDisplaySurfaceSize; //Atomic Table, Used by Bios when enabling HW ICON @@ -253,50 +253,50 @@ typedef struct _ATOM_MASTER_LIST_OF_COMMAND_TABLES{ USHORT GPIOPinControl; //Atomic Table, only used by Bios USHORT SetEngineClock; //Function Table,directly used by various SW components,latest version 1.1 USHORT SetMemoryClock; //Function Table,directly used by various SW components,latest version 1.1 - USHORT SetPixelClock; //Function Table,directly used by various SW components,latest version 1.2 + USHORT SetPixelClock; //Function Table,directly used by various SW components,latest version 1.2 USHORT EnableDispPowerGating; //Atomic Table, indirectly used by various SW components,called from ASIC_Init USHORT ResetMemoryDLL; //Atomic Table, indirectly used by various SW components,called from SetMemoryClock USHORT ResetMemoryDevice; //Atomic Table, indirectly used by various SW components,called from SetMemoryClock USHORT MemoryPLLInit; //Atomic Table, used only by Bios - USHORT AdjustDisplayPll; //Atomic Table, used by various SW componentes. - USHORT AdjustMemoryController; //Atomic Table, indirectly used by various SW components,called from SetMemoryClock + USHORT AdjustDisplayPll; //Atomic Table, used by various SW componentes. + USHORT AdjustMemoryController; //Atomic Table, indirectly used by various SW components,called from SetMemoryClock USHORT EnableASIC_StaticPwrMgt; //Atomic Table, only used by Bios - USHORT SetUniphyInstance; //Atomic Table, only used by Bios - USHORT DAC_LoadDetection; //Atomic Table, directly used by various SW components,latest version 1.2 + USHORT SetUniphyInstance; //Atomic Table, only used by Bios + USHORT DAC_LoadDetection; //Atomic Table, directly used by various SW components,latest version 1.2 USHORT LVTMAEncoderControl; //Atomic Table,directly used by various SW components,latest version 1.3 - USHORT HW_Misc_Operation; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT DAC1EncoderControl; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT DAC2EncoderControl; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT DVOOutputControl; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT CV1OutputControl; //Atomic Table, Atomic Table, Obsolete from Ry6xx, use DAC2 Output instead + USHORT HW_Misc_Operation; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT DAC1EncoderControl; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT DAC2EncoderControl; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT DVOOutputControl; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT CV1OutputControl; //Atomic Table, Atomic Table, Obsolete from Ry6xx, use DAC2 Output instead USHORT GetConditionalGoldenSetting; //Only used by Bios USHORT TVEncoderControl; //Function Table,directly used by various SW components,latest version 1.1 USHORT PatchMCSetting; //only used by BIOS USHORT MC_SEQ_Control; //only used by BIOS USHORT Gfx_Harvesting; //Atomic Table, Obsolete from Ry6xx, Now only used by BIOS for GFX harvesting USHORT EnableScaler; //Atomic Table, used only by Bios - USHORT BlankCRTC; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT EnableCRTC; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT GetPixelClock; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT BlankCRTC; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT EnableCRTC; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT GetPixelClock; //Atomic Table, directly used by various SW components,latest version 1.1 USHORT EnableVGA_Render; //Function Table,directly used by various SW components,latest version 1.1 USHORT GetSCLKOverMCLKRatio; //Atomic Table, only used by Bios USHORT SetCRTC_Timing; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT SetCRTC_OverScan; //Atomic Table, used by various SW components,latest version 1.1 + USHORT SetCRTC_OverScan; //Atomic Table, used by various SW components,latest version 1.1 USHORT SetCRTC_Replication; //Atomic Table, used only by Bios - USHORT SelectCRTC_Source; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT SelectCRTC_Source; //Atomic Table, directly used by various SW components,latest version 1.1 USHORT EnableGraphSurfaces; //Atomic Table, used only by Bios USHORT UpdateCRTC_DoubleBufferRegisters; //Atomic Table, used only by Bios USHORT LUT_AutoFill; //Atomic Table, only used by Bios USHORT EnableHW_IconCursor; //Atomic Table, only used by Bios - USHORT GetMemoryClock; //Atomic Table, directly used by various SW components,latest version 1.1 - USHORT GetEngineClock; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT GetMemoryClock; //Atomic Table, directly used by various SW components,latest version 1.1 + USHORT GetEngineClock; //Atomic Table, directly used by various SW components,latest version 1.1 USHORT SetCRTC_UsingDTDTiming; //Atomic Table, directly used by various SW components,latest version 1.1 USHORT ExternalEncoderControl; //Atomic Table, directly used by various SW components,latest version 2.1 USHORT LVTMAOutputControl; //Atomic Table, directly used by various SW components,latest version 1.1 USHORT VRAM_BlockDetectionByStrap; //Atomic Table, used only by Bios - USHORT MemoryCleanUp; //Atomic Table, only used by Bios + USHORT MemoryCleanUp; //Atomic Table, only used by Bios USHORT ProcessI2cChannelTransaction; //Function Table,only used by Bios - USHORT WriteOneByteToHWAssistedI2C; //Function Table,indirectly used by various SW components + USHORT WriteOneByteToHWAssistedI2C; //Function Table,indirectly used by various SW components USHORT ReadHWAssistedI2CStatus; //Atomic Table, indirectly used by various SW components USHORT SpeedFanControl; //Function Table,indirectly used by various SW components,called from ASIC_Init USHORT PowerConnectorDetection; //Atomic Table, directly used by various SW components,latest version 1.1 @@ -318,22 +318,22 @@ typedef struct _ATOM_MASTER_LIST_OF_COMMAND_TABLES{ USHORT DIG1EncoderControl; //Atomic Table,directly used by various SW components,latest version 1.1 USHORT DIG2EncoderControl; //Atomic Table,directly used by various SW components,latest version 1.1 USHORT DIG1TransmitterControl; //Atomic Table,directly used by various SW components,latest version 1.1 - USHORT DIG2TransmitterControl; //Atomic Table,directly used by various SW components,latest version 1.1 + USHORT DIG2TransmitterControl; //Atomic Table,directly used by various SW components,latest version 1.1 USHORT ProcessAuxChannelTransaction; //Function Table,only used by Bios USHORT DPEncoderService; //Function Table,only used by Bios USHORT GetVoltageInfo; //Function Table,only used by Bios since SI -}ATOM_MASTER_LIST_OF_COMMAND_TABLES; +}ATOM_MASTER_LIST_OF_COMMAND_TABLES; -// For backward compatible +// For backward compatible #define ReadEDIDFromHWAssistedI2C ProcessI2cChannelTransaction #define DPTranslatorControl DIG2EncoderControl #define UNIPHYTransmitterControl DIG1TransmitterControl #define LVTMATransmitterControl DIG2TransmitterControl #define SetCRTC_DPM_State GetConditionalGoldenSetting -#define ASIC_StaticPwrMgtStatusChange SetUniphyInstance +#define ASIC_StaticPwrMgtStatusChange SetUniphyInstance #define HPDInterruptService ReadHWAssistedI2CStatus #define EnableVGA_Access GetSCLKOverMCLKRatio -#define EnableYUV GetDispObjectInfo +#define EnableYUV GetDispObjectInfo #define DynamicClockGating EnableDispPowerGating #define SetupHWAssistedI2CStatus ComputeMemoryClockParam @@ -348,18 +348,18 @@ typedef struct _ATOM_MASTER_COMMAND_TABLE ATOM_MASTER_LIST_OF_COMMAND_TABLES ListOfCommandTables; }ATOM_MASTER_COMMAND_TABLE; -/****************************************************************************/ +/****************************************************************************/ // Structures used in every command table -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_TABLE_ATTRIBUTE { #if ATOM_BIG_ENDIAN USHORT UpdatedByUtility:1; //[15]=Table updated by utility flag - USHORT PS_SizeInBytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), - USHORT WS_SizeInBytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), + USHORT PS_SizeInBytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), + USHORT WS_SizeInBytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), #else - USHORT WS_SizeInBytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), - USHORT PS_SizeInBytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), + USHORT WS_SizeInBytes:8; //[7:0]=Size of workspace in Bytes (in multiple of a dword), + USHORT PS_SizeInBytes:7; //[14:8]=Size of parameter space in Bytes (multiple of a dword), USHORT UpdatedByUtility:1; //[15]=Table updated by utility flag #endif }ATOM_TABLE_ATTRIBUTE; @@ -370,45 +370,45 @@ typedef union _ATOM_TABLE_ATTRIBUTE_ACCESS USHORT susAccess; }ATOM_TABLE_ATTRIBUTE_ACCESS; -/****************************************************************************/ +/****************************************************************************/ // Common header for all command tables. -// Every table pointed by _ATOM_MASTER_COMMAND_TABLE has this common header. +// Every table pointed by _ATOM_MASTER_COMMAND_TABLE has this common header. // And the pointer actually points to this header. -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_COMMON_ROM_COMMAND_TABLE_HEADER { ATOM_COMMON_TABLE_HEADER CommonHeader; - ATOM_TABLE_ATTRIBUTE TableAttribute; + ATOM_TABLE_ATTRIBUTE TableAttribute; }ATOM_COMMON_ROM_COMMAND_TABLE_HEADER; -/****************************************************************************/ +/****************************************************************************/ // Structures used by ComputeMemoryEnginePLLTable -/****************************************************************************/ +/****************************************************************************/ #define COMPUTE_MEMORY_PLL_PARAM 1 #define COMPUTE_ENGINE_PLL_PARAM 2 #define ADJUST_MC_SETTING_PARAM 3 -/****************************************************************************/ +/****************************************************************************/ // Structures used by AdjustMemoryControllerTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_ADJUST_MEMORY_CLOCK_FREQ { #if ATOM_BIG_ENDIAN - ULONG ulPointerReturnFlag:1; // BYTE_3[7]=1 - Return the pointer to the right Data Block; BYTE_3[7]=0 - Program the right Data Block + ULONG ulPointerReturnFlag:1; // BYTE_3[7]=1 - Return the pointer to the right Data Block; BYTE_3[7]=0 - Program the right Data Block ULONG ulMemoryModuleNumber:7; // BYTE_3[6:0] ULONG ulClockFreq:24; #else ULONG ulClockFreq:24; ULONG ulMemoryModuleNumber:7; // BYTE_3[6:0] - ULONG ulPointerReturnFlag:1; // BYTE_3[7]=1 - Return the pointer to the right Data Block; BYTE_3[7]=0 - Program the right Data Block + ULONG ulPointerReturnFlag:1; // BYTE_3[7]=1 - Return the pointer to the right Data Block; BYTE_3[7]=0 - Program the right Data Block #endif }ATOM_ADJUST_MEMORY_CLOCK_FREQ; #define POINTER_RETURN_FLAG 0x80 typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS { - ULONG ulClock; //When return, it's the re-calculated clock based on given Fb_div Post_Div and ref_div - UCHAR ucAction; //0:reserved //1:Memory //2:Engine + ULONG ulClock; //When returen, it's the re-calculated clock based on given Fb_div Post_Div and ref_div + UCHAR ucAction; //0:reserved //1:Memory //2:Engine UCHAR ucReserved; //may expand to return larger Fbdiv later UCHAR ucFbDiv; //return value UCHAR ucPostDiv; //return value @@ -416,7 +416,7 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V2 { - ULONG ulClock; //When return, [23:0] return real clock + ULONG ulClock; //When return, [23:0] return real clock UCHAR ucAction; //0:reserved;COMPUTE_MEMORY_PLL_PARAM:Memory;COMPUTE_ENGINE_PLL_PARAM:Engine. it return ref_div to be written to register USHORT usFbDiv; //return Feedback value to be written to register UCHAR ucPostDiv; //return post div to be written to register @@ -428,14 +428,14 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V2 #define USE_NON_BUS_CLOCK_MASK 0x01000000 //Applicable to both memory and engine clock change, when set, it uses another clock as the temporary clock (engine uses memory and vice versa) #define USE_MEMORY_SELF_REFRESH_MASK 0x02000000 //Only applicable to memory clock change, when set, using memory self refresh during clock transition #define SKIP_INTERNAL_MEMORY_PARAMETER_CHANGE 0x04000000 //Only applicable to memory clock change, when set, the table will skip predefined internal memory parameter change -#define FIRST_TIME_CHANGE_CLOCK 0x08000000 //Applicable to both memory and engine clock change, when set, it means this is 1st time to change clock after ASIC bootup +#define FIRST_TIME_CHANGE_CLOCK 0x08000000 //Applicable to both memory and engine clock change,when set, it means this is 1st time to change clock after ASIC bootup #define SKIP_SW_PROGRAM_PLL 0x10000000 //Applicable to both memory and engine clock change, when set, it means the table will not program SPLL/MPLL #define USE_SS_ENABLED_PIXEL_CLOCK USE_NON_BUS_CLOCK_MASK #define b3USE_NON_BUS_CLOCK_MASK 0x01 //Applicable to both memory and engine clock change, when set, it uses another clock as the temporary clock (engine uses memory and vice versa) #define b3USE_MEMORY_SELF_REFRESH 0x02 //Only applicable to memory clock change, when set, using memory self refresh during clock transition #define b3SKIP_INTERNAL_MEMORY_PARAMETER_CHANGE 0x04 //Only applicable to memory clock change, when set, the table will skip predefined internal memory parameter change -#define b3FIRST_TIME_CHANGE_CLOCK 0x08 //Applicable to both memory and engine clock change,i when set, it means this is 1st time to change clock after ASIC bootup +#define b3FIRST_TIME_CHANGE_CLOCK 0x08 //Applicable to both memory and engine clock change,when set, it means this is 1st time to change clock after ASIC bootup #define b3SKIP_SW_PROGRAM_PLL 0x10 //Applicable to both memory and engine clock change, when set, it means the table will not program SPLL/MPLL typedef struct _ATOM_COMPUTE_CLOCK_FREQ @@ -451,8 +451,8 @@ typedef struct _ATOM_COMPUTE_CLOCK_FREQ typedef struct _ATOM_S_MPLL_FB_DIVIDER { - USHORT usFbDivFrac; - USHORT usFbDiv; + USHORT usFbDivFrac; + USHORT usFbDiv; }ATOM_S_MPLL_FB_DIVIDER; typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3 @@ -463,9 +463,9 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3 ULONG ulClockParams; //ULONG access for BE ATOM_S_MPLL_FB_DIVIDER ulFbDiv; //Output Parameter }; - UCHAR ucRefDiv; //Output Parameter - UCHAR ucPostDiv; //Output Parameter - UCHAR ucCntlFlag; //Output Parameter + UCHAR ucRefDiv; //Output Parameter + UCHAR ucPostDiv; //Output Parameter + UCHAR ucCntlFlag; //Output Parameter UCHAR ucReserved; }COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3; @@ -481,9 +481,9 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4 { #if ATOM_BIG_ENDIAN ULONG ucPostDiv:8; //return parameter: post divider which is used to program to register directly - ULONG ulClock:24; //Input= target clock, output = actual clock + ULONG ulClock:24; //Input= target clock, output = actual clock #else - ULONG ulClock:24; //Input= target clock, output = actual clock + ULONG ulClock:24; //Input= target clock, output = actual clock ULONG ucPostDiv:8; //return parameter: post divider which is used to program to register directly #endif }COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4; @@ -496,14 +496,14 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5 ULONG ulClockParams; //ULONG access for BE ATOM_S_MPLL_FB_DIVIDER ulFbDiv; //Output Parameter }; - UCHAR ucRefDiv; //Output Parameter - UCHAR ucPostDiv; //Output Parameter + UCHAR ucRefDiv; //Output Parameter + UCHAR ucPostDiv; //Output Parameter union { UCHAR ucCntlFlag; //Output Flags UCHAR ucInputFlag; //Input Flags. ucInputFlag[0] - Strobe(1)/Performance(0) mode }; - UCHAR ucReserved; + UCHAR ucReserved; }COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5; @@ -522,14 +522,14 @@ typedef struct _COMPUTE_GPU_CLOCK_OUTPUT_PARAMETERS_V1_6 { COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V4 ulClock; //Output Parameter: ucPostDiv=DFS divider ATOM_S_MPLL_FB_DIVIDER ulFbDiv; //Output Parameter: PLL FB divider - UCHAR ucPllRefDiv; //Output Parameter: PLL ref divider - UCHAR ucPllPostDiv; //Output Parameter: PLL post divider + UCHAR ucPllRefDiv; //Output Parameter: PLL ref divider + UCHAR ucPllPostDiv; //Output Parameter: PLL post divider UCHAR ucPllCntlFlag; //Output Flags: control flag - UCHAR ucReserved; + UCHAR ucReserved; }COMPUTE_GPU_CLOCK_OUTPUT_PARAMETERS_V1_6; //ucPllCntlFlag -#define SPLL_CNTL_FLAG_VCO_MODE_MASK 0x03 +#define SPLL_CNTL_FLAG_VCO_MODE_MASK 0x03 // ucInputFlag @@ -540,22 +540,22 @@ typedef struct _COMPUTE_MEMORY_CLOCK_PARAM_PARAMETERS_V2_1 { union { - ULONG ulClock; + ULONG ulClock; ATOM_S_MPLL_FB_DIVIDER ulFbDiv; //Output:UPPER_WORD=FB_DIV_INTEGER, LOWER_WORD=FB_DIV_FRAC shl (16-FB_FRACTION_BITS) }; - UCHAR ucDllSpeed; //Output + UCHAR ucDllSpeed; //Output UCHAR ucPostDiv; //Output union{ UCHAR ucInputFlag; //Input : ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN: 1-StrobeMode, 0-PerformanceMode - UCHAR ucPllCntlFlag; //Output: + UCHAR ucPllCntlFlag; //Output: }; - UCHAR ucBWCntl; + UCHAR ucBWCntl; }COMPUTE_MEMORY_CLOCK_PARAM_PARAMETERS_V2_1; // definition of ucInputFlag #define MPLL_INPUT_FLAG_STROBE_MODE_EN 0x01 // definition of ucPllCntlFlag -#define MPLL_CNTL_FLAG_VCO_MODE_MASK 0x03 +#define MPLL_CNTL_FLAG_VCO_MODE_MASK 0x03 #define MPLL_CNTL_FLAG_BYPASS_DQ_PLL 0x04 #define MPLL_CNTL_FLAG_QDR_ENABLE 0x08 #define MPLL_CNTL_FLAG_AD_HALF_RATE 0x10 @@ -576,9 +576,9 @@ typedef struct _DYNAMICE_ENGINE_SETTINGS_PARAMETER ULONG ulReserved; }DYNAMICE_ENGINE_SETTINGS_PARAMETER; -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetEngineClockTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_ENGINE_CLOCK_PARAMETERS { ULONG ulTargetEngineClock; //In 10Khz unit @@ -590,9 +590,9 @@ typedef struct _SET_ENGINE_CLOCK_PS_ALLOCATION COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_PS_ALLOCATION sReserved; }SET_ENGINE_CLOCK_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetMemoryClockTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_MEMORY_CLOCK_PARAMETERS { ULONG ulTargetMemoryClock; //In 10Khz unit @@ -604,9 +604,9 @@ typedef struct _SET_MEMORY_CLOCK_PS_ALLOCATION COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_PS_ALLOCATION sReserved; }SET_MEMORY_CLOCK_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ // Structures used by ASIC_Init.ctb -/****************************************************************************/ +/****************************************************************************/ typedef struct _ASIC_INIT_PARAMETERS { ULONG ulDefaultEngineClock; //In 10Khz unit @@ -619,29 +619,29 @@ typedef struct _ASIC_INIT_PS_ALLOCATION SET_ENGINE_CLOCK_PS_ALLOCATION sReserved; //Caller doesn't need to init this structure }ASIC_INIT_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ // Structure used by DynamicClockGatingTable.ctb -/****************************************************************************/ -typedef struct _DYNAMIC_CLOCK_GATING_PARAMETERS +/****************************************************************************/ +typedef struct _DYNAMIC_CLOCK_GATING_PARAMETERS { UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE UCHAR ucPadding[3]; }DYNAMIC_CLOCK_GATING_PARAMETERS; #define DYNAMIC_CLOCK_GATING_PS_ALLOCATION DYNAMIC_CLOCK_GATING_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structure used by EnableDispPowerGatingTable.ctb -/****************************************************************************/ -typedef struct _ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 +/****************************************************************************/ +typedef struct _ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1 { UCHAR ucDispPipeId; // ATOM_CRTC1, ATOM_CRTC2, ... UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE UCHAR ucPadding[2]; }ENABLE_DISP_POWER_GATING_PARAMETERS_V2_1; -/****************************************************************************/ +/****************************************************************************/ // Structure used by EnableASIC_StaticPwrMgtTable.ctb -/****************************************************************************/ +/****************************************************************************/ typedef struct _ENABLE_ASIC_STATIC_PWR_MGT_PARAMETERS { UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE @@ -649,9 +649,9 @@ typedef struct _ENABLE_ASIC_STATIC_PWR_MGT_PARAMETERS }ENABLE_ASIC_STATIC_PWR_MGT_PARAMETERS; #define ENABLE_ASIC_STATIC_PWR_MGT_PS_ALLOCATION ENABLE_ASIC_STATIC_PWR_MGT_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by DAC_LoadDetectionTable.ctb -/****************************************************************************/ +/****************************************************************************/ typedef struct _DAC_LOAD_DETECTION_PARAMETERS { USHORT usDeviceID; //{ATOM_DEVICE_CRTx_SUPPORT,ATOM_DEVICE_TVx_SUPPORT,ATOM_DEVICE_CVx_SUPPORT} @@ -668,10 +668,10 @@ typedef struct _DAC_LOAD_DETECTION_PS_ALLOCATION ULONG Reserved[2];// Don't set this one, allocation for EXT DAC }DAC_LOAD_DETECTION_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ // Structures used by DAC1EncoderControlTable.ctb and DAC2EncoderControlTable.ctb -/****************************************************************************/ -typedef struct _DAC_ENCODER_CONTROL_PARAMETERS +/****************************************************************************/ +typedef struct _DAC_ENCODER_CONTROL_PARAMETERS { USHORT usPixelClock; // in 10KHz; for bios convenient UCHAR ucDacStandard; // See definition of ATOM_DACx_xxx, For DEC3.0, bit 7 used as internal flag to indicate DAC2 (==1) or DAC1 (==0) @@ -682,28 +682,28 @@ typedef struct _DAC_ENCODER_CONTROL_PARAMETERS #define DAC_ENCODER_CONTROL_PS_ALLOCATION DAC_ENCODER_CONTROL_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by DIG1EncoderControlTable // DIG2EncoderControlTable // ExternalEncoderControlTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS { USHORT usPixelClock; // in 10KHz; for bios convenient - UCHAR ucConfig; + UCHAR ucConfig; // [2] Link Select: // =0: PHY linkA if bfLane<3 // =1: PHY linkB if bfLanes<3 // =0: PHY linkA+B if bfLanes=3 // [3] Transmitter Sel // =0: UNIPHY or PCIEPHY - // =1: LVTMA - UCHAR ucAction; // =0: turn off encoder - // =1: turn on encoder + // =1: LVTMA + UCHAR ucAction; // =0: turn off encoder + // =1: turn on encoder UCHAR ucEncoderMode; - // =0: DP encoder - // =1: LVDS encoder - // =2: DVI encoder + // =0: DP encoder + // =1: LVDS encoder + // =2: DVI encoder // =3: HDMI encoder // =4: SDVO encoder UCHAR ucLaneNum; // how many lanes to enable @@ -768,11 +768,11 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V2 { USHORT usPixelClock; // in 10KHz; for bios convenient ATOM_DIG_ENCODER_CONFIG_V2 acConfig; - UCHAR ucAction; + UCHAR ucAction; UCHAR ucEncoderMode; - // =0: DP encoder - // =1: LVDS encoder - // =2: DVI encoder + // =0: DP encoder + // =1: LVDS encoder + // =2: DVI encoder // =3: HDMI encoder // =4: SDVO encoder UCHAR ucLaneNum; // how many lanes to enable @@ -843,12 +843,12 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V3 { USHORT usPixelClock; // in 10KHz; for bios convenient ATOM_DIG_ENCODER_CONFIG_V3 acConfig; - UCHAR ucAction; + UCHAR ucAction; union { UCHAR ucEncoderMode; - // =0: DP encoder - // =1: LVDS encoder - // =2: DVI encoder + // =0: DP encoder + // =1: LVDS encoder + // =2: DVI encoder // =3: HDMI encoder // =4: SDVO encoder // =5: DP audio @@ -864,7 +864,7 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V3 //ucTableFormatRevision=1 //ucTableContentRevision=4 -// start from NI +// start from NI // Following function ENABLE sub-function will be used by driver when TMDS/HDMI/LVDS is used, disable function will be used by driver typedef struct _ATOM_DIG_ENCODER_CONFIG_V4 { @@ -902,12 +902,12 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V4 ATOM_DIG_ENCODER_CONFIG_V4 acConfig; UCHAR ucConfig; }; - UCHAR ucAction; + UCHAR ucAction; union { UCHAR ucEncoderMode; - // =0: DP encoder - // =1: LVDS encoder - // =2: DVI encoder + // =0: DP encoder + // =1: LVDS encoder + // =2: DVI encoder // =3: HDMI encoder // =4: SDVO encoder // =5: DP audio @@ -921,9 +921,9 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V4 UCHAR ucHPD_ID; // HPD ID (1-6). =0 means to skip HDP programming. New comparing to previous version }DIG_ENCODER_CONTROL_PARAMETERS_V4; -// define ucBitPerColor: +// define ucBitPerColor: #define PANEL_BPC_UNDEFINE 0x00 -#define PANEL_6BIT_PER_COLOR 0x01 +#define PANEL_6BIT_PER_COLOR 0x01 #define PANEL_8BIT_PER_COLOR 0x02 #define PANEL_10BIT_PER_COLOR 0x03 #define PANEL_12BIT_PER_COLOR 0x04 @@ -934,11 +934,11 @@ typedef struct _DIG_ENCODER_CONTROL_PARAMETERS_V4 #define DP_PANEL_MODE_INTERNAL_DP2_MODE 0x01 #define DP_PANEL_MODE_INTERNAL_DP1_MODE 0x11 -/****************************************************************************/ +/****************************************************************************/ // Structures used by UNIPHYTransmitterControlTable // LVTMATransmitterControlTable // DVOOutputControlTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_DP_VS_MODE { UCHAR ucLaneSel; @@ -954,36 +954,36 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS ATOM_DP_VS_MODE asMode; // DP Voltage swing mode }; UCHAR ucConfig; - // [0]=0: 4 lane Link, - // =1: 8 lane Link ( Dual Links TMDS ) - // [1]=0: InCoherent mode - // =1: Coherent Mode + // [0]=0: 4 lane Link, + // =1: 8 lane Link ( Dual Links TMDS ) + // [1]=0: InCoherent mode + // =1: Coherent Mode // [2] Link Select: // =0: PHY linkA if bfLane<3 // =1: PHY linkB if bfLanes<3 - // =0: PHY linkA+B if bfLanes=3 + // =0: PHY linkA+B if bfLanes=3 // [5:4]PCIE lane Sel // =0: lane 0~3 or 0~7 // =1: lane 4~7 // =2: lane 8~11 or 8~15 - // =3: lane 12~15 - UCHAR ucAction; // =0: turn off encoder - // =1: turn on encoder + // =3: lane 12~15 + UCHAR ucAction; // =0: turn off encoder + // =1: turn on encoder UCHAR ucReserved[4]; }DIG_TRANSMITTER_CONTROL_PARAMETERS; -#define DIG_TRANSMITTER_CONTROL_PS_ALLOCATION DIG_TRANSMITTER_CONTROL_PARAMETERS +#define DIG_TRANSMITTER_CONTROL_PS_ALLOCATION DIG_TRANSMITTER_CONTROL_PARAMETERS //ucInitInfo -#define ATOM_TRAMITTER_INITINFO_CONNECTOR_MASK 0x00ff +#define ATOM_TRAMITTER_INITINFO_CONNECTOR_MASK 0x00ff -//ucConfig +//ucConfig #define ATOM_TRANSMITTER_CONFIG_8LANE_LINK 0x01 #define ATOM_TRANSMITTER_CONFIG_COHERENT 0x02 #define ATOM_TRANSMITTER_CONFIG_LINK_SEL_MASK 0x04 #define ATOM_TRANSMITTER_CONFIG_LINKA 0x00 #define ATOM_TRANSMITTER_CONFIG_LINKB 0x04 -#define ATOM_TRANSMITTER_CONFIG_LINKA_B 0x00 +#define ATOM_TRANSMITTER_CONFIG_LINKA_B 0x00 #define ATOM_TRANSMITTER_CONFIG_LINKB_A 0x04 #define ATOM_TRANSMITTER_CONFIG_ENCODER_SEL_MASK 0x08 // only used when ATOM_TRANSMITTER_ACTION_ENABLE @@ -1025,7 +1025,7 @@ typedef struct _ATOM_DIG_TRANSMITTER_CONFIG_V2 UCHAR ucTransmitterSel:2; //bit7:6: =0 Dig Transmitter 1 ( Uniphy AB ) // =1 Dig Transmitter 2 ( Uniphy CD ) // =2 Dig Transmitter 3 ( Uniphy EF ) - UCHAR ucReserved:1; + UCHAR ucReserved:1; UCHAR fDPConnector:1; //bit4=0: DP connector =1: None DP connector UCHAR ucEncoderSel:1; //bit3=0: Data/Clk path source from DIGA( DIG inst0 ). =1: Data/clk path source from DIGB ( DIG inst1 ) UCHAR ucLinkSel:1; //bit2=0: Uniphy LINKA or C or E when fDualLinkConnector=0. when fDualLinkConnector=1, it means master link of dual link is A or C or E @@ -1040,14 +1040,14 @@ typedef struct _ATOM_DIG_TRANSMITTER_CONFIG_V2 // =1: Uniphy LINKB or D or F when fDualLinkConnector=0. when fDualLinkConnector=1, it means master link of dual link is B or D or F UCHAR ucEncoderSel:1; //bit3=0: Data/Clk path source from DIGA( DIG inst0 ). =1: Data/clk path source from DIGB ( DIG inst1 ) UCHAR fDPConnector:1; //bit4=0: DP connector =1: None DP connector - UCHAR ucReserved:1; + UCHAR ucReserved:1; UCHAR ucTransmitterSel:2; //bit7:6: =0 Dig Transmitter 1 ( Uniphy AB ) // =1 Dig Transmitter 2 ( Uniphy CD ) // =2 Dig Transmitter 3 ( Uniphy EF ) #endif }ATOM_DIG_TRANSMITTER_CONFIG_V2; -//ucConfig +//ucConfig //Bit0 #define ATOM_TRANSMITTER_CONFIG_V2_DUAL_LINK_CONNECTOR 0x01 @@ -1126,7 +1126,7 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V3 UCHAR ucReserved[3]; }DIG_TRANSMITTER_CONTROL_PARAMETERS_V3; -//ucConfig +//ucConfig //Bit0 #define ATOM_TRANSMITTER_CONFIG_V3_DUAL_LINK_CONNECTOR 0x01 @@ -1156,17 +1156,17 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V3 #define ATOM_TRANSMITTER_CONFIG_V3_TRANSMITTER3 0x80 //EF -/****************************************************************************/ +/****************************************************************************/ // Structures used by UNIPHYTransmitterControlTable V1.4 // ASIC Families: NI // ucTableFormatRevision=1 // ucTableContentRevision=4 -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_DP_VS_MODE_V4 { UCHAR ucLaneSel; union - { + { UCHAR ucLaneSet; struct { #if ATOM_BIG_ENDIAN @@ -1179,9 +1179,9 @@ typedef struct _ATOM_DP_VS_MODE_V4 UCHAR ucPOST_CURSOR2:2; //Bit[7:6] Post Cursor2 Level <= New in V4 #endif }; - }; + }; }ATOM_DP_VS_MODE_V4; - + typedef struct _ATOM_DIG_TRANSMITTER_CONFIG_V4 { #if ATOM_BIG_ENDIAN @@ -1220,24 +1220,24 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V4 ATOM_DIG_TRANSMITTER_CONFIG_V4 acConfig; UCHAR ucConfig; }; - UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_XXX + UCHAR ucAction; // define as ATOM_TRANSMITER_ACTION_XXX UCHAR ucLaneNum; UCHAR ucReserved[3]; }DIG_TRANSMITTER_CONTROL_PARAMETERS_V4; -//ucConfig +//ucConfig //Bit0 #define ATOM_TRANSMITTER_CONFIG_V4_DUAL_LINK_CONNECTOR 0x01 //Bit1 #define ATOM_TRANSMITTER_CONFIG_V4_COHERENT 0x02 //Bit2 #define ATOM_TRANSMITTER_CONFIG_V4_LINK_SEL_MASK 0x04 -#define ATOM_TRANSMITTER_CONFIG_V4_LINKA 0x00 +#define ATOM_TRANSMITTER_CONFIG_V4_LINKA 0x00 #define ATOM_TRANSMITTER_CONFIG_V4_LINKB 0x04 // Bit3 #define ATOM_TRANSMITTER_CONFIG_V4_ENCODER_SEL_MASK 0x08 -#define ATOM_TRANSMITTER_CONFIG_V4_DIG1_ENCODER 0x00 -#define ATOM_TRANSMITTER_CONFIG_V4_DIG2_ENCODER 0x08 +#define ATOM_TRANSMITTER_CONFIG_V4_DIG1_ENCODER 0x00 +#define ATOM_TRANSMITTER_CONFIG_V4_DIG2_ENCODER 0x08 // Bit5:4 #define ATOM_TRANSMITTER_CONFIG_V4_REFCLK_SEL_MASK 0x30 #define ATOM_TRANSMITTER_CONFIG_V4_P1PLL 0x00 @@ -1256,13 +1256,13 @@ typedef struct _ATOM_DIG_TRANSMITTER_CONFIG_V5 #if ATOM_BIG_ENDIAN UCHAR ucReservd1:1; UCHAR ucHPDSel:3; - UCHAR ucPhyClkSrcId:2; - UCHAR ucCoherentMode:1; + UCHAR ucPhyClkSrcId:2; + UCHAR ucCoherentMode:1; UCHAR ucReserved:1; #else UCHAR ucReserved:1; - UCHAR ucCoherentMode:1; - UCHAR ucPhyClkSrcId:2; + UCHAR ucCoherentMode:1; + UCHAR ucPhyClkSrcId:2; UCHAR ucHPDSel:3; UCHAR ucReservd1:1; #endif @@ -1280,14 +1280,14 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5 ATOM_DIG_TRANSMITTER_CONFIG_V5 asConfig; UCHAR ucConfig; }; - UCHAR ucDigEncoderSel; // indicate DIG front end encoder + UCHAR ucDigEncoderSel; // indicate DIG front end encoder UCHAR ucDPLaneSet; UCHAR ucReserved; UCHAR ucReserved1; }DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5; //ucPhyId -#define ATOM_PHY_ID_UNIPHYA 0 +#define ATOM_PHY_ID_UNIPHYA 0 #define ATOM_PHY_ID_UNIPHYB 1 #define ATOM_PHY_ID_UNIPHYC 2 #define ATOM_PHY_ID_UNIPHYD 3 @@ -1317,12 +1317,12 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5 #define DP_LANE_SET__0DB_0_6V 0x01 #define DP_LANE_SET__0DB_0_8V 0x02 #define DP_LANE_SET__0DB_1_2V 0x03 -#define DP_LANE_SET__3_5DB_0_4V 0x08 +#define DP_LANE_SET__3_5DB_0_4V 0x08 #define DP_LANE_SET__3_5DB_0_6V 0x09 #define DP_LANE_SET__3_5DB_0_8V 0x0a #define DP_LANE_SET__6DB_0_4V 0x10 #define DP_LANE_SET__6DB_0_6V 0x11 -#define DP_LANE_SET__9_5DB_0_4V 0x18 +#define DP_LANE_SET__9_5DB_0_4V 0x18 // ATOM_DIG_TRANSMITTER_CONFIG_V5 asConfig; // Bit1 @@ -1334,7 +1334,7 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5 #define ATOM_TRANSMITTER_CONFIG_V5_P1PLL 0x00 #define ATOM_TRANSMITTER_CONFIG_V5_P2PLL 0x04 -#define ATOM_TRANSMITTER_CONFIG_V5_P0PLL 0x08 +#define ATOM_TRANSMITTER_CONFIG_V5_P0PLL 0x08 #define ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT 0x0c // Bit6:4 #define ATOM_TRANSMITTER_CONFIG_V5_HPD_SEL_MASK 0x70 @@ -1351,25 +1351,25 @@ typedef struct _DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5 #define DIG_TRANSMITTER_CONTROL_PS_ALLOCATION_V1_5 DIG_TRANSMITTER_CONTROL_PARAMETERS_V1_5 -/****************************************************************************/ +/****************************************************************************/ // Structures used by ExternalEncoderControlTable V1.3 // ASIC Families: Evergreen, Llano, NI // ucTableFormatRevision=1 // ucTableContentRevision=3 -/****************************************************************************/ +/****************************************************************************/ typedef struct _EXTERNAL_ENCODER_CONTROL_PARAMETERS_V3 { union{ - USHORT usPixelClock; // pixel clock in 10Khz, valid when ucAction=SETUP/ENABLE_OUTPUT + USHORT usPixelClock; // pixel clock in 10Khz, valid when ucAction=SETUP/ENABLE_OUTPUT USHORT usConnectorId; // connector id, valid when ucAction = INIT }; - UCHAR ucConfig; // indicate which encoder, and DP link rate when ucAction = SETUP/ENABLE_OUTPUT - UCHAR ucAction; // + UCHAR ucConfig; // indicate which encoder, and DP link rate when ucAction = SETUP/ENABLE_OUTPUT + UCHAR ucAction; // UCHAR ucEncoderMode; // encoder mode, only used when ucAction = SETUP/ENABLE_OUTPUT - UCHAR ucLaneNum; // lane number, only used when ucAction = SETUP/ENABLE_OUTPUT + UCHAR ucLaneNum; // lane number, only used when ucAction = SETUP/ENABLE_OUTPUT UCHAR ucBitPerColor; // output bit per color, only valid when ucAction = SETUP/ENABLE_OUTPUT and ucEncodeMode= DP - UCHAR ucReserved; + UCHAR ucReserved; }EXTERNAL_ENCODER_CONTROL_PARAMETERS_V3; // ucAction @@ -1399,29 +1399,29 @@ typedef struct _EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION_V3 }EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION_V3; -/****************************************************************************/ +/****************************************************************************/ // Structures used by DAC1OuputControlTable // DAC2OuputControlTable // LVTMAOutputControlTable (Before DEC30) // TMDSAOutputControlTable (Before DEC30) -/****************************************************************************/ +/****************************************************************************/ typedef struct _DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS { UCHAR ucAction; // Possible input:ATOM_ENABLE||ATOMDISABLE // When the display is LCD, in addition to above: // ATOM_LCD_BLOFF|| ATOM_LCD_BLON ||ATOM_LCD_BL_BRIGHTNESS_CONTROL||ATOM_LCD_SELFTEST_START|| // ATOM_LCD_SELFTEST_STOP - + UCHAR aucPadding[3]; // padding to DWORD aligned }DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS; #define DISPLAY_DEVICE_OUTPUT_CONTROL_PS_ALLOCATION DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS -#define CRT1_OUTPUT_CONTROL_PARAMETERS DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS +#define CRT1_OUTPUT_CONTROL_PARAMETERS DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS #define CRT1_OUTPUT_CONTROL_PS_ALLOCATION DISPLAY_DEVICE_OUTPUT_CONTROL_PS_ALLOCATION -#define CRT2_OUTPUT_CONTROL_PARAMETERS DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS +#define CRT2_OUTPUT_CONTROL_PARAMETERS DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS #define CRT2_OUTPUT_CONTROL_PS_ALLOCATION DISPLAY_DEVICE_OUTPUT_CONTROL_PS_ALLOCATION #define CV1_OUTPUT_CONTROL_PARAMETERS DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS @@ -1443,9 +1443,9 @@ typedef struct _DISPLAY_DEVICE_OUTPUT_CONTROL_PARAMETERS #define DVO_OUTPUT_CONTROL_PS_ALLOCATION DIG_TRANSMITTER_CONTROL_PS_ALLOCATION #define DVO_OUTPUT_CONTROL_PARAMETERS_V3 DIG_TRANSMITTER_CONTROL_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by BlankCRTCTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _BLANK_CRTC_PARAMETERS { UCHAR ucCRTC; // ATOM_CRTC1 or ATOM_CRTC2 @@ -1456,22 +1456,22 @@ typedef struct _BLANK_CRTC_PARAMETERS }BLANK_CRTC_PARAMETERS; #define BLANK_CRTC_PS_ALLOCATION BLANK_CRTC_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by EnableCRTCTable // EnableCRTCMemReqTable // UpdateCRTC_DoubleBufferRegistersTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ENABLE_CRTC_PARAMETERS { UCHAR ucCRTC; // ATOM_CRTC1 or ATOM_CRTC2 - UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE + UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE UCHAR ucPadding[2]; }ENABLE_CRTC_PARAMETERS; #define ENABLE_CRTC_PS_ALLOCATION ENABLE_CRTC_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetCRTC_OverScanTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_CRTC_OVERSCAN_PARAMETERS { USHORT usOverscanRight; // right @@ -1483,9 +1483,9 @@ typedef struct _SET_CRTC_OVERSCAN_PARAMETERS }SET_CRTC_OVERSCAN_PARAMETERS; #define SET_CRTC_OVERSCAN_PS_ALLOCATION SET_CRTC_OVERSCAN_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetCRTC_ReplicationTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_CRTC_REPLICATION_PARAMETERS { UCHAR ucH_Replication; // horizontal replication @@ -1495,9 +1495,9 @@ typedef struct _SET_CRTC_REPLICATION_PARAMETERS }SET_CRTC_REPLICATION_PARAMETERS; #define SET_CRTC_REPLICATION_PS_ALLOCATION SET_CRTC_REPLICATION_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by SelectCRTC_SourceTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SELECT_CRTC_SOURCE_PARAMETERS { UCHAR ucCRTC; // ATOM_CRTC1 or ATOM_CRTC2 @@ -1515,7 +1515,7 @@ typedef struct _SELECT_CRTC_SOURCE_PARAMETERS_V2 }SELECT_CRTC_SOURCE_PARAMETERS_V2; //ucEncoderID -//#define ASIC_INT_DAC1_ENCODER_ID 0x00 +//#define ASIC_INT_DAC1_ENCODER_ID 0x00 //#define ASIC_INT_TV_ENCODER_ID 0x02 //#define ASIC_INT_DIG1_ENCODER_ID 0x03 //#define ASIC_INT_DAC2_ENCODER_ID 0x04 @@ -1534,10 +1534,10 @@ typedef struct _SELECT_CRTC_SOURCE_PARAMETERS_V2 //#define ATOM_ENCODER_MODE_CV 14 //#define ATOM_ENCODER_MODE_CRT 15 -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetPixelClockTable -// GetPixelClockTable -/****************************************************************************/ +// GetPixelClockTable +/****************************************************************************/ //Major revision=1., Minor revision=1 typedef struct _PIXEL_CLOCK_PARAMETERS { @@ -1545,7 +1545,7 @@ typedef struct _PIXEL_CLOCK_PARAMETERS // 0 means disable PPLL USHORT usRefDiv; // Reference divider USHORT usFbDiv; // feedback divider - UCHAR ucPostDiv; // post divider + UCHAR ucPostDiv; // post divider UCHAR ucFracFbDiv; // fractional feedback divider UCHAR ucPpll; // ATOM_PPLL1 or ATOM_PPL2 UCHAR ucRefDivSrc; // ATOM_PJITTER or ATO_NONPJITTER @@ -1565,7 +1565,7 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V2 // 0 means disable PPLL USHORT usRefDiv; // Reference divider USHORT usFbDiv; // feedback divider - UCHAR ucPostDiv; // post divider + UCHAR ucPostDiv; // post divider UCHAR ucFracFbDiv; // fractional feedback divider UCHAR ucPpll; // ATOM_PPLL1 or ATOM_PPL2 UCHAR ucRefDivSrc; // ATOM_PJITTER or ATO_NONPJITTER @@ -1612,7 +1612,7 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V3 // 0 means disable PPLL. For VGA PPLL,make sure this value is not 0. USHORT usRefDiv; // Reference divider USHORT usFbDiv; // feedback divider - UCHAR ucPostDiv; // post divider + UCHAR ucPostDiv; // post divider UCHAR ucFracFbDiv; // fractional feedback divider UCHAR ucPpll; // ATOM_PPLL1 or ATOM_PPL2 UCHAR ucTransmitterId; // graphic encoder id defined in objectId.h @@ -1631,25 +1631,25 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V3 typedef struct _PIXEL_CLOCK_PARAMETERS_V5 { - UCHAR ucCRTC; // ATOM_CRTC1~6, indicate the CRTC controller to + UCHAR ucCRTC; // ATOM_CRTC1~6, indicate the CRTC controller to // drive the pixel clock. not used for DCPLL case. union{ UCHAR ucReserved; UCHAR ucFracFbDiv; // [gphan] temporary to prevent build problem. remove it after driver code is changed. }; USHORT usPixelClock; // target the pixel clock to drive the CRTC timing - // 0 means disable PPLL/DCPLL. - USHORT usFbDiv; // feedback divider integer part. - UCHAR ucPostDiv; // post divider. + // 0 means disable PPLL/DCPLL. + USHORT usFbDiv; // feedback divider integer part. + UCHAR ucPostDiv; // post divider. UCHAR ucRefDiv; // Reference divider UCHAR ucPpll; // ATOM_PPLL1/ATOM_PPLL2/ATOM_DCPLL - UCHAR ucTransmitterID; // ASIC encoder id defined in objectId.h, - // indicate which graphic encoder will be used. - UCHAR ucEncoderMode; // Encoder mode: - UCHAR ucMiscInfo; // bit[0]= Force program PPLL - // bit[1]= when VGA timing is used. + UCHAR ucTransmitterID; // ASIC encoder id defined in objectId.h, + // indicate which graphic encoder will be used. + UCHAR ucEncoderMode; // Encoder mode: + UCHAR ucMiscInfo; // bit[0]= Force program PPLL + // bit[1]= when VGA timing is used. // bit[3:2]= HDMI panel bit depth: =0: 24bpp =1:30bpp, =2:32bpp - // bit[4]= RefClock source for PPLL. + // bit[4]= RefClock source for PPLL. // =0: XTLAIN( default mode ) // =1: other external clock source, which is pre-defined // by VBIOS depend on the feature required. @@ -1669,14 +1669,14 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V5 typedef struct _CRTC_PIXEL_CLOCK_FREQ { #if ATOM_BIG_ENDIAN - ULONG ucCRTC:8; // ATOM_CRTC1~6, indicate the CRTC controller to + ULONG ucCRTC:8; // ATOM_CRTC1~6, indicate the CRTC controller to // drive the pixel clock. not used for DCPLL case. - ULONG ulPixelClock:24; // target the pixel clock to drive the CRTC timing. + ULONG ulPixelClock:24; // target the pixel clock to drive the CRTC timing. // 0 means disable PPLL/DCPLL. Expanded to 24 bits comparing to previous version. #else - ULONG ulPixelClock:24; // target the pixel clock to drive the CRTC timing. + ULONG ulPixelClock:24; // target the pixel clock to drive the CRTC timing. // 0 means disable PPLL/DCPLL. Expanded to 24 bits comparing to previous version. - ULONG ucCRTC:8; // ATOM_CRTC1~6, indicate the CRTC controller to + ULONG ucCRTC:8; // ATOM_CRTC1~6, indicate the CRTC controller to // drive the pixel clock. not used for DCPLL case. #endif }CRTC_PIXEL_CLOCK_FREQ; @@ -1684,22 +1684,22 @@ typedef struct _CRTC_PIXEL_CLOCK_FREQ typedef struct _PIXEL_CLOCK_PARAMETERS_V6 { union{ - CRTC_PIXEL_CLOCK_FREQ ulCrtcPclkFreq; // pixel clock and CRTC id frequency + CRTC_PIXEL_CLOCK_FREQ ulCrtcPclkFreq; // pixel clock and CRTC id frequency ULONG ulDispEngClkFreq; // dispclk frequency }; - USHORT usFbDiv; // feedback divider integer part. - UCHAR ucPostDiv; // post divider. + USHORT usFbDiv; // feedback divider integer part. + UCHAR ucPostDiv; // post divider. UCHAR ucRefDiv; // Reference divider UCHAR ucPpll; // ATOM_PPLL1/ATOM_PPLL2/ATOM_DCPLL - UCHAR ucTransmitterID; // ASIC encoder id defined in objectId.h, - // indicate which graphic encoder will be used. - UCHAR ucEncoderMode; // Encoder mode: - UCHAR ucMiscInfo; // bit[0]= Force program PPLL - // bit[1]= when VGA timing is used. + UCHAR ucTransmitterID; // ASIC encoder id defined in objectId.h, + // indicate which graphic encoder will be used. + UCHAR ucEncoderMode; // Encoder mode: + UCHAR ucMiscInfo; // bit[0]= Force program PPLL + // bit[1]= when VGA timing is used. // bit[3:2]= HDMI panel bit depth: =0: 24bpp =1:30bpp, =2:32bpp - // bit[4]= RefClock source for PPLL. + // bit[4]= RefClock source for PPLL. // =0: XTLAIN( default mode ) - // =1: other external clock source, which is pre-defined + // =1: other external clock source, which is pre-defined // by VBIOS depend on the feature required. // bit[7:5]: reserved. ULONG ulFbDivDecFrac; // 20 bit feedback divider decimal fraction part, range from 1~999999 ( 0.000001 to 0.999999 ) @@ -1711,9 +1711,9 @@ typedef struct _PIXEL_CLOCK_PARAMETERS_V6 #define PIXEL_CLOCK_V6_MISC_HDMI_BPP_MASK 0x0c #define PIXEL_CLOCK_V6_MISC_HDMI_24BPP 0x00 #define PIXEL_CLOCK_V6_MISC_HDMI_36BPP 0x04 -#define PIXEL_CLOCK_V6_MISC_HDMI_36BPP_V6 0x08 //for V6, the correct definition for 36bpp should be 2 for 36bpp(2:1) +#define PIXEL_CLOCK_V6_MISC_HDMI_36BPP_V6 0x08 //for V6, the correct defintion for 36bpp should be 2 for 36bpp(2:1) #define PIXEL_CLOCK_V6_MISC_HDMI_30BPP 0x08 -#define PIXEL_CLOCK_V6_MISC_HDMI_30BPP_V6 0x04 //for V6, the correct definition for 30bpp should be 1 for 36bpp(5:4) +#define PIXEL_CLOCK_V6_MISC_HDMI_30BPP_V6 0x04 //for V6, the correct defintion for 30bpp should be 1 for 36bpp(5:4) #define PIXEL_CLOCK_V6_MISC_HDMI_48BPP 0x0c #define PIXEL_CLOCK_V6_MISC_REF_DIV_SRC 0x10 #define PIXEL_CLOCK_V6_MISC_GEN_DPREFCLK 0x40 @@ -1735,9 +1735,9 @@ typedef struct _GET_DISP_PLL_STATUS_INPUT_PARAMETERS_V3 PIXEL_CLOCK_PARAMETERS_V5 sDispClkInput; }GET_DISP_PLL_STATUS_INPUT_PARAMETERS_V3; -/****************************************************************************/ +/****************************************************************************/ // Structures used by AdjustDisplayPllTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ADJUST_DISPLAY_PLL_PARAMETERS { USHORT usPixelClock; @@ -1782,21 +1782,21 @@ typedef struct _ADJUST_DISPLAY_PLL_OUTPUT_PARAMETERS_V3 ULONG ulDispPllFreq; // return display PPLL freq which is used to generate the pixclock, and related idclk, symclk etc UCHAR ucRefDiv; // if it is none-zero, it is used to be calculated the other ppll parameter fb_divider and post_div ( if it is not given ) UCHAR ucPostDiv; // if it is none-zero, it is used to be calculated the other ppll parameter fb_divider - UCHAR ucReserved[2]; + UCHAR ucReserved[2]; }ADJUST_DISPLAY_PLL_OUTPUT_PARAMETERS_V3; typedef struct _ADJUST_DISPLAY_PLL_PS_ALLOCATION_V3 { - union + union { ADJUST_DISPLAY_PLL_INPUT_PARAMETERS_V3 sInput; ADJUST_DISPLAY_PLL_OUTPUT_PARAMETERS_V3 sOutput; }; } ADJUST_DISPLAY_PLL_PS_ALLOCATION_V3; -/****************************************************************************/ +/****************************************************************************/ // Structures used by EnableYUVTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ENABLE_YUV_PARAMETERS { UCHAR ucEnable; // ATOM_ENABLE:Enable YUV or ATOM_DISABLE:Disable YUV (RGB) @@ -1805,27 +1805,27 @@ typedef struct _ENABLE_YUV_PARAMETERS }ENABLE_YUV_PARAMETERS; #define ENABLE_YUV_PS_ALLOCATION ENABLE_YUV_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by GetMemoryClockTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _GET_MEMORY_CLOCK_PARAMETERS { ULONG ulReturnMemoryClock; // current memory speed in 10KHz unit } GET_MEMORY_CLOCK_PARAMETERS; #define GET_MEMORY_CLOCK_PS_ALLOCATION GET_MEMORY_CLOCK_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by GetEngineClockTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _GET_ENGINE_CLOCK_PARAMETERS { ULONG ulReturnEngineClock; // current engine speed in 10KHz unit } GET_ENGINE_CLOCK_PARAMETERS; #define GET_ENGINE_CLOCK_PS_ALLOCATION GET_ENGINE_CLOCK_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Following Structures and constant may be obsolete -/****************************************************************************/ +/****************************************************************************/ //Maxium 8 bytes,the data read in will be placed in the parameter space. //Read operaion successeful when the paramter space is non-zero, otherwise read operation failed typedef struct _READ_EDID_FROM_HW_I2C_DATA_PARAMETERS @@ -1850,7 +1850,7 @@ typedef struct _WRITE_ONE_BYTE_HW_I2C_DATA_PARAMETERS { USHORT usPrescale; //Ratio between Engine clock and I2C clock USHORT usByteOffset; //Write to which byte - //Upper portion of usByteOffset is Format of data + //Upper portion of usByteOffset is Format of data //1bytePS+offsetPS //2bytesPS+offsetPS //blockID+offsetPS @@ -1876,18 +1876,18 @@ typedef struct _SET_UP_HW_I2C_DATA_PARAMETERS #define SPEED_FAN_CONTROL_PS_ALLOCATION WRITE_ONE_BYTE_HW_I2C_DATA_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structures used by PowerConnectorDetectionTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _POWER_CONNECTOR_DETECTION_PARAMETERS { UCHAR ucPowerConnectorStatus; //Used for return value 0: detected, 1:not detected - UCHAR ucPwrBehaviorId; + UCHAR ucPwrBehaviorId; USHORT usPwrBudget; //how much power currently boot to in unit of watt }POWER_CONNECTOR_DETECTION_PARAMETERS; typedef struct POWER_CONNECTOR_DETECTION_PS_ALLOCATION -{ +{ UCHAR ucPowerConnectorStatus; //Used for return value 0: detected, 1:not detected UCHAR ucReserved; USHORT usPwrBudget; //how much power currently boot to in unit of watt @@ -1896,12 +1896,12 @@ typedef struct POWER_CONNECTOR_DETECTION_PS_ALLOCATION /****************************LVDS SS Command Table Definitions**********************/ -/****************************************************************************/ +/****************************************************************************/ // Structures used by EnableSpreadSpectrumOnPPLLTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ENABLE_LVDS_SS_PARAMETERS { - USHORT usSpreadSpectrumPercentage; + USHORT usSpreadSpectrumPercentage; UCHAR ucSpreadSpectrumType; //Bit1=0 Down Spread,=1 Center Spread. Bit1=1 Ext. =0 Int. Others:TBD UCHAR ucSpreadSpectrumStepSize_Delay; //bits3:2 SS_STEP_SIZE; bit 6:4 SS_DELAY UCHAR ucEnable; //ATOM_ENABLE or ATOM_DISABLE @@ -1911,7 +1911,7 @@ typedef struct _ENABLE_LVDS_SS_PARAMETERS //ucTableFormatRevision=1,ucTableContentRevision=2 typedef struct _ENABLE_LVDS_SS_PARAMETERS_V2 { - USHORT usSpreadSpectrumPercentage; + USHORT usSpreadSpectrumPercentage; UCHAR ucSpreadSpectrumType; //Bit1=0 Down Spread,=1 Center Spread. Bit1=1 Ext. =0 Int. Others:TBD UCHAR ucSpreadSpectrumStep; // UCHAR ucEnable; //ATOM_ENABLE or ATOM_DISABLE @@ -1935,12 +1935,12 @@ typedef struct _ENABLE_SPREAD_SPECTRUM_ON_PPLL typedef struct _ENABLE_SPREAD_SPECTRUM_ON_PPLL_V2 { USHORT usSpreadSpectrumPercentage; - UCHAR ucSpreadSpectrumType; // Bit[0]: 0-Down Spread,1-Center Spread. - // Bit[1]: 1-Ext. 0-Int. + UCHAR ucSpreadSpectrumType; // Bit[0]: 0-Down Spread,1-Center Spread. + // Bit[1]: 1-Ext. 0-Int. // Bit[3:2]: =0 P1PLL =1 P2PLL =2 DCPLL // Bits[7:4] reserved UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE - USHORT usSpreadSpectrumAmount; // Includes SS_AMOUNT_FBDIV[7:0] and SS_AMOUNT_NFRAC_SLIP[11:8] + USHORT usSpreadSpectrumAmount; // Includes SS_AMOUNT_FBDIV[7:0] and SS_AMOUNT_NFRAC_SLIP[11:8] USHORT usSpreadSpectrumStep; // SS_STEP_SIZE_DSFRAC }ENABLE_SPREAD_SPECTRUM_ON_PPLL_V2; @@ -1960,15 +1960,15 @@ typedef struct _ENABLE_SPREAD_SPECTRUM_ON_PPLL_V2 typedef struct _ENABLE_SPREAD_SPECTRUM_ON_PPLL_V3 { USHORT usSpreadSpectrumAmountFrac; // SS_AMOUNT_DSFRAC New in DCE5.0 - UCHAR ucSpreadSpectrumType; // Bit[0]: 0-Down Spread,1-Center Spread. - // Bit[1]: 1-Ext. 0-Int. + UCHAR ucSpreadSpectrumType; // Bit[0]: 0-Down Spread,1-Center Spread. + // Bit[1]: 1-Ext. 0-Int. // Bit[3:2]: =0 P1PLL =1 P2PLL =2 DCPLL // Bits[7:4] reserved UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE - USHORT usSpreadSpectrumAmount; // Includes SS_AMOUNT_FBDIV[7:0] and SS_AMOUNT_NFRAC_SLIP[11:8] + USHORT usSpreadSpectrumAmount; // Includes SS_AMOUNT_FBDIV[7:0] and SS_AMOUNT_NFRAC_SLIP[11:8] USHORT usSpreadSpectrumStep; // SS_STEP_SIZE_DSFRAC }ENABLE_SPREAD_SPECTRUM_ON_PPLL_V3; - + #define ATOM_PPLL_SS_TYPE_V3_DOWN_SPREAD 0x00 #define ATOM_PPLL_SS_TYPE_V3_CENTRE_SPREAD 0x01 #define ATOM_PPLL_SS_TYPE_V3_EXT_SPREAD 0x02 @@ -1989,14 +1989,14 @@ typedef struct _ENABLE_SPREAD_SPECTRUM_ON_PPLL_V2 typedef struct _SET_PIXEL_CLOCK_PS_ALLOCATION { PIXEL_CLOCK_PARAMETERS sPCLKInput; - ENABLE_SPREAD_SPECTRUM_ON_PPLL sReserved;//Caller doesn't need to init this portion + ENABLE_SPREAD_SPECTRUM_ON_PPLL sReserved;//Caller doesn't need to init this portion }SET_PIXEL_CLOCK_PS_ALLOCATION; #define ENABLE_VGA_RENDER_PS_ALLOCATION SET_PIXEL_CLOCK_PS_ALLOCATION -/****************************************************************************/ +/****************************************************************************/ // Structures used by ### -/****************************************************************************/ +/****************************************************************************/ typedef struct _MEMORY_TRAINING_PARAMETERS { ULONG ulTargetMemoryClock; //In 10Khz unit @@ -2007,11 +2007,11 @@ typedef struct _MEMORY_TRAINING_PARAMETERS /****************************LVDS and other encoder command table definitions **********************/ -/****************************************************************************/ +/****************************************************************************/ // Structures used by LVDSEncoderControlTable (Before DCE30) // LVTMAEncoderControlTable (Before DCE30) // TMDSAEncoderControlTable (Before DCE30) -/****************************************************************************/ +/****************************************************************************/ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS { USHORT usPixelClock; // in 10KHz; for bios convenient @@ -2024,7 +2024,7 @@ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS }LVDS_ENCODER_CONTROL_PARAMETERS; #define LVDS_ENCODER_CONTROL_PS_ALLOCATION LVDS_ENCODER_CONTROL_PARAMETERS - + #define TMDS1_ENCODER_CONTROL_PARAMETERS LVDS_ENCODER_CONTROL_PARAMETERS #define TMDS1_ENCODER_CONTROL_PS_ALLOCATION TMDS1_ENCODER_CONTROL_PARAMETERS @@ -2064,10 +2064,10 @@ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2 }LVDS_ENCODER_CONTROL_PARAMETERS_V2; #define LVDS_ENCODER_CONTROL_PS_ALLOCATION_V2 LVDS_ENCODER_CONTROL_PARAMETERS_V2 - + #define TMDS1_ENCODER_CONTROL_PARAMETERS_V2 LVDS_ENCODER_CONTROL_PARAMETERS_V2 #define TMDS1_ENCODER_CONTROL_PS_ALLOCATION_V2 TMDS1_ENCODER_CONTROL_PARAMETERS_V2 - + #define TMDS2_ENCODER_CONTROL_PARAMETERS_V2 TMDS1_ENCODER_CONTROL_PARAMETERS_V2 #define TMDS2_ENCODER_CONTROL_PS_ALLOCATION_V2 TMDS2_ENCODER_CONTROL_PARAMETERS_V2 @@ -2080,18 +2080,18 @@ typedef struct _LVDS_ENCODER_CONTROL_PARAMETERS_V2 #define TMDS2_ENCODER_CONTROL_PARAMETERS_V3 LVDS_ENCODER_CONTROL_PARAMETERS_V3 #define TMDS2_ENCODER_CONTROL_PS_ALLOCATION_V3 TMDS2_ENCODER_CONTROL_PARAMETERS_V3 -/****************************************************************************/ +/****************************************************************************/ // Structures used by ### -/****************************************************************************/ +/****************************************************************************/ typedef struct _ENABLE_EXTERNAL_TMDS_ENCODER_PARAMETERS -{ +{ UCHAR ucEnable; // Enable or Disable External TMDS encoder UCHAR ucMisc; // Bit0=0:Enable Single link;=1:Enable Dual link;Bit1 {=0:666RGB, =1:888RGB} UCHAR ucPadding[2]; }ENABLE_EXTERNAL_TMDS_ENCODER_PARAMETERS; typedef struct _ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION -{ +{ ENABLE_EXTERNAL_TMDS_ENCODER_PARAMETERS sXTmdsEncoder; WRITE_ONE_BYTE_HW_I2C_DATA_PS_ALLOCATION sReserved; //Caller doesn't need to init this portion }ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION; @@ -2099,7 +2099,7 @@ typedef struct _ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION #define ENABLE_EXTERNAL_TMDS_ENCODER_PARAMETERS_V2 LVDS_ENCODER_CONTROL_PARAMETERS_V2 typedef struct _ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION_V2 -{ +{ ENABLE_EXTERNAL_TMDS_ENCODER_PARAMETERS_V2 sXTmdsEncoder; WRITE_ONE_BYTE_HW_I2C_DATA_PS_ALLOCATION sReserved; //Caller doesn't need to init this portion }ENABLE_EXTERNAL_TMDS_ENCODER_PS_ALLOCATION_V2; @@ -2110,9 +2110,9 @@ typedef struct _EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION WRITE_ONE_BYTE_HW_I2C_DATA_PS_ALLOCATION sReserved; }EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ // Structures used by DVOEncoderControlTable -/****************************************************************************/ +/****************************************************************************/ //ucTableFormatRevision=1,ucTableContentRevision=3 //ucDVOConfig: @@ -2126,7 +2126,7 @@ typedef struct _EXTERNAL_ENCODER_CONTROL_PS_ALLOCATION typedef struct _DVO_ENCODER_CONTROL_PARAMETERS_V3 { - USHORT usPixelClock; + USHORT usPixelClock; UCHAR ucDVOConfig; UCHAR ucAction; //ATOM_ENABLE/ATOM_DISABLE/ATOM_HPD_INIT UCHAR ucReseved[4]; @@ -2135,7 +2135,7 @@ typedef struct _DVO_ENCODER_CONTROL_PARAMETERS_V3 typedef struct _DVO_ENCODER_CONTROL_PARAMETERS_V1_4 { - USHORT usPixelClock; + USHORT usPixelClock; UCHAR ucDVOConfig; UCHAR ucAction; //ATOM_ENABLE/ATOM_DISABLE/ATOM_HPD_INIT UCHAR ucBitPerColor; //please refer to definition of PANEL_xBIT_PER_COLOR @@ -2145,7 +2145,7 @@ typedef struct _DVO_ENCODER_CONTROL_PARAMETERS_V1_4 //ucTableFormatRevision=1 -//ucTableContentRevision=3 structure is not changed but usMisc add bit 1 as another input for +//ucTableContentRevision=3 structure is not changed but usMisc add bit 1 as another input for // bit1=0: non-coherent mode // =1: coherent mode @@ -2192,9 +2192,9 @@ typedef struct _DVO_ENCODER_CONTROL_PARAMETERS_V1_4 #define PANEL_ENCODER_75FRC_E 0x00 #define PANEL_ENCODER_75FRC_F 0x80 -/****************************************************************************/ +/****************************************************************************/ // Structures used by SetVoltageTable -/****************************************************************************/ +/****************************************************************************/ #define SET_VOLTAGE_TYPE_ASIC_VDDC 1 #define SET_VOLTAGE_TYPE_ASIC_MVDDC 2 #define SET_VOLTAGE_TYPE_ASIC_MVDDQ 3 @@ -2215,13 +2215,13 @@ typedef struct _SET_VOLTAGE_PARAMETERS UCHAR ucVoltageType; // To tell which voltage to set up, VDDC/MVDDC/MVDDQ UCHAR ucVoltageMode; // To set all, to set source A or source B or ... UCHAR ucVoltageIndex; // An index to tell which voltage level - UCHAR ucReserved; + UCHAR ucReserved; }SET_VOLTAGE_PARAMETERS; typedef struct _SET_VOLTAGE_PARAMETERS_V2 { UCHAR ucVoltageType; // To tell which voltage to set up, VDDC/MVDDC/MVDDQ - UCHAR ucVoltageMode; // Not used, maybe use for state machine for different power mode + UCHAR ucVoltageMode; // Not used, maybe use for state machine for differen power mode USHORT usVoltageLevel; // real voltage level }SET_VOLTAGE_PARAMETERS_V2; @@ -2245,9 +2245,9 @@ typedef struct _SET_VOLTAGE_PARAMETERS_V1_3 #define ATOM_SET_VOLTAGE_PHASE 4 //Set Vregulator Phase, only for SVID/PVID regulator #define ATOM_GET_MAX_VOLTAGE 6 //Get Max Voltage, not used from SetVoltageTable v1.3 #define ATOM_GET_VOLTAGE_LEVEL 6 //Get Voltage level from vitual voltage ID, not used for SetVoltage v1.4 -#define ATOM_GET_LEAKAGE_ID 8 //Get Leakage Voltage Id ( starting from SMU7x IP ), SetVoltage v1.4 +#define ATOM_GET_LEAKAGE_ID 8 //Get Leakage Voltage Id ( starting from SMU7x IP ), SetVoltage v1.4 -// define virtual voltage id in usVoltageLevel +// define vitual voltage id in usVoltageLevel #define ATOM_VIRTUAL_VOLTAGE_ID0 0xff01 #define ATOM_VIRTUAL_VOLTAGE_ID1 0xff02 #define ATOM_VIRTUAL_VOLTAGE_ID2 0xff03 @@ -2268,7 +2268,7 @@ typedef struct _GET_VOLTAGE_INFO_INPUT_PARAMETER_V1_1 { UCHAR ucVoltageType; // Input: To tell which voltage to set up, VDDC/MVDDC/MVDDQ/VDDCI UCHAR ucVoltageMode; // Input: Indicate action: Get voltage info - USHORT usVoltageLevel; // Input: real voltage level in unit of mv or Voltage Phase (0, 1, 2, .. ) or Leakage Id + USHORT usVoltageLevel; // Input: real voltage level in unit of mv or Voltage Phase (0, 1, 2, .. ) or Leakage Id ULONG ulReserved; }GET_VOLTAGE_INFO_INPUT_PARAMETER_V1_1; @@ -2307,14 +2307,14 @@ typedef struct _GET_VOLTAGE_INFO_INPUT_PARAMETER_V1_2 { UCHAR ucVoltageType; // Input: To tell which voltage to set up, VDDC/MVDDC/MVDDQ/VDDCI UCHAR ucVoltageMode; // Input: Indicate action: Get voltage info - USHORT usVoltageLevel; // Input: real voltage level in unit of mv or Voltage Phase (0, 1, 2, .. ) or Leakage Id + USHORT usVoltageLevel; // Input: real voltage level in unit of mv or Voltage Phase (0, 1, 2, .. ) or Leakage Id ULONG ulSCLKFreq; // Input: when ucVoltageMode= ATOM_GET_VOLTAGE_EVV_VOLTAGE, DPM state SCLK frequency, Define in PPTable SCLK/Voltage dependence table }GET_VOLTAGE_INFO_INPUT_PARAMETER_V1_2; // New in GetVoltageInfo v1.2 ucVoltageMode -#define ATOM_GET_VOLTAGE_EVV_VOLTAGE 0x09 +#define ATOM_GET_VOLTAGE_EVV_VOLTAGE 0x09 -// New Added from CI Hawaii for EVV feature +// New Added from CI Hawaii for EVV feature typedef struct _GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2 { USHORT usVoltageLevel; // real voltage level in unit of mv @@ -2322,9 +2322,9 @@ typedef struct _GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2 ULONG ulReseved; }GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2; -/****************************************************************************/ +/****************************************************************************/ // Structures used by TVEncoderControlTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _TV_ENCODER_CONTROL_PARAMETERS { USHORT usPixelClock; // in 10KHz; for bios convenient @@ -2335,28 +2335,28 @@ typedef struct _TV_ENCODER_CONTROL_PARAMETERS typedef struct _TV_ENCODER_CONTROL_PS_ALLOCATION { - TV_ENCODER_CONTROL_PARAMETERS sTVEncoder; + TV_ENCODER_CONTROL_PARAMETERS sTVEncoder; WRITE_ONE_BYTE_HW_I2C_DATA_PS_ALLOCATION sReserved; // Don't set this one }TV_ENCODER_CONTROL_PS_ALLOCATION; //==============================Data Table Portion==================================== -/****************************************************************************/ +/****************************************************************************/ // Structure used in Data.mtb -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_MASTER_LIST_OF_DATA_TABLES { - USHORT UtilityPipeLine; // Offest for the utility to get parser info, Don't change this position! - USHORT MultimediaCapabilityInfo; // Only used by MM Lib,latest version 1.1, not configuable from Bios, need to include the table to build Bios + USHORT UtilityPipeLine; // Offest for the utility to get parser info,Don't change this position! + USHORT MultimediaCapabilityInfo; // Only used by MM Lib,latest version 1.1, not configuable from Bios, need to include the table to build Bios USHORT MultimediaConfigInfo; // Only used by MM Lib,latest version 2.1, not configuable from Bios, need to include the table to build Bios USHORT StandardVESA_Timing; // Only used by Bios USHORT FirmwareInfo; // Shared by various SW components,latest version 1.4 USHORT PaletteData; // Only used by BIOS - USHORT LCD_Info; // Shared by various SW components,latest version 1.3, was called LVDS_Info + USHORT LCD_Info; // Shared by various SW components,latest version 1.3, was called LVDS_Info USHORT DIGTransmitterInfo; // Internal used by VBIOS only version 3.1 - USHORT AnalogTV_Info; // Shared by various SW components,latest version 1.1 + USHORT AnalogTV_Info; // Shared by various SW components,latest version 1.1 USHORT SupportedDevicesInfo; // Will be obsolete from R600 - USHORT GPIO_I2C_Info; // Shared by various SW components,latest version 1.2 will be used from R600 + USHORT GPIO_I2C_Info; // Shared by various SW components,latest version 1.2 will be used from R600 USHORT VRAM_UsageByFirmware; // Shared by various SW components,latest version 1.3 will be used from R600 USHORT GPIO_Pin_LUT; // Shared by various SW components,latest version 1.1 USHORT VESA_ToInternalModeLUT; // Only used by Bios @@ -2383,22 +2383,22 @@ typedef struct _ATOM_MASTER_LIST_OF_DATA_TABLES }ATOM_MASTER_LIST_OF_DATA_TABLES; typedef struct _ATOM_MASTER_DATA_TABLE -{ - ATOM_COMMON_TABLE_HEADER sHeader; +{ + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_MASTER_LIST_OF_DATA_TABLES ListOfDataTables; }ATOM_MASTER_DATA_TABLE; -// For backward compatible +// For backward compatible #define LVDS_Info LCD_Info #define DAC_Info PaletteData #define TMDS_Info DIGTransmitterInfo -/****************************************************************************/ +/****************************************************************************/ // Structure used in MultimediaCapabilityInfoTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_MULTIMEDIA_CAPABILITY_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulSignature; // HW info table signature string "$ATI" UCHAR ucI2C_Type; // I2C type (normal GP_IO, ImpactTV GP_IO, Dedicated I2C pin, etc) UCHAR ucTV_OutInfo; // Type of TV out supported (3:0) and video out crystal frequency (6:4) and TV data port (7) @@ -2406,9 +2406,9 @@ typedef struct _ATOM_MULTIMEDIA_CAPABILITY_INFO UCHAR ucHostPortInfo; // Provides host port configuration information }ATOM_MULTIMEDIA_CAPABILITY_INFO; -/****************************************************************************/ +/****************************************************************************/ // Structure used in MultimediaConfigInfoTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_MULTIMEDIA_CONFIG_INFO { ATOM_COMMON_TABLE_HEADER sHeader; @@ -2428,20 +2428,20 @@ typedef struct _ATOM_MULTIMEDIA_CONFIG_INFO }ATOM_MULTIMEDIA_CONFIG_INFO; -/****************************************************************************/ +/****************************************************************************/ // Structures used in FirmwareInfoTable -/****************************************************************************/ +/****************************************************************************/ // usBIOSCapability Definition: -// Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; -// Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; -// Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; +// Bit 0 = 0: Bios image is not Posted, =1:Bios image is Posted; +// Bit 1 = 0: Dual CRTC is not supported, =1: Dual CRTC is supported; +// Bit 2 = 0: Extended Desktop is not supported, =1: Extended Desktop is supported; // Others: Reserved #define ATOM_BIOS_INFO_ATOM_FIRMWARE_POSTED 0x0001 #define ATOM_BIOS_INFO_DUAL_CRTC_SUPPORT 0x0002 #define ATOM_BIOS_INFO_EXTENDED_DESKTOP_SUPPORT 0x0004 -#define ATOM_BIOS_INFO_MEMORY_CLOCK_SS_SUPPORT 0x0008 // (valid from v1.1 ~v1.4):=1: memclk SS enable, =0 memclk SS disable. -#define ATOM_BIOS_INFO_ENGINE_CLOCK_SS_SUPPORT 0x0010 // (valid from v1.1 ~v1.4):=1: engclk SS enable, =0 engclk SS disable. +#define ATOM_BIOS_INFO_MEMORY_CLOCK_SS_SUPPORT 0x0008 // (valid from v1.1 ~v1.4):=1: memclk SS enable, =0 memclk SS disable. +#define ATOM_BIOS_INFO_ENGINE_CLOCK_SS_SUPPORT 0x0010 // (valid from v1.1 ~v1.4):=1: engclk SS enable, =0 engclk SS disable. #define ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU 0x0020 #define ATOM_BIOS_INFO_WMI_SUPPORT 0x0040 #define ATOM_BIOS_INFO_PPMODE_ASSIGNGED_BY_SYSTEM 0x0080 @@ -2505,7 +2505,7 @@ typedef union _ATOM_FIRMWARE_CAPABILITY_ACCESS typedef struct _ATOM_FIRMWARE_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit @@ -2530,8 +2530,8 @@ typedef struct _ATOM_FIRMWARE_INFO USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usMinPixelClockPLL_Output; //In 10Khz unit, the definitions above can't change!!! ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usReferenceClock; //In 10Khz unit - USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit + USHORT usReferenceClock; //In 10Khz unit + USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit UCHAR ucPM_RTS_StreamSize; //RTS PM4 packets in Kb unit UCHAR ucDesign_ID; //Indicate what is the board design UCHAR ucMemoryModule_ID; //Indicate what is the board design @@ -2539,7 +2539,7 @@ typedef struct _ATOM_FIRMWARE_INFO typedef struct _ATOM_FIRMWARE_INFO_V1_2 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit @@ -2566,8 +2566,8 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_2 USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usMinPixelClockPLL_Output; //In 10Khz unit - lower 16bit of ulMinPixelClockPLL_Output ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usReferenceClock; //In 10Khz unit - USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit + USHORT usReferenceClock; //In 10Khz unit + USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit UCHAR ucPM_RTS_StreamSize; //RTS PM4 packets in Kb unit UCHAR ucDesign_ID; //Indicate what is the board design UCHAR ucMemoryModule_ID; //Indicate what is the board design @@ -2575,7 +2575,7 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_2 typedef struct _ATOM_FIRMWARE_INFO_V1_3 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit @@ -2603,8 +2603,8 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_3 USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usMinPixelClockPLL_Output; //In 10Khz unit - lower 16bit of ulMinPixelClockPLL_Output ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usReferenceClock; //In 10Khz unit - USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit + USHORT usReferenceClock; //In 10Khz unit + USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit UCHAR ucPM_RTS_StreamSize; //RTS PM4 packets in Kb unit UCHAR ucDesign_ID; //Indicate what is the board design UCHAR ucMemoryModule_ID; //Indicate what is the board design @@ -2612,7 +2612,7 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_3 typedef struct _ATOM_FIRMWARE_INFO_V1_4 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit @@ -2641,8 +2641,8 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_4 USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usMinPixelClockPLL_Output; //In 10Khz unit - lower 16bit of ulMinPixelClockPLL_Output ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usReferenceClock; //In 10Khz unit - USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit + USHORT usReferenceClock; //In 10Khz unit + USHORT usPM_RTS_Location; //RTS PM4 starting location in ROM in 1Kb unit UCHAR ucPM_RTS_StreamSize; //RTS PM4 packets in Kb unit UCHAR ucDesign_ID; //Indicate what is the board design UCHAR ucMemoryModule_ID; //Indicate what is the board design @@ -2651,7 +2651,7 @@ typedef struct _ATOM_FIRMWARE_INFO_V1_4 //the structure below to be used from Cypress typedef struct _ATOM_FIRMWARE_INFO_V2_1 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit @@ -2680,8 +2680,8 @@ typedef struct _ATOM_FIRMWARE_INFO_V2_1 USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usMinPixelClockPLL_Output; //In 10Khz unit - lower 16bit of ulMinPixelClockPLL_Output ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usCoreReferenceClock; //In 10Khz unit - USHORT usMemoryReferenceClock; //In 10Khz unit + USHORT usCoreReferenceClock; //In 10Khz unit + USHORT usMemoryReferenceClock; //In 10Khz unit USHORT usUniphyDPModeExtClkFreq; //In 10Khz unit, if it is 0, In DP Mode Uniphy Input clock from internal PPLL, otherwise Input clock from external Spread clock UCHAR ucMemoryModule_ID; //Indicate what is the board design UCHAR ucReserved4[3]; @@ -2692,17 +2692,17 @@ typedef struct _ATOM_FIRMWARE_INFO_V2_1 //ucTableContentRevision=2 typedef struct _ATOM_FIRMWARE_INFO_V2_2 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulFirmwareRevision; ULONG ulDefaultEngineClock; //In 10Khz unit ULONG ulDefaultMemoryClock; //In 10Khz unit - ULONG ulSPLL_OutputFreq; //In 10Khz unit + ULONG ulSPLL_OutputFreq; //In 10Khz unit ULONG ulGPUPLL_OutputFreq; //In 10Khz unit ULONG ulReserved1; //Was ulMaxEngineClockPLL_Output; //In 10Khz unit* ULONG ulReserved2; //Was ulMaxMemoryClockPLL_Output; //In 10Khz unit* ULONG ulMaxPixelClockPLL_Output; //In 10Khz unit ULONG ulBinaryAlteredInfo; //Was ulASICMaxEngineClock ? - ULONG ulDefaultDispEngineClkFreq; //In 10Khz unit. This is the frequency before DCDTO, corresponding to usBootUpVDDCVoltage. + ULONG ulDefaultDispEngineClkFreq; //In 10Khz unit. This is the frequency before DCDTO, corresponding to usBootUpVDDCVoltage. UCHAR ucReserved3; //Was ucASICMaxTemperature; UCHAR ucMinAllowedBL_Level; USHORT usBootUpVDDCVoltage; //In MV unit @@ -2719,8 +2719,8 @@ typedef struct _ATOM_FIRMWARE_INFO_V2_2 USHORT usMaxPixelClockPLL_Input; //In 10Khz unit USHORT usBootUpVDDCIVoltage; //In unit of mv; Was usMinPixelClockPLL_Output; ATOM_FIRMWARE_CAPABILITY_ACCESS usFirmwareCapability; - USHORT usCoreReferenceClock; //In 10Khz unit - USHORT usMemoryReferenceClock; //In 10Khz unit + USHORT usCoreReferenceClock; //In 10Khz unit + USHORT usMemoryReferenceClock; //In 10Khz unit USHORT usUniphyDPModeExtClkFreq; //In 10Khz unit, if it is 0, In DP Mode Uniphy Input clock from internal PPLL, otherwise Input clock from external Spread clock UCHAR ucMemoryModule_ID; //Indicate what is the board design UCHAR ucReserved9[3]; @@ -2736,9 +2736,9 @@ typedef struct _ATOM_FIRMWARE_INFO_V2_2 #define REMOTE_DISPLAY_DISABLE 0x00 #define REMOTE_DISPLAY_ENABLE 0x01 -/****************************************************************************/ +/****************************************************************************/ // Structures used in IntegratedSystemInfoTable -/****************************************************************************/ +/****************************************************************************/ #define IGP_CAP_FLAG_DYNAMIC_CLOCK_EN 0x2 #define IGP_CAP_FLAG_AC_CARD 0x4 #define IGP_CAP_FLAG_SDVO_CARD 0x8 @@ -2746,7 +2746,7 @@ typedef struct _ATOM_FIRMWARE_INFO_V2_2 typedef struct _ATOM_INTEGRATED_SYSTEM_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulBootUpEngineClock; //in 10kHz unit ULONG ulBootUpMemoryClock; //in 10kHz unit ULONG ulMaxSystemMemoryClock; //in 10kHz unit @@ -2754,8 +2754,8 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO UCHAR ucNumberOfCyclesInPeriodHi; UCHAR ucLCDTimingSel; //=0:not valid.!=0 sel this timing descriptor from LCD EDID. USHORT usReserved1; - USHORT usInterNBVoltageLow; //An intermidiate PMW value to set the voltage - USHORT usInterNBVoltageHigh; //Another intermidiate PMW value to set the voltage + USHORT usInterNBVoltageLow; //An intermidiate PMW value to set the voltage + USHORT usInterNBVoltageHigh; //Another intermidiate PMW value to set the voltage ULONG ulReserved[2]; USHORT usFSBClock; //In MHz unit @@ -2769,22 +2769,22 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO UCHAR ucMaxNBVoltage; UCHAR ucMinNBVoltage; UCHAR ucMemoryType; //[7:4]=1:DDR1;=2:DDR2;=3:DDR3.[3:0] is reserved - UCHAR ucNumberOfCyclesInPeriod; //CG.FVTHROT_PWM_CTRL_REG0.NumberOfCyclesInPeriod + UCHAR ucNumberOfCyclesInPeriod; //CG.FVTHROT_PWM_CTRL_REG0.NumberOfCyclesInPeriod UCHAR ucStartingPWM_HighTime; //CG.FVTHROT_PWM_CTRL_REG0.StartingPWM_HighTime UCHAR ucHTLinkWidth; //16 bit vs. 8 bit - UCHAR ucMaxNBVoltageHigh; + UCHAR ucMaxNBVoltageHigh; UCHAR ucMinNBVoltageHigh; }ATOM_INTEGRATED_SYSTEM_INFO; /* Explanation on entries in ATOM_INTEGRATED_SYSTEM_INFO -ulBootUpMemoryClock: For Intel IGP,it's the UMA system memory clock +ulBootUpMemoryClock: For Intel IGP,it's the UMA system memory clock For AMD IGP,it's 0 if no SidePort memory installed or it's the boot-up SidePort memory clock ulMaxSystemMemoryClock: For Intel IGP,it's the Max freq from memory SPD if memory runs in ASYNC mode or otherwise (SYNC mode) it's 0 For AMD IGP,for now this can be 0 -ulMinSystemMemoryClock: For Intel IGP,it's 133MHz if memory runs in ASYNC mode or otherwise (SYNC mode) it's 0 +ulMinSystemMemoryClock: For Intel IGP,it's 133MHz if memory runs in ASYNC mode or otherwise (SYNC mode) it's 0 For AMD IGP,for now this can be 0 -usFSBClock: For Intel IGP,it's FSB Freq +usFSBClock: For Intel IGP,it's FSB Freq For AMD IGP,it's HT Link Speed usK8MemoryClock: For AMD IGP only. For RevF CPU, set it to 200 @@ -2795,8 +2795,8 @@ VC:Voltage Control ucMaxNBVoltage: Voltage regulator dependent PWM value. Low 8 bits of the value for the max voltage.Set this one to 0xFF if VC without PWM. Set this to 0x0 if no VC at all. ucMinNBVoltage: Voltage regulator dependent PWM value. Low 8 bits of the value for the min voltage.Set this one to 0x00 if VC without PWM or no VC at all. -ucNumberOfCyclesInPeriod: Indicate how many cycles when PWM duty is 100%. low 8 bits of the value. -ucNumberOfCyclesInPeriodHi: Indicate how many cycles when PWM duty is 100%. high 8 bits of the value.If the PWM has an inverter,set bit [7]==1,otherwise set it 0 +ucNumberOfCyclesInPeriod: Indicate how many cycles when PWM duty is 100%. low 8 bits of the value. +ucNumberOfCyclesInPeriodHi: Indicate how many cycles when PWM duty is 100%. high 8 bits of the value.If the PWM has an inverter,set bit [7]==1,otherwise set it 0 ucMaxNBVoltageHigh: Voltage regulator dependent PWM value. High 8 bits of the value for the max voltage.Set this one to 0xFF if VC without PWM. Set this to 0x0 if no VC at all. ucMinNBVoltageHigh: Voltage regulator dependent PWM value. High 8 bits of the value for the min voltage.Set this one to 0x00 if VC without PWM or no VC at all. @@ -2809,7 +2809,7 @@ usInterNBVoltageHigh: Voltage regulator dependent PWM value. The value makes t /* The following IGP table is introduced from RS780, which is supposed to be put by SBIOS in FB before IGP VBIOS starts VPOST; -Then VBIOS will copy the whole structure to its image so all GPU SW components can access this data structure to get whatever they need. +Then VBIOS will copy the whole structure to its image so all GPU SW components can access this data structure to get whatever they need. The enough reservation should allow us to never change table revisions. Whenever needed, a GPU SW component can use reserved portion for new data entries. SW components can access the IGP system infor structure in the same way as before @@ -2856,23 +2856,23 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 USHORT usFirmwareVersion; //0 means FW is not supported. Otherwise it's the FW version loaded by SBIOS and driver should enable FW. USHORT usFullT0Time; // Input to calculate minimum HT link change time required by NB P-State. Unit is 0.01us. ULONG ulReserved3[96]; //must be 0x0 -}ATOM_INTEGRATED_SYSTEM_INFO_V2; +}ATOM_INTEGRATED_SYSTEM_INFO_V2; /* ulBootUpEngineClock: Boot-up Engine Clock in 10Khz; ulBootUpUMAClock: Boot-up UMA Clock in 10Khz; it must be 0x0 when UMA is not present ulBootUpSidePortClock: Boot-up SidePort Clock in 10Khz; it must be 0x0 when SidePort Memory is not present,this could be equal to or less than maximum supported Sideport memory clock -ulSystemConfig: -Bit[0]=1: PowerExpress mode =0 Non-PowerExpress mode; +ulSystemConfig: +Bit[0]=1: PowerExpress mode =0 Non-PowerExpress mode; Bit[1]=1: system boots up at AMD overdrived state or user customized mode. In this case, driver will just stick to this boot-up mode. No other PowerPlay state =0: system boots up at driver control state. Power state depends on PowerPlay table. Bit[2]=1: PWM method is used on NB voltage control. =0: GPIO method is used. Bit[3]=1: Only one power state(Performance) will be supported. =0: Multiple power states supported from PowerPlay table. -Bit[4]=1: CLMC is supported and enabled on current system. - =0: CLMC is not supported or enabled on current system. SBIOS need to support HT link/freq change through ATIF interface. -Bit[5]=1: Enable CDLW for all driver control power states. Max HT width is from SBIOS, while Min HT width is determined by display requirement. +Bit[4]=1: CLMC is supported and enabled on current system. + =0: CLMC is not supported or enabled on current system. SBIOS need to support HT link/freq change through ATIF interface. +Bit[5]=1: Enable CDLW for all driver control power states. Max HT width is from SBIOS, while Min HT width is determined by display requirement. =0: CDLW is disabled. If CLMC is enabled case, Min HT width will be set equal to Max HT width. If CLMC disabled case, Max HT width will be applied. Bit[6]=1: High Voltage requested for all power states. In this case, voltage will be forced at 1.1v and powerplay table voltage drop/throttling request will be ignored. =0: Voltage settings is determined by powerplay table. @@ -2891,11 +2891,11 @@ ulOtherDisplayMisc: [15:8]- Bootup LCD Expansion selection; 0-center, 1-full pan ulDDISlot1Config: Describes the PCIE lane configuration on this DDI PCIE slot (ADD2 card) or connector (Mobile design). [3:0] - Bit vector to indicate PCIE lane config of the DDI slot/connector on chassis (bit 0=1 lane 3:0; bit 1=1 lane 7:4; bit 2=1 lane 11:8; bit 3=1 lane 15:12) [7:4] - Bit vector to indicate PCIE lane config of the same DDI slot/connector on docking station (bit 4=1 lane 3:0; bit 5=1 lane 7:4; bit 6=1 lane 11:8; bit 7=1 lane 15:12) - When a DDI connector is not "paired" (meaning two connections mutually exclusive on chassis or docking, only one of them can be connected at one time. + When a DDI connector is not "paired" (meaming two connections mutualexclusive on chassis or docking, only one of them can be connected at one time. in both chassis and docking, SBIOS has to duplicate the same PCIE lane info from chassis to docking or vice versa. For example: one DDI connector is only populated in docking with PCIE lane 8-11, but there is no paired connection on chassis, SBIOS has to copy bit 6 to bit 2. - [15:8] - Lane configuration attribute; + [15:8] - Lane configuration attribute; [23:16]- Connector type, possible value: CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D @@ -2910,7 +2910,7 @@ For IGP, Hypermemory is the only memory type showed in CCC. ucUMAChannelNumber: how many channels for the UMA; -ulDockingPinCFGInfo: [15:0]-Bus/Device/Function # to CFG to read this Docking Pin; [31:16]-reg offset in CFG to read this pin +ulDockingPinCFGInfo: [15:0]-Bus/Device/Function # to CFG to read this Docking Pin; [31:16]-reg offset in CFG to read this pin ucDockingPinBit: which bit in this register to read the pin status; ucDockingPinPolarity:Polarity of the pin when docked; @@ -2918,7 +2918,7 @@ ulCPUCapInfo: [7:0]=1:Griffin;[7:0]=2:Greyhound;[7:0]=3:K8, [7:0]=4:Phara usNumberOfCyclesInPeriod:Indicate how many cycles when PWM duty is 100%. -usMaxNBVoltage:Max. voltage control value in either PWM or GPIO mode. +usMaxNBVoltage:Max. voltage control value in either PWM or GPIO mode. usMinNBVoltage:Min. voltage control value in either PWM or GPIO mode. GPIO mode: both usMaxNBVoltage & usMinNBVoltage have a valid value ulSystemConfig.SYSTEM_CONFIG_USE_PWM_ON_VOLTAGE=0 PWM mode: both usMaxNBVoltage & usMinNBVoltage have a valid value ulSystemConfig.SYSTEM_CONFIG_USE_PWM_ON_VOLTAGE=1 @@ -2927,14 +2927,14 @@ usMinNBVoltage:Min. voltage control value in either PWM or GPIO mode. usBootUpNBVoltage:Boot-up voltage regulator dependent PWM value. ulHTLinkFreq: Bootup HT link Frequency in 10Khz. -usMinHTLinkWidth: Bootup minimum HT link width. If CDLW disabled, this is equal to usMaxHTLinkWidth. - If CDLW enabled, both upstream and downstream width should be the same during bootup. -usMaxHTLinkWidth: Bootup maximum HT link width. If CDLW disabled, this is equal to usMinHTLinkWidth. +usMinHTLinkWidth: Bootup minimum HT link width. If CDLW disabled, this is equal to usMaxHTLinkWidth. If CDLW enabled, both upstream and downstream width should be the same during bootup. +usMaxHTLinkWidth: Bootup maximum HT link width. If CDLW disabled, this is equal to usMinHTLinkWidth. + If CDLW enabled, both upstream and downstream width should be the same during bootup. -usUMASyncStartDelay: Memory access latency, required for watermark calculation +usUMASyncStartDelay: Memory access latency, required for watermark calculation usUMADataReturnTime: Memory access latency, required for watermark calculation -usLinkStatusZeroTime:Memory access latency required for watermark calculation, set this to 0x0 for K8 CPU, set a proper value in 0.01 the unit of us +usLinkStatusZeroTime:Memory access latency required for watermark calculation, set this to 0x0 for K8 CPU, set a proper value in 0.01 the unit of us for Griffin or Greyhound. SBIOS needs to convert to actual time by: if T0Ttime [5:4]=00b, then usLinkStatusZeroTime=T0Ttime [3:0]*0.1us (0.0 to 1.5us) if T0Ttime [5:4]=01b, then usLinkStatusZeroTime=T0Ttime [3:0]*0.5us (0.0 to 7.5us) @@ -2942,7 +2942,7 @@ for Griffin or Greyhound. SBIOS needs to convert to actual time by: if T0Ttime [5:4]=11b, and T0Ttime [3:0]=0x0 to 0xa, then usLinkStatusZeroTime=T0Ttime [3:0]*20us (0.0 to 200us) ulHighVoltageHTLinkFreq: HT link frequency for power state with low voltage. If boot up runs in HT1, this must be 0. - This must be less than or equal to ulHTLinkFreq(bootup frequency). + This must be less than or equal to ulHTLinkFreq(bootup frequency). ulLowVoltageHTLinkFreq: HT link frequency for power state with low voltage or voltage scaling 1.0v~1.1v. If boot up runs in HT1, this must be 0. This must be less than or equal to ulHighVoltageHTLinkFreq. @@ -2952,7 +2952,7 @@ usMinUpStreamHTLinkWidth: Asymmetric link width support in the future, to rep usMinDownStreamHTLinkWidth: same as above. */ -// ATOM_INTEGRATED_SYSTEM_INFO::ulCPUCapInfo - CPU type definition +// ATOM_INTEGRATED_SYSTEM_INFO::ulCPUCapInfo - CPU type definition #define INTEGRATED_SYSTEM_INFO__UNKNOWN_CPU 0 #define INTEGRATED_SYSTEM_INFO__AMD_CPU__GRIFFIN 1 #define INTEGRATED_SYSTEM_INFO__AMD_CPU__GREYHOUND 2 @@ -2964,7 +2964,7 @@ usMinDownStreamHTLinkWidth: same as above. #define SYSTEM_CONFIG_POWEREXPRESS_ENABLE 0x00000001 #define SYSTEM_CONFIG_RUN_AT_OVERDRIVE_ENGINE 0x00000002 -#define SYSTEM_CONFIG_USE_PWM_ON_VOLTAGE 0x00000004 +#define SYSTEM_CONFIG_USE_PWM_ON_VOLTAGE 0x00000004 #define SYSTEM_CONFIG_PERFORMANCE_POWERSTATE_ONLY 0x00000008 #define SYSTEM_CONFIG_CLMC_ENABLED 0x00000010 #define SYSTEM_CONFIG_CDLW_ENABLED 0x00000020 @@ -2993,7 +2993,7 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V5 { ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulBootUpEngineClock; //in 10kHz unit - ULONG ulDentistVCOFreq; //Dentist VCO clock in 10kHz unit, the source of GPU SCLK, LCLK, UCLK and VCLK. + ULONG ulDentistVCOFreq; //Dentist VCO clock in 10kHz unit, the source of GPU SCLK, LCLK, UCLK and VCLK. ULONG ulLClockFreq; //GPU Lclk freq in 10kHz unit, have relationship with NCLK in NorthBridge ULONG ulBootUpUMAClock; //in 10kHz unit ULONG ulReserved1[8]; //must be 0x0 for the reserved @@ -3021,7 +3021,7 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V5 ULONG ulCSR_M3_ARB_CNTL_UVD[10]; //arrays with values for CSR M3 arbiter for UVD playback ULONG ulCSR_M3_ARB_CNTL_FS3D[10];//arrays with values for CSR M3 arbiter for Full Screen 3D applications ULONG ulReserved6[61]; //must be 0x0 -}ATOM_INTEGRATED_SYSTEM_INFO_V5; +}ATOM_INTEGRATED_SYSTEM_INFO_V5; #define ATOM_CRT_INT_ENCODER1_INDEX 0x00000000 #define ATOM_LCD_INT_ENCODER1_INDEX 0x00000001 @@ -3039,7 +3039,7 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V5 #define ATOM_DFP_INT_ENCODER4_INDEX 0x0000000D // define ASIC internal encoder id ( bit vector ), used for CRTC_SourceSelTable -#define ASIC_INT_DAC1_ENCODER_ID 0x00 +#define ASIC_INT_DAC1_ENCODER_ID 0x00 #define ASIC_INT_TV_ENCODER_ID 0x02 #define ASIC_INT_DIG1_ENCODER_ID 0x03 #define ASIC_INT_DAC2_ENCODER_ID 0x04 @@ -3056,15 +3056,15 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V5 //define Encoder attribute #define ATOM_ANALOG_ENCODER 0 -#define ATOM_DIGITAL_ENCODER 1 -#define ATOM_DP_ENCODER 2 +#define ATOM_DIGITAL_ENCODER 1 +#define ATOM_DP_ENCODER 2 #define ATOM_ENCODER_ENUM_MASK 0x70 #define ATOM_ENCODER_ENUM_ID1 0x00 #define ATOM_ENCODER_ENUM_ID2 0x10 #define ATOM_ENCODER_ENUM_ID3 0x20 #define ATOM_ENCODER_ENUM_ID4 0x30 -#define ATOM_ENCODER_ENUM_ID5 0x40 +#define ATOM_ENCODER_ENUM_ID5 0x40 #define ATOM_ENCODER_ENUM_ID6 0x50 #define ATOM_DEVICE_CRT1_INDEX 0x00000000 @@ -3162,8 +3162,8 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V5 // Bit 9 = 0 - no DFP3 support= 1- DFP3 is supported // Bit 10 = 0 - no DFP4 support= 1- DFP4 is supported // Bit 11 = 0 - no DFP5 support= 1- DFP5 is supported -// -// +// +// /****************************************************************************/ /* Structure used in MclkSS_InfoTable */ @@ -3196,11 +3196,11 @@ typedef union _ATOM_I2C_ID_CONFIG_ACCESS ATOM_I2C_ID_CONFIG sbfAccess; UCHAR ucAccess; }ATOM_I2C_ID_CONFIG_ACCESS; + - -/****************************************************************************/ +/****************************************************************************/ // Structure used in GPIO_I2C_InfoTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_GPIO_I2C_ASSIGMENT { USHORT usClkMaskRegisterIndex; @@ -3225,20 +3225,20 @@ typedef struct _ATOM_GPIO_I2C_ASSIGMENT }ATOM_GPIO_I2C_ASSIGMENT; typedef struct _ATOM_GPIO_I2C_INFO -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; ATOM_GPIO_I2C_ASSIGMENT asGPIO_Info[ATOM_MAX_SUPPORTED_DEVICE]; }ATOM_GPIO_I2C_INFO; -/****************************************************************************/ +/****************************************************************************/ // Common Structure used in other structures -/****************************************************************************/ +/****************************************************************************/ #ifndef _H2INC - + //Please don't add or expand this bitfield structure below, this one will retire soon.! typedef struct _ATOM_MODE_MISC_INFO -{ +{ #if ATOM_BIG_ENDIAN USHORT Reserved:6; USHORT RGB888:1; @@ -3262,23 +3262,23 @@ typedef struct _ATOM_MODE_MISC_INFO USHORT Interlace:1; USHORT DoubleClock:1; USHORT RGB888:1; - USHORT Reserved:6; + USHORT Reserved:6; #endif }ATOM_MODE_MISC_INFO; - + typedef union _ATOM_MODE_MISC_INFO_ACCESS -{ +{ ATOM_MODE_MISC_INFO sbfAccess; USHORT usAccess; }ATOM_MODE_MISC_INFO_ACCESS; - + #else - + typedef union _ATOM_MODE_MISC_INFO_ACCESS -{ +{ USHORT usAccess; }ATOM_MODE_MISC_INFO_ACCESS; - + #endif // usModeMiscInfo- @@ -3296,7 +3296,7 @@ typedef union _ATOM_MODE_MISC_INFO_ACCESS //usRefreshRate- #define ATOM_REFRESH_43 43 #define ATOM_REFRESH_47 47 -#define ATOM_REFRESH_56 56 +#define ATOM_REFRESH_56 56 #define ATOM_REFRESH_60 60 #define ATOM_REFRESH_65 65 #define ATOM_REFRESH_70 70 @@ -3315,29 +3315,29 @@ typedef union _ATOM_MODE_MISC_INFO_ACCESS // VESA_HSYNC_WIDTH = VESA_HSYNC_TIME = EDID_HSPW // VESA_BORDER = EDID_BORDER -/****************************************************************************/ +/****************************************************************************/ // Structure used in SetCRTC_UsingDTDTimingTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_CRTC_USING_DTD_TIMING_PARAMETERS { USHORT usH_Size; USHORT usH_Blanking_Time; USHORT usV_Size; - USHORT usV_Blanking_Time; + USHORT usV_Blanking_Time; USHORT usH_SyncOffset; USHORT usH_SyncWidth; USHORT usV_SyncOffset; USHORT usV_SyncWidth; - ATOM_MODE_MISC_INFO_ACCESS susModeMiscInfo; + ATOM_MODE_MISC_INFO_ACCESS susModeMiscInfo; UCHAR ucH_Border; // From DFP EDID UCHAR ucV_Border; - UCHAR ucCRTC; // ATOM_CRTC1 or ATOM_CRTC2 + UCHAR ucCRTC; // ATOM_CRTC1 or ATOM_CRTC2 UCHAR ucPadding[3]; }SET_CRTC_USING_DTD_TIMING_PARAMETERS; -/****************************************************************************/ +/****************************************************************************/ // Structure used in SetCRTC_TimingTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_CRTC_TIMING_PARAMETERS { USHORT usH_Total; // horizontal total @@ -3358,11 +3358,11 @@ typedef struct _SET_CRTC_TIMING_PARAMETERS }SET_CRTC_TIMING_PARAMETERS; #define SET_CRTC_TIMING_PARAMETERS_PS_ALLOCATION SET_CRTC_TIMING_PARAMETERS -/****************************************************************************/ +/****************************************************************************/ // Structure used in StandardVESA_TimingTable -// AnalogTV_InfoTable +// AnalogTV_InfoTable // ComponentVideoInfoTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_MODE_TIMING { USHORT usCRTC_H_Total; @@ -3390,7 +3390,7 @@ typedef struct _ATOM_DTD_FORMAT USHORT usHActive; USHORT usHBlanking_Time; USHORT usVActive; - USHORT usVBlanking_Time; + USHORT usVBlanking_Time; USHORT usHSyncOffset; USHORT usHSyncWidth; USHORT usVSyncOffset; @@ -3404,10 +3404,10 @@ typedef struct _ATOM_DTD_FORMAT UCHAR ucRefreshRate; }ATOM_DTD_FORMAT; -/****************************************************************************/ -// Structure used in LVDS_InfoTable +/****************************************************************************/ +// Structure used in LVDS_InfoTable // * Need a document to describe this table -/****************************************************************************/ +/****************************************************************************/ #define SUPPORTED_LCD_REFRESHRATE_30Hz 0x0004 #define SUPPORTED_LCD_REFRESHRATE_40Hz 0x0008 #define SUPPORTED_LCD_REFRESHRATE_50Hz 0x0010 @@ -3417,7 +3417,7 @@ typedef struct _ATOM_DTD_FORMAT //ucTableContentRevision=1 typedef struct _ATOM_LVDS_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_DTD_FORMAT sLCDTiming; USHORT usModePatchTableOffset; USHORT usSupportedRefreshRate; //Refer to panel info table in ATOMBIOS extension Spec. @@ -3437,7 +3437,7 @@ typedef struct _ATOM_LVDS_INFO //ucTableContentRevision=2 typedef struct _ATOM_LVDS_INFO_V12 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_DTD_FORMAT sLCDTiming; USHORT usExtInfoTableOffset; USHORT usSupportedRefreshRate; //Refer to panel info table in ATOMBIOS extension Spec. @@ -3453,15 +3453,15 @@ typedef struct _ATOM_LVDS_INFO_V12 UCHAR ucSS_Id; USHORT usLCDVenderID; USHORT usLCDProductID; - UCHAR ucLCDPanel_SpecialHandlingCap; + UCHAR ucLCDPanel_SpecialHandlingCap; UCHAR ucPanelInfoSize; // start from ATOM_DTD_FORMAT to end of panel info, include ExtInfoTable UCHAR ucReserved[2]; }ATOM_LVDS_INFO_V12; //Definitions for ucLCDPanel_SpecialHandlingCap: -//Once DAL sees this CAP is set, it will read EDID from LCD on its own instead of using sLCDTiming in ATOM_LVDS_INFO_V12. -//Other entries in ATOM_LVDS_INFO_V12 are still valid/useful to DAL +//Once DAL sees this CAP is set, it will read EDID from LCD on its own instead of using sLCDTiming in ATOM_LVDS_INFO_V12. +//Other entries in ATOM_LVDS_INFO_V12 are still valid/useful to DAL #define LCDPANEL_CAP_READ_EDID 0x1 //If a design supports DRR (dynamic refresh rate) on internal panels (LVDS or EDP), this cap is set in ucLCDPanel_SpecialHandlingCap together @@ -3486,21 +3486,21 @@ typedef struct _ATOM_LVDS_INFO_V12 #define PANEL_COLOR_BIT_DEPTH_MASK 0x70 -// Bit7:{=0:Random Dithering disabled;1 Random Dithering enabled} +// Bit7:{=0:Random Dithering disabled;1 Random Dithering enabled} #define PANEL_RANDOM_DITHER 0x80 #define PANEL_RANDOM_DITHER_MASK 0x80 -#define ATOM_LVDS_INFO_LAST ATOM_LVDS_INFO_V12 // no need to change this +#define ATOM_LVDS_INFO_LAST ATOM_LVDS_INFO_V12 // no need to change this -/****************************************************************************/ +/****************************************************************************/ // Structures used by LCD_InfoTable V1.3 Note: previous version was called ATOM_LVDS_INFO_V12 // ASIC Families: NI // ucTableFormatRevision=1 // ucTableContentRevision=3 -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_LCD_INFO_V13 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_DTD_FORMAT sLCDTiming; USHORT usExtInfoTableOffset; USHORT usSupportedRefreshRate; //Refer to panel info table in ATOMBIOS extension Spec. @@ -3509,18 +3509,18 @@ typedef struct _ATOM_LCD_INFO_V13 // Bit0: {=0:single, =1:dual}, // Bit1: {=0:LDI format for RGB888, =1 FPDI format for RGB888} // was {=0:666RGB, =1:888RGB}, // Bit3:2: {Grey level} - // Bit6:4 Color Bit Depth definition (see below definition in EDID V1.4 @BYTE 14h) - // Bit7 Reserved. was for ATOM_PANEL_MISC_API_ENABLED, still need it? + // Bit6:4 Color Bit Depth definition (see below definition in EDID V1.4 @BYTE 14h) + // Bit7 Reserved. was for ATOM_PANEL_MISC_API_ENABLED, still need it? UCHAR ucPanelDefaultRefreshRate; UCHAR ucPanelIdentification; UCHAR ucSS_Id; USHORT usLCDVenderID; USHORT usLCDProductID; - UCHAR ucLCDPanel_SpecialHandlingCap; // Reorganized in V13 + UCHAR ucLCDPanel_SpecialHandlingCap; // Reorganized in V13 // Bit0: Once DAL sees this CAP is set, it will read EDID from LCD on its own // Bit1: See LCDPANEL_CAP_DRR_SUPPORTED // Bit2: a quick reference whether an embadded panel (LCD1 ) is LVDS (0) or eDP (1) - // Bit7-3: Reserved + // Bit7-3: Reserved UCHAR ucPanelInfoSize; // start from ATOM_DTD_FORMAT to end of panel info, include ExtInfoTable USHORT usBacklightPWM; // Backlight PWM in Hz. New in _V13 @@ -3539,13 +3539,13 @@ typedef struct _ATOM_LCD_INFO_V13 UCHAR ucDPCD_MAX_LANE_COUNT; // dpcd 02h UCHAR ucDPCD_MAX_DOWNSPREAD; // dpcd 03h - USHORT usMaxPclkFreqInSingleLink; // Max PixelClock frequency in single link mode. + USHORT usMaxPclkFreqInSingleLink; // Max PixelClock frequency in single link mode. UCHAR uceDPToLVDSRxId; UCHAR ucLcdReservd; ULONG ulReserved[2]; -}ATOM_LCD_INFO_V13; +}ATOM_LCD_INFO_V13; -#define ATOM_LCD_INFO_LAST ATOM_LCD_INFO_V13 +#define ATOM_LCD_INFO_LAST ATOM_LCD_INFO_V13 //Definitions for ucLCD_Misc #define ATOM_PANEL_MISC_V13_DUAL 0x00000001 @@ -3566,11 +3566,11 @@ typedef struct _ATOM_LCD_INFO_V13 // 1 0 1 - 14 Bits per Primary Color // 1 1 0 - 16 Bits per Primary Color // 1 1 1 - Reserved - + //Definitions for ucLCDPanel_SpecialHandlingCap: -//Once DAL sees this CAP is set, it will read EDID from LCD on its own instead of using sLCDTiming in ATOM_LVDS_INFO_V12. -//Other entries in ATOM_LVDS_INFO_V12 are still valid/useful to DAL +//Once DAL sees this CAP is set, it will read EDID from LCD on its own instead of using sLCDTiming in ATOM_LVDS_INFO_V12. +//Other entries in ATOM_LVDS_INFO_V12 are still valid/useful to DAL #define LCDPANEL_CAP_V13_READ_EDID 0x1 // = LCDPANEL_CAP_READ_EDID no change comparing to previous version //If a design supports DRR (dynamic refresh rate) on internal panels (LVDS or EDP), this cap is set in ucLCDPanel_SpecialHandlingCap together @@ -3582,9 +3582,9 @@ typedef struct _ATOM_LCD_INFO_V13 #define LCDPANEL_CAP_V13_eDP 0x4 // = LCDPANEL_CAP_eDP no change comparing to previous version //uceDPToLVDSRxId -#define eDP_TO_LVDS_RX_DISABLE 0x00 // no eDP->LVDS translator chip +#define eDP_TO_LVDS_RX_DISABLE 0x00 // no eDP->LVDS translator chip #define eDP_TO_LVDS_COMMON_ID 0x01 // common eDP->LVDS translator chip without AMD SW init -#define eDP_TO_LVDS_RT_ID 0x02 // RT translator which require AMD SW init +#define eDP_TO_LVDS_RT_ID 0x02 // RT tanslator which require AMD SW init typedef struct _ATOM_PATCH_RECORD_MODE { @@ -3639,7 +3639,7 @@ typedef struct _ATOM_PANEL_RESOLUTION_PATCH_RECORD //ucTableContentRevision=2 typedef struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT { - USHORT usSpreadSpectrumPercentage; + USHORT usSpreadSpectrumPercentage; UCHAR ucSpreadSpectrumType; //Bit1=0 Down Spread,=1 Center Spread. Bit1=1 Ext. =0 Int. Bit2=1: PCIE REFCLK SS =0 iternal PPLL SS Others:TBD UCHAR ucSS_Step; UCHAR ucSS_Delay; @@ -3649,8 +3649,8 @@ typedef struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT }ATOM_SPREAD_SPECTRUM_ASSIGNMENT; #define ATOM_MAX_SS_ENTRY 16 -#define ATOM_DP_SS_ID1 0x0f1 // SS ID for internal DP stream at 2.7Ghz. if ATOM_DP_SS_ID2 does not exist in SS_InfoTable, it is used for internal DP stream at 1.62Ghz as well. -#define ATOM_DP_SS_ID2 0x0f2 // SS ID for internal DP stream at 1.62Ghz, if it exists in SS_InfoTable. +#define ATOM_DP_SS_ID1 0x0f1 // SS ID for internal DP stream at 2.7Ghz. if ATOM_DP_SS_ID2 does not exist in SS_InfoTable, it is used for internal DP stream at 1.62Ghz as well. +#define ATOM_DP_SS_ID2 0x0f2 // SS ID for internal DP stream at 1.62Ghz, if it exists in SS_InfoTable. #define ATOM_LVLINK_2700MHz_SS_ID 0x0f3 // SS ID for LV link translator chip at 2.7Ghz #define ATOM_LVLINK_1620MHz_SS_ID 0x0f4 // SS ID for LV link translator chip at 1.62Ghz @@ -3662,18 +3662,18 @@ typedef struct _ATOM_SPREAD_SPECTRUM_ASSIGNMENT #define ATOM_INTERNAL_SS_MASK 0x00000000 #define ATOM_EXTERNAL_SS_MASK 0x00000002 #define EXEC_SS_STEP_SIZE_SHIFT 2 -#define EXEC_SS_DELAY_SHIFT 4 +#define EXEC_SS_DELAY_SHIFT 4 #define ACTIVEDATA_TO_BLON_DELAY_SHIFT 4 typedef struct _ATOM_SPREAD_SPECTRUM_INFO -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; ATOM_SPREAD_SPECTRUM_ASSIGNMENT asSS_Info[ATOM_MAX_SS_ENTRY]; }ATOM_SPREAD_SPECTRUM_INFO; -/****************************************************************************/ +/****************************************************************************/ // Structure used in AnalogTV_InfoTable (Top level) -/****************************************************************************/ +/****************************************************************************/ //ucTVBootUpDefaultStd definition: //ATOM_TV_NTSC 1 @@ -3700,9 +3700,9 @@ typedef struct _ATOM_SPREAD_SPECTRUM_INFO typedef struct _ATOM_ANALOG_TV_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucTV_SupportedStandard; - UCHAR ucTV_BootUpDefaultStandard; + UCHAR ucTV_BootUpDefaultStandard; UCHAR ucExt_TV_ASIC_ID; UCHAR ucExt_TV_ASIC_SlaveAddr; /*ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING];*/ @@ -3713,9 +3713,9 @@ typedef struct _ATOM_ANALOG_TV_INFO typedef struct _ATOM_ANALOG_TV_INFO_V1_2 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucTV_SupportedStandard; - UCHAR ucTV_BootUpDefaultStandard; + UCHAR ucTV_BootUpDefaultStandard; UCHAR ucExt_TV_ASIC_ID; UCHAR ucExt_TV_ASIC_SlaveAddr; ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING_V1_2]; @@ -3723,9 +3723,9 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2 typedef struct _ATOM_DPCD_INFO { - UCHAR ucRevisionNumber; //10h : Revision 1.0; 11h : Revision 1.1 + UCHAR ucRevisionNumber; //10h : Revision 1.0; 11h : Revision 1.1 UCHAR ucMaxLinkRate; //06h : 1.62Gbps per lane; 0Ah = 2.7Gbps per lane - UCHAR ucMaxLane; //Bits 4:0 = MAX_LANE_COUNT (1/2/4). Bit 7 = ENHANCED_FRAME_CAP + UCHAR ucMaxLane; //Bits 4:0 = MAX_LANE_COUNT (1/2/4). Bit 7 = ENHANCED_FRAME_CAP UCHAR ucMaxDownSpread; //Bit0 = 0: No Down spread; Bit0 = 1: 0.5% (Subject to change according to DP spec) }ATOM_DPCD_INFO; @@ -3738,7 +3738,7 @@ typedef struct _ATOM_DPCD_INFO // Current Mode timing and Dail Timing and/or STD timing data EACH device. They can be broken down as below. // All the addresses below are the offsets from the frame buffer start.They all MUST be Dword aligned! // To driver: The physical address of this memory portion=mmFB_START(4K aligned)+ATOMBIOS_VRAM_USAGE_START_ADDR+ATOM_x_ADDR -// To Bios: ATOMBIOS_VRAM_USAGE_START_ADDR+ATOM_x_ADDR->MM_INDEX +// To Bios: ATOMBIOS_VRAM_USAGE_START_ADDR+ATOM_x_ADDR->MM_INDEX #ifndef VESA_MEMORY_IN_64K_BLOCK #define VESA_MEMORY_IN_64K_BLOCK 0x100 //256*64K=16Mb (Max. VESA memory is 16Mb!) @@ -3748,11 +3748,11 @@ typedef struct _ATOM_DPCD_INFO #define ATOM_HWICON_SURFACE_SIZE 4096 //In Bytes #define ATOM_HWICON_INFOTABLE_SIZE 32 #define MAX_DTD_MODE_IN_VRAM 6 -#define ATOM_DTD_MODE_SUPPORT_TBL_SIZE (MAX_DTD_MODE_IN_VRAM*28) //28= (SIZEOF ATOM_DTD_FORMAT) +#define ATOM_DTD_MODE_SUPPORT_TBL_SIZE (MAX_DTD_MODE_IN_VRAM*28) //28= (SIZEOF ATOM_DTD_FORMAT) #define ATOM_STD_MODE_SUPPORT_TBL_SIZE 32*8 //32 is a predefined number,8= (SIZEOF ATOM_STD_FORMAT) //20 bytes for Encoder Type and DPCD in STD EDID area -#define DFP_ENCODER_TYPE_OFFSET (ATOM_EDID_RAW_DATASIZE + ATOM_DTD_MODE_SUPPORT_TBL_SIZE + ATOM_STD_MODE_SUPPORT_TBL_SIZE - 20) -#define ATOM_DP_DPCD_OFFSET (DFP_ENCODER_TYPE_OFFSET + 4 ) +#define DFP_ENCODER_TYPE_OFFSET (ATOM_EDID_RAW_DATASIZE + ATOM_DTD_MODE_SUPPORT_TBL_SIZE + ATOM_STD_MODE_SUPPORT_TBL_SIZE - 20) +#define ATOM_DP_DPCD_OFFSET (DFP_ENCODER_TYPE_OFFSET + 4 ) #define ATOM_HWICON1_SURFACE_ADDR 0 #define ATOM_HWICON2_SURFACE_ADDR (ATOM_HWICON1_SURFACE_ADDR + ATOM_HWICON_SURFACE_SIZE) @@ -3805,12 +3805,12 @@ typedef struct _ATOM_DPCD_INFO #define ATOM_DP_TRAINING_TBL_ADDR (ATOM_DFP5_STD_MODE_TBL_ADDR + ATOM_STD_MODE_SUPPORT_TBL_SIZE) -#define ATOM_STACK_STORAGE_START (ATOM_DP_TRAINING_TBL_ADDR + 1024) -#define ATOM_STACK_STORAGE_END ATOM_STACK_STORAGE_START + 512 +#define ATOM_STACK_STORAGE_START (ATOM_DP_TRAINING_TBL_ADDR + 1024) +#define ATOM_STACK_STORAGE_END ATOM_STACK_STORAGE_START + 512 //The size below is in Kb! #define ATOM_VRAM_RESERVE_SIZE ((((ATOM_STACK_STORAGE_END - ATOM_HWICON1_SURFACE_ADDR)>>10)+4)&0xFFFC) - + #define ATOM_VRAM_RESERVE_V2_SIZE 32 #define ATOM_VRAM_OPERATION_FLAGS_MASK 0xC0000000L @@ -3818,18 +3818,18 @@ typedef struct _ATOM_DPCD_INFO #define ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION 0x1 #define ATOM_VRAM_BLOCK_NEEDS_RESERVATION 0x0 -/***********************************************************************************/ +/***********************************************************************************/ // Structure used in VRAM_UsageByFirmwareTable // Note1: This table is filled by SetBiosReservationStartInFB in CoreCommSubs.asm -// at running time. -// note2: From RV770, the memory is more than 32bit addressable, so we will change +// at running time. +// note2: From RV770, the memory is more than 32bit addressable, so we will change // ucTableFormatRevision=1,ucTableContentRevision=4, the structure remains -// exactly same as 1.1 and 1.2 (1.3 is never in use), but ulStartAddrUsedByFirmware -// (in offset to start of memory address) is KB aligned instead of byte aligned. -/***********************************************************************************/ +// exactly same as 1.1 and 1.2 (1.3 is never in use), but ulStartAddrUsedByFirmware +// (in offset to start of memory address) is KB aligned instead of byte aligend. +/***********************************************************************************/ // Note3: /* If we change usReserved to "usFBUsedbyDrvInKB", then to VBIOS this usFBUsedbyDrvInKB is a predefined, unchanged constant across VGA or non VGA adapter, -for CAIL, The size of FB access area is known, only thing missing is the Offset of FB Access area, so we can have: +for CAIL, The size of FB access area is known, only thing missing is the Offset of FB Access area, so we can have: If (ulStartAddrUsedByFirmware!=0) FBAccessAreaOffset= ulStartAddrUsedByFirmware - usFBUsedbyDrvInKB; @@ -3842,7 +3842,7 @@ else //Non VGA case CAIL needs to claim an reserved area defined by FBAccessAreaOffset and usFBUsedbyDrvInKB in non VGA case.*/ -/***********************************************************************************/ +/***********************************************************************************/ #define ATOM_MAX_FIRMWARE_VRAM_USAGE_INFO 1 typedef struct _ATOM_FIRMWARE_VRAM_RESERVE_INFO @@ -3854,7 +3854,7 @@ typedef struct _ATOM_FIRMWARE_VRAM_RESERVE_INFO typedef struct _ATOM_VRAM_USAGE_BY_FIRMWARE { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_FIRMWARE_VRAM_RESERVE_INFO asFirmwareVramReserveInfo[ATOM_MAX_FIRMWARE_VRAM_USAGE_INFO]; }ATOM_VRAM_USAGE_BY_FIRMWARE; @@ -3868,13 +3868,13 @@ typedef struct _ATOM_FIRMWARE_VRAM_RESERVE_INFO_V1_5 typedef struct _ATOM_VRAM_USAGE_BY_FIRMWARE_V1_5 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_FIRMWARE_VRAM_RESERVE_INFO_V1_5 asFirmwareVramReserveInfo[ATOM_MAX_FIRMWARE_VRAM_USAGE_INFO]; }ATOM_VRAM_USAGE_BY_FIRMWARE_V1_5; -/****************************************************************************/ +/****************************************************************************/ // Structure used in GPIO_Pin_LUTTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_GPIO_PIN_ASSIGNMENT { USHORT usGpioPin_AIndex; @@ -3896,9 +3896,9 @@ typedef struct _ATOM_GPIO_PIN_LUT ATOM_GPIO_PIN_ASSIGNMENT asGPIO_Pin[1]; }ATOM_GPIO_PIN_LUT; -/****************************************************************************/ -// Structure used in ComponentVideoInfoTable -/****************************************************************************/ +/****************************************************************************/ +// Structure used in ComponentVideoInfoTable +/****************************************************************************/ #define GPIO_PIN_ACTIVE_HIGH 0x1 #define MAX_SUPPORTED_CV_STANDARDS 5 @@ -3926,25 +3926,25 @@ typedef struct _ATOM_GPIO_INFO //Line 3 out put 5V. #define ATOM_CV_LINE3_ASPECTRATIO_16_9_GPIO_A 0x01 //represent gpio 3 state for 16:9 #define ATOM_CV_LINE3_ASPECTRATIO_16_9_GPIO_B 0x02 //represent gpio 4 state for 16:9 -#define ATOM_CV_LINE3_ASPECTRATIO_16_9_GPIO_SHIFT 0x0 +#define ATOM_CV_LINE3_ASPECTRATIO_16_9_GPIO_SHIFT 0x0 -//Line 3 out put 2.2V +//Line 3 out put 2.2V #define ATOM_CV_LINE3_ASPECTRATIO_4_3_LETBOX_GPIO_A 0x04 //represent gpio 3 state for 4:3 Letter box #define ATOM_CV_LINE3_ASPECTRATIO_4_3_LETBOX_GPIO_B 0x08 //represent gpio 4 state for 4:3 Letter box -#define ATOM_CV_LINE3_ASPECTRATIO_4_3_LETBOX_GPIO_SHIFT 0x2 +#define ATOM_CV_LINE3_ASPECTRATIO_4_3_LETBOX_GPIO_SHIFT 0x2 //Line 3 out put 0V #define ATOM_CV_LINE3_ASPECTRATIO_4_3_GPIO_A 0x10 //represent gpio 3 state for 4:3 #define ATOM_CV_LINE3_ASPECTRATIO_4_3_GPIO_B 0x20 //represent gpio 4 state for 4:3 -#define ATOM_CV_LINE3_ASPECTRATIO_4_3_GPIO_SHIFT 0x4 +#define ATOM_CV_LINE3_ASPECTRATIO_4_3_GPIO_SHIFT 0x4 #define ATOM_CV_LINE3_ASPECTRATIO_MASK 0x3F // bit [5:0] #define ATOM_CV_LINE3_ASPECTRATIO_EXIST 0x80 //bit 7 -//GPIO bit index in gpio setting per mode value, also represent the block no. in gpio blocks. -#define ATOM_GPIO_INDEX_LINE3_ASPECRATIO_GPIO_A 3 //bit 3 in uc480i/uc480p/uc720p/uc1080i, which represent the default gpio bit setting for the mode. -#define ATOM_GPIO_INDEX_LINE3_ASPECRATIO_GPIO_B 4 //bit 4 in uc480i/uc480p/uc720p/uc1080i, which represent the default gpio bit setting for the mode. +//GPIO bit index in gpio setting per mode value, also represend the block no. in gpio blocks. +#define ATOM_GPIO_INDEX_LINE3_ASPECRATIO_GPIO_A 3 //bit 3 in uc480i/uc480p/uc720p/uc1080i, which represend the default gpio bit setting for the mode. +#define ATOM_GPIO_INDEX_LINE3_ASPECRATIO_GPIO_B 4 //bit 4 in uc480i/uc480p/uc720p/uc1080i, which represend the default gpio bit setting for the mode. typedef struct _ATOM_COMPONENT_VIDEO_INFO @@ -3988,11 +3988,11 @@ typedef struct _ATOM_COMPONENT_VIDEO_INFO_V21 #define ATOM_COMPONENT_VIDEO_INFO_LAST ATOM_COMPONENT_VIDEO_INFO_V21 -/****************************************************************************/ +/****************************************************************************/ // Structure used in object_InfoTable -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_OBJECT_HEADER -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usDeviceSupport; USHORT usConnectorObjectTableOffset; @@ -4003,7 +4003,7 @@ typedef struct _ATOM_OBJECT_HEADER }ATOM_OBJECT_HEADER; typedef struct _ATOM_OBJECT_HEADER_V3 -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usDeviceSupport; USHORT usConnectorObjectTableOffset; @@ -4016,20 +4016,20 @@ typedef struct _ATOM_OBJECT_HEADER_V3 typedef struct _ATOM_DISPLAY_OBJECT_PATH { - USHORT usDeviceTag; //supported device + USHORT usDeviceTag; //supported device USHORT usSize; //the size of ATOM_DISPLAY_OBJECT_PATH - USHORT usConnObjectId; //Connector Object ID - USHORT usGPUObjectId; //GPU ID - USHORT usGraphicObjIds[1]; //1st Encoder Obj source from GPU to last Graphic Obj destinate to connector. + USHORT usConnObjectId; //Connector Object ID + USHORT usGPUObjectId; //GPU ID + USHORT usGraphicObjIds[1]; //1st Encoder Obj source from GPU to last Graphic Obj destinate to connector. }ATOM_DISPLAY_OBJECT_PATH; typedef struct _ATOM_DISPLAY_EXTERNAL_OBJECT_PATH { - USHORT usDeviceTag; //supported device + USHORT usDeviceTag; //supported device USHORT usSize; //the size of ATOM_DISPLAY_OBJECT_PATH - USHORT usConnObjectId; //Connector Object ID - USHORT usGPUObjectId; //GPU ID - USHORT usGraphicObjIds[2]; //usGraphicObjIds[0]= GPU internal encoder, usGraphicObjIds[1]= external encoder + USHORT usConnObjectId; //Connector Object ID + USHORT usGPUObjectId; //GPU ID + USHORT usGraphicObjIds[2]; //usGraphicObjIds[0]= GPU internal encoder, usGraphicObjIds[1]= external encoder }ATOM_DISPLAY_EXTERNAL_OBJECT_PATH; typedef struct _ATOM_DISPLAY_OBJECT_PATH_TABLE @@ -4041,7 +4041,7 @@ typedef struct _ATOM_DISPLAY_OBJECT_PATH_TABLE }ATOM_DISPLAY_OBJECT_PATH_TABLE; -typedef struct _ATOM_OBJECT //each object has this structure +typedef struct _ATOM_OBJECT //each object has this structure { USHORT usObjectID; USHORT usSrcDstTableOffset; @@ -4049,7 +4049,7 @@ typedef struct _ATOM_OBJECT //each object has thi USHORT usReserved; }ATOM_OBJECT; -typedef struct _ATOM_OBJECT_TABLE //Above 4 object table offset pointing to a bunch of objects all have this structure +typedef struct _ATOM_OBJECT_TABLE //Above 4 object table offset pointing to a bunch of objects all have this structure { UCHAR ucNumberOfObjects; UCHAR ucPadding[3]; @@ -4088,7 +4088,7 @@ typedef struct _ATOM_SRC_DST_TABLE_FOR_ONE_OBJECT //usSrcDstTableOffset #define MAX_NUMBER_OF_EXT_AUXDDC_LUT_ENTRIES (EXT_AUXDDC_LUTINDEX_7+1) //ucChannelMapping are defined as following -//for DP connector, eDP, DP to VGA/LVDS +//for DP connector, eDP, DP to VGA/LVDS //Bit[1:0]: Define which pin connect to DP connector DP_Lane0, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 //Bit[3:2]: Define which pin connect to DP connector DP_Lane1, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 //Bit[5:4]: Define which pin connect to DP connector DP_Lane2, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 @@ -4108,7 +4108,7 @@ typedef struct _ATOM_DP_CONN_CHANNEL_MAPPING #endif }ATOM_DP_CONN_CHANNEL_MAPPING; -//for DVI/HDMI, in dual link case, both links have to have same mapping. +//for DVI/HDMI, in dual link case, both links have to have same mapping. //Bit[1:0]: Define which pin connect to DVI connector data Lane2, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 //Bit[3:2]: Define which pin connect to DVI connector data Lane1, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 //Bit[5:4]: Define which pin connect to DVI connector data Lane0, =0: source from GPU pin TX0, =1: from GPU pin TX1, =2: from GPU pin TX2, =3 from GPU pin TX3 @@ -4130,8 +4130,8 @@ typedef struct _ATOM_DVI_CONN_CHANNEL_MAPPING typedef struct _EXT_DISPLAY_PATH { - USHORT usDeviceTag; //A bit vector to show what devices are supported - USHORT usDeviceACPIEnum; //16bit device ACPI id. + USHORT usDeviceTag; //A bit vector to show what devices are supported + USHORT usDeviceACPIEnum; //16bit device ACPI id. USHORT usDeviceConnector; //A physical connector for displays to plug in, using object connector definitions UCHAR ucExtAUXDDCLutIndex; //An index into external AUX/DDC channel LUT UCHAR ucExtHPDPINLutIndex; //An index into external HPD pin LUT @@ -4143,9 +4143,9 @@ typedef struct _EXT_DISPLAY_PATH }; UCHAR ucChPNInvert; // bit vector for up to 8 lanes, =0: P and N is not invert, =1 P and N is inverted USHORT usCaps; - USHORT usReserved; + USHORT usReserved; }EXT_DISPLAY_PATH; - + #define NUMBER_OF_UCHAR_FOR_GUID 16 #define MAX_NUMBER_OF_EXT_DISPLAY_PATH 7 @@ -4158,7 +4158,7 @@ typedef struct _ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucGuid [NUMBER_OF_UCHAR_FOR_GUID]; // a GUID is a 16 byte long string EXT_DISPLAY_PATH sPath[MAX_NUMBER_OF_EXT_DISPLAY_PATH]; // total of fixed 7 entries. - UCHAR ucChecksum; // a simple Checksum of the sum of whole structure equal to 0x0. + UCHAR ucChecksum; // a simple Checksum of the sum of whole structure equal to 0x0. UCHAR uc3DStereoPinId; // use for eDP panel UCHAR ucRemoteDisplayConfig; UCHAR uceDPToLVDSRxId; @@ -4174,7 +4174,7 @@ typedef struct _ATOM_COMMON_RECORD_HEADER }ATOM_COMMON_RECORD_HEADER; -#define ATOM_I2C_RECORD_TYPE 1 +#define ATOM_I2C_RECORD_TYPE 1 #define ATOM_HPD_INT_RECORD_TYPE 2 #define ATOM_OUTPUT_PROTECTION_RECORD_TYPE 3 #define ATOM_CONNECTOR_DEVICE_TAG_RECORD_TYPE 4 @@ -4191,30 +4191,30 @@ typedef struct _ATOM_COMMON_RECORD_HEADER #define ATOM_ROUTER_DATA_CLOCK_PATH_SELECT_RECORD_TYPE 15 #define ATOM_CONNECTOR_HPDPIN_LUT_RECORD_TYPE 16 //This is for the case when connectors are not known to object table #define ATOM_CONNECTOR_AUXDDC_LUT_RECORD_TYPE 17 //This is for the case when connectors are not known to object table -#define ATOM_OBJECT_LINK_RECORD_TYPE 18 //Once this record is present under one object, it indicats the object is linked to another obj described by the record +#define ATOM_OBJECT_LINK_RECORD_TYPE 18 //Once this record is present under one object, it indicats the oobject is linked to another obj described by the record #define ATOM_CONNECTOR_REMOTE_CAP_RECORD_TYPE 19 #define ATOM_ENCODER_CAP_RECORD_TYPE 20 #define ATOM_BRACKET_LAYOUT_RECORD_TYPE 21 -//Must be updated when new record type is added, equal to that record definition! +//Must be updated when new record type is added,equal to that record definition! #define ATOM_MAX_OBJECT_RECORD_NUMBER ATOM_BRACKET_LAYOUT_RECORD_TYPE typedef struct _ATOM_I2C_RECORD { ATOM_COMMON_RECORD_HEADER sheader; - ATOM_I2C_ID_CONFIG sucI2cId; + ATOM_I2C_ID_CONFIG sucI2cId; UCHAR ucI2CAddr; //The slave address, it's 0 when the record is attached to connector for DDC }ATOM_I2C_RECORD; typedef struct _ATOM_HPD_INT_RECORD { ATOM_COMMON_RECORD_HEADER sheader; - UCHAR ucHPDIntGPIOID; //Corresponding block in GPIO_PIN_INFO table gives the pin info + UCHAR ucHPDIntGPIOID; //Corresponding block in GPIO_PIN_INFO table gives the pin info UCHAR ucPlugged_PinState; }ATOM_HPD_INT_RECORD; -typedef struct _ATOM_OUTPUT_PROTECTION_RECORD +typedef struct _ATOM_OUTPUT_PROTECTION_RECORD { ATOM_COMMON_RECORD_HEADER sheader; UCHAR ucProtectionFlag; @@ -4262,7 +4262,7 @@ typedef struct _ATOM_ENCODER_FPGA_CONTROL_RECORD typedef struct _ATOM_CONNECTOR_CVTV_SHARE_DIN_RECORD { ATOM_COMMON_RECORD_HEADER sheader; - UCHAR ucGPIOID; //Corresponding block in GPIO_PIN_INFO table gives the pin info + UCHAR ucGPIOID; //Corresponding block in GPIO_PIN_INFO table gives the pin info UCHAR ucTVActiveState; //Indicating when the pin==0 or 1 when TV is connected }ATOM_CONNECTOR_CVTV_SHARE_DIN_RECORD; @@ -4296,18 +4296,18 @@ typedef struct _ATOM_OBJECT_GPIO_CNTL_RECORD ATOM_GPIO_PIN_CONTROL_PAIR asGpio[1]; // the real gpio pin pair determined by number of pins ucNumberOfPins }ATOM_OBJECT_GPIO_CNTL_RECORD; -//Definitions for GPIO pin state +//Definitions for GPIO pin state #define GPIO_PIN_TYPE_INPUT 0x00 #define GPIO_PIN_TYPE_OUTPUT 0x10 #define GPIO_PIN_TYPE_HW_CONTROL 0x20 -//For GPIO_PIN_TYPE_OUTPUT the following is defined +//For GPIO_PIN_TYPE_OUTPUT the following is defined #define GPIO_PIN_OUTPUT_STATE_MASK 0x01 #define GPIO_PIN_OUTPUT_STATE_SHIFT 0 #define GPIO_PIN_STATE_ACTIVE_LOW 0x0 #define GPIO_PIN_STATE_ACTIVE_HIGH 0x1 -// Indexes to GPIO array in GLSync record +// Indexes to GPIO array in GLSync record // GLSync record is for Frame Lock/Gen Lock feature. #define ATOM_GPIO_INDEX_GLSYNC_REFCLK 0 #define ATOM_GPIO_INDEX_GLSYNC_HSYNC 1 @@ -4329,26 +4329,26 @@ typedef struct _ATOM_ENCODER_DVO_CF_RECORD // Bit maps for ATOM_ENCODER_CAP_RECORD.ucEncoderCap #define ATOM_ENCODER_CAP_RECORD_HBR2 0x01 // DP1.2 HBR2 is supported by HW encoder -#define ATOM_ENCODER_CAP_RECORD_HBR2_EN 0x02 // DP1.2 HBR2 setting is qualified and HBR2 can be enabled +#define ATOM_ENCODER_CAP_RECORD_HBR2_EN 0x02 // DP1.2 HBR2 setting is qualified and HBR2 can be enabled typedef struct _ATOM_ENCODER_CAP_RECORD { ATOM_COMMON_RECORD_HEADER sheader; union { - USHORT usEncoderCap; + USHORT usEncoderCap; struct { #if ATOM_BIG_ENDIAN USHORT usReserved:14; // Bit1-15 may be defined for other capability in future USHORT usHBR2En:1; // Bit1 is for DP1.2 HBR2 enable - USHORT usHBR2Cap:1; // Bit0 is for DP1.2 HBR2 capability. + USHORT usHBR2Cap:1; // Bit0 is for DP1.2 HBR2 capability. #else - USHORT usHBR2Cap:1; // Bit0 is for DP1.2 HBR2 capability. + USHORT usHBR2Cap:1; // Bit0 is for DP1.2 HBR2 capability. USHORT usHBR2En:1; // Bit1 is for DP1.2 HBR2 enable USHORT usReserved:14; // Bit1-15 may be defined for other capability in future #endif }; - }; -}ATOM_ENCODER_CAP_RECORD; + }; +}ATOM_ENCODER_CAP_RECORD; // value for ATOM_CONNECTOR_CF_RECORD.ucConnectedDvoBundle #define ATOM_CONNECTOR_CF_RECORD_CONNECTED_UPPER12BITBUNDLEA 1 @@ -4380,7 +4380,7 @@ typedef struct _ATOM_CONNECTOR_PCIE_SUBCONNECTOR_RECORD typedef struct _ATOM_ROUTER_DDC_PATH_SELECT_RECORD { - ATOM_COMMON_RECORD_HEADER sheader; + ATOM_COMMON_RECORD_HEADER sheader; UCHAR ucMuxType; //decide the number of ucMuxState, =0, no pin state, =1: single state with complement, >1: multiple state UCHAR ucMuxControlPin; UCHAR ucMuxState[2]; //for alligment purpose @@ -4388,7 +4388,7 @@ typedef struct _ATOM_ROUTER_DDC_PATH_SELECT_RECORD typedef struct _ATOM_ROUTER_DATA_CLOCK_PATH_SELECT_RECORD { - ATOM_COMMON_RECORD_HEADER sheader; + ATOM_COMMON_RECORD_HEADER sheader; UCHAR ucMuxType; UCHAR ucMuxControlPin; UCHAR ucMuxState[2]; //for alligment purpose @@ -4401,7 +4401,7 @@ typedef struct _ATOM_ROUTER_DATA_CLOCK_PATH_SELECT_RECORD typedef struct _ATOM_CONNECTOR_HPDPIN_LUT_RECORD //record for ATOM_CONNECTOR_HPDPIN_LUT_RECORD_TYPE { ATOM_COMMON_RECORD_HEADER sheader; - UCHAR ucHPDPINMap[MAX_NUMBER_OF_EXT_HPDPIN_LUT_ENTRIES]; //An fixed size array which maps external pins to internal GPIO_PIN_INFO table + UCHAR ucHPDPINMap[MAX_NUMBER_OF_EXT_HPDPIN_LUT_ENTRIES]; //An fixed size array which maps external pins to internal GPIO_PIN_INFO table }ATOM_CONNECTOR_HPDPIN_LUT_RECORD; typedef struct _ATOM_CONNECTOR_AUXDDC_LUT_RECORD //record for ATOM_CONNECTOR_AUXDDC_LUT_RECORD_TYPE @@ -4447,9 +4447,9 @@ typedef struct _ATOM_BRACKET_LAYOUT_RECORD ATOM_CONNECTOR_LAYOUT_INFO asConnInfo[1]; }ATOM_BRACKET_LAYOUT_RECORD; -/****************************************************************************/ +/****************************************************************************/ // ASIC voltage data table -/****************************************************************************/ +/****************************************************************************/ typedef struct _ATOM_VOLTAGE_INFO_HEADER { USHORT usVDDCBaseLevel; //In number of 50mv unit @@ -4465,7 +4465,7 @@ typedef struct _ATOM_VOLTAGE_INFO_HEADER typedef struct _ATOM_VOLTAGE_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_VOLTAGE_INFO_HEADER viHeader; UCHAR ucVoltageEntries[64]; //64 is for allocation, the actual number of entry is present at ucNumOfVoltageEntries*ucBytesPerVoltageEntry }ATOM_VOLTAGE_INFO; @@ -4497,10 +4497,10 @@ typedef struct _ATOM_VOLTAGE_FORMULA_V2 typedef struct _ATOM_VOLTAGE_CONTROL { - UCHAR ucVoltageControlId; //Indicate it is controlled by I2C or GPIO or HW state machine + UCHAR ucVoltageControlId; //Indicate it is controlled by I2C or GPIO or HW state machine UCHAR ucVoltageControlI2cLine; UCHAR ucVoltageControlAddress; - UCHAR ucVoltageControlOffset; + UCHAR ucVoltageControlOffset; USHORT usGpioPin_AIndex; //GPIO_PAD register index UCHAR ucGpioPinBitShift[9]; //at most 8 pin support 255 VIDs, termintate with 0xff UCHAR ucReserved; @@ -4513,11 +4513,11 @@ typedef struct _ATOM_VOLTAGE_CONTROL #define VOLTAGE_CONTROL_ID_LM64 0x01 //I2C control, used for R5xx Core Voltage #define VOLTAGE_CONTROL_ID_DAC 0x02 //I2C control, used for R5xx/R6xx MVDDC,MVDDQ or VDDCI #define VOLTAGE_CONTROL_ID_VT116xM 0x03 //I2C control, used for R6xx Core Voltage -#define VOLTAGE_CONTROL_ID_DS4402 0x04 -#define VOLTAGE_CONTROL_ID_UP6266 0x05 +#define VOLTAGE_CONTROL_ID_DS4402 0x04 +#define VOLTAGE_CONTROL_ID_UP6266 0x05 #define VOLTAGE_CONTROL_ID_SCORPIO 0x06 -#define VOLTAGE_CONTROL_ID_VT1556M 0x07 -#define VOLTAGE_CONTROL_ID_CHL822x 0x08 +#define VOLTAGE_CONTROL_ID_VT1556M 0x07 +#define VOLTAGE_CONTROL_ID_CHL822x 0x08 #define VOLTAGE_CONTROL_ID_VT1586M 0x09 #define VOLTAGE_CONTROL_ID_UP1637 0x0A #define VOLTAGE_CONTROL_ID_CHL8214 0x0B @@ -4530,30 +4530,30 @@ typedef struct _ATOM_VOLTAGE_CONTROL typedef struct _ATOM_VOLTAGE_OBJECT { - UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI - UCHAR ucSize; //Size of Object - ATOM_VOLTAGE_CONTROL asControl; //describ how to control - ATOM_VOLTAGE_FORMULA asFormula; //Indicate How to convert real Voltage to VID + UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI + UCHAR ucSize; //Size of Object + ATOM_VOLTAGE_CONTROL asControl; //describ how to control + ATOM_VOLTAGE_FORMULA asFormula; //Indicate How to convert real Voltage to VID }ATOM_VOLTAGE_OBJECT; typedef struct _ATOM_VOLTAGE_OBJECT_V2 { - UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI - UCHAR ucSize; //Size of Object - ATOM_VOLTAGE_CONTROL asControl; //describ how to control - ATOM_VOLTAGE_FORMULA_V2 asFormula; //Indicate How to convert real Voltage to VID + UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI + UCHAR ucSize; //Size of Object + ATOM_VOLTAGE_CONTROL asControl; //describ how to control + ATOM_VOLTAGE_FORMULA_V2 asFormula; //Indicate How to convert real Voltage to VID }ATOM_VOLTAGE_OBJECT_V2; typedef struct _ATOM_VOLTAGE_OBJECT_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; - ATOM_VOLTAGE_OBJECT asVoltageObj[3]; //Info for Voltage control + ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_VOLTAGE_OBJECT asVoltageObj[3]; //Info for Voltage control }ATOM_VOLTAGE_OBJECT_INFO; typedef struct _ATOM_VOLTAGE_OBJECT_INFO_V2 { - ATOM_COMMON_TABLE_HEADER sHeader; - ATOM_VOLTAGE_OBJECT_V2 asVoltageObj[3]; //Info for Voltage control + ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_VOLTAGE_OBJECT_V2 asVoltageObj[3]; //Info for Voltage control }ATOM_VOLTAGE_OBJECT_INFO_V2; typedef struct _ATOM_LEAKID_VOLTAGE @@ -4564,9 +4564,9 @@ typedef struct _ATOM_LEAKID_VOLTAGE }ATOM_LEAKID_VOLTAGE; typedef struct _ATOM_VOLTAGE_OBJECT_HEADER_V3{ - UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI - UCHAR ucVoltageMode; //Indicate voltage control mode: Init/Set/Leakage/Set phase - USHORT usSize; //Size of Object + UCHAR ucVoltageType; //Indicate Voltage Source: VDDC, MVDDC, MVDDQ or MVDDCI + UCHAR ucVoltageMode; //Indicate voltage control mode: Init/Set/Leakage/Set phase + USHORT usSize; //Size of Object }ATOM_VOLTAGE_OBJECT_HEADER_V3; // ATOM_VOLTAGE_OBJECT_HEADER_V3.ucVoltageMode @@ -4574,7 +4574,7 @@ typedef struct _ATOM_VOLTAGE_OBJECT_HEADER_V3{ #define VOLTAGE_OBJ_VR_I2C_INIT_SEQ 3 //VOLTAGE REGULATOR INIT sequece through I2C -> ATOM_I2C_VOLTAGE_OBJECT_V3 #define VOLTAGE_OBJ_PHASE_LUT 4 //Set Vregulator Phase lookup table ->ATOM_GPIO_VOLTAGE_OBJECT_V3 #define VOLTAGE_OBJ_SVID2 7 //Indicate voltage control by SVID2 ->ATOM_SVID2_VOLTAGE_OBJECT_V3 -#define VOLTAGE_OBJ_EVV 8 +#define VOLTAGE_OBJ_EVV 8 #define VOLTAGE_OBJ_PWRBOOST_LEAKAGE_LUT 0x10 //Powerboost Voltage and LeakageId lookup table->ATOM_LEAKAGE_VOLTAGE_OBJECT_V3 #define VOLTAGE_OBJ_HIGH_STATE_LEAKAGE_LUT 0x11 //High voltage state Voltage and LeakageId lookup table->ATOM_LEAKAGE_VOLTAGE_OBJECT_V3 #define VOLTAGE_OBJ_HIGH1_STATE_LEAKAGE_LUT 0x12 //High1 voltage state Voltage and LeakageId lookup table->ATOM_LEAKAGE_VOLTAGE_OBJECT_V3 @@ -4588,7 +4588,7 @@ typedef struct _VOLTAGE_LUT_ENTRY_V2 typedef struct _LEAKAGE_VOLTAGE_LUT_ENTRY_V2 { USHORT usVoltageLevel; // The Voltage ID which is used to program GPIO register - USHORT usVoltageId; + USHORT usVoltageId; USHORT usLeakageId; // The corresponding Voltage Value, in mV }LEAKAGE_VOLTAGE_LUT_ENTRY_V2; @@ -4598,7 +4598,7 @@ typedef struct _ATOM_I2C_VOLTAGE_OBJECT_V3 UCHAR ucVoltageRegulatorId; //Indicate Voltage Regulator Id UCHAR ucVoltageControlI2cLine; UCHAR ucVoltageControlAddress; - UCHAR ucVoltageControlOffset; + UCHAR ucVoltageControlOffset; ULONG ulReserved; VOLTAGE_LUT_ENTRY asVolI2cLut[1]; // end with 0xff }ATOM_I2C_VOLTAGE_OBJECT_V3; @@ -4610,12 +4610,12 @@ typedef struct _ATOM_I2C_VOLTAGE_OBJECT_V3 typedef struct _ATOM_GPIO_VOLTAGE_OBJECT_V3 { ATOM_VOLTAGE_OBJECT_HEADER_V3 sHeader; // voltage mode = VOLTAGE_OBJ_GPIO_LUT or VOLTAGE_OBJ_PHASE_LUT - UCHAR ucVoltageGpioCntlId; // default is 0 which indicate control through CG VID mode - UCHAR ucGpioEntryNum; // indicate the entry numbers of Voltage/Gpio value Look up table + UCHAR ucVoltageGpioCntlId; // default is 0 which indicate control through CG VID mode + UCHAR ucGpioEntryNum; // indiate the entry numbers of Votlage/Gpio value Look up table UCHAR ucPhaseDelay; // phase delay in unit of micro second - UCHAR ucReserved; + UCHAR ucReserved; ULONG ulGpioMaskVal; // GPIO Mask value - VOLTAGE_LUT_ENTRY_V2 asVolGpioLut[1]; + VOLTAGE_LUT_ENTRY_V2 asVolGpioLut[1]; }ATOM_GPIO_VOLTAGE_OBJECT_V3; typedef struct _ATOM_LEAKAGE_VOLTAGE_OBJECT_V3 @@ -4623,9 +4623,9 @@ typedef struct _ATOM_LEAKAGE_VOLTAGE_OBJECT_V3 ATOM_VOLTAGE_OBJECT_HEADER_V3 sHeader; // voltage mode = 0x10/0x11/0x12 UCHAR ucLeakageCntlId; // default is 0 UCHAR ucLeakageEntryNum; // indicate the entry number of LeakageId/Voltage Lut table - UCHAR ucReserved[2]; + UCHAR ucReserved[2]; ULONG ulMaxVoltageLevel; - LEAKAGE_VOLTAGE_LUT_ENTRY_V2 asLeakageIdLut[1]; + LEAKAGE_VOLTAGE_LUT_ENTRY_V2 asLeakageIdLut[1]; }ATOM_LEAKAGE_VOLTAGE_OBJECT_V3; @@ -4635,9 +4635,9 @@ typedef struct _ATOM_SVID2_VOLTAGE_OBJECT_V3 // 14:7 – PSI0_VID // 6 – PSI0_EN // 5 – PSI1 -// 4:2 – load line slope trim. -// 1:0 – offset trim, - USHORT usLoadLine_PSI; +// 4:2 – load line slope trim. +// 1:0 – offset trim, + USHORT usLoadLine_PSI; // GPU GPIO pin Id to SVID2 regulator VRHot pin. possible value 0~31. 0 means GPIO0, 31 means GPIO31 UCHAR ucSVDGpioId; //0~31 indicate GPIO0~31 UCHAR ucSVCGpioId; //0~31 indicate GPIO0~31 @@ -4653,8 +4653,8 @@ typedef union _ATOM_VOLTAGE_OBJECT_V3{ typedef struct _ATOM_VOLTAGE_OBJECT_INFO_V3_1 { - ATOM_COMMON_TABLE_HEADER sHeader; - ATOM_VOLTAGE_OBJECT_V3 asVoltageObj[3]; //Info for Voltage control + ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_VOLTAGE_OBJECT_V3 asVoltageObj[3]; //Info for Voltage control }ATOM_VOLTAGE_OBJECT_INFO_V3_1; typedef struct _ATOM_ASIC_PROFILE_VOLTAGE @@ -4663,28 +4663,28 @@ typedef struct _ATOM_ASIC_PROFILE_VOLTAGE UCHAR ucReserved; USHORT usSize; USHORT usEfuseSpareStartAddr; - USHORT usFuseIndex[8]; //from LSB to MSB, Max 8bit,end of 0xffff if less than 8 efuse id, + USHORT usFuseIndex[8]; //from LSB to MSB, Max 8bit,end of 0xffff if less than 8 efuse id, ATOM_LEAKID_VOLTAGE asLeakVol[2]; //Leakid and relatd voltage }ATOM_ASIC_PROFILE_VOLTAGE; //ucProfileId -#define ATOM_ASIC_PROFILE_ID_EFUSE_VOLTAGE 1 +#define ATOM_ASIC_PROFILE_ID_EFUSE_VOLTAGE 1 #define ATOM_ASIC_PROFILE_ID_EFUSE_PERFORMANCE_VOLTAGE 1 #define ATOM_ASIC_PROFILE_ID_EFUSE_THERMAL_VOLTAGE 2 typedef struct _ATOM_ASIC_PROFILING_INFO { - ATOM_COMMON_TABLE_HEADER asHeader; + ATOM_COMMON_TABLE_HEADER asHeader; ATOM_ASIC_PROFILE_VOLTAGE asVoltage; }ATOM_ASIC_PROFILING_INFO; typedef struct _ATOM_ASIC_PROFILING_INFO_V2_1 { - ATOM_COMMON_TABLE_HEADER asHeader; + ATOM_COMMON_TABLE_HEADER asHeader; UCHAR ucLeakageBinNum; // indicate the entry number of LeakageId/Voltage Lut table - USHORT usLeakageBinArrayOffset; // offset of USHORT Leakage Bin list array ( from lower LeakageId to higher) + USHORT usLeakageBinArrayOffset; // offset of USHORT Leakage Bin list array ( from lower LeakageId to higher) - UCHAR ucElbVDDC_Num; + UCHAR ucElbVDDC_Num; USHORT usElbVDDC_IdArrayOffset; // offset of USHORT virtual VDDC voltage id ( 0xff01~0xff08 ) USHORT usElbVDDC_LevelArrayOffset; // offset of 2 dimension voltage level USHORT array @@ -4695,7 +4695,7 @@ typedef struct _ATOM_ASIC_PROFILING_INFO_V2_1 typedef struct _ATOM_ASIC_PROFILING_INFO_V3_1 { - ATOM_COMMON_TABLE_HEADER asHeader; + ATOM_COMMON_TABLE_HEADER asHeader; ULONG ulEvvDerateTdp; ULONG ulEvvDerateTdc; ULONG ulBoardCoreTemp; @@ -4745,7 +4745,7 @@ typedef struct _ATOM_POWER_SOURCE_OBJECT UCHAR ucPwrSensRegIndex; // I2C register Index if I2C detect UCHAR ucPwrSensRegBitMask; // detect which bit is used if I2C detect UCHAR ucPwrSensActiveState; // high active or low active - UCHAR ucReserve[3]; // reserve + UCHAR ucReserve[3]; // reserve USHORT usSensPwr; // in unit of watt }ATOM_POWER_SOURCE_OBJECT; @@ -4771,15 +4771,15 @@ typedef struct _ATOM_POWER_SOURCE_INFO typedef struct _ATOM_CLK_VOLT_CAPABILITY { - ULONG ulVoltageIndex; // The Voltage Index indicated by FUSE, same voltage index shared with SCLK DPM fuse table + ULONG ulVoltageIndex; // The Voltage Index indicated by FUSE, same voltage index shared with SCLK DPM fuse table ULONG ulMaximumSupportedCLK; // Maximum clock supported with specified voltage index, unit in 10kHz }ATOM_CLK_VOLT_CAPABILITY; typedef struct _ATOM_AVAILABLE_SCLK_LIST { ULONG ulSupportedSCLK; // Maximum clock supported with specified voltage index, unit in 10kHz - USHORT usVoltageIndex; // The Voltage Index indicated by FUSE for specified SCLK - USHORT usVoltageID; // The Voltage ID indicated by FUSE for specified SCLK + USHORT usVoltageIndex; // The Voltage Index indicated by FUSE for specified SCLK + USHORT usVoltageID; // The Voltage ID indicated by FUSE for specified SCLK }ATOM_AVAILABLE_SCLK_LIST; // ATOM_INTEGRATED_SYSTEM_INFO_V6 ulSystemConfig cap definition @@ -4790,28 +4790,28 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V6 { ATOM_COMMON_TABLE_HEADER sHeader; ULONG ulBootUpEngineClock; - ULONG ulDentistVCOFreq; - ULONG ulBootUpUMAClock; - ATOM_CLK_VOLT_CAPABILITY sDISPCLK_Voltage[4]; + ULONG ulDentistVCOFreq; + ULONG ulBootUpUMAClock; + ATOM_CLK_VOLT_CAPABILITY sDISPCLK_Voltage[4]; ULONG ulBootUpReqDisplayVector; ULONG ulOtherDisplayMisc; ULONG ulGPUCapInfo; ULONG ulSB_MMIO_Base_Addr; USHORT usRequestedPWMFreqInHz; - UCHAR ucHtcTmpLmt; + UCHAR ucHtcTmpLmt; UCHAR ucHtcHystLmt; - ULONG ulMinEngineClock; - ULONG ulSystemConfig; - ULONG ulCPUCapInfo; - USHORT usNBP0Voltage; + ULONG ulMinEngineClock; + ULONG ulSystemConfig; + ULONG ulCPUCapInfo; + USHORT usNBP0Voltage; USHORT usNBP1Voltage; - USHORT usBootUpNBVoltage; + USHORT usBootUpNBVoltage; USHORT usExtDispConnInfoOffset; - USHORT usPanelRefreshRateRange; - UCHAR ucMemoryType; + USHORT usPanelRefreshRateRange; + UCHAR ucMemoryType; UCHAR ucUMAChannelNumber; - ULONG ulCSR_M3_ARB_CNTL_DEFAULT[10]; - ULONG ulCSR_M3_ARB_CNTL_UVD[10]; + ULONG ulCSR_M3_ARB_CNTL_DEFAULT[10]; + ULONG ulCSR_M3_ARB_CNTL_UVD[10]; ULONG ulCSR_M3_ARB_CNTL_FS3D[10]; ATOM_AVAILABLE_SCLK_LIST sAvail_SCLK[5]; ULONG ulGMCRestoreResetTime; @@ -4829,24 +4829,24 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V6 USHORT usDVISSpreadRateIn10Hz; ULONG SclkDpmBoostMargin; ULONG SclkDpmThrottleMargin; - USHORT SclkDpmTdpLimitPG; + USHORT SclkDpmTdpLimitPG; USHORT SclkDpmTdpLimitBoost; ULONG ulBoostEngineCLock; - UCHAR ulBoostVid_2bit; + UCHAR ulBoostVid_2bit; UCHAR EnableBoost; USHORT GnbTdpLimit; USHORT usMaxLVDSPclkFreqInSingleLink; UCHAR ucLvdsMisc; UCHAR ucLVDSReserved; - ULONG ulReserved3[15]; - ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO sExtDispConnInfo; -}ATOM_INTEGRATED_SYSTEM_INFO_V6; + ULONG ulReserved3[15]; + ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO sExtDispConnInfo; +}ATOM_INTEGRATED_SYSTEM_INFO_V6; // ulGPUCapInfo #define INTEGRATED_SYSTEM_INFO_V6_GPUCAPINFO__TMDSHDMI_COHERENT_SINGLEPLL_MODE 0x01 #define INTEGRATED_SYSTEM_INFO_V6_GPUCAPINFO__DISABLE_AUX_HW_MODE_DETECTION 0x08 -//ucLVDSMisc: +//ucLVDSMisc: #define SYS_INFO_LVDSMISC__888_FPDI_MODE 0x01 #define SYS_INFO_LVDSMISC__DL_CH_SWAP 0x02 #define SYS_INFO_LVDSMISC__888_BPC 0x04 @@ -4862,57 +4862,57 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V6 /********************************************************************************************************************** ATOM_INTEGRATED_SYSTEM_INFO_V6 Description ulBootUpEngineClock: VBIOS bootup Engine clock frequency, in 10kHz unit. if it is equal 0, then VBIOS use pre-defined bootup engine clock -ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. -ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. +ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. +ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. sDISPCLK_Voltage: Report Display clock voltage requirement. - + ulBootUpReqDisplayVector: VBIOS boot up display IDs, following are supported devices in Liano/Ontaio projects: ATOM_DEVICE_CRT1_SUPPORT 0x0001 ATOM_DEVICE_CRT2_SUPPORT 0x0010 - ATOM_DEVICE_DFP1_SUPPORT 0x0008 - ATOM_DEVICE_DFP6_SUPPORT 0x0040 - ATOM_DEVICE_DFP2_SUPPORT 0x0080 - ATOM_DEVICE_DFP3_SUPPORT 0x0200 - ATOM_DEVICE_DFP4_SUPPORT 0x0400 + ATOM_DEVICE_DFP1_SUPPORT 0x0008 + ATOM_DEVICE_DFP6_SUPPORT 0x0040 + ATOM_DEVICE_DFP2_SUPPORT 0x0080 + ATOM_DEVICE_DFP3_SUPPORT 0x0200 + ATOM_DEVICE_DFP4_SUPPORT 0x0400 ATOM_DEVICE_DFP5_SUPPORT 0x0800 ATOM_DEVICE_LCD1_SUPPORT 0x0002 -ulOtherDisplayMisc: Other display related flags, not defined yet. +ulOtherDisplayMisc: Other display related flags, not defined yet. ulGPUCapInfo: bit[0]=0: TMDS/HDMI Coherent Mode use cascade PLL mode. =1: TMDS/HDMI Coherent Mode use signel PLL mode. bit[3]=0: Enable HW AUX mode detection logic =1: Disable HW AUX mode dettion logic ulSB_MMIO_Base_Addr: Physical Base address to SB MMIO space. Driver needs to initialize it for SMU usage. -usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). +usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). Any attempt to change BL using VBIOS function or enable VariBri from PP table is not effective since ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==0; - + When it's set to a non-zero frequency, the BackLight is controlled by GPU (SW) in one of two ways below: 1. SW uses the GPU BL PWM output to control the BL, in chis case, this non-zero frequency determines what freq GPU should use; VBIOS will set up proper PWM frequency and ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1,as the result, - Changing BL using VBIOS function is functional in both driver and non-driver present environment; + Changing BL using VBIOS function is functional in both driver and non-driver present environment; and enabling VariBri under the driver environment from PP table is optional. 2. SW uses other means to control BL (like DPCD),this non-zero frequency serves as a flag only indicating that BL control from GPU is expected. VBIOS will NOT set up PWM frequency but make ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1 Changing BL using VBIOS function could be functional in both driver and non-driver present environment,but - it's per platform + it's per platform and enabling VariBri under the driver environment from PP table is optional. -ucHtcTmpLmt: Refer to D18F3x64 bit[22:16], HtcTmpLmt. +ucHtcTmpLmt: Refer to D18F3x64 bit[22:16], HtcTmpLmt. Threshold on value to enter HTC_active state. -ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. +ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. To calculate threshold off value to exit HTC_active state, which is Threshold on vlaue minus ucHtcHystLmt. ulMinEngineClock: Minimum SCLK allowed in 10kHz unit. This is calculated based on WRCK Fuse settings. -ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled +ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled =1: PCIE Power Gating Enabled Bit[1]=0: DDR-DLL shut-down feature disabled. 1: DDR-DLL shut-down feature enabled. Bit[2]=0: DDR-PLL Power down feature disabled. - 1: DDR-PLL Power down feature enabled. + 1: DDR-PLL Power down feature enabled. ulCPUCapInfo: TBD usNBP0Voltage: VID for voltage on NB P0 State -usNBP1Voltage: VID for voltage on NB P1 State +usNBP1Voltage: VID for voltage on NB P1 State usBootUpNBVoltage: Voltage Index of GNB voltage configured by SBIOS, which is suffcient to support VBIOS DISPCLK requirement. usExtDispConnInfoOffset: Offset to sExtDispConnInfo inside the structure usPanelRefreshRateRange: Bit vector for LCD supported refresh rate range. If DRR is requestd by the platform, at least two bits need to be set @@ -4922,24 +4922,24 @@ usPanelRefreshRateRange: Bit vector for LCD supported refresh rate rang SUPPORTED_LCD_REFRESHRATE_50Hz 0x0010 SUPPORTED_LCD_REFRESHRATE_60Hz 0x0020 ucMemoryType: [3:0]=1:DDR1;=2:DDR2;=3:DDR3.[7:4] is reserved. -ucUMAChannelNumber: System memory channel numbers. +ucUMAChannelNumber: System memory channel numbers. ulCSR_M3_ARB_CNTL_DEFAULT[10]: Arrays with values for CSR M3 arbiter for default ulCSR_M3_ARB_CNTL_UVD[10]: Arrays with values for CSR M3 arbiter for UVD playback. ulCSR_M3_ARB_CNTL_FS3D[10]: Arrays with values for CSR M3 arbiter for Full Screen 3D applications. -sAvail_SCLK[5]: Arrays to provide availabe list of SLCK and corresponding voltage, order from low to high -ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. -ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calcualte data reconnection latency. Unit in 10kHz. +sAvail_SCLK[5]: Arrays to provide availabe list of SLCK and corresponding voltage, order from low to high +ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. +ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calcualte data reconnection latency. Unit in 10kHz. ulIdleNClk: NCLK speed while memory runs in self-refresh state. Unit in 10kHz. ulDDR_DLL_PowerUpTime: DDR PHY DLL power up time. Unit in ns. ulDDR_PLL_PowerUpTime: DDR PHY PLL power up time. Unit in ns. usPCIEClkSSPercentage: PCIE Clock Spred Spectrum Percentage in unit 0.01%; 100 mean 1%. usPCIEClkSSType: PCIE Clock Spred Spectrum Type. 0 for Down spread(default); 1 for Center spread. -usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. -usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. +usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. usMaxLVDSPclkFreqInSingleLink: Max pixel clock LVDS panel single link, if=0 means VBIOS use default threhold, right now it is 85Mhz ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 panel in LDI mode, =1: LVDS 888 panel in FPDI mode [bit1] LVDS panel lower and upper link mapping =0: lower link and upper link not swap, =1: lower link and upper link are swapped @@ -4951,9 +4951,9 @@ ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 pan // this Table is used for Liano/Ontario APU typedef struct _ATOM_FUSION_SYSTEM_INFO_V1 { - ATOM_INTEGRATED_SYSTEM_INFO_V6 sIntegratedSysInfo; - ULONG ulPowerplayTable[128]; -}ATOM_FUSION_SYSTEM_INFO_V1; + ATOM_INTEGRATED_SYSTEM_INFO_V6 sIntegratedSysInfo; + ULONG ulPowerplayTable[128]; +}ATOM_FUSION_SYSTEM_INFO_V1; typedef struct _ATOM_TDP_CONFIG_BITS @@ -4980,8 +4980,8 @@ typedef union _ATOM_TDP_CONFIG /********************************************************************************************************************** ATOM_FUSION_SYSTEM_INFO_V1 Description sIntegratedSysInfo: refer to ATOM_INTEGRATED_SYSTEM_INFO_V6 definition. -ulPowerplayTable[128]: This 512 bytes memory is used to save ATOM_PPLIB_POWERPLAYTABLE3, starting form ulPowerplayTable[0] -**********************************************************************************************************************/ +ulPowerplayTable[128]: This 512 bytes memory is used to save ATOM_PPLIB_POWERPLAYTABLE3, starting form ulPowerplayTable[0] +**********************************************************************************************************************/ // this IntegrateSystemInfoTable is used for Trinity APU typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_7 @@ -4999,14 +4999,14 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_7 UCHAR ucHtcTmpLmt; UCHAR ucHtcHystLmt; ULONG ulMinEngineClock; - ULONG ulSystemConfig; + ULONG ulSystemConfig; ULONG ulCPUCapInfo; - USHORT usNBP0Voltage; + USHORT usNBP0Voltage; USHORT usNBP1Voltage; - USHORT usBootUpNBVoltage; + USHORT usBootUpNBVoltage; USHORT usExtDispConnInfoOffset; - USHORT usPanelRefreshRateRange; - UCHAR ucMemoryType; + USHORT usPanelRefreshRateRange; + UCHAR ucMemoryType; UCHAR ucUMAChannelNumber; UCHAR strVBIOSMsg[40]; ATOM_TDP_CONFIG asTdpConfig; @@ -5027,10 +5027,10 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_7 USHORT usDVISSpreadRateIn10Hz; ULONG SclkDpmBoostMargin; ULONG SclkDpmThrottleMargin; - USHORT SclkDpmTdpLimitPG; + USHORT SclkDpmTdpLimitPG; USHORT SclkDpmTdpLimitBoost; ULONG ulBoostEngineCLock; - UCHAR ulBoostVid_2bit; + UCHAR ulBoostVid_2bit; UCHAR EnableBoost; USHORT GnbTdpLimit; USHORT usMaxLVDSPclkFreqInSingleLink; @@ -5046,7 +5046,7 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_7 UCHAR ucMinAllowedBL_Level; ULONG ulLCDBitDepthControlVal; ULONG ulNbpStateMemclkFreq[4]; - USHORT usNBP2Voltage; + USHORT usNBP2Voltage; USHORT usNBP3Voltage; ULONG ulNbpStateNClkFreq[4]; UCHAR ucNBDPMEnable; @@ -5077,21 +5077,21 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_7 /********************************************************************************************************************** ATOM_INTEGRATED_SYSTEM_INFO_V1_7 Description ulBootUpEngineClock: VBIOS bootup Engine clock frequency, in 10kHz unit. if it is equal 0, then VBIOS use pre-defined bootup engine clock -ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. -ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. +ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. +ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. sDISPCLK_Voltage: Report Display clock voltage requirement. - + ulBootUpReqDisplayVector: VBIOS boot up display IDs, following are supported devices in Trinity projects: ATOM_DEVICE_CRT1_SUPPORT 0x0001 - ATOM_DEVICE_DFP1_SUPPORT 0x0008 - ATOM_DEVICE_DFP6_SUPPORT 0x0040 - ATOM_DEVICE_DFP2_SUPPORT 0x0080 - ATOM_DEVICE_DFP3_SUPPORT 0x0200 - ATOM_DEVICE_DFP4_SUPPORT 0x0400 + ATOM_DEVICE_DFP1_SUPPORT 0x0008 + ATOM_DEVICE_DFP6_SUPPORT 0x0040 + ATOM_DEVICE_DFP2_SUPPORT 0x0080 + ATOM_DEVICE_DFP3_SUPPORT 0x0200 + ATOM_DEVICE_DFP4_SUPPORT 0x0400 ATOM_DEVICE_DFP5_SUPPORT 0x0800 ATOM_DEVICE_LCD1_SUPPORT 0x0002 -ulOtherDisplayMisc: bit[0]=0: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is not supported by SBIOS. - =1: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is supported by SBIOS. +ulOtherDisplayMisc: bit[0]=0: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is not supported by SBIOS. + =1: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is supported by SBIOS. bit[1]=0: INT15 callback function Get boot display( ax=4e08, bl=01h) is not supported by SBIOS =1: INT15 callback function Get boot display( ax=4e08, bl=01h) is supported by SBIOS bit[2]=0: INT15 callback function Get panel Expansion ( ax=4e08, bl=02h) is not supported by SBIOS @@ -5104,42 +5104,42 @@ ulGPUCapInfo: bit[0]=0: TMDS/HDMI Coherent Mode use cascade =1: DP mode use single PLL mode bit[3]=0: Enable AUX HW mode detection logic =1: Disable AUX HW mode detection logic - + ulSB_MMIO_Base_Addr: Physical Base address to SB MMIO space. Driver needs to initialize it for SMU usage. -usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). +usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). Any attempt to change BL using VBIOS function or enable VariBri from PP table is not effective since ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==0; - + When it's set to a non-zero frequency, the BackLight is controlled by GPU (SW) in one of two ways below: 1. SW uses the GPU BL PWM output to control the BL, in chis case, this non-zero frequency determines what freq GPU should use; VBIOS will set up proper PWM frequency and ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1,as the result, - Changing BL using VBIOS function is functional in both driver and non-driver present environment; + Changing BL using VBIOS function is functional in both driver and non-driver present environment; and enabling VariBri under the driver environment from PP table is optional. 2. SW uses other means to control BL (like DPCD),this non-zero frequency serves as a flag only indicating that BL control from GPU is expected. VBIOS will NOT set up PWM frequency but make ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1 Changing BL using VBIOS function could be functional in both driver and non-driver present environment,but - it's per platform + it's per platform and enabling VariBri under the driver environment from PP table is optional. -ucHtcTmpLmt: Refer to D18F3x64 bit[22:16], HtcTmpLmt. +ucHtcTmpLmt: Refer to D18F3x64 bit[22:16], HtcTmpLmt. Threshold on value to enter HTC_active state. -ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. +ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. To calculate threshold off value to exit HTC_active state, which is Threshold on vlaue minus ucHtcHystLmt. ulMinEngineClock: Minimum SCLK allowed in 10kHz unit. This is calculated based on WRCK Fuse settings. -ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled +ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled =1: PCIE Power Gating Enabled Bit[1]=0: DDR-DLL shut-down feature disabled. 1: DDR-DLL shut-down feature enabled. Bit[2]=0: DDR-PLL Power down feature disabled. - 1: DDR-PLL Power down feature enabled. + 1: DDR-PLL Power down feature enabled. ulCPUCapInfo: TBD usNBP0Voltage: VID for voltage on NB P0 State -usNBP1Voltage: VID for voltage on NB P1 State +usNBP1Voltage: VID for voltage on NB P1 State usNBP2Voltage: VID for voltage on NB P2 State -usNBP3Voltage: VID for voltage on NB P3 State -usBootUpNBVoltage: Voltage Index of GNB voltage configured by SBIOS, which is sufficient to support VBIOS DISPCLK requirement. +usNBP3Voltage: VID for voltage on NB P3 State +usBootUpNBVoltage: Voltage Index of GNB voltage configured by SBIOS, which is suffcient to support VBIOS DISPCLK requirement. usExtDispConnInfoOffset: Offset to sExtDispConnInfo inside the structure usPanelRefreshRateRange: Bit vector for LCD supported refresh rate range. If DRR is requestd by the platform, at least two bits need to be set to indicate a range. @@ -5148,24 +5148,24 @@ usPanelRefreshRateRange: Bit vector for LCD supported refresh rate rang SUPPORTED_LCD_REFRESHRATE_50Hz 0x0010 SUPPORTED_LCD_REFRESHRATE_60Hz 0x0020 ucMemoryType: [3:0]=1:DDR1;=2:DDR2;=3:DDR3.[7:4] is reserved. -ucUMAChannelNumber: System memory channel numbers. +ucUMAChannelNumber: System memory channel numbers. ulCSR_M3_ARB_CNTL_DEFAULT[10]: Arrays with values for CSR M3 arbiter for default ulCSR_M3_ARB_CNTL_UVD[10]: Arrays with values for CSR M3 arbiter for UVD playback. ulCSR_M3_ARB_CNTL_FS3D[10]: Arrays with values for CSR M3 arbiter for Full Screen 3D applications. -sAvail_SCLK[5]: Arrays to provide available list of SLCK and corresponding voltage, order from low to high -ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. -ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calculate data reconnection latency. Unit in 10kHz. +sAvail_SCLK[5]: Arrays to provide availabe list of SLCK and corresponding voltage, order from low to high +ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. +ulMinimumNClk: Minimum NCLK speed among all NB-Pstates to calcualte data reconnection latency. Unit in 10kHz. ulIdleNClk: NCLK speed while memory runs in self-refresh state. Unit in 10kHz. ulDDR_DLL_PowerUpTime: DDR PHY DLL power up time. Unit in ns. ulDDR_PLL_PowerUpTime: DDR PHY PLL power up time. Unit in ns. usPCIEClkSSPercentage: PCIE Clock Spread Spectrum Percentage in unit 0.01%; 100 mean 1%. usPCIEClkSSType: PCIE Clock Spread Spectrum Type. 0 for Down spread(default); 1 for Center spread. -usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. -usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. +usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. usMaxLVDSPclkFreqInSingleLink: Max pixel clock LVDS panel single link, if=0 means VBIOS use default threhold, right now it is 85Mhz ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 panel in LDI mode, =1: LVDS 888 panel in FPDI mode [bit1] LVDS panel lower and upper link mapping =0: lower link and upper link not swap, =1: lower link and upper link are swapped @@ -5173,40 +5173,40 @@ ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 pan [bit3] LVDS parameter override enable =0: ucLvdsMisc parameter are not used =1: ucLvdsMisc parameter should be used [bit4] Polarity of signal sent to digital BLON output pin. =0: not inverted(active high) =1: inverted ( active low ) [bit5] Travid LVDS output voltage override enable, when =1, use ucTravisLVDSVolAdjust value to overwrite Traivs register LVDS_CTRL_4 -ucTravisLVDSVolAdjust When ucLVDSMisc[5]=1,it means platform SBIOS want to overwrite TravisLVDSVoltage. Then VBIOS will use ucTravisLVDSVolAdjust +ucTravisLVDSVolAdjust When ucLVDSMisc[5]=1,it means platform SBIOS want to overwrite TravisLVDSVoltage. Then VBIOS will use ucTravisLVDSVolAdjust value to program Travis register LVDS_CTRL_4 ucLVDSPwrOnSeqDIGONtoDE_in4Ms: LVDS power up sequence time in unit of 4ms, time delay from DIGON signal active to data enable signal active( DE ). - =0 mean use VBIOS default which is 8 ( 32ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. + =0 mean use VBIOS default which is 8 ( 32ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOnDEtoVARY_BL_in4Ms: LVDS power up sequence time in unit of 4ms., time delay from DE( data enable ) active to Vary Brightness enable signal active( VARY_BL ). - =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. +ucLVDSPwrOnDEtoVARY_BL_in4Ms: LVDS power up sequence time in unit of 4ms., time delay from DE( data enable ) active to Vary Brightness enable signal active( VARY_BL ). + =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffVARY_BLtoDE_in4Ms: LVDS power down sequence time in unit of 4ms, time delay from data enable ( DE ) signal off to LCDVCC (DIGON) off. +ucLVDSPwrOffVARY_BLtoDE_in4Ms: LVDS power down sequence time in unit of 4ms, time delay from data enable ( DE ) signal off to LCDVCC (DIGON) off. =0 mean use VBIOS default delay which is 8 ( 32ms ). The LVDS power down sequence is as following: BLON->VARY_BL->DE->DIGON This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffDEtoDIGON_in4Ms: LVDS power down sequence time in unit of 4ms, time delay from vary brightness enable signal( VARY_BL) off to data enable ( DE ) signal off. +ucLVDSPwrOffDEtoDIGON_in4Ms: LVDS power down sequence time in unit of 4ms, time delay from vary brightness enable signal( VARY_BL) off to data enable ( DE ) signal off. =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power down sequence is as following: BLON->VARY_BL->DE->DIGON This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSOffToOnDelay_in4Ms: LVDS power down sequence time in unit of 4ms. Time delay from DIGON signal off to DIGON signal active. +ucLVDSOffToOnDelay_in4Ms: LVDS power down sequence time in unit of 4ms. Time delay from DIGON signal off to DIGON signal active. =0 means to use VBIOS default delay which is 125 ( 500ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. ucLVDSPwrOnSeqVARY_BLtoBLON_in4Ms: - LVDS power up sequence time in unit of 4ms. Time delay from VARY_BL signal on to DLON signal active. + LVDS power up sequence time in unit of 4ms. Time delay from VARY_BL signal on to DLON signal active. =0 means to use VBIOS default delay which is 0 ( 0ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffSeqBLONtoVARY_BL_in4Ms: - LVDS power down sequence time in unit of 4ms. Time delay from BLON signal off to VARY_BL signal off. +ucLVDSPwrOffSeqBLONtoVARY_BL_in4Ms: + LVDS power down sequence time in unit of 4ms. Time delay from BLON signal off to VARY_BL signal off. =0 means to use VBIOS default delay which is 0 ( 0ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucMinAllowedBL_Level: Lowest LCD backlight PWM level. This is customer platform specific parameters. By default it is 0. +ucMinAllowedBL_Level: Lowest LCD backlight PWM level. This is customer platform specific parameters. By default it is 0. -ulNbpStateMemclkFreq[4]: system memory clock frequency in unit of 10Khz in different NB pstate. +ulNbpStateMemclkFreq[4]: system memory clock frequncey in unit of 10Khz in different NB pstate. **********************************************************************************************************************/ @@ -5226,13 +5226,13 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_8 UCHAR ucHtcTmpLmt; UCHAR ucHtcHystLmt; ULONG ulReserved2; - ULONG ulSystemConfig; + ULONG ulSystemConfig; ULONG ulCPUCapInfo; ULONG ulReserved3; USHORT usGPUReservedSysMemSize; USHORT usExtDispConnInfoOffset; - USHORT usPanelRefreshRateRange; - UCHAR ucMemoryType; + USHORT usPanelRefreshRateRange; + UCHAR ucMemoryType; UCHAR ucUMAChannelNumber; UCHAR strVBIOSMsg[40]; ATOM_TDP_CONFIG asTdpConfig; @@ -5267,21 +5267,21 @@ typedef struct _ATOM_INTEGRATED_SYSTEM_INFO_V1_8 UCHAR ucMinAllowedBL_Level; ULONG ulLCDBitDepthControlVal; ULONG ulNbpStateMemclkFreq[4]; - ULONG ulReserved6; + ULONG ulReserved6; ULONG ulNbpStateNClkFreq[4]; - USHORT usNBPStateVoltage[4]; - USHORT usBootUpNBVoltage; - USHORT usReserved2; + USHORT usNBPStateVoltage[4]; + USHORT usBootUpNBVoltage; + USHORT usReserved2; ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO sExtDispConnInfo; }ATOM_INTEGRATED_SYSTEM_INFO_V1_8; /********************************************************************************************************************** ATOM_INTEGRATED_SYSTEM_INFO_V1_8 Description ulBootUpEngineClock: VBIOS bootup Engine clock frequency, in 10kHz unit. if it is equal 0, then VBIOS use pre-defined bootup engine clock -ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. -ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. +ulDentistVCOFreq: Dentist VCO clock in 10kHz unit. +ulBootUpUMAClock: System memory boot up clock frequency in 10Khz unit. sDISPCLK_Voltage: Report Display clock frequency requirement on GNB voltage(up to 4 voltage levels). - + ulBootUpReqDisplayVector: VBIOS boot up display IDs, following are supported devices in Trinity projects: ATOM_DEVICE_CRT1_SUPPORT 0x0001 ATOM_DEVICE_DFP1_SUPPORT 0x0008 @@ -5292,8 +5292,8 @@ ulBootUpReqDisplayVector: VBIOS boot up display IDs, following are suppo ATOM_DEVICE_DFP5_SUPPORT 0x0800 ATOM_DEVICE_LCD1_SUPPORT 0x0002 -ulVBIOSMisc: Miscellenous flags for VBIOS requirement and interface - bit[0]=0: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is not supported by SBIOS. +ulVBIOSMisc: Miscellenous flags for VBIOS requirement and interface + bit[0]=0: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is not supported by SBIOS. =1: INT15 callback function Get LCD EDID ( ax=4e08, bl=1b ) is supported by SBIOS. bit[1]=0: INT15 callback function Get boot display( ax=4e08, bl=01h) is not supported by SBIOS =1: INT15 callback function Get boot display( ax=4e08, bl=01h) is supported by SBIOS @@ -5308,38 +5308,38 @@ ulGPUCapInfo: bit[0~2]= Reserved bit[4]=0: Disable DFS bypass feature =1: Enable DFS bypass feature -usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). +usRequestedPWMFreqInHz: When it's set to 0x0 by SBIOS: the LCD BackLight is not controlled by GPU(SW). Any attempt to change BL using VBIOS function or enable VariBri from PP table is not effective since ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==0; - + When it's set to a non-zero frequency, the BackLight is controlled by GPU (SW) in one of two ways below: - 1. SW uses the GPU BL PWM output to control the BL, in this case, this non-zero frequency determines what freq GPU should use; + 1. SW uses the GPU BL PWM output to control the BL, in chis case, this non-zero frequency determines what freq GPU should use; VBIOS will set up proper PWM frequency and ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1,as the result, - Changing BL using VBIOS function is functional in both driver and non-driver present environment; + Changing BL using VBIOS function is functional in both driver and non-driver present environment; and enabling VariBri under the driver environment from PP table is optional. 2. SW uses other means to control BL (like DPCD),this non-zero frequency serves as a flag only indicating that BL control from GPU is expected. VBIOS will NOT set up PWM frequency but make ATOM_BIOS_INFO_BL_CONTROLLED_BY_GPU==1 Changing BL using VBIOS function could be functional in both driver and non-driver present environment,but - it's per platform + it's per platform and enabling VariBri under the driver environment from PP table is optional. ucHtcTmpLmt: Refer to D18F3x64 bit[22:16], HtcTmpLmt. Threshold on value to enter HTC_active state. -ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. - To calculate threshold off value to exit HTC_active state, which is Threshold on value minus ucHtcHystLmt. +ucHtcHystLmt: Refer to D18F3x64 bit[27:24], HtcHystLmt. + To calculate threshold off value to exit HTC_active state, which is Threshold on vlaue minus ucHtcHystLmt. -ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled +ulSystemConfig: Bit[0]=0: PCIE Power Gating Disabled =1: PCIE Power Gating Enabled Bit[1]=0: DDR-DLL shut-down feature disabled. 1: DDR-DLL shut-down feature enabled. Bit[2]=0: DDR-PLL Power down feature disabled. - 1: DDR-PLL Power down feature enabled. + 1: DDR-PLL Power down feature enabled. Bit[3]=0: GNB DPM is disabled - =1: GNB DPM is enabled + =1: GNB DPM is enabled ulCPUCapInfo: TBD usExtDispConnInfoOffset: Offset to sExtDispConnInfo inside the structure -usPanelRefreshRateRange: Bit vector for LCD supported refresh rate range. If DRR is requested by the platform, at least two bits need to be set +usPanelRefreshRateRange: Bit vector for LCD supported refresh rate range. If DRR is requestd by the platform, at least two bits need to be set to indicate a range. SUPPORTED_LCD_REFRESHRATE_30Hz 0x0004 SUPPORTED_LCD_REFRESHRATE_40Hz 0x0008 @@ -5347,29 +5347,29 @@ usPanelRefreshRateRange: Bit vector for LCD supported refresh rate rang SUPPORTED_LCD_REFRESHRATE_60Hz 0x0020 ucMemoryType: [3:0]=1:DDR1;=2:DDR2;=3:DDR3;=5:GDDR5; [7:4] is reserved. -ucUMAChannelNumber: System memory channel numbers. +ucUMAChannelNumber: System memory channel numbers. -strVBIOSMsg[40]: VBIOS boot up customized message string +strVBIOSMsg[40]: VBIOS boot up customized message string -sAvail_SCLK[5]: Arrays to provide available list of SLCK and corresponding voltage, order from low to high +sAvail_SCLK[5]: Arrays to provide availabe list of SLCK and corresponding voltage, order from low to high -ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. +ulGMCRestoreResetTime: GMC power restore and GMC reset time to calculate data reconnection latency. Unit in ns. ulIdleNClk: NCLK speed while memory runs in self-refresh state, used to calculate self-refresh latency. Unit in 10kHz. ulDDR_DLL_PowerUpTime: DDR PHY DLL power up time. Unit in ns. ulDDR_PLL_PowerUpTime: DDR PHY PLL power up time. Unit in ns. usPCIEClkSSPercentage: PCIE Clock Spread Spectrum Percentage in unit 0.01%; 100 mean 1%. usPCIEClkSSType: PCIE Clock Spread Spectrum Type. 0 for Down spread(default); 1 for Center spread. -usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. -usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. -usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. -usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usLvdsSSPercentage: LVDS panel ( not include eDP ) Spread Spectrum Percentage in unit of 0.01%, =0, use VBIOS default setting. +usLvdsSSpreadRateIn10Hz: LVDS panel ( not include eDP ) Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usHDMISSPercentage: HDMI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usHDMISSpreadRateIn10Hz: HDMI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. +usDVISSPercentage: DVI Spread Spectrum Percentage in unit 0.01%; 100 mean 1%, =0, use VBIOS default setting. +usDVISSpreadRateIn10Hz: DVI Spread Spectrum frequency in unit of 10Hz, =0, use VBIOS default setting. usGPUReservedSysMemSize: Reserved system memory size for ACP engine in APU GNB, units in MB. 0/2/4MB based on CMOS options, current default could be 0MB. KV only, not on KB. -ulGPUReservedSysMemBaseAddrLo: Low 32 bits base address to the reserved system memory. -ulGPUReservedSysMemBaseAddrHi: High 32 bits base address to the reserved system memory. +ulGPUReservedSysMemBaseAddrLo: Low 32 bits base address to the reserved system memory. +ulGPUReservedSysMemBaseAddrHi: High 32 bits base address to the reserved system memory. usMaxLVDSPclkFreqInSingleLink: Max pixel clock LVDS panel single link, if=0 means VBIOS use default threhold, right now it is 85Mhz ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 panel in LDI mode, =1: LVDS 888 panel in FPDI mode @@ -5378,45 +5378,45 @@ ucLVDSMisc: [bit0] LVDS 888bit panel mode =0: LVDS 888 pan [bit3] LVDS parameter override enable =0: ucLvdsMisc parameter are not used =1: ucLvdsMisc parameter should be used [bit4] Polarity of signal sent to digital BLON output pin. =0: not inverted(active high) =1: inverted ( active low ) [bit5] Travid LVDS output voltage override enable, when =1, use ucTravisLVDSVolAdjust value to overwrite Traivs register LVDS_CTRL_4 -ucTravisLVDSVolAdjust When ucLVDSMisc[5]=1,it means platform SBIOS want to overwrite TravisLVDSVoltage. Then VBIOS will use ucTravisLVDSVolAdjust +ucTravisLVDSVolAdjust When ucLVDSMisc[5]=1,it means platform SBIOS want to overwrite TravisLVDSVoltage. Then VBIOS will use ucTravisLVDSVolAdjust value to program Travis register LVDS_CTRL_4 -ucLVDSPwrOnSeqDIGONtoDE_in4Ms: +ucLVDSPwrOnSeqDIGONtoDE_in4Ms: LVDS power up sequence time in unit of 4ms, time delay from DIGON signal active to data enable signal active( DE ). - =0 mean use VBIOS default which is 8 ( 32ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. + =0 mean use VBIOS default which is 8 ( 32ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOnDEtoVARY_BL_in4Ms: - LVDS power up sequence time in unit of 4ms., time delay from DE( data enable ) active to Vary Brightness enable signal active( VARY_BL ). - =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. +ucLVDSPwrOnDEtoVARY_BL_in4Ms: + LVDS power up sequence time in unit of 4ms., time delay from DE( data enable ) active to Vary Brightness enable signal active( VARY_BL ). + =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power up sequence is as following: DIGON->DE->VARY_BL->BLON. This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffVARY_BLtoDE_in4Ms: - LVDS power down sequence time in unit of 4ms, time delay from data enable ( DE ) signal off to LCDVCC (DIGON) off. +ucLVDSPwrOffVARY_BLtoDE_in4Ms: + LVDS power down sequence time in unit of 4ms, time delay from data enable ( DE ) signal off to LCDVCC (DIGON) off. =0 mean use VBIOS default delay which is 8 ( 32ms ). The LVDS power down sequence is as following: BLON->VARY_BL->DE->DIGON This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffDEtoDIGON_in4Ms: - LVDS power down sequence time in unit of 4ms, time delay from vary brightness enable signal( VARY_BL) off to data enable ( DE ) signal off. +ucLVDSPwrOffDEtoDIGON_in4Ms: + LVDS power down sequence time in unit of 4ms, time delay from vary brightness enable signal( VARY_BL) off to data enable ( DE ) signal off. =0 mean use VBIOS default which is 90 ( 360ms ). The LVDS power down sequence is as following: BLON->VARY_BL->DE->DIGON This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSOffToOnDelay_in4Ms: - LVDS power down sequence time in unit of 4ms. Time delay from DIGON signal off to DIGON signal active. +ucLVDSOffToOnDelay_in4Ms: + LVDS power down sequence time in unit of 4ms. Time delay from DIGON signal off to DIGON signal active. =0 means to use VBIOS default delay which is 125 ( 500ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. ucLVDSPwrOnSeqVARY_BLtoBLON_in4Ms: - LVDS power up sequence time in unit of 4ms. Time delay from VARY_BL signal on to DLON signal active. + LVDS power up sequence time in unit of 4ms. Time delay from VARY_BL signal on to DLON signal active. =0 means to use VBIOS default delay which is 0 ( 0ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucLVDSPwrOffSeqBLONtoVARY_BL_in4Ms: - LVDS power down sequence time in unit of 4ms. Time delay from BLON signal off to VARY_BL signal off. +ucLVDSPwrOffSeqBLONtoVARY_BL_in4Ms: + LVDS power down sequence time in unit of 4ms. Time delay from BLON signal off to VARY_BL signal off. =0 means to use VBIOS default delay which is 0 ( 0ms ). This parameter is used by VBIOS only. VBIOS will patch LVDS_InfoTable. -ucMinAllowedBL_Level: Lowest LCD backlight PWM level. This is customer platform specific parameters. By default it is 0. +ucMinAllowedBL_Level: Lowest LCD backlight PWM level. This is customer platform specific parameters. By default it is 0. ulLCDBitDepthControlVal: GPU display control encoder bit dither control setting, used to program register mmFMT_BIT_DEPTH_CONTROL ulNbpStateMemclkFreq[4]: system memory clock frequncey in unit of 10Khz in different NB P-State(P0, P1, P2 & P3). ulNbpStateNClkFreq[4]: NB P-State NClk frequency in different NB P-State usNBPStateVoltage[4]: NB P-State (P0/P1 & P2/P3) voltage; NBP3 refers to lowes voltage -usBootUpNBVoltage: NB P-State voltage during boot up before driver loaded +usBootUpNBVoltage: NB P-State voltage during boot up before driver loaded sExtDispConnInfo: Display connector information table provided to VBIOS **********************************************************************************************************************/ @@ -5426,7 +5426,7 @@ typedef struct _ATOM_FUSION_SYSTEM_INFO_V2 { ATOM_INTEGRATED_SYSTEM_INFO_V1_8 sIntegratedSysInfo; // refer to ATOM_INTEGRATED_SYSTEM_INFO_V1_8 definition ULONG ulPowerplayTable[128]; // Update comments here to link new powerplay table definition structure -}ATOM_FUSION_SYSTEM_INFO_V2; +}ATOM_FUSION_SYSTEM_INFO_V2; /**************************************************************************/ @@ -5451,13 +5451,13 @@ typedef struct _ATOM_I2C_DEVICE_SETUP_INFO UCHAR ucSSChipID; //SS chip being used UCHAR ucSSChipSlaveAddr; //Slave Address to set up this SS chip UCHAR ucNumOfI2CDataRecords; //number of data block - ATOM_I2C_DATA_RECORD asI2CData[1]; + ATOM_I2C_DATA_RECORD asI2CData[1]; }ATOM_I2C_DEVICE_SETUP_INFO; //========================================================================================== typedef struct _ATOM_ASIC_MVDD_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_I2C_DEVICE_SETUP_INFO asI2CSetup[1]; }ATOM_ASIC_MVDD_INFO; @@ -5513,14 +5513,14 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT_V2 typedef struct _ATOM_ASIC_INTERNAL_SS_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_ASIC_SS_ASSIGNMENT asSpreadSpectrum[4]; }ATOM_ASIC_INTERNAL_SS_INFO; typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V2 { - ATOM_COMMON_TABLE_HEADER sHeader; - ATOM_ASIC_SS_ASSIGNMENT_V2 asSpreadSpectrum[1]; //this is point only. + ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_ASIC_SS_ASSIGNMENT_V2 asSpreadSpectrum[1]; //this is point only. }ATOM_ASIC_INTERNAL_SS_INFO_V2; typedef struct _ATOM_ASIC_SS_ASSIGNMENT_V3 @@ -5541,8 +5541,8 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT_V3 typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 { - ATOM_COMMON_TABLE_HEADER sHeader; - ATOM_ASIC_SS_ASSIGNMENT_V3 asSpreadSpectrum[1]; //this is pointer only. + ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_ASIC_SS_ASSIGNMENT_V3 asSpreadSpectrum[1]; //this is pointer only. }ATOM_ASIC_INTERNAL_SS_INFO_V3; @@ -5559,7 +5559,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define ATOM_I2C_CHANNEL_STATUS1_DEF 9 #define ATOM_INTERNAL_TIMER_DEF 10 -// BIOS_0_SCRATCH Definition +// BIOS_0_SCRATCH Definition #define ATOM_S0_CRT1_MONO 0x00000001L #define ATOM_S0_CRT1_COLOR 0x00000002L #define ATOM_S0_CRT1_MASK (ATOM_S0_CRT1_MONO+ATOM_S0_CRT1_COLOR) @@ -5597,14 +5597,14 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define ATOM_S0_DFP_MASK ATOM_S0_DFP1 | ATOM_S0_DFP2 | ATOM_S0_DFP3 | ATOM_S0_DFP4 | ATOM_S0_DFP5 | ATOM_S0_DFP6 -#define ATOM_S0_FAD_REGISTER_BUG 0x02000000L // If set, indicates we are running a PCIE asic with +#define ATOM_S0_FAD_REGISTER_BUG 0x02000000L // If set, indicates we are running a PCIE asic with // the FAD/HDP reg access bug. Bit is read by DAL, this is obsolete from RV5xx #define ATOM_S0_THERMAL_STATE_MASK 0x1C000000L #define ATOM_S0_THERMAL_STATE_SHIFT 26 #define ATOM_S0_SYSTEM_POWER_STATE_MASK 0xE0000000L -#define ATOM_S0_SYSTEM_POWER_STATE_SHIFT 29 +#define ATOM_S0_SYSTEM_POWER_STATE_SHIFT 29 #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_AC 1 #define ATOM_S0_SYSTEM_POWER_STATE_VALUE_DC 2 @@ -5853,11 +5853,11 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define ATOM_S6_LID_STATEb0 0x40 #define ATOM_S6_DOCK_STATEb0 0x80 #define ATOM_S6_CRITICAL_STATEb1 0x01 -#define ATOM_S6_HW_I2C_BUSY_STATEb1 0x02 +#define ATOM_S6_HW_I2C_BUSY_STATEb1 0x02 #define ATOM_S6_THERMAL_STATE_CHANGEb1 0x04 #define ATOM_S6_INTERRUPT_SET_BY_BIOSb1 0x08 -#define ATOM_S6_REQ_LCD_EXPANSION_FULLb1 0x10 -#define ATOM_S6_REQ_LCD_EXPANSION_ASPEC_RATIOb1 0x20 +#define ATOM_S6_REQ_LCD_EXPANSION_FULLb1 0x10 +#define ATOM_S6_REQ_LCD_EXPANSION_ASPEC_RATIOb1 0x20 #define ATOM_S6_ACC_REQ_CRT1b2 0x01 #define ATOM_S6_ACC_REQ_LCD1b2 0x02 @@ -5915,26 +5915,26 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 // BIOS_8_SCRATCH Definition #define ATOM_S8_I2C_CHANNEL_BUSY_MASK 0x00000FFFF -#define ATOM_S8_I2C_HW_ENGINE_BUSY_MASK 0x0FFFF0000 +#define ATOM_S8_I2C_HW_ENGINE_BUSY_MASK 0x0FFFF0000 #define ATOM_S8_I2C_CHANNEL_BUSY_SHIFT 0 #define ATOM_S8_I2C_ENGINE_BUSY_SHIFT 16 // BIOS_9_SCRATCH Definition -#ifndef ATOM_S9_I2C_CHANNEL_COMPLETED_MASK +#ifndef ATOM_S9_I2C_CHANNEL_COMPLETED_MASK #define ATOM_S9_I2C_CHANNEL_COMPLETED_MASK 0x0000FFFF #endif -#ifndef ATOM_S9_I2C_CHANNEL_ABORTED_MASK +#ifndef ATOM_S9_I2C_CHANNEL_ABORTED_MASK #define ATOM_S9_I2C_CHANNEL_ABORTED_MASK 0xFFFF0000 #endif -#ifndef ATOM_S9_I2C_CHANNEL_COMPLETED_SHIFT +#ifndef ATOM_S9_I2C_CHANNEL_COMPLETED_SHIFT #define ATOM_S9_I2C_CHANNEL_COMPLETED_SHIFT 0 #endif -#ifndef ATOM_S9_I2C_CHANNEL_ABORTED_SHIFT +#ifndef ATOM_S9_I2C_CHANNEL_ABORTED_SHIFT #define ATOM_S9_I2C_CHANNEL_ABORTED_SHIFT 16 #endif - + #define ATOM_FLAG_SET 0x20 #define ATOM_FLAG_CLEAR 0 #define CLEAR_ATOM_S6_ACC_MODE ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_ACC_MODE_SHIFT | ATOM_FLAG_CLEAR) @@ -5957,7 +5957,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define SET_ATOM_S6_CRITICAL_STATE ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_CRITICAL_STATE_SHIFT | ATOM_FLAG_SET) #define CLEAR_ATOM_S6_CRITICAL_STATE ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_CRITICAL_STATE_SHIFT | ATOM_FLAG_CLEAR) -#define SET_ATOM_S6_REQ_SCALER ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_REQ_SCALER_SHIFT | ATOM_FLAG_SET) +#define SET_ATOM_S6_REQ_SCALER ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_REQ_SCALER_SHIFT | ATOM_FLAG_SET) #define CLEAR_ATOM_S6_REQ_SCALER ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_REQ_SCALER_SHIFT | ATOM_FLAG_CLEAR ) #define SET_ATOM_S6_REQ_SCALER_ARATIO ((ATOM_ACC_CHANGE_INFO_DEF << 8 )|ATOM_S6_REQ_SCALER_ARATIO_SHIFT | ATOM_FLAG_SET ) @@ -5972,7 +5972,7 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define SET_ATOM_S7_DOS_8BIT_DAC_EN ((ATOM_DOS_MODE_INFO_DEF << 8 )|ATOM_S7_DOS_8BIT_DAC_EN_SHIFT | ATOM_FLAG_SET ) #define CLEAR_ATOM_S7_DOS_8BIT_DAC_EN ((ATOM_DOS_MODE_INFO_DEF << 8 )|ATOM_S7_DOS_8BIT_DAC_EN_SHIFT | ATOM_FLAG_CLEAR ) -/****************************************************************************/ +/****************************************************************************/ //Portion II: Definitions only used in Driver /****************************************************************************/ @@ -5992,8 +5992,8 @@ typedef struct _ATOM_ASIC_INTERNAL_SS_INFO_V3 #define GET_DATA_TABLE_MAJOR_REVISION GET_COMMAND_TABLE_COMMANDSET_REVISION #define GET_DATA_TABLE_MINOR_REVISION GET_COMMAND_TABLE_PARAMETER_REVISION -/****************************************************************************/ -//Portion III: Definitions only used in VBIOS +/****************************************************************************/ +//Portion III: Definitinos only used in VBIOS /****************************************************************************/ #define ATOM_DAC_SRC 0x80 #define ATOM_SRC_DAC1 0 @@ -6011,13 +6011,13 @@ typedef struct _MEMORY_PLLINIT_PARAMETERS #define MEMORY_PLLINIT_PS_ALLOCATION MEMORY_PLLINIT_PARAMETERS -#define GPIO_PIN_WRITE 0x01 +#define GPIO_PIN_WRITE 0x01 #define GPIO_PIN_READ 0x00 typedef struct _GPIO_PIN_CONTROL_PARAMETERS { UCHAR ucGPIO_ID; //return value, read from GPIO pins - UCHAR ucGPIOBitShift; //define which bit in uGPIOBitVal need to be update + UCHAR ucGPIOBitShift; //define which bit in uGPIOBitVal need to be update UCHAR ucGPIOBitVal; //Set/Reset corresponding bit defined in ucGPIOBitMask UCHAR ucAction; //=GPIO_PIN_WRITE: Read; =GPIO_PIN_READ: Write }GPIO_PIN_CONTROL_PARAMETERS; @@ -6026,10 +6026,10 @@ typedef struct _ENABLE_SCALER_PARAMETERS { UCHAR ucScaler; // ATOM_SCALER1, ATOM_SCALER2 UCHAR ucEnable; // ATOM_SCALER_DISABLE or ATOM_SCALER_CENTER or ATOM_SCALER_EXPANSION - UCHAR ucTVStandard; // + UCHAR ucTVStandard; // UCHAR ucPadding[1]; -}ENABLE_SCALER_PARAMETERS; -#define ENABLE_SCALER_PS_ALLOCATION ENABLE_SCALER_PARAMETERS +}ENABLE_SCALER_PARAMETERS; +#define ENABLE_SCALER_PS_ALLOCATION ENABLE_SCALER_PARAMETERS //ucEnable: #define SCALER_BYPASS_AUTO_CENTER_NO_REPLICATION 0 @@ -6049,14 +6049,14 @@ typedef struct _ENABLE_HARDWARE_ICON_CURSOR_PARAMETERS typedef struct _ENABLE_HARDWARE_ICON_CURSOR_PS_ALLOCATION { ENABLE_HARDWARE_ICON_CURSOR_PARAMETERS sEnableIcon; - ENABLE_CRTC_PARAMETERS sReserved; + ENABLE_CRTC_PARAMETERS sReserved; }ENABLE_HARDWARE_ICON_CURSOR_PS_ALLOCATION; typedef struct _ENABLE_GRAPH_SURFACE_PARAMETERS { USHORT usHight; // Image Hight USHORT usWidth; // Image Width - UCHAR ucSurface; // Surface 1 or 2 + UCHAR ucSurface; // Surface 1 or 2 UCHAR ucPadding[3]; }ENABLE_GRAPH_SURFACE_PARAMETERS; @@ -6075,7 +6075,7 @@ typedef struct _ENABLE_GRAPH_SURFACE_PARAMETERS_V1_3 USHORT usWidth; // Image Width UCHAR ucSurface; // Surface 1 or 2 UCHAR ucEnable; // ATOM_ENABLE or ATOM_DISABLE - USHORT usDeviceId; // Active Device Id for this surface. If no device, set to 0. + USHORT usDeviceId; // Active Device Id for this surface. If no device, set to 0. }ENABLE_GRAPH_SURFACE_PARAMETERS_V1_3; typedef struct _ENABLE_GRAPH_SURFACE_PARAMETERS_V1_4 @@ -6097,7 +6097,7 @@ typedef struct _ENABLE_GRAPH_SURFACE_PARAMETERS_V1_4 typedef struct _ENABLE_GRAPH_SURFACE_PS_ALLOCATION { - ENABLE_GRAPH_SURFACE_PARAMETERS sSetSurface; + ENABLE_GRAPH_SURFACE_PARAMETERS sSetSurface; ENABLE_YUV_PS_ALLOCATION sReserved; // Don't set this one }ENABLE_GRAPH_SURFACE_PS_ALLOCATION; @@ -6110,23 +6110,23 @@ typedef struct _MEMORY_CLEAN_UP_PARAMETERS typedef struct _GET_DISPLAY_SURFACE_SIZE_PARAMETERS { - USHORT usX_Size; //When use as input parameter, usX_Size indicates which CRTC + USHORT usX_Size; //When use as input parameter, usX_Size indicates which CRTC USHORT usY_Size; -}GET_DISPLAY_SURFACE_SIZE_PARAMETERS; +}GET_DISPLAY_SURFACE_SIZE_PARAMETERS; typedef struct _GET_DISPLAY_SURFACE_SIZE_PARAMETERS_V2 { union{ - USHORT usX_Size; //When use as input parameter, usX_Size indicates which CRTC - USHORT usSurface; + USHORT usX_Size; //When use as input parameter, usX_Size indicates which CRTC + USHORT usSurface; }; USHORT usY_Size; - USHORT usDispXStart; + USHORT usDispXStart; USHORT usDispYStart; -}GET_DISPLAY_SURFACE_SIZE_PARAMETERS_V2; +}GET_DISPLAY_SURFACE_SIZE_PARAMETERS_V2; -typedef struct _PALETTE_DATA_CONTROL_PARAMETERS_V3 +typedef struct _PALETTE_DATA_CONTROL_PARAMETERS_V3 { UCHAR ucLutId; UCHAR ucAction; @@ -6156,7 +6156,7 @@ typedef struct _INTERRUPT_SERVICE_PARAMETERS_V2 #define HDP4_INTERRUPT_ID 4 #define HDP5_INTERRUPT_ID 5 #define HDP6_INTERRUPT_ID 6 -#define SW_INTERRUPT_ID 11 +#define SW_INTERRUPT_ID 11 // ucAction #define INTERRUPT_SERVICE_GEN_SW_INT 1 @@ -6168,7 +6168,7 @@ typedef struct _INTERRUPT_SERVICE_PARAMETERS_V2 typedef struct _INDIRECT_IO_ACCESS { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR IOAccessSequence[256]; } INDIRECT_IO_ACCESS; @@ -6197,7 +6197,7 @@ typedef struct _INDIRECT_IO_ACCESS #define INDIRECT_IO_SMU_WRITE INDIRECT_IO_SMU | INDIRECT_WRITE typedef struct _ATOM_OEM_INFO -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; ATOM_I2C_ID_CONFIG_ACCESS sucI2cId; }ATOM_OEM_INFO; @@ -6210,12 +6210,12 @@ typedef struct _ATOM_TV_MODE typedef struct _ATOM_BIOS_INT_TVSTD_MODE { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT usTV_Mode_LUT_Offset; // Pointer to standard to internal number conversion table USHORT usTV_FIFO_Offset; // Pointer to FIFO entry table USHORT usNTSC_Tbl_Offset; // Pointer to SDTV_Mode_NTSC table - USHORT usPAL_Tbl_Offset; // Pointer to SDTV_Mode_PAL table - USHORT usCV_Tbl_Offset; // Pointer to SDTV_Mode_PAL table + USHORT usPAL_Tbl_Offset; // Pointer to SDTV_Mode_PAL table + USHORT usCV_Tbl_Offset; // Pointer to SDTV_Mode_PAL table }ATOM_BIOS_INT_TVSTD_MODE; @@ -6228,13 +6228,13 @@ typedef struct _ATOM_TV_MODE_SCALER_PTR typedef struct _ATOM_STANDARD_VESA_TIMING { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_DTD_FORMAT aModeTimings[16]; // 16 is not the real array number, just for initial allocation }ATOM_STANDARD_VESA_TIMING; typedef struct _ATOM_STD_FORMAT -{ +{ USHORT usSTD_HDisp; USHORT usSTD_VDisp; USHORT usSTD_RefreshRate; @@ -6248,8 +6248,8 @@ typedef struct _ATOM_VESA_TO_EXTENDED_MODE }ATOM_VESA_TO_EXTENDED_MODE; typedef struct _ATOM_VESA_TO_INTENAL_MODE_LUT -{ - ATOM_COMMON_TABLE_HEADER sHeader; +{ + ATOM_COMMON_TABLE_HEADER sHeader; ATOM_VESA_TO_EXTENDED_MODE asVESA_ToExtendedModeInfo[76]; }ATOM_VESA_TO_INTENAL_MODE_LUT; @@ -6315,7 +6315,7 @@ typedef struct _ATOM_INIT_REG_BLOCK{ #define ACCESS_PLACEHOLDER 0x80 typedef struct _ATOM_MC_INIT_PARAM_TABLE -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usAdjustARB_SEQDataOffset; USHORT usMCInitMemTypeTblOffset; @@ -6391,12 +6391,12 @@ typedef struct _MCuCodeHeader typedef struct _ATOM_VRAM_MODULE_V1 { ULONG ulReserved; - USHORT usEMRSValue; + USHORT usEMRSValue; USHORT usMRSValue; USHORT usReserved; UCHAR ucExtMemoryID; // An external indicator (by hardcode, callback or pin) to tell what is the current memory module UCHAR ucMemoryType; // [7:4]=0x1:DDR1;=0x2:DDR2;=0x3:DDR3;=0x4:DDR4;[3:0] reserved; - UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vendor + UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vender UCHAR ucMemoryDeviceCfg; // [7:4]=0x0:4M;=0x1:8M;=0x2:16M;0x3:32M....[3:0]=0x0:x4;=0x1:x8;=0x2:x16;=0x3:x32... UCHAR ucRow; // Number of Row,in power of 2; UCHAR ucColumn; // Number of Column,in power of 2; @@ -6418,12 +6418,12 @@ typedef struct _ATOM_VRAM_MODULE_V2 ULONG ulMemoryClock; // Override of default memory clock for particular memory type USHORT usEMRS2Value; // EMRS2 Value is used for GDDR2 and GDDR4 memory type USHORT usEMRS3Value; // EMRS3 Value is used for GDDR2 and GDDR4 memory type - USHORT usEMRSValue; + USHORT usEMRSValue; USHORT usMRSValue; USHORT usReserved; UCHAR ucExtMemoryID; // An external indicator (by hardcode, callback or pin) to tell what is the current memory module UCHAR ucMemoryType; // [7:4]=0x1:DDR1;=0x2:DDR2;=0x3:DDR3;=0x4:DDR4;[3:0] - must not be used for now; - UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vendor. If not predefined, vendor detection table gets executed + UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vender. If not predefined, vendor detection table gets executed UCHAR ucMemoryDeviceCfg; // [7:4]=0x0:4M;=0x1:8M;=0x2:16M;0x3:32M....[3:0]=0x0:x4;=0x1:x8;=0x2:x16;=0x3:x32... UCHAR ucRow; // Number of Row,in power of 2; UCHAR ucColumn; // Number of Column,in power of 2; @@ -6440,9 +6440,9 @@ typedef struct _ATOM_VRAM_MODULE_V2 typedef struct _ATOM_MEMORY_TIMING_FORMAT { - ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing + ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing union{ - USHORT usMRS; // mode register + USHORT usMRS; // mode register USHORT usDDR3_MR0; }; union{ @@ -6450,24 +6450,24 @@ typedef struct _ATOM_MEMORY_TIMING_FORMAT USHORT usDDR3_MR1; }; UCHAR ucCL; // CAS latency - UCHAR ucWL; // WRITE Latency + UCHAR ucWL; // WRITE Latency UCHAR uctRAS; // tRAS - UCHAR uctRC; // tRC + UCHAR uctRC; // tRC UCHAR uctRFC; // tRFC - UCHAR uctRCDR; // tRCDR + UCHAR uctRCDR; // tRCDR UCHAR uctRCDW; // tRCDW UCHAR uctRP; // tRP - UCHAR uctRRD; // tRRD + UCHAR uctRRD; // tRRD UCHAR uctWR; // tWR UCHAR uctWTR; // tWTR UCHAR uctPDIX; // tPDIX UCHAR uctFAW; // tFAW UCHAR uctAOND; // tAOND - union + union { struct { - UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon - UCHAR ucReserved; + UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon + UCHAR ucReserved; }; USHORT usDDR3_MR2; }; @@ -6476,71 +6476,71 @@ typedef struct _ATOM_MEMORY_TIMING_FORMAT typedef struct _ATOM_MEMORY_TIMING_FORMAT_V1 { - ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing - USHORT usMRS; // mode register + ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing + USHORT usMRS; // mode register USHORT usEMRS; // extended mode register UCHAR ucCL; // CAS latency - UCHAR ucWL; // WRITE Latency + UCHAR ucWL; // WRITE Latency UCHAR uctRAS; // tRAS - UCHAR uctRC; // tRC + UCHAR uctRC; // tRC UCHAR uctRFC; // tRFC - UCHAR uctRCDR; // tRCDR + UCHAR uctRCDR; // tRCDR UCHAR uctRCDW; // tRCDW UCHAR uctRP; // tRP - UCHAR uctRRD; // tRRD + UCHAR uctRRD; // tRRD UCHAR uctWR; // tWR UCHAR uctWTR; // tWTR UCHAR uctPDIX; // tPDIX UCHAR uctFAW; // tFAW UCHAR uctAOND; // tAOND - UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon + UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon ////////////////////////////////////GDDR parameters/////////////////////////////////// - UCHAR uctCCDL; // - UCHAR uctCRCRL; // - UCHAR uctCRCWL; // - UCHAR uctCKE; // - UCHAR uctCKRSE; // - UCHAR uctCKRSX; // - UCHAR uctFAW32; // - UCHAR ucMR5lo; // - UCHAR ucMR5hi; // + UCHAR uctCCDL; // + UCHAR uctCRCRL; // + UCHAR uctCRCWL; // + UCHAR uctCKE; // + UCHAR uctCKRSE; // + UCHAR uctCKRSX; // + UCHAR uctFAW32; // + UCHAR ucMR5lo; // + UCHAR ucMR5hi; // UCHAR ucTerminator; }ATOM_MEMORY_TIMING_FORMAT_V1; typedef struct _ATOM_MEMORY_TIMING_FORMAT_V2 { - ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing - USHORT usMRS; // mode register + ULONG ulClkRange; // memory clock in 10kHz unit, when target memory clock is below this clock, use this memory timing + USHORT usMRS; // mode register USHORT usEMRS; // extended mode register UCHAR ucCL; // CAS latency - UCHAR ucWL; // WRITE Latency + UCHAR ucWL; // WRITE Latency UCHAR uctRAS; // tRAS - UCHAR uctRC; // tRC + UCHAR uctRC; // tRC UCHAR uctRFC; // tRFC - UCHAR uctRCDR; // tRCDR + UCHAR uctRCDR; // tRCDR UCHAR uctRCDW; // tRCDW UCHAR uctRP; // tRP - UCHAR uctRRD; // tRRD + UCHAR uctRRD; // tRRD UCHAR uctWR; // tWR UCHAR uctWTR; // tWTR UCHAR uctPDIX; // tPDIX UCHAR uctFAW; // tFAW UCHAR uctAOND; // tAOND - UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon + UCHAR ucflag; // flag to control memory timing calculation. bit0= control EMRS2 Infineon ////////////////////////////////////GDDR parameters/////////////////////////////////// - UCHAR uctCCDL; // - UCHAR uctCRCRL; // - UCHAR uctCRCWL; // - UCHAR uctCKE; // - UCHAR uctCKRSE; // - UCHAR uctCKRSX; // - UCHAR uctFAW32; // - UCHAR ucMR4lo; // - UCHAR ucMR4hi; // - UCHAR ucMR5lo; // - UCHAR ucMR5hi; // + UCHAR uctCCDL; // + UCHAR uctCRCRL; // + UCHAR uctCRCWL; // + UCHAR uctCKE; // + UCHAR uctCKRSE; // + UCHAR uctCKRSX; // + UCHAR uctFAW32; // + UCHAR ucMR4lo; // + UCHAR ucMR4hi; // + UCHAR ucMR5lo; // + UCHAR ucMR5hi; // UCHAR ucTerminator; - UCHAR ucReserved; + UCHAR ucReserved; }ATOM_MEMORY_TIMING_FORMAT_V2; typedef struct _ATOM_MEMORY_FORMAT @@ -6555,17 +6555,17 @@ typedef struct _ATOM_MEMORY_FORMAT USHORT usDDR3_MR3; // Used for DDR3 memory }; UCHAR ucMemoryType; // [7:4]=0x1:DDR1;=0x2:DDR2;=0x3:DDR3;=0x4:DDR4;[3:0] - must not be used for now; - UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vendor. If not predefined, vendor detection table gets executed + UCHAR ucMemoryVenderID; // Predefined,never change across designs or memory type/vender. If not predefined, vendor detection table gets executed UCHAR ucRow; // Number of Row,in power of 2; UCHAR ucColumn; // Number of Column,in power of 2; UCHAR ucBank; // Nunber of Bank; UCHAR ucRank; // Number of Rank, in power of 2 UCHAR ucBurstSize; // burst size, 0= burst size=4 1= burst size=8 UCHAR ucDllDisBit; // position of DLL Enable/Disable bit in EMRS ( Extended Mode Register ) - UCHAR ucRefreshRateFactor; // memory refresh rate in unit of ms + UCHAR ucRefreshRateFactor; // memory refresh rate in unit of ms UCHAR ucDensity; // _8Mx32, _16Mx32, _16Mx16, _32Mx16 UCHAR ucPreamble; //[7:4] Write Preamble, [3:0] Read Preamble - UCHAR ucMemAttrib; // Memory Device Attribute, like RDBI/WDBI etc + UCHAR ucMemAttrib; // Memory Device Addribute, like RDBI/WDBI etc ATOM_MEMORY_TIMING_FORMAT asMemTiming[5]; //Memory Timing block sort from lower clock to higher clock }ATOM_MEMORY_FORMAT; @@ -6578,8 +6578,8 @@ typedef struct _ATOM_VRAM_MODULE_V3 USHORT usDefaultMVDDC; // board dependent parameter:Default Memory IO Voltage UCHAR ucExtMemoryID; // An external indicator (by hardcode, callback or pin) to tell what is the current memory module UCHAR ucChannelNum; // board dependent parameter:Number of channel; - UCHAR ucChannelSize; // board dependent parameter:32bit or 64bit - UCHAR ucVREFI; // board dependent parameter: EXT or INT +160mv to -140mv + UCHAR ucChannelSize; // board dependent parameter:32bit or 64bit + UCHAR ucVREFI; // board dependnt parameter: EXT or INT +160mv to -140mv UCHAR ucNPL_RT; // board dependent parameter:NPL round trip delay, used for calculate memory timing parameters UCHAR ucFlag; // To enable/disable functionalities based on memory type ATOM_MEMORY_FORMAT asMemory; // describ all of video memory parameters from memory spec @@ -6621,7 +6621,7 @@ typedef struct _ATOM_VRAM_MODULE_V4 union{ USHORT usEMRS3Value; // EMRS3 Value is used for GDDR2 and GDDR4 memory type USHORT usDDR3_MR3; // Used for DDR3 memory - }; + }; UCHAR ucMemoryVenderID; // Predefined, If not predefined, vendor detection table gets executed UCHAR ucRefreshRateFactor; // [1:0]=RefreshFactor (00=8ms, 01=16ms, 10=32ms,11=64ms) UCHAR ucReserved2[2]; @@ -6717,13 +6717,13 @@ typedef struct _ATOM_VRAM_MODULE_V7 USHORT usSEQSettingOffset; UCHAR ucReserved; // Memory Module specific values - USHORT usEMRS2Value; // EMRS2/MR2 Value. + USHORT usEMRS2Value; // EMRS2/MR2 Value. USHORT usEMRS3Value; // EMRS3/MR3 Value. UCHAR ucMemoryVenderID; // [7:4] Revision, [3:0] Vendor code UCHAR ucRefreshRateFactor; // [1:0]=RefreshFactor (00=8ms, 01=16ms, 10=32ms,11=64ms) UCHAR ucFIFODepth; // FIFO depth can be detected during vendor detection, here is hardcoded per memory UCHAR ucCDR_Bandwidth; // [0:3]=Read CDR bandwidth, [4:7] - Write CDR Bandwidth - char strMemPNString[20]; // part number end with '0'. + char strMemPNString[20]; // part number end with '0'. }ATOM_VRAM_MODULE_V7; typedef struct _ATOM_VRAM_INFO_V2 @@ -6756,7 +6756,7 @@ typedef struct _ATOM_VRAM_INFO_V4 USHORT usRerseved; UCHAR ucMemDQ7_0ByteRemap; // DQ line byte remap, =0: Memory Data line BYTE0, =1: BYTE1, =2: BYTE2, =3: BYTE3 ULONG ulMemDQ7_0BitRemap; // each DQ line ( 7~0) use 3bits, like: DQ0=Bit[2:0], DQ1:[5:3], ... DQ7:[23:21] - UCHAR ucReservde[4]; + UCHAR ucReservde[4]; UCHAR ucNumOfVRAMModule; ATOM_VRAM_MODULE_V4 aVramInfo[ATOM_MAX_NUMBER_OF_VRAM_MODULE]; // just for allocation, real number of blocks is in ucNumOfVRAMModule; ATOM_INIT_REG_BLOCK asMemPatch; // for allocation @@ -6773,7 +6773,7 @@ typedef struct _ATOM_VRAM_INFO_HEADER_V2_1 UCHAR ucNumOfVRAMModule; // indicate number of VRAM module UCHAR ucMemoryClkPatchTblVer; // version of memory AC timing register list UCHAR ucVramModuleVer; // indicate ATOM_VRAM_MODUE version - UCHAR ucReserved; + UCHAR ucReserved; ATOM_VRAM_MODULE_V7 aVramInfo[ATOM_MAX_NUMBER_OF_VRAM_MODULE]; // just for allocation, real number of blocks is in ucNumOfVRAMModule; }ATOM_VRAM_INFO_HEADER_V2_1; @@ -6797,18 +6797,18 @@ typedef struct _ATOM_MEMORY_TRAINING_INFO typedef struct SW_I2C_CNTL_DATA_PARAMETERS { UCHAR ucControl; - UCHAR ucData; - UCHAR ucSatus; - UCHAR ucTemp; + UCHAR ucData; + UCHAR ucSatus; + UCHAR ucTemp; } SW_I2C_CNTL_DATA_PARAMETERS; #define SW_I2C_CNTL_DATA_PS_ALLOCATION SW_I2C_CNTL_DATA_PARAMETERS typedef struct _SW_I2C_IO_DATA_PARAMETERS -{ +{ USHORT GPIO_Info; - UCHAR ucAct; - UCHAR ucData; + UCHAR ucAct; + UCHAR ucData; } SW_I2C_IO_DATA_PARAMETERS; #define SW_I2C_IO_DATA_PS_ALLOCATION SW_I2C_IO_DATA_PARAMETERS @@ -6842,8 +6842,8 @@ typedef struct _SW_I2C_IO_DATA_PARAMETERS typedef struct _PTR_32_BIT_STRUCTURE { - USHORT Offset16; - USHORT Segment16; + USHORT Offset16; + USHORT Segment16; } PTR_32_BIT_STRUCTURE; typedef union _PTR_32_BIT_UNION @@ -6963,7 +6963,7 @@ typedef struct _VESA_MODE_INFO_BLOCK #define ATOM_BIOS_FUNCTION_SHORT_QUERY1 0x04 #define ATOM_BIOS_FUNCTION_SHORT_QUERY2 0x05 #define ATOM_BIOS_FUNCTION_SHORT_QUERY3 0x06 -#define ATOM_BIOS_FUNCTION_GET_DDC 0x0B +#define ATOM_BIOS_FUNCTION_GET_DDC 0x0B #define ATOM_BIOS_FUNCTION_ASIC_DSTATE 0x0E #define ATOM_BIOS_FUNCTION_DEBUG_PLAY 0x0F #define ATOM_BIOS_FUNCTION_STV_STD 0x16 @@ -6973,28 +6973,28 @@ typedef struct _VESA_MODE_INFO_BLOCK #define ATOM_BIOS_FUNCTION_PANEL_CONTROL 0x82 #define ATOM_BIOS_FUNCTION_OLD_DEVICE_DET 0x83 #define ATOM_BIOS_FUNCTION_OLD_DEVICE_SWITCH 0x84 -#define ATOM_BIOS_FUNCTION_HW_ICON 0x8A +#define ATOM_BIOS_FUNCTION_HW_ICON 0x8A #define ATOM_BIOS_FUNCTION_SET_CMOS 0x8B #define SUB_FUNCTION_UPDATE_DISPLAY_INFO 0x8000 // Sub function 80 #define SUB_FUNCTION_UPDATE_EXPANSION_INFO 0x8100 // Sub function 80 #define ATOM_BIOS_FUNCTION_DISPLAY_INFO 0x8D #define ATOM_BIOS_FUNCTION_DEVICE_ON_OFF 0x8E -#define ATOM_BIOS_FUNCTION_VIDEO_STATE 0x8F -#define ATOM_SUB_FUNCTION_GET_CRITICAL_STATE 0x0300 // Sub function 03 +#define ATOM_BIOS_FUNCTION_VIDEO_STATE 0x8F +#define ATOM_SUB_FUNCTION_GET_CRITICAL_STATE 0x0300 // Sub function 03 #define ATOM_SUB_FUNCTION_GET_LIDSTATE 0x0700 // Sub function 7 #define ATOM_SUB_FUNCTION_THERMAL_STATE_NOTICE 0x1400 // Notify caller the current thermal state #define ATOM_SUB_FUNCTION_CRITICAL_STATE_NOTICE 0x8300 // Notify caller the current critical state #define ATOM_SUB_FUNCTION_SET_LIDSTATE 0x8500 // Sub function 85 #define ATOM_SUB_FUNCTION_GET_REQ_DISPLAY_FROM_SBIOS_MODE 0x8900// Sub function 89 #define ATOM_SUB_FUNCTION_INFORM_ADC_SUPPORT 0x9400 // Notify caller that ADC is supported + - -#define ATOM_BIOS_FUNCTION_VESA_DPMS 0x4F10 // Set DPMS -#define ATOM_SUB_FUNCTION_SET_DPMS 0x0001 // BL: Sub function 01 -#define ATOM_SUB_FUNCTION_GET_DPMS 0x0002 // BL: Sub function 02 -#define ATOM_PARAMETER_VESA_DPMS_ON 0x0000 // BH Parameter for DPMS ON. -#define ATOM_PARAMETER_VESA_DPMS_STANDBY 0x0100 // BH Parameter for DPMS STANDBY +#define ATOM_BIOS_FUNCTION_VESA_DPMS 0x4F10 // Set DPMS +#define ATOM_SUB_FUNCTION_SET_DPMS 0x0001 // BL: Sub function 01 +#define ATOM_SUB_FUNCTION_GET_DPMS 0x0002 // BL: Sub function 02 +#define ATOM_PARAMETER_VESA_DPMS_ON 0x0000 // BH Parameter for DPMS ON. +#define ATOM_PARAMETER_VESA_DPMS_STANDBY 0x0100 // BH Parameter for DPMS STANDBY #define ATOM_PARAMETER_VESA_DPMS_SUSPEND 0x0200 // BH Parameter for DPMS SUSPEND #define ATOM_PARAMETER_VESA_DPMS_OFF 0x0400 // BH Parameter for DPMS OFF #define ATOM_PARAMETER_VESA_DPMS_REDUCE_ON 0x0800 // BH Parameter for DPMS REDUCE ON (NOT SUPPORTED) @@ -7037,7 +7037,7 @@ typedef struct _ASIC_ENCODER_INFO typedef struct _ATOM_DISP_OUT_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT ptrTransmitterInfo; USHORT ptrEncoderInfo; ASIC_TRANSMITTER_INFO asTransmitterInfo[1]; @@ -7046,17 +7046,17 @@ typedef struct _ATOM_DISP_OUT_INFO typedef struct _ATOM_DISP_OUT_INFO_V2 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT ptrTransmitterInfo; USHORT ptrEncoderInfo; - USHORT ptrMainCallParserFar; // direct address of main parser call in VBIOS binary. + USHORT ptrMainCallParserFar; // direct address of main parser call in VBIOS binary. ASIC_TRANSMITTER_INFO asTransmitterInfo[1]; ASIC_ENCODER_INFO asEncoderInfo[1]; }ATOM_DISP_OUT_INFO_V2; typedef struct _ATOM_DISP_CLOCK_ID { - UCHAR ucPpllId; + UCHAR ucPpllId; UCHAR ucPpllAttribute; }ATOM_DISP_CLOCK_ID; @@ -7080,19 +7080,19 @@ typedef struct _ASIC_TRANSMITTER_INFO_V2 typedef struct _ATOM_DISP_OUT_INFO_V3 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT ptrTransmitterInfo; USHORT ptrEncoderInfo; - USHORT ptrMainCallParserFar; // direct address of main parser call in VBIOS binary. + USHORT ptrMainCallParserFar; // direct address of main parser call in VBIOS binary. USHORT usReserved; - UCHAR ucDCERevision; + UCHAR ucDCERevision; UCHAR ucMaxDispEngineNum; UCHAR ucMaxActiveDispEngineNum; UCHAR ucMaxPPLLNum; UCHAR ucCoreRefClkSource; // value of CORE_REF_CLK_SOURCE UCHAR ucDispCaps; UCHAR ucReserved[2]; - ASIC_TRANSMITTER_INFO_V2 asTransmitterInfo[1]; // for alignment only + ASIC_TRANSMITTER_INFO_V2 asTransmitterInfo[1]; // for alligment only }ATOM_DISP_OUT_INFO_V3; //ucDispCaps @@ -7108,7 +7108,7 @@ typedef enum CORE_REF_CLK_SOURCE{ // DispDevicePriorityInfo typedef struct _ATOM_DISPLAY_DEVICE_PRIORITY_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT asDevicePriority[16]; }ATOM_DISPLAY_DEVICE_PRIORITY_INFO; @@ -7149,7 +7149,7 @@ typedef struct _PROCESS_AUX_CHANNEL_TRANSACTION_PARAMETERS_V2 typedef struct _DP_ENCODER_SERVICE_PARAMETERS { USHORT ucLinkClock; - union + union { UCHAR ucConfig; // for DP training command UCHAR ucI2cId; // use for GET_SINK_TYPE command @@ -7187,7 +7187,7 @@ typedef struct _DP_ENCODER_SERVICE_PARAMETERS_V2 USHORT usExtEncoderObjId; // External Encoder Object Id, output parameter only, use when ucAction = DP_SERVICE_V2_ACTION_DET_EXT_CONNECTION UCHAR ucAuxId; UCHAR ucAction; - UCHAR ucSinkType; // Iput and Output parameters. + UCHAR ucSinkType; // Iput and Output parameters. UCHAR ucHPDId; // Input parameter, used when ucAction = DP_SERVICE_V2_ACTION_DET_EXT_CONNECTION UCHAR ucReserved[2]; }DP_ENCODER_SERVICE_PARAMETERS_V2; @@ -7204,7 +7204,7 @@ typedef struct _DP_ENCODER_SERVICE_PS_ALLOCATION_V2 // DP_TRAINING_TABLE -#define DPCD_SET_LINKRATE_LANENUM_PATTERN1_TBL_ADDR ATOM_DP_TRAINING_TBL_ADDR +#define DPCD_SET_LINKRATE_LANENUM_PATTERN1_TBL_ADDR ATOM_DP_TRAINING_TBL_ADDR #define DPCD_SET_SS_CNTL_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 8 ) #define DPCD_SET_LANE_VSWING_PREEMP_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 16 ) #define DPCD_SET_TRAINING_PATTERN0_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 24 ) @@ -7215,7 +7215,7 @@ typedef struct _DP_ENCODER_SERVICE_PS_ALLOCATION_V2 #define DP_I2C_AUX_DDC_WRITE_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 64) #define DP_I2C_AUX_DDC_READ_START_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 72) #define DP_I2C_AUX_DDC_READ_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 76) -#define DP_I2C_AUX_DDC_WRITE_END_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 80) +#define DP_I2C_AUX_DDC_WRITE_END_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 80) #define DP_I2C_AUX_DDC_READ_END_TBL_ADDR (ATOM_DP_TRAINING_TBL_ADDR + 84) typedef struct _PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS @@ -7227,7 +7227,7 @@ typedef struct _PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS UCHAR ucStatus; }; USHORT lpI2CDataOut; - UCHAR ucFlag; + UCHAR ucFlag; UCHAR ucTransBytes; UCHAR ucSlaveAddr; UCHAR ucLineNumber; @@ -7240,17 +7240,17 @@ typedef struct _PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS #define HW_I2C_READ 0 #define I2C_2BYTE_ADDR 0x02 -/****************************************************************************/ +/****************************************************************************/ // Structures used by HW_Misc_OperationTable -/****************************************************************************/ -typedef struct _ATOM_HW_MISC_OPERATION_INPUT_PARAMETER_V1_1 +/****************************************************************************/ +typedef struct _ATOM_HW_MISC_OPERATION_INPUT_PARAMETER_V1_1 { UCHAR ucCmd; // Input: To tell which action to take UCHAR ucReserved[3]; ULONG ulReserved; -}ATOM_HW_MISC_OPERATION_INPUT_PARAMETER_V1_1; +}ATOM_HW_MISC_OPERATION_INPUT_PARAMETER_V1_1; -typedef struct _ATOM_HW_MISC_OPERATION_OUTPUT_PARAMETER_V1_1 +typedef struct _ATOM_HW_MISC_OPERATION_OUTPUT_PARAMETER_V1_1 { UCHAR ucReturnCode; // Output: Return value base on action was taken UCHAR ucReserved[3]; @@ -7260,7 +7260,7 @@ typedef struct _ATOM_HW_MISC_OPERATION_OUTPUT_PARAMETER_V1_1 // Actions code #define ATOM_GET_SDI_SUPPORT 0xF0 -// Return code +// Return code #define ATOM_UNKNOWN_CMD 0 #define ATOM_FEATURE_NOT_SUPPORTED 1 #define ATOM_FEATURE_SUPPORTED 2 @@ -7268,15 +7268,15 @@ typedef struct _ATOM_HW_MISC_OPERATION_OUTPUT_PARAMETER_V1_1 typedef struct _ATOM_HW_MISC_OPERATION_PS_ALLOCATION { ATOM_HW_MISC_OPERATION_INPUT_PARAMETER_V1_1 sInput_Output; - PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS sReserved; + PROCESS_I2C_CHANNEL_TRANSACTION_PARAMETERS sReserved; }ATOM_HW_MISC_OPERATION_PS_ALLOCATION; -/****************************************************************************/ +/****************************************************************************/ typedef struct _SET_HWBLOCK_INSTANCE_PARAMETER_V2 { UCHAR ucHWBlkInst; // HW block instance, 0, 1, 2, ... - UCHAR ucReserved[3]; + UCHAR ucReserved[3]; }SET_HWBLOCK_INSTANCE_PARAMETER_V2; #define HWBLKINST_INSTANCE_MASK 0x07 @@ -7293,24 +7293,24 @@ typedef struct _SET_HWBLOCK_INSTANCE_PARAMETER_V2 #define SELECT_CRTC_PIXEL_RATE 7 #define SELECT_VGA_BLK 8 -// DIGTransmitterInfoTable structure used to program UNIPHY settings -typedef struct _DIG_TRANSMITTER_INFO_HEADER_V3_1{ - ATOM_COMMON_TABLE_HEADER sHeader; - USHORT usDPVsPreEmphSettingOffset; // offset of PHY_ANALOG_SETTING_INFO * with DP Voltage Swing and Pre-Emphasis for each Link clock - USHORT usPhyAnalogRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with None-DP mode Analog Setting's register Info +// DIGTransmitterInfoTable structure used to program UNIPHY settings +typedef struct _DIG_TRANSMITTER_INFO_HEADER_V3_1{ + ATOM_COMMON_TABLE_HEADER sHeader; + USHORT usDPVsPreEmphSettingOffset; // offset of PHY_ANALOG_SETTING_INFO * with DP Voltage Swing and Pre-Emphasis for each Link clock + USHORT usPhyAnalogRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with None-DP mode Analog Setting's register Info USHORT usPhyAnalogSettingOffset; // offset of CLOCK_CONDITION_SETTING_ENTRY* with None-DP mode Analog Setting for each link clock range - USHORT usPhyPllRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy Pll register Info + USHORT usPhyPllRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy Pll register Info USHORT usPhyPllSettingOffset; // offset of CLOCK_CONDITION_SETTING_ENTRY* with Phy Pll Settings }DIG_TRANSMITTER_INFO_HEADER_V3_1; -typedef struct _DIG_TRANSMITTER_INFO_HEADER_V3_2{ - ATOM_COMMON_TABLE_HEADER sHeader; - USHORT usDPVsPreEmphSettingOffset; // offset of PHY_ANALOG_SETTING_INFO * with DP Voltage Swing and Pre-Emphasis for each Link clock - USHORT usPhyAnalogRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with None-DP mode Analog Setting's register Info +typedef struct _DIG_TRANSMITTER_INFO_HEADER_V3_2{ + ATOM_COMMON_TABLE_HEADER sHeader; + USHORT usDPVsPreEmphSettingOffset; // offset of PHY_ANALOG_SETTING_INFO * with DP Voltage Swing and Pre-Emphasis for each Link clock + USHORT usPhyAnalogRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with None-DP mode Analog Setting's register Info USHORT usPhyAnalogSettingOffset; // offset of CLOCK_CONDITION_SETTING_ENTRY* with None-DP mode Analog Setting for each link clock range - USHORT usPhyPllRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy Pll register Info + USHORT usPhyPllRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy Pll register Info USHORT usPhyPllSettingOffset; // offset of CLOCK_CONDITION_SETTING_ENTRY* with Phy Pll Settings - USHORT usDPSSRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy SS Pll register Info + USHORT usDPSSRegListOffset; // offset of CLOCK_CONDITION_REGESTER_INFO* with Phy SS Pll register Info USHORT usDPSSSettingOffset; // offset of CLOCK_CONDITION_SETTING_ENTRY* with Phy SS Pll Settings }DIG_TRANSMITTER_INFO_HEADER_V3_2; @@ -7371,9 +7371,9 @@ typedef struct _PHY_ANALOG_SETTING_INFO_V2{ typedef struct _GFX_HAVESTING_PARAMETERS { UCHAR ucGfxBlkId; //GFX blk id to be harvested, like CU, RB or PRIM - UCHAR ucReserved; //reserved + UCHAR ucReserved; //reserved UCHAR ucActiveUnitNumPerSH; //requested active CU/RB/PRIM number per shader array - UCHAR ucMaxUnitNumPerSH; //max CU/RB/PRIM number per shader array + UCHAR ucMaxUnitNumPerSH; //max CU/RB/PRIM number per shader array } GFX_HAVESTING_PARAMETERS; //ucGfxBlkId @@ -7381,8 +7381,8 @@ typedef struct _GFX_HAVESTING_PARAMETERS { #define GFX_HARVESTING_RB_ID 1 #define GFX_HARVESTING_PRIM_ID 2 -/****************************************************************************/ -//Portion VI: Definitions for vbios MC scratch registers that driver used +/****************************************************************************/ +//Portion VI: Definitinos for vbios MC scratch registers that driver used /****************************************************************************/ #define MC_MISC0__MEMORY_TYPE_MASK 0xF0000000 @@ -7402,23 +7402,23 @@ typedef struct _GFX_HAVESTING_PARAMETERS { #define ATOM_MEM_TYPE_HBM_STRING "HBM" #define ATOM_MEM_TYPE_DDR3_STRING "DDR3" -/****************************************************************************/ -//Portion VI: Definitions being obsolete +/****************************************************************************/ +//Portion VI: Definitinos being oboselete /****************************************************************************/ //========================================================================================== //Remove the definitions below when driver is ready! typedef struct _ATOM_DAC_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT usMaxFrequency; // in 10kHz unit USHORT usReserved; }ATOM_DAC_INFO; -typedef struct _COMPASSIONATE_DATA +typedef struct _COMPASSIONATE_DATA { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; //============================== DAC1 portion UCHAR ucDAC1_BG_Adjustment; @@ -7448,7 +7448,7 @@ typedef struct _COMPASSIONATE_DATA /****************************Supported Device Info Table Definitions**********************/ // ucConnectInfo: // [7:4] - connector type -// = 1 - VGA connector +// = 1 - VGA connector // = 2 - DVI-I // = 3 - DVI-D // = 4 - DVI-A @@ -7467,7 +7467,7 @@ typedef struct _COMPASSIONATE_DATA // = 2 - DACB // = 3 - External DAC // Others=TBD -// +// typedef struct _ATOM_CONNECTOR_INFO { @@ -7494,7 +7494,7 @@ typedef struct _ATOM_CONNECTOR_INFO_I2C typedef struct _ATOM_SUPPORTED_DEVICES_INFO -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usDeviceSupport; ATOM_CONNECTOR_INFO_I2C asConnInfo[ATOM_MAX_SUPPORTED_DEVICE_INFO]; @@ -7508,7 +7508,7 @@ typedef struct _ATOM_CONNECTOR_INC_SRC_BITMAP }ATOM_CONNECTOR_INC_SRC_BITMAP; typedef struct _ATOM_SUPPORTED_DEVICES_INFO_2 -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usDeviceSupport; ATOM_CONNECTOR_INFO_I2C asConnInfo[ATOM_MAX_SUPPORTED_DEVICE_INFO_2]; @@ -7516,7 +7516,7 @@ typedef struct _ATOM_SUPPORTED_DEVICES_INFO_2 }ATOM_SUPPORTED_DEVICES_INFO_2; typedef struct _ATOM_SUPPORTED_DEVICES_INFO_2d1 -{ +{ ATOM_COMMON_TABLE_HEADER sHeader; USHORT usDeviceSupport; ATOM_CONNECTOR_INFO_I2C asConnInfo[ATOM_MAX_SUPPORTED_DEVICE]; @@ -7534,14 +7534,14 @@ typedef struct _ATOM_MISC_CONTROL_INFO UCHAR ucPLL_DutyCycle; // PLL duty cycle control UCHAR ucPLL_VCO_Gain; // PLL VCO gain control UCHAR ucPLL_VoltageSwing; // PLL driver voltage swing control -}ATOM_MISC_CONTROL_INFO; +}ATOM_MISC_CONTROL_INFO; #define ATOM_MAX_MISC_INFO 4 typedef struct _ATOM_TMDS_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; USHORT usMaxFrequency; // in 10Khz ATOM_MISC_CONTROL_INFO asMiscInfo[ATOM_MAX_MISC_INFO]; }ATOM_TMDS_INFO; @@ -7549,14 +7549,14 @@ typedef struct _ATOM_TMDS_INFO typedef struct _ATOM_ENCODER_ANALOG_ATTRIBUTE { - UCHAR ucTVStandard; //Same as TV standards defined above, + UCHAR ucTVStandard; //Same as TV standards defined above, UCHAR ucPadding[1]; }ATOM_ENCODER_ANALOG_ATTRIBUTE; typedef struct _ATOM_ENCODER_DIGITAL_ATTRIBUTE { UCHAR ucAttribute; //Same as other digital encoder attributes defined above - UCHAR ucPadding[1]; + UCHAR ucPadding[1]; }ATOM_ENCODER_DIGITAL_ATTRIBUTE; typedef union _ATOM_ENCODER_ATTRIBUTE @@ -7568,15 +7568,15 @@ typedef union _ATOM_ENCODER_ATTRIBUTE typedef struct _DVO_ENCODER_CONTROL_PARAMETERS { - USHORT usPixelClock; - USHORT usEncoderID; - UCHAR ucDeviceType; //Use ATOM_DEVICE_xxx1_Index to indicate device type only. + USHORT usPixelClock; + USHORT usEncoderID; + UCHAR ucDeviceType; //Use ATOM_DEVICE_xxx1_Index to indicate device type only. UCHAR ucAction; //ATOM_ENABLE/ATOM_DISABLE/ATOM_HPD_INIT - ATOM_ENCODER_ATTRIBUTE usDevAttr; + ATOM_ENCODER_ATTRIBUTE usDevAttr; }DVO_ENCODER_CONTROL_PARAMETERS; typedef struct _DVO_ENCODER_CONTROL_PS_ALLOCATION -{ +{ DVO_ENCODER_CONTROL_PARAMETERS sDVOEncoder; WRITE_ONE_BYTE_HW_I2C_DATA_PS_ALLOCATION sReserved; //Caller doesn't need to init this portion }DVO_ENCODER_CONTROL_PS_ALLOCATION; @@ -7589,25 +7589,25 @@ typedef struct _DVO_ENCODER_CONTROL_PS_ALLOCATION #define ATOM_XTMDS_SUPPORTED_DUALLINK 0x00000002 #define ATOM_XTMDS_MVPU_FPGA 0x00000004 - + typedef struct _ATOM_XTMDS_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; - USHORT usSingleLinkMaxFrequency; + ATOM_COMMON_TABLE_HEADER sHeader; + USHORT usSingleLinkMaxFrequency; ATOM_I2C_ID_CONFIG_ACCESS sucI2cId; //Point the ID on which I2C is used to control external chip - UCHAR ucXtransimitterID; + UCHAR ucXtransimitterID; UCHAR ucSupportedLink; // Bit field, bit0=1, single link supported;bit1=1,dual link supported - UCHAR ucSequnceAlterID; // Even with the same external TMDS asic, it's possible that the program sequence alters - // due to design. This ID is used to alert driver that the sequence is not "standard"! + UCHAR ucSequnceAlterID; // Even with the same external TMDS asic, it's possible that the program seqence alters + // due to design. This ID is used to alert driver that the sequence is not "standard"! UCHAR ucMasterAddress; // Address to control Master xTMDS Chip UCHAR ucSlaveAddress; // Address to control Slave xTMDS Chip }ATOM_XTMDS_INFO; typedef struct _DFP_DPMS_STATUS_CHANGE_PARAMETERS -{ +{ UCHAR ucEnable; // ATOM_ENABLE=On or ATOM_DISABLE=Off UCHAR ucDevice; // ATOM_DEVICE_DFP1_INDEX.... - UCHAR ucPadding[2]; + UCHAR ucPadding[2]; }DFP_DPMS_STATUS_CHANGE_PARAMETERS; /****************************Legacy Power Play Table Definitions **********************/ @@ -7624,8 +7624,8 @@ typedef struct _DFP_DPMS_STATUS_CHANGE_PARAMETERS #define ATOM_PM_MISCINFO_ENGINE_CLOCK_CONTRL_EN 0x00000020L #define ATOM_PM_MISCINFO_MEMORY_CLOCK_CONTRL_EN 0x00000040L -#define ATOM_PM_MISCINFO_PROGRAM_VOLTAGE 0x00000080L //When this bit set, ucVoltageDropIndex is not an index for GPIO pin, but a voltage ID that SW needs program - +#define ATOM_PM_MISCINFO_PROGRAM_VOLTAGE 0x00000080L //When this bit set, ucVoltageDropIndex is not an index for GPIO pin, but a voltage ID that SW needs program + #define ATOM_PM_MISCINFO_ASIC_REDUCED_SPEED_SCLK_EN 0x00000100L #define ATOM_PM_MISCINFO_ASIC_DYNAMIC_VOLTAGE_EN 0x00000200L #define ATOM_PM_MISCINFO_ASIC_SLEEP_MODE_EN 0x00000400L @@ -7635,22 +7635,22 @@ typedef struct _DFP_DPMS_STATUS_CHANGE_PARAMETERS #define ATOM_PM_MISCINFO_LOW_LCD_REFRESH_RATE 0x00004000L #define ATOM_PM_MISCINFO_DRIVER_DEFAULT_MODE 0x00008000L -#define ATOM_PM_MISCINFO_OVER_CLOCK_MODE 0x00010000L +#define ATOM_PM_MISCINFO_OVER_CLOCK_MODE 0x00010000L #define ATOM_PM_MISCINFO_OVER_DRIVE_MODE 0x00020000L #define ATOM_PM_MISCINFO_POWER_SAVING_MODE 0x00040000L #define ATOM_PM_MISCINFO_THERMAL_DIODE_MODE 0x00080000L #define ATOM_PM_MISCINFO_FRAME_MODULATION_MASK 0x00300000L //0-FM Disable, 1-2 level FM, 2-4 level FM, 3-Reserved -#define ATOM_PM_MISCINFO_FRAME_MODULATION_SHIFT 20 +#define ATOM_PM_MISCINFO_FRAME_MODULATION_SHIFT 20 #define ATOM_PM_MISCINFO_DYN_CLK_3D_IDLE 0x00400000L #define ATOM_PM_MISCINFO_DYNAMIC_CLOCK_DIVIDER_BY_2 0x00800000L #define ATOM_PM_MISCINFO_DYNAMIC_CLOCK_DIVIDER_BY_4 0x01000000L -#define ATOM_PM_MISCINFO_DYNAMIC_HDP_BLOCK_EN 0x02000000L //When set, Dynamic +#define ATOM_PM_MISCINFO_DYNAMIC_HDP_BLOCK_EN 0x02000000L //When set, Dynamic #define ATOM_PM_MISCINFO_DYNAMIC_MC_HOST_BLOCK_EN 0x04000000L //When set, Dynamic #define ATOM_PM_MISCINFO_3D_ACCELERATION_EN 0x08000000L //When set, This mode is for acceleated 3D mode -#define ATOM_PM_MISCINFO_POWERPLAY_SETTINGS_GROUP_MASK 0x70000000L //1-Optimal Battery Life Group, 2-High Battery, 3-Balanced, 4-High Performance, 5- Optimal Performance (Default state with Default clocks) +#define ATOM_PM_MISCINFO_POWERPLAY_SETTINGS_GROUP_MASK 0x70000000L //1-Optimal Battery Life Group, 2-High Battery, 3-Balanced, 4-High Performance, 5- Optimal Performance (Default state with Default clocks) #define ATOM_PM_MISCINFO_POWERPLAY_SETTINGS_GROUP_SHIFT 28 #define ATOM_PM_MISCINFO_ENABLE_BACK_BIAS 0x80000000L @@ -7660,11 +7660,11 @@ typedef struct _DFP_DPMS_STATUS_CHANGE_PARAMETERS #define ATOM_PM_MISCINFO2_FS3D_OVERDRIVE_INFO 0x00000008L #define ATOM_PM_MISCINFO2_FORCEDLOWPWR_MODE 0x00000010L #define ATOM_PM_MISCINFO2_VDDCI_DYNAMIC_VOLTAGE_EN 0x00000020L -#define ATOM_PM_MISCINFO2_VIDEO_PLAYBACK_CAPABLE 0x00000040L //If this bit is set in multi-pp mode, then driver will pack up one with the minior power consumption. +#define ATOM_PM_MISCINFO2_VIDEO_PLAYBACK_CAPABLE 0x00000040L //If this bit is set in multi-pp mode, then driver will pack up one with the minior power consumption. //If it's not set in any pp mode, driver will use its default logic to pick a pp mode in video playback #define ATOM_PM_MISCINFO2_NOT_VALID_ON_DC 0x00000080L #define ATOM_PM_MISCINFO2_STUTTER_MODE_EN 0x00000100L -#define ATOM_PM_MISCINFO2_UVD_SUPPORT_MODE 0x00000200L +#define ATOM_PM_MISCINFO2_UVD_SUPPORT_MODE 0x00000200L //ucTableFormatRevision=1 //ucTableContentRevision=1 @@ -7687,8 +7687,8 @@ typedef struct _ATOM_POWERMODE_INFO typedef struct _ATOM_POWERMODE_INFO_V2 { ULONG ulMiscInfo; //The power level should be arranged in ascending order - ULONG ulMiscInfo2; - ULONG ulEngineClock; + ULONG ulMiscInfo2; + ULONG ulEngineClock; ULONG ulMemoryClock; UCHAR ucVoltageDropIndex; // index to GPIO table UCHAR ucSelectedPanel_RefreshRate;// panel refresh rate @@ -7702,15 +7702,15 @@ typedef struct _ATOM_POWERMODE_INFO_V2 typedef struct _ATOM_POWERMODE_INFO_V3 { ULONG ulMiscInfo; //The power level should be arranged in ascending order - ULONG ulMiscInfo2; - ULONG ulEngineClock; + ULONG ulMiscInfo2; + ULONG ulEngineClock; ULONG ulMemoryClock; - UCHAR ucVoltageDropIndex; // index to Core (VDDC) voltage table + UCHAR ucVoltageDropIndex; // index to Core (VDDC) votage table UCHAR ucSelectedPanel_RefreshRate;// panel refresh rate UCHAR ucMinTemperature; UCHAR ucMaxTemperature; UCHAR ucNumPciELanes; // number of PCIE lanes - UCHAR ucVDDCI_VoltageDropIndex; // index to VDDCI voltage table + UCHAR ucVDDCI_VoltageDropIndex; // index to VDDCI votage table }ATOM_POWERMODE_INFO_V3; @@ -7730,7 +7730,7 @@ typedef struct _ATOM_POWERMODE_INFO_V3 typedef struct _ATOM_POWERPLAY_INFO { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucOverdriveThermalController; UCHAR ucOverdriveI2cLine; UCHAR ucOverdriveIntBitmap; @@ -7742,7 +7742,7 @@ typedef struct _ATOM_POWERPLAY_INFO typedef struct _ATOM_POWERPLAY_INFO_V2 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucOverdriveThermalController; UCHAR ucOverdriveI2cLine; UCHAR ucOverdriveIntBitmap; @@ -7751,10 +7751,10 @@ typedef struct _ATOM_POWERPLAY_INFO_V2 UCHAR ucNumOfPowerModeEntries; ATOM_POWERMODE_INFO_V2 asPowerPlayInfo[ATOM_MAX_NUMBEROF_POWER_BLOCK]; }ATOM_POWERPLAY_INFO_V2; - + typedef struct _ATOM_POWERPLAY_INFO_V3 { - ATOM_COMMON_TABLE_HEADER sHeader; + ATOM_COMMON_TABLE_HEADER sHeader; UCHAR ucOverdriveThermalController; UCHAR ucOverdriveI2cLine; UCHAR ucOverdriveIntBitmap; @@ -7765,14 +7765,14 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 }ATOM_POWERPLAY_INFO_V3; -// Following definitions are for compatibility issue in different SW components. +// Following definitions are for compatibility issue in different SW components. #define ATOM_MASTER_DATA_TABLE_REVISION 0x01 -#define Object_Info Object_Header +#define Object_Info Object_Header #define AdjustARB_SEQ MC_InitParameter #define VRAM_GPIO_DetectionInfo VoltageObjectInfo -#define ASIC_VDDCI_Info ASIC_ProfilingInfo +#define ASIC_VDDCI_Info ASIC_ProfilingInfo #define ASIC_MVDDQ_Info MemoryTrainingInfo -#define SS_Info PPLL_SS_Info +#define SS_Info PPLL_SS_Info #define ASIC_MVDDC_Info ASIC_InternalSS_Info #define DispDevicePriorityInfo SaveRestoreInfo #define DispOutInfo TV_VideoMode @@ -7796,7 +7796,7 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 #define ATOM_DEVICE_DFP1I_INDEX ATOM_DEVICE_DFP1_INDEX #define ATOM_DEVICE_DFP1X_INDEX ATOM_DEVICE_DFP2_INDEX - + #define ATOM_DEVICE_DFP2I_INDEX 0x00000009 #define ATOM_DEVICE_DFP2I_SUPPORT (0x1L << ATOM_DEVICE_DFP2I_INDEX) @@ -7814,7 +7814,7 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 #define ATOM_S3_DFP2I_ACTIVEb1 0x02 -#define ATOM_S3_DFP1I_ACTIVE ATOM_S3_DFP1_ACTIVE +#define ATOM_S3_DFP1I_ACTIVE ATOM_S3_DFP1_ACTIVE #define ATOM_S3_DFP1X_ACTIVE ATOM_S3_DFP2_ACTIVE #define ATOM_S3_DFP2I_ACTIVE 0x00000200L @@ -7833,14 +7833,14 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 #define ATOM_S6_ACC_REQ_DFP2Ib3 0x02 #define ATOM_S6_ACC_REQ_DFP2I 0x02000000L -#define TMDS1XEncoderControl DVOEncoderControl +#define TMDS1XEncoderControl DVOEncoderControl #define DFP1XOutputControl DVOOutputControl #define ExternalDFPOutputControl DFP1XOutputControl #define EnableExternalTMDS_Encoder TMDS1XEncoderControl #define DFP1IOutputControl TMDSAOutputControl -#define DFP2IOutputControl LVTMAOutputControl +#define DFP2IOutputControl LVTMAOutputControl #define DAC1_ENCODER_CONTROL_PARAMETERS DAC_ENCODER_CONTROL_PARAMETERS #define DAC1_ENCODER_CONTROL_PS_ALLOCATION DAC_ENCODER_CONTROL_PS_ALLOCATION @@ -7849,7 +7849,7 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 #define DAC2_ENCODER_CONTROL_PS_ALLOCATION DAC_ENCODER_CONTROL_PS_ALLOCATION #define ucDac1Standard ucDacStandard -#define ucDac2Standard ucDacStandard +#define ucDac2Standard ucDacStandard #define TMDS1EncoderControl TMDSAEncoderControl #define TMDS2EncoderControl LVTMAEncoderControl @@ -7861,7 +7861,7 @@ typedef struct _ATOM_POWERPLAY_INFO_V3 //These two lines will be removed for sure in a few days, will follow up with Michael V. #define EnableLVDS_SS EnableSpreadSpectrumOnPPLL -#define ENABLE_LVDS_SS_PARAMETERS_V3 ENABLE_SPREAD_SPECTRUM_ON_PPLL +#define ENABLE_LVDS_SS_PARAMETERS_V3 ENABLE_SPREAD_SPECTRUM_ON_PPLL //#define ATOM_S2_CRT1_DPMS_STATE 0x00010000L //#define ATOM_S2_LCD1_DPMS_STATE ATOM_S2_CRT1_DPMS_STATE diff --git a/sys/dev/pci/drm/ttm/ttm_pool.c b/sys/dev/pci/drm/ttm/ttm_pool.c index e47829c96..8ed9fe8e1 100644 --- a/sys/dev/pci/drm/ttm/ttm_pool.c +++ b/sys/dev/pci/drm/ttm/ttm_pool.c @@ -485,6 +485,68 @@ static unsigned int ttm_pool_page_order(struct ttm_pool *pool, struct vm_page *p #endif /* notyet */ +/* Called when we got a page, either from a pool or newly allocated */ +static int ttm_pool_page_allocated(struct ttm_pool *pool, unsigned int order, + struct vm_page *p, dma_addr_t **dma_addr, + unsigned long *num_pages, + struct vm_page ***pages, + unsigned long **orders) +{ + unsigned int i; + int r; + + if (*dma_addr) { + r = ttm_pool_map(pool, order, p, dma_addr); + if (r) + return r; + } + + *num_pages -= 1 << order; + for (i = 1 << order; i; --i, ++(*pages), ++p, ++(*orders)) { + **pages = p; + **orders = order; + } + + return 0; +} + +/** + * ttm_pool_free_range() - Free a range of TTM pages + * @pool: The pool used for allocating. + * @tt: The struct ttm_tt holding the page pointers. + * @caching: The page caching mode used by the range. + * @start_page: index for first page to free. + * @end_page: index for last page to free + 1. + * + * During allocation the ttm_tt page-vector may be populated with ranges of + * pages with different attributes if allocation hit an error without being + * able to completely fulfill the allocation. This function can be used + * to free these individual ranges. + */ +static void ttm_pool_free_range(struct ttm_pool *pool, struct ttm_tt *tt, + enum ttm_caching caching, + pgoff_t start_page, pgoff_t end_page) +{ + struct vm_page **pages = tt->pages; + unsigned int order; + pgoff_t i, nr; + + for (i = start_page; i < end_page; i += nr, pages += nr) { + struct ttm_pool_type *pt = NULL; + + order = tt->orders[i]; + nr = (1UL << order); + if (tt->dma_address) + ttm_pool_unmap(pool, tt->dma_address[i], nr); + + pt = ttm_pool_select_type(pool, caching, order); + if (pt) + ttm_pool_type_give(pt, *pages); + else + ttm_pool_free_page(pool, caching, order, *pages); + } +} + /** * ttm_pool_alloc - Fill a ttm_tt object * @@ -500,15 +562,17 @@ static unsigned int ttm_pool_page_order(struct ttm_pool *pool, struct vm_page *p int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt, struct ttm_operation_ctx *ctx) { - unsigned long num_pages = tt->num_pages; + pgoff_t num_pages = tt->num_pages; dma_addr_t *dma_addr = tt->dma_address; struct vm_page **caching = tt->pages; struct vm_page **pages = tt->pages; - unsigned long *orders = tt->orders; + enum ttm_caching page_caching; gfp_t gfp_flags = GFP_USER; - unsigned int i, order; + pgoff_t caching_divide; + unsigned int order; struct vm_page *p; int r; + unsigned long *orders = tt->orders; WARN_ON(!num_pages || ttm_tt_is_populated(tt)); #ifdef __linux__ @@ -529,17 +593,51 @@ int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt, for (order = min_t(unsigned int, MAX_ORDER - 1, __fls(num_pages)); num_pages; order = min_t(unsigned int, order, __fls(num_pages))) { - bool apply_caching = false; struct ttm_pool_type *pt; + page_caching = tt->caching; pt = ttm_pool_select_type(pool, tt->caching, order); p = pt ? ttm_pool_type_take(pt) : NULL; if (p) { - apply_caching = true; - } else { - p = ttm_pool_alloc_page(pool, gfp_flags, order, tt->dmat); - if (p && PageHighMem(p)) - apply_caching = true; + r = ttm_pool_apply_caching(caching, pages, + tt->caching); + if (r) + goto error_free_page; + + caching = pages; + do { + r = ttm_pool_page_allocated(pool, order, p, + &dma_addr, + &num_pages, + &pages, &orders); + if (r) + goto error_free_page; + + caching = pages; + if (num_pages < (1 << order)) + break; + + p = ttm_pool_type_take(pt); + } while (p); + } + + page_caching = ttm_cached; + while (num_pages >= (1 << order) && + (p = ttm_pool_alloc_page(pool, gfp_flags, order, tt->dmat))) { + + if (PageHighMem(p)) { + r = ttm_pool_apply_caching(caching, pages, + tt->caching); + if (r) + goto error_free_page; + caching = pages; + } + r = ttm_pool_page_allocated(pool, order, p, &dma_addr, + &num_pages, &pages, &orders); + if (r) + goto error_free_page; + if (PageHighMem(p)) + caching = pages; } if (!p) { @@ -550,26 +648,6 @@ int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt, r = -ENOMEM; goto error_free_all; } - - if (apply_caching) { - r = ttm_pool_apply_caching(caching, pages, - tt->caching); - if (r) - goto error_free_page; - caching = pages + (1 << order); - } - - if (dma_addr) { - r = ttm_pool_map(pool, order, p, &dma_addr); - if (r) - goto error_free_page; - } - - num_pages -= 1 << order; - for (i = 1 << order; i; --i) { - *(pages++) = p++; - *(orders++) = order; - } } r = ttm_pool_apply_caching(caching, pages, tt->caching); @@ -579,15 +657,13 @@ int ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt, return 0; error_free_page: - ttm_pool_free_page(pool, tt->caching, order, p); + ttm_pool_free_page(pool, page_caching, order, p); error_free_all: num_pages = tt->num_pages - num_pages; - for (i = 0; i < num_pages; ) { - order = tt->orders[i]; - ttm_pool_free_page(pool, tt->caching, order, tt->pages[i]); - i += 1 << order; - } + caching_divide = caching - tt->pages; + ttm_pool_free_range(pool, tt, tt->caching, 0, caching_divide); + ttm_pool_free_range(pool, tt, ttm_cached, caching_divide, num_pages); return r; } @@ -603,26 +679,7 @@ EXPORT_SYMBOL(ttm_pool_alloc); */ void ttm_pool_free(struct ttm_pool *pool, struct ttm_tt *tt) { - unsigned int i; - - for (i = 0; i < tt->num_pages; ) { - unsigned int order, num_pages; - struct ttm_pool_type *pt; - - order = tt->orders[i]; - num_pages = 1ULL << order; - if (tt->dma_address) - ttm_pool_unmap(pool, tt->dma_address[i], num_pages); - - pt = ttm_pool_select_type(pool, tt->caching, order); - if (pt) - ttm_pool_type_give(pt, tt->pages[i]); - else - ttm_pool_free_page(pool, tt->caching, order, - tt->pages[i]); - - i += num_pages; - } + ttm_pool_free_range(pool, tt, tt->caching, 0, tt->num_pages); while (atomic_long_read(&allocated_pages) > page_pool_size) ttm_pool_shrink(); diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index bf04f4a26..8aa8740bc 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.170 2023/04/14 12:45:10 stsp Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.171 2023/05/11 16:55:46 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -8431,17 +8431,6 @@ iwx_run_stop(struct iwx_softc *sc) return err; } - /* Reset Tx chains in case MIMO or 40 MHz channels were enabled. */ - if (in->in_ni.ni_flags & IEEE80211_NODE_HT) { - err = iwx_phy_ctxt_update(sc, in->in_phyctxt, - in->in_phyctxt->channel, 1, 1, 0, IEEE80211_HTOP0_SCO_SCN, - IEEE80211_VHTOP0_CHAN_WIDTH_HT); - if (err) { - printf("%s: failed to update PHY\n", DEVNAME(sc)); - return err; - } - } - return 0; } diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 85a0dcaad..4d7960895 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.2034 2023/05/01 07:24:04 dlg Exp $ +$OpenBSD: pcidevs,v 1.2036 2023/05/12 11:42:22 jsg Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -5892,16 +5892,15 @@ product INTEL DG2_G11_2 0x5694 Arc A350M product INTEL DG2_G11_3 0x5695 Graphics product INTEL DG2_G12_1 0x5696 Graphics product INTEL DG2_G12_2 0x5697 Graphics -product INTEL DG2_G11_4 0x5698 Graphics product INTEL DG2_G10_4 0x56a0 Arc A770 product INTEL DG2_G10_5 0x56a1 Arc A750 product INTEL DG2_G10_6 0x56a2 Arc A580 product INTEL DG2_G12_3 0x56a3 Graphics product INTEL DG2_G12_4 0x56a4 Graphics -product INTEL DG2_G11_5 0x56a5 Arc A380 -product INTEL DG2_G11_6 0x56a6 Arc A310 -product INTEL DG2_G11_7 0x56b0 Arc Pro A30M -product INTEL DG2_G11_8 0x56b1 Arc Pro A40/A50 +product INTEL DG2_G11_4 0x56a5 Arc A380 +product INTEL DG2_G11_5 0x56a6 Arc A310 +product INTEL DG2_G11_6 0x56b0 Arc Pro A30M +product INTEL DG2_G11_7 0x56b1 Arc Pro A40/A50 product INTEL DG2_G12_5 0x56b2 Graphics product INTEL DG2_G12_6 0x56b3 Graphics product INTEL ATS_M150 0x56c0 Flex 170 @@ -7063,6 +7062,7 @@ product LEADTEK WINFAST_XP 0x6609 Leadtek WinFast TV 2000 XP /* Lenovo products */ product LENOVO NVME 0x0003 NVMe +product LENOVO NVME_2 0x0006 NVMe /* Level 1 (Intel) */ product LEVEL1 LXT1001 0x0001 LXT1001 diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 980e93194..50fb0a592 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.2034 2023/05/01 07:24:04 dlg Exp + * OpenBSD: pcidevs,v 1.2036 2023/05/12 11:42:22 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -5897,16 +5897,15 @@ #define PCI_PRODUCT_INTEL_DG2_G11_3 0x5695 /* Graphics */ #define PCI_PRODUCT_INTEL_DG2_G12_1 0x5696 /* Graphics */ #define PCI_PRODUCT_INTEL_DG2_G12_2 0x5697 /* Graphics */ -#define PCI_PRODUCT_INTEL_DG2_G11_4 0x5698 /* Graphics */ #define PCI_PRODUCT_INTEL_DG2_G10_4 0x56a0 /* Arc A770 */ #define PCI_PRODUCT_INTEL_DG2_G10_5 0x56a1 /* Arc A750 */ #define PCI_PRODUCT_INTEL_DG2_G10_6 0x56a2 /* Arc A580 */ #define PCI_PRODUCT_INTEL_DG2_G12_3 0x56a3 /* Graphics */ #define PCI_PRODUCT_INTEL_DG2_G12_4 0x56a4 /* Graphics */ -#define PCI_PRODUCT_INTEL_DG2_G11_5 0x56a5 /* Arc A380 */ -#define PCI_PRODUCT_INTEL_DG2_G11_6 0x56a6 /* Arc A310 */ -#define PCI_PRODUCT_INTEL_DG2_G11_7 0x56b0 /* Arc Pro A30M */ -#define PCI_PRODUCT_INTEL_DG2_G11_8 0x56b1 /* Arc Pro A40/A50 */ +#define PCI_PRODUCT_INTEL_DG2_G11_4 0x56a5 /* Arc A380 */ +#define PCI_PRODUCT_INTEL_DG2_G11_5 0x56a6 /* Arc A310 */ +#define PCI_PRODUCT_INTEL_DG2_G11_6 0x56b0 /* Arc Pro A30M */ +#define PCI_PRODUCT_INTEL_DG2_G11_7 0x56b1 /* Arc Pro A40/A50 */ #define PCI_PRODUCT_INTEL_DG2_G12_5 0x56b2 /* Graphics */ #define PCI_PRODUCT_INTEL_DG2_G12_6 0x56b3 /* Graphics */ #define PCI_PRODUCT_INTEL_ATS_M150 0x56c0 /* Flex 170 */ @@ -7068,6 +7067,7 @@ /* Lenovo products */ #define PCI_PRODUCT_LENOVO_NVME 0x0003 /* NVMe */ +#define PCI_PRODUCT_LENOVO_NVME_2 0x0006 /* NVMe */ /* Level 1 (Intel) */ #define PCI_PRODUCT_LEVEL1_LXT1001 0x0001 /* LXT1001 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index cb61fc1af..30cd87b2c 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.2034 2023/05/01 07:24:04 dlg Exp + * OpenBSD: pcidevs,v 1.2036 2023/05/12 11:42:22 jsg Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -20943,10 +20943,6 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G12_2, "Graphics", }, - { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_4, - "Graphics", - }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G10_4, "Arc A770", @@ -20968,19 +20964,19 @@ static const struct pci_known_product pci_known_products[] = { "Graphics", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_5, + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_4, "Arc A380", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_6, + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_5, "Arc A310", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_7, + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_6, "Arc Pro A30M", }, { - PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_8, + PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DG2_G11_7, "Arc Pro A40/A50", }, { @@ -25507,6 +25503,10 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_LENOVO, PCI_PRODUCT_LENOVO_NVME, "NVMe", }, + { + PCI_VENDOR_LENOVO, PCI_PRODUCT_LENOVO_NVME_2, + "NVMe", + }, { PCI_VENDOR_LEVEL1, PCI_PRODUCT_LEVEL1_LXT1001, "LXT1001", diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c index 6793824d7..0c8bacef2 100644 --- a/sys/dev/usb/if_ure.c +++ b/sys/dev/usb/if_ure.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ure.c,v 1.31 2022/10/27 13:21:14 patrick Exp $ */ +/* $OpenBSD: if_ure.c,v 1.32 2023/05/06 08:07:10 kevlo Exp $ */ /*- * Copyright (c) 2015, 2016, 2019 Kevin Lo * Copyright (c) 2020 Jonathon Fletcher @@ -270,7 +270,7 @@ ure_read_1(struct ure_softc *sc, uint16_t reg, uint16_t index) shift = (reg & 3) << 3; reg &= ~3; - + ure_read_mem(sc, reg, index, &temp, 4); val = UGETDW(temp); val >>= shift; @@ -466,8 +466,8 @@ ure_ifmedia_init(struct ifnet *ifp) reg = sc->ure_rxbufsz - URE_FRAMELEN(ifp->if_mtu) - sizeof(struct ure_rxpkt) - URE_RX_BUF_ALIGN; - if (sc->ure_flags & (URE_FLAG_8153B | URE_FLAG_8156 | - URE_FLAG_8156B)) { + if (sc->ure_flags & + (URE_FLAG_8153B | URE_FLAG_8156 | URE_FLAG_8156B)) { ure_write_2(sc, URE_USB_RX_EARLY_SIZE, URE_MCU_TYPE_USB, reg / 8); @@ -493,6 +493,11 @@ ure_ifmedia_init(struct ifnet *ifp) reg); } + if (sc->ure_chip & URE_CHIP_VER_7420) { + URE_SETBIT_2(sc, URE_PLA_MAC_PWR_CTRL4, + URE_MCU_TYPE_PLA, URE_IDLE_SPDWN_EN); + } + if ((sc->ure_chip & URE_CHIP_VER_6010) || (sc->ure_flags & URE_FLAG_8156B)) { URE_CLRBIT_2(sc, URE_USB_FW_TASK, URE_MCU_TYPE_USB, @@ -502,7 +507,7 @@ ure_ifmedia_init(struct ifnet *ifp) URE_FC_PATCH_TASK); } } - + /* Reset the packet filter. */ URE_CLRBIT_2(sc, URE_PLA_FMC, URE_MCU_TYPE_PLA, URE_FMC_FCR_MCU_EN); URE_SETBIT_2(sc, URE_PLA_FMC, URE_MCU_TYPE_PLA, URE_FMC_FCR_MCU_EN); @@ -530,15 +535,18 @@ ure_ifmedia_upd(struct ifnet *ifp) if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return (EINVAL); - reg = ure_ocp_reg_read(sc, 0xa5d4); - reg &= ~URE_ADV_2500TFDX; + if (!(sc->ure_chip & URE_CHIP_VER_7420)) { + reg = ure_ocp_reg_read(sc, URE_OCP_10GBT_CTRL); + reg &= ~URE_ADV_2500TFDX; + } anar = gig = 0; switch (IFM_SUBTYPE(ifm->ifm_media)) { case IFM_AUTO: anar |= ANAR_TX_FD | ANAR_TX | ANAR_10_FD | ANAR_10; gig |= GTCR_ADV_1000TFDX | GTCR_ADV_1000THDX; - reg |= URE_ADV_2500TFDX; + if (!(sc->ure_chip & URE_CHIP_VER_7420)) + reg |= URE_ADV_2500TFDX; break; case IFM_2500_T: anar |= ANAR_TX_FD | ANAR_TX | ANAR_10_FD | ANAR_10; @@ -566,9 +574,10 @@ ure_ifmedia_upd(struct ifnet *ifp) } ure_ocp_reg_write(sc, URE_OCP_BASE_MII + MII_ANAR * 2, - anar | ANAR_PAUSE_ASYM | ANAR_FC); - ure_ocp_reg_write(sc, URE_OCP_BASE_MII + MII_100T2CR * 2, gig); - ure_ocp_reg_write(sc, 0xa5d4, reg); + anar | ANAR_PAUSE_ASYM | ANAR_FC); + ure_ocp_reg_write(sc, URE_OCP_BASE_MII + MII_100T2CR * 2, gig); + if (!(sc->ure_chip & URE_CHIP_VER_7420)) + ure_ocp_reg_write(sc, URE_OCP_10GBT_CTRL, reg); ure_ocp_reg_write(sc, URE_OCP_BASE_MII + MII_BMCR, BMCR_AUTOEN | BMCR_STARTNEG); @@ -602,7 +611,7 @@ ure_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) status = ure_read_2(sc, URE_PLA_PHYSTATUS, URE_MCU_TYPE_PLA); if ((status & URE_PHYSTATUS_FDX) || - (status & URE_PHYSTATUS_2500MBPS)) + (status & URE_PHYSTATUS_2500MBPS)) ifmr->ifm_active |= IFM_FDX; else ifmr->ifm_active |= IFM_HDX; @@ -634,9 +643,11 @@ ure_add_media_types(struct ure_softc *sc) ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_1000_T, 0, NULL); ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_1000_T | IFM_FDX, 0, NULL); - ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_2500_T, 0, NULL); - ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_2500_T | IFM_FDX, 0, - NULL); + if (!(sc->ure_chip & URE_CHIP_VER_7420)) { + ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_2500_T, 0, NULL); + ifmedia_add(&sc->ure_ifmedia, IFM_ETHER | IFM_2500_T | IFM_FDX, + 0, NULL); + } } void @@ -929,7 +940,7 @@ ure_start(struct ifnet *ifp) continue; } - /* + /* * If packet larger than remaining space, send buffer and * continue. */ @@ -1176,12 +1187,12 @@ ure_rtl8153_init(struct ure_softc *sc) } URE_SETBIT_1(sc, URE_USB_CSR_DUMMY2, URE_MCU_TYPE_USB, URE_EP4_FULL_FC); - + URE_CLRBIT_2(sc, URE_USB_WDT11_CTRL, URE_MCU_TYPE_USB, URE_TIMER11_EN); URE_CLRBIT_2(sc, URE_PLA_LED_FEATURE, URE_MCU_TYPE_PLA, URE_LED_MODE_MASK); - + if ((sc->ure_chip & URE_CHIP_VER_5C10) && sc->ure_udev->speed != USB_SPEED_SUPER) reg = URE_LPM_TIMER_500MS; @@ -1269,7 +1280,7 @@ ure_rtl8153b_init(struct ure_softc *sc) URE_CLRBIT_1(sc, URE_USB_POWER_CUT, URE_MCU_TYPE_USB, URE_UPS_EN | URE_USP_PREWAKE); URE_CLRBIT_1(sc, URE_USB_MISC_2, URE_MCU_TYPE_USB, - URE_UPS_FORCE_PWR_DOWN); + URE_UPS_FORCE_PWR_DOWN | URE_UPS_NO_UPS); URE_CLRBIT_1(sc, URE_PLA_INDICATE_FALG, URE_MCU_TYPE_PLA, URE_UPCOMING_RUNTIME_D3); @@ -1318,7 +1329,7 @@ ure_rtl8153b_init(struct ure_softc *sc) URE_SETBIT_2(sc, URE_USB_FW_TASK, URE_MCU_TYPE_USB, URE_FC_PATCH_TASK); } - + /* MAC clock speed down. */ if (sc->ure_flags & (URE_FLAG_8156 | URE_FLAG_8156B)) { ure_write_2(sc, URE_PLA_MAC_PWR_CTRL, URE_MCU_TYPE_PLA, 0x0403); @@ -1350,6 +1361,17 @@ ure_rtl8153b_init(struct ure_softc *sc) URE_SETBIT_1(sc, URE_USB_BMU_CONFIG, URE_MCU_TYPE_USB, URE_ACT_ODMA); + if (!(sc->ure_flags & URE_FLAG_8153B)) { + /* + * Select force mode through 0xa5b4 bit 15 + * 0: MDIO force mode + * 1: MMD force mode + */ + reg = ure_ocp_reg_read(sc, 0xa5b4); + if (reg & 0x8000) + ure_ocp_reg_write(sc, 0xa5b4, reg & ~0x8000); + } + URE_SETBIT_2(sc, URE_PLA_RSTTALLY, URE_MCU_TYPE_PLA, URE_TALLY_RESET); } @@ -1523,9 +1545,7 @@ ure_rtl8153_nic_reset(struct ure_softc *sc) ure_write_4(sc, URE_USB_RX_BUF_TH, URE_MCU_TYPE_USB, 0x00600400); - } - - if (!(sc->ure_flags & (URE_FLAG_8156 | URE_FLAG_8156B))) { + } else { URE_SETBIT_2(sc, URE_PLA_TCR0, URE_MCU_TYPE_PLA, URE_TCR0_AUTO_FIFO); ure_reset(sc); @@ -1611,7 +1631,7 @@ ure_wait_for_flash(struct ure_softc *sc) int i; if ((ure_read_2(sc, URE_PLA_GPHY_CTRL, URE_MCU_TYPE_PLA) & - URE_GPHY_FLASH) && + URE_GPHY_FLASH) && !(ure_read_2(sc, URE_USB_GPHY_CTRL, URE_MCU_TYPE_USB) & URE_BYPASS_FLASH)) { for (i = 0; i < 100; i++) { @@ -1712,7 +1732,7 @@ ure_match(struct device *parent, void *match, void *aux) if (uaa->iface == NULL || uaa->configno != 1) return (UMATCH_NONE); - + return (usb_lookup(ure_devs, uaa->vendor, uaa->product) != NULL ? UMATCH_VENDOR_PRODUCT_CONF_IFACE : UMATCH_NONE); } @@ -1811,6 +1831,11 @@ ure_attach(struct device *parent, struct device *self, void *aux) sc->ure_flags = URE_FLAG_8156B; printf("RTL8156B (0x7410)"); break; + case 0x7420: + sc->ure_flags = URE_FLAG_8156B; + sc->ure_chip = URE_CHIP_VER_7420; + printf("RTL8153D (0x7420)"); + break; default: printf(", unknown ver %02x", ver); break; @@ -1981,7 +2006,7 @@ ure_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) struct mbuf *m; int pktlen = 0, s; struct ure_rxpkt rxhdr; - + if (usbd_is_dying(sc->ure_udev)) return; diff --git a/sys/dev/usb/if_urereg.h b/sys/dev/usb/if_urereg.h index 47b7cdb3f..4d6153109 100644 --- a/sys/dev/usb/if_urereg.h +++ b/sys/dev/usb/if_urereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urereg.h,v 1.11 2022/04/02 12:22:56 kevlo Exp $ */ +/* $OpenBSD: if_urereg.h,v 1.12 2023/05/06 08:07:10 kevlo Exp $ */ /*- * Copyright (c) 2015, 2016, 2019 Kevin Lo * All rights reserved. @@ -167,6 +167,7 @@ #define URE_OCP_EEE_ABLE 0xa5c4 #define URE_OCP_EEE_ADV 0xa5d0 #define URE_OCP_EEE_LPABLE 0xa5d2 +#define URE_OCP_10GBT_CTRL 0xa5d4 #define URE_OCP_PHY_STATE 0xa708 #define URE_OCP_ADC_CFG 0xbc06 @@ -248,19 +249,19 @@ #define URE_CRWECR_CONFIG 0xc0 /* URE_PLA_OOB_CTRL */ -#define URE_DIS_MCU_CLROOB 0x01 -#define URE_LINK_LIST_READY 0x02 -#define URE_RXFIFO_EMPTY 0x10 -#define URE_TXFIFO_EMPTY 0x20 -#define URE_NOW_IS_OOB 0x80 +#define URE_DIS_MCU_CLROOB 0x01 +#define URE_LINK_LIST_READY 0x02 +#define URE_RXFIFO_EMPTY 0x10 +#define URE_TXFIFO_EMPTY 0x20 +#define URE_NOW_IS_OOB 0x80 #define URE_FIFO_EMPTY (URE_TXFIFO_EMPTY | URE_RXFIFO_EMPTY) /* URE_PLA_MISC_1 */ -#define URE_RXDY_GATED_EN 0x0008 +#define URE_RXDY_GATED_EN 0x0008 /* URE_PLA_SFF_STS_7 */ -#define URE_MCU_BORW_EN 0x4000 -#define URE_RE_INIT_LL 0x8000 +#define URE_MCU_BORW_EN 0x4000 +#define URE_RE_INIT_LL 0x8000 /* URE_PLA_CPCR */ #define URE_FLOW_CTRL_EN 0x0001 @@ -312,6 +313,7 @@ #define URE_TP1000_SPDWN_EN 0x0008 #define URE_TP500_SPDWN_EN 0x0010 #define URE_TP100_SPDWN_EN 0x0020 +#define URE_IDLE_SPDWN_EN 0x0040 #define URE_TX10MIDLE_EN 0x0100 #define URE_RXDV_SPDWN_EN 0x0800 #define URE_PWRSAVE_SPDWN_EN 0x1000 @@ -391,6 +393,7 @@ /* URE_USB_MISC_2 */ #define URE_UPS_FORCE_PWR_DOWN 0x01 +#define URE_UPS_NO_UPS 0x80 /* URE_USB_ECM_OPTION */ #define URE_BYPASS_MAC_RESET 0x0020 @@ -493,15 +496,15 @@ #define URE_UPS_FLAGS_MASK 0xffffffff /* URE_OCP_ALDPS_CONFIG */ -#define URE_ENPWRSAVE 0x8000 -#define URE_ENPDNPS 0x0200 -#define URE_LINKENA 0x0100 +#define URE_ENPWRSAVE 0x8000 +#define URE_ENPDNPS 0x0200 +#define URE_LINKENA 0x0100 #define URE_DIS_SDSAVE 0x0010 /* URE_OCP_PHY_STATUS */ #define URE_PHY_STAT_MASK 0x0007 #define URE_PHY_STAT_EXT_INIT 2 -#define URE_PHY_STAT_LAN_ON 3 +#define URE_PHY_STAT_LAN_ON 3 #define URE_PHY_STAT_PWRDN 5 /* URE_OCP_POWER_CFG */ @@ -646,4 +649,5 @@ struct ure_softc { #define URE_CHIP_VER_5C20 0x10 #define URE_CHIP_VER_5C30 0x20 #define URE_CHIP_VER_6010 0x40 +#define URE_CHIP_VER_7420 0x80 }; diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 008ae4bb1..2136a6dc9 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.98 2022/07/15 17:57:27 kettenis Exp $ */ +/* $OpenBSD: udl.c,v 1.99 2023/05/10 18:28:04 miod Exp $ */ /* * Copyright (c) 2009 Marcus Glocker @@ -249,7 +249,8 @@ static const struct udl_type udl_devs[] = { { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_CONV }, DL160 }, { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LUM70 }, DL125 }, { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_POLARIS2 }, DLUNK }, - { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421 }, DLUNK } + { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421 }, DLUNK }, + { { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_TOSHIBA }, DLUNK } }; #define udl_lookup(v, p) ((struct udl_type *)usb_lookup(udl_devs, v, p)) diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index 18676aaa7..16f466baa 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.63 2022/04/16 19:19:59 naddy Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.64 2023/05/10 15:28:26 krw Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -96,6 +96,11 @@ umass_scsi_attach(struct umass_softc *sc) sc->sc_dev.dv_xname, sc, scbus)); break; case UMASS_CPROTO_UFI: + flags |= SDEV_UFI | SDEV_ATAPI; + DPRINTF(UDMASS_USB, ("%s: umass_attach_bus: UFI\n" + "sc = 0x%p, scbus = 0x%p\n", + sc->sc_dev.dv_xname, sc, scbus)); + break; case UMASS_CPROTO_ATAPI: flags |= SDEV_ATAPI; DPRINTF(UDMASS_USB, ("%s: umass_attach_bus: ATAPI\n" diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index f2b82c103..edb86ebbf 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$OpenBSD: usbdevs,v 1.755 2023/04/28 01:24:14 kevlo Exp $ +$OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp $ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* @@ -1575,6 +1575,7 @@ product DIGITALSTREAM PS2 0x0001 PS/2 Active /* DisplayLink products */ product DISPLAYLINK GUC2020 0x0059 IOGEAR DVI GUC2020 product DISPLAYLINK LD220 0x0100 Samsung LD220 +product DISPLAYLINK TOSHIBA 0x0110 TOSHIBA Video Dock product DISPLAYLINK POLARIS2 0x0117 Polaris2 USB dock product DISPLAYLINK VCUD60 0x0136 Rextron DVI product DISPLAYLINK CONV 0x0138 StarTech CONV-USB2DVI diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 2c753908b..022a71013 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.767 2023/04/28 01:24:51 kevlo Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.768 2023/05/10 18:26:43 miod Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.755 2023/04/28 01:24:14 kevlo Exp + * OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -1582,6 +1582,7 @@ /* DisplayLink products */ #define USB_PRODUCT_DISPLAYLINK_GUC2020 0x0059 /* IOGEAR DVI GUC2020 */ #define USB_PRODUCT_DISPLAYLINK_LD220 0x0100 /* Samsung LD220 */ +#define USB_PRODUCT_DISPLAYLINK_TOSHIBA 0x0110 /* TOSHIBA Video Dock */ #define USB_PRODUCT_DISPLAYLINK_POLARIS2 0x0117 /* Polaris2 USB dock */ #define USB_PRODUCT_DISPLAYLINK_VCUD60 0x0136 /* Rextron DVI */ #define USB_PRODUCT_DISPLAYLINK_CONV 0x0138 /* StarTech CONV-USB2DVI */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 0e456b32c..92c80f0ce 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.761 2023/04/28 01:24:51 kevlo Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.762 2023/05/10 18:26:43 miod Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.755 2023/04/28 01:24:14 kevlo Exp + * OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -2589,6 +2589,10 @@ const struct usb_known_product usb_known_products[] = { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LD220, "Samsung LD220", }, + { + USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_TOSHIBA, + "TOSHIBA Video Dock", + }, { USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_POLARIS2, "Polaris2 USB dock", diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 399dd0b65..ae455082b 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.264 2023/02/27 00:58:38 deraadt Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.265 2023/05/04 09:41:15 mvs Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.246 2023/02/25 09:55:46 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.247 2023/05/04 09:40:36 mvs Exp */ #include @@ -441,7 +441,7 @@ const struct sysent sysent[] = { sys_nosys }, /* 200 = obsolete pad_truncate */ { 0, 0, 0, sys_nosys }, /* 201 = obsolete pad_ftruncate */ - { 6, s(struct sys_sysctl_args), 0, + { 6, s(struct sys_sysctl_args), SY_NOLOCK | 0, sys_sysctl }, /* 202 = sysctl */ { 2, s(struct sys_mlock_args), 0, sys_mlock }, /* 203 = mlock */ diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 817b9fd01..9108277af 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.111 2023/02/16 08:50:57 claudio Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.112 2023/05/11 09:51:33 bluhm Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -160,7 +160,7 @@ ktrsyscall(struct proc *p, register_t code, size_t argsize, register_t args[]) u_int nargs = 0; int i; - if (code == SYS_sysctl) { + if ((code & KTRC_CODE_MASK) == SYS_sysctl) { /* * The sysctl encoding stores the mib[] * array because it is interesting. diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index b017372eb..0f434246f 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.411 2023/01/22 12:05:44 mvs Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.412 2023/05/04 09:40:36 mvs Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -168,7 +168,7 @@ sys_sysctl(struct proc *p, void *v, register_t *retval) syscallarg(void *) new; syscallarg(size_t) newlen; } */ *uap = v; - int error, dolock = 1; + int error, dokernellock = 1, dolock = 1; size_t savelen = 0, oldlen = 0; sysctlfn *fn; int name[CTL_MAXNAME]; @@ -203,6 +203,7 @@ sys_sysctl(struct proc *p, void *v, register_t *retval) break; case CTL_NET: fn = net_sysctl; + dokernellock = 0; break; case CTL_FS: fn = fs_sysctl; @@ -230,19 +231,22 @@ sys_sysctl(struct proc *p, void *v, register_t *retval) if (SCARG(uap, oldlenp) && (error = copyin(SCARG(uap, oldlenp), &oldlen, sizeof(oldlen)))) return (error); + if (dokernellock) + KERNEL_LOCK(); if (SCARG(uap, old) != NULL) { if ((error = rw_enter(&sysctl_lock, RW_WRITE|RW_INTR)) != 0) - return (error); + goto unlock; if (dolock) { if (atop(oldlen) > uvmexp.wiredmax - uvmexp.wired) { rw_exit_write(&sysctl_lock); - return (ENOMEM); + error = ENOMEM; + goto unlock; } error = uvm_vslock(p, SCARG(uap, old), oldlen, PROT_READ | PROT_WRITE); if (error) { rw_exit_write(&sysctl_lock); - return (error); + goto unlock; } } savelen = oldlen; @@ -254,6 +258,9 @@ sys_sysctl(struct proc *p, void *v, register_t *retval) uvm_vsunlock(p, SCARG(uap, old), savelen); rw_exit_write(&sysctl_lock); } +unlock: + if (dokernellock) + KERNEL_UNLOCK(); if (error) return (error); if (SCARG(uap, oldlenp)) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 9eccb48a3..e012d086b 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.155 2023/02/25 09:55:46 mvs Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.156 2023/05/09 14:22:17 visa Exp $ */ /* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */ /* @@ -769,12 +769,6 @@ pselregister(struct proc *p, fd_set *pibits[3], fd_set *pobits[3], int nfd, * __EV_SELECT */ error = 0; break; - case EPIPE: /* Specific to pipes */ - KASSERT(kev.filter == EVFILT_WRITE); - FD_SET(kev.ident, pobits[1]); - (*ncollected)++; - error = 0; - break; case ENXIO: /* Device has been detached */ default: goto bad; @@ -1073,10 +1067,6 @@ again: goto again; } break; - case EPIPE: /* Specific to pipes */ - KASSERT(kevp->filter == EVFILT_WRITE); - pl->revents |= POLLHUP; - break; default: DPRINTFN(0, "poll err %lu fd %d revents %02x serial" " %lu filt %d ERROR=%d\n", diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index dd072058e..0c5b5406b 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.145 2023/02/12 10:41:00 mvs Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.146 2023/05/09 14:22:17 visa Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -857,9 +857,13 @@ pipe_kqfilter(struct file *fp, struct knote *kn) break; case EVFILT_WRITE: if (wpipe == NULL) { - /* other end of pipe has been closed */ - error = EPIPE; - break; + /* + * The other end of the pipe has been closed. + * Since the filter now always indicates a pending + * event, attach the knote to the current side + * to proceed with the registration. + */ + wpipe = rpipe; } kn->kn_fop = &pipe_wfiltops; kn->kn_hook = wpipe; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index ec9322c51..3d816ebc2 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.262 2023/02/27 00:58:38 deraadt Exp $ */ +/* $OpenBSD: syscalls.c,v 1.263 2023/05/04 09:41:15 mvs Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.246 2023/02/25 09:55:46 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.247 2023/05/04 09:40:36 mvs Exp */ const char *const syscallnames[] = { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 7f437623b..3faf5dde4 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ -; $OpenBSD: syscalls.master,v 1.246 2023/02/25 09:55:46 mvs Exp $ +; $OpenBSD: syscalls.master,v 1.247 2023/05/04 09:40:36 mvs Exp $ ; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -361,7 +361,7 @@ 199 OBSOL pad_lseek 200 OBSOL pad_truncate 201 OBSOL pad_ftruncate -202 STD { int sys_sysctl(const int *name, u_int namelen, \ +202 STD NOLOCK { int sys_sysctl(const int *name, u_int namelen, \ void *old, size_t *oldlenp, void *new, \ size_t newlen); } 203 STD { int sys_mlock(const void *addr, size_t len); } diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 1534c0dbf..3b5c0bbbc 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.60 2022/08/14 01:58:28 jsg Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.61 2023/05/04 09:40:36 mvs Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -213,9 +213,13 @@ net_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, newp, newlen)); #endif #if NPFLOW > 0 - if (family == PF_PFLOW) - return (pflow_sysctl(name + 1, namelen - 1, oldp, oldlenp, - newp, newlen)); + if (family == PF_PFLOW) { + KERNEL_LOCK(); + error = pflow_sysctl(name + 1, namelen - 1, oldp, oldlenp, + newp, newlen); + KERNEL_UNLOCK(); + return (error); + } #endif #ifdef PIPEX if (family == PF_PIPEX) @@ -223,9 +227,13 @@ net_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, newp, newlen)); #endif #ifdef MPLS - if (family == PF_MPLS) - return (mpls_sysctl(name + 1, namelen - 1, oldp, oldlenp, - newp, newlen)); + if (family == PF_MPLS) { + KERNEL_LOCK(); + error = mpls_sysctl(name + 1, namelen - 1, oldp, oldlenp, + newp, newlen); + KERNEL_UNLOCK(); + return (error); + } #endif dp = pffinddomain(family); if (dp == NULL) @@ -236,8 +244,10 @@ net_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, protocol = name[1]; for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_protocol == protocol && pr->pr_sysctl) { + KERNEL_LOCK(); error = (*pr->pr_sysctl)(name + 2, namelen - 2, oldp, oldlenp, newp, newlen); + KERNEL_UNLOCK(); return (error); } return (ENOPROTOOPT); diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index ffafd2285..6f0ea19b0 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.284 2022/08/14 01:58:28 jsg Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.285 2023/05/05 01:19:51 bluhm Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -1776,6 +1776,14 @@ mq_hdatalen(struct mbuf_queue *mq) return (hdatalen); } +void +mq_set_maxlen(struct mbuf_queue *mq, u_int maxlen) +{ + mtx_enter(&mq->mq_mtx); + mq->mq_maxlen = maxlen; + mtx_leave(&mq->mq_mtx); +} + int sysctl_mq(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, size_t newlen, struct mbuf_queue *mq) @@ -1793,11 +1801,8 @@ sysctl_mq(int *name, u_int namelen, void *oldp, size_t *oldlenp, case IFQCTL_MAXLEN: maxlen = mq->mq_maxlen; error = sysctl_int(oldp, oldlenp, newp, newlen, &maxlen); - if (!error && maxlen != mq->mq_maxlen) { - mtx_enter(&mq->mq_mtx); - mq->mq_maxlen = maxlen; - mtx_leave(&mq->mq_mtx); - } + if (!error && maxlen != mq->mq_maxlen) + mq_set_maxlen(mq, maxlen); return (error); case IFQCTL_DROPS: return (sysctl_rdint(oldp, oldlenp, newp, mq_drops(mq))); diff --git a/sys/net/if.c b/sys/net/if.c index 4534ed54f..e9ea77f61 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.694 2023/04/26 19:54:35 mvs Exp $ */ +/* $OpenBSD: if.c,v 1.695 2023/05/07 16:23:23 bluhm Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -761,27 +761,6 @@ if_enqueue_ifq(struct ifnet *ifp, struct mbuf *m) return (0); } -void -if_mqoutput(struct ifnet *ifp, struct mbuf_queue *mq, unsigned int *total, - struct sockaddr *dst, struct rtentry *rt) -{ - struct mbuf_list ml; - struct mbuf *m; - unsigned int len; - - mq_delist(mq, &ml); - len = ml_len(&ml); - while ((m = ml_dequeue(&ml)) != NULL) - ifp->if_output(ifp, m, rt_key(rt), rt); - - /* XXXSMP we also discard if other CPU enqueues */ - if (mq_len(mq) > 0) { - /* mbuf is back in queue. Discard. */ - atomic_sub_int(total, len + mq_purge(mq)); - } else - atomic_sub_int(total, len); -} - void if_input(struct ifnet *ifp, struct mbuf_list *ml) { @@ -843,6 +822,46 @@ if_input_local(struct ifnet *ifp, struct mbuf *m, sa_family_t af) return (0); } +int +if_output_ml(struct ifnet *ifp, struct mbuf_list *ml, + struct sockaddr *dst, struct rtentry *rt) +{ + struct mbuf *m; + int error = 0; + + while ((m = ml_dequeue(ml)) != NULL) { + error = ifp->if_output(ifp, m, dst, rt); + if (error) + break; + } + if (error) + ml_purge(ml); + + return error; +} + +int +if_output_mq(struct ifnet *ifp, struct mbuf_queue *mq, unsigned int *total, + struct sockaddr *dst, struct rtentry *rt) +{ + struct mbuf_list ml; + unsigned int len; + int error; + + mq_delist(mq, &ml); + len = ml_len(&ml); + error = if_output_ml(ifp, &ml, dst, rt); + + /* XXXSMP we also discard if other CPU enqueues */ + if (mq_len(mq) > 0) { + /* mbuf is back in queue. Discard. */ + atomic_sub_int(total, len + mq_purge(mq)); + } else + atomic_sub_int(total, len); + + return error; +} + int if_output_local(struct ifnet *ifp, struct mbuf *m, sa_family_t af) { diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index a202556e4..463ca9cf9 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.365 2023/02/27 09:35:32 jan Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.366 2023/05/07 16:23:23 bluhm Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -1826,7 +1826,7 @@ bridge_fragment(struct ifnet *brifp, struct ifnet *ifp, struct ether_header *eh, struct mbuf *m) { struct llc llc; - struct mbuf_list fml; + struct mbuf_list ml; int error = 0; int hassnap = 0; u_int16_t etype; @@ -1884,11 +1884,11 @@ bridge_fragment(struct ifnet *brifp, struct ifnet *ifp, struct ether_header *eh, return; } - error = ip_fragment(m, &fml, ifp, ifp->if_mtu); + error = ip_fragment(m, &ml, ifp, ifp->if_mtu); if (error) return; - while ((m = ml_dequeue(&fml)) != NULL) { + while ((m = ml_dequeue(&ml)) != NULL) { if (hassnap) { M_PREPEND(m, LLC_SNAPFRAMELEN, M_DONTWAIT); if (m == NULL) { @@ -1908,7 +1908,7 @@ bridge_fragment(struct ifnet *brifp, struct ifnet *ifp, struct ether_header *eh, break; } if (error) - ml_purge(&fml); + ml_purge(&ml); else ipstat_inc(ips_fragmented); diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 853dbccad..94480ac14 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_var.h,v 1.125 2023/04/18 22:01:24 mvs Exp $ */ +/* $OpenBSD: if_var.h,v 1.126 2023/05/07 16:23:23 bluhm Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -321,12 +321,14 @@ extern struct ifnet_head ifnetlist; void if_start(struct ifnet *); int if_enqueue(struct ifnet *, struct mbuf *); int if_enqueue_ifq(struct ifnet *, struct mbuf *); -void if_mqoutput(struct ifnet *, struct mbuf_queue *, unsigned int *, - struct sockaddr *, struct rtentry *); void if_input(struct ifnet *, struct mbuf_list *); void if_vinput(struct ifnet *, struct mbuf *); void if_input_process(struct ifnet *, struct mbuf_list *); int if_input_local(struct ifnet *, struct mbuf *, sa_family_t); +int if_output_ml(struct ifnet *, struct mbuf_list *, + struct sockaddr *, struct rtentry *); +int if_output_mq(struct ifnet *, struct mbuf_queue *, unsigned int *, + struct sockaddr *, struct rtentry *); int if_output_local(struct ifnet *, struct mbuf *, sa_family_t); void if_rtrequest_dummy(struct ifnet *, int, struct rtentry *); void p2p_rtrequest(struct ifnet *, int, struct rtentry *); diff --git a/sys/net/pf.c b/sys/net/pf.c index 8af515586..ee979d9e8 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.1174 2023/04/28 14:08:34 phessler Exp $ */ +/* $OpenBSD: pf.c,v 1.1178 2023/05/10 12:07:16 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1370,6 +1370,8 @@ pf_state_import(const struct pfsync_state *sp, int flags) int error = ENOMEM; int n = 0; + PF_ASSERT_LOCKED(); + if (sp->creatorid == 0) { DPFPRINTF(LOG_NOTICE, "%s: invalid creator id: %08x", __func__, ntohl(sp->creatorid)); @@ -4270,6 +4272,8 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, struct pf_test_ctx ctx; int rv; + PF_ASSERT_LOCKED(); + memset(&ctx, 0, sizeof(ctx)); ctx.pd = pd; ctx.rm = rm; @@ -6462,12 +6466,11 @@ void pf_route(struct pf_pdesc *pd, struct pf_state *st) { struct mbuf *m0; - struct mbuf_list fml; + struct mbuf_list ml; struct sockaddr_in *dst, sin; struct rtentry *rt = NULL; struct ip *ip; struct ifnet *ifp = NULL; - int error = 0; unsigned int rtableid; if (pd->m->m_pkthdr.pf.routed++ > 3) { @@ -6545,8 +6548,6 @@ pf_route(struct pf_pdesc *pd, struct pf_state *st) ip = mtod(m0, struct ip *); } - in_proto_cksum_out(m0, ifp); - if (ntohs(ip->ip_len) <= ifp->if_mtu) { ip->ip_sum = 0; if (ifp->if_capabilities & IFCAP_CSUM_IPv4) @@ -6555,10 +6556,21 @@ pf_route(struct pf_pdesc *pd, struct pf_state *st) ipstat_inc(ips_outswcsum); ip->ip_sum = in_cksum(m0, ip->ip_hl << 2); } - error = ifp->if_output(ifp, m0, sintosa(dst), rt); + in_proto_cksum_out(m0, ifp); + ifp->if_output(ifp, m0, sintosa(dst), rt); goto done; } + if (ISSET(m0->m_pkthdr.csum_flags, M_TCP_TSO) && + m0->m_pkthdr.ph_mss <= ifp->if_mtu) { + if (tcp_chopper(m0, &ml, ifp, m0->m_pkthdr.ph_mss) || + if_output_ml(ifp, &ml, sintosa(dst), rt)) + goto done; + tcpstat_inc(tcps_outswtso); + goto done; + } + CLR(m0->m_pkthdr.csum_flags, M_TCP_TSO); + /* * Too large for interface; fragment if possible. * Must be able to put at least 8 bytes per fragment. @@ -6571,19 +6583,10 @@ pf_route(struct pf_pdesc *pd, struct pf_state *st) goto bad; } - error = ip_fragment(m0, &fml, ifp, ifp->if_mtu); - if (error) + if (ip_fragment(m0, &ml, ifp, ifp->if_mtu) || + if_output_ml(ifp, &ml, sintosa(dst), rt)) goto done; - - while ((m0 = ml_dequeue(&fml)) != NULL) { - error = ifp->if_output(ifp, m0, sintosa(dst), rt); - if (error) - break; - } - if (error) - ml_purge(&fml); - else - ipstat_inc(ips_fragmented); + ipstat_inc(ips_fragmented); done: if_put(ifp); @@ -6601,6 +6604,7 @@ void pf_route6(struct pf_pdesc *pd, struct pf_state *st) { struct mbuf *m0; + struct mbuf_list ml; struct sockaddr_in6 *dst, sin6; struct rtentry *rt = NULL; struct ip6_hdr *ip6; @@ -6683,24 +6687,37 @@ pf_route6(struct pf_pdesc *pd, struct pf_state *st) } } - in6_proto_cksum_out(m0, ifp); - /* * If packet has been reassembled by PF earlier, we have to * use pf_refragment6() here to turn it back to fragments. */ if ((mtag = m_tag_find(m0, PACKET_TAG_PF_REASSEMBLED, NULL))) { (void) pf_refragment6(&m0, mtag, dst, ifp, rt); - } else if ((u_long)m0->m_pkthdr.len <= ifp->if_mtu) { - ifp->if_output(ifp, m0, sin6tosa(dst), rt); - } else { - ip6stat_inc(ip6s_cantfrag); - if (st->rt != PF_DUPTO) - pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, - ifp->if_mtu, pd->af, st->rule.ptr, pd->rdomain); - goto bad; + goto done; } + if (m0->m_pkthdr.len <= ifp->if_mtu) { + in6_proto_cksum_out(m0, ifp); + ifp->if_output(ifp, m0, sin6tosa(dst), rt); + goto done; + } + + if (ISSET(m0->m_pkthdr.csum_flags, M_TCP_TSO) && + m0->m_pkthdr.ph_mss <= ifp->if_mtu) { + if (tcp_chopper(m0, &ml, ifp, m0->m_pkthdr.ph_mss) || + if_output_ml(ifp, &ml, sin6tosa(dst), rt)) + goto done; + tcpstat_inc(tcps_outswtso); + goto done; + } + CLR(m0->m_pkthdr.csum_flags, M_TCP_TSO); + + ip6stat_inc(ip6s_cantfrag); + if (st->rt != PF_DUPTO) + pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, + ifp->if_mtu, pd->af, st->rule.ptr, pd->rdomain); + goto bad; + done: if_put(ifp); rtfree(rt); diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 61a166076..f70796cdd 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.402 2023/04/29 10:25:32 kn Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.404 2023/05/11 12:36:22 kn Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -858,6 +858,8 @@ pf_commit_rules(u_int32_t version, char *anchor) struct pf_rulequeue *old_rules; u_int32_t old_rcount; + PF_ASSERT_LOCKED(); + rs = pf_find_ruleset(anchor); if (rs == NULL || !rs->rules.inactive.open || version != rs->rules.inactive.version) @@ -2105,8 +2107,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) NET_LOCK(); PF_LOCK(); - if (pl->index < 0 || pl->index >= PF_LIMIT_MAX || - pf_pool_limits[pl->index].pp == NULL) { + if (pl->index < 0 || pl->index >= PF_LIMIT_MAX) { error = EINVAL; PF_UNLOCK(); NET_UNLOCK(); @@ -2151,13 +2152,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) struct pf_ruleset *ruleset; struct pf_anchor *anchor; - NET_LOCK(); PF_LOCK(); pr->path[sizeof(pr->path) - 1] = '\0'; if ((ruleset = pf_find_ruleset(pr->path)) == NULL) { error = EINVAL; PF_UNLOCK(); - NET_UNLOCK(); goto fail; } pr->nr = 0; @@ -2172,7 +2171,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) pr->nr++; } PF_UNLOCK(); - NET_UNLOCK(); break; } @@ -2182,13 +2180,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) struct pf_anchor *anchor; u_int32_t nr = 0; - NET_LOCK(); PF_LOCK(); pr->path[sizeof(pr->path) - 1] = '\0'; if ((ruleset = pf_find_ruleset(pr->path)) == NULL) { error = EINVAL; PF_UNLOCK(); - NET_UNLOCK(); goto fail; } pr->name[0] = '\0'; @@ -2210,7 +2206,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) } } PF_UNLOCK(); - NET_UNLOCK(); if (!pr->name[0]) error = EBUSY; break; diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c index a3d8d6333..7bd6dfd60 100644 --- a/sys/net/pf_lb.c +++ b/sys/net/pf_lb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_lb.c,v 1.73 2023/01/04 10:31:55 dlg Exp $ */ +/* $OpenBSD: pf_lb.c,v 1.74 2023/05/10 22:42:51 sashan Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -196,18 +196,24 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_rule *r, /* XXX bug: icmp states dont use the id on both * XXX sides (traceroute -I through nat) */ key.port[sidx] = pd->nsport; + key.hash = pf_pkt_hash(key.af, key.proto, &key.addr[0], + &key.addr[1], key.port[0], key.port[1]); if (pf_find_state_all(&key, dir, NULL) == NULL) { *nport = pd->nsport; return (0); } } else if (low == 0 && high == 0) { key.port[sidx] = pd->nsport; + key.hash = pf_pkt_hash(key.af, key.proto, &key.addr[0], + &key.addr[1], key.port[0], key.port[1]); if (pf_find_state_all(&key, dir, NULL) == NULL) { *nport = pd->nsport; return (0); } } else if (low == high) { key.port[sidx] = htons(low); + key.hash = pf_pkt_hash(key.af, key.proto, &key.addr[0], + &key.addr[1], key.port[0], key.port[1]); if (pf_find_state_all(&key, dir, NULL) == NULL) { *nport = htons(low); return (0); @@ -225,6 +231,9 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_rule *r, /* low <= cut <= high */ for (tmp = cut; tmp <= high && tmp <= 0xffff; ++tmp) { key.port[sidx] = htons(tmp); + key.hash = pf_pkt_hash(key.af, key.proto, + &key.addr[0], &key.addr[1], key.port[0], + key.port[1]); if (pf_find_state_all(&key, dir, NULL) == NULL && !in_baddynamic(tmp, pd->proto)) { *nport = htons(tmp); @@ -234,6 +243,9 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_rule *r, tmp = cut; for (tmp -= 1; tmp >= low && tmp <= 0xffff; --tmp) { key.port[sidx] = htons(tmp); + key.hash = pf_pkt_hash(key.af, key.proto, + &key.addr[0], &key.addr[1], key.port[0], + key.port[1]); if (pf_find_state_all(&key, dir, NULL) == NULL && !in_baddynamic(tmp, pd->proto)) { *nport = htons(tmp); diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index db2f5755b..7ab4c00c7 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.226 2022/11/06 18:05:05 dlg Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.227 2023/05/07 16:23:23 bluhm Exp $ */ /* * Copyright 2001 Niels Provos @@ -954,7 +954,7 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, struct ifnet *ifp, struct rtentry *rt) { struct mbuf *m = *m0; - struct mbuf_list fml; + struct mbuf_list ml; struct pf_fragment_tag *ftag = (struct pf_fragment_tag *)(mtag + 1); u_int32_t mtu; u_int16_t hdrlen, extoff, maxlen; @@ -997,14 +997,14 @@ pf_refragment6(struct mbuf **m0, struct m_tag *mtag, struct sockaddr_in6 *dst, * we drop the packet. */ mtu = hdrlen + sizeof(struct ip6_frag) + maxlen; - error = ip6_fragment(m, &fml, hdrlen, proto, mtu); + error = ip6_fragment(m, &ml, hdrlen, proto, mtu); *m0 = NULL; /* ip6_fragment() has consumed original packet. */ if (error) { DPFPRINTF(LOG_NOTICE, "refragment error %d", error); return (PF_DROP); } - while ((m = ml_dequeue(&fml)) != NULL) { + while ((m = ml_dequeue(&ml)) != NULL) { m->m_pkthdr.pf.flags |= PF_TAG_REFRAGMENTED; if (ifp == NULL) { ip6_forward(m, NULL, 0); diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c index a7f60e2e3..247d87600 100644 --- a/sys/net/pf_osfp.c +++ b/sys/net/pf_osfp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_osfp.c,v 1.45 2020/12/15 15:23:48 sashan Exp $ */ +/* $OpenBSD: pf_osfp.c,v 1.46 2023/05/07 12:45:21 kn Exp $ */ /* * Copyright (c) 2003 Mike Frantzen @@ -60,10 +60,9 @@ typedef struct pool pool_t; #define pool_put(pool, item) free(item) #define pool_init(pool, size, a, ao, f, m, p) (*(pool)) = (size) -#define NET_LOCK() -#define NET_UNLOCK() #define PF_LOCK() #define PF_UNLOCK() +#define PF_ASSERT_LOCKED() #ifdef PFDEBUG #include /* for DPFPRINTF() */ @@ -71,16 +70,21 @@ typedef struct pool pool_t; #endif /* _KERNEL */ -SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list; -pool_t pf_osfp_entry_pl; -pool_t pf_osfp_pl; +/* + * Protection/ownership: + * I immutable after pf_osfp_initialize() + * p pf_lock + */ -struct pf_os_fingerprint *pf_osfp_find(struct pf_osfp_list *, - struct pf_os_fingerprint *, u_int8_t); -struct pf_os_fingerprint *pf_osfp_find_exact(struct pf_osfp_list *, - struct pf_os_fingerprint *); -void pf_osfp_insert(struct pf_osfp_list *, - struct pf_os_fingerprint *); +SLIST_HEAD(pf_osfp_list, pf_os_fingerprint) pf_osfp_list = + SLIST_HEAD_INITIALIZER(pf_osfp_list); /* [p] */ +pool_t pf_osfp_entry_pl; /* [I] */ +pool_t pf_osfp_pl; /* [I] */ + +struct pf_os_fingerprint *pf_osfp_find(struct pf_os_fingerprint *, + u_int8_t); +struct pf_os_fingerprint *pf_osfp_find_exact(struct pf_os_fingerprint *); +void pf_osfp_insert(struct pf_os_fingerprint *); #ifdef _KERNEL @@ -257,8 +261,7 @@ pf_osfp_fingerprint_hdr(const struct ip *ip, const struct ip6_hdr *ip6, (fp.fp_flags & PF_OSFP_WSCALE_DC) ? "*" : "", fp.fp_wscale); - if ((fpresult = pf_osfp_find(&pf_osfp_list, &fp, - PF_OSFP_MAXTTL_OFFSET))) + if ((fpresult = pf_osfp_find(&fp, PF_OSFP_MAXTTL_OFFSET))) return (&fpresult->fp_oses); return (NULL); } @@ -302,7 +305,6 @@ pf_osfp_initialize(void) IPL_NONE, PR_WAITOK, "pfosfpen", NULL); pool_init(&pf_osfp_pl, sizeof(struct pf_os_fingerprint), 0, IPL_NONE, PR_WAITOK, "pfosfp", NULL); - SLIST_INIT(&pf_osfp_list); } /* Flush the fingerprint list */ @@ -312,7 +314,6 @@ pf_osfp_flush(void) struct pf_os_fingerprint *fp; struct pf_osfp_entry *entry; - NET_LOCK(); PF_LOCK(); while ((fp = SLIST_FIRST(&pf_osfp_list))) { SLIST_REMOVE_HEAD(&pf_osfp_list, fp_next); @@ -323,7 +324,6 @@ pf_osfp_flush(void) pool_put(&pf_osfp_pl, fp); } PF_UNLOCK(); - NET_UNLOCK(); } @@ -379,14 +379,12 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc) return (ENOMEM); } - NET_LOCK(); PF_LOCK(); - if ((fp = pf_osfp_find_exact(&pf_osfp_list, &fpadd))) { + if ((fp = pf_osfp_find_exact(&fpadd))) { struct pf_osfp_entry *tentry; SLIST_FOREACH(tentry, &fp->fp_oses, fp_entry) { if (PF_OSFP_ENTRY_EQ(tentry, &fpioc->fp_os)) { - NET_UNLOCK(); PF_UNLOCK(); pool_put(&pf_osfp_entry_pl, entry); pool_put(&pf_osfp_pl, fp_prealloc); @@ -405,7 +403,7 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc) fp->fp_wscale = fpioc->fp_wscale; fp->fp_ttl = fpioc->fp_ttl; SLIST_INIT(&fp->fp_oses); - pf_osfp_insert(&pf_osfp_list, fp); + pf_osfp_insert(fp); } memcpy(entry, &fpioc->fp_os, sizeof(*entry)); @@ -416,7 +414,6 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc) SLIST_INSERT_HEAD(&fp->fp_oses, entry, fp_entry); PF_UNLOCK(); - NET_UNLOCK(); #ifdef PFDEBUG if ((fp = pf_osfp_validate())) @@ -433,11 +430,12 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc) /* Find a fingerprint in the list */ struct pf_os_fingerprint * -pf_osfp_find(struct pf_osfp_list *list, struct pf_os_fingerprint *find, - u_int8_t ttldiff) +pf_osfp_find(struct pf_os_fingerprint *find, u_int8_t ttldiff) { struct pf_os_fingerprint *f; + PF_ASSERT_LOCKED(); + #define MATCH_INT(_MOD, _DC, _field) \ if ((f->fp_flags & _DC) == 0) { \ if ((f->fp_flags & _MOD) == 0) { \ @@ -449,7 +447,7 @@ pf_osfp_find(struct pf_osfp_list *list, struct pf_os_fingerprint *find, } \ } - SLIST_FOREACH(f, list, fp_next) { + SLIST_FOREACH(f, &pf_osfp_list, fp_next) { if (f->fp_tcpopts != find->fp_tcpopts || f->fp_optcnt != find->fp_optcnt || f->fp_ttl < find->fp_ttl || @@ -507,11 +505,13 @@ pf_osfp_find(struct pf_osfp_list *list, struct pf_os_fingerprint *find, /* Find an exact fingerprint in the list */ struct pf_os_fingerprint * -pf_osfp_find_exact(struct pf_osfp_list *list, struct pf_os_fingerprint *find) +pf_osfp_find_exact(struct pf_os_fingerprint *find) { struct pf_os_fingerprint *f; - SLIST_FOREACH(f, list, fp_next) { + PF_ASSERT_LOCKED(); + + SLIST_FOREACH(f, &pf_osfp_list, fp_next) { if (f->fp_tcpopts == find->fp_tcpopts && f->fp_wsize == find->fp_wsize && f->fp_psize == find->fp_psize && @@ -528,18 +528,20 @@ pf_osfp_find_exact(struct pf_osfp_list *list, struct pf_os_fingerprint *find) /* Insert a fingerprint into the list */ void -pf_osfp_insert(struct pf_osfp_list *list, struct pf_os_fingerprint *ins) +pf_osfp_insert(struct pf_os_fingerprint *ins) { struct pf_os_fingerprint *f, *prev = NULL; + PF_ASSERT_LOCKED(); + /* XXX need to go semi tree based. can key on tcp options */ - SLIST_FOREACH(f, list, fp_next) + SLIST_FOREACH(f, &pf_osfp_list, fp_next) prev = f; if (prev) SLIST_INSERT_AFTER(prev, ins, fp_next); else - SLIST_INSERT_HEAD(list, ins, fp_next); + SLIST_INSERT_HEAD(&pf_osfp_list, ins, fp_next); } /* Fill a fingerprint by its number (from an ioctl) */ @@ -551,9 +553,7 @@ pf_osfp_get(struct pf_osfp_ioctl *fpioc) int num = fpioc->fp_getnum; int i = 0; - memset(fpioc, 0, sizeof(*fpioc)); - NET_LOCK(); PF_LOCK(); SLIST_FOREACH(fp, &pf_osfp_list, fp_next) { SLIST_FOREACH(entry, &fp->fp_oses, fp_entry) { @@ -568,13 +568,11 @@ pf_osfp_get(struct pf_osfp_ioctl *fpioc) memcpy(&fpioc->fp_os, entry, sizeof(fpioc->fp_os)); PF_UNLOCK(); - NET_UNLOCK(); return (0); } } } PF_UNLOCK(); - NET_UNLOCK(); return (EBUSY); } @@ -586,6 +584,8 @@ pf_osfp_validate(void) { struct pf_os_fingerprint *f, *f2, find; + PF_ASSERT_LOCKED(); + SLIST_FOREACH(f, &pf_osfp_list, fp_next) { memcpy(&find, f, sizeof(find)); @@ -598,7 +598,7 @@ pf_osfp_validate(void) find.fp_wsize *= (find.fp_mss + 40); else if (f->fp_flags & PF_OSFP_WSIZE_MOD) find.fp_wsize *= 2; - if (f != (f2 = pf_osfp_find(&pf_osfp_list, &find, 0))) { + if (f != (f2 = pf_osfp_find(&find, 0))) { if (f2) DPFPRINTF(LOG_NOTICE, "Found \"%s %s %s\" instead of " diff --git a/sys/net/pfvar_priv.h b/sys/net/pfvar_priv.h index 741125e44..e9e80f619 100644 --- a/sys/net/pfvar_priv.h +++ b/sys/net/pfvar_priv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar_priv.h,v 1.31 2023/04/28 14:08:38 sashan Exp $ */ +/* $OpenBSD: pfvar_priv.h,v 1.33 2023/05/10 22:42:51 sashan Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -135,7 +135,6 @@ RBT_PROTOTYPE(pf_state_tree_id, pf_state, entry_id, pf_state_compare_id); extern struct pf_state_tree_id tree_id; /* - * * states are linked into a global list to support the following * functionality: * @@ -148,7 +147,7 @@ extern struct pf_state_tree_id tree_id; * been successfully added to the various trees that make up the state * table. states are only removed from the pf_state_list by the garbage * collection process. - + * * the pf_state_list head and tail pointers (ie, the pfs_list TAILQ_HEAD * structure) and the pointers between the entries on the pf_state_list * are locked separately. at a high level, this allows for insertion @@ -406,6 +405,9 @@ void pf_state_peer_hton(const struct pf_state_peer *, struct pfsync_state_peer *); void pf_state_peer_ntoh(const struct pfsync_state_peer *, struct pf_state_peer *); +u_int16_t pf_pkt_hash(sa_family_t, uint8_t, + const struct pf_addr *, const struct pf_addr *, + uint16_t, uint16_t); #endif /* _KERNEL */ diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 4ecf82f07..2854dd0c2 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.263 2023/04/25 16:24:25 bluhm Exp $ */ +/* $OpenBSD: if_ether.c,v 1.265 2023/05/12 12:40:49 bluhm Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -388,10 +388,8 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, rt->rt_expire - arpt_keep / 8 < uptime) { mtx_enter(&arp_mtx); - if (ISSET(rt->rt_flags, RTF_LLINFO)) { - la = (struct llinfo_arp *)rt->rt_llinfo; - KASSERT(la != NULL); - + la = (struct llinfo_arp *)rt->rt_llinfo; + if (la != NULL) { if (la->la_refreshed + 30 < uptime) { la->la_refreshed = uptime; refresh = 1; @@ -412,12 +410,11 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, goto bad; mtx_enter(&arp_mtx); - if (!ISSET(rt->rt_flags, RTF_LLINFO)) { + la = (struct llinfo_arp *)rt->rt_llinfo; + if (la == NULL) { mtx_leave(&arp_mtx); goto bad; } - la = (struct llinfo_arp *)rt->rt_llinfo; - KASSERT(la != NULL); /* * There is an arptab entry, but no ethernet address @@ -723,7 +720,7 @@ arpcache(struct ifnet *ifp, struct ether_arp *ea, struct rtentry *rt) la->la_asked = 0; la->la_refreshed = 0; - if_mqoutput(ifp, &la->la_mq, &la_hold_total, rt_key(rt), rt); + if_output_mq(ifp, &la->la_mq, &la_hold_total, rt_key(rt), rt); return (0); } diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 4fc6f3a58..16dcdb24c 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.142 2023/04/11 00:45:09 jsg Exp $ */ +/* $OpenBSD: in.h,v 1.143 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -780,6 +780,7 @@ int in_canforward(struct in_addr); int in_cksum(struct mbuf *, int); int in4_cksum(struct mbuf *, u_int8_t, int, int); void in_proto_cksum_out(struct mbuf *, struct ifnet *); +int in_ifcap_cksum(struct mbuf *, struct ifnet *, int); void in_ifdetach(struct ifnet *); int in_mask2len(struct in_addr *); void in_len2mask(struct in_addr *, int); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index b0c6ed720..f5b1173a2 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.382 2022/08/12 17:04:16 bluhm Exp $ */ +/* $OpenBSD: ip_output.c,v 1.385 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -84,7 +84,6 @@ void ip_mloopback(struct ifnet *, struct mbuf *, struct sockaddr_in *); static __inline u_int16_t __attribute__((__unused__)) in_cksum_phdr(u_int32_t, u_int32_t, u_int32_t); void in_delayed_cksum(struct mbuf *); -int in_ifcap_cksum(struct mbuf *, struct ifnet *, int); int ip_output_ipsec_lookup(struct mbuf *m, int hlen, struct inpcb *inp, struct tdb **, int ipsecflowinfo); @@ -104,7 +103,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags, { struct ip *ip; struct ifnet *ifp = NULL; - struct mbuf_list fml; + struct mbuf_list ml; int hlen = sizeof (struct ip); int error = 0; struct route iproute; @@ -443,7 +442,6 @@ sendit: goto reroute; } #endif - in_proto_cksum_out(m, ifp); #ifdef IPSEC if (ipsec_in_use && (flags & IP_FORWARDING) && (ipforwarding == 2) && @@ -464,11 +462,21 @@ sendit: ipstat_inc(ips_outswcsum); ip->ip_sum = in_cksum(m, hlen); } - + in_proto_cksum_out(m, ifp); error = ifp->if_output(ifp, m, sintosa(dst), ro->ro_rt); goto done; } + if (ISSET(m->m_pkthdr.csum_flags, M_TCP_TSO) && + m->m_pkthdr.ph_mss <= mtu) { + if ((error = tcp_chopper(m, &ml, ifp, m->m_pkthdr.ph_mss)) || + (error = if_output_ml(ifp, &ml, sintosa(dst), ro->ro_rt))) + goto done; + tcpstat_inc(tcps_outswtso); + goto done; + } + CLR(m->m_pkthdr.csum_flags, M_TCP_TSO); + /* * Too large for interface; fragment if possible. * Must be able to put at least 8 bytes per fragment. @@ -505,19 +513,10 @@ sendit: goto bad; } - error = ip_fragment(m, &fml, ifp, mtu); - if (error) + if ((error = ip_fragment(m, &ml, ifp, mtu)) || + (error = if_output_ml(ifp, &ml, sintosa(dst), ro->ro_rt))) goto done; - - while ((m = ml_dequeue(&fml)) != NULL) { - error = ifp->if_output(ifp, m, sintosa(dst), ro->ro_rt); - if (error) - break; - } - if (error) - ml_purge(&fml); - else - ipstat_inc(ips_fragmented); + ipstat_inc(ips_fragmented); done: if (ro == &iproute && ro->ro_rt) @@ -607,12 +606,12 @@ ip_output_ipsec_pmtu_update(struct tdb *tdb, struct route *ro, int ip_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route *ro, int fwd) { -#if NPF > 0 - struct ifnet *encif; -#endif + struct mbuf_list ml; + struct ifnet *encif = NULL; struct ip *ip; struct in_addr dst; - int error, rtableid; + u_int len; + int error, rtableid, tso = 0; #if NPF > 0 /* @@ -632,16 +631,22 @@ ip_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route *ro, int fwd) * Until now the change was not reconsidered. * What's the behaviour? */ - in_proto_cksum_out(m, encif); #endif - /* Check if we are allowed to fragment */ + /* Check if we can chop the TCP packet */ ip = mtod(m, struct ip *); + if (ISSET(m->m_pkthdr.csum_flags, M_TCP_TSO) && + m->m_pkthdr.ph_mss <= tdb->tdb_mtu) { + tso = 1; + len = m->m_pkthdr.ph_mss; + } else + len = ntohs(ip->ip_len); + + /* Check if we are allowed to fragment */ dst = ip->ip_dst; rtableid = m->m_pkthdr.ph_rtableid; if (ip_mtudisc && (ip->ip_off & htons(IP_DF)) && tdb->tdb_mtu && - ntohs(ip->ip_len) > tdb->tdb_mtu && - tdb->tdb_mtutimeout > gettime()) { + len > tdb->tdb_mtu && tdb->tdb_mtutimeout > gettime()) { int transportmode; transportmode = (tdb->tdb_dst.sa.sa_family == AF_INET) && @@ -662,14 +667,33 @@ ip_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route *ro, int fwd) */ m->m_flags &= ~(M_MCAST | M_BCAST); - /* Callee frees mbuf */ + if (tso) { + error = tcp_chopper(m, &ml, encif, len); + if (error) + goto done; + } else { + CLR(m->m_pkthdr.csum_flags, M_TCP_TSO); + in_proto_cksum_out(m, encif); + ml_init(&ml); + ml_enqueue(&ml, m); + } + KERNEL_LOCK(); - error = ipsp_process_packet(m, tdb, AF_INET, 0); + while ((m = ml_dequeue(&ml)) != NULL) { + /* Callee frees mbuf */ + error = ipsp_process_packet(m, tdb, AF_INET, 0); + if (error) + break; + } KERNEL_UNLOCK(); + done: if (error) { + ml_purge(&ml); ipsecstat_inc(ipsec_odrops); tdbstat_inc(tdb, tdb_odrops); } + if (!error && tso) + tcpstat_inc(tcps_outswtso); if (ip_mtudisc && error == EMSGSIZE) ip_output_ipsec_pmtu_update(tdb, ro, dst, rtableid, 0); return error; @@ -677,16 +701,15 @@ ip_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route *ro, int fwd) #endif /* IPSEC */ int -ip_fragment(struct mbuf *m0, struct mbuf_list *fml, struct ifnet *ifp, +ip_fragment(struct mbuf *m0, struct mbuf_list *ml, struct ifnet *ifp, u_long mtu) { - struct mbuf *m; struct ip *ip; int firstlen, hlen, tlen, len, off; int error; - ml_init(fml); - ml_enqueue(fml, m0); + ml_init(ml); + ml_enqueue(ml, m0); ip = mtod(m0, struct ip *); hlen = ip->ip_hl << 2; @@ -705,10 +728,11 @@ ip_fragment(struct mbuf *m0, struct mbuf_list *fml, struct ifnet *ifp, in_proto_cksum_out(m0, NULL); /* - * Loop through length of segment after first fragment, + * Loop through length of payload after first fragment, * make new header and copy data of each part and link onto chain. */ for (off = hlen + firstlen; off < tlen; off += len) { + struct mbuf *m; struct ip *mhip; int mhlen; @@ -717,8 +741,7 @@ ip_fragment(struct mbuf *m0, struct mbuf_list *fml, struct ifnet *ifp, error = ENOBUFS; goto bad; } - ml_enqueue(fml, m); - + ml_enqueue(ml, m); if ((error = m_dup_pkthdr(m, m0, M_DONTWAIT)) != 0) goto bad; m->m_data += max_linkhdr; @@ -762,25 +785,26 @@ ip_fragment(struct mbuf *m0, struct mbuf_list *fml, struct ifnet *ifp, * Update first fragment by trimming what's been copied out * and updating header, then send each fragment (in order). */ - m = m0; - m_adj(m, hlen + firstlen - tlen); - ip->ip_off |= htons(IP_MF); - ip->ip_len = htons(m->m_pkthdr.len); + if (hlen + firstlen < tlen) { + m_adj(m0, hlen + firstlen - tlen); + ip->ip_off |= htons(IP_MF); + } + ip->ip_len = htons(m0->m_pkthdr.len); ip->ip_sum = 0; - if (in_ifcap_cksum(m, ifp, IFCAP_CSUM_IPv4)) - m->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; + if (in_ifcap_cksum(m0, ifp, IFCAP_CSUM_IPv4)) + m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; else { ipstat_inc(ips_outswcsum); - ip->ip_sum = in_cksum(m, hlen); + ip->ip_sum = in_cksum(m0, hlen); } - ipstat_add(ips_ofragments, ml_len(fml)); + ipstat_add(ips_ofragments, ml_len(ml)); return (0); bad: ipstat_inc(ips_odropped); - ml_purge(fml); + ml_purge(ml); return (error); } diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 19e3bbd10..84adc729b 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.135 2023/04/25 22:56:28 bluhm Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.136 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -210,6 +210,7 @@ tcp_output(struct tcpcb *tp) #ifdef TCP_ECN int needect; #endif + int tso; if (tp->t_flags & TF_BLOCKOUTPUT) { tp->t_flags |= TF_NEEDOUTPUT; @@ -279,6 +280,7 @@ again: } sendalot = 0; + tso = 0; /* * If in persist timeout with window of 0, send 1 byte. * Otherwise, if window is small but nonzero @@ -346,8 +348,25 @@ again: txmaxseg = ulmin(so->so_snd.sb_hiwat / 2, tp->t_maxseg); if (len > txmaxseg) { - len = txmaxseg; - sendalot = 1; + if (tcp_do_tso && + tp->t_inpcb->inp_options == NULL && + tp->t_inpcb->inp_outputopts6 == NULL && +#ifdef TCP_SIGNATURE + ((tp->t_flags & TF_SIGNATURE) == 0) && +#endif + len >= 2 * tp->t_maxseg && + tp->rcv_numsacks == 0 && sack_rxmit == 0 && + !(flags & (TH_SYN|TH_RST|TH_FIN))) { + tso = 1; + /* avoid small chopped packets */ + if (len > (len / tp->t_maxseg) * tp->t_maxseg) { + len = (len / tp->t_maxseg) * tp->t_maxseg; + sendalot = 1; + } + } else { + len = txmaxseg; + sendalot = 1; + } } if (off + len < so->so_snd.sb_cc) flags &= ~TH_FIN; @@ -365,7 +384,7 @@ again: * to send into a small window), then must resend. */ if (len) { - if (len == txmaxseg) + if (len >= txmaxseg) goto send; if ((idle || (tp->t_flags & TF_NODELAY)) && len + off >= so->so_snd.sb_cc && !soissending(so) && @@ -616,10 +635,19 @@ send: /* * Adjust data length if insertion of options will * bump the packet length beyond the t_maxopd length. + * Clear the FIN bit because we cut off the tail of + * the segment. */ if (len > tp->t_maxopd - optlen) { - len = tp->t_maxopd - optlen; - sendalot = 1; + if (tso) { + if (len + hdrlen + max_linkhdr > MAXMCLBYTES) { + len = MAXMCLBYTES - hdrlen - max_linkhdr; + sendalot = 1; + } + } else { + len = tp->t_maxopd - optlen; + sendalot = 1; + } flags &= ~TH_FIN; } @@ -723,6 +751,12 @@ send: m->m_pkthdr.ph_ifidx = 0; m->m_pkthdr.len = hdrlen + len; + /* Enable TSO and specify the size of the resulting segments. */ + if (tso) { + m->m_pkthdr.csum_flags |= M_TCP_TSO; + m->m_pkthdr.ph_mss = tp->t_maxseg; + } + if (!tp->t_template) panic("tcp_output"); #ifdef DIAGNOSTIC @@ -1153,3 +1187,176 @@ tcp_setpersist(struct tcpcb *tp) if (tp->t_rxtshift < TCP_MAXRXTSHIFT) tp->t_rxtshift++; } + +int +tcp_chopper(struct mbuf *m0, struct mbuf_list *ml, struct ifnet *ifp, + u_int mss) +{ + struct ip *ip = NULL; +#ifdef INET6 + struct ip6_hdr *ip6 = NULL; +#endif + struct tcphdr *th; + int firstlen, iphlen, hlen, tlen, off; + int error; + + ml_init(ml); + ml_enqueue(ml, m0); + + ip = mtod(m0, struct ip *); + switch (ip->ip_v) { + case 4: + iphlen = ip->ip_hl << 2; + if (ISSET(ip->ip_off, htons(IP_OFFMASK | IP_MF)) || + iphlen != sizeof(struct ip) || ip->ip_p != IPPROTO_TCP) { + /* only TCP without fragment or IP option supported */ + error = EPROTOTYPE; + goto bad; + } + break; +#ifdef INET6 + case 6: + ip = NULL; + ip6 = mtod(m0, struct ip6_hdr *); + iphlen = sizeof(struct ip6_hdr); + if (ip6->ip6_nxt != IPPROTO_TCP) { + /* only TCP without IPv6 header chain supported */ + error = EPROTOTYPE; + goto bad; + } + break; +#endif + default: + panic("%s: unknown ip version %d", __func__, ip->ip_v); + } + + tlen = m0->m_pkthdr.len; + if (tlen < iphlen + sizeof(struct tcphdr)) { + error = ENOPROTOOPT; + goto bad; + } + /* IP and TCP header should be contiguous, this check is paranoia */ + if (m0->m_len < iphlen + sizeof(*th)) { + ml_dequeue(ml); + if ((m0 = m_pullup(m0, iphlen + sizeof(*th))) == NULL) { + error = ENOBUFS; + goto bad; + } + ml_enqueue(ml, m0); + } + th = (struct tcphdr *)(mtod(m0, caddr_t) + iphlen); + hlen = iphlen + (th->th_off << 2); + if (tlen < hlen) { + error = ENOPROTOOPT; + goto bad; + } + firstlen = MIN(tlen - hlen, mss); + + CLR(m0->m_pkthdr.csum_flags, M_TCP_TSO); + + /* + * Loop through length of payload after first segment, + * make new header and copy data of each part and link onto chain. + */ + for (off = hlen + firstlen; off < tlen; off += mss) { + struct mbuf *m; + struct tcphdr *mhth; + int len; + + len = MIN(tlen - off, mss); + + MGETHDR(m, M_DONTWAIT, MT_HEADER); + if (m == NULL) { + error = ENOBUFS; + goto bad; + } + ml_enqueue(ml, m); + if ((error = m_dup_pkthdr(m, m0, M_DONTWAIT)) != 0) + goto bad; + + /* IP and TCP header to the end, space for link layer header */ + m->m_len = hlen; + m_align(m, hlen); + + /* copy and adjust TCP header */ + mhth = (struct tcphdr *)(mtod(m, caddr_t) + iphlen); + memcpy(mhth, th, hlen - iphlen); + mhth->th_seq = htonl(ntohl(th->th_seq) + (off - hlen)); + if (off + len < tlen) + CLR(mhth->th_flags, TH_PUSH|TH_FIN); + + /* add mbuf chain with payload */ + m->m_pkthdr.len = hlen + len; + if ((m->m_next = m_copym(m0, off, len, M_DONTWAIT)) == NULL) { + error = ENOBUFS; + goto bad; + } + + /* copy and adjust IP header, calculate checksum */ + SET(m->m_pkthdr.csum_flags, M_TCP_CSUM_OUT); + mhth->th_sum = 0; + if (ip) { + struct ip *mhip; + + mhip = mtod(m, struct ip *); + *mhip = *ip; + mhip->ip_len = htons(hlen + len); + mhip->ip_id = htons(ip_randomid()); + mhip->ip_sum = 0; + if (ifp && in_ifcap_cksum(m, ifp, IFCAP_CSUM_IPv4)) { + m->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; + } else { + ipstat_inc(ips_outswcsum); + mhip->ip_sum = in_cksum(m, iphlen); + } + in_proto_cksum_out(m, ifp); + } +#ifdef INET6 + if (ip6) { + struct ip6_hdr *mhip6; + + mhip6 = mtod(m, struct ip6_hdr *); + *mhip6 = *ip6; + mhip6->ip6_plen = htons(hlen - iphlen + len); + in6_proto_cksum_out(m, ifp); + } +#endif + } + + /* + * Update first segment by trimming what's been copied out + * and updating header, then send each segment (in order). + */ + if (hlen + firstlen < tlen) { + m_adj(m0, hlen + firstlen - tlen); + CLR(th->th_flags, TH_PUSH|TH_FIN); + } + /* adjust IP header, calculate checksum */ + SET(m0->m_pkthdr.csum_flags, M_TCP_CSUM_OUT); + th->th_sum = 0; + if (ip) { + ip->ip_len = htons(m0->m_pkthdr.len); + ip->ip_sum = 0; + if (ifp && in_ifcap_cksum(m0, ifp, IFCAP_CSUM_IPv4)) { + m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT; + } else { + ipstat_inc(ips_outswcsum); + ip->ip_sum = in_cksum(m0, iphlen); + } + in_proto_cksum_out(m0, ifp); + } +#ifdef INET6 + if (ip6) { + ip6->ip6_plen = htons(m0->m_pkthdr.len - iphlen); + in6_proto_cksum_out(m0, ifp); + } +#endif + + tcpstat_add(tcps_outpkttso, ml_len(ml)); + return 0; + + bad: + tcpstat_inc(tcps_outbadtso); + ml_purge(ml); + return error; +} diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b08f55f00..ad8f7eae1 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.190 2022/11/07 11:22:55 yasuoka Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.191 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -119,6 +119,7 @@ int tcp_ack_on_push = 0; /* set to enable immediate ACK-on-PUSH */ int tcp_do_ecn = 0; /* RFC3168 ECN enabled/disabled? */ #endif int tcp_do_rfc3390 = 2; /* Increase TCP's Initial Window to 10*mss */ +int tcp_do_tso = 1; /* TCP segmentation offload for output */ #ifndef TCB_INITIAL_HASH_SIZE #define TCB_INITIAL_HASH_SIZE 128 diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index c676a5782..120e3cc5e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.217 2023/03/14 00:24:05 yasuoka Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.218 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -166,6 +166,7 @@ const struct sysctl_bounded_args tcpctl_vars[] = { { TCPCTL_SYN_BUCKET_LIMIT, &tcp_syn_bucket_limit, 1, INT_MAX }, { TCPCTL_RFC3390, &tcp_do_rfc3390, 0, 2 }, { TCPCTL_ALWAYS_KEEPALIVE, &tcp_always_keepalive, 0, 1 }, + { TCPCTL_TSO, &tcp_do_tso, 0, 1 }, }; struct inpcbtable tcbtable; @@ -1335,6 +1336,10 @@ tcp_sysctl_tcpstat(void *oldp, size_t *oldlenp, void *newp) ASSIGN(tcps_sack_rcv_opts); ASSIGN(tcps_sack_snd_opts); ASSIGN(tcps_sack_drop_opts); + ASSIGN(tcps_outswtso); + ASSIGN(tcps_outhwtso); + ASSIGN(tcps_outpkttso); + ASSIGN(tcps_outbadtso); #undef ASSIGN @@ -1494,8 +1499,8 @@ tcp_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, default: NET_LOCK(); - error = sysctl_bounded_arr(tcpctl_vars, nitems(tcpctl_vars), name, - namelen, oldp, oldlenp, newp, newlen); + error = sysctl_bounded_arr(tcpctl_vars, nitems(tcpctl_vars), + name, namelen, oldp, oldlenp, newp, newlen); NET_UNLOCK(); return (error); } diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 72424e0ef..d8cfc12c5 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.163 2023/03/14 00:24:05 yasuoka Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.164 2023/05/10 12:07:16 bluhm Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -442,6 +442,11 @@ struct tcpstat { u_int64_t tcps_sack_rcv_opts; /* SACK options received */ u_int64_t tcps_sack_snd_opts; /* SACK options sent */ u_int64_t tcps_sack_drop_opts; /* SACK options dropped */ + + u_int32_t tcps_outswtso; /* output tso chopped in software */ + u_int32_t tcps_outhwtso; /* output tso processed by hardware */ + u_int32_t tcps_outpkttso; /* packets generated by tso */ + u_int32_t tcps_outbadtso; /* output tso failed, packet dropped */ }; /* @@ -473,7 +478,8 @@ struct tcpstat { #define TCPCTL_SYN_USE_LIMIT 23 /* number of uses before reseeding hash */ #define TCPCTL_ROOTONLY 24 /* return root only port bitmap */ #define TCPCTL_SYN_HASH_SIZE 25 /* number of buckets in the hash */ -#define TCPCTL_MAXID 26 +#define TCPCTL_TSO 26 /* enable TCP segmentation offload */ +#define TCPCTL_MAXID 27 #define TCPCTL_NAMES { \ { 0, 0 }, \ @@ -500,8 +506,9 @@ struct tcpstat { { "stats", CTLTYPE_STRUCT }, \ { "always_keepalive", CTLTYPE_INT }, \ { "synuselimit", CTLTYPE_INT }, \ - { "rootonly", CTLTYPE_STRUCT }, \ + { "rootonly", CTLTYPE_STRUCT }, \ { "synhashsize", CTLTYPE_INT }, \ + { "tso", CTLTYPE_INT }, \ } struct tcp_ident_mapping { @@ -614,6 +621,10 @@ enum tcpstat_counters { tcps_sack_rcv_opts, tcps_sack_snd_opts, tcps_sack_drop_opts, + tcps_outswtso, + tcps_outhwtso, + tcps_outpkttso, + tcps_outbadtso, tcps_ncounters, }; @@ -665,6 +676,7 @@ extern struct pool sackhl_pool; extern int tcp_sackhole_limit; /* max entries for tcp sack queues */ extern int tcp_do_ecn; /* RFC3168 ECN enabled/disabled? */ extern int tcp_do_rfc3390; /* RFC3390 Increasing TCP's Initial Window */ +extern int tcp_do_tso; /* enable TSO for TCP output packets */ extern struct pool tcpqe_pool; extern int tcp_reass_limit; /* max entries for tcp reass queues */ @@ -706,6 +718,7 @@ struct tcpcb * tcp_newtcpcb(struct inpcb *, int); void tcp_notify(struct inpcb *, int); int tcp_output(struct tcpcb *); +int tcp_chopper(struct mbuf *, struct mbuf_list *, struct ifnet *, u_int); void tcp_pulloutofband(struct socket *, u_int, struct mbuf *, int); int tcp_reass(struct tcpcb *, struct tcphdr *, struct mbuf *, int *); void tcp_rscale(struct tcpcb *, u_long); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 07e13d565..b14ffbe41 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.272 2022/11/12 02:50:59 kn Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.275 2023/05/10 12:07:17 bluhm Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -165,7 +165,7 @@ ip6_output(struct mbuf *m, struct ip6_pktopts *opt, struct route_in6 *ro, { struct ip6_hdr *ip6; struct ifnet *ifp = NULL; - struct mbuf_list fml; + struct mbuf_list ml; int hlen, tlen; struct route_in6 ip6route; struct rtentry *rt = NULL; @@ -664,8 +664,6 @@ reroute: ip6->ip6_dst.s6_addr16[1] = dst_scope; } - in6_proto_cksum_out(m, ifp); - /* * Send the packet to the outgoing interface. * If necessary, do IPv6 fragmentation before sending. @@ -688,7 +686,9 @@ reroute: dontfrag = 1; else dontfrag = 0; - if (dontfrag && tlen > ifp->if_mtu) { /* case 2-b */ + if (dontfrag && /* case 2-b */ + (ISSET(m->m_pkthdr.csum_flags, M_TCP_TSO) ? + m->m_pkthdr.csum_flags : tlen) > ifp->if_mtu) { #ifdef IPSEC if (ip_mtudisc) ipsec_adjust_mtu(m, mtu); @@ -700,11 +700,22 @@ reroute: /* * transmit packet without fragmentation */ - if (dontfrag || (tlen <= mtu)) { /* case 1-a and 2-a */ + if (dontfrag || tlen <= mtu) { /* case 1-a and 2-a */ + in6_proto_cksum_out(m, ifp); error = ifp->if_output(ifp, m, sin6tosa(dst), ro->ro_rt); goto done; } + if (ISSET(m->m_pkthdr.csum_flags, M_TCP_TSO) && + m->m_pkthdr.ph_mss <= mtu) { + if ((error = tcp_chopper(m, &ml, ifp, m->m_pkthdr.ph_mss)) || + (error = if_output_ml(ifp, &ml, sin6tosa(dst), ro->ro_rt))) + goto done; + tcpstat_inc(tcps_outswtso); + goto done; + } + CLR(m->m_pkthdr.csum_flags, M_TCP_TSO); + /* * try to fragment the packet. case 1-b */ @@ -751,19 +762,10 @@ reroute: ip6->ip6_nxt = IPPROTO_FRAGMENT; } - error = ip6_fragment(m, &fml, hlen, nextproto, mtu); - if (error) + if ((error = ip6_fragment(m, &ml, hlen, nextproto, mtu)) || + (error = if_output_ml(ifp, &ml, sin6tosa(dst), ro->ro_rt))) goto done; - - while ((m = ml_dequeue(&fml)) != NULL) { - error = ifp->if_output(ifp, m, sin6tosa(dst), ro->ro_rt); - if (error) - break; - } - if (error) - ml_purge(&fml); - else - ip6stat_inc(ip6s_fragmented); + ip6stat_inc(ip6s_fragmented); done: if (ro == &ip6route && ro->ro_rt) { @@ -789,16 +791,15 @@ bad: } int -ip6_fragment(struct mbuf *m0, struct mbuf_list *fml, int hlen, - u_char nextproto, u_long mtu) +ip6_fragment(struct mbuf *m0, struct mbuf_list *ml, int hlen, u_char nextproto, + u_long mtu) { - struct mbuf *m; struct ip6_hdr *ip6; u_int32_t id; int tlen, len, off; int error; - ml_init(fml); + ml_init(ml); ip6 = mtod(m0, struct ip6_hdr *); tlen = m0->m_pkthdr.len; @@ -810,10 +811,11 @@ ip6_fragment(struct mbuf *m0, struct mbuf_list *fml, int hlen, id = htonl(ip6_randomid()); /* - * Loop through length of segment, + * Loop through length of payload, * make new header and copy data of each part and link onto chain. */ for (off = hlen; off < tlen; off += len) { + struct mbuf *m; struct mbuf *mlast; struct ip6_hdr *mhip6; struct ip6_frag *ip6f; @@ -823,8 +825,7 @@ ip6_fragment(struct mbuf *m0, struct mbuf_list *fml, int hlen, error = ENOBUFS; goto bad; } - ml_enqueue(fml, m); - + ml_enqueue(ml, m); if ((error = m_dup_pkthdr(m, m0, M_DONTWAIT)) != 0) goto bad; m->m_data += max_linkhdr; @@ -856,13 +857,13 @@ ip6_fragment(struct mbuf *m0, struct mbuf_list *fml, int hlen, ip6f->ip6f_nxt = nextproto; } - ip6stat_add(ip6s_ofragments, ml_len(fml)); + ip6stat_add(ip6s_ofragments, ml_len(ml)); m_freem(m0); return (0); bad: ip6stat_inc(ip6s_odropped); - ml_purge(fml); + ml_purge(ml); m_freem(m0); return (error); } @@ -2840,12 +2841,12 @@ int ip6_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route_in6 *ro, int tunalready, int fwd) { -#if NPF > 0 - struct ifnet *encif; -#endif + struct mbuf_list ml; + struct ifnet *encif = NULL; struct ip6_hdr *ip6; struct in6_addr dst; - int error, ifidx, rtableid; + u_int len; + int error, ifidx, rtableid, tso = 0; #if NPF > 0 /* @@ -2865,17 +2866,23 @@ ip6_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route_in6 *ro, * Until now the change was not reconsidered. * What's the behaviour? */ - in6_proto_cksum_out(m, encif); #endif - /* Check if we are allowed to fragment */ + /* Check if we can chop the TCP packet */ ip6 = mtod(m, struct ip6_hdr *); + if (ISSET(m->m_pkthdr.csum_flags, M_TCP_TSO) && + m->m_pkthdr.ph_mss <= tdb->tdb_mtu) { + tso = 1; + len = m->m_pkthdr.ph_mss; + } else + len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen); + + /* Check if we are allowed to fragment */ dst = ip6->ip6_dst; ifidx = m->m_pkthdr.ph_ifidx; rtableid = m->m_pkthdr.ph_rtableid; if (ip_mtudisc && tdb->tdb_mtu && - sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) > tdb->tdb_mtu && - tdb->tdb_mtutimeout > gettime()) { + len > tdb->tdb_mtu && tdb->tdb_mtutimeout > gettime()) { int transportmode; transportmode = (tdb->tdb_dst.sa.sa_family == AF_INET6) && @@ -2902,14 +2909,33 @@ ip6_output_ipsec_send(struct tdb *tdb, struct mbuf *m, struct route_in6 *ro, */ m->m_flags &= ~(M_BCAST | M_MCAST); - /* Callee frees mbuf */ + if (tso) { + error = tcp_chopper(m, &ml, encif, len); + if (error) + goto done; + } else { + CLR(m->m_pkthdr.csum_flags, M_TCP_TSO); + in6_proto_cksum_out(m, encif); + ml_init(&ml); + ml_enqueue(&ml, m); + } + KERNEL_LOCK(); - error = ipsp_process_packet(m, tdb, AF_INET6, tunalready); + while ((m = ml_dequeue(&ml)) != NULL) { + /* Callee frees mbuf */ + error = ipsp_process_packet(m, tdb, AF_INET6, tunalready); + if (error) + break; + } KERNEL_UNLOCK(); + done: if (error) { + ml_purge(&ml); ipsecstat_inc(ipsec_odrops); tdbstat_inc(tdb, tdb_odrops); } + if (!error && tso) + tcpstat_inc(tcps_outswtso); if (ip_mtudisc && error == EMSGSIZE) ip6_output_ipsec_pmtu_update(tdb, ro, &dst, ifidx, rtableid, 0); return error; diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index a67096332..fd3836a31 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.273 2023/05/02 06:06:13 bluhm Exp $ */ +/* $OpenBSD: nd6.c,v 1.279 2023/05/12 12:42:16 bluhm Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -62,6 +62,15 @@ #include #include +/* + * Locks used to protect struct members in this file: + * a atomic operations + * I immutable after creation + * K kernel lock + * m nd6 mutex, needed when net lock is shared + * N net lock + */ + #define ND6_SLOWTIMER_INTERVAL (60 * 60) /* 1 hour */ #define ND6_RECALC_REACHTM_INTERVAL (60 * 120) /* 2 hours */ @@ -84,9 +93,13 @@ int nd6_debug = 1; int nd6_debug = 0; #endif -TAILQ_HEAD(llinfo_nd6_head, llinfo_nd6) nd6_list; -struct pool nd6_pool; /* pool for llinfo_nd6 structures */ -int nd6_inuse; +/* llinfo_nd6 live time, rt_llinfo and RTF_LLINFO are protected by nd6_mtx */ +struct mutex nd6_mtx = MUTEX_INITIALIZER(IPL_SOFTNET); + +TAILQ_HEAD(llinfo_nd6_head, llinfo_nd6) nd6_list = + TAILQ_HEAD_INITIALIZER(nd6_list); /* [mN] list of llinfo_nd6 structures */ +struct pool nd6_pool; /* [I] pool for llinfo_nd6 structures */ +int nd6_inuse; /* [m] limit neigbor discovery routes */ unsigned int ln_hold_total; /* [a] packets currently in the nd6 queue */ void nd6_timer(void *); @@ -105,7 +118,6 @@ struct task nd6_expire_task; void nd6_init(void) { - TAILQ_INIT(&nd6_list); pool_init(&nd6_pool, sizeof(struct llinfo_nd6), 0, IPL_SOFTNET, 0, "nd6", NULL); @@ -259,6 +271,7 @@ nd6_timer(void *unused) uptime = getuptime(); expire = uptime + nd6_gctimer; + /* Net lock is exclusive, no nd6 mutex needed for nd6_list here. */ TAILQ_FOREACH_SAFE(ln, &nd6_list, ln_list, nln) { struct rtentry *rt = ln->ln_rt; @@ -465,7 +478,7 @@ nd6_purge(struct ifnet *ifp) { struct llinfo_nd6 *ln, *nln; - NET_ASSERT_LOCKED(); + NET_ASSERT_LOCKED_EXCLUSIVE(); /* * Nuke neighbor cache entries for the ifp. @@ -514,6 +527,7 @@ nd6_lookup(const struct in6_addr *addr6, int create, struct ifnet *ifp, if (rt == NULL) { if (create && ifp) { struct rt_addrinfo info; + struct llinfo_nd6 *ln; struct ifaddr *ifa; int error; @@ -543,11 +557,9 @@ nd6_lookup(const struct in6_addr *addr6, int create, struct ifnet *ifp, rtableid); if (error) return (NULL); - if (rt->rt_llinfo != NULL) { - struct llinfo_nd6 *ln = - (struct llinfo_nd6 *)rt->rt_llinfo; + ln = (struct llinfo_nd6 *)rt->rt_llinfo; + if (ln != NULL) ln->ln_state = ND6_LLINFO_NOSTATE; - } } else return (NULL); } @@ -627,13 +639,20 @@ nd6_is_addr_neighbor(const struct sockaddr_in6 *addr, struct ifnet *ifp) void nd6_invalidate(struct rtentry *rt) { - struct llinfo_nd6 *ln = (struct llinfo_nd6 *)rt->rt_llinfo; + struct llinfo_nd6 *ln; struct sockaddr_dl *sdl = satosdl(rt->rt_gateway); + mtx_enter(&nd6_mtx); + ln = (struct llinfo_nd6 *)rt->rt_llinfo; + if (ln == NULL) { + mtx_leave(&nd6_mtx); + return; + } atomic_sub_int(&ln_hold_total, mq_purge(&ln->ln_mq)); sdl->sdl_alen = 0; ln->ln_state = ND6_LLINFO_INCOMPLETE; ln->ln_asked = 0; + mtx_leave(&nd6_mtx); } /* @@ -721,7 +740,7 @@ void nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) { struct sockaddr *gate = rt->rt_gateway; - struct llinfo_nd6 *ln = (struct llinfo_nd6 *)rt->rt_llinfo; + struct llinfo_nd6 *ln; struct ifaddr *ifa; struct in6_ifaddr *ifa6; @@ -760,40 +779,12 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) switch (req) { case RTM_ADD: - if ((rt->rt_flags & RTF_CLONING) || - ((rt->rt_flags & (RTF_LLINFO | RTF_LOCAL)) && ln == NULL)) { - if (ln != NULL) - nd6_llinfo_settimer(ln, 0); - if ((rt->rt_flags & RTF_CLONING) != 0) - break; + if (rt->rt_flags & RTF_CLONING) { + rt->rt_expire = 0; + break; } - /* - * In IPv4 code, we try to announce new RTF_ANNOUNCE entry here. - * We don't do that here since llinfo is not ready yet. - * - * There are also couple of other things to be discussed: - * - unsolicited NA code needs improvement beforehand - * - RFC2461 says we MAY send multicast unsolicited NA - * (7.2.6 paragraph 4), however, it also says that we - * SHOULD provide a mechanism to prevent multicast NA storm. - * we don't have anything like it right now. - * note that the mechanism needs a mutual agreement - * between proxies, which means that we need to implement - * a new protocol, or a new kludge. - * - from RFC2461 6.2.4, host MUST NOT send an unsolicited NA. - * we need to check ip6forwarding before sending it. - * (or should we allow proxy ND configuration only for - * routers? there's no mention about proxy ND from hosts) - */ -#if 0 - /* XXX it does not work */ - if (rt->rt_flags & RTF_ANNOUNCE) - nd6_na_output(ifp, - &satosin6(rt_key(rt))->sin6_addr, - &satosin6(rt_key(rt))->sin6_addr, - ip6_forwarding ? ND_NA_FLAG_ROUTER : 0, - 1, NULL); -#endif + if ((rt->rt_flags & RTF_LOCAL) && rt->rt_llinfo == NULL) + rt->rt_expire = 0; /* FALLTHROUGH */ case RTM_RESOLVE: if (gate->sa_family != AF_LINK || @@ -804,21 +795,29 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) } satosdl(gate)->sdl_type = ifp->if_type; satosdl(gate)->sdl_index = ifp->if_index; - if (ln != NULL) - break; /* This happens on a route change */ /* * Case 2: This route may come from cloning, or a manual route * add with a LL address. */ ln = pool_get(&nd6_pool, PR_NOWAIT | PR_ZERO); - rt->rt_llinfo = (caddr_t)ln; if (ln == NULL) { log(LOG_DEBUG, "%s: pool get failed\n", __func__); break; } - mq_init(&ln->ln_mq, LN_HOLD_QUEUE, IPL_SOFTNET); + + mtx_enter(&nd6_mtx); + if (rt->rt_llinfo != NULL) { + /* we lost the race, another thread has entered it */ + mtx_leave(&nd6_mtx); + pool_put(&nd6_pool, ln); + break; + } nd6_inuse++; + mq_init(&ln->ln_mq, LN_HOLD_QUEUE, IPL_SOFTNET); + rt->rt_llinfo = (caddr_t)ln; ln->ln_rt = rt; + rt->rt_flags |= RTF_LLINFO; + TAILQ_INSERT_HEAD(&nd6_list, ln, ln_list); /* this is required for "ndp" command. - shin */ if (req == RTM_ADD) { /* @@ -836,8 +835,6 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) ln->ln_state = ND6_LLINFO_NOSTATE; nd6_llinfo_settimer(ln, 0); } - rt->rt_flags |= RTF_LLINFO; - TAILQ_INSERT_HEAD(&nd6_list, ln, ln_list); /* * If we have too many cache entries, initiate immediate @@ -879,43 +876,59 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) ifa6 = in6ifa_ifpwithaddr(ifp, &satosin6(rt_key(rt))->sin6_addr); ifa = ifa6 ? &ifa6->ia_ifa : NULL; - if (ifa) { - ln->ln_state = ND6_LLINFO_REACHABLE; - ln->ln_byhint = 0; - rt->rt_expire = 0; - KASSERT(ifa == rt->rt_ifa); - } else if (rt->rt_flags & RTF_ANNOUNCE) { + if (ifa != NULL || + (rt->rt_flags & RTF_ANNOUNCE)) { ln->ln_state = ND6_LLINFO_REACHABLE; ln->ln_byhint = 0; rt->rt_expire = 0; + } + mtx_leave(&nd6_mtx); - /* join solicited node multicast for proxy ND */ - if (ifp->if_flags & IFF_MULTICAST) { - struct in6_addr llsol; - int error; + /* join solicited node multicast for proxy ND */ + if (ifa == NULL && + (rt->rt_flags & RTF_ANNOUNCE) && + (ifp->if_flags & IFF_MULTICAST)) { + struct in6_addr llsol; + int error; - llsol = satosin6(rt_key(rt))->sin6_addr; - llsol.s6_addr16[0] = htons(0xff02); - llsol.s6_addr16[1] = htons(ifp->if_index); - llsol.s6_addr32[1] = 0; - llsol.s6_addr32[2] = htonl(1); - llsol.s6_addr8[12] = 0xff; + llsol = satosin6(rt_key(rt))->sin6_addr; + llsol.s6_addr16[0] = htons(0xff02); + llsol.s6_addr16[1] = htons(ifp->if_index); + llsol.s6_addr32[1] = 0; + llsol.s6_addr32[2] = htonl(1); + llsol.s6_addr8[12] = 0xff; - if (in6_addmulti(&llsol, ifp, &error)) { - char addr[INET6_ADDRSTRLEN]; - nd6log((LOG_ERR, "%s: failed to join " - "%s (errno=%d)\n", ifp->if_xname, - inet_ntop(AF_INET6, &llsol, - addr, sizeof(addr)), - error)); - } + KERNEL_LOCK(); + if (in6_addmulti(&llsol, ifp, &error)) { + char addr[INET6_ADDRSTRLEN]; + nd6log((LOG_ERR, "%s: failed to join " + "%s (errno=%d)\n", ifp->if_xname, + inet_ntop(AF_INET6, &llsol, + addr, sizeof(addr)), + error)); } + KERNEL_UNLOCK(); } break; case RTM_DELETE: - if (ln == NULL) + mtx_enter(&nd6_mtx); + ln = (struct llinfo_nd6 *)rt->rt_llinfo; + if (ln == NULL) { + /* we lost the race, another thread has removed it */ + mtx_leave(&nd6_mtx); break; + } + nd6_inuse--; + TAILQ_REMOVE(&nd6_list, ln, ln_list); + rt->rt_expire = 0; + rt->rt_llinfo = NULL; + rt->rt_flags &= ~RTF_LLINFO; + atomic_sub_int(&ln_hold_total, mq_purge(&ln->ln_mq)); + mtx_leave(&nd6_mtx); + + pool_put(&nd6_pool, ln); + /* leave from solicited node multicast for proxy ND */ if ((rt->rt_flags & RTF_ANNOUNCE) != 0 && (ifp->if_flags & IFF_MULTICAST) != 0) { @@ -929,22 +942,15 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) llsol.s6_addr32[2] = htonl(1); llsol.s6_addr8[12] = 0xff; + KERNEL_LOCK(); IN6_LOOKUP_MULTI(llsol, ifp, in6m); if (in6m) in6_delmulti(in6m); + KERNEL_UNLOCK(); } - nd6_inuse--; - TAILQ_REMOVE(&nd6_list, ln, ln_list); - rt->rt_expire = 0; - rt->rt_llinfo = NULL; - rt->rt_flags &= ~RTF_LLINFO; - atomic_sub_int(&ln_hold_total, mq_purge(&ln->ln_mq)); - pool_put(&nd6_pool, ln); break; case RTM_INVALIDATE: - if (ln == NULL) - break; if (!ISSET(rt->rt_flags, RTF_LOCAL)) nd6_invalidate(rt); break; @@ -1020,10 +1026,10 @@ void nd6_cache_lladdr(struct ifnet *ifp, const struct in6_addr *from, char *lladdr, int lladdrlen, int type, int code) { - struct rtentry *rt = NULL; - struct llinfo_nd6 *ln = NULL; + struct rtentry *rt; + struct llinfo_nd6 *ln; int is_newentry; - struct sockaddr_dl *sdl = NULL; + struct sockaddr_dl *sdl; int do_update; int olladdr; int llchange; @@ -1142,7 +1148,7 @@ fail: * meaningless. */ nd6_llinfo_settimer(ln, nd6_gctimer); - if_mqoutput(ifp, &ln->ln_mq, &ln_hold_total, + if_output_mq(ifp, &ln->ln_mq, &ln_hold_total, rt_key(rt), rt); } else if (ln->ln_state == ND6_LLINFO_INCOMPLETE) { /* probe right away */ @@ -1250,7 +1256,7 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, { struct sockaddr_dl *sdl; struct rtentry *rt; - struct llinfo_nd6 *ln = NULL; + struct llinfo_nd6 *ln; struct in6_addr saddr6; time_t uptime; int solicit = 0; @@ -1260,15 +1266,12 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, return (0); } - /* XXXSMP there is a MP race in nd6_resolve() */ - KERNEL_LOCK(); uptime = getuptime(); rt = rt_getll(rt0); if (ISSET(rt->rt_flags, RTF_REJECT) && (rt->rt_expire == 0 || rt->rt_expire > uptime)) { m_freem(m); - KERNEL_UNLOCK(); return (rt == rt0 ? EHOSTDOWN : EHOSTUNREACH); } @@ -1291,6 +1294,11 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, goto bad; } + KERNEL_LOCK(); + if (!ISSET(rt->rt_flags, RTF_LLINFO)) { + KERNEL_UNLOCK(); + goto bad; + } ln = (struct llinfo_nd6 *)rt->rt_llinfo; KASSERT(ln != NULL); @@ -1299,8 +1307,10 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, * for this entry to be a target of forced garbage collection (see * nd6_rtrequest()). */ + mtx_enter(&nd6_mtx); TAILQ_REMOVE(&nd6_list, ln, ln_list); TAILQ_INSERT_HEAD(&nd6_list, ln, ln_list); + mtx_leave(&nd6_mtx); /* * The first time we send a packet to a neighbor whose entry is @@ -1321,6 +1331,8 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, * send the packet. */ if (ln->ln_state > ND6_LLINFO_INCOMPLETE) { + KERNEL_UNLOCK(); + sdl = satosdl(rt->rt_gateway); if (sdl->sdl_alen != ETHER_ADDR_LEN) { char addr[INET6_ADDRSTRLEN]; @@ -1332,7 +1344,6 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, } bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - KERNEL_UNLOCK(); return (0); } @@ -1374,7 +1385,6 @@ nd6_resolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, bad: m_freem(m); - KERNEL_UNLOCK(); return (EINVAL); } diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index e9dc93e99..293ccbfb6 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.h,v 1.98 2023/05/02 06:06:13 bluhm Exp $ */ +/* $OpenBSD: nd6.h,v 1.99 2023/05/04 06:56:56 bluhm Exp $ */ /* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */ /* @@ -44,7 +44,10 @@ #define ND6_LLINFO_PROBE 4 /* - * Locks used to protect struct members in this file: + * Locks used to protect struct members in this file: + * I immutable after creation + * K kernel lock + * m nd6 mutex, needed when net lock is shared * N net lock */ @@ -79,8 +82,8 @@ struct in6_ndireq { #include struct llinfo_nd6 { - TAILQ_ENTRY(llinfo_nd6) ln_list; - struct rtentry *ln_rt; + TAILQ_ENTRY(llinfo_nd6) ln_list; /* [mN] global nd6_list */ + struct rtentry *ln_rt; /* [I] backpointer to rtentry */ struct mbuf_queue ln_mq; /* hold packets until resolved */ struct in6_addr ln_saddr6; /* source of prompting packet */ long ln_asked; /* number of queries already sent for addr */ diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 263671847..30b8ffedb 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.147 2023/05/02 06:06:13 bluhm Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.149 2023/05/07 16:23:24 bluhm Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -567,7 +567,7 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len) struct nd_opts ndopts; char addr[INET6_ADDRSTRLEN], addr0[INET6_ADDRSTRLEN]; - NET_ASSERT_LOCKED(); + NET_ASSERT_LOCKED_EXCLUSIVE(); ifp = if_get(m->m_pkthdr.ph_ifidx); if (ifp == NULL) @@ -851,7 +851,7 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len) } rt->rt_flags &= ~RTF_REJECT; ln->ln_asked = 0; - if_mqoutput(ifp, &ln->ln_mq, &ln_hold_total, rt_key(rt), rt); + if_output_mq(ifp, &ln->ln_mq, &ln_hold_total, rt_key(rt), rt); freeit: rtfree(rt); diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 881a79586..a62b6ea88 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.201 2022/04/16 19:19:59 naddy Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.202 2023/05/10 15:28:26 krw Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -299,6 +299,7 @@ struct scsi_link { #define SDEV_UMASS 0x0400 /* device is UMASS SCSI */ #define SDEV_VIRTUAL 0x0800 /* device is virtualised on the hba */ #define SDEV_OWN_IOPL 0x1000 /* scsibus */ +#define SDEV_UFI 0x2000 /* Universal Floppy Interface */ u_int16_t quirks; /* per-device oddities */ #define SDEV_AUTOSAVE 0x0001 /* do implicit SAVEDATAPOINTER on disconnect */ #define SDEV_NOSYNC 0x0002 /* does not grok SDTR */ diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index d697de784..c62e188de 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.333 2022/10/23 14:39:19 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.334 2023/05/10 15:28:26 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1115,13 +1115,19 @@ sdgetdisklabel(dev_t dev, struct sd_softc *sc, struct disklabel *lp, /* As long as it's not 0 - readdisklabel divides by it. */ } - lp->d_type = DTYPE_SCSI; - if ((link->inqdata.device & SID_TYPE) == T_OPTICAL) - strncpy(lp->d_typename, "SCSI optical", - sizeof(lp->d_typename)); - else - strncpy(lp->d_typename, "SCSI disk", + if (ISSET(link->flags, SDEV_UFI)) { + lp->d_type = DTYPE_FLOPPY; + strncpy(lp->d_typename, "USB floppy disk", sizeof(lp->d_typename)); + } else { + lp->d_type = DTYPE_SCSI; + if ((link->inqdata.device & SID_TYPE) == T_OPTICAL) + strncpy(lp->d_typename, "SCSI optical", + sizeof(lp->d_typename)); + else + strncpy(lp->d_typename, "SCSI disk", + sizeof(lp->d_typename)); + } /* * Try to fit ' ' into d_packname. If that doesn't fit diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f8eae7a4e..2e479b715 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbuf.h,v 1.255 2022/08/15 16:15:37 bluhm Exp $ */ +/* $OpenBSD: mbuf.h,v 1.257 2023/05/10 12:07:17 bluhm Exp $ */ /* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */ /* @@ -129,12 +129,13 @@ struct pkthdr { SLIST_HEAD(, m_tag) ph_tags; /* list of packet tags */ int64_t ph_timestamp; /* packet timestamp */ int len; /* total packet length */ + u_int ph_rtableid; /* routing table id */ + u_int ph_ifidx; /* rcv interface index */ u_int16_t ph_tagsset; /* mtags attached */ u_int16_t ph_flowid; /* pseudo unique flow id */ u_int16_t csum_flags; /* checksum flags */ u_int16_t ether_vtag; /* Ethernet 802.1p+Q vlan tag */ - u_int ph_rtableid; /* routing table id */ - u_int ph_ifidx; /* rcv interface index */ + u_int16_t ph_mss; /* TCP max segment size */ u_int8_t ph_loopcnt; /* mbuf is looping in kernel */ u_int8_t ph_family; /* af, used when queueing */ struct pkthdr_pf pf; @@ -226,6 +227,7 @@ struct mbuf { #define M_IPV6_DF_OUT 0x1000 /* don't fragment outgoing IPv6 */ #define M_TIMESTAMP 0x2000 /* ph_timestamp is set */ #define M_FLOWID 0x4000 /* ph_flowid is set */ +#define M_TCP_TSO 0x8000 /* TCP Segmentation Offload needed */ #ifdef _KERNEL #define MCS_BITS \ @@ -526,6 +528,8 @@ unsigned int ml_hdatalen(struct mbuf_list *); * mbuf queues */ +#include + #define MBUF_QUEUE_INITIALIZER(_maxlen, _ipl) \ { MUTEX_INITIALIZER(_ipl), MBUF_LIST_INITIALIZER(), (_maxlen), 0 } @@ -538,12 +542,12 @@ void mq_delist(struct mbuf_queue *, struct mbuf_list *); struct mbuf * mq_dechain(struct mbuf_queue *); unsigned int mq_purge(struct mbuf_queue *); unsigned int mq_hdatalen(struct mbuf_queue *); +void mq_set_maxlen(struct mbuf_queue *, u_int); -#define mq_len(_mq) ml_len(&(_mq)->mq_list) -#define mq_empty(_mq) ml_empty(&(_mq)->mq_list) -#define mq_full(_mq) (mq_len((_mq)) >= (_mq)->mq_maxlen) -#define mq_drops(_mq) ((_mq)->mq_drops) -#define mq_set_maxlen(_mq, _l) ((_mq)->mq_maxlen = (_l)) +#define mq_len(_mq) READ_ONCE((_mq)->mq_list.ml_len) +#define mq_empty(_mq) (mq_len(_mq) == 0) +#define mq_full(_mq) (mq_len((_mq)) >= READ_ONCE((_mq)->mq_maxlen)) +#define mq_drops(_mq) READ_ONCE((_mq)->mq_drops) #endif /* _KERNEL */ #endif /* _SYS_MBUF_H_ */ diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 377de2902..e102dc1c6 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.261 2023/02/27 00:58:38 deraadt Exp $ */ +/* $OpenBSD: syscall.h,v 1.262 2023/05/04 09:41:15 mvs Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.246 2023/02/25 09:55:46 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.247 2023/05/04 09:40:36 mvs Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index 567f0cde1..54205e011 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.264 2023/02/27 00:58:38 deraadt Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.265 2023/05/04 09:41:15 mvs Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.246 2023/02/25 09:55:46 mvs Exp + * created from; OpenBSD: syscalls.master,v 1.247 2023/05/04 09:40:36 mvs Exp */ #ifdef syscallarg diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c index 690871347..caea59be2 100644 --- a/sys/uvm/uvm_mmap.c +++ b/sys/uvm/uvm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_mmap.c,v 1.181 2023/04/11 00:45:09 jsg Exp $ */ +/* $OpenBSD: uvm_mmap.c,v 1.182 2023/05/09 10:35:20 kn Exp $ */ /* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */ /* @@ -449,7 +449,6 @@ sys_msync(struct proc *p, void *v, register_t *retval) } */ *uap = v; vaddr_t addr; vsize_t size, pageoff; - vm_map_t map; int flags, uvmflags; /* extract syscall args from the uap */ @@ -470,9 +469,6 @@ sys_msync(struct proc *p, void *v, register_t *retval) if (addr > SIZE_MAX - size) return EINVAL; /* disallow wrap-around. */ - /* get map */ - map = &p->p_vmspace->vm_map; - /* translate MS_ flags into PGO_ flags */ uvmflags = PGO_CLEANIT; if (flags & MS_INVALIDATE) @@ -482,7 +478,7 @@ sys_msync(struct proc *p, void *v, register_t *retval) else uvmflags |= PGO_SYNCIO; /* XXXCDC: force sync for now! */ - return uvm_map_clean(map, addr, addr+size, uvmflags); + return uvm_map_clean(&p->p_vmspace->vm_map, addr, addr+size, uvmflags); } /* diff --git a/usr.bin/doas/doas.conf.5 b/usr.bin/doas/doas.conf.5 index e98bfbe70..c547366ab 100644 --- a/usr.bin/doas/doas.conf.5 +++ b/usr.bin/doas/doas.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: doas.conf.5,v 1.45 2020/10/09 10:24:33 jmc Exp $ +.\" $OpenBSD: doas.conf.5,v 1.46 2023/05/03 14:29:57 kn Exp $ .\" .\"Copyright (c) 2015 Ted Unangst .\" @@ -13,7 +13,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: October 9 2020 $ +.Dd $Mdocdate: May 3 2023 $ .Dt DOAS.CONF 5 .Os .Sh NAME @@ -55,7 +55,7 @@ again for some time. Environment variables other than those listed in .Xr doas 1 are retained when creating the environment for the new process. -.It Ic setenv { Oo Ar variable ... Oc Oo Ar variable=value ... Oc Ic } +.It Ic setenv Brq Oo Ar variable ... Oc Oo Ar variable Ns = Ns Ar value ... Oc Keep or set the space-separated specified variables. Variables may also be removed with a leading .Sq - diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index a386ab025..5806e614d 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -20,7 +20,8 @@ MAGICMODE= 444 CLEANFILES+= magic post-magic -MAG1= $(.CURDIR)/magdir/Header \ +MAG1= $(.CURDIR)/magdir/SecBSD \ + $(.CURDIR)/magdir/Header \ $(.CURDIR)/magdir/Localstuff \ $(.CURDIR)/magdir/OpenBSD MAGFILES= $(.CURDIR)/magdir/[0-9a-z]* diff --git a/usr.bin/file/magdir/SecBSD b/usr.bin/file/magdir/SecBSD new file mode 100644 index 000000000..07c617a33 --- /dev/null +++ b/usr.bin/file/magdir/SecBSD @@ -0,0 +1,269 @@ + + +#------------------------------------------------------------------------------ +# SecBSD: file(1) magic for SecBSD objects +# +# All new-style magic numbers are in network byte order. +# + +0 lelong 000000407 SecBSD little-endian object file +>16 lelong >0 not stripped +0 belong 000000407 SecBSD big-endian object file +>16 belong >0 not stripped + +0 belong&0377777777 041400413 SecBSD/i386 demand paged +>0 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 041400410 SecBSD/i386 pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 041400407 SecBSD/i386 +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 041400507 SecBSD/i386 core +>12 string >\0 from '%s' + +0 belong&0377777777 041600413 SecBSD/m68k demand paged +>0 byte &0x80 +>>20 belong <8192 shared library +>>20 belong =8192 dynamically linked executable +>>20 belong >8192 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 041600410 SecBSD/m68k pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 041600407 SecBSD/m68k +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 belong !0 executable +>>20 belong =0 object file +>16 belong >0 not stripped +0 belong&0377777777 041600507 SecBSD/m68k core +>12 string >\0 from '%s' + +0 belong&0377777777 046200413 SecBSD/m88k demand paged +>0 byte &0x80 +>>20 belong <8192 shared library +>>20 belong =8192 dynamically linked executable +>>20 belong >8192 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 046200410 SecBSD/m88k pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 046200407 SecBSD/m88k +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 belong !0 executable +>>20 belong =0 object file +>16 belong >0 not stripped +0 belong&0377777777 046200507 SecBSD/m88k core +>12 string >\0 from '%s' + +0 belong&0377777777 042000413 SecBSD/m68k4k demand paged +>0 byte &0x80 +>>20 belong <4096 shared library +>>20 belong =4096 dynamically linked executable +>>20 belong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 042000410 SecBSD/m68k4k pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 042000407 SecBSD/m68k4k +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 belong !0 executable +>>20 belong =0 object file +>16 belong >0 not stripped +0 belong&0377777777 042000507 SecBSD/m68k4k core +>12 string >\0 from '%s' + +0 belong&0377777777 042200413 SecBSD/ns32532 demand paged +>0 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 042200410 SecBSD/ns32532 pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 042200407 SecBSD/ns32532 +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 042200507 SecBSD/ns32532 core +>12 string >\0 from '%s' + +0 belong&0377777777 042400413 SecBSD/sparc demand paged +>0 byte &0x80 +>>20 belong <8192 shared library +>>20 belong =8192 dynamically linked executable +>>20 belong >8192 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 042400410 SecBSD/sparc pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 042400407 SecBSD/sparc +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 belong !0 executable +>>20 belong =0 object file +>16 belong >0 not stripped +0 belong&0377777777 042400507 SecBSD/sparc core +>12 string >\0 from '%s' + +0 belong&0377777777 042600413 SecBSD/pmax demand paged +>0 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 042600410 SecBSD/pmax pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 042600407 SecBSD/pmax +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 042600507 SecBSD/pmax core +>12 string >\0 from '%s' + +0 belong&0377777777 043000413 SecBSD/vax1k demand paged +>0 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 043000410 SecBSD/vax1k pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 043000407 SecBSD/vax1k +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 043000507 SecBSD/vax1k core +>12 string >\0 from '%s' + +0 belong&0377777777 045400413 SecBSD/vax demand paged +>0 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 045400410 SecBSD/vax pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 045400407 SecBSD/vax +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 045400507 SecBSD/vax core +>12 string >\0 from '%s' + +# SecBSD/alpha does not support (and has never supported) a.out objects, +# so no rules are provided for them. SecBSD/alpha ELF objects are +# dealt with in "elf". +0 leshort 0x00070185 ECOFF SecBSD/alpha binary +>10 leshort 0x0001 not stripped +>10 leshort 0x0000 stripped +0 belong&0377777777 043200507 SecBSD/alpha core +>12 string >\0 from '%s' + +# SecBSD/powerpc core files +0 belong&0377777777 045200507 SecBSD/powerpc core +>12 string >\0 from '%s' + +# SecBSD/sparc64 core files +0 belong&0377777777 045600507 SecBSD/sparc64 core +>12 string >\0 from '%s' + +# SecBSD/hppa core files +0 belong&0377777777 046400507 SecBSD/hppa core +>12 string >\0 from '%s' + +# SecBSD/mips64 +0 belong&0377777777 047400413 SecBSD/mips64 demand paged +>0 byte &0x80 +>>20 belong <8192 shared library +>>20 belong =8192 dynamically linked executable +>>20 belong >8192 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 047400410 SecBSD/mips64 pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 belong >0 not stripped +0 belong&0377777777 047400407 SecBSD/mips64 +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 belong !0 executable +>>20 belong =0 object file +>16 belong >0 not stripped +0 belong&0377777777 047400507 SecBSD/mips64 core +>12 string >\0 from '%s' + +0 belong&0377777777 043600413 SecBSD/arm demand paged +>0 byte &0x80 +>>20 lelong <8192 shared library +>>20 lelong =8192 dynamically linked executable +>>20 lelong >8192 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 043600410 SecBSD/arm pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +0 belong&0377777777 043600407 SecBSD/arm +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 +>>0 byte &0x40 position independent +>>20 lelong !0 executable +>>20 lelong =0 object file +>16 lelong >0 not stripped +0 belong&0377777777 043600507 SecBSD/arm core +>12 string >\0 from '%s' +0 belong&0377777777 047200507 SecBSD/amd64 core +>12 string >\0 from '%s' +0 belong&0377777777 044200507 SecBSD/sh core +>12 string >\0 from '%s' diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 2157946fc..e04355ed0 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.174 2022/08/12 14:49:15 bluhm Exp $ */ +/* $OpenBSD: inet.c,v 1.175 2023/05/10 12:07:17 bluhm Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -408,6 +408,10 @@ tcp_stats(char *name) p(tcps_sndwinup, "\t\t%u window update packet%s\n"); p(tcps_sndctrl, "\t\t%u control packet%s\n"); p(tcps_outswcsum, "\t\t%u packet%s software-checksummed\n"); + p(tcps_outswtso, "\t\t%u output TSO packet%s software chopped\n"); + p(tcps_outhwtso, "\t\t%u output TSO packet%s hardware processed\n"); + p(tcps_outpkttso, "\t\t%u output TSO packet%s generated\n"); + p(tcps_outbadtso, "\t\t%u output TSO packet%s dropped\n"); p(tcps_rcvtotal, "\t%u packet%s received\n"); p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%u ack%s (for %llu byte%s)\n"); p(tcps_rcvdupack, "\t\t%u duplicate ack%s\n"); diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1 index c430e49f0..4c9d15b9d 100644 --- a/usr.bin/openssl/openssl.1 +++ b/usr.bin/openssl/openssl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: openssl.1,v 1.143 2023/04/25 16:11:02 tb Exp $ +.\" $OpenBSD: openssl.1,v 1.144 2023/05/05 18:01:27 tb Exp $ .\" ==================================================================== .\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. .\" @@ -110,7 +110,7 @@ .\" copied and put under another distribution licence .\" [including the GNU Public Licence.] .\" -.Dd $Mdocdate: April 25 2023 $ +.Dd $Mdocdate: May 5 2023 $ .Dt OPENSSL 1 .Os .Sh NAME @@ -3505,6 +3505,8 @@ for PKCS#1 padding; for no padding; .Cm oaep for OAEP mode; +.Cm x931 +for X9.31 mode; and .Cm pss for PSS. @@ -3515,6 +3517,8 @@ If a digest is set then a DigestInfo structure is used and its length must correspond to the digest type. For oeap mode only encryption and decryption is supported. +For x931 if the digest type is set it is used to format the block data; +otherwise the first byte is used to specify the X9.31 digest ID. Sign, verify, and verifyrecover can be performed in this mode. For pss mode only sign and verify are supported and the digest type must be specified. @@ -4178,7 +4182,7 @@ Print the public/private key components in plain text. .Op Fl in Ar file .Op Fl inkey Ar file .Op Fl keyform Cm der | pem -.Op Fl oaep | pkcs | raw +.Op Fl oaep | pkcs | raw | x931 .Op Fl out Ar file .Op Fl passin Ar arg .Op Fl pubin @@ -4216,9 +4220,9 @@ The input key file; by default an RSA private key. The private key format. The default is .Cm pem . -.It Fl oaep | pkcs | raw +.It Fl oaep | pkcs | raw | x931 The padding to use: -PKCS#1 OAEP, PKCS#1 v1.5 (the default), no padding, +PKCS#1 OAEP, PKCS#1 v1.5 (the default), no padding, or ANSI X9.31, respectively. For signatures, only .Fl pkcs diff --git a/usr.bin/openssl/rsautl.c b/usr.bin/openssl/rsautl.c index 4f674b0ef..d67e78807 100644 --- a/usr.bin/openssl/rsautl.c +++ b/usr.bin/openssl/rsautl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsautl.c,v 1.22 2023/04/09 18:33:26 tb Exp $ */ +/* $OpenBSD: rsautl.c,v 1.23 2023/05/05 18:01:27 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2000. */ @@ -206,6 +206,13 @@ static const struct option rsautl_options[] = { .value = RSA_VERIFY, .opt.value = &cfg.rsa_mode, }, + { + .name = "x931", + .desc = "Use ANSI X9.31 padding", + .type = OPTION_VALUE, + .value = RSA_X931_PADDING, + .opt.value = &cfg.pad, + }, {NULL}, }; @@ -217,7 +224,7 @@ rsautl_usage() "usage: rsautl [-asn1parse] [-certin] [-decrypt] [-encrypt] " "[-hexdump]\n" " [-in file] [-inkey file] [-keyform der | pem]\n" - " [-oaep | -pkcs | -raw] [-out file] [-passin arg]\n" + " [-oaep | -pkcs | -raw | -x931] [-out file] [-passin arg]\n" " [-pubin] [-rev] [-sign] [-verify]\n\n"); options_usage(rsautl_options); diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index 2cd0c73b8..a1f973fd2 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: local_passwd.c,v 1.63 2022/02/10 13:06:46 robert Exp $ */ +/* $OpenBSD: local_passwd.c,v 1.64 2023/05/08 17:15:43 tobias Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -202,7 +202,7 @@ getnewpasswd(struct passwd *pw, login_cap_t *lc, int authenticated) pwd_tries = pwd_gettries(lc); - for (newpass[0] = '\0', tries = 0;;) { + for (newpass[0] = '\0', tries = -1;;) { char repeat[1024]; p = readpassphrase("New password:", newpass, sizeof(newpass), @@ -217,7 +217,7 @@ getnewpasswd(struct passwd *pw, login_cap_t *lc, int authenticated) continue; } - if ((tries++ < pwd_tries || pwd_tries == 0) && + if ((pwd_tries == 0 || ++tries < pwd_tries) && pwd_check(lc, p) == 0) continue; p = readpassphrase("Retype new password:", repeat, sizeof(repeat), diff --git a/usr.bin/passwd/pwd_check.c b/usr.bin/passwd/pwd_check.c index a1b4eca73..cfdd14a8a 100644 --- a/usr.bin/passwd/pwd_check.c +++ b/usr.bin/passwd/pwd_check.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_check.c,v 1.17 2021/08/28 06:46:49 robert Exp $ */ +/* $OpenBSD: pwd_check.c,v 1.18 2023/05/08 16:11:41 tobias Exp $ */ /* * Copyright 2000 Niels Provos @@ -114,6 +114,8 @@ pwd_check(login_cap_t *lc, char *password) switch (child = fork()) { case -1: warn("fork"); + close(pipefds[0]); + close(pipefds[1]); goto out; case 0: (void)signal(SIGINT, SIG_DFL); @@ -184,8 +186,10 @@ pwd_check(login_cap_t *lc, char *password) /* get the return value from the child */ while (waitpid(child, &res, 0) == -1) { - if (errno != EINTR) - break; + if (errno != EINTR) { + warn("waitpid"); + goto out; + } } if (WIFEXITED(res) && WEXITSTATUS(res) == 0) { free(checker); diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index ef824c3d8..ca1d34eb5 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.235 2023/02/17 04:22:50 dtucker Exp $ */ +/* $OpenBSD: monitor.c,v 1.236 2023/05/10 10:04:20 dtucker Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -110,9 +110,6 @@ int mm_answer_keyverify(struct ssh *, int, struct sshbuf *); int mm_answer_pty(struct ssh *, int, struct sshbuf *); int mm_answer_pty_cleanup(struct ssh *, int, struct sshbuf *); int mm_answer_term(struct ssh *, int, struct sshbuf *); -int mm_answer_rsa_keyallowed(struct ssh *, int, struct sshbuf *); -int mm_answer_rsa_challenge(struct ssh *, int, struct sshbuf *); -int mm_answer_rsa_response(struct ssh *, int, struct sshbuf *); int mm_answer_sesskey(struct ssh *, int, struct sshbuf *); int mm_answer_sessid(struct ssh *, int, struct sshbuf *); diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index 552a88eb0..09816b5a6 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.127 2022/09/28 07:55:29 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.128 2023/05/08 10:03:39 tb Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -53,7 +53,7 @@ static const struct grid_cell grid_cleared_cell = { { { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0, 0 }; static const struct grid_cell_entry grid_cleared_entry = { - GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } } + { .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED }; /* Store cell in entry. */ diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 5f1397e38..ff4512e97 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.1197 2023/04/25 09:31:50 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.1198 2023/05/08 10:03:39 tb Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -723,7 +723,6 @@ struct grid_extd_entry { /* Grid cell entry. */ struct grid_cell_entry { - u_char flags; union { u_int offset; struct { @@ -733,6 +732,7 @@ struct grid_cell_entry { u_char data; } data; }; + u_char flags; } __packed; /* Grid line. */ diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index b8249c051..520a089af 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.14 2021/11/02 03:09:15 cheloha Exp $ */ +/* $OpenBSD: str.c,v 1.15 2023/05/04 16:08:29 tb Exp $ */ /* $NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $ */ /*- @@ -52,8 +52,7 @@ static int genrange(STR *); static void genseq(STR *); int -next(s) - STR *s; +next(STR *s) { int ch; @@ -110,8 +109,7 @@ next(s) } static int -bracket(s) - STR *s; +bracket(STR *s) { char *p; @@ -203,8 +201,7 @@ genclass(STR *s) } static int -c_class(a, b) - const void *a, *b; +c_class(const void *a, const void *b) { return (strcmp(((CLASS *)a)->name, ((CLASS *)b)->name)); } @@ -214,8 +211,7 @@ c_class(a, b) * we just syntax check and grab the character. */ static void -genequiv(s) - STR *s; +genequiv(STR *s) { if (*s->str == '\\') { s->equiv[0] = backslash(s); @@ -233,8 +229,7 @@ genequiv(s) } static int -genrange(s) - STR *s; +genrange(STR *s) { int stopval; unsigned char *savestart; @@ -252,8 +247,7 @@ genrange(s) } static void -genseq(s) - STR *s; +genseq(STR *s) { char *ep; diff --git a/usr.sbin/bgpctl/bgpctl.8 b/usr.sbin/bgpctl/bgpctl.8 index 4935c029d..4f344f4d0 100644 --- a/usr.sbin/bgpctl/bgpctl.8 +++ b/usr.sbin/bgpctl/bgpctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bgpctl.8,v 1.110 2023/04/23 11:42:45 claudio Exp $ +.\" $OpenBSD: bgpctl.8,v 1.111 2023/05/09 13:26:27 claudio Exp $ .\" .\" Copyright (c) 2003 Henning Brauer .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 23 2023 $ +.Dd $Mdocdate: May 9 2023 $ .Dt BGPCTL 8 .Os .Sh NAME @@ -404,12 +404,14 @@ Additionally, the following .Ar options are defined: .Pp -.Bl -tag -width "selected" -compact +.Bl -tag -width "disqualified" -compact .It Cm best Alias for .Ic selected . .It Cm detail Show more detailed output for matching routes. +.It Cm disqualified +Show only routes which are not eligible. .It Cm error Show only prefixes which are marked invalid and were treated as withdrawn. .It Ar family @@ -419,8 +421,6 @@ Show routes from the unfiltered Adj-RIB-In. The .Cm neighbor needs to be specified. -.It Cm invalid -Show only routes which are not eligible. .It Cm leaked Show only routes where a route leak was detected. .It Cm out diff --git a/usr.sbin/bgpctl/json.c b/usr.sbin/bgpctl/json.c index 1b7a97585..cd1e9a716 100644 --- a/usr.sbin/bgpctl/json.c +++ b/usr.sbin/bgpctl/json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: json.c,v 1.7 2023/04/26 21:17:24 claudio Exp $ */ +/* $OpenBSD: json.c,v 1.8 2023/05/05 07:42:40 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -16,10 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include #include +#include #include #include "json.h" @@ -179,16 +181,58 @@ void json_do_printf(const char *name, const char *fmt, ...) { va_list ap; + char *str; + + va_start(ap, fmt); + if (!eb) { + if (vasprintf(&str, fmt, ap) == -1) + errx(1, "json printf failed"); + json_do_string(name, str); + free(str); + } + va_end(ap); +} + +void +json_do_string(const char *name, const char *v) +{ + unsigned char c; do_comma_indent(); - do_name(name); if (!eb) eb = fprintf(jsonfh, "\"") < 0; - va_start(ap, fmt); - if (!eb) - eb = vfprintf(jsonfh, fmt, ap) < 0; - va_end(ap); + while ((c = *v++) != '\0' && !eb) { + /* skip escaping '/' since our use case does not require it */ + switch(c) { + case '"': + eb = fprintf(jsonfh, "\\\"") < 0; + break; + case '\\': + eb = fprintf(jsonfh, "\\\\") < 0; + break; + case '\b': + eb = fprintf(jsonfh, "\\b") < 0; + break; + case '\f': + eb = fprintf(jsonfh, "\\f") < 0; + break; + case '\n': + eb = fprintf(jsonfh, "\\n") < 0; + break; + case '\r': + eb = fprintf(jsonfh, "\\r") < 0; + break; + case '\t': + eb = fprintf(jsonfh, "\\t") < 0; + break; + default: + if (iscntrl(c)) + errx(1, "bad control character in string"); + eb = putc(c, jsonfh) == EOF; + break; + } + } if (!eb) eb = fprintf(jsonfh, "\"") < 0; } diff --git a/usr.sbin/bgpctl/json.h b/usr.sbin/bgpctl/json.h index 6ed36527e..3e30f3b97 100644 --- a/usr.sbin/bgpctl/json.h +++ b/usr.sbin/bgpctl/json.h @@ -1,4 +1,4 @@ -/* $OpenBSD: json.h,v 1.6 2023/04/26 20:53:17 claudio Exp $ */ +/* $OpenBSD: json.h,v 1.7 2023/05/05 07:42:40 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -26,6 +26,7 @@ void json_do_object(const char *); void json_do_end(void); void json_do_printf(const char *, const char *, ...) __attribute__((__format__ (printf, 2, 3))); +void json_do_string(const char *, const char *); void json_do_hexdump(const char *, void *, size_t); void json_do_bool(const char *, int); void json_do_uint(const char *, unsigned long long); diff --git a/usr.sbin/bgpctl/output_json.c b/usr.sbin/bgpctl/output_json.c index 631caccb0..ec8c2aeae 100644 --- a/usr.sbin/bgpctl/output_json.c +++ b/usr.sbin/bgpctl/output_json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output_json.c,v 1.33 2023/04/26 19:14:54 claudio Exp $ */ +/* $OpenBSD: output_json.c,v 1.34 2023/05/05 07:42:40 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -62,7 +62,7 @@ json_neighbor_capabilities(struct capabilities *capa) json_do_array("multiprotocol"); for (i = AID_MIN; i < AID_MAX; i++) if (capa->mp[i]) - json_do_printf("mp", "%s", aid2str(i)); + json_do_string("mp", aid2str(i)); json_do_end(); } if (capa->grestart.restart) { @@ -87,8 +87,7 @@ json_neighbor_capabilities(struct capabilities *capa) for (i = AID_MIN; i < AID_MAX; i++) if (capa->grestart.flags[i] & CAPA_GR_PRESENT) { json_do_object("family"); - json_do_printf("family", "%s", - aid2str(i)); + json_do_string("family", aid2str(i)); json_do_bool("preserved", capa->grestart.flags[i] & CAPA_GR_FORWARD); @@ -104,16 +103,16 @@ json_neighbor_capabilities(struct capabilities *capa) for (i = AID_MIN; i < AID_MAX; i++) if (capa->add_path[i]) { json_do_object("add-path-elm"); - json_do_printf("family", "%s", aid2str(i)); + json_do_string("family", aid2str(i)); switch (capa->add_path[i]) { case CAPA_AP_RECV: - json_do_printf("mode", "recv"); + json_do_string("mode", "recv"); break; case CAPA_AP_SEND: - json_do_printf("mode", "send"); + json_do_string("mode", "send"); break; case CAPA_AP_BIDIR: - json_do_printf("mode", "bidir"); + json_do_string("mode", "bidir"); break; default: json_do_printf("mode", "unknown %d", @@ -126,7 +125,7 @@ json_neighbor_capabilities(struct capabilities *capa) } if (capa->policy) { - json_do_printf("open_policy", "%s", + json_do_string("open_policy", capa->policy == 2 ? "enforce" : "present"); } @@ -137,9 +136,9 @@ static void json_neighbor_stats(struct peer *p) { json_do_object("stats"); - json_do_printf("last_read", "%s", fmt_monotime(p->stats.last_read)); + json_do_string("last_read", fmt_monotime(p->stats.last_read)); json_do_int("last_read_sec", get_monotime(p->stats.last_read)); - json_do_printf("last_write", "%s", fmt_monotime(p->stats.last_write)); + json_do_string("last_write", fmt_monotime(p->stats.last_write)); json_do_int("last_write_sec", get_monotime(p->stats.last_write)); json_do_object("prefixes"); @@ -242,14 +241,13 @@ json_neighbor_full(struct peer *p) p->conf.max_out_prefix_restart); } if (p->auth.method != AUTH_NONE) - json_do_printf("authentication", "%s", + json_do_string("authentication", fmt_auth_method(p->auth.method)); json_do_bool("ttl_security", p->conf.ttlsec); json_do_uint("holdtime", p->conf.holdtime); json_do_uint("min_holdtime", p->conf.min_holdtime); if (p->conf.ebgp && p->conf.role != ROLE_NONE) - json_do_printf("role", "%s", - log_policy(p->conf.role)); + json_do_string("role", log_policy(p->conf.role)); /* capabilities */ json_do_bool("announce_capabilities", p->conf.announce_capa); @@ -263,19 +261,19 @@ json_neighbor_full(struct peer *p) /* errors */ if (p->conf.reason[0]) - json_do_printf("my_shutdown_reason", "%s", + json_do_string("my_shutdown_reason", log_reason(p->conf.reason)); if (p->stats.last_reason[0]) - json_do_printf("last_shutdown_reason", "%s", + json_do_string("last_shutdown_reason", log_reason(p->stats.last_reason)); errstr = fmt_errstr(p->stats.last_sent_errcode, p->stats.last_sent_suberr); if (errstr) - json_do_printf("last_error_sent", "%s", errstr); + json_do_string("last_error_sent", errstr); errstr = fmt_errstr(p->stats.last_rcvd_errcode, p->stats.last_rcvd_suberr); if (errstr) - json_do_printf("last_error_received", "%s", errstr); + json_do_string("last_error_received", errstr); /* connection info */ if (p->state >= STATE_OPENSENT) { @@ -284,13 +282,13 @@ json_neighbor_full(struct peer *p) json_do_uint("keepalive", p->holdtime / 3); json_do_object("local"); - json_do_printf("address", "%s", log_addr(&p->local)); + json_do_string("address", log_addr(&p->local)); json_do_uint("port", p->local_port); json_neighbor_capabilities(&p->capa.ann); json_do_end(); json_do_object("remote"); - json_do_printf("address", "%s", log_addr(&p->remote)); + json_do_string("address", log_addr(&p->remote)); json_do_uint("port", p->remote_port); json_neighbor_capabilities(&p->capa.peer); json_do_end(); @@ -299,9 +297,9 @@ json_neighbor_full(struct peer *p) json_neighbor_capabilities(&p->capa.neg); if (p->conf.ebgp && p->conf.role != ROLE_NONE) { - json_do_printf("remote_role", "%s", + json_do_string("remote_role", log_policy(p->remote_role)); - json_do_printf("local_role", "%s", + json_do_string("local_role", log_policy(p->conf.role)); } json_do_end(); @@ -315,24 +313,23 @@ json_neighbor(struct peer *p, struct parse_result *res) json_do_object("neighbor"); - json_do_printf("remote_as", "%s", log_as(p->conf.remote_as)); + json_do_string("remote_as", log_as(p->conf.remote_as)); if (p->conf.descr[0]) - json_do_printf("description", "%s", p->conf.descr); + json_do_string("description", p->conf.descr); if (p->conf.group[0]) - json_do_printf("group", "%s", p->conf.group); + json_do_string("group", p->conf.group); if (!p->conf.template) - json_do_printf("remote_addr", "%s", - log_addr(&p->conf.remote_addr)); + json_do_string("remote_addr", log_addr(&p->conf.remote_addr)); else json_do_printf("remote_addr", "%s/%u", log_addr(&p->conf.remote_addr), p->conf.remote_masklen); if (p->state == STATE_ESTABLISHED) { struct in_addr ina; ina.s_addr = p->remote_bgpid; - json_do_printf("bgpid", "%s", inet_ntoa(ina)); + json_do_string("bgpid", inet_ntoa(ina)); } - json_do_printf("state", "%s", statenames[p->state]); - json_do_printf("last_updown", "%s", fmt_monotime(p->stats.last_updown)); + json_do_string("state", statenames[p->state]); + json_do_string("last_updown", fmt_monotime(p->stats.last_updown)); json_do_int("last_updown_sec", get_monotime(p->stats.last_updown)); switch (res->action) { @@ -359,7 +356,7 @@ json_timer(struct ctl_timer *t) json_do_array("timers"); json_do_object("timer"); - json_do_printf("name", "%s", timernames[t->type]); + json_do_string("name", timernames[t->type]); json_do_int("due", t->val); json_do_end(); } @@ -383,7 +380,7 @@ json_fib(struct kroute_full *kf) origin = "static"; else origin = "unknown"; - json_do_printf("origin", "%s", origin); + json_do_string("origin", origin); json_do_bool("used_by_nexthop", kf->flags & F_NEXTHOP); json_do_bool("blackhole", kf->flags & F_BLACKHOLE); json_do_bool("reject", kf->flags & F_REJECT); @@ -391,7 +388,7 @@ json_fib(struct kroute_full *kf) if (kf->flags & F_CONNECTED) json_do_printf("nexthop", "link#%u", kf->ifindex); else - json_do_printf("nexthop", "%s", log_addr(&kf->nexthop)); + json_do_string("nexthop", log_addr(&kf->nexthop)); if (kf->flags & F_MPLS) { json_do_array("mplslabel"); @@ -409,7 +406,7 @@ json_fib_table(struct ktable *kt) json_do_object("fibtable"); json_do_uint("rtableid", kt->rtableid); - json_do_printf("description", "%s", kt->descr); + json_do_string("description", kt->descr); json_do_bool("coupled", kt->fib_sync); json_do_bool("admin_change", kt->fib_sync != kt->fib_conf); json_do_end(); @@ -420,15 +417,15 @@ json_do_interface(struct ctl_show_interface *iface) { json_do_object("interface"); - json_do_printf("name", "%s", iface->ifname); + json_do_string("name", iface->ifname); json_do_uint("rdomain", iface->rdomain); json_do_bool("is_up", iface->is_up); json_do_bool("nh_reachable", iface->nh_reachable); if (iface->media[0]) - json_do_printf("media", "%s", iface->media); + json_do_string("media", iface->media); - json_do_printf("linkstate", "%s", iface->linkstate); + json_do_string("linkstate", iface->linkstate); if (iface->baudrate > 0) json_do_uint("baudrate", iface->baudrate); @@ -442,7 +439,7 @@ json_nexthop(struct ctl_show_nexthop *nh) json_do_object("nexthop"); - json_do_printf("address", "%s", log_addr(&nh->addr)); + json_do_string("address", log_addr(&nh->addr)); json_do_bool("valid", nh->valid); if (!nh->krvalid) @@ -452,7 +449,7 @@ json_nexthop(struct ctl_show_nexthop *nh) nh->kr.prefixlen); json_do_uint("priority", nh->kr.priority); json_do_bool("connected", nh->kr.flags & F_CONNECTED); - json_do_printf("nexthop", "%s", log_addr(&nh->kr.nexthop)); + json_do_string("nexthop", log_addr(&nh->kr.nexthop)); if (nh->iface.ifname[0]) json_do_interface(&nh->iface); done: @@ -485,12 +482,12 @@ json_communities(u_char *data, size_t len, struct parse_result *res) switch (c.flags) { case COMMUNITY_TYPE_BASIC: json_do_array("communities"); - json_do_printf("community", "%s", + json_do_string("community", fmt_community(c.data1, c.data2)); break; case COMMUNITY_TYPE_LARGE: json_do_array("large_communities"); - json_do_printf("community", "%s", + json_do_string("community", fmt_large_community(c.data1, c.data2, c.data3)); break; case COMMUNITY_TYPE_EXT: @@ -511,7 +508,7 @@ json_communities(u_char *data, size_t len, struct parse_result *res) ext = htobe64(ext); json_do_array("extended_communities"); - json_do_printf("community", "%s", + json_do_string("community", fmt_ext_community((void *)&ext)); break; } @@ -524,7 +521,7 @@ json_do_community(u_char *data, uint16_t len) uint16_t a, v, i; if (len & 0x3) { - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); return; } @@ -535,7 +532,7 @@ json_do_community(u_char *data, uint16_t len) memcpy(&v, data + i + 2, sizeof(v)); a = ntohs(a); v = ntohs(v); - json_do_printf("community", "%s", fmt_community(a, v)); + json_do_string("community", fmt_community(a, v)); } json_do_end(); @@ -548,7 +545,7 @@ json_do_large_community(u_char *data, uint16_t len) uint16_t i; if (len % 12) { - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); return; } @@ -562,7 +559,7 @@ json_do_large_community(u_char *data, uint16_t len) l1 = ntohl(l1); l2 = ntohl(l2); - json_do_printf("community", "%s", + json_do_string("community", fmt_large_community(a, l1, l2)); } @@ -575,14 +572,14 @@ json_do_ext_community(u_char *data, uint16_t len) uint16_t i; if (len & 0x7) { - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); return; } json_do_array("extended_communities"); for (i = 0; i < len; i += 8) - json_do_printf("community", "%s", fmt_ext_community(data + i)); + json_do_string("community", fmt_ext_community(data + i)); json_do_end(); } @@ -630,7 +627,7 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) json_do_array("attributes"); json_do_object("attribute"); - json_do_printf("type", "%s", fmt_attr(type, -1)); + json_do_string("type", fmt_attr(type, -1)); json_do_uint("length", alen); json_do_object("flags"); json_do_bool("partial", flags & ATTR_PARTIAL); @@ -641,9 +638,9 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) switch (type) { case ATTR_ORIGIN: if (alen == 1) - json_do_printf("origin", "%s", fmt_origin(*data, 0)); + json_do_string("origin", fmt_origin(*data, 0)); else - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; case ATTR_ASPATH: case ATTR_AS4_PATH: @@ -657,12 +654,12 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) if (path == NULL) errx(1, "aspath_inflate failed"); } else { - json_do_printf("error", "bad AS-Path"); + json_do_string("error", "bad AS-Path"); break; } if (aspath_asprint(&aspath, path, alen) == -1) err(1, NULL); - json_do_printf("aspath", "%s", aspath); + json_do_string("aspath", aspath); free(aspath); if (path != data) free(path); @@ -670,9 +667,9 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) case ATTR_NEXTHOP: if (alen == 4) { memcpy(&id, data, sizeof(id)); - json_do_printf("nexthop", "%s", inet_ntoa(id)); + json_do_string("nexthop", inet_ntoa(id)); } else - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; case ATTR_MED: case ATTR_LOCALPREF: @@ -681,7 +678,7 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) memcpy(&val, data, sizeof(val)); json_do_uint("metric", ntohl(val)); } else - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; case ATTR_AGGREGATOR: case ATTR_AS4_AGGREGATOR: @@ -694,11 +691,11 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) memcpy(&id, data + sizeof(short_as), sizeof(id)); as = ntohs(short_as); } else { - json_do_printf("error", "bad AS-Path"); + json_do_string("error", "bad AS-Path"); break; } json_do_uint("AS", as); - json_do_printf("router_id", "%s", inet_ntoa(id)); + json_do_string("router_id", inet_ntoa(id)); break; case ATTR_COMMUNITIES: json_do_community(data, alen); @@ -706,16 +703,16 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) case ATTR_ORIGINATOR_ID: if (alen == 4) { memcpy(&id, data, sizeof(id)); - json_do_printf("originator", "%s", inet_ntoa(id)); + json_do_string("originator", inet_ntoa(id)); } else - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; case ATTR_CLUSTER_LIST: json_do_array("cluster_list"); for (off = 0; off + sizeof(id) <= alen; off += sizeof(id)) { memcpy(&id, data + off, sizeof(id)); - json_do_printf("cluster_id", "%s", inet_ntoa(id)); + json_do_string("cluster_id", inet_ntoa(id)); } json_do_end(); break; @@ -723,7 +720,7 @@ json_attr(u_char *data, size_t len, int reqflags, int addpath) case ATTR_MP_UNREACH_NLRI: if (alen < 3) { bad_len: - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; } memcpy(&afi, data, 2); @@ -738,7 +735,7 @@ bad_len: afi, safi); break; } - json_do_printf("family", "%s", aid2str(aid)); + json_do_string("family", aid2str(aid)); if (type == ATTR_MP_REACH_NLRI) { struct bgpd_addr nexthop; @@ -780,7 +777,7 @@ bad_len: data += nhlen + 1; alen -= nhlen + 1; - json_do_printf("nexthop", "%s", log_addr(&nexthop)); + json_do_string("nexthop", log_addr(&nexthop)); } json_do_array("NLRI"); @@ -788,7 +785,7 @@ bad_len: json_do_object("prefix"); if (addpath) { if (alen <= sizeof(pathid)) { - json_do_printf("error", "bad path-id"); + json_do_string("error", "bad path-id"); break; } memcpy(&pathid, data, sizeof(pathid)); @@ -841,7 +838,7 @@ bad_len: as = ntohl(as); json_do_uint("as", as); } else - json_do_printf("error", "bad length"); + json_do_string("error", "bad length"); break; case ATTR_ATOMIC_AGGREGATE: default: @@ -866,18 +863,18 @@ json_rib(struct ctl_show_rib *r, u_char *asdata, size_t aslen, if (aspath_asprint(&aspath, asdata, aslen) == -1) err(1, NULL); - json_do_printf("aspath", "%s", aspath); + json_do_string("aspath", aspath); free(aspath); - json_do_printf("exit_nexthop", "%s", log_addr(&r->exit_nexthop)); - json_do_printf("true_nexthop", "%s", log_addr(&r->true_nexthop)); + json_do_string("exit_nexthop", log_addr(&r->exit_nexthop)); + json_do_string("true_nexthop", log_addr(&r->true_nexthop)); json_do_object("neighbor"); if (r->descr[0]) - json_do_printf("description", "%s", r->descr); - json_do_printf("remote_addr", "%s", log_addr(&r->remote_addr)); + json_do_string("description", r->descr); + json_do_string("remote_addr", log_addr(&r->remote_addr)); id.s_addr = htonl(r->remote_id); - json_do_printf("bgp_id", "%s", inet_ntoa(id)); + json_do_string("bgp_id", inet_ntoa(id)); json_do_end(); if (r->flags & F_PREF_PATH_ID) @@ -892,23 +889,23 @@ json_rib(struct ctl_show_rib *r, u_char *asdata, size_t aslen, if (r->flags & F_PREF_AS_WIDE) json_do_bool("as-wide", 1); if (r->flags & F_PREF_INTERNAL) - json_do_printf("source", "%s", "internal"); + json_do_string("source", "internal"); else - json_do_printf("source", "%s", "external"); + json_do_string("source", "external"); if (r->flags & F_PREF_STALE) json_do_bool("stale", 1); if (r->flags & F_PREF_ANNOUNCE) json_do_bool("announced", 1); /* various attribibutes */ - json_do_printf("ovs", "%s", fmt_ovs(r->roa_validation_state, 0)); - json_do_printf("avs", "%s", fmt_avs(r->aspa_validation_state, 0)); - json_do_printf("origin", "%s", fmt_origin(r->origin, 0)); + json_do_string("ovs", fmt_ovs(r->roa_validation_state, 0)); + json_do_string("avs", fmt_avs(r->aspa_validation_state, 0)); + json_do_string("origin", fmt_origin(r->origin, 0)); json_do_uint("metric", r->med); json_do_uint("localpref", r->local_pref); json_do_uint("weight", r->weight); json_do_int("dmetric", r->dmetric); - json_do_printf("last_update", "%s", fmt_timeframe(r->age)); + json_do_string("last_update", fmt_timeframe(r->age)); json_do_int("last_update_sec", r->age); /* keep the object open for communities and attributes */ @@ -985,9 +982,9 @@ json_rib_set(struct ctl_show_set *set) json_do_array("sets"); json_do_object("set"); - json_do_printf("name", "%s", set->name); - json_do_printf("type", "%s", fmt_set_type(set)); - json_do_printf("last_change", "%s", fmt_monotime(set->lastchange)); + json_do_string("name", set->name); + json_do_string("type", fmt_set_type(set)); + json_do_string("last_change", fmt_monotime(set->lastchange)); json_do_int("last_change_sec", get_monotime(set->lastchange)); if (set->type == ASNUM_SET || set->type == ASPA_SET) { json_do_uint("num_ASnum", set->as_cnt); @@ -1005,11 +1002,11 @@ json_rtr(struct ctl_show_rtr *rtr) json_do_object("rtr"); if (rtr->descr[0]) - json_do_printf("descr", "%s", rtr->descr); - json_do_printf("remote_addr", "%s", log_addr(&rtr->remote_addr)); + json_do_string("descr", rtr->descr); + json_do_string("remote_addr", log_addr(&rtr->remote_addr)); json_do_uint("remote_port", rtr->remote_port); if (rtr->local_addr.aid != AID_UNSPEC) - json_do_printf("local_addr", "%s", log_addr(&rtr->local_addr)); + json_do_string("local_addr", log_addr(&rtr->local_addr)); if (rtr->session_id != -1) { json_do_uint("session_id", rtr->session_id); @@ -1020,17 +1017,17 @@ json_rtr(struct ctl_show_rtr *rtr) json_do_uint("expire", rtr->expire); if (rtr->last_sent_error != NO_ERROR) { - json_do_printf("last_sent_error", "%s", + json_do_string("last_sent_error", log_rtr_error(rtr->last_sent_error)); if (rtr->last_sent_msg[0]) - json_do_printf("last_sent_msg", "%s", + json_do_string("last_sent_msg", log_reason(rtr->last_sent_msg)); } if (rtr->last_recv_error != NO_ERROR) { - json_do_printf("last_recv_error", "%s", + json_do_string("last_recv_error", log_rtr_error(rtr->last_recv_error)); if (rtr->last_recv_msg[0]) - json_do_printf("last_recv_msg", "%s", + json_do_string("last_recv_msg", log_reason(rtr->last_recv_msg)); } } @@ -1039,14 +1036,14 @@ static void json_result(u_int rescode) { if (rescode == 0) - json_do_printf("status", "OK"); + json_do_string("status", "OK"); else if (rescode >= sizeof(ctl_res_strerror)/sizeof(ctl_res_strerror[0])) { - json_do_printf("status", "FAILED"); + json_do_string("status", "FAILED"); json_do_printf("error", "unknown error %d", rescode); } else { - json_do_printf("status", "FAILED"); - json_do_printf("error", "%s", ctl_res_strerror[rescode]); + json_do_string("status", "FAILED"); + json_do_string("error", ctl_res_strerror[rescode]); } } diff --git a/usr.sbin/bgpctl/parser.c b/usr.sbin/bgpctl/parser.c index ff1647308..ae9003fd7 100644 --- a/usr.sbin/bgpctl/parser.c +++ b/usr.sbin/bgpctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.132 2023/04/21 10:49:01 claudio Exp $ */ +/* $OpenBSD: parser.c,v 1.133 2023/05/09 13:26:27 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -179,11 +179,11 @@ static const struct token t_show_rib[] = { { FLAG, "best", F_CTL_BEST, t_show_rib}, { COMMUNITY, "community", NONE, t_show_rib}, { FLAG, "detail", F_CTL_DETAIL, t_show_rib}, + { FLAG, "disqualified", F_CTL_INELIGIBLE, t_show_rib}, { ASTYPE, "empty-as", AS_EMPTY, t_show_rib}, { FLAG, "error", F_CTL_INVALID, t_show_rib}, { EXTCOMMUNITY, "ext-community", NONE, t_show_rib}, { FLAG, "in", F_CTL_ADJ_IN, t_show_rib}, - { FLAG, "invalid", F_CTL_INELIGIBLE, t_show_rib}, { LRGCOMMUNITY, "large-community", NONE, t_show_rib}, { FLAG, "leaked", F_CTL_LEAKED, t_show_rib}, { KEYWORD, "memory", SHOW_RIB_MEM, NULL}, diff --git a/usr.sbin/bgpd/rde_filter.c b/usr.sbin/bgpd/rde_filter.c index 4c0b57007..f0e9b17fe 100644 --- a/usr.sbin/bgpd/rde_filter.c +++ b/usr.sbin/bgpd/rde_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_filter.c,v 1.135 2023/04/19 13:23:33 claudio Exp $ */ +/* $OpenBSD: rde_filter.c,v 1.136 2023/05/09 13:11:19 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker @@ -583,6 +583,12 @@ filterset_copy(struct filter_set_head *source, struct filter_set_head *dest) if ((t = malloc(sizeof(struct filter_set))) == NULL) fatal(NULL); memcpy(t, s, sizeof(struct filter_set)); + if (t->type == ACTION_RTLABEL_ID) + rtlabel_ref(t->action.id); + else if (t->type == ACTION_PFTABLE_ID) + pftable_ref(t->action.id); + else if (t->type == ACTION_SET_NEXTHOP_REF) + nexthop_ref(t->action.nh_ref); TAILQ_INSERT_TAIL(dest, t, entry); } } diff --git a/usr.sbin/bgpd/rtr.c b/usr.sbin/bgpd/rtr.c index e30d0c4a7..e02b09bd8 100644 --- a/usr.sbin/bgpd/rtr.c +++ b/usr.sbin/bgpd/rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtr.c,v 1.14 2023/04/20 15:44:45 claudio Exp $ */ +/* $OpenBSD: rtr.c,v 1.15 2023/05/05 10:48:16 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -595,7 +595,8 @@ rtr_recalc(void) imsg_compose(ibuf_rde, IMSG_RECONF_ASPA_PREP, 0, 0, -1, &ap, sizeof(ap)); - RB_FOREACH(aspa, aspa_tree, &at) { + /* walk tree in reverse because aspa_add_set requires that */ + RB_FOREACH_REVERSE(aspa, aspa_tree, &at) { uint32_t as[2]; as[0] = aspa->as; as[1] = aspa->num; diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 137fda976..c8debdb4d 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.443 2023/04/20 12:53:27 claudio Exp $ */ +/* $OpenBSD: session.c,v 1.444 2023/05/05 07:28:08 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer @@ -1189,20 +1189,15 @@ session_setup_socket(struct peer *p) return (-1); } - /* only increase bufsize (and thus window) if md5 or ipsec is in use */ - if (p->conf.auth.method != AUTH_NONE) { - /* try to increase bufsize. no biggie if it fails */ - bsize = 65535; - while (bsize > 8192 && - setsockopt(p->fd, SOL_SOCKET, SO_RCVBUF, &bsize, - sizeof(bsize)) == -1 && errno != EINVAL) - bsize /= 2; - bsize = 65535; - while (bsize > 8192 && - setsockopt(p->fd, SOL_SOCKET, SO_SNDBUF, &bsize, - sizeof(bsize)) == -1 && errno != EINVAL) - bsize /= 2; - } + /* limit bufsize. no biggie if it fails */ + bsize = 65535; + while (bsize > 8192 && setsockopt(p->fd, SOL_SOCKET, SO_RCVBUF, + &bsize, sizeof(bsize)) == -1 && errno != EINVAL) + bsize /= 2; + bsize = 65535; + while (bsize > 8192 && setsockopt(p->fd, SOL_SOCKET, SO_SNDBUF, + &bsize, sizeof(bsize)) == -1 && errno != EINVAL) + bsize /= 2; return (0); } diff --git a/usr.sbin/bgplgd/qs.c b/usr.sbin/bgplgd/qs.c index cb5dfde7c..0aa10f6d4 100644 --- a/usr.sbin/bgplgd/qs.c +++ b/usr.sbin/bgplgd/qs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qs.c,v 1.4 2023/03/13 17:31:28 claudio Exp $ */ +/* $OpenBSD: qs.c,v 1.5 2023/05/09 14:35:45 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker * @@ -391,7 +391,7 @@ qs_argv(char **argv, size_t argc, size_t len, struct lg_ctx *ctx, int barenbr) argv[argc++] = "error"; } else if (ctx->qs_args[QS_INVALID].one) { if (argc < len) - argv[argc++] = "invalid"; + argv[argc++] = "disqualified"; } else if (ctx->qs_args[QS_LEAKED].one) { if (argc < len) argv[argc++] = "leaked"; diff --git a/usr.sbin/btrace/btrace.c b/usr.sbin/btrace/btrace.c index ae583a5e1..21c91884a 100644 --- a/usr.sbin/btrace/btrace.c +++ b/usr.sbin/btrace/btrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: btrace.c,v 1.69 2023/03/10 23:02:30 bluhm Exp $ */ +/* $OpenBSD: btrace.c,v 1.70 2023/05/12 14:14:16 claudio Exp $ */ /* * Copyright (c) 2019 - 2021 Martin Pieuchot @@ -119,9 +119,12 @@ struct dtioc_arg_info **dt_args; /* array of probe arguments */ struct dt_evt bt_devt; /* fake event for BEGIN/END */ uint64_t bt_filtered; /* # of events filtered out */ +struct syms *kelf, *uelf; + char **vargs; int nargs = 0; int verbose = 0; +int dtfd; volatile sig_atomic_t quit_pending; static void @@ -153,6 +156,9 @@ main(int argc, char *argv[]) case 'n': noaction = 1; break; + case 'p': + uelf = kelf_open(optarg); + break; case 'v': verbose++; break; @@ -204,6 +210,7 @@ main(int argc, char *argv[]) fd = open(__PATH_DEVDT, O_RDONLY); if (fd == -1) err(1, "could not open %s", __PATH_DEVDT); + dtfd = fd; } if (showprobes) { @@ -516,7 +523,7 @@ rules_setup(int fd) } if (dokstack) - kelf_open(); + kelf = kelf_open(_PATH_KSYMS); /* Initialize "fake" event for BEGIN/END */ bt_devt.dtev_pbn = -1; @@ -593,8 +600,10 @@ rules_teardown(int fd) } } - if (dokstack) - kelf_close(); + kelf_close(kelf); + kelf = NULL; + kelf_close(uelf); + uelf = NULL; /* Update "fake" event for BEGIN/END */ clock_gettime(CLOCK_REALTIME, &bt_devt.dtev_tsp); @@ -703,17 +712,21 @@ builtin_nsecs(struct dt_evt *dtev) } const char * -builtin_stack(struct dt_evt *dtev, int kernel) +builtin_stack(struct dt_evt *dtev, int kernel, unsigned long offset) { struct stacktrace *st = &dtev->dtev_kstack; - static char buf[4096], *bp; + static char buf[4096]; + const char *last = "\nkernel\n"; + char *bp; size_t i; int sz; - if (!kernel) - return ""; - if (st->st_count == 0) + if (!kernel) { + st = &dtev->dtev_ustack; + last = "\nuserland\n"; + } else if (st->st_count == 0) { return "\nuserland\n"; + } buf[0] = '\0'; bp = buf; @@ -721,7 +734,12 @@ builtin_stack(struct dt_evt *dtev, int kernel) for (i = 0; i < st->st_count; i++) { int l; - l = kelf_snprintsym(bp, sz - 1, st->st_pc[i]); + if (!kernel) + l = kelf_snprintsym(uelf, bp, sz - 1, st->st_pc[i], + offset); + else + l = kelf_snprintsym(kelf, bp, sz - 1, st->st_pc[i], + offset); if (l < 0) break; if (l >= sz - 1) { @@ -732,7 +750,7 @@ builtin_stack(struct dt_evt *dtev, int kernel) bp += l; sz -= l; } - snprintf(bp, sz, "\nkernel\n"); + snprintf(bp, sz, "%s", last); return buf; } @@ -1525,10 +1543,10 @@ ba2str(struct bt_arg *ba, struct dt_evt *dtev) str = ""; break; case B_AT_BI_KSTACK: - str = builtin_stack(dtev, 1); + str = builtin_stack(dtev, 1, 0); break; case B_AT_BI_USTACK: - str = builtin_stack(dtev, 0); + str = builtin_stack(dtev, 0, dt_get_offset(dtev->dtev_pid)); break; case B_AT_BI_COMM: str = dtev->dtev_comm; @@ -1796,3 +1814,30 @@ debug_probe_name(struct bt_probe *bp) return buf; } + +unsigned long +dt_get_offset(pid_t pid) +{ + static struct dtioc_getaux cache[32]; + static int next; + struct dtioc_getaux *aux = NULL; + int i; + + for (i = 0; i < 32; i++) { + if (cache[i].dtga_pid != pid) + continue; + aux = cache + i; + break; + } + + if (aux == NULL) { + aux = &cache[next++]; + next %= 32; + + aux->dtga_pid = pid; + if (ioctl(dtfd, DTIOCGETAUXBASE, aux)) + aux->dtga_auxbase = 0; + } + + return aux->dtga_auxbase; +} diff --git a/usr.sbin/btrace/btrace.h b/usr.sbin/btrace/btrace.h index d763ae5a5..78d4618d4 100644 --- a/usr.sbin/btrace/btrace.h +++ b/usr.sbin/btrace/btrace.h @@ -1,4 +1,4 @@ -/* $OpenBSD: btrace.h,v 1.11 2021/12/07 22:17:03 guenther Exp $ */ +/* $OpenBSD: btrace.h,v 1.12 2023/05/12 14:14:16 claudio Exp $ */ /* * Copyright (c) 2019 - 2020 Martin Pieuchot @@ -33,11 +33,15 @@ const char * ba_name(struct bt_arg *); long ba2long(struct bt_arg *, struct dt_evt *); const char *ba2str(struct bt_arg *, struct dt_evt *); long bacmp(struct bt_arg *, struct bt_arg *); +unsigned long dt_get_offset(pid_t); /* ksyms.c */ -int kelf_open(void); -void kelf_close(void); -int kelf_snprintsym(char *, size_t, unsigned long); +struct syms; +struct syms *kelf_open(const char *); +void kelf_offset(struct syms *, unsigned long); +void kelf_close(struct syms *); +int kelf_snprintsym(struct syms *, char *, size_t, + unsigned long, unsigned long); /* map.c */ struct map; @@ -52,7 +56,7 @@ void map_zero(struct map *); struct hist *hist_increment(struct hist *, const char *, long); void hist_print(struct hist *, const char *); -#define KLEN 512 /* # of characters in map key, contain a stack trace */ +#define KLEN 1024 /* # of characters in map key, contain a stack trace */ #define STRLEN 64 /* maximum # of bytes to output via str() function */ /* printf.c */ diff --git a/usr.sbin/btrace/ksyms.c b/usr.sbin/btrace/ksyms.c index 09fbd81cc..7e0ca0ad1 100644 --- a/usr.sbin/btrace/ksyms.c +++ b/usr.sbin/btrace/ksyms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksyms.c,v 1.4 2021/02/10 00:34:57 deraadt Exp $ */ +/* $OpenBSD: ksyms.c,v 1.5 2023/05/12 14:14:16 claudio Exp $ */ /* * Copyright (c) 2016 Martin Pieuchot @@ -16,73 +16,82 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define _DYN_LOADER /* needed for AuxInfo */ + +#include + #include #include #include #include #include #include +#include #include #include #include "btrace.h" -int kfd = -1; -Elf *kelf; -Elf_Scn *ksymtab; -size_t kstrtabndx, knsymb; +struct syms { + int fd; + Elf *elf; + Elf_Scn *symtab; + size_t strtabndx, nsymb; +}; -int kelf_parse(void); +int kelf_parse(struct syms *); -int -kelf_open(void) +struct syms * +kelf_open(const char *path) { + struct syms *syms; int error; - assert(kfd == -1); - if (elf_version(EV_CURRENT) == EV_NONE) errx(1, "elf_version: %s", elf_errmsg(-1)); - kfd = open(_PATH_KSYMS, O_RDONLY); - if (kfd == -1) { - warn("open"); - return 1; + if ((syms = calloc(1, sizeof(*syms))) == NULL) + err(1, NULL); + + syms->fd = open(path, O_RDONLY); + if (syms->fd == -1) { + warn("open: %s", path); + free(syms); + return NULL; } - if ((kelf = elf_begin(kfd, ELF_C_READ, NULL)) == NULL) { + if ((syms->elf = elf_begin(syms->fd, ELF_C_READ, NULL)) == NULL) { warnx("elf_begin: %s", elf_errmsg(-1)); - error = 1; goto bad; } - if (elf_kind(kelf) != ELF_K_ELF) { - error = 1; + if (elf_kind(syms->elf) != ELF_K_ELF) goto bad; - } - error = kelf_parse(); + error = kelf_parse(syms); if (error) goto bad; - return 0; + return syms; bad: - kelf_close(); - return error; + kelf_close(syms); + return NULL; } void -kelf_close(void) +kelf_close(struct syms *syms) { - elf_end(kelf); - kelf = NULL; - close(kfd); - kfd = -1; + if (syms == NULL) + return; + elf_end(syms->elf); + close(syms->fd); + free(syms); } int -kelf_snprintsym(char *str, size_t size, unsigned long pc) +kelf_snprintsym(struct syms *syms, char *str, size_t size, unsigned long pc, + unsigned long off) { GElf_Sym sym; Elf_Data *data = NULL; @@ -91,32 +100,35 @@ kelf_snprintsym(char *str, size_t size, unsigned long pc) char *name; int cnt; - data = elf_rawdata(ksymtab, data); + if (syms == NULL) + goto fallback; + + data = elf_rawdata(syms->symtab, data); if (data == NULL) goto fallback; - for (i = 0; i < knsymb; i++) { + for (i = 0; i < syms->nsymb; i++) { if (gelf_getsym(data, i, &sym) == NULL) continue; if (GELF_ST_TYPE(sym.st_info) != STT_FUNC) continue; - if (pc >= sym.st_value) { - if (pc < (sym.st_value + sym.st_size)) + if (pc >= sym.st_value + off) { + if (pc < (sym.st_value + off + sym.st_size)) break; /* Workaround for symbols w/o size, usually asm ones. */ - if (sym.st_size == 0 && sym.st_value > bestoff) { + if (sym.st_size == 0 && sym.st_value + off > bestoff) { bestidx = i; - bestoff = sym.st_value; + bestoff = sym.st_value + off; } } } - if (i == knsymb) { + if (i == syms->nsymb) { if (bestidx == 0 || gelf_getsym(data, bestidx, &sym) == NULL) goto fallback; } - name = elf_strptr(kelf, kstrtabndx, sym.st_name); + name = elf_strptr(syms->elf, syms->strtabndx, sym.st_name); if (name != NULL) cnt = snprintf(str, size, "\n%s", name); else @@ -124,7 +136,7 @@ kelf_snprintsym(char *str, size_t size, unsigned long pc) if (cnt < 0) return cnt; - offset = pc - sym.st_value; + offset = pc - (sym.st_value + off); if (offset != 0) { int l; @@ -142,43 +154,44 @@ fallback: } int -kelf_parse(void) +kelf_parse(struct syms *syms) { GElf_Shdr shdr; Elf_Scn *scn, *scnctf; char *name; size_t shstrndx; - if (elf_getshdrstrndx(kelf, &shstrndx) != 0) { + if (elf_getshdrstrndx(syms->elf, &shstrndx) != 0) { warnx("elf_getshdrstrndx: %s", elf_errmsg(-1)); return 1; } scn = scnctf = NULL; - while ((scn = elf_nextscn(kelf, scn)) != NULL) { + while ((scn = elf_nextscn(syms->elf, scn)) != NULL) { if (gelf_getshdr(scn, &shdr) != &shdr) { warnx("elf_getshdr: %s", elf_errmsg(-1)); return 1; } - if ((name = elf_strptr(kelf, shstrndx, shdr.sh_name)) == NULL) { + if ((name = elf_strptr(syms->elf, shstrndx, + shdr.sh_name)) == NULL) { warnx("elf_strptr: %s", elf_errmsg(-1)); return 1; } if (strcmp(name, ELF_SYMTAB) == 0 && shdr.sh_type == SHT_SYMTAB && shdr.sh_entsize != 0) { - ksymtab = scn; - knsymb = shdr.sh_size / shdr.sh_entsize; + syms->symtab = scn; + syms->nsymb = shdr.sh_size / shdr.sh_entsize; } if (strcmp(name, ELF_STRTAB) == 0 && shdr.sh_type == SHT_STRTAB) { - kstrtabndx = elf_ndxscn(scn); + syms->strtabndx = elf_ndxscn(scn); } } - if (ksymtab == NULL) + if (syms->symtab == NULL) warnx("symbol table not found"); return 0; diff --git a/usr.sbin/cron/crontab.5 b/usr.sbin/cron/crontab.5 index 88fe5e72c..b54cc5d9c 100644 --- a/usr.sbin/cron/crontab.5 +++ b/usr.sbin/cron/crontab.5 @@ -17,9 +17,9 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $OpenBSD: crontab.5,v 1.41 2020/04/18 17:11:40 jmc Exp $ +.\" $OpenBSD: crontab.5,v 1.42 2023/05/06 23:06:27 millert Exp $ .\" -.Dd $Mdocdate: April 18 2020 $ +.Dd $Mdocdate: May 6 2023 $ .Dt CRONTAB 5 .Os .Sh NAME @@ -157,8 +157,7 @@ If either (or both) of the numbers on either side of the .Ql ~ are omitted, the appropriate limit (low or high) for the field will be used. .Pp -Step values can be used in conjunction with ranges (but not random ranges -which represent a single number). +Step values can be used in conjunction with ranges. Following a range with .No / Ns Ar number specifies skips of @@ -173,6 +172,18 @@ Steps are also permitted after an asterisk, so to say .Dq every two hours , just use .Dq */2 . +A step value after a random range will execute the command at a random +offset less than the step size. +For example, to avoid a thundering herd at the top and bottom of the hour, +.Dq 0~59/30 +.Po +or simply +.Dq ~/30 +.Pc +can be used in the +.Ar minute +field to specify that command execution happen twice an hour at +consistent intervals. .Pp An asterisk .Pq Ql * diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c index 52c2d57ef..36d275019 100644 --- a/usr.sbin/cron/crontab.c +++ b/usr.sbin/cron/crontab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crontab.c,v 1.95 2021/06/22 20:12:17 jmc Exp $ */ +/* $OpenBSD: crontab.c,v 1.96 2023/05/05 13:50:40 millert Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") @@ -381,6 +381,41 @@ edit_cmd(void) syslog(LOG_INFO, "(%s) END EDIT (%s)", RealUser, User); } +/* Create a temporary file in the spool dir owned by "pw". */ +static FILE * +spool_mkstemp(char *template) +{ + uid_t euid = geteuid(); + int fd = -1; + FILE *fp; + + if (euid != pw->pw_uid) { + if (seteuid(pw->pw_uid) == -1) { + warn("unable to change uid to %u", pw->pw_uid); + goto bad; + } + } + fd = mkstemp(template); + if (euid != pw->pw_uid) { + if (seteuid(euid) == -1) { + warn("unable to change uid to %u", euid); + goto bad; + } + } + if (fd == -1 || !(fp = fdopen(fd, "w+"))) { + warn("%s", template); + goto bad; + } + return (fp); + +bad: + if (fd != -1) { + close(fd); + unlink(template); + } + return (NULL); +} + /* returns 0 on success * -1 on syntax error * -2 on install error @@ -390,10 +425,9 @@ replace_cmd(void) { char n[PATH_MAX], envstr[MAX_ENVSTR]; FILE *tmp; - int ch, eof, fd; + int ch, eof; int error = 0; entry *e; - uid_t euid = geteuid(); time_t now = time(NULL); char **envp = env_init(); @@ -407,25 +441,8 @@ replace_cmd(void) warnc(ENAMETOOLONG, "%s/tmp.XXXXXXXXX", _PATH_CRON_SPOOL); return (-2); } - if (euid != pw->pw_uid) { - if (seteuid(pw->pw_uid) == -1) { - warn("unable to change uid to %u", pw->pw_uid); - return (-2); - } - } - fd = mkstemp(TempFilename); - if (euid != pw->pw_uid) { - if (seteuid(euid) == -1) { - warn("unable to change uid to %u", euid); - return (-2); - } - } - if (fd == -1 || !(tmp = fdopen(fd, "w+"))) { - warn("%s", TempFilename); - if (fd != -1) { - close(fd); - unlink(TempFilename); - } + tmp = spool_mkstemp(TempFilename); + if (tmp == NULL) { TempFilename[0] = '\0'; return (-2); } diff --git a/usr.sbin/cron/entry.c b/usr.sbin/cron/entry.c index ab683b847..c3f04b1af 100644 --- a/usr.sbin/cron/entry.c +++ b/usr.sbin/cron/entry.c @@ -1,4 +1,4 @@ -/* $OpenBSD: entry.c,v 1.53 2022/05/21 01:21:29 deraadt Exp $ */ +/* $OpenBSD: entry.c,v 1.56 2023/05/08 15:18:31 millert Exp $ */ /* * Copyright 1988,1990,1993,1994 by Paul Vixie @@ -456,10 +456,11 @@ get_range(bitstr_t *bits, int low, int high, const char *names[], /* range = number | number* "~" number* | number "-" number ["/" number] */ - int i, num1, num2, num3; + int i, num1, num2, num3, rndstep; num1 = low; num2 = high; + rndstep = 0; if (ch == '*') { /* '*' means [low, high] but can still be modified by /step @@ -497,14 +498,33 @@ get_range(bitstr_t *bits, int low, int high, const char *names[], /* get the (optional) number following the tilde */ - ch = get_number(&num2, low, names, ch, file, ", \t\n"); - if (ch == EOF) + ch = get_number(&num2, low, names, ch, file, "/, \t\n"); + if (ch == EOF) { + /* no second number, check for valid terminator + */ ch = get_char(file); + if (!strchr("/, \t\n", ch)) { + unget_char(ch, file); + return (EOF); + } + } if (ch == EOF || num1 > num2) { unget_char(ch, file); return (EOF); } + /* we must perform the bounds checking ourselves + */ + if (num1 < low || num2 > high) + return (EOF); + + if (ch == '/') { + /* randomize the step value instead of num1 + */ + rndstep = 1; + break; + } + /* get a random number in the interval [num1, num2] */ num3 = num1; @@ -538,6 +558,13 @@ get_range(bitstr_t *bits, int low, int high, const char *names[], ch = get_number(&num3, 0, NULL, ch, file, ", \t\n"); if (ch == EOF || num3 == 0) return (EOF); + if (rndstep) { + /* + * use a random offset smaller than the step size + * and the difference between high and low values. + */ + num1 += arc4random_uniform(MINIMUM(num3, num2 - num1)); + } } else { /* no step. default==1. */ diff --git a/usr.sbin/cron/macros.h b/usr.sbin/cron/macros.h index c1cc8f84a..efd2f5c92 100644 --- a/usr.sbin/cron/macros.h +++ b/usr.sbin/cron/macros.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macros.h,v 1.15 2015/11/12 21:12:05 millert Exp $ */ +/* $OpenBSD: macros.h,v 1.16 2023/05/06 23:06:27 millert Exp $ */ /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") @@ -29,6 +29,8 @@ #define MAX_TEMPSTR 100 /* obvious */ #define MAX_UNAME (_PW_NAME_LEN+1) /* max length of username, should be overkill */ +#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) + #define Skip_Blanks(c, f) \ while (c == '\t' || c == ' ') \ c = get_char(f); diff --git a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm index c9bc4afcc..2937f8514 100644 --- a/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm +++ b/usr.sbin/pkg_add/OpenBSD/RequiredBy.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: RequiredBy.pm,v 1.27 2015/08/13 16:34:11 espie Exp $ +# $OpenBSD: RequiredBy.pm,v 1.28 2023/05/04 14:02:44 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie # @@ -105,7 +105,7 @@ sub erase sub delete { my ($self, @pkgnames) = @_; - $self->fill_entries($self); + $self->fill_entries; for my $pkg (@pkgnames) { delete $self->{entries}->{$pkg}; } @@ -115,7 +115,7 @@ sub delete sub add { my ($self, @pkgnames) = @_; - $self->fill_entries($self); + $self->fill_entries; for my $pkg (@pkgnames) { $self->{entries}->{$pkg} = 1; } diff --git a/usr.sbin/rpki-client/cert.c b/usr.sbin/rpki-client/cert.c index 0ed702044..f8f7c42b9 100644 --- a/usr.sbin/rpki-client/cert.c +++ b/usr.sbin/rpki-client/cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cert.c,v 1.107 2023/04/15 00:39:08 job Exp $ */ +/* $OpenBSD: cert.c,v 1.108 2023/05/09 10:34:32 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2021 Job Snijders @@ -1092,6 +1092,7 @@ auth_insert(struct auth_tree *auths, struct cert *cert, struct auth *parent) na->parent = parent; na->cert = cert; + na->any_inherits = x509_any_inherits(cert->x509); if (RB_INSERT(auth_tree, auths, na) != NULL) err(1, "auth tree corrupted"); diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h index 4c1217aa9..68d724de2 100644 --- a/usr.sbin/rpki-client/extern.h +++ b/usr.sbin/rpki-client/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.180 2023/04/27 08:37:53 beck Exp $ */ +/* $OpenBSD: extern.h,v 1.181 2023/05/09 10:34:32 tb Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -454,6 +454,7 @@ struct auth { RB_ENTRY(auth) entry; struct cert *cert; /* owner information */ struct auth *parent; /* pointer to parent or NULL for TA cert */ + int any_inherits; }; /* * Tree of auth sorted by ski diff --git a/usr.sbin/rpki-client/filemode.c b/usr.sbin/rpki-client/filemode.c index b2e729c33..2870662c2 100644 --- a/usr.sbin/rpki-client/filemode.c +++ b/usr.sbin/rpki-client/filemode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: filemode.c,v 1.30 2023/04/26 16:32:41 claudio Exp $ */ +/* $OpenBSD: filemode.c,v 1.31 2023/05/03 10:22:30 tb Exp $ */ /* * Copyright (c) 2019 Claudio Jeker * Copyright (c) 2019 Kristaps Dzonsons @@ -478,6 +478,7 @@ proc_parser_file(char *file, unsigned char *buf, size_t len) } else { cert_free(cert); cert = NULL; + expires = NULL; status = 0; } } diff --git a/usr.sbin/rpki-client/http.c b/usr.sbin/rpki-client/http.c index 6c78bc06c..700f06b5b 100644 --- a/usr.sbin/rpki-client/http.c +++ b/usr.sbin/rpki-client/http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http.c,v 1.73 2022/11/02 16:50:51 claudio Exp $ */ +/* $OpenBSD: http.c,v 1.74 2023/05/10 15:24:41 claudio Exp $ */ /* * Copyright (c) 2020 Nils Fisher * Copyright (c) 2020 Claudio Jeker @@ -1954,6 +1954,7 @@ proc_http(char *bind_addr, int fd) if (conn->pfd != NULL && conn->pfd->revents != 0) http_do(conn, http_handle); else if (conn->io_time <= now) { + conn->io_time = 0; if (conn->state == STATE_CONNECT) { warnx("%s: connect timeout", conn_info(conn)); diff --git a/usr.sbin/rpki-client/json.c b/usr.sbin/rpki-client/json.c index 6e065648e..5d860729e 100644 --- a/usr.sbin/rpki-client/json.c +++ b/usr.sbin/rpki-client/json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: json.c,v 1.1 2023/04/27 07:57:25 claudio Exp $ */ +/* $OpenBSD: json.c,v 1.2 2023/05/03 07:56:05 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -16,10 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include #include #include #include +#include #include #include "json.h" @@ -179,16 +181,58 @@ void json_do_printf(const char *name, const char *fmt, ...) { va_list ap; + char *str; + + va_start(ap, fmt); + if (!eb) { + if (vasprintf(&str, fmt, ap) == -1) + errx(1, "json printf failed"); + json_do_string(name, str); + free(str); + } + va_end(ap); +} + +void +json_do_string(const char *name, const char *v) +{ + unsigned char c; do_comma_indent(); - do_name(name); if (!eb) eb = fprintf(jsonfh, "\"") < 0; - va_start(ap, fmt); - if (!eb) - eb = vfprintf(jsonfh, fmt, ap) < 0; - va_end(ap); + while ((c = *v++) != '\0' && !eb) { + /* skip escaping '/' since our use case does not require it */ + switch(c) { + case '"': + eb = fprintf(jsonfh, "\\\"") < 0; + break; + case '\\': + eb = fprintf(jsonfh, "\\\\") < 0; + break; + case '\b': + eb = fprintf(jsonfh, "\\b") < 0; + break; + case '\f': + eb = fprintf(jsonfh, "\\f") < 0; + break; + case '\n': + eb = fprintf(jsonfh, "\\n") < 0; + break; + case '\r': + eb = fprintf(jsonfh, "\\r") < 0; + break; + case '\t': + eb = fprintf(jsonfh, "\\t") < 0; + break; + default: + if (iscntrl(c)) + errx(1, "bad control character in string"); + eb = putc(c, jsonfh) == EOF; + break; + } + } if (!eb) eb = fprintf(jsonfh, "\"") < 0; } diff --git a/usr.sbin/rpki-client/json.h b/usr.sbin/rpki-client/json.h index bd7cbf221..5eb8babef 100644 --- a/usr.sbin/rpki-client/json.h +++ b/usr.sbin/rpki-client/json.h @@ -1,4 +1,4 @@ -/* $OpenBSD: json.h,v 1.1 2023/04/27 07:57:25 claudio Exp $ */ +/* $OpenBSD: json.h,v 1.2 2023/05/03 07:56:05 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker @@ -26,6 +26,7 @@ void json_do_object(const char *); void json_do_end(void); void json_do_printf(const char *, const char *, ...) __attribute__((__format__ (printf, 2, 3))); +void json_do_string(const char *, const char *); void json_do_hexdump(const char *, void *, size_t); void json_do_bool(const char *, int); void json_do_uint(const char *, unsigned long long); diff --git a/usr.sbin/rpki-client/output-json.c b/usr.sbin/rpki-client/output-json.c index f3a788cf0..39f1cbdd3 100644 --- a/usr.sbin/rpki-client/output-json.c +++ b/usr.sbin/rpki-client/output-json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-json.c,v 1.36 2023/04/27 07:57:25 claudio Exp $ */ +/* $OpenBSD: output-json.c,v 1.37 2023/05/03 09:54:25 claudio Exp $ */ /* * Copyright (c) 2019 Claudio Jeker * @@ -39,8 +39,8 @@ outputheader_json(struct stats *st) json_do_object("metadata"); - json_do_printf("buildmachine", "%s", hn); - json_do_printf("buildtime", "%s", tbuf); + json_do_string("buildmachine", hn); + json_do_string("buildtime", tbuf); json_do_int("elapsedtime", st->elapsed_time.tv_sec); json_do_int("usertime", st->user_time.tv_sec); json_do_int("systemtime", st->system_time.tv_sec); @@ -59,7 +59,7 @@ outputheader_json(struct stats *st) json_do_array("talfiles"); for (i = 0; i < talsz; i++) - json_do_printf("name", "%s", tals[i]); + json_do_string("name", tals[i]); json_do_end(); json_do_int("manifests", st->repo_tal_stats.mfts); @@ -138,9 +138,9 @@ output_json(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, json_do_object("roa"); json_do_int("asn", v->asid); - json_do_printf("prefix", "%s", buf); + json_do_string("prefix", buf); json_do_int("maxLength", v->maxlength); - json_do_printf("ta", "%s", taldescs[v->talid]); + json_do_string("ta", taldescs[v->talid]); json_do_int("expires", v->expires); json_do_end(); } @@ -150,9 +150,9 @@ output_json(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, RB_FOREACH(b, brk_tree, brks) { json_do_object("brks"); json_do_int("asn", b->asid); - json_do_printf("ski", "%s", b->ski); - json_do_printf("pubkey", "%s", b->pubkey); - json_do_printf("ta", "%s", taldescs[b->talid]); + json_do_string("ski", b->ski); + json_do_string("pubkey", b->pubkey); + json_do_string("ta", taldescs[b->talid]); json_do_int("expires", b->expires); json_do_end(); } diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c index 4da886e75..7da33377a 100644 --- a/usr.sbin/rpki-client/parser.c +++ b/usr.sbin/rpki-client/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.93 2023/04/27 08:37:53 beck Exp $ */ +/* $OpenBSD: parser.c,v 1.94 2023/05/11 20:13:30 job Exp $ */ /* * Copyright (c) 2019 Claudio Jeker * Copyright (c) 2019 Kristaps Dzonsons @@ -188,7 +188,8 @@ proc_parser_mft_check(const char *fn, struct mft *p) /* silently skip not-existing unknown files */ if (m->type == RTYPE_INVALID && noent == 2) continue; - warnx("%s: bad message digest for %s", fn, m->file); + warnx("%s#%s: bad message digest for %s", fn, + p->seqnum, m->file); rc = 0; continue; } diff --git a/usr.sbin/rpki-client/rrdp.c b/usr.sbin/rpki-client/rrdp.c index e5fe79186..d254beca5 100644 --- a/usr.sbin/rpki-client/rrdp.c +++ b/usr.sbin/rpki-client/rrdp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rrdp.c,v 1.29 2023/01/04 16:51:34 job Exp $ */ +/* $OpenBSD: rrdp.c,v 1.30 2023/05/03 07:51:08 claudio Exp $ */ /* * Copyright (c) 2020 Nils Fisher * Copyright (c) 2021 Claudio Jeker @@ -503,8 +503,8 @@ rrdp_data_handler(struct rrdp *s) len = read(s->infd, buf, sizeof(buf)); if (len == -1) { - s->state |= RRDP_STATE_PARSE_ERROR; warn("%s: read failure", s->local); + rrdp_abort_req(s); return; } if ((s->state & RRDP_STATE_PARSE) == 0) diff --git a/usr.sbin/rpki-client/validate.c b/usr.sbin/rpki-client/validate.c index b21ff004c..ef0bc7f58 100644 --- a/usr.sbin/rpki-client/validate.c +++ b/usr.sbin/rpki-client/validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: validate.c,v 1.59 2023/04/27 08:37:53 beck Exp $ */ +/* $OpenBSD: validate.c,v 1.61 2023/05/11 14:05:31 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -152,6 +152,8 @@ valid_cert(const char *fn, struct auth *a, const struct cert *cert) } for (i = 0; i < cert->ipsz; i++) { + if (cert->ips[i].type == CERT_IP_INHERIT) + continue; if (valid_ip(a, cert->ips[i].afi, cert->ips[i].min, cert->ips[i].max)) continue; @@ -332,25 +334,37 @@ valid_origin(const char *uri, const char *proto) } /* - * Walk the certificate tree to the root and build a certificate - * chain from cert->x509. All certs in the tree are validated and - * can be loaded as trusted stack into the validator. + * Walk the tree of known valid CA certificates until we find a certificate that + * doesn't inherit. Build a chain of intermediates and use the non-inheriting + * certificate as a trusted root by virtue of X509_V_FLAG_PARTIAL_CHAIN. The + * RFC 3779 path validation needs a non-inheriting trust root to ensure that + * all delegated resources are covered. */ static void -build_chain(const struct auth *a, STACK_OF(X509) **chain) +build_chain(const struct auth *a, STACK_OF(X509) **intermediates, + STACK_OF(X509) **root) { - *chain = NULL; + *intermediates = NULL; + *root = NULL; if (a == NULL) return; - if ((*chain = sk_X509_new_null()) == NULL) + if ((*intermediates = sk_X509_new_null()) == NULL) + err(1, "sk_X509_new_null"); + if ((*root = sk_X509_new_null()) == NULL) err(1, "sk_X509_new_null"); for (; a != NULL; a = a->parent) { assert(a->cert->x509 != NULL); - if (!sk_X509_push(*chain, a->cert->x509)) + if (!a->any_inherits) { + if (!sk_X509_push(*root, a->cert->x509)) + errx(1, "sk_X509_push"); + break; + } + if (!sk_X509_push(*intermediates, a->cert->x509)) errx(1, "sk_X509_push"); } + assert(sk_X509_num(*root) == 1); } /* @@ -381,13 +395,13 @@ valid_x509(char *file, X509_STORE_CTX *store_ctx, X509 *x509, struct auth *a, { X509_VERIFY_PARAM *params; ASN1_OBJECT *cp_oid; - STACK_OF(X509) *chain; + STACK_OF(X509) *intermediates, *root; STACK_OF(X509_CRL) *crls = NULL; unsigned long flags; int error; *errstr = NULL; - build_chain(a, &chain); + build_chain(a, &intermediates, &root); build_crls(crl, &crls); assert(store_ctx != NULL); @@ -404,25 +418,33 @@ valid_x509(char *file, X509_STORE_CTX *store_ctx, X509 *x509, struct auth *a, X509_VERIFY_PARAM_set_time(params, evaluation_time); flags = X509_V_FLAG_CRL_CHECK; + flags |= X509_V_FLAG_PARTIAL_CHAIN; flags |= X509_V_FLAG_POLICY_CHECK; flags |= X509_V_FLAG_EXPLICIT_POLICY; flags |= X509_V_FLAG_INHIBIT_MAP; X509_STORE_CTX_set_flags(store_ctx, flags); X509_STORE_CTX_set_depth(store_ctx, MAX_CERT_DEPTH); - X509_STORE_CTX_set0_trusted_stack(store_ctx, chain); + /* + * See the comment above build_chain() for details on what's happening + * here. The nomenclature in this API is dubious and poorly documented. + */ + X509_STORE_CTX_set0_untrusted(store_ctx, intermediates); + X509_STORE_CTX_set0_trusted_stack(store_ctx, root); X509_STORE_CTX_set0_crls(store_ctx, crls); if (X509_verify_cert(store_ctx) <= 0) { error = X509_STORE_CTX_get_error(store_ctx); *errstr = X509_verify_cert_error_string(error); X509_STORE_CTX_cleanup(store_ctx); - sk_X509_free(chain); + sk_X509_free(intermediates); + sk_X509_free(root); sk_X509_CRL_free(crls); return 0; } X509_STORE_CTX_cleanup(store_ctx); - sk_X509_free(chain); + sk_X509_free(intermediates); + sk_X509_free(root); sk_X509_CRL_free(crls); return 1; } diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c index 6028cbc51..84fd035f0 100644 --- a/usr.sbin/smtpd/bounce.c +++ b/usr.sbin/smtpd/bounce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bounce.c,v 1.87 2023/02/08 08:20:54 tb Exp $ */ +/* $OpenBSD: bounce.c,v 1.88 2023/05/04 12:43:44 chrisz Exp $ */ /* * Copyright (c) 2009 Gilles Chehade @@ -538,8 +538,8 @@ bounce_next(struct bounce_session *s) if ((len = getline(&line, &sz, s->msgfp)) == -1) break; if (len == 1 && line[0] == '\n' && /* end of headers */ - s->msg->bounce.type == B_DELIVERED && - s->msg->bounce.dsn_ret == DSN_RETHDRS) { + (s->msg->bounce.type != B_FAILED || + s->msg->bounce.dsn_ret != DSN_RETFULL)) { free(line); fclose(s->msgfp); s->msgfp = NULL; diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c index 529241390..0ae45f0ca 100644 --- a/usr.sbin/smtpd/lka_filter.c +++ b/usr.sbin/smtpd/lka_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka_filter.c,v 1.68 2021/06/14 17:58:15 eric Exp $ */ +/* $OpenBSD: lka_filter.c,v 1.69 2023/05/10 07:20:20 op Exp $ */ /* * Copyright (c) 2018 Gilles Chehade @@ -933,13 +933,13 @@ filter_protocol_query(struct filter *filter, uint64_t token, uint64_t reqid, con n = io_printf(lka_proc_get_io(filter->proc), "filter|%s|%lld.%06ld|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s|%s\n", PROTOCOL_VERSION, - tv.tv_sec, tv.tv_usec, + (long long int)tv.tv_sec, tv.tv_usec, phase, reqid, token, fs->rdns, param); else n = io_printf(lka_proc_get_io(filter->proc), "filter|%s|%lld.%06ld|smtp-in|%s|%016"PRIx64"|%016"PRIx64"|%s\n", PROTOCOL_VERSION, - tv.tv_sec, tv.tv_usec, + (long long int)tv.tv_sec, tv.tv_usec, phase, reqid, token, param); if (n == -1) fatalx("failed to write to processor"); @@ -957,7 +957,7 @@ filter_data_query(struct filter *filter, uint64_t token, uint64_t reqid, const c "filter|%s|%lld.%06ld|smtp-in|data-line|" "%016"PRIx64"|%016"PRIx64"|%s\n", PROTOCOL_VERSION, - tv.tv_sec, tv.tv_usec, + (long long int)tv.tv_sec, tv.tv_usec, reqid, token, line); if (n == -1) fatalx("failed to write to processor"); @@ -1374,8 +1374,9 @@ report_smtp_broadcast(uint64_t reqid, const char *direction, struct timeval *tv, va_start(ap, format); if (io_printf(lka_proc_get_io(rp->name), "report|%s|%lld.%06ld|%s|%s|%016"PRIx64"%s", - PROTOCOL_VERSION, tv->tv_sec, tv->tv_usec, direction, - event, reqid, format[0] != '\n' ? "|" : "") == -1 || + PROTOCOL_VERSION, (long long int)tv->tv_sec, tv->tv_usec, + direction, event, reqid, + format[0] != '\n' ? "|" : "") == -1 || io_vprintf(lka_proc_get_io(rp->name), format, ap) == -1) fatalx("failed to write to processor"); va_end(ap); diff --git a/usr.sbin/smtpd/mail.maildir.c b/usr.sbin/smtpd/mail.maildir.c index c204caaf2..355831e89 100644 --- a/usr.sbin/smtpd/mail.maildir.c +++ b/usr.sbin/smtpd/mail.maildir.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #define MAILADDR_ESCAPE "!#$%&'*/?^`{|}~" diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c index edfd98860..894bf865a 100644 --- a/usr.sbin/smtpd/mda.c +++ b/usr.sbin/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.144 2023/02/08 08:20:54 tb Exp $ */ +/* $OpenBSD: mda.c,v 1.145 2023/05/10 07:19:08 op Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -507,7 +507,7 @@ mda_getlastline(int fd, char *dst, size_t dstsz) size_t sz = 0; ssize_t len; int out = 0; - + if (lseek(fd, 0, SEEK_SET) == -1) { log_warn("warn: mda: lseek"); close(fd); diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 4915bf600..42d396868 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.291 2022/02/10 14:59:35 millert Exp $ */ +/* $OpenBSD: parse.y,v 1.292 2023/05/10 07:19:49 op Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c index 6e340ccde..4a5c692e9 100644 --- a/usr.sbin/smtpd/to.c +++ b/usr.sbin/smtpd/to.c @@ -1,4 +1,4 @@ -/* $OpenBSD: to.c,v 1.48 2021/06/14 17:58:16 eric Exp $ */ +/* $OpenBSD: to.c,v 1.49 2023/05/10 08:02:10 op Exp $ */ /* * Copyright (c) 2009 Jacek Masiulaniec @@ -140,10 +140,10 @@ time_to_text(time_t when) { struct tm *lt; static char buf[40]; - char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - char *month[] = {"Jan","Feb","Mar","Apr","May","Jun", + const char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; + const char *month[] = {"Jan","Feb","Mar","Apr","May","Jun", "Jul","Aug","Sep","Oct","Nov","Dec"}; - char *tz; + const char *tz; long offset; lt = localtime(&when); diff --git a/usr.sbin/snmpd/usm.c b/usr.sbin/snmpd/usm.c index 1ced2fdb4..a3df1ac0f 100644 --- a/usr.sbin/snmpd/usm.c +++ b/usr.sbin/snmpd/usm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usm.c,v 1.25 2022/12/20 20:01:25 martijn Exp $ */ +/* $OpenBSD: usm.c,v 1.26 2023/05/08 12:25:23 gerhard Exp $ */ /* * Copyright (c) 2012 GeNUA mbH @@ -629,8 +629,10 @@ usm_decrypt(struct snmp_message *msg, struct ber_element *encr) return NULL; scoped_pdu_len = usm_crypt(msg, privstr, (int)privlen, buf, 0); - if (scoped_pdu_len < 0) + if (scoped_pdu_len < 0) { + free(buf); return NULL; + } bzero(&ber, sizeof(ber)); ober_set_application(&ber, smi_application); diff --git a/usr.sbin/vmd/vm.conf.5 b/usr.sbin/vmd/vm.conf.5 index c99c26092..ed6cd41df 100644 --- a/usr.sbin/vmd/vm.conf.5 +++ b/usr.sbin/vmd/vm.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: vm.conf.5,v 1.62 2023/02/19 17:10:38 deraadt Exp $ +.\" $OpenBSD: vm.conf.5,v 1.63 2023/05/12 00:06:53 kn Exp $ .\" .\" Copyright (c) 2015 Mike Larkin .\" Copyright (c) 2015 Reyk Floeter @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: February 19 2023 $ +.Dd $Mdocdate: May 12 2023 $ .Dt VM.CONF 5 .Os .Sh NAME @@ -143,7 +143,7 @@ instances in parallel every seconds. Defaults to .Ar parallelism -equal to number of CPUs and a +equal to number of online CPUs and a .Ar delay of 30 seconds. .El diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c index c06fe9748..b8cc0a09f 100644 --- a/usr.sbin/vmd/vmd.c +++ b/usr.sbin/vmd/vmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmd.c,v 1.146 2023/04/28 19:46:42 dv Exp $ */ +/* $OpenBSD: vmd.c,v 1.148 2023/05/12 16:18:17 dv Exp $ */ /* * Copyright (c) 2015 Reyk Floeter @@ -113,25 +113,39 @@ vmd_dispatch_control(int fd, struct privsep_proc *p, struct imsg *imsg) memcpy(&vmc, imsg->data, sizeof(vmc)); vmc.vmc_kernel = imsg->fd; - ret = vm_register(ps, &vmc, &vm, 0, vmc.vmc_owner.uid); - if (vmc.vmc_flags == 0 || vmc.vmc_flags == VMOP_CREATE_KERNEL) { - /* start an existing VM with pre-configured options */ - if (!(ret == -1 && errno == EALREADY && - !(vm->vm_state & VM_STATE_RUNNING))) { - res = errno; - cmd = IMSG_VMDOP_START_VM_RESPONSE; - } - } else if (ret != 0) { + /* Try registering our VM in our list of known VMs. */ + if (vm_register(ps, &vmc, &vm, 0, vmc.vmc_owner.uid)) { res = errno; - cmd = IMSG_VMDOP_START_VM_RESPONSE; + + /* Did we have a failure during lookup of a parent? */ + if (vm == NULL) { + cmd = IMSG_VMDOP_START_VM_RESPONSE; + break; + } + + /* Does the VM already exist? */ + if (res == EALREADY) { + /* Is it already running? */ + if (vm->vm_state & VM_STATE_RUNNING) { + cmd = IMSG_VMDOP_START_VM_RESPONSE; + break; + } + + /* If not running, are our flags ok? */ + if (vmc.vmc_flags && + vmc.vmc_flags != VMOP_CREATE_KERNEL) { + cmd = IMSG_VMDOP_START_VM_RESPONSE; + break; + } + } + res = 0; } - if (res == 0) { - res = config_setvm(ps, vm, imsg->hdr.peerid, - vm->vm_params.vmc_owner.uid); - if (res) - cmd = IMSG_VMDOP_START_VM_RESPONSE; - } + /* Try to start the launch of the VM. */ + res = config_setvm(ps, vm, imsg->hdr.peerid, + vm->vm_params.vmc_owner.uid); + if (res) + cmd = IMSG_VMDOP_START_VM_RESPONSE; break; case IMSG_VMDOP_WAIT_VM_REQUEST: case IMSG_VMDOP_TERMINATE_VM_REQUEST: @@ -1488,7 +1502,6 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, struct vm_create_params *vcp = &vmc->vmc_params; struct vmop_create_params *vmcp; struct vm_create_params *vcpp; - struct vmd_vm *vm = NULL; unsigned int i, j; /* return without error if the parent is NULL (nothing to inherit) */ @@ -1512,8 +1525,8 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, name = vcp->vcp_name; - if ((vm = vm_getbyname(vcp->vcp_name)) != NULL || - (vm = vm_getbyvmid(vcp->vcp_id)) != NULL) { + if (vm_getbyname(vcp->vcp_name) != NULL || + vm_getbyvmid(vcp->vcp_id) != NULL) { return (EPROCLIM); } @@ -1602,8 +1615,8 @@ vm_instance(struct privsep *ps, struct vmd_vm **vm_parent, } /* kernel */ - if (vmc->vmc_kernel > -1 || (vm->vm_kernel_path != NULL && - strnlen(vm->vm_kernel_path, PATH_MAX) < PATH_MAX)) { + if (vmc->vmc_kernel > -1 || ((*vm_parent)->vm_kernel_path != NULL && + strnlen((*vm_parent)->vm_kernel_path, PATH_MAX) < PATH_MAX)) { if (vm_checkinsflag(vmcp, VMOP_CREATE_KERNEL, uid) != 0) { log_warnx("vm \"%s\" no permission to set boot image", name);