From nobody Sun Sep 17 01:54:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rp9vY1T2Wz4sgRf; Sun, 17 Sep 2023 01:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rp9vY119Mz4H4h; Sun, 17 Sep 2023 01:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694915641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5j/8StAPyLvqsRlXggE/8KMVOTH7wrLhWJ/3NlGIkU=; b=mwOT1TUcNJVXSLGg3Vv8DfZNqYxwloaZjC3/yb2DI5UzxfViZrpQ2JlqJdpUtTXmV/J9RN 5698KLX8Mt7o5DlsBtQA2Fasd+kLBnw17KwAPHjD5sBWA9BuKpT1aOFrx6ZxYsm1QHBJ7B RxO7mjYIxbtbMTf65GGXtIqTTCJXwJPCgnystDo1fCIlSUxwqi9vBg3HKh2J4JNszCcQTF l0ta4uT3O1p3b4ZEP/6IyqWoUY2Jxdh6a8TfPi4xpxqfCR4yfvQ/rol2A5Tigp8NpZS6tv WRehHvagh1bOAJ6lIEogXZm6vsCU3S0EySe1zel8G5bK53HgvS5CzBA/afaQ5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694915641; a=rsa-sha256; cv=none; b=dPwq44XNZjfuLfgt8ZUuMCCkX5ZFBkUwqT4Q0HtClowSDEeg0Rzuq51io5H253EDUFBVDX D8r3Tbi2WT1BkX9q+eKczr4bpc1kfXpd40t5Ehbe37TbJ0YkBm3I86Dyxg4gHqyX33rwkd CtCiMgcxMrpF0k5z4GDFIZqTmT/MhyeKQ2aF/f8QJaUjClJEBRHs5SAIIODNHqeoUFdMqe VA2bP2PN1LRP9cPMZSHE/N3lAyDTc6k16bm2Ng5bi7XfewS5lryHRRL55gnVfOSMB6vuiG UBcBFp37zY0Z764U3leNjkxf3lfOdirrTvs1mae8uh/fEx9iV+dxUKZId0iTNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694915641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5j/8StAPyLvqsRlXggE/8KMVOTH7wrLhWJ/3NlGIkU=; b=P3o0GcOqvwsxA2M6AMeS83wfzxUYpQKab2GhFCC9BfNbEVugENa7MukVFNKM6LyLcDU5vn 1nuB2i+zDa4eh+p39K1Kjp8hycn+Z4gM/3L2wDWI4GMT77q5Tpcw2jF/bjonU9Xa166UE0 gavIw7RpvQ/Dny4S6E2LVAzuotapfLoM5bLiWS0LQ8SBehA40sli6+l1H/+VD7qYyp9w+S CouvoX9VEfJowrzVwEHThDz4u9IcjalKsWA6O/SSim2zDUNL+u/SbH8iv9gq/wJcDB4mAk niZUQXwsLK0PtTTj/tY2sFOtyZMD7p9ZswHNqfL2BBYL3uLEz6HMrDtbNbH6cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rp9vX6tTFzVd9; Sun, 17 Sep 2023 01:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38H1s0NH059595; Sun, 17 Sep 2023 01:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38H1s0cO059592; Sun, 17 Sep 2023 01:54:00 GMT (envelope-from git) Date: Sun, 17 Sep 2023 01:54:00 GMT Message-Id: <202309170154.38H1s0cO059592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 601fd768cfd5 - main - lib/libc/tests/string/strcspn_test.c: extend tests to catch previous bug List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 601fd768cfd599518f7f9d30592763d1279d336d Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=601fd768cfd599518f7f9d30592763d1279d336d commit 601fd768cfd599518f7f9d30592763d1279d336d Author: Robert Clausecker AuthorDate: 2023-09-12 02:48:58 +0000 Commit: Robert Clausecker CommitDate: 2023-09-17 00:40:13 +0000 lib/libc/tests/string/strcspn_test.c: extend tests to catch previous bug This extends the strcspn() unit tests to catch mistakes in the implementation that only appear when a mismatch occurs in a certain position of the string against a certain position of the set. See also: 52d4a4d4e0dedc72bc33082a3f84c2d0fd6f2cbb Sponsored by: The FreeBSD Foundation Approved by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41821 --- lib/libc/tests/string/strcspn_test.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c index abacdcbbf18a..722d20025535 100644 --- a/lib/libc/tests/string/strcspn_test.c +++ b/lib/libc/tests/string/strcspn_test.c @@ -148,10 +148,74 @@ ATF_TC_BODY(set_alignments, tc) test_set_alignments(buf, 30, NOMATCH); } +#ifndef STRSPN +/* test all positions in which set could match buf */ +static void +test_match_positions(char *buf, char *set, size_t buflen, size_t setlen) +{ + size_t i, j, outcome; + + memset(buf, '-', buflen); + + for (i = 0; i < setlen; i++) + set[i] = 'A' + i; + + buf[buflen] = '\0'; + set[setlen] = '\0'; + + /* + * Check for (mis)match at buffer position i + * against set position j. + */ + for (i = 0; i < buflen; i++) { + for (j = 0; j < setlen; j++) { + buf[i] = set[j]; + + outcome = strcspn(buf, set); + ATF_CHECK_EQ_MSG(i, outcome, + "strcspn(\"%s\", \"%s\") = %zu != %zu", + buf, set, outcome, i); + } + + buf[i] = '-'; + } +} + +ATF_TC_WITHOUT_HEAD(match_positions); +ATF_TC_BODY(match_positions, tc) +{ + char buf[129], set[65]; + + test_match_positions(buf, set, 128, 64); + test_match_positions(buf, set, 64, 64); + test_match_positions(buf, set, 32, 64); + test_match_positions(buf, set, 16, 64); + test_match_positions(buf, set, 8, 64); + test_match_positions(buf, set, 128, 32); + test_match_positions(buf, set, 64, 32); + test_match_positions(buf, set, 32, 32); + test_match_positions(buf, set, 16, 32); + test_match_positions(buf, set, 8, 32); + test_match_positions(buf, set, 128, 16); + test_match_positions(buf, set, 64, 16); + test_match_positions(buf, set, 32, 16); + test_match_positions(buf, set, 16, 16); + test_match_positions(buf, set, 8, 16); + test_match_positions(buf, set, 128, 8); + test_match_positions(buf, set, 64, 8); + test_match_positions(buf, set, 32, 8); + test_match_positions(buf, set, 16, 8); + test_match_positions(buf, set, 8, 8); +} +#endif /* !defined(STRSPN) */ + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, buf_alignments); ATF_TP_ADD_TC(tp, set_alignments); +#ifndef STRSPN + ATF_TP_ADD_TC(tp, match_positions); +#endif return (atf_no_error()); } From nobody Sun Sep 17 10:37:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpPWS04bFz4tTg5; Sun, 17 Sep 2023 10:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpPWR6Rfqz4VXL; Sun, 17 Sep 2023 10:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bcCiv4Mu7Ndy66JqrSkws4KuNyAhGcCQ7BebdkjT4MQ=; b=xjz+S5Ga8IDMl4811l650lsMxnqV6uuzkYIfsBZ75tSGd/1jZpFs4X9H3jWgRkFSa47EFy r6S0Vl0H/dF1aobaWbsN/bGTb4/NXat+wvDPnTihyLhd7w0h2J0MIfsL0FCTuKP+Eeizvo KjKpoN76BZuaSmv680cnF1HhpIedGi16W9jqjXT3ILtdaeKur+PoyqaxFQMyWwniL5hvtf iWMd1JXwsh75WGGG7PDj12afLm+7X3py/Jree6oqQA5WASH5SXehjYymiV2np+eT1ez938 RFo/g02izAhVQm9rQyDSobWVL9K+tyfgSGmBApcyR8tFT4eSPa9o4jCs0Ccrkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694947043; a=rsa-sha256; cv=none; b=YVbD5YFzzIEFT2DcWtriTtP0NyYT8pO6MxXfgd2JHwQXPQFkTsINOoDSGiaXXgBIKG2I1c A7RoAmheG1DCM8S6lVL9fRGKG+Z0KEhdRu7HwYMGOuL7ySMwj7BRBtXgXFFK2fMy7uGWN0 5r7UTXZ0Aacfzk5CrgCyRzAJGhEYlRaziG5406vVTTep5yM/D/yX7DITX4n0uzQkxvedSh M2/K9be06qW0HWFEJaJzjQS9ma7XymkOV/u8P2NgxMU5I4xCHXzOD+3Ozgzr8tKGMpPg3g cTg1VjbXo/cl1eJwTjrFDqzCYbQa7iPpIVSjd0t2JBDApiCR/DJQescRmt+4Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bcCiv4Mu7Ndy66JqrSkws4KuNyAhGcCQ7BebdkjT4MQ=; b=TBpc5TncewNFS3iqQOcnXfogTgJJUjs3bgmdZKa6DDGE5zgdcIJCT6q/Q4VPLN0dP6gurX rMf4vgEp7pYvzwBjB552xGNXjSYvnazP7h8zy87ki2G4t6oYEe9/M0vltVm9QFi+RE3ieY QRtCLilDbZeA7PXsyLNxFEdr12lL9C2y3hbm2JrDA1bKvgHBggt6i2iuKPyIXQXjbMt11/ ki902hvhV/iB/wG9qGaXAKe01t+woT6eu522GUnNIpB/MsMQISBa+Jm1Z3lLlT37n9Ke+1 N2OVN0iB4YnZXRLTDROzLJi0NlSHcjjkuhQy2WEYL/YaPzAXj65NR55LmEM4PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpPWR5RMNzln6; Sun, 17 Sep 2023 10:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HAbNtR023786; Sun, 17 Sep 2023 10:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HAbNtH023783; Sun, 17 Sep 2023 10:37:23 GMT (envelope-from git) Date: Sun, 17 Sep 2023 10:37:23 GMT Message-Id: <202309171037.38HAbNtH023783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: aa3bcaad5107 - main - amd64: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa3bcaad51076ceb346fa0c64ab69a35e5241b20 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aa3bcaad51076ceb346fa0c64ab69a35e5241b20 commit aa3bcaad51076ceb346fa0c64ab69a35e5241b20 Author: Bojan Novković AuthorDate: 2023-09-15 10:41:10 +0000 Commit: Mark Johnston CommitDate: 2023-09-17 10:27:22 +0000 amd64: Add a leaf PTP when pmap_enter(psind=1) creates a wired mapping This patch reverts the changes made in D19670 and fixes the original issue by allocating and prepopulating a leaf page table page for wired userspace 2M pages. The original issue is an edge case that creates an unmapped, wired region in userspace. Subsequent faults on this region can trigger wired superpage creation, which leads to a panic in pmap_demote_pde_locked() as the pmap does not create a leaf page table page for the wired superpage. D19670 fixed this by disallowing preemptive creation of wired superpage mappings, but that fix is currently interfering with an ongoing effort of speeding up vm_map_wire for large, contiguous entries (e.g. bhyve wiring guest memory). Reviewed by: alc, markj Sponsored by: Google, Inc. (GSoC 2023) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41132 --- sys/amd64/amd64/pmap.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index b10997fd657b..ff83d8749313 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -7493,9 +7493,8 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, pd_entry_t oldpde, *pde; pt_entry_t PG_G, PG_RW, PG_V; vm_page_t mt, pdpg; + vm_page_t uwptpg; - KASSERT(pmap == kernel_pmap || (newpde & PG_W) == 0, - ("pmap_enter_pde: cannot create wired user mapping")); PG_G = pmap_global_bit(pmap); PG_RW = pmap_rw_bit(pmap); KASSERT((newpde & (pmap_modified_bit(pmap) | PG_RW)) != PG_RW, @@ -7592,6 +7591,22 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, } } + /* + * Allocate leaf ptpage for wired userspace pages. + */ + uwptpg = NULL; + if ((newpde & PG_W) != 0 && pmap != kernel_pmap) { + uwptpg = pmap_alloc_pt_page(pmap, pmap_pde_pindex(va), + VM_ALLOC_WIRED); + if (uwptpg == NULL) + return (KERN_RESOURCE_SHORTAGE); + if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { + pmap_free_pt_page(pmap, uwptpg, false); + return (KERN_RESOURCE_SHORTAGE); + } + + uwptpg->ref_count = NPTEPG; + } if ((newpde & PG_MANAGED) != 0) { /* * Abort this mapping if its PV entry could not be created. @@ -7599,6 +7614,14 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, if (!pmap_pv_insert_pde(pmap, va, newpde, flags, lockp)) { if (pdpg != NULL) pmap_abort_ptp(pmap, va, pdpg); + if (uwptpg != NULL) { + mt = pmap_remove_pt_page(pmap, va); + KASSERT(mt == uwptpg, + ("removed pt page %p, expected %p", mt, + uwptpg)); + uwptpg->ref_count = 1; + pmap_free_pt_page(pmap, uwptpg, false); + } CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx" " in pmap %p", va, pmap); return (KERN_RESOURCE_SHORTAGE); From nobody Sun Sep 17 10:37:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpPWT0tY2z4tTsw; Sun, 17 Sep 2023 10:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpPWS75fnz4W2p; Sun, 17 Sep 2023 10:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QcqmqT9krmAWYfP8Ta+QrD2nk9nB3FrAoi1N7KUluis=; b=BuqRiub8gbjI5BB0Y2vlcFkUetbcSL8+HZ3JY6HcwNIDoi+usntp4CQwqoP2mtBES+pBKr 6BROHDLDgEWPqOD0LYyRBEc0NG98fO/Bg3syDEwG1elWI1PW6Jg1TTUX1jsTYY/nu9Vr0+ VW4JbHXtojw3zd34D2Jry+oxrl0Pk0VdszaPIW4Rtr7oPX90zoO8KVPDDbRv2HfsOqOTpB HqXrm75N1zqaOuoV/a/iBU2vPdr8QONYJKNYkmVn3sB2MU5jUU0rpd0woAXAT5miaxLdnt R4kEqUAwl7UXWSA27fR7qfPxonc+zYIwHmuKjp4hvSYl8Et+k5anzpQHJlTOJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694947045; a=rsa-sha256; cv=none; b=b+Bqxi3WMjv45Wrl0ZyS6soYdhhdCqNAavvsC5q1el233dLlWKuhfNhaxsAzBpG6WxQ5vi VS33rjv/MRdzfMpyIXZF5bb7IKlUU76WIfKmX6x6mJ8hkvzxbLz9+ZQQf5a628Aqp2Nyrm uc6kckKsXIwdACKFo3LRmcJKDRXFiwy1Hbi33wJx/ojMAD7Z99SStpQUK0VAiOkLIPJxp6 IYrsz3Gycpj1qhqPALvwNHlJRabGHqv43rT14svWzJUeeag3YoJrrb/VXVRAj4t/iSaMfz LX5evwAmlfNUtCZ6taOg+T1XcZQQHhPB7FKCZk5fYyUst3jPoI3XNZdBZWpDuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QcqmqT9krmAWYfP8Ta+QrD2nk9nB3FrAoi1N7KUluis=; b=JbhItoV6RIuq4Gm1GOZZRzh1uDGRXi7MTUtWlNnJ5PTEBD5pgmK2BNvQevhXX3tAL6QjRT A2/EkxGfXl4h6ro9T0ua+zWTXWFnjWORe7jPlPenet0YZR7hYLQVUyCgBSFSIBfGYVzTER FYRBEbMbqNoD3ExVOFii3e9cL7QxS67FC2/WWiUfZjNT3xolOmXnnpbXQXFsea+oP/J3sB adihLtej4As5hSsNdd4T8CyhcN/VpraJLNTjnFV5YFsKWlLNisjhneSbHeA34hDbsEzMsl Kt5PPCpOtbuVOva55iRPiTfBojijtZNNI9qrji/E31tjFjtJ9FNdlYclG79utw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpPWS67QMzln7; Sun, 17 Sep 2023 10:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HAbOAq023831; Sun, 17 Sep 2023 10:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HAbOcA023828; Sun, 17 Sep 2023 10:37:24 GMT (envelope-from git) Date: Sun, 17 Sep 2023 10:37:24 GMT Message-Id: <202309171037.38HAbOcA023828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8f26ed01bd74 - main - mlock tests: Add a regression test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f26ed01bd74aab21309ac04ae1d1368a6346c90 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8f26ed01bd74aab21309ac04ae1d1368a6346c90 commit 8f26ed01bd74aab21309ac04ae1d1368a6346c90 Author: Mark Johnston AuthorDate: 2023-09-15 16:28:42 +0000 Commit: Mark Johnston CommitDate: 2023-09-17 10:27:31 +0000 mlock tests: Add a regression test The test tries to trigger creation of a superpage mapping in an mlock()ed region. MFC after: 2 weeks --- tests/sys/vm/mlock_test.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/tests/sys/vm/mlock_test.c b/tests/sys/vm/mlock_test.c index f0c76fe86b56..8c8ce4a2e8de 100644 --- a/tests/sys/vm/mlock_test.c +++ b/tests/sys/vm/mlock_test.c @@ -28,11 +28,15 @@ #include #include #include +#include #include #include +#include #include +#include #include +#include #include #include @@ -161,12 +165,122 @@ ATF_TC_BODY(mlock__truncate_and_unlock, tc) ATF_REQUIRE(munlock(addr, len) == 0); } +/* + * Exercise a corner case involving an interaction between mlock() and superpage + * creation: a truncation of the object backing a mapping results in the + * truncated region being unmapped by the pmap, but does not affect the logical + * mapping. In particular, the truncated region remains mlock()ed. If the + * mapping is later extended, a page fault in the formerly truncated region can + * result in superpage creation via a call to pmap_enter(psind = 1). + */ +ATF_TC(mlock__superpage_fault); +ATF_TC_HEAD(mlock__superpage_fault, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(mlock__superpage_fault, tc) +{ + struct rlimit rlim; + void *addr1, *addr2; + size_t len, pagesizes[MAXPAGESIZES]; + int count, error, shmfd; + char vec; + + count = getpagesizes(pagesizes, MAXPAGESIZES); + ATF_REQUIRE_MSG(count >= 1, + "failed to get page sizes: %s", strerror(errno)); + if (count == 1) + atf_tc_skip("system does not support multiple page sizes"); + len = pagesizes[1]; + + error = getrlimit(RLIMIT_MEMLOCK, &rlim); + ATF_REQUIRE_MSG(error == 0, "getrlimit: %s", strerror(errno)); + rlim.rlim_cur += len; + rlim.rlim_max += len; + error = setrlimit(RLIMIT_MEMLOCK, &rlim); + ATF_REQUIRE_MSG(error == 0, "setrlimit: %s", strerror(errno)); + + shmfd = shm_open(SHM_ANON, O_RDWR | O_CREAT, 0600); + ATF_REQUIRE_MSG(shmfd >= 0, "shm_open: %s", strerror(errno)); + error = ftruncate(shmfd, len); + ATF_REQUIRE_MSG(error == 0, "ftruncate: %s", strerror(errno)); + + addr1 = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ALIGNED_SUPER, shmfd, 0); + ATF_REQUIRE_MSG(addr1 != MAP_FAILED, "mmap: %s", strerror(errno)); + ATF_REQUIRE_MSG(((uintptr_t)addr1 & (len - 1)) == 0, + "addr %p is misaligned", addr1); + addr2 = mmap(NULL, len, PROT_READ, + MAP_SHARED | MAP_ALIGNED_SUPER, shmfd, 0); + ATF_REQUIRE_MSG(addr2 != MAP_FAILED, "mmap: %s", strerror(errno)); + ATF_REQUIRE_MSG(((uintptr_t)addr2 & (len - 1)) == 0, + "addr %p is misaligned", addr2); + + memset(addr1, 0x42, len); + error = mincore(addr1, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + if ((vec & MINCORE_SUPER) == 0) + atf_tc_skip("initial superpage promotion failed"); + + error = mlock(addr2, len); + ATF_REQUIRE_MSG(error == 0, "mlock: %s", strerror(errno)); + error = mincore(addr2, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + ATF_REQUIRE((vec & MINCORE_SUPER) != 0); + + /* + * Free a page back to the superpage reservation, demoting both + * mappings. + */ + error = ftruncate(shmfd, len - pagesizes[0]); + ATF_REQUIRE_MSG(error == 0, "ftruncate: %s", strerror(errno)); + + /* + * Extend the mapping back to its original size. + */ + error = ftruncate(shmfd, len); + ATF_REQUIRE_MSG(error == 0, "ftruncate: %s", strerror(errno)); + + /* + * Trigger re-promotion. + */ + error = mincore(addr1, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + ATF_REQUIRE((vec & MINCORE_SUPER) == 0); + memset((char *)addr1 + len - pagesizes[0], 0x43, pagesizes[0]); + error = mincore(addr1, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + ATF_REQUIRE((vec & MINCORE_SUPER) != 0); + + /* + * Trigger a read fault, which should install a superpage mapping + * without promotion. + */ + error = mincore(addr2, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + ATF_REQUIRE((vec & MINCORE_SUPER) == 0); + (void)atomic_load( + (_Atomic int *)(void *)((char *)addr2 + len - pagesizes[0])); + error = mincore(addr2, pagesizes[0], &vec); + ATF_REQUIRE_MSG(error == 0, "mincore: %s", strerror(errno)); + ATF_REQUIRE((vec & MINCORE_SUPER) != 0); + + /* + * Trigger demotion of the wired mapping. + */ + error = munlock(addr2, pagesizes[0]); + ATF_REQUIRE_MSG(error == 0, "munlock: %s", strerror(errno)); + + ATF_REQUIRE(close(shmfd) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, mlock__copy_on_write_anon); ATF_TP_ADD_TC(tp, mlock__copy_on_write_vnode); ATF_TP_ADD_TC(tp, mlock__truncate_and_resize); ATF_TP_ADD_TC(tp, mlock__truncate_and_unlock); + ATF_TP_ADD_TC(tp, mlock__superpage_fault); return (atf_no_error()); } From nobody Sun Sep 17 10:37:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpPWV1d4Cz4tTsx; Sun, 17 Sep 2023 10:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpPWV11RKz4W1D; Sun, 17 Sep 2023 10:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vU1t+Ck88ByxiF8BrtJmBSy4bkmUe2i5ZtGZ0ll6TPw=; b=PeKZHMETDKw8Nn/xmePZwVUUmaQWfe0wH2ma5QoR1Koxeg8+qGpV/lrGIbW0QZh5aAaawG N5Az+/N9+lFd6HhXo/zn8dyFi1IuLOAQzV41Ng3mbAJgjtQYrFBwK3WrmtyJUwIZyL9MV7 kMmfRvQuq8BQpwVHpbtdXeHkSNGdALU32aTj1P42P7DM2XatR5sku+gvs/49iP+szO/rwL wZcK82p4McaERunGYzZZDnvcl0V0fbFFgpaqPrDoxcZ+bZE/4ZDaHsFmX5mkL/zEGff2VS oc2ThYFwk2tnVj4oFRAxMOAQOWrW3z/VjRfE0bh92z6QIc/Fq9cjAeCx8Mce8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694947046; a=rsa-sha256; cv=none; b=RGmytZXMkfXesEtCjJgmP5g07aSkdYvN01yWzThtvMqJxu81TeH7mS0h00QfEnewlrvqH+ pyUg7JLK6r/V/FwlmpqU1HeI56QRKqJddaN40a/F9VUVfnCZptPhWg0iLOizsNScGeUNCH j2/6RoVFsxurpJwfBasv0S0dP3OQ47hUoxS4VsnGPFyEm1lLjaiYVmnE0Wt6TlgmCgWPSf dVA4B0PJmNFsKp09+HFRquSr62bhdAZmTHTlKsHTjWRZ5JQJimaoVfKVxhyIE6vvwaZ3TT ff2HGqLD2MRM8iF7r7/LQCvZqfQMHmXUmNMN+FgqZ3weBJOkhBl7CIWb2SFjMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694947046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vU1t+Ck88ByxiF8BrtJmBSy4bkmUe2i5ZtGZ0ll6TPw=; b=yK8OnzzxYGEjdnKs/iRlUSSmgMbzVK2B4eH0uOgoKOkbw4Dva0lCbg8nUSi9lAXTwJy+Yr L7Owiot5y0EddT+ZOwKl9YniJNVCzYKy0QhfqfYrT1TMuNgfm1+bAJYUMa3zDX37E8IUkZ Ij6zR1Oi80HIwOu3qmZqHSzkeh7eFMzfF7DtKmK4vk57/jtSebkMsp8jiuKzNb2ad9Ijub MEA6OtQZCAHMNmGc7YPTou0A+sS7g+7TzGTC7h8rnLbe6bsM/IQabG7W8j3SJDvpZAjZZj 3ZjxWSm7d1ahAX8xX4PZrfO6QgO5JC2KplSZ3ZMLgRyjKCZoVAze0Fbsufe9Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpPWV03R5zlwy; Sun, 17 Sep 2023 10:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HAbPgq023885; Sun, 17 Sep 2023 10:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HAbPJG023882; Sun, 17 Sep 2023 10:37:25 GMT (envelope-from git) Date: Sun, 17 Sep 2023 10:37:25 GMT Message-Id: <202309171037.38HAbPJG023882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f7c733e4fe5d - main - amd64: Convert a cheap DIAGNOSTIC check to a KASSERT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 commit f7c733e4fe5d55fd78cd2b0c27483eeaff3f79a3 Author: Mark Johnston AuthorDate: 2023-08-11 15:54:34 +0000 Commit: Mark Johnston CommitDate: 2023-09-17 10:27:31 +0000 amd64: Convert a cheap DIAGNOSTIC check to a KASSERT MFC after: 1 week --- sys/amd64/amd64/trap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 0d9a660abdb8..4d5887369207 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1188,12 +1188,9 @@ amd64_syscall(struct thread *td, int traced) kmsan_mark(td->td_frame, sizeof(*td->td_frame), KMSAN_STATE_INITED); -#ifdef DIAGNOSTIC - if (!TRAPF_USERMODE(td->td_frame)) { - panic("syscall"); - /* NOT REACHED */ - } -#endif + KASSERT(TRAPF_USERMODE(td->td_frame), + ("%s: not from user mode", __func__)); + syscallenter(td); /* From nobody Sun Sep 17 12:14:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpRgy4frbz4sWKc; Sun, 17 Sep 2023 12:14:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpRgy4DYHz3Ffq; Sun, 17 Sep 2023 12:14:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694952894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzysnTHW6+QCDDArxX7317w6shMEUh3WD8dx+bHZGEU=; b=O0+HB7URtXbsIe6bR9L5DvZqvzLHZHl7Jx/HjSHiZjZUHJsX5b9RUm9KUcl+4HEpP+Njdm f+e9A8iIRxGiPwBaAnQR6lkkContQpHRqbYneznN2GBPgOeY2N7pGqyMbHY30s9eNup40h qWS5wMD/OkHoCsmOJViC3ZmStHSxx8WeJqKrJOxz2E8oqSKa8S4e6CK3BniqHtoZm7V+LQ 5l6Mq4J8pKof/2zu6gzQjEwACDPfiP3BxsVnBOLInrBAb2lXVvN2ocrBEz1hIeFsNKquqi tGRKC/3XFw0VbNgjU4jqsTKWCv4nArLVwEL33ONXaEzwsCf07s7P3FCMx1WnBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694952894; a=rsa-sha256; cv=none; b=EXvufjR4NTc0qEEuszzL6HOZT8WR/APLqq2lmhVLfSN7N/MtG7GCHx+PHcBNn2W56fdiLr OcfxjQAYvd33P9FSAgi8x7w1fD+fN5bbiv65OFlIo09S188TmxuszSOUI/+A3LQDLVMwjJ ZFswO1S72piUdGF4sC3PYhnYapfpgg8PyUOZ56OL5nBm5Yk0mOmC0FE6vgIO9h4K3flLZG UVgZM9GAAvVORyJJMv8PzBsi9cPWsxa+Yeq+pnwivQsXQw+HkdcF16FSp5gIBMSDmbwF/D uAwLfA3OJjql5YODltA98i4Yr3gaOPLIFJ9bw6fPK6hX1RCBVLgT3VbQ+/lJZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694952894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzysnTHW6+QCDDArxX7317w6shMEUh3WD8dx+bHZGEU=; b=nKLXDh7+eEEdooC1qSuU5rjLzJhgs9pH5M9N0tbCvg7s7HlVUW2avNX1dgfsd1r74mnV4e XgsJxmmrnAWIiTwhZq74QiOmhdWleptWKygZQ2bkgO4a5DTRuaGuAlaXTGd80pxc5KjXNz sv6j7t39wBjnzaWXrzE+bN5i8nwUW6uw40dXKb3R+Gzt/0Az87np574M0R706+Je4U5CyI gjifLa8FDQT8Dk2y4PjAagddUIKmtea2xSJlvOkZt3CWJ70zzWJ3YRzTK9gwVNcI76OF8N 5rySuJisMUgd0uXHPEU4bfPTTBIfGdN4W46ejMmWgFXjepGGEJmBO0c9t5/ibg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpRgy304XznxP; Sun, 17 Sep 2023 12:14:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HCEspP090304; Sun, 17 Sep 2023 12:14:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HCEsxD090301; Sun, 17 Sep 2023 12:14:54 GMT (envelope-from git) Date: Sun, 17 Sep 2023 12:14:54 GMT Message-Id: <202309171214.38HCEsxD090301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 479d224efcbf - main - Fix geom build with clang 17 and KTR enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 479d224efcbf0115f8cd84314fcc46cbac146a1d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=479d224efcbf0115f8cd84314fcc46cbac146a1d commit 479d224efcbf0115f8cd84314fcc46cbac146a1d Author: Dimitry Andric AuthorDate: 2023-09-12 06:52:31 +0000 Commit: Dimitry Andric CommitDate: 2023-09-17 12:13:09 +0000 Fix geom build with clang 17 and KTR enabled When building a kernel with clang 17 and KTR enabled, such as with the LINT configurations, a -Werror warning is emitted: sys/geom/geom_io.c:145:31: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand] 145 | if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { | ~~~~~~~~~~~~~~~~~~~~~~~~ ^ sys/geom/geom_io.c:145:31: note: use '&' for a bitwise operation 145 | if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { | ^~ | & sys/geom/geom_io.c:145:31: note: remove constant to silence this warning Replace the multiple uses of the expression with one macro, and in this macro use "!= 0" to get a logical operand instead of a bitwise one. Reviewed by: jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41823 --- sys/geom/geom_io.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 2acf08517222..da8f917686ff 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -68,6 +68,9 @@ #include #include +#define KTR_GEOM_ENABLED \ + ((KTR_COMPILE & KTR_GEOM) != 0 && (ktr_mask & KTR_GEOM) != 0) + static int g_io_transient_map_bio(struct bio *bp); static struct g_bioq g_bio_run_down; @@ -142,7 +145,7 @@ g_new_bio(void) bp = uma_zalloc(biozone, M_NOWAIT | M_ZERO); #ifdef KTR - if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { + if (KTR_GEOM_ENABLED) { struct stack st; CTR1(KTR_GEOM, "g_new_bio(): %p", bp); @@ -160,7 +163,7 @@ g_alloc_bio(void) bp = uma_zalloc(biozone, M_WAITOK | M_ZERO); #ifdef KTR - if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { + if (KTR_GEOM_ENABLED) { struct stack st; CTR1(KTR_GEOM, "g_alloc_bio(): %p", bp); @@ -175,7 +178,7 @@ void g_destroy_bio(struct bio *bp) { #ifdef KTR - if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { + if (KTR_GEOM_ENABLED) { struct stack st; CTR1(KTR_GEOM, "g_destroy_bio(): %p", bp); @@ -220,7 +223,7 @@ g_clone_bio(struct bio *bp) bp->bio_children++; } #ifdef KTR - if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { + if (KTR_GEOM_ENABLED) { struct stack st; CTR2(KTR_GEOM, "g_clone_bio(%p): %p", bp, bp2); @@ -249,7 +252,7 @@ g_duplicate_bio(struct bio *bp) bp2->bio_attribute = bp->bio_attribute; bp->bio_children++; #ifdef KTR - if ((KTR_COMPILE & KTR_GEOM) && (ktr_mask & KTR_GEOM)) { + if (KTR_GEOM_ENABLED) { struct stack st; CTR2(KTR_GEOM, "g_duplicate_bio(%p): %p", bp, bp2); From nobody Sun Sep 17 12:21:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpRqd4lb3z4sXCV; Sun, 17 Sep 2023 12:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpRqd4Jd6z3GH4; Sun, 17 Sep 2023 12:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694953293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgCWI65pQB+6jjEYLNC/mUYzcD1WGjonAcnNyf98QrA=; b=JrM6qJWvajhs04FpVWipHNb9PFwfF+zm9fUJ7XQ+wZi+oQMmvASUxlg49LWkKsbSIvXcKb tke+mbdoRLwPHNqzR0SUmR0ZHghYtsR92CoWHjHqELR7z7w4XOWKlhkaCysAoSjpQHrD5T 4sfk83yv5y0tudREEJ+oH7SyKuzUljweDLFmFuEk/+UOJu/b39N1yMOHR2e+1OrSPUfGM9 68dl0YzjTPJifrH8avzpYW3KWE/qRKk9Ov/CkpICb2qnovwqh4q/3lQqWmXiRxUyC65Zxx FJXapdxjvjA0HEWm29jMHLkDY5h9bztbvAAi0jvR/rFkpX45kqnLl20CMmmnEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694953293; a=rsa-sha256; cv=none; b=P2p1wQ9vPkxC2vHCWGyvUnH+GyoM95HphEcCcrOyijf/1/jysfaZO6pZw/g0IKj4kPzfPa YnlNOcpE8gJ3uEjqTwWFJiLA8n6EITzCx1C3V3ygLlWze8giZMbLmLwClHwDjn4oMDLlXm u+9ZQWVRnT274GIBgthYDpVQCxXlFJmnL3nYIDYhLAb8n20nEPbkLBRCN+M657Z5Tw9z64 eB9jkDDnmyhAOa82FxZHT3FgPvG00L2m/Qn74EfF8clPt1g0JMLhGPgZjWbJEXmhzLtFml Ay1U6WWbGecVKM4IlDGA+y02EBaMn4u7lh4+2fMhWrvEEUYH9TMRqV5lkky+Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694953293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgCWI65pQB+6jjEYLNC/mUYzcD1WGjonAcnNyf98QrA=; b=QKTe42dljEHMUDCwgFpei/k5G58e+QqOBSkjlcaLWicYkYv8RzmHiBbniuAs6NcEgpEDPf 46aY10cJOWrr4OsVicI2NRlyfPwZa/jvCAvpzpcCnIH50mdgjO8A+fMpqQ2z9opjl5w/3T kqtCd/ZYepUe0CzuAqBVFIHfXnb6ZY+zBfpN+FL0rwIBoYHtZSO1yGhrnOrA3J+EidF5jO 4pfxUjWnhHPGIyIKkCIN4w43dahQV+S2sRL4ZaNMgl1JGqhfqcZUt4E5INg5ItVECN/G7/ taIiXUTp/e5QfAZ6jFsQ2Jookhe9FaX53GG9gaPiTy/NlWeVFy5Hv8BtCTF34w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpRqd3N47zpZ4; Sun, 17 Sep 2023 12:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HCLXGr003632; Sun, 17 Sep 2023 12:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HCLXDj003620; Sun, 17 Sep 2023 12:21:33 GMT (envelope-from git) Date: Sun, 17 Sep 2023 12:21:33 GMT Message-Id: <202309171221.38HCLXDj003620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 4ff9d270893a - main - pkgbase: Add instructions for upgrading past 78847e1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ff9d270893af757b4348398c887e630d71edf6e Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=4ff9d270893af757b4348398c887e630d71edf6e commit 4ff9d270893af757b4348398c887e630d71edf6e Author: Doug Rabson AuthorDate: 2023-09-17 10:06:01 +0000 Commit: Doug Rabson CommitDate: 2023-09-17 12:21:06 +0000 pkgbase: Add instructions for upgrading past 78847e1 The pkg solver gets confused by the file moves and refuses to upgrade without manually upgrading FreeBSD-utilities and FreeBSD-utilities-dev first. PR: 254173, 273859 MFC after: 1 week Reviewed by: Mina Galić Differential Revision: https://reviews.freebsd.org/D41892 --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index b1276bfe83f6..e2f50b13b154 100644 --- a/UPDATING +++ b/UPDATING @@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: Enable splitting out pkgbase manpages into separate packages by default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf. +20230911: + Move standard include files to the clibs-dev package and move clang + internal libraries and headers to clang and clang-dev. Upgrading systems + installed using pkgbase past this change involves extra steps to allow + for these file moves: + + pkg upgrade -y FreeBSD-utilities + pkg upgrade -y FreeBSD-utilities-dev + pkg upgrade -y + 20230909: Enable vnet sysctl variables to be loader tunable. SYSCTLs which belongs to VNETs can be initialized during early boot or module From nobody Sun Sep 17 15:16:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWjT5JnJz4t3Tg; Sun, 17 Sep 2023 15:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWjT4sP1z4LbT; Sun, 17 Sep 2023 15:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOs0fFWe4mRV7uMEdIVqgn4f5s9+jx99nTsKOkt2+R0=; b=mwNn+887EBlN3jvMCVeaa5bcBIyccmSOEqUBuyjWKUDbkp17MrpPNDxxIPqv03mUrqbTSP KWvWV+jE6Qf8hmi8AXFPAlLRs5APmvGoD63RXfpz/YhpFYQliai7twz4PXl/yHViKkX0Zy M+j+ah6J7ys2Qw6S1Kqkc4NcyOP7soYk1MKvlgs10VxYtojl0Bniw8jA+ni1y7sEypjKyZ H5ICqJlREDtPTtaGvm2CVfj+QP3LX0oh2U6Y7bcdCxkoEbPtzTxyaVXk/9DFatwUxXIX9S hUtqrbhviZ8Kxc/IbNyXr1lk1BcD+0Rwz2clyxk6y79IeSTA72J660iGR4KMpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963789; a=rsa-sha256; cv=none; b=QqG1/NTuqgxZvdc9i5ZN/+5/rMq3uUhGkfe9kT3rtbK+SImlyko7ySauE5DRBVDzrsXbPg Drsd7pVuEUh9GYPcgy9Ic3g0le6M3R47xKO9L0Q/eUOJKLPLWUZmDekOOZmnRaz1UaePJr SMpMwOH4RH6qJugCj/CF8Fgtx67X4sBO95hwYMY2D8zshIkuHJ5jA01H2Yzw6BSmqIYVnZ h0VexnC3p2dfRmJHE/JRdUflMIuxjcv71VeeWqVc6/rasFOvqmqrf2A/irhqTG2wY7Jdw6 ibFcw5/rTo/BcdUK7rC02jTwxUIhnKHGvMDVrkG38sRkBmVYVjdO9poHPLLA8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOs0fFWe4mRV7uMEdIVqgn4f5s9+jx99nTsKOkt2+R0=; b=ZBgBAVDh9pn7sJNUU42djmOtx0SPmqOaqzx67KZ1CeZMJoD69R2+M4+opo5uxMbACADoVP BG9UShJEHLdMEET+j8h+/P5Y8qiFb3sHdtfDUoHicwyEFZiBNZtF1CXNKrjhWkgPs6bw7a PPEqRTNHkU9cABc5NXqUduciTtQ1tULGMkL1zmCYm1PZ4i11oko959PeTbwW+sikS8zICA gHo1NnF1eu2oS5JN23wrVCxz0xWtqplSYvvJ0FD7XahOC2KyCUuPQWPNA6U4hS7A42u9cn bZz5EwRFxNrKTfiIaxaDi3lHqodP6W0s19Z8AI5/RqGTSmZYJ7K+YvOl0eH/dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWjT3wqMztST; Sun, 17 Sep 2023 15:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFGTPW089936; Sun, 17 Sep 2023 15:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFGT2g089933; Sun, 17 Sep 2023 15:16:29 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:16:29 GMT Message-Id: <202309171516.38HFGT2g089933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d95431624f93 - main - nvme: Give up when we've failed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d95431624f934fe4740211738fc787808005b14e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d95431624f934fe4740211738fc787808005b14e commit d95431624f934fe4740211738fc787808005b14e Author: Warner Losh AuthorDate: 2023-09-15 16:02:32 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:11:56 +0000 nvme: Give up when we've failed Normally, we poll the device every so often to see if commands have timed out. However, we'll go into the recovery state as part of failing the drive. To account for all possibilties, if we're failed when we get into the polling function, just stop polling: Party is over. Sponsored by: Netflix --- sys/dev/nvme/nvme_qpair.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index b256c4713c8d..4e37aa0e1020 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1011,6 +1011,17 @@ nvme_qpair_timeout(void *arg) mtx_assert(&qpair->recovery, MA_OWNED); + /* + * If the controller has failed, give up. We're never going to change + * state from a failed controller: no further transactions are possible. + * We go ahead and let the timeout expire in many cases for simplicity. + */ + if (qpair->ctrlr->is_failed) { + nvme_printf(ctrlr, "Controller failed, giving up\n"); + qpair->timer_armed = false; + return; + } + switch (qpair->recovery_state) { case RECOVERY_NONE: /* @@ -1094,8 +1105,8 @@ nvme_qpair_timeout(void *arg) idle = false; /* We want to keep polling */ break; case RECOVERY_WAITING: - nvme_printf(ctrlr, "waiting for reset to complete\n"); - idle = false; /* We want to keep polling */ + nvme_printf(ctrlr, "Waiting for reset to complete\n"); + idle = false; /* We want to keep polling */ break; } From nobody Sun Sep 17 15:16:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWjW1hHHz4t3Tm; Sun, 17 Sep 2023 15:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWjV5pcwz4Ln2; Sun, 17 Sep 2023 15:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFG+rAQWUsgp/SpcW3rLO2iyxOjRU971SbhHjDDxgww=; b=upz4W1c/D+DQzzs7z9JOLas1eA2rebUUfg+IJ+4A2sAnmwwR1Y5QhdhoykTbdAFa+lSZva b7TkK5icsrYEPn2qzJ2aoq+L3liOl7Sav5EdB46p1kVxSXWwC6faW8C8fbDRRn+cvvfrCN Se0VGGRwFYXe3aLu5x4Xuie/5zh7nTKBAQ1zQ9tZwEc2Awh+YVn2tek12oQTKs9T0K7mMB xMBmBJ0IeQMTQKSl4rjPQEfvyEHJyRr0e8NMYi8vifvjQwSNAIb4huov3Om1o3KR3begiR kSzdf8VBLZtnDX+pFkQzamhesd7XnT0fFAqfgpE9q1deOiPbshIWqyGG+32a8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963790; a=rsa-sha256; cv=none; b=hXYsjuYp0NzEA4qjzab2ylQSlCwUIfizlsFrCDYZjf+K25h7b7F47Vl7OPsff75MpHGtkI AvIo6nhsPpAOwI9ocLFoR8V2ty7+zNWfmqEQ9boES1Yu7MRdJRUUZEowQ6FbKZm8tWobEL 9HTl1BPaIyuY2UlvA7qPnwFRmQ0KVqWebyQT0ut4ypWSajzrkYfdsHKmxAvHfp68MtXZiF +jaOEzY59Or2yiWfvUPq+So6v+D1TSiVit1GNU0Z3qLNev0xLMatmi3HHldvo01Otwg/wA uNUh6lufm16vZSIL0Ecr4H1vr2FOSwpS5NoCxYHqhIUksso2ESyOMelzqZ+lXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFG+rAQWUsgp/SpcW3rLO2iyxOjRU971SbhHjDDxgww=; b=rQFB75zmnBVQQnNV7klVSBC2qPUXd3oDWw6E8E6nEdaWOV+rlikQlYvQEwRRfbbTpgQh+5 cqkfDPNh+OnOA41BSUmmJdEsLFQhOAsP21SJI/L9HjVl6vGYO/tSV6SFcH+mnsU0/wtSq+ jdc8y9AWi8flxq4ZS6scgK1jzgatK2CAe4AyoFVfsdyV+Niue8GPliCea1lBWCxrJ5Kog9 h338afA0xDPardFRFBsyYSutmqLWzrouPQV/r86IgEFt6BVJlw6Gd0wwxmx/fPqWfgU9e1 3cB3Npu1kKnRnoe6LZ0/vc2p0hiT5mDoA2uMQDXWoSPHd7qlOMhA7CWdHE40Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWjV4wkVztKm; Sun, 17 Sep 2023 15:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFGUR4089990; Sun, 17 Sep 2023 15:16:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFGUnx089987; Sun, 17 Sep 2023 15:16:30 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:16:30 GMT Message-Id: <202309171516.38HFGUnx089987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5d51862412a8 - main - Restrict the glibc compat cookie open functions to __BSD_VISIBLE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d51862412a8ad246f414c7071999b6815080884 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5d51862412a8ad246f414c7071999b6815080884 commit 5d51862412a8ad246f414c7071999b6815080884 Author: Warner Losh AuthorDate: 2023-09-15 16:13:11 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:11:57 +0000 Restrict the glibc compat cookie open functions to __BSD_VISIBLE Sponsored by: Netflix --- include/stdio.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/stdio.h b/include/stdio.h index b7c412c81da7..9881b3f07329 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -415,6 +415,7 @@ FILE *funopen(const void *, #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0) #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) +#if __BSD_VISIBLE typedef __ssize_t cookie_read_function_t(void *, char *, size_t); typedef __ssize_t cookie_write_function_t(void *, const char *, size_t); typedef int cookie_seek_function_t(void *, off64_t *, int); @@ -426,6 +427,7 @@ typedef struct { cookie_close_function_t *close; } cookie_io_functions_t; FILE *fopencookie(void *, const char *, cookie_io_functions_t); +#endif /* * Portability hacks. See . From nobody Sun Sep 17 15:16:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWjX07Jbz4t3GV; Sun, 17 Sep 2023 15:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWjW6YjYz4Lpx; Sun, 17 Sep 2023 15:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lj9CHdEpXZXJYAGi2K3YWTW4Dt1GiMmS3VddTIiUysQ=; b=P56nqo64AUX6O562mHQor4JKojsZibq2XTIzlHt8ZAz3Lq4a5o4sx+JjcOV/AmHFFuFC06 h7y8s/2sVgQj50UwMAkIVreCmbJC+n5jiMqx2mKl6YJ25fh+HsP5c4e2zAXkUuwFT8L6XG OZt44kCr8pqSdOSC36JBYlZDCtqWUiuQSExOyOXO7MhxtKOPvIy4TEBiE5sS4jS/0ZxYRr uxBb5c7t4mv0VMMpkSw2AULermEIJq70yF+2PPODFu7AvXxjqXqZBJypgeN7a2VIf8w8WZ Yo/5JKoMW5Eo3hwit+IU6iF56FyhbKsl2Yjd3zi77M4SPM1I8t8P9vFm9EKkPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963791; a=rsa-sha256; cv=none; b=DFCi1fAned4ngipgX3ULVCbgw475m/jKapO+JfjA4QP7QJboFHhwKXkiozaL7AlW2yMMr8 6XsXzzE3Cpudy3MlRdQJoMuvWVVk4TEYZuxmXEgeviBuiV51iFm+x37BCe+QQxKkC36tpt MhsB3acvjS1xfZt7dDdqejZJhnK1spKGV02x8ybomoPBuZuQyyu4V+VjY4B6oYV54leIjR ILWeNPbHAzmdsjLLjF1ORDt3wlyFkfD9xrWMKFI7KsC9qanw5Xzeu4uXO2AyDCPvGdW/vT 6vZ0hVeqamdVYeMHIvDBgTJ1HxH4C2oO36DXcL42yGscSSyqr7Kfj9BN2bIixg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lj9CHdEpXZXJYAGi2K3YWTW4Dt1GiMmS3VddTIiUysQ=; b=hLgPXE81JBuN/m/JkibMWOKLxcEbF4mUrekf6ZKtvwm8GjpyNo+GVrQ3ZBRCNsIXPCGLPU pEaCpPZG24VxYEm7L7h9GZckmBQ2m6URdYuOvb3ocOc+NwjiB/5eQBqO9ZnATpKysL62Ab 2WUHxVr4ZakyB/AWKh71YTDnC76ATw6Un1omrnpHYlRvzr+s6Cf9Y4DIz6nkx5hYICvFC+ /JUEesqNmVeCssbszO1K/qJB0QJN9tDHCSe9nTZRvZDKBBT3il3MPP7BkmzirHr8pbijYf oO4pdM1bvCzOTy7T+CuBskOlFjn9ZdxtqSvcXG4mYf2VrGHeDaPQXKcXycjTQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWjW5gLXztcD; Sun, 17 Sep 2023 15:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFGV7E090033; Sun, 17 Sep 2023 15:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFGVsA090030; Sun, 17 Sep 2023 15:16:31 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:16:31 GMT Message-Id: <202309171516.38HFGVsA090030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c2909b0c9a29 - main - cam(4): Fix device hints documentation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2909b0c9a29cd6fa0019ed9998dde9e054bdad2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2909b0c9a29cd6fa0019ed9998dde9e054bdad2 commit c2909b0c9a29cd6fa0019ed9998dde9e054bdad2 Author: Tom Hukins AuthorDate: 2023-09-17 15:12:22 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:13:49 +0000 cam(4): Fix device hints documentation The code in sys/cam/cam_periph.c that calls resource_int_value(9) looks for "lun" not "unit". PR: 212155 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/843 --- share/man/man4/scsi.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index 3ea4b333543e..38bc5e14a031 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -22,7 +22,7 @@ .\" 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. -.Dd November 3, 2021 +.Dd September 15, 2023 .Dt CAM 4 .Os .Sh NAME @@ -213,7 +213,7 @@ Peripheral drivers can be wired to a specific bus, target, and lun as so: .Bd -literal -offset indent hint.da.0.at="scbus0" hint.da.0.target="0" -hint.da.0.unit="0" +hint.da.0.lun="0" .Ed .Pp This assigns @@ -234,10 +234,10 @@ hint.nvme.4.at="pci7:0:0" hint.scbus.10.at="nvme4" hint.nda.10.at="scbus10" hint.nda.10.target="1" -hint.nda.10.unit="12" +hint.nda.10.lun="12" hint.nda.11.at="scbus10" hint.nda.11.target="1" -hint.nda.11.unit="2" +hint.nda.11.lun="2" .Ed .Pp This assigns the NVMe card living at PCI bus 7 slot 0 function 1 to scbus 10. From nobody Sun Sep 17 15:16:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWjY19Nvz4t3Tv; Sun, 17 Sep 2023 15:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWjY0ch7z4Lnx; Sun, 17 Sep 2023 15:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MKiiye0JmK3h7rjlxC6pE3v32SOutmYF0wk04T2TLTM=; b=k0RYXXvdvbSnUKoLAoILWfcUouz7A19W6Cu+vKFhz4pn7T9DDWoW3tkCam01+cAGr8cODR uwp32ecadVBAVhixgmitdwYW5hTvGKfyK4Yp2cXIbsyJYJHDQWLoOauNb00NoGnIGV6EFI rvHHdFDWnImnx9VzPIN5jpq2OQ41oAqJfOrXw3aQrLW8X2Dz7Ba867Ni1JquCeVcVtGSWp H0I1wO/Z+h7ovEpcbWs8sOJu1rp7KctNe/Nr4BD0nLF2wtuWZkanepKst9B7teqqhJNf3p ZIAYgM5UzVziegeVSYy6ILJ12MoFDjoGVyJ+hUHcGxBOt419mdOkp9dN60E+Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963793; a=rsa-sha256; cv=none; b=M3Kp49GRUhQxo5V0O5Psmdjy1UZXPjK3cgHhzl2SMmo+MrQJ6uIIf2633ueWEn+mrzrBzo 9YlFxspvNiKThuWms9/tQOAyS/a5FuPzkqvCKqPohHVXvcNfU4lnlMyYvVOejeO7TP5s7o Lq/rOy4EgY3hIMXImbESaGwmzEF29thnPigz4sQbx8Ha8XfjSW4rCLaesIcImY3FO4M474 3EseNaSGkPA2zzeQBg3TxbE6qJCX+FOrWeEzrsQ6yWJu9QLSxDw7V3etHO142aba9PuTQA OCgZoVysaXdvq3UYytYRMIVOwWidCAxVaGTH9w0D660EG9By6SIT7pkGPkPMMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MKiiye0JmK3h7rjlxC6pE3v32SOutmYF0wk04T2TLTM=; b=v0yGLD4UVXxY+yJtVUfUnkyKdHwHRVL9MUQ4Tar+/iVvanMXxDC697B1vbyr9jW/hFf3Po JHdnNxxrgkrjYNSuv2pMoz+CIrmERuy4+roJlFNPqM+bfhYVu7yh4kzyMe6ZMpjfqVEA+S nBy5jnOVVrsAgQAwW2jnrgcHcEsfhBcrjWJZLF52OsiOH70/h2x0Hvo8043jdugviWE+Yu nKUpFPI/gdjzBr9MiHMMrvtxUcZp7EY4r99R90DppQNjdmR3jWEupySyjAHQe7CQ18DShB r5qozma1Fa1knxv+SRG9LbQWwCcfEExKnoknjH1ic8skWX9dHFZVeHAVPAiYAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWjX6q1pztZJ; Sun, 17 Sep 2023 15:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFGW0M090072; Sun, 17 Sep 2023 15:16:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFGWM0090069; Sun, 17 Sep 2023 15:16:32 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:16:32 GMT Message-Id: <202309171516.38HFGWM0090069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 576b06d7ad3d - main - cam(4): Remove redundant words List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 576b06d7ad3d8cb1e853c39865993d4ef37a2a4e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=576b06d7ad3d8cb1e853c39865993d4ef37a2a4e commit 576b06d7ad3d8cb1e853c39865993d4ef37a2a4e Author: Tom Hukins AuthorDate: 2023-09-17 15:12:22 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:14:06 +0000 cam(4): Remove redundant words Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/843 --- share/man/man4/scsi.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index 38bc5e14a031..7cf6dc00cf58 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -228,7 +228,7 @@ wired to any particular controller, bus, target, and/or unit instance. .Pp This also works with .Xr nvme 4 -drives as well. +drives. .Bd -literal -offset indent hint.nvme.4.at="pci7:0:0" hint.scbus.10.at="nvme4" @@ -240,7 +240,7 @@ hint.nda.11.target="1" hint.nda.11.lun="2" .Ed .Pp -This assigns the NVMe card living at PCI bus 7 slot 0 function 1 to scbus 10. +This assigns the NVMe card at PCI bus 7 slot 0 function 1 to scbus 10. The target for .Xr nda 4 devices is always 1. From nobody Sun Sep 17 15:18:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWlk00fGz4t3YK for ; Sun, 17 Sep 2023 15:18:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWlj1yYnz4NHB for ; Sun, 17 Sep 2023 15:18:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-52f33659d09so4470840a12.1 for ; Sun, 17 Sep 2023 08:18:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1694963901; x=1695568701; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=SZrc39FcjD/HuyS/C00p5qVPUiZZv3DnQrPHuZQT114=; b=Vo08GC8PcETTVuHnLOn1OlajPHlebZnLaIhLo8c21ceU9rTEjBvjepvkTpraxQXCYw be1fSFAvTLWlRYzrmw57YVxLUesW6kBq/qxNNdFvUmd6t8dVWMOmZXRKMuf+i0P4COdm DFZ6v+p/Y59rk57A1NQ6eSAS0Av3IMUtqZudV8+w7bHC1FJrTgKdtEEihl860BTXlm6b QOIgqTxVaYjHarmbHaS+LTKDmQTaBb2qy1/jwAdTlCegvXsXS9e8p703jd8JML1dWgWC tlCGBYbGVw0jMK7BiYmudQjVh6GbYrF3TjnhtuYJv5/qywQv1ncP5p3PgoYV6np84zna 9hWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694963901; x=1695568701; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SZrc39FcjD/HuyS/C00p5qVPUiZZv3DnQrPHuZQT114=; b=fmpwie2ADi5OFzPOg1U4BadgxvyENulH3sgo5wFoZrtGRSISECVpc7ZEHQW32yuTa5 gr6bdh8E00me/ALokDf3cCqY2f6uEm9fz1eAd8MVUokFL3u87DXR9m3tuZabJfUmBLZ4 bENuRQtI+JJs9fk14CABqk51mRDTGMfHyOzFdE0WH50wyZ7uqc1Io1DugKrZr6k2+5EY J9xscwMf5ipUtRLHZVEpGazuC4cvFu8FE1Nd4RKxhNnj9aLee+05j6kJ0HZXx82cYK4U zdqSbJpAcQ1pu6SxRNWuXXkjFSg6xcKKbRQpMpzWJedfqklVgBqTf9I8lMgDEbCmyKfR FFNA== X-Gm-Message-State: AOJu0YxsUZFxsjoeuShE9crxuz/xPtNMUaiXYR5GMGWwRZNmEjrUkR32 WyGFuF+CgVvtymkyEtx8g6zHX6rqQxgYg1tJJd3Sl644/PDgYJCjJ+K5Tw== X-Google-Smtp-Source: AGHT+IGZ2ysVogMPxYJtd8ly+0xLSSt5mz1kHacOn6kt8WkNN0n1pQQeBn2Vak7fBNwdDQqL54SMEmoPpc7mv//fw7U= X-Received: by 2002:a05:6402:b32:b0:52f:2bd3:6f4d with SMTP id bo18-20020a0564020b3200b0052f2bd36f4dmr5302901edb.0.1694963901223; Sun, 17 Sep 2023 08:18:21 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202309171516.38HFGUnx089987@gitrepo.freebsd.org> In-Reply-To: <202309171516.38HFGUnx089987@gitrepo.freebsd.org> From: Warner Losh Date: Sun, 17 Sep 2023 16:18:10 +0100 Message-ID: Subject: Re: git: 5d51862412a8 - main - Restrict the glibc compat cookie open functions to __BSD_VISIBLE To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003d6fa906058f8971" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4RpWlj1yYnz4NHB --0000000000003d6fa906058f8971 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Sep 17, 2023 at 4:16=E2=80=AFPM Warner Losh wrote= : > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D5d51862412a8ad246f414c7071999b6= 815080884 > > commit 5d51862412a8ad246f414c7071999b6815080884 > Author: Warner Losh > AuthorDate: 2023-09-15 16:13:11 +0000 > Commit: Warner Losh > CommitDate: 2023-09-17 15:11:57 +0000 > > Restrict the glibc compat cookie open functions to __BSD_VISIBLE > > Sponsored by: Netflix > Reviewed by: kib@ Differential Revision: https://reviews.freebsd.org/D41878 > --- > include/stdio.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/stdio.h b/include/stdio.h > index b7c412c81da7..9881b3f07329 100644 > --- a/include/stdio.h > +++ b/include/stdio.h > @@ -415,6 +415,7 @@ FILE *funopen(const void *, > #define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0) > #define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0) > > +#if __BSD_VISIBLE > typedef __ssize_t cookie_read_function_t(void *, char *, size_t); > typedef __ssize_t cookie_write_function_t(void *, const char *, size_t); > typedef int cookie_seek_function_t(void *, off64_t *, int); > @@ -426,6 +427,7 @@ typedef struct { > cookie_close_function_t *close; > } cookie_io_functions_t; > FILE *fopencookie(void *, const char *, cookie_io_functions_t); > +#endif > > /* > * Portability hacks. See . > --0000000000003d6fa906058f8971 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Sep 17, 2023 at 4:16=E2=80=AF= PM Warner Losh <imp@freebsd.org&g= t; wrote:
The br= anch main has been updated by imp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D5d51862412a8ad246f414c7071999b6815080884
commit 5d51862412a8ad246f414c7071999b6815080884
Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-09-15 16:13:11 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-09-17 15:11:57 +0000

=C2=A0 =C2=A0 Restrict the glibc compat cookie open functions to __BSD_VISI= BLE

=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Netflix=

Reviewed by: kib@
Differenti= al Revision:=C2=A0https://re= views.freebsd.org/D41878
=C2=A0
---
=C2=A0include/stdio.h | 2 ++
=C2=A01 file changed, 2 insertions(+)

diff --git a/include/stdio.h b/include/stdio.h
index b7c412c81da7..9881b3f07329 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -415,6 +415,7 @@ FILE=C2=A0 =C2=A0 =C2=A0 =C2=A0 *funopen(const void *,<= br> =C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 fropen(cookie, fn) funopen(cookie,= fn, 0, 0, 0)
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 fwopen(cookie, fn) funopen(cookie,= 0, fn, 0, 0)

+#if __BSD_VISIBLE
=C2=A0typedef __ssize_t cookie_read_function_t(void *, char *, size_t);
=C2=A0typedef __ssize_t cookie_write_function_t(void *, const char *, size_= t);
=C2=A0typedef int cookie_seek_function_t(void *, off64_t *, int);
@@ -426,6 +427,7 @@ typedef struct {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cookie_close_function_t *close;
=C2=A0} cookie_io_functions_t;
=C2=A0FILE=C2=A0 =C2=A0*fopencookie(void *, const char *, cookie_io_functio= ns_t);
+#endif

=C2=A0/*
=C2=A0 * Portability hacks.=C2=A0 See <sys/types.h>.
--0000000000003d6fa906058f8971-- From nobody Sun Sep 17 15:21:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpWqT3gYPz4t44t for ; Sun, 17 Sep 2023 15:21:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWqT24dvz4Nq4 for ; Sun, 17 Sep 2023 15:21:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9aa0495f9cfso1043424366b.1 for ; Sun, 17 Sep 2023 08:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1694964100; x=1695568900; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=b0qnDlGaCKjud7ojWbQI0q5nseDEZY29BGmYG5+BfU0=; b=2L2QYC2T6Ns1K2JeWm4WOpUDF+3N/KepZlHLgLTtk4lyJBcAmOTU0IGnQ/v+bTjvpd n7qEvqaPvpyuet7J1zGP1soJhi85LnRk+a/i0WZu+7tU0GcDCFnuxnD23sDwmeYVBseF g2mAQB29vu4g5jB/VWQcA2YVEojaSHLO6CdzNePeZJkRedUs96YV4Smcq3wsRURkvbjU 5SoejWn6z/uvmtFXdsm+4z8kUM6VChYoos+tsWi7m/qKIZcRQQthQXNFmz1uWM955apk 8uxR+DM7U7DjjFdEJSM1vy32LBi232jCjque7XI+3RHtQy9gbCCK6cniYoaM1c/OR2j0 7Q5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694964100; x=1695568900; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=b0qnDlGaCKjud7ojWbQI0q5nseDEZY29BGmYG5+BfU0=; b=Ys1O/4Y6dSyPyeK4v6Nmvi7gdd0Pygq+ew7BW8myG7HhBW7V73hrd1mkHiXsRAnIVK 35EvFefv/x21zHS1kLkn48DDnmir+7hUzgu/2FSVG39jaVP2j6CAwvNtHM0W4oxCaToi HJxqwgTBSpj15WR2bWekSc1gSkAuecqEIVKWTlOGpvgwl/RBOCkU2QqmK5673pVJO4SM 5sGulzBlFOQesH2MQPtAmH5vwkbw4AxGN028Tb+7OatxSQ7lbPp5NNUA/jrQpMw2Zxxi yU6nk0pyuNv1XhhCKTk0aIz8n61ikAPZoZTAmSfxSe0jR7A+RfKKk6kpX/UOC0mZeRvV g5tg== X-Gm-Message-State: AOJu0Yzqm3mpkwIenvsry6lG1mo+7oWOLNPxnOcid0ejIqsEG2JgfL8Z uenJ3NwGR3Z1ivzgDVCRUWMT0OK/XmX14WMOUeSe0w== X-Google-Smtp-Source: AGHT+IHsr0egGU/Zp7gwu+3U+9GD5/4HnCk2ETS1UTsKEdhjOJ7FswfbK53lbQxiHuE2rYwiHHslQ3PVegYzMUYMACU= X-Received: by 2002:a17:907:3e91:b0:9aa:206d:b052 with SMTP id hs17-20020a1709073e9100b009aa206db052mr14057731ejc.27.1694964099586; Sun, 17 Sep 2023 08:21:39 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202309171516.38HFGT2g089933@gitrepo.freebsd.org> In-Reply-To: <202309171516.38HFGT2g089933@gitrepo.freebsd.org> From: Warner Losh Date: Sun, 17 Sep 2023 16:21:28 +0100 Message-ID: Subject: Re: git: d95431624f93 - main - nvme: Give up when we've failed To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000001030d506058f954c" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4RpWqT24dvz4Nq4 --0000000000001030d506058f954c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Sep 17, 2023 at 4:16=E2=80=AFPM Warner Losh wrote= : > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dd95431624f934fe4740211738fc7878= 08005b14e > > commit d95431624f934fe4740211738fc787808005b14e > Author: Warner Losh > AuthorDate: 2023-09-15 16:02:32 +0000 > Commit: Warner Losh > CommitDate: 2023-09-17 15:11:56 +0000 > > nvme: Give up when we've failed > > Normally, we poll the device every so often to see if commands have > timed out. However, we'll go into the recovery state as part of faili= ng > the drive. To account for all possibilties, if we're failed when we g= et > into the polling function, just stop polling: Party is over. > > Sponsored by: Netflix > Reviewed by: jtl@ Differential Revision: https://reviews.freebsd.org/D41877 > --- > sys/dev/nvme/nvme_qpair.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c > index b256c4713c8d..4e37aa0e1020 100644 > --- a/sys/dev/nvme/nvme_qpair.c > +++ b/sys/dev/nvme/nvme_qpair.c > @@ -1011,6 +1011,17 @@ nvme_qpair_timeout(void *arg) > > mtx_assert(&qpair->recovery, MA_OWNED); > > + /* > + * If the controller has failed, give up. We're never going to > change > + * state from a failed controller: no further transactions are > possible. > + * We go ahead and let the timeout expire in many cases for > simplicity. > + */ > + if (qpair->ctrlr->is_failed) { > + nvme_printf(ctrlr, "Controller failed, giving up\n"); > + qpair->timer_armed =3D false; > + return; > + } > + > switch (qpair->recovery_state) { > case RECOVERY_NONE: > /* > @@ -1094,8 +1105,8 @@ nvme_qpair_timeout(void *arg) > idle =3D false; /* We want to keep poll= ing > */ > break; > case RECOVERY_WAITING: > - nvme_printf(ctrlr, "waiting for reset to complete\n"); > - idle =3D false; /* We want to keep poll= ing > */ > + nvme_printf(ctrlr, "Waiting for reset to complete\n"); > + idle =3D false; /* We want to keep polling */ > break; > } > > --0000000000001030d506058f954c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Sep 17, 2023 at 4:16=E2=80=AF= PM Warner Losh <imp@freebsd.org&g= t; wrote:
The br= anch main has been updated by imp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3Dd95431624f934fe4740211738fc787808005b14e
commit d95431624f934fe4740211738fc787808005b14e
Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-09-15 16:02:32 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-09-17 15:11:56 +0000

=C2=A0 =C2=A0 nvme: Give up when we've failed

=C2=A0 =C2=A0 Normally, we poll the device every so often to see if command= s have
=C2=A0 =C2=A0 timed out. However, we'll go into the recovery state as p= art of failing
=C2=A0 =C2=A0 the drive. To account for all possibilties, if we're fail= ed when we get
=C2=A0 =C2=A0 into the polling function, just stop polling: Party is over.<= br>
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Netflix=

Reviewed by: jtl@
Differenti= al Revision:=C2=A0https://re= views.freebsd.org/D41877
=C2=A0
---
=C2=A0sys/dev/nvme/nvme_qpair.c | 15 +++++++++++++--
=C2=A01 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index b256c4713c8d..4e37aa0e1020 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -1011,6 +1011,17 @@ nvme_qpair_timeout(void *arg)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 mtx_assert(&qpair->recovery, MA_OWNED);<= br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/*
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 * If the controller has failed, give up. We= 9;re never going to change
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 * state from a failed controller: no further t= ransactions are possible.
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 * We go ahead and let the timeout expire in ma= ny cases for simplicity.
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (qpair->ctrlr->is_failed) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nvme_printf(ctrlr, = "Controller failed, giving up\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qpair->timer_arm= ed =3D false;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0}
+
=C2=A0 =C2=A0 =C2=A0 =C2=A0 switch (qpair->recovery_state) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case RECOVERY_NONE:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
@@ -1094,8 +1105,8 @@ nvme_qpair_timeout(void *arg)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 idle =3D false;=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* We wan= t to keep polling */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case RECOVERY_WAITING:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nvme_printf(ctrlr, = "waiting for reset to complete\n");
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0idle =3D false;=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* We wan= t to keep polling */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nvme_printf(ctrlr, = "Waiting for reset to complete\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0idle =3D false;=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* We want to keep polling */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 }

--0000000000001030d506058f954c-- From nobody Sun Sep 17 15:44:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpXL64RByz4t6lv; Sun, 17 Sep 2023 15:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpXL63rF8z4SJ3; Sun, 17 Sep 2023 15:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694965486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXESQgw4RGt3zKzli3Zn1KOOprB+yEUqhK1kK4MBQOA=; b=IOeQ2ekdzYDXgrXud2F1lRsSypw/searWD5D+A6v2ImzsBByhHeZigs6jbiLYuHj9uXlwQ jBKH3fqOSpnvXO4277L0woHOsz5iaBilmrliT5ZPTTcsTzgo8Zxd/9yRvlv2v7hz0M33Jc HLZFhKb1f9kwgEgqXgmyM2ZMvuw0amg/Kw733CabnOEnWdvZYsiSeMThbG8LuCe4DMgg4O oGVXN/hpNVQU0FGGkAuJQnW+TYS1UkoThLudSn4FaPLWaMMerYojef1t5ue+R6Ilr24TWA UUJumTWQ4EdCnqa0+q2Wdd/e/6pZ/rg+Xgzzwi7ZqdFnjyFlmaRNtpDg1s62xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694965486; a=rsa-sha256; cv=none; b=FnqDsz5jaWZF1z8kgeerXtNK7CoQbQ9p1WZP2OK1FnrFXAXie3fWUJD+vUxhu60gbumSxE kjy+LyA7FETVXQY0Df+sCqg5G6bqtJjIzfke1zCkCxmYW0MLIh/OjgtzxSTUzPv9gKs3rq ttVFBUHJgLEQ9CUHMGTZCbYAICjRKDRk87fJ+0y1hh3joCJzv7W+75GLOccZouvgRlvbnS OY4UMkeYH7iC2P6xmFN/iRzCbhLGzPZg7GKexDE5ZUnuOaBHIHiVb01d0JF4RueU+l3s/P 9xkPgMJ/74TMJnwWAkpl/MR0ndm4bDB/+NaCGDiJtIkrRbJcHox7ifPPqhlmsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694965486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXESQgw4RGt3zKzli3Zn1KOOprB+yEUqhK1kK4MBQOA=; b=ZqtLIyDvrzh43wqMwDiad5MfKi7Jakm0wlyHy2KHGksCgFVJ4A7QGmhX8g47F5BM3P6tTa EtUpWJ6VfKyTEYnuHrFivqaHjp+ntS+ORaDvSo4zt7Wc6SNFU7uewQBYtjiyhZWW6TQmw6 mAHaJY2QvJatX3B06iLHKmv9Lh6is6VgbanA0YrQ2MWwtbXsQOEoSVPM1T2XXLhFhOEXYG PUd0D5V+ehAZwj4x+tfw3AqUEEEg6GvxqCoxfDqWAYythrFiLrWCjq/cdgJ0a0E8GF3zpa pVzpVem9nObLQeCRu2wZe/SQ9bFahFaPBnPbkRieshhDRdUnWB5UKfLUqvunQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpXL62ncJzvL5; Sun, 17 Sep 2023 15:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HFikNo039968; Sun, 17 Sep 2023 15:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HFiks4039966; Sun, 17 Sep 2023 15:44:46 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:44:46 GMT Message-Id: <202309171544.38HFiks4039966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 6a47fa697ace - main - powerpc: Implement fpu_kern_enter/fpu_kern_leave List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a47fa697ace42851b44498a53446b29b2593316 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=6a47fa697ace42851b44498a53446b29b2593316 commit 6a47fa697ace42851b44498a53446b29b2593316 Author: Justin Hibbits AuthorDate: 2023-09-17 14:40:48 +0000 Commit: Justin Hibbits CommitDate: 2023-09-17 15:45:23 +0000 powerpc: Implement fpu_kern_enter/fpu_kern_leave Summary: Provide an implementation of fpu_kern_enter/fpu_kern_leave for PPC to enable FPU, VSX, and Altivec usage in-kernel. The functions currently only support FPU_KERN_NOCTX, but this is sufficient for ossl(1) and many other users of the API. This patchset has been tested on powerpc64le using a modified version of the in-tree tools/tools/crypto/cryptocheck.c tool to check for FPU/Vec register clobbering along with a follow-up patch to enable ossl(4) on powerpc64*. Reviewed by: jhibbits MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41540 --- share/man/man9/fpu_kern.9 | 5 +- sys/powerpc/include/altivec.h | 2 + sys/powerpc/include/fpu.h | 20 ++++++ sys/powerpc/include/pcb.h | 7 ++- sys/powerpc/powerpc/altivec.c | 34 +++++++++- sys/powerpc/powerpc/exec_machdep.c | 21 +++---- sys/powerpc/powerpc/fpu.c | 125 +++++++++++++++++++++++++++++++++++++ sys/sys/param.h | 2 +- 8 files changed, 199 insertions(+), 17 deletions(-) diff --git a/share/man/man9/fpu_kern.9 b/share/man/man9/fpu_kern.9 index c9dd58e96adf..92dc0eaa7e17 100644 --- a/share/man/man9/fpu_kern.9 +++ b/share/man/man9/fpu_kern.9 @@ -185,7 +185,8 @@ and false otherwise. .Sh NOTES The .Nm -is currently implemented only for the i386, amd64, and arm64 architectures. +is currently implemented only for the i386, amd64, arm64, and powerpc +architectures. .Pp There is no way to handle floating point exceptions raised from kernel mode. @@ -205,6 +206,8 @@ facitily and this manual page were written by .An Konstantin Belousov Aq Mt kib@FreeBSD.org . The arm64 support was added by .An Andrew Turner Aq Mt andrew@FreeBSD.org . +The powerpc support was added by +.An Shawn Anastasio Aq Mt sanastasio@raptorengineering.com . .Sh BUGS .Fn fpu_kern_leave should probably have type diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h index 581a568b7034..e5151529f698 100644 --- a/sys/powerpc/include/altivec.h +++ b/sys/powerpc/include/altivec.h @@ -35,5 +35,7 @@ void enable_vec(struct thread *); void save_vec(struct thread *); void save_vec_nodrop(struct thread *); +void enable_vec_kern(void); +void disable_vec(struct thread *td); #endif /* _MACHINE_ALTIVEC_H_ */ diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h index 30df3a470b09..aa5640ea31fb 100644 --- a/sys/powerpc/include/fpu.h +++ b/sys/powerpc/include/fpu.h @@ -76,6 +76,26 @@ void save_fpu(struct thread *); void save_fpu_nodrop(struct thread *); void cleanup_fpscr(void); u_int get_fpu_exception(struct thread *); +void enable_fpu_kern(void); +void disable_fpu(struct thread *td); + +/* + * Flags for fpu_kern_alloc_ctx(), fpu_kern_enter() and fpu_kern_thread(). + */ +#define FPU_KERN_NORMAL 0x0000 +#define FPU_KERN_NOWAIT 0x0001 +#define FPU_KERN_KTHR 0x0002 +#define FPU_KERN_NOCTX 0x0004 + +struct fpu_kern_ctx; + +struct fpu_kern_ctx *fpu_kern_alloc_ctx(u_int flags); +void fpu_kern_free_ctx(struct fpu_kern_ctx *ctx); +void fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, + u_int flags); +int fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx); +int fpu_kern_thread(u_int flags); +int is_fpu_kern_thread(u_int flags); #endif /* _KERNEL */ diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index e5e6e3223406..050ada6b0f64 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -48,7 +48,7 @@ struct pcb { register_t pcb_toc; /* toc pointer */ register_t pcb_lr; /* link register */ register_t pcb_dscr; /* dscr value */ - register_t pcb_fscr; + register_t pcb_fscr; register_t pcb_tar; struct pmap *pcb_pm; /* pmap of our vmspace */ jmp_buf *pcb_onfault; /* For use during @@ -56,11 +56,14 @@ struct pcb { int pcb_flags; #define PCB_FPU 0x1 /* Process uses FPU */ #define PCB_FPREGS 0x2 /* Process had FPU registers initialized */ -#define PCB_VEC 0x4 /* Process had Altivec initialized */ +#define PCB_VEC 0x4 /* Process uses Altivec */ #define PCB_VSX 0x8 /* Process had VSX initialized */ #define PCB_CDSCR 0x10 /* Process had Custom DSCR initialized */ #define PCB_HTM 0x20 /* Process had HTM initialized */ #define PCB_CFSCR 0x40 /* Process had FSCR updated */ +#define PCB_KERN_FPU 0x80 /* Kernel is using FPU/Vector unit */ +#define PCB_KERN_FPU_NOSAVE 0x100 /* FPU/Vec state not saved for kernel use */ +#define PCB_VECREGS 0x200 /* Process had Altivec registers initialized */ struct fpu { union { #if _BYTE_ORDER == _BIG_ENDIAN diff --git a/sys/powerpc/powerpc/altivec.c b/sys/powerpc/powerpc/altivec.c index 16e4477703d2..5072cf3dc6f6 100644 --- a/sys/powerpc/powerpc/altivec.c +++ b/sys/powerpc/powerpc/altivec.c @@ -105,10 +105,11 @@ enable_vec(struct thread *td) * the thread, initialise the vector registers and VSCR to 0, and * set the flag to indicate that the vector unit is in use. */ + pcb->pcb_flags |= PCB_VEC; tf->srr1 |= PSL_VEC; - if (!(pcb->pcb_flags & PCB_VEC)) { + if (!(pcb->pcb_flags & PCB_VECREGS)) { memset(&pcb->pcb_vec, 0, sizeof pcb->pcb_vec); - pcb->pcb_flags |= PCB_VEC; + pcb->pcb_flags |= PCB_VECREGS; } /* @@ -170,3 +171,32 @@ save_vec_nodrop(struct thread *td) if (td == PCPU_GET(vecthread)) save_vec_int(td); } + +void +enable_vec_kern(void) +{ + mtmsr(mfmsr() | PSL_VEC); +} + +void +disable_vec(struct thread *td) +{ + register_t msr; + struct pcb *pcb; + struct trapframe *tf; + + pcb = td->td_pcb; + tf = trapframe(td); + + /* Disable PSL_VEC in kernel (if enabled) */ + msr = mfmsr() & ~PSL_VEC; + isync(); + mtmsr(msr); + + /* + * Disable PSL_VEC in userspace. It will be re-enabled when + * an Altivec instruction is executed. + */ + tf->srr1 &= ~PSL_VEC; + pcb->pcb_flags &= ~PCB_VEC; +} diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index b42978ff94a8..05d3a3cf79ba 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -441,12 +441,14 @@ grab_mcontext(struct thread *td, mcontext_t *mcp, int flags) * Repeat for Altivec context */ - if (pcb->pcb_flags & PCB_VEC) { - KASSERT(td == curthread, - ("get_mcontext: fp save not curthread")); - critical_enter(); - save_vec(td); - critical_exit(); + if (pcb->pcb_flags & PCB_VECREGS) { + if (pcb->pcb_flags & PCB_VEC) { + KASSERT(td == curthread, + ("get_mcontext: altivec save not curthread")); + critical_enter(); + save_vec(td); + critical_exit(); + } mcp->mc_flags |= _MC_AV_VALID; mcp->mc_vscr = pcb->pcb_vec.vscr; mcp->mc_vrsave = pcb->pcb_vec.vrsave; @@ -543,11 +545,8 @@ set_mcontext(struct thread *td, mcontext_t *mcp) } if (mcp->mc_flags & _MC_AV_VALID) { - if ((pcb->pcb_flags & PCB_VEC) != PCB_VEC) { - critical_enter(); - enable_vec(td); - critical_exit(); - } + /* enable_vec() will happen lazily on a fault */ + pcb->pcb_flags |= PCB_VECREGS; pcb->pcb_vec.vscr = mcp->mc_vscr; pcb->pcb_vec.vrsave = mcp->mc_vrsave; memcpy(pcb->pcb_vec.vr, mcp->mc_avec, sizeof(mcp->mc_avec)); diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c index cc1381046b4b..8f5df2f7d576 100644 --- a/sys/powerpc/powerpc/fpu.c +++ b/sys/powerpc/powerpc/fpu.c @@ -42,6 +42,7 @@ #include #include #include +#include static void save_fpu_int(struct thread *td) @@ -259,3 +260,127 @@ get_fpu_exception(struct thread *td) return ucode; } +void +enable_fpu_kern(void) +{ + register_t msr; + + msr = mfmsr() | PSL_FP; + + if (cpu_features & PPC_FEATURE_HAS_VSX) + msr |= PSL_VSX; + + mtmsr(msr); +} + +void +disable_fpu(struct thread *td) +{ + register_t msr; + struct pcb *pcb; + struct trapframe *tf; + + pcb = td->td_pcb; + tf = trapframe(td); + + /* Disable FPU in kernel (if enabled) */ + msr = mfmsr() & ~(PSL_FP | PSL_VSX); + isync(); + mtmsr(msr); + + /* + * Disable FPU in userspace. It will be re-enabled when + * an FP or VSX instruction is executed. + */ + tf->srr1 &= ~(PSL_FP | PSL_VSX); + pcb->pcb_flags &= ~(PCB_FPU | PCB_VSX); +} + +#ifndef __SPE__ +/* + * XXX: Implement fpu_kern_alloc_ctx/fpu_kern_free_ctx once fpu_kern_enter and + * fpu_kern_leave can handle !FPU_KERN_NOCTX. + */ +struct fpu_kern_ctx { +#define FPU_KERN_CTX_DUMMY 0x01 /* avoided save for the kern thread */ +#define FPU_KERN_CTX_INUSE 0x02 + uint32_t flags; +}; + +void +fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + + KASSERT((flags & FPU_KERN_NOCTX) != 0 || ctx != NULL, + ("ctx is required when !FPU_KERN_NOCTX")); + KASSERT(ctx == NULL || (ctx->flags & FPU_KERN_CTX_INUSE) == 0, + ("using inuse ctx")); + KASSERT((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) == 0, + ("recursive fpu_kern_enter while in PCB_KERN_FPU_NOSAVE state")); + + if ((flags & FPU_KERN_NOCTX) != 0) { + critical_enter(); + + if (pcb->pcb_flags & PCB_FPU) { + save_fpu(td); + pcb->pcb_flags |= PCB_FPREGS; + } + enable_fpu_kern(); + + if (pcb->pcb_flags & PCB_VEC) { + save_vec(td); + pcb->pcb_flags |= PCB_VECREGS; + } + enable_vec_kern(); + + pcb->pcb_flags |= PCB_KERN_FPU | PCB_KERN_FPU_NOSAVE; + return; + } + + KASSERT(0, ("fpu_kern_enter with !FPU_KERN_NOCTX not implemented!")); +} + +int +fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + + if ((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) != 0) { + KASSERT(ctx == NULL, ("non-null ctx after FPU_KERN_NOCTX")); + KASSERT(PCPU_GET(fpcurthread) == NULL, + ("non-NULL fpcurthread for PCB_FP_NOSAVE")); + CRITICAL_ASSERT(td); + + /* Disable FPU, VMX, and VSX */ + disable_fpu(td); + disable_vec(td); + + pcb->pcb_flags &= ~PCB_KERN_FPU_NOSAVE; + + critical_exit(); + } else { + KASSERT(0, ("fpu_kern_leave with !FPU_KERN_NOCTX not implemented!")); + } + + pcb->pcb_flags &= ~PCB_KERN_FPU; + + return 0; +} + +int +is_fpu_kern_thread(u_int flags __unused) +{ + struct pcb *curpcb; + + if ((curthread->td_pflags & TDP_KTHREAD) == 0) + return (0); + curpcb = curthread->td_pcb; + return ((curpcb->pcb_flags & PCB_KERN_FPU) != 0); +} + +#endif /* !__SPE__ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index da88c3e28581..2e4310dac111 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500000 +#define __FreeBSD_version 1500001 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Sep 17 15:53:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpXXX36rVz4t8j7; Sun, 17 Sep 2023 15:53:48 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Received: from mail.gonegalt.net (mail.gonegalt.net [208.167.253.104]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpXXW2BsMz4T84; Sun, 17 Sep 2023 15:53:47 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gonegalt.net header.s=dkim header.b=neSWwa7z; spf=none (mx1.freebsd.org: domain of chmeee@has.gonegalt.net has no SPF policy when checking 208.167.253.104) smtp.mailfrom=chmeee@has.gonegalt.net; dmarc=pass (policy=none) header.from=has.gonegalt.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gonegalt.net; s=dkim; t=1694966017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ALWmniLFCRRlkLxrsDfxUmAIAZaCJpxga6XjLDnYEqQ=; b=neSWwa7zmE5Sha2QVzw7xth0dnSqd0EfW79E/sV9fbv3uLEdiJ7WMe6PdB90j2kj7wHCjA TFrW7pMmS95x2cgrPcg2l3P+ZyJQVpPkkvS1M8Bnq/K9D/Se3yoxbDcmiQP/LEtYMIzQKh z2MKomXNPdzh7/aH3dpAxJqd7kNt040= Received: by localhost (OpenSMTPD) with ESMTP id dbd9a752; Sun, 17 Sep 2023 11:53:37 -0400 (EDT) Received: from ralga.knownspace ([192.168.1.17]) by mail.gonegalt.net with ESMTPSA id hXoSKwEhB2UAzgAA0J78UA (envelope-from ); Sun, 17 Sep 2023 11:53:37 -0400 Date: Sun, 17 Sep 2023 11:53:37 -0400 From: Justin Hibbits To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, Shawn Anastasio Subject: Re: git: 6a47fa697ace - main - powerpc: Implement fpu_kern_enter/fpu_kern_leave Message-ID: <20230917115337.6084d166@ralga.knownspace> In-Reply-To: <202309171544.38HFiks4039966@gitrepo.freebsd.org> References: <202309171544.38HFiks4039966@gitrepo.freebsd.org> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; powerpc64le-unknown-linux-gnu) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.80 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[has.gonegalt.net,none]; R_DKIM_ALLOW(-0.20)[gonegalt.net:s=dkim]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:20473, ipnet:208.167.224.0/19, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[gonegalt.net:+]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4RpXXW2BsMz4T84 On Sun, 17 Sep 2023 15:44:46 GMT Justin Hibbits wrote: > The branch main has been updated by jhibbits: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=6a47fa697ace42851b44498a53446b29b2593316 > > commit 6a47fa697ace42851b44498a53446b29b2593316 > Author: Justin Hibbits > AuthorDate: 2023-09-17 14:40:48 +0000 > Commit: Justin Hibbits > CommitDate: 2023-09-17 15:45:23 +0000 > > powerpc: Implement fpu_kern_enter/fpu_kern_leave > > Summary: > Provide an implementation of fpu_kern_enter/fpu_kern_leave for > PPC to enable FPU, VSX, and Altivec usage in-kernel. The functions > currently only support FPU_KERN_NOCTX, but this is sufficient for > ossl(1) and many other users of the API. > > This patchset has been tested on powerpc64le using a modified > version of the in-tree tools/tools/crypto/cryptocheck.c tool to check > for FPU/Vec register clobbering along with a follow-up patch to > enable ossl(4) on powerpc64*. > > Reviewed by: jhibbits > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D41540 Submitted by: sanastasio_raptorengineering.com I should have checked when I edited the commit message, and fixed it back to the original author. Sorry about that, Shawn. - Justin From nobody Sun Sep 17 16:12:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpXyZ6tvJz4tClq; Sun, 17 Sep 2023 16:12:54 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc2b.google.com (mail-oo1-xc2b.google.com [IPv6:2607:f8b0:4864:20::c2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpXyZ2ZKmz4Wcw; Sun, 17 Sep 2023 16:12:54 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc2b.google.com with SMTP id 006d021491bc7-57129417cecso2027503eaf.1; Sun, 17 Sep 2023 09:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694967173; x=1695571973; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ZvHn2CRlvoE64GGoSLIU1mC53hA+/wsUSsfl83F4hFI=; b=DzFeAgLugrJqnGzypwcFeK/x0OJ6fN2u3/I8srlJ73/LKphNoOfHSgrcUdoBM0GP09 92XUz2sC5hYeBcaiWvhaTwoCsCVtOiBioT47vyHv/NKGw/GC09UI8y2+MZNbQQUUIRUU oXQV8ehqnSuEb1rpYpJXrrF0ysKVPO1tSrl2NBUgMCLYkIUZSffXXPHFDfMv+xqZjSzQ NijTYtEYK2Jbm0c/OWjFhFIA/Il4+7KcYdEUQX/bF1Qjc5saKuWJY6KYG+Ie2SgqQUBA 2zmuw9eZ+KFnkCKf4j8iZZpZgS3llWb4/7VG0aHWjfeWtBTuMgfHTcM1i43UYURQi4gT gQQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694967173; x=1695571973; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZvHn2CRlvoE64GGoSLIU1mC53hA+/wsUSsfl83F4hFI=; b=Jkrilvm8nxoufPVSYbelZRoRWnT5t1s9wmByXR90OhpPkFyiIliBW5jKd/J3ctBvkM 1LPFa2TvTaOiJxgx8a6+FgBvAhvQnPJteI0dAMxfogqLLK84NgIVW1Gp+QDQGnvP9VGR Foh8JgPSTSnYQ/toLLE0KNdOElJydc4cPA2nUlM9cnclVMbzeQ6WVEMS5QZCOkOmgGDZ b/rTJO+Jy4V7vHfU8tvTjSpOTwGpz9sBlCk8uklrU+bHJoZfGUqJJddOGVdeXPJe3Ia3 SkMCXA9sX7o8gmSY97gvi85ZYlYuDEhzveJJiDSAhCqVNicD2yRmjHEokg6mmCXTO13E DM8A== X-Gm-Message-State: AOJu0YzLSijbs8xwyJPbuTQ9Zy2QxnGB3GDurqJd1VZZDQG+mUCFCmLR ps2JOBNoVOdC7hc6KFwojDQ1MNHQBazgPOd77Ijk8O7R X-Google-Smtp-Source: AGHT+IH6n5vtT4kEnPsswBGv1FF2fUbp3MLZOcfLqRLVDdNrMWTQHKx5vcB/ej1TiBFH86b/rhT4Rd1wKd+U6hAzdo4= X-Received: by 2002:a4a:91cf:0:b0:571:aceb:26d3 with SMTP id e15-20020a4a91cf000000b00571aceb26d3mr4379268ooh.4.1694967172776; Sun, 17 Sep 2023 09:12:52 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:5750:0:b0:4f0:1250:dd51 with HTTP; Sun, 17 Sep 2023 09:12:52 -0700 (PDT) In-Reply-To: <20230917115337.6084d166@ralga.knownspace> References: <202309171544.38HFiks4039966@gitrepo.freebsd.org> <20230917115337.6084d166@ralga.knownspace> From: Mateusz Guzik Date: Sun, 17 Sep 2023 18:12:52 +0200 Message-ID: Subject: Re: git: 6a47fa697ace - main - powerpc: Implement fpu_kern_enter/fpu_kern_leave To: Justin Hibbits Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Shawn Anastasio Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4RpXyZ2ZKmz4Wcw given that this is fresh and self-contained you can revert and commit properly On 9/17/23, Justin Hibbits wrote: > On Sun, 17 Sep 2023 15:44:46 GMT > Justin Hibbits wrote: > >> The branch main has been updated by jhibbits: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=6a47fa697ace42851b44498a53446b29b2593316 >> >> commit 6a47fa697ace42851b44498a53446b29b2593316 >> Author: Justin Hibbits >> AuthorDate: 2023-09-17 14:40:48 +0000 >> Commit: Justin Hibbits >> CommitDate: 2023-09-17 15:45:23 +0000 >> >> powerpc: Implement fpu_kern_enter/fpu_kern_leave >> >> Summary: >> Provide an implementation of fpu_kern_enter/fpu_kern_leave for >> PPC to enable FPU, VSX, and Altivec usage in-kernel. The functions >> currently only support FPU_KERN_NOCTX, but this is sufficient for >> ossl(1) and many other users of the API. >> >> This patchset has been tested on powerpc64le using a modified >> version of the in-tree tools/tools/crypto/cryptocheck.c tool to check >> for FPU/Vec register clobbering along with a follow-up patch to >> enable ossl(4) on powerpc64*. >> >> Reviewed by: jhibbits >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D41540 > > Submitted by: sanastasio_raptorengineering.com > > > I should have checked when I edited the commit message, and fixed it > back to the original author. Sorry about that, Shawn. > > - Justin > -- Mateusz Guzik From nobody Sun Sep 17 17:18:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpZQY0Dzlz4tPkM; Sun, 17 Sep 2023 17:18:45 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Received: from mail.gonegalt.net (mail.gonegalt.net [208.167.253.104]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpZQX5G7vz4gJd; Sun, 17 Sep 2023 17:18:44 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gonegalt.net; s=dkim; t=1694971119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DmI0crW6Ym4axwHQzB8LrcEo40p7pGeHf+BAJtOvnX0=; b=QomQastZDNo+1gJlBqFgisXAm3zxNlrCUsVtSTmB3WR+iKEVPcc0nSORuP+6U+176MfzxZ mg1cpVMjvohaUCtlndBhrvDB8LQvsHP/09C59vAuNCmhvHaqy90J9Mufh3roqxsJ4mPWyM NNLyY8jlIAjvmogMtE/UGCJATmPS94o= Received: by localhost (OpenSMTPD) with ESMTP id 41654a2c; Sun, 17 Sep 2023 13:18:39 -0400 (EDT) Received: from ralga.knownspace ([192.168.1.17]) by mail.gonegalt.net with ESMTPSA id v51qM+80B2Ux0gAA0J78UA (envelope-from ); Sun, 17 Sep 2023 13:18:39 -0400 Date: Sun, 17 Sep 2023 13:18:38 -0400 From: Justin Hibbits To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Shawn Anastasio Subject: Re: git: 6a47fa697ace - main - powerpc: Implement fpu_kern_enter/fpu_kern_leave Message-ID: <20230917131838.6efb5508@ralga.knownspace> In-Reply-To: References: <202309171544.38HFiks4039966@gitrepo.freebsd.org> <20230917115337.6084d166@ralga.knownspace> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; powerpc64le-unknown-linux-gnu) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:20473, ipnet:208.167.224.0/19, country:US] X-Rspamd-Queue-Id: 4RpZQX5G7vz4gJd On Sun, 17 Sep 2023 18:12:52 +0200 Mateusz Guzik wrote: > given that this is fresh and self-contained you can revert and commit > properly Good point, will do. - Justin > > On 9/17/23, Justin Hibbits wrote: > > On Sun, 17 Sep 2023 15:44:46 GMT > > Justin Hibbits wrote: > > > >> The branch main has been updated by jhibbits: > >> > >> URL: > >> https://cgit.FreeBSD.org/src/commit/?id=6a47fa697ace42851b44498a53446b29b2593316 > >> > >> commit 6a47fa697ace42851b44498a53446b29b2593316 > >> Author: Justin Hibbits > >> AuthorDate: 2023-09-17 14:40:48 +0000 > >> Commit: Justin Hibbits > >> CommitDate: 2023-09-17 15:45:23 +0000 > >> > >> powerpc: Implement fpu_kern_enter/fpu_kern_leave > >> > >> Summary: > >> Provide an implementation of fpu_kern_enter/fpu_kern_leave for > >> PPC to enable FPU, VSX, and Altivec usage in-kernel. The functions > >> currently only support FPU_KERN_NOCTX, but this is sufficient for > >> ossl(1) and many other users of the API. > >> > >> This patchset has been tested on powerpc64le using a modified > >> version of the in-tree tools/tools/crypto/cryptocheck.c tool to > >> check for FPU/Vec register clobbering along with a follow-up patch > >> to enable ossl(4) on powerpc64*. > >> > >> Reviewed by: jhibbits > >> MFC after: 2 weeks > >> Differential Revision: https://reviews.freebsd.org/D41540 > > > > Submitted by: sanastasio_raptorengineering.com > > > > > > I should have checked when I edited the commit message, and fixed it > > back to the original author. Sorry about that, Shawn. > > > > - Justin > > > > From nobody Sun Sep 17 17:21:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpZTp1PL3z4tQ3C; Sun, 17 Sep 2023 17:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpZTp0mC8z4gnx; Sun, 17 Sep 2023 17:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694971294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/jEsudpJtjqV3ctYftVXhXJyGnvKGycg6w7iFizydk=; b=W9qvYEoZ+LQBfUiBbBqxD5rgPWuBBGE3t4y54Pxhj4sMeK69CLunLDzpejzCcYBFL9tKZe lNrM2JYexWr77RIIHQa364eSxrxd/DNlFF43+6lOkhoxZa9BDn+8OM9Ta8u8QsN0P1daqv kEHM7Q61Q16K4yLpkrpyaXVI3pzxKcFVvVfLItijUQ9y44c3HFwHAYl9msmlEtTxccE8aF OqVSTlvp09DETMQrsjR6r/ShZ2/z4aTokqLjoWak+4ocjD0zbIrbvBSFO0+o6bOzF83x+A 1FTPYQvG5/H1W4QJIgdnsO3+AISpa8t1bsrixS1oY8VTXbvmIRR0XZ/Ff0IDHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694971294; a=rsa-sha256; cv=none; b=qK1zp5AyVHfILPsp3I7DCZJA0DHzUJnUGF5x68SnPJRpxfuSr0k8nc5syQCsyJmHTQsP8j bejk9tX+RZVLEQmZmd0b6yW5wuRJsho7gBHjA6nr2FUDzZgAc2U5X1vWX17U9/RWVgYxG2 nvSscNgjCH7BYSq2POlOFwo8RszZ6pR1BpOoOR+BrOLtPRbQsw9wu07UpPAY7evNZxohv7 79r9EQ1ri/qCbNZ7JL8eoxJs8+pdEgDD/kRnvOR5tex1YzWjgIkAo4SQIK/nbEEJHk/Eq7 GGtEIFog/ZKhVQjfRC/qDX8yZz31OnpSj6xuVNjmG6Oz6cXmtJigOSaAu5/ARw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694971294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/jEsudpJtjqV3ctYftVXhXJyGnvKGycg6w7iFizydk=; b=P1nRFPdAsZf6CqsyEC7kW5G4PODNsav6/5F4zt1p0KRYH+l8lwflxEUy2tEM9+k0W9XjaA mNqo7loHIMOv624R7rsrD/T7JDB7RQTQvyQzOwIaGVnB6bjFmMvgtTBUjGu/U6nGB+tV57 keqXH8kZQ0y+qCCZYd+/79KpIYw/S2hvFqVtXvXMCf8jCumbmPTav582+tvgrjbnD2sFKE X9vElPbZXuweP0M8+jL8gqShvUc1jQaxGiqeEse04URkeVrZwgHi4YsGkiDuazuFEjv8ug cHES4FBc6Do6YyCySviL86skJyzzAghwXnfxsCeQsOHXARaLu2HZxne7eZSQiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpZTn6tnBzxsy; Sun, 17 Sep 2023 17:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HHLXNE002595; Sun, 17 Sep 2023 17:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HHLX9B002592; Sun, 17 Sep 2023 17:21:33 GMT (envelope-from git) Date: Sun, 17 Sep 2023 17:21:33 GMT Message-Id: <202309171721.38HHLX9B002592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 67a27733d1f4 - main - Revert "powerpc: Implement fpu_kern_enter/fpu_kern_leave" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67a27733d1f49f338ef2c7db9d8f6e40ba2f8b11 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=67a27733d1f49f338ef2c7db9d8f6e40ba2f8b11 commit 67a27733d1f49f338ef2c7db9d8f6e40ba2f8b11 Author: Justin Hibbits AuthorDate: 2023-09-17 17:19:56 +0000 Commit: Justin Hibbits CommitDate: 2023-09-17 17:19:56 +0000 Revert "powerpc: Implement fpu_kern_enter/fpu_kern_leave" This reverts commit 6a47fa697ace42851b44498a53446b29b2593316. Need to correct authorship. --- share/man/man9/fpu_kern.9 | 5 +- sys/powerpc/include/altivec.h | 2 - sys/powerpc/include/fpu.h | 20 ------ sys/powerpc/include/pcb.h | 7 +-- sys/powerpc/powerpc/altivec.c | 34 +--------- sys/powerpc/powerpc/exec_machdep.c | 21 ++++--- sys/powerpc/powerpc/fpu.c | 125 ------------------------------------- sys/sys/param.h | 2 +- 8 files changed, 17 insertions(+), 199 deletions(-) diff --git a/share/man/man9/fpu_kern.9 b/share/man/man9/fpu_kern.9 index 92dc0eaa7e17..c9dd58e96adf 100644 --- a/share/man/man9/fpu_kern.9 +++ b/share/man/man9/fpu_kern.9 @@ -185,8 +185,7 @@ and false otherwise. .Sh NOTES The .Nm -is currently implemented only for the i386, amd64, arm64, and powerpc -architectures. +is currently implemented only for the i386, amd64, and arm64 architectures. .Pp There is no way to handle floating point exceptions raised from kernel mode. @@ -206,8 +205,6 @@ facitily and this manual page were written by .An Konstantin Belousov Aq Mt kib@FreeBSD.org . The arm64 support was added by .An Andrew Turner Aq Mt andrew@FreeBSD.org . -The powerpc support was added by -.An Shawn Anastasio Aq Mt sanastasio@raptorengineering.com . .Sh BUGS .Fn fpu_kern_leave should probably have type diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h index e5151529f698..581a568b7034 100644 --- a/sys/powerpc/include/altivec.h +++ b/sys/powerpc/include/altivec.h @@ -35,7 +35,5 @@ void enable_vec(struct thread *); void save_vec(struct thread *); void save_vec_nodrop(struct thread *); -void enable_vec_kern(void); -void disable_vec(struct thread *td); #endif /* _MACHINE_ALTIVEC_H_ */ diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h index aa5640ea31fb..30df3a470b09 100644 --- a/sys/powerpc/include/fpu.h +++ b/sys/powerpc/include/fpu.h @@ -76,26 +76,6 @@ void save_fpu(struct thread *); void save_fpu_nodrop(struct thread *); void cleanup_fpscr(void); u_int get_fpu_exception(struct thread *); -void enable_fpu_kern(void); -void disable_fpu(struct thread *td); - -/* - * Flags for fpu_kern_alloc_ctx(), fpu_kern_enter() and fpu_kern_thread(). - */ -#define FPU_KERN_NORMAL 0x0000 -#define FPU_KERN_NOWAIT 0x0001 -#define FPU_KERN_KTHR 0x0002 -#define FPU_KERN_NOCTX 0x0004 - -struct fpu_kern_ctx; - -struct fpu_kern_ctx *fpu_kern_alloc_ctx(u_int flags); -void fpu_kern_free_ctx(struct fpu_kern_ctx *ctx); -void fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, - u_int flags); -int fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx); -int fpu_kern_thread(u_int flags); -int is_fpu_kern_thread(u_int flags); #endif /* _KERNEL */ diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index 050ada6b0f64..e5e6e3223406 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -48,7 +48,7 @@ struct pcb { register_t pcb_toc; /* toc pointer */ register_t pcb_lr; /* link register */ register_t pcb_dscr; /* dscr value */ - register_t pcb_fscr; + register_t pcb_fscr; register_t pcb_tar; struct pmap *pcb_pm; /* pmap of our vmspace */ jmp_buf *pcb_onfault; /* For use during @@ -56,14 +56,11 @@ struct pcb { int pcb_flags; #define PCB_FPU 0x1 /* Process uses FPU */ #define PCB_FPREGS 0x2 /* Process had FPU registers initialized */ -#define PCB_VEC 0x4 /* Process uses Altivec */ +#define PCB_VEC 0x4 /* Process had Altivec initialized */ #define PCB_VSX 0x8 /* Process had VSX initialized */ #define PCB_CDSCR 0x10 /* Process had Custom DSCR initialized */ #define PCB_HTM 0x20 /* Process had HTM initialized */ #define PCB_CFSCR 0x40 /* Process had FSCR updated */ -#define PCB_KERN_FPU 0x80 /* Kernel is using FPU/Vector unit */ -#define PCB_KERN_FPU_NOSAVE 0x100 /* FPU/Vec state not saved for kernel use */ -#define PCB_VECREGS 0x200 /* Process had Altivec registers initialized */ struct fpu { union { #if _BYTE_ORDER == _BIG_ENDIAN diff --git a/sys/powerpc/powerpc/altivec.c b/sys/powerpc/powerpc/altivec.c index 5072cf3dc6f6..16e4477703d2 100644 --- a/sys/powerpc/powerpc/altivec.c +++ b/sys/powerpc/powerpc/altivec.c @@ -105,11 +105,10 @@ enable_vec(struct thread *td) * the thread, initialise the vector registers and VSCR to 0, and * set the flag to indicate that the vector unit is in use. */ - pcb->pcb_flags |= PCB_VEC; tf->srr1 |= PSL_VEC; - if (!(pcb->pcb_flags & PCB_VECREGS)) { + if (!(pcb->pcb_flags & PCB_VEC)) { memset(&pcb->pcb_vec, 0, sizeof pcb->pcb_vec); - pcb->pcb_flags |= PCB_VECREGS; + pcb->pcb_flags |= PCB_VEC; } /* @@ -171,32 +170,3 @@ save_vec_nodrop(struct thread *td) if (td == PCPU_GET(vecthread)) save_vec_int(td); } - -void -enable_vec_kern(void) -{ - mtmsr(mfmsr() | PSL_VEC); -} - -void -disable_vec(struct thread *td) -{ - register_t msr; - struct pcb *pcb; - struct trapframe *tf; - - pcb = td->td_pcb; - tf = trapframe(td); - - /* Disable PSL_VEC in kernel (if enabled) */ - msr = mfmsr() & ~PSL_VEC; - isync(); - mtmsr(msr); - - /* - * Disable PSL_VEC in userspace. It will be re-enabled when - * an Altivec instruction is executed. - */ - tf->srr1 &= ~PSL_VEC; - pcb->pcb_flags &= ~PCB_VEC; -} diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 05d3a3cf79ba..b42978ff94a8 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -441,14 +441,12 @@ grab_mcontext(struct thread *td, mcontext_t *mcp, int flags) * Repeat for Altivec context */ - if (pcb->pcb_flags & PCB_VECREGS) { - if (pcb->pcb_flags & PCB_VEC) { - KASSERT(td == curthread, - ("get_mcontext: altivec save not curthread")); - critical_enter(); - save_vec(td); - critical_exit(); - } + if (pcb->pcb_flags & PCB_VEC) { + KASSERT(td == curthread, + ("get_mcontext: fp save not curthread")); + critical_enter(); + save_vec(td); + critical_exit(); mcp->mc_flags |= _MC_AV_VALID; mcp->mc_vscr = pcb->pcb_vec.vscr; mcp->mc_vrsave = pcb->pcb_vec.vrsave; @@ -545,8 +543,11 @@ set_mcontext(struct thread *td, mcontext_t *mcp) } if (mcp->mc_flags & _MC_AV_VALID) { - /* enable_vec() will happen lazily on a fault */ - pcb->pcb_flags |= PCB_VECREGS; + if ((pcb->pcb_flags & PCB_VEC) != PCB_VEC) { + critical_enter(); + enable_vec(td); + critical_exit(); + } pcb->pcb_vec.vscr = mcp->mc_vscr; pcb->pcb_vec.vrsave = mcp->mc_vrsave; memcpy(pcb->pcb_vec.vr, mcp->mc_avec, sizeof(mcp->mc_avec)); diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c index 8f5df2f7d576..cc1381046b4b 100644 --- a/sys/powerpc/powerpc/fpu.c +++ b/sys/powerpc/powerpc/fpu.c @@ -42,7 +42,6 @@ #include #include #include -#include static void save_fpu_int(struct thread *td) @@ -260,127 +259,3 @@ get_fpu_exception(struct thread *td) return ucode; } -void -enable_fpu_kern(void) -{ - register_t msr; - - msr = mfmsr() | PSL_FP; - - if (cpu_features & PPC_FEATURE_HAS_VSX) - msr |= PSL_VSX; - - mtmsr(msr); -} - -void -disable_fpu(struct thread *td) -{ - register_t msr; - struct pcb *pcb; - struct trapframe *tf; - - pcb = td->td_pcb; - tf = trapframe(td); - - /* Disable FPU in kernel (if enabled) */ - msr = mfmsr() & ~(PSL_FP | PSL_VSX); - isync(); - mtmsr(msr); - - /* - * Disable FPU in userspace. It will be re-enabled when - * an FP or VSX instruction is executed. - */ - tf->srr1 &= ~(PSL_FP | PSL_VSX); - pcb->pcb_flags &= ~(PCB_FPU | PCB_VSX); -} - -#ifndef __SPE__ -/* - * XXX: Implement fpu_kern_alloc_ctx/fpu_kern_free_ctx once fpu_kern_enter and - * fpu_kern_leave can handle !FPU_KERN_NOCTX. - */ -struct fpu_kern_ctx { -#define FPU_KERN_CTX_DUMMY 0x01 /* avoided save for the kern thread */ -#define FPU_KERN_CTX_INUSE 0x02 - uint32_t flags; -}; - -void -fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags) -{ - struct pcb *pcb; - - pcb = td->td_pcb; - - KASSERT((flags & FPU_KERN_NOCTX) != 0 || ctx != NULL, - ("ctx is required when !FPU_KERN_NOCTX")); - KASSERT(ctx == NULL || (ctx->flags & FPU_KERN_CTX_INUSE) == 0, - ("using inuse ctx")); - KASSERT((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) == 0, - ("recursive fpu_kern_enter while in PCB_KERN_FPU_NOSAVE state")); - - if ((flags & FPU_KERN_NOCTX) != 0) { - critical_enter(); - - if (pcb->pcb_flags & PCB_FPU) { - save_fpu(td); - pcb->pcb_flags |= PCB_FPREGS; - } - enable_fpu_kern(); - - if (pcb->pcb_flags & PCB_VEC) { - save_vec(td); - pcb->pcb_flags |= PCB_VECREGS; - } - enable_vec_kern(); - - pcb->pcb_flags |= PCB_KERN_FPU | PCB_KERN_FPU_NOSAVE; - return; - } - - KASSERT(0, ("fpu_kern_enter with !FPU_KERN_NOCTX not implemented!")); -} - -int -fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx) -{ - struct pcb *pcb; - - pcb = td->td_pcb; - - if ((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) != 0) { - KASSERT(ctx == NULL, ("non-null ctx after FPU_KERN_NOCTX")); - KASSERT(PCPU_GET(fpcurthread) == NULL, - ("non-NULL fpcurthread for PCB_FP_NOSAVE")); - CRITICAL_ASSERT(td); - - /* Disable FPU, VMX, and VSX */ - disable_fpu(td); - disable_vec(td); - - pcb->pcb_flags &= ~PCB_KERN_FPU_NOSAVE; - - critical_exit(); - } else { - KASSERT(0, ("fpu_kern_leave with !FPU_KERN_NOCTX not implemented!")); - } - - pcb->pcb_flags &= ~PCB_KERN_FPU; - - return 0; -} - -int -is_fpu_kern_thread(u_int flags __unused) -{ - struct pcb *curpcb; - - if ((curthread->td_pflags & TDP_KTHREAD) == 0) - return (0); - curpcb = curthread->td_pcb; - return ((curpcb->pcb_flags & PCB_KERN_FPU) != 0); -} - -#endif /* !__SPE__ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index 2e4310dac111..da88c3e28581 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500001 +#define __FreeBSD_version 1500000 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Sep 17 17:21:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpZTq2Wqdz4tQ3J; Sun, 17 Sep 2023 17:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpZTq1SW7z4gvS; Sun, 17 Sep 2023 17:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694971295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sun6J5uGCfJD7YloNsGd34ho82B8OgEgo7HXTXK5YzQ=; b=yAg+5j/kL7/i4CbKwNOsApMBL7yGRy7ZEmAkbzpti2n45gKWzKG39k1ce8CgbVeYM8x3gr s+4udowuwEq8mmrsG+cuswrTxaVQMIMemOyV+klm/kyieCbWNSNmAtxM1YvWZl/xc5DUfJ J5L1maqOj21mxgFmhBqLq0SjdfjO9bXHqS6VsKrY/M6IhlE5PtEiEQtGAHAWzjPuvMigdU MKeUedWr3j7/zDRY0EfT3636TOm/3W01V6vGeC+zCbjbfrFgsS4WtGnLcOAZT1sfnukNFx gWICluEiLkuG0c1knEqVVBa5RQcnsxu1esXOza3d5YUrnfFYFd25Pw6sU8t08A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694971295; a=rsa-sha256; cv=none; b=vEI43ORry9HUG8YnoySIbUpH6qsZVuIFEtKGPK6Rt1HH1gTiAZvTAY02O9a2fxgzurx761 l2l+v9wBOzfH9YG9RAEqwvPDmpzNKJYI2nhCnMsq8WjpbVhnvJtFa2o1m/tTYPMCizVJvN qW57+EuX6lTzZuL9BFYR/wTxra72tP6HEFR3RNvv502gKAn6f6o54Zj63THORuB0Yiz6Bg f9npQWs6KjWcUoBwb39saSlMJfRwnwnKV3aWxZiTphHaDEqlt83r3kHGfcJQNYASlskHed AqyerHzaWsd0krrPnN3o7FcRzrYPdIdXOW/R/5e2xpMJiB5rVqURlCjlPYVTMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694971295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sun6J5uGCfJD7YloNsGd34ho82B8OgEgo7HXTXK5YzQ=; b=P4/yeWAZJtm6FOc4RLAy2n7TD87qb+BHiwCm+KT1m9zpjuBuGPjxcAGF4CuhNHYFJ5yVj4 alwmrc6GowWAfNz242tgzUBOeMwPf0Bg6LNBe/Bf5aGEH3Dn1+MvMuc7sLf8RSZe6OvBzv 8e9mLZwnvVR8+T7QCDma0RJ2FpSAVnTyAROOKvMND7z0t33EswUdIaD81EKFJdBF/gtiYO jGW/ODn+HEXvNU/dZyXNAs1m1fBMbasoAQ+CE9EC7R9MqvN9wYcFRYuN/D4suI6vKU8606 +TZgVjKEYN0Wdm06j7sCUbwhxiFibTtEo5Pjw8jvDXOqkHLE9OkjcHZEffX3yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpZTq0V9BzxNF; Sun, 17 Sep 2023 17:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HHLYFS002631; Sun, 17 Sep 2023 17:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HHLY7Z002628; Sun, 17 Sep 2023 17:21:34 GMT (envelope-from git) Date: Sun, 17 Sep 2023 17:21:34 GMT Message-Id: <202309171721.38HHLY7Z002628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: a6662c37b6ff - main - powerpc: Implement fpu_kern_enter/fpu_kern_leave List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6662c37b6ffee46e18be5f7570149edc64c1d0b Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=a6662c37b6ffee46e18be5f7570149edc64c1d0b commit a6662c37b6ffee46e18be5f7570149edc64c1d0b Author: Shawn Anastasio AuthorDate: 2023-09-17 14:40:48 +0000 Commit: Justin Hibbits CommitDate: 2023-09-17 17:21:04 +0000 powerpc: Implement fpu_kern_enter/fpu_kern_leave Summary: Provide an implementation of fpu_kern_enter/fpu_kern_leave for PPC to enable FPU, VSX, and Altivec usage in-kernel. The functions currently only support FPU_KERN_NOCTX, but this is sufficient for ossl(1) and many other users of the API. This patchset has been tested on powerpc64le using a modified version of the in-tree tools/tools/crypto/cryptocheck.c tool to check for FPU/Vec register clobbering along with a follow-up patch to enable ossl(4) on powerpc64*. Reviewed by: jhibbits MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41540 --- share/man/man9/fpu_kern.9 | 5 +- sys/powerpc/include/altivec.h | 2 + sys/powerpc/include/fpu.h | 20 ++++++ sys/powerpc/include/pcb.h | 7 ++- sys/powerpc/powerpc/altivec.c | 34 +++++++++- sys/powerpc/powerpc/exec_machdep.c | 21 +++---- sys/powerpc/powerpc/fpu.c | 125 +++++++++++++++++++++++++++++++++++++ sys/sys/param.h | 2 +- 8 files changed, 199 insertions(+), 17 deletions(-) diff --git a/share/man/man9/fpu_kern.9 b/share/man/man9/fpu_kern.9 index c9dd58e96adf..92dc0eaa7e17 100644 --- a/share/man/man9/fpu_kern.9 +++ b/share/man/man9/fpu_kern.9 @@ -185,7 +185,8 @@ and false otherwise. .Sh NOTES The .Nm -is currently implemented only for the i386, amd64, and arm64 architectures. +is currently implemented only for the i386, amd64, arm64, and powerpc +architectures. .Pp There is no way to handle floating point exceptions raised from kernel mode. @@ -205,6 +206,8 @@ facitily and this manual page were written by .An Konstantin Belousov Aq Mt kib@FreeBSD.org . The arm64 support was added by .An Andrew Turner Aq Mt andrew@FreeBSD.org . +The powerpc support was added by +.An Shawn Anastasio Aq Mt sanastasio@raptorengineering.com . .Sh BUGS .Fn fpu_kern_leave should probably have type diff --git a/sys/powerpc/include/altivec.h b/sys/powerpc/include/altivec.h index 581a568b7034..e5151529f698 100644 --- a/sys/powerpc/include/altivec.h +++ b/sys/powerpc/include/altivec.h @@ -35,5 +35,7 @@ void enable_vec(struct thread *); void save_vec(struct thread *); void save_vec_nodrop(struct thread *); +void enable_vec_kern(void); +void disable_vec(struct thread *td); #endif /* _MACHINE_ALTIVEC_H_ */ diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h index 30df3a470b09..aa5640ea31fb 100644 --- a/sys/powerpc/include/fpu.h +++ b/sys/powerpc/include/fpu.h @@ -76,6 +76,26 @@ void save_fpu(struct thread *); void save_fpu_nodrop(struct thread *); void cleanup_fpscr(void); u_int get_fpu_exception(struct thread *); +void enable_fpu_kern(void); +void disable_fpu(struct thread *td); + +/* + * Flags for fpu_kern_alloc_ctx(), fpu_kern_enter() and fpu_kern_thread(). + */ +#define FPU_KERN_NORMAL 0x0000 +#define FPU_KERN_NOWAIT 0x0001 +#define FPU_KERN_KTHR 0x0002 +#define FPU_KERN_NOCTX 0x0004 + +struct fpu_kern_ctx; + +struct fpu_kern_ctx *fpu_kern_alloc_ctx(u_int flags); +void fpu_kern_free_ctx(struct fpu_kern_ctx *ctx); +void fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, + u_int flags); +int fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx); +int fpu_kern_thread(u_int flags); +int is_fpu_kern_thread(u_int flags); #endif /* _KERNEL */ diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index e5e6e3223406..050ada6b0f64 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -48,7 +48,7 @@ struct pcb { register_t pcb_toc; /* toc pointer */ register_t pcb_lr; /* link register */ register_t pcb_dscr; /* dscr value */ - register_t pcb_fscr; + register_t pcb_fscr; register_t pcb_tar; struct pmap *pcb_pm; /* pmap of our vmspace */ jmp_buf *pcb_onfault; /* For use during @@ -56,11 +56,14 @@ struct pcb { int pcb_flags; #define PCB_FPU 0x1 /* Process uses FPU */ #define PCB_FPREGS 0x2 /* Process had FPU registers initialized */ -#define PCB_VEC 0x4 /* Process had Altivec initialized */ +#define PCB_VEC 0x4 /* Process uses Altivec */ #define PCB_VSX 0x8 /* Process had VSX initialized */ #define PCB_CDSCR 0x10 /* Process had Custom DSCR initialized */ #define PCB_HTM 0x20 /* Process had HTM initialized */ #define PCB_CFSCR 0x40 /* Process had FSCR updated */ +#define PCB_KERN_FPU 0x80 /* Kernel is using FPU/Vector unit */ +#define PCB_KERN_FPU_NOSAVE 0x100 /* FPU/Vec state not saved for kernel use */ +#define PCB_VECREGS 0x200 /* Process had Altivec registers initialized */ struct fpu { union { #if _BYTE_ORDER == _BIG_ENDIAN diff --git a/sys/powerpc/powerpc/altivec.c b/sys/powerpc/powerpc/altivec.c index 16e4477703d2..5072cf3dc6f6 100644 --- a/sys/powerpc/powerpc/altivec.c +++ b/sys/powerpc/powerpc/altivec.c @@ -105,10 +105,11 @@ enable_vec(struct thread *td) * the thread, initialise the vector registers and VSCR to 0, and * set the flag to indicate that the vector unit is in use. */ + pcb->pcb_flags |= PCB_VEC; tf->srr1 |= PSL_VEC; - if (!(pcb->pcb_flags & PCB_VEC)) { + if (!(pcb->pcb_flags & PCB_VECREGS)) { memset(&pcb->pcb_vec, 0, sizeof pcb->pcb_vec); - pcb->pcb_flags |= PCB_VEC; + pcb->pcb_flags |= PCB_VECREGS; } /* @@ -170,3 +171,32 @@ save_vec_nodrop(struct thread *td) if (td == PCPU_GET(vecthread)) save_vec_int(td); } + +void +enable_vec_kern(void) +{ + mtmsr(mfmsr() | PSL_VEC); +} + +void +disable_vec(struct thread *td) +{ + register_t msr; + struct pcb *pcb; + struct trapframe *tf; + + pcb = td->td_pcb; + tf = trapframe(td); + + /* Disable PSL_VEC in kernel (if enabled) */ + msr = mfmsr() & ~PSL_VEC; + isync(); + mtmsr(msr); + + /* + * Disable PSL_VEC in userspace. It will be re-enabled when + * an Altivec instruction is executed. + */ + tf->srr1 &= ~PSL_VEC; + pcb->pcb_flags &= ~PCB_VEC; +} diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index b42978ff94a8..05d3a3cf79ba 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -441,12 +441,14 @@ grab_mcontext(struct thread *td, mcontext_t *mcp, int flags) * Repeat for Altivec context */ - if (pcb->pcb_flags & PCB_VEC) { - KASSERT(td == curthread, - ("get_mcontext: fp save not curthread")); - critical_enter(); - save_vec(td); - critical_exit(); + if (pcb->pcb_flags & PCB_VECREGS) { + if (pcb->pcb_flags & PCB_VEC) { + KASSERT(td == curthread, + ("get_mcontext: altivec save not curthread")); + critical_enter(); + save_vec(td); + critical_exit(); + } mcp->mc_flags |= _MC_AV_VALID; mcp->mc_vscr = pcb->pcb_vec.vscr; mcp->mc_vrsave = pcb->pcb_vec.vrsave; @@ -543,11 +545,8 @@ set_mcontext(struct thread *td, mcontext_t *mcp) } if (mcp->mc_flags & _MC_AV_VALID) { - if ((pcb->pcb_flags & PCB_VEC) != PCB_VEC) { - critical_enter(); - enable_vec(td); - critical_exit(); - } + /* enable_vec() will happen lazily on a fault */ + pcb->pcb_flags |= PCB_VECREGS; pcb->pcb_vec.vscr = mcp->mc_vscr; pcb->pcb_vec.vrsave = mcp->mc_vrsave; memcpy(pcb->pcb_vec.vr, mcp->mc_avec, sizeof(mcp->mc_avec)); diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c index cc1381046b4b..8f5df2f7d576 100644 --- a/sys/powerpc/powerpc/fpu.c +++ b/sys/powerpc/powerpc/fpu.c @@ -42,6 +42,7 @@ #include #include #include +#include static void save_fpu_int(struct thread *td) @@ -259,3 +260,127 @@ get_fpu_exception(struct thread *td) return ucode; } +void +enable_fpu_kern(void) +{ + register_t msr; + + msr = mfmsr() | PSL_FP; + + if (cpu_features & PPC_FEATURE_HAS_VSX) + msr |= PSL_VSX; + + mtmsr(msr); +} + +void +disable_fpu(struct thread *td) +{ + register_t msr; + struct pcb *pcb; + struct trapframe *tf; + + pcb = td->td_pcb; + tf = trapframe(td); + + /* Disable FPU in kernel (if enabled) */ + msr = mfmsr() & ~(PSL_FP | PSL_VSX); + isync(); + mtmsr(msr); + + /* + * Disable FPU in userspace. It will be re-enabled when + * an FP or VSX instruction is executed. + */ + tf->srr1 &= ~(PSL_FP | PSL_VSX); + pcb->pcb_flags &= ~(PCB_FPU | PCB_VSX); +} + +#ifndef __SPE__ +/* + * XXX: Implement fpu_kern_alloc_ctx/fpu_kern_free_ctx once fpu_kern_enter and + * fpu_kern_leave can handle !FPU_KERN_NOCTX. + */ +struct fpu_kern_ctx { +#define FPU_KERN_CTX_DUMMY 0x01 /* avoided save for the kern thread */ +#define FPU_KERN_CTX_INUSE 0x02 + uint32_t flags; +}; + +void +fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + + KASSERT((flags & FPU_KERN_NOCTX) != 0 || ctx != NULL, + ("ctx is required when !FPU_KERN_NOCTX")); + KASSERT(ctx == NULL || (ctx->flags & FPU_KERN_CTX_INUSE) == 0, + ("using inuse ctx")); + KASSERT((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) == 0, + ("recursive fpu_kern_enter while in PCB_KERN_FPU_NOSAVE state")); + + if ((flags & FPU_KERN_NOCTX) != 0) { + critical_enter(); + + if (pcb->pcb_flags & PCB_FPU) { + save_fpu(td); + pcb->pcb_flags |= PCB_FPREGS; + } + enable_fpu_kern(); + + if (pcb->pcb_flags & PCB_VEC) { + save_vec(td); + pcb->pcb_flags |= PCB_VECREGS; + } + enable_vec_kern(); + + pcb->pcb_flags |= PCB_KERN_FPU | PCB_KERN_FPU_NOSAVE; + return; + } + + KASSERT(0, ("fpu_kern_enter with !FPU_KERN_NOCTX not implemented!")); +} + +int +fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx) +{ + struct pcb *pcb; + + pcb = td->td_pcb; + + if ((pcb->pcb_flags & PCB_KERN_FPU_NOSAVE) != 0) { + KASSERT(ctx == NULL, ("non-null ctx after FPU_KERN_NOCTX")); + KASSERT(PCPU_GET(fpcurthread) == NULL, + ("non-NULL fpcurthread for PCB_FP_NOSAVE")); + CRITICAL_ASSERT(td); + + /* Disable FPU, VMX, and VSX */ + disable_fpu(td); + disable_vec(td); + + pcb->pcb_flags &= ~PCB_KERN_FPU_NOSAVE; + + critical_exit(); + } else { + KASSERT(0, ("fpu_kern_leave with !FPU_KERN_NOCTX not implemented!")); + } + + pcb->pcb_flags &= ~PCB_KERN_FPU; + + return 0; +} + +int +is_fpu_kern_thread(u_int flags __unused) +{ + struct pcb *curpcb; + + if ((curthread->td_pflags & TDP_KTHREAD) == 0) + return (0); + curpcb = curthread->td_pcb; + return ((curpcb->pcb_flags & PCB_KERN_FPU) != 0); +} + +#endif /* !__SPE__ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index da88c3e28581..2e4310dac111 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500000 +#define __FreeBSD_version 1500001 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Mon Sep 18 00:01:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RplMk32Qhz4t4lZ; Mon, 18 Sep 2023 00:01:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RplMk1p4xz3WbT; Mon, 18 Sep 2023 00:01:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694995314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yEyHKZr27EKl9VsQxKPH7g4iwbflTFPQ3bCo+ZW7gpY=; b=tuM0aV0FV2LRC2ubQORfqoj4t2DivYUFH/9CiE2ajqsb4juYgUf5YXuw6Zyru2oDlghj/9 k4e9Coouwjsu/rkDYzNrAyDRca5kCLU7VlciNtf41QDDt+jkrP+b5bErv/nahZXhDHv4PF Gsx3Fqc7VqvZpIzzAMAt1uYGJgIkAQ5jkSRbHLpzQPOOcaHfLY72/8Z3fkC791tJZZtaZO TuS70Ej0ErtDqi/SRX63xfUseKsKDtf7Z2AsaLtp35hY5YxzArQcV8ld3tUdLiMW2VLFpX Md37xrB+FxgK3RCRdhVNfIpiwCT8AN8yU3r6uTeDuqlNZbZU6yAfJHJXsH54Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694995314; a=rsa-sha256; cv=none; b=i8YzC9GhVWPNifovRJQjOxanO2e3S6EZlDBOpiH8P5N5I+Kc0sqhosTqQrkMlyjfOEr0aS QkJijb9XfRJYdBVKpiGiN4P5RG+TXWA21wv+03BwnJpEFx49PfwxfNTZlnuGcuGDmACO3j FAYRfeUH8PV1TLK/5lCGq8vIrtWbxnrhDGBaxe9lTfhqJZXi/dt7n0ZAPWm8c3uD7FslI1 BRpFp7kXczACpIt2THIo5hddonU+FDog7AgJ/qV0Sg4NJifefs7XfpeMnNOdmphNJEuwku T5DHRYKMQDQGoh1P2ch+LkoBXZtEsGm/nwvJt+pNJ4bMRkL05Dw8UzV5Ey8wUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694995314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yEyHKZr27EKl9VsQxKPH7g4iwbflTFPQ3bCo+ZW7gpY=; b=eibkPK2v3Ajv1T8VAVyu6yvb5RNmB2GkQeU0NFfqvHTPEVZmjsUhU+A++B+yGefhc8l9bk n+LXP0S+s0HGuDglXpw3nmIgnU1HgyuuGRE88G7fYUQb97j1dJ/0AVLsVQltjAo3e5iMK2 kRIq7pJQadZYW5nQszZaV2ggvP11sSoC+mXaUjFTO2YD00KFppPtu/5kHmY2UHjxYN5+hu aIv36Lzzc3F4BnQO06ncvYRESPXv9sIVHnMm/zb5tARD47DQJJ9E5BlIbOtZEuJpYLIHPA dNr2P6KWUWNjQgntfVpiX0amxctx4Llh+RoYXOWlo1hCU6p2w8BSW96xrx7yRg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RplMk0HH8z11ZF; Mon, 18 Sep 2023 00:01:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 5A177EA29; Mon, 18 Sep 2023 02:01:52 +0200 (CEST) From: Kristof Provost To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1a18383a52bc - main - libcrypto: link engines and the legacy provider to libcrypto Date: Mon, 18 Sep 2023 01:01:51 +0100 X-Mailer: MailMate (1.14r5937) Message-ID: <44E31276-1371-47E7-AB8E-9EC45728CE15@FreeBSD.org> In-Reply-To: <202309161555.38GFtUXj064786@gitrepo.freebsd.org> References: <202309161555.38GFtUXj064786@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 16 Sep 2023, at 16:55, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1a18383a52bc373e316d224c= ef1298debf6f7e25 > > commit 1a18383a52bc373e316d224cef1298debf6f7e25 > Author: Pierre Pronchery > AuthorDate: 2023-09-15 15:14:16 +0000 > Commit: Ed Maste > CommitDate: 2023-09-16 15:55:12 +0000 > > libcrypto: link engines and the legacy provider to libcrypto > > OpenSSL's legacy provider module and engines need to link to > libcrypto.so, as it provides some of the actual implementations of > legacy routines. > > This is a little tricky due to build order issues. Introduce a sma= ll > hack (LIBCRYPTO_WITHOUT_SUBDIRS) that builds libcrypto.so in its us= ual > early phase without any OpenSSL provider modules or engines. This = is > intended to restore the test suite; a future change should remove t= he > hack and replace it with a better approach. > > PR: 254853, 273528 > Discussed with: Folks at EuroBSDCon in Coimbra > Sponsored by: The FreeBSD Foundation MFC after: 3 days? We=E2=80=99ll want this in 14.0. Best regards, Kristof From nobody Mon Sep 18 01:10:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rpmtc140wz4t9Dg; Mon, 18 Sep 2023 01:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rpmtc0qJ5z3cSt; Mon, 18 Sep 2023 01:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694999416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKoJf0+mMIn5MtyC61D1MrS93kBne61d/zBZI52nd2E=; b=R0472EP55yQD4RCy+CgkRKpwIfdMWpEGBBQyBqdVX6FGPaeJh27wEvldkiXaIBmhw6e3v1 DUxN4Kc+Px6Ri7swXxf8I85r8o0R3SPzzSrXpQiXa/o+MKPSCDr1Ogn474LpP9PMgpV+2J 3oIIsU5gkU/tdRjH/25yx0PMRVskinnNLoArRSCgGvEmefbsoehS2bHM4CkMUpTfnrgacl EMmAVPOAImnyVJQyQVtVDizlU7GnxA3uDfZXWHibyYRQt+UKW+ku4ziFG6hhIneP3sMVbI aw/aARe8vNZimL1zrkbIOopAyGZmqWvoA1WlTbos6YtMkiKAbVy4yVUHtZzODQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694999416; a=rsa-sha256; cv=none; b=PSQdrDvX4cCFiyL/hhayr2w55VxJmlR2ORw1n+WGsEoZSIZ8L3mbY6tKlvj//dowr1kIXc OsI15/AmDpGJfm2NnaFVR7hWSpBmp/x68P4VRKawAs2l1PI91HRiXOwPyE29MsnnbhcdjM w/mvYhIWnmPnO5z/7NcGD36PgtG5yGqHsNascxC955aOUGfHc3K9ICv5KTozu3ym0XdJza 8QUMN96JYiIeHCplqsB1x+uPP1s7Oyb1S6asxMmia1WV+Ykvt6NlGnhqQk46hsgZ5j3Xcw kPedKjnoodcfAxjGOkeWbp0NIrI/EQPdmwRfAqqgyySKbK0CIt4mX4GQIz6Y6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694999416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKoJf0+mMIn5MtyC61D1MrS93kBne61d/zBZI52nd2E=; b=aI3hQigKfwhnkbiKPK1U+RCrpfJyLe2zH+YrAfK1wcoSlJJOP5SFgizzQtEBszjlnFFDks CH3ChlumFVJkj9z/oNQC1X3GYpgqEdLQ4tEUCPKckDKLLpWaQg2rA6/YqUmMsuZekQDbT+ hTbRa3BTr05JMPwEbaSvUjvrS2i5MuBP9AP8N/OejHSwHt/nYWtyI4wF1l96Ln57PbkhK5 dESmktMrO6m7ySKKQndyGdkbAK2XZ0fWe0E7gw4XVguGilc3Bb6uRMb4nAxDn7PNcdpSSJ ZTT1atJyJEySIiZIO40Yo3N4yMDW1Xn2HMkybn5alA5CvGU0EWo9BRrNpm+/Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rpmtb70g3z199M; Mon, 18 Sep 2023 01:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38I1AFSe076083; Mon, 18 Sep 2023 01:10:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38I1AC03074198; Mon, 18 Sep 2023 01:10:12 GMT (envelope-from git) Date: Mon, 18 Sep 2023 01:10:12 GMT Message-Id: <202309180110.38I1AC03074198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 988758838533 - main - Merge bmake-20230909 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 988758838533b24f5893b36514fe2c68a3f911a2 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=988758838533b24f5893b36514fe2c68a3f911a2 commit 988758838533b24f5893b36514fe2c68a3f911a2 Merge: a6662c37b6ff 1012cf15f75d Author: Simon J. Gerraty AuthorDate: 2023-09-18 01:05:19 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-18 01:09:37 +0000 Merge bmake-20230909 Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a' contrib/bmake/ChangeLog | 78 +++++++ contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.1 | 34 +++- contrib/bmake/bmake.cat1 | 48 +++-- contrib/bmake/boot-strap | 4 +- contrib/bmake/cond.c | 23 +-- contrib/bmake/configure | 61 ++++-- contrib/bmake/configure.in | 51 +++-- contrib/bmake/import.sh | 34 +++- contrib/bmake/install-sh | 20 +- contrib/bmake/main.c | 47 ++++- contrib/bmake/make-bootstrap.sh.in | 1 + contrib/bmake/make.1 | 34 +++- contrib/bmake/make.h | 15 +- contrib/bmake/meta.c | 9 +- contrib/bmake/mk/ChangeLog | 43 ++++ contrib/bmake/mk/FILES | 1 + contrib/bmake/mk/dirdeps.mk | 22 +- contrib/bmake/mk/install-mk | 6 +- contrib/bmake/mk/install-sh | 226 +++++++++++++++++++++ contrib/bmake/mk/jobs.mk | 24 ++- contrib/bmake/mk/lib.mk | 6 +- contrib/bmake/mk/meta.autodep.mk | 4 +- contrib/bmake/mk/mk-files.txt | 16 +- contrib/bmake/mk/rst2htm.mk | 8 +- contrib/bmake/mk/sys.mk | 20 +- contrib/bmake/mk/sys/IRIX.mk | 13 +- contrib/bmake/parse.c | 35 ++-- contrib/bmake/unit-tests/Makefile | 22 +- contrib/bmake/unit-tests/cond-cmp-numeric-eq.mk | 7 +- contrib/bmake/unit-tests/cond-cmp-numeric-ge.mk | 4 +- contrib/bmake/unit-tests/cond-cmp-numeric-gt.mk | 6 +- contrib/bmake/unit-tests/cond-cmp-numeric-le.mk | 4 +- contrib/bmake/unit-tests/cond-cmp-numeric-lt.mk | 4 +- contrib/bmake/unit-tests/cond-cmp-numeric-ne.mk | 4 +- contrib/bmake/unit-tests/cond-func-empty.exp | 4 +- contrib/bmake/unit-tests/cond-func-empty.mk | 36 +++- contrib/bmake/unit-tests/cond-op-and.mk | 10 +- contrib/bmake/unit-tests/cond-op-or.mk | 10 +- contrib/bmake/unit-tests/dep-op-missing.exp | 2 +- contrib/bmake/unit-tests/directive-dinclude.exp | 2 +- contrib/bmake/unit-tests/directive-dinclude.mk | 4 +- .../bmake/unit-tests/directive-export-gmake.exp | 6 +- contrib/bmake/unit-tests/directive-export-gmake.mk | 27 ++- contrib/bmake/unit-tests/directive-export.exp | 3 + contrib/bmake/unit-tests/directive-export.mk | 19 +- contrib/bmake/unit-tests/directive-for-escape.exp | 83 +++++--- contrib/bmake/unit-tests/directive-for-escape.mk | 46 ++++- .../bmake/unit-tests/directive-hyphen-include.exp | 2 +- .../bmake/unit-tests/directive-hyphen-include.mk | 4 +- .../bmake/unit-tests/directive-include-guard.exp | 16 +- .../bmake/unit-tests/directive-include-guard.mk | 74 +++---- contrib/bmake/unit-tests/directive-include.exp | 2 +- contrib/bmake/unit-tests/directive-include.mk | 4 +- contrib/bmake/unit-tests/directive-sinclude.exp | 2 +- contrib/bmake/unit-tests/directive-sinclude.mk | 4 +- contrib/bmake/unit-tests/directive.exp | 8 +- contrib/bmake/unit-tests/directive.mk | 10 +- contrib/bmake/unit-tests/opt-debug-graph1.exp | 1 + contrib/bmake/unit-tests/opt-debug-graph2.exp | 1 + contrib/bmake/unit-tests/opt-debug-graph3.exp | 1 + contrib/bmake/unit-tests/opt-jobs.mk | 56 ++++- contrib/bmake/unit-tests/parse.exp | 6 +- contrib/bmake/unit-tests/parse.mk | 8 +- contrib/bmake/unit-tests/suff-main-several.exp | 1 + contrib/bmake/unit-tests/suff-transform-debug.exp | 1 + contrib/bmake/unit-tests/var-op-assign.exp | 2 +- contrib/bmake/unit-tests/var-op-assign.mk | 4 +- contrib/bmake/unit-tests/varmod-gmtime.mk | 31 ++- contrib/bmake/unit-tests/varmod-ifelse.exp | 26 ++- contrib/bmake/unit-tests/varmod-ifelse.mk | 54 ++++- contrib/bmake/unit-tests/varmod-mtime.exp | 9 +- contrib/bmake/unit-tests/varmod-mtime.mk | 86 ++++++-- contrib/bmake/unit-tests/varname-dot-make-jobs.exp | 2 +- contrib/bmake/unit-tests/varname-dot-make-jobs.mk | 27 ++- contrib/bmake/unit-tests/varname.exp | 2 +- contrib/bmake/unit-tests/varname.mk | 4 +- contrib/bmake/var.c | 53 +++-- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/config.h | 4 +- usr.bin/bmake/unit-tests/Makefile | 22 +- 81 files changed, 1309 insertions(+), 408 deletions(-) diff --cc contrib/bmake/mk/install-sh index 000000000000,1fa52a59de7e..1fa52a59de7e mode 000000,100755..100755 --- a/contrib/bmake/mk/install-sh +++ b/contrib/bmake/mk/install-sh diff --cc usr.bin/bmake/Makefile.config index 0f67b27f271a,000000000000..c31d0790ed9e mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,27 -1,0 +1,27 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20230622 ++_MAKE_VERSION?=20230909 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk + +EGREP = egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/config.h index fa7451e3ba0d,000000000000..af8b4c8e02ba mode 100644,000000..100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@@ -1,445 -1,0 +1,445 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Path of default shell */ +/* #undef DEFSHELL_CUSTOM */ + +/* Shell spec to use by default */ +/* #undef DEFSHELL_INDEX */ + +/* Path of default shell */ +/* #undef DEFSHELL_PATH */ + +/* Define to 1 if you have the header file. */ +#define HAVE_AR_H 1 + +/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the `err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the `errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the `getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the `getwd' function. */ +#define HAVE_GETWD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type `long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_RANLIB_H 1 + +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the `sigaddset' function. */ +#define HAVE_SIGADDSET 1 + +/* Define to 1 if you have the `sigpending' function. */ +#define HAVE_SIGPENDING 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the `sigsetmask' function. */ +#define HAVE_SIGSETMASK 1 + +/* Define to 1 if you have the `sigsuspend' function. */ +#define HAVE_SIGSUSPEND 1 + +/* Define to 1 if you have the `sigvec' function. */ +#define HAVE_SIGVEC 1 + +/* Define to 1 if the system has the type `sig_atomic_t'. */ +#define HAVE_SIG_ATOMIC_T 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `stresep' function. */ +/* #undef HAVE_STRESEP */ + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the `strtod' function. */ +#define HAVE_STRTOD 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the `sysctl' function. */ +#define HAVE_SYSCTL 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `wait3' function. */ +#define HAVE_WAIT3 1 + +/* Define to 1 if you have the `wait4' function. */ +#define HAVE_WAIT4 1 + +/* Define to 1 if you have the `waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the `warn' function. */ +#define HAVE_WARN 1 + +/* Define to 1 if you have the `warnx' function. */ +#define HAVE_WARNX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sjg@NetBSD.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bmake" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "bmake 20220909" ++#define PACKAGE_STRING "bmake 20230723" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bmake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "20220909" ++#define PACKAGE_VERSION "20230723" + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* C99 function name */ +/* #undef __func__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to `int' if does not define. */ +/* #undef mode_t */ + +/* Define to `long int' if does not define. */ +/* #undef off_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + +/* type that signal handlers can safely frob */ +/* #undef sig_atomic_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ diff --cc usr.bin/bmake/unit-tests/Makefile index 055b65e1b48d,000000000000..c5cc7646efed mode 100644,000000..100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@@ -1,867 -1,0 +1,885 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# - # $Id: Makefile,v 1.199 2023/06/20 17:27:20 sjg Exp $ ++# $Id: Makefile,v 1.207 2023/09/09 16:44:03 sjg Exp $ +# - # $NetBSD: Makefile,v 1.339 2023/06/20 09:25:34 rillig Exp $ ++# $NetBSD: Makefile,v 1.341 2023/09/09 16:41:04 sjg Exp $ +# +# Unit tests for make(1) +# +# The main targets are: +# +# all: +# run all the tests +# test: +# run 'all', and compare to expected results +# accept: +# move generated output to expected results +# +# Settable variables +# +# TEST_MAKE +# The make program to be tested. +# +# +# Adding a test case +# +# Each feature should get its own set of tests in its own suitably +# named makefile (*.mk), with its own set of expected results (*.exp), +# and it should be added to the TESTS list. +# + +.MAIN: all + +# we use these below but we might be an older make +.MAKE.OS?= ${uname -s:L:sh} +.MAKE.UID?= ${id -u:L:sh} + +# for many tests we need a TMPDIR that will not collide +# with other users. +.if ${.OBJDIR} != ${.CURDIR} +# easy +TMPDIR:= ${.OBJDIR}/tmp +.elif defined(TMPDIR) +TMPDIR:= ${TMPDIR}/uid${.MAKE.UID} +.else +TMPDIR:= /tmp/uid${.MAKE.UID} +.endif +# make sure it exists +.if !exist(${TMPDIR}) +_!= mkdir -p ${TMPDIR} +.endif + +# Each test is in a sub-makefile. +# Keep the list sorted. +# Any test that is commented out must be ignored in +# src/tests/usr.bin/make/t_make.sh as well. +#TESTS+= archive +#TESTS+= archive-suffix +TESTS+= cmd-errors +TESTS+= cmd-errors-jobs +TESTS+= cmd-errors-lint +TESTS+= cmd-interrupt +TESTS+= cmdline +TESTS+= cmdline-redirect-stdin +TESTS+= cmdline-undefined +TESTS+= comment +TESTS+= compat-error +TESTS+= cond-cmp-numeric +TESTS+= cond-cmp-numeric-eq +TESTS+= cond-cmp-numeric-ge +TESTS+= cond-cmp-numeric-gt +TESTS+= cond-cmp-numeric-le +TESTS+= cond-cmp-numeric-lt +TESTS+= cond-cmp-numeric-ne +TESTS+= cond-cmp-string +TESTS+= cond-cmp-unary +TESTS+= cond-eof +TESTS+= cond-func +TESTS+= cond-func-commands +TESTS+= cond-func-defined +TESTS+= cond-func-empty +TESTS+= cond-func-exists +TESTS+= cond-func-make +TESTS+= cond-func-make-main +TESTS+= cond-func-target +TESTS+= cond-late +TESTS+= cond-op +TESTS+= cond-op-and +TESTS+= cond-op-and-lint +TESTS+= cond-op-not +TESTS+= cond-op-or +TESTS+= cond-op-or-lint +TESTS+= cond-op-parentheses +TESTS+= cond-short +TESTS+= cond-token-number +TESTS+= cond-token-plain +TESTS+= cond-token-string +TESTS+= cond-token-var +TESTS+= cond-undef-lint +TESTS+= counter +TESTS+= counter-append +TESTS+= dep +TESTS+= dep-colon +TESTS+= dep-colon-bug-cross-file +TESTS+= dep-double-colon +TESTS+= dep-double-colon-indep +TESTS+= dep-duplicate +TESTS+= dep-exclam +TESTS+= dep-none +TESTS+= dep-op-missing +TESTS+= dep-percent +TESTS+= dep-var +TESTS+= dep-wildcards +TESTS+= depsrc +TESTS+= depsrc-end +TESTS+= depsrc-exec +TESTS+= depsrc-ignore +TESTS+= depsrc-made +TESTS+= depsrc-make +TESTS+= depsrc-meta +TESTS+= depsrc-nometa +TESTS+= depsrc-nometa_cmp +TESTS+= depsrc-nopath +TESTS+= depsrc-notmain +TESTS+= depsrc-optional +TESTS+= depsrc-phony +TESTS+= depsrc-precious +TESTS+= depsrc-recursive +TESTS+= depsrc-silent +TESTS+= depsrc-use +TESTS+= depsrc-usebefore +TESTS+= depsrc-usebefore-double-colon +TESTS+= depsrc-wait +TESTS+= deptgt +TESTS+= deptgt-begin +TESTS+= deptgt-begin-fail +TESTS+= deptgt-begin-fail-indirect +TESTS+= deptgt-default +TESTS+= deptgt-delete_on_error +TESTS+= deptgt-end +TESTS+= deptgt-end-fail +TESTS+= deptgt-end-fail-all +TESTS+= deptgt-end-fail-indirect +TESTS+= deptgt-end-jobs +TESTS+= deptgt-error +TESTS+= deptgt-ignore +TESTS+= deptgt-interrupt +TESTS+= deptgt-main +TESTS+= deptgt-makeflags +TESTS+= deptgt-no_parallel +TESTS+= deptgt-nopath +TESTS+= deptgt-notparallel +TESTS+= deptgt-objdir +TESTS+= deptgt-order +TESTS+= deptgt-path +TESTS+= deptgt-path-suffix +TESTS+= deptgt-phony +TESTS+= deptgt-posix +TESTS+= deptgt-precious +TESTS+= deptgt-shell +TESTS+= deptgt-silent +TESTS+= deptgt-silent-jobs +TESTS+= deptgt-stale +TESTS+= deptgt-suffixes +TESTS+= dir +TESTS+= dir-expand-path +TESTS+= directive +TESTS+= directive-dinclude +TESTS+= directive-elif +TESTS+= directive-elifdef +TESTS+= directive-elifmake +TESTS+= directive-elifndef +TESTS+= directive-elifnmake +TESTS+= directive-else +TESTS+= directive-endfor +TESTS+= directive-endif +TESTS+= directive-error +TESTS+= directive-export +TESTS+= directive-export-env +TESTS+= directive-export-impl +TESTS+= directive-export-gmake +TESTS+= directive-export-literal +TESTS+= directive-for +TESTS+= directive-for-break +TESTS+= directive-for-empty +TESTS+= directive-for-errors +TESTS+= directive-for-escape +TESTS+= directive-for-generating-endif +TESTS+= directive-for-if +TESTS+= directive-for-lines +TESTS+= directive-for-null +TESTS+= directive-hyphen-include +TESTS+= directive-if +TESTS+= directive-if-nested +TESTS+= directive-ifdef +TESTS+= directive-ifmake +TESTS+= directive-ifndef +TESTS+= directive-ifnmake +TESTS+= directive-include +TESTS+= directive-include-fatal +TESTS+= directive-include-guard +TESTS+= directive-info +TESTS+= directive-misspellings +TESTS+= directive-sinclude +TESTS+= directive-undef +TESTS+= directive-unexport +TESTS+= directive-unexport-env +TESTS+= directive-warning +TESTS+= dollar +TESTS+= doterror +TESTS+= dotwait +TESTS+= error +TESTS+= # escape # broken by reverting POSIX changes +TESTS+= export +TESTS+= export-all +TESTS+= export-env +TESTS+= export-variants +TESTS+= gnode-submake +TESTS+= hanoi-include +TESTS+= impsrc +TESTS+= include-main +TESTS+= job-flags +#TESTS+= job-output-long-lines +TESTS+= job-output-null +TESTS+= jobs-empty-commands +TESTS+= jobs-empty-commands-error +TESTS+= jobs-error-indirect +TESTS+= jobs-error-nested +TESTS+= jobs-error-nested-make +TESTS+= lint +TESTS+= make-exported +TESTS+= meta-cmd-cmp +TESTS+= moderrs +TESTS+= modmisc +.if ${.MAKE.UID} > 0 +TESTS+= objdir-writable +.endif +TESTS+= opt +TESTS+= opt-backwards +TESTS+= opt-chdir +TESTS+= opt-debug +TESTS+= opt-debug-all +TESTS+= opt-debug-archive +TESTS+= opt-debug-curdir +TESTS+= opt-debug-cond +TESTS+= opt-debug-dir +TESTS+= opt-debug-errors +TESTS+= opt-debug-errors-jobs +TESTS+= opt-debug-file +TESTS+= opt-debug-for +TESTS+= opt-debug-graph1 +TESTS+= opt-debug-graph2 +TESTS+= opt-debug-graph3 +TESTS+= opt-debug-hash +#TESTS+= opt-debug-jobs +TESTS+= opt-debug-lint +TESTS+= opt-debug-loud +TESTS+= opt-debug-meta +TESTS+= opt-debug-making +TESTS+= opt-debug-no-rm +TESTS+= opt-debug-parse +TESTS+= opt-debug-suff +TESTS+= opt-debug-targets +TESTS+= opt-debug-varraw +TESTS+= opt-debug-var +TESTS+= opt-debug-x-trace +TESTS+= opt-define +TESTS+= opt-env +TESTS+= opt-file +TESTS+= opt-ignore +TESTS+= opt-include-dir +TESTS+= opt-jobs +TESTS+= opt-jobs-internal +TESTS+= opt-jobs-no-action +TESTS+= opt-keep-going +TESTS+= opt-keep-going-indirect +TESTS+= opt-keep-going-multiple +TESTS+= opt-m-include-dir +TESTS+= opt-no-action +TESTS+= opt-no-action-at-all +TESTS+= opt-no-action-runflags +TESTS+= opt-no-action-touch +TESTS+= opt-query +TESTS+= opt-raw +TESTS+= opt-silent +TESTS+= opt-touch +TESTS+= opt-touch-jobs +TESTS+= opt-tracefile +TESTS+= opt-var-expanded +TESTS+= opt-var-literal +TESTS+= opt-version +TESTS+= opt-warnings-as-errors +TESTS+= opt-where-am-i +TESTS+= opt-x-reduce-exported +TESTS+= order +TESTS+= parse +TESTS+= parse-var +TESTS+= phony-end +TESTS+= posix +TESTS+= # posix1 # broken by reverting POSIX changes +TESTS+= recursive +TESTS+= sh +TESTS+= sh-dots +TESTS+= sh-errctl +TESTS+= sh-flags +TESTS+= sh-jobs +TESTS+= sh-jobs-error +TESTS+= sh-leading-at +TESTS+= sh-leading-hyphen +TESTS+= sh-leading-plus +TESTS+= sh-meta-chars +TESTS+= sh-multi-line +TESTS+= sh-single-line +TESTS+= shell-csh +TESTS+= shell-custom +.if exists(/bin/ksh) +TESTS+= shell-ksh +.endif +TESTS+= shell-sh +TESTS+= suff-add-later +TESTS+= suff-clear-regular +TESTS+= suff-clear-single +TESTS+= suff-incomplete +TESTS+= suff-lookup +TESTS+= suff-main +TESTS+= suff-main-several +TESTS+= suff-phony +TESTS+= suff-rebuild +TESTS+= suff-self +TESTS+= suff-transform-debug +TESTS+= suff-transform-endless +TESTS+= suff-transform-expand +TESTS+= suff-transform-select +TESTS+= suff-use +TESTS+= sunshcmd +TESTS+= ternary +TESTS+= unexport +TESTS+= unexport-env +TESTS+= use-inference +TESTS+= var-readonly +TESTS+= var-scope +TESTS+= var-scope-cmdline +TESTS+= var-scope-env +TESTS+= var-scope-global +TESTS+= var-scope-local +TESTS+= var-scope-local-legacy +TESTS+= var-eval-short +TESTS+= var-op +TESTS+= var-op-append +TESTS+= var-op-assign +TESTS+= var-op-default +TESTS+= var-op-expand +TESTS+= var-op-shell +TESTS+= var-op-sunsh +TESTS+= var-recursive +TESTS+= varcmd +TESTS+= vardebug +TESTS+= varfind +TESTS+= varmisc +TESTS+= varmod +TESTS+= varmod-assign +TESTS+= varmod-assign-shell +TESTS+= varmod-defined +TESTS+= varmod-edge +TESTS+= varmod-exclam-shell +TESTS+= varmod-extension +TESTS+= varmod-gmtime +TESTS+= varmod-hash +TESTS+= varmod-head +TESTS+= varmod-ifelse +TESTS+= varmod-indirect +TESTS+= varmod-l-name-to-value +TESTS+= varmod-localtime +TESTS+= varmod-loop +TESTS+= varmod-loop-delete +TESTS+= varmod-loop-varname +TESTS+= varmod-match +TESTS+= varmod-match-escape +TESTS+= varmod-mtime +TESTS+= varmod-no-match +TESTS+= varmod-order +TESTS+= varmod-order-numeric +TESTS+= varmod-order-reverse +TESTS+= varmod-order-shuffle +TESTS+= varmod-order-string +TESTS+= varmod-path +TESTS+= varmod-quote +TESTS+= varmod-quote-dollar +TESTS+= varmod-range *** 496 LINES SKIPPED *** From nobody Mon Sep 18 09:03:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RpzP462gzz4sq58; Mon, 18 Sep 2023 09:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpzP45Wqzz3NCJ; Mon, 18 Sep 2023 09:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695027832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M599usNpJwhr50n9Xo/gCDqu4vEM1VG9Akj+u2nxOd0=; b=VsaNHFGx8srU3PE5CTtvuacGNWV+oq9BRy1cjFQaHX4gIg2oXoU8Br0dF7iwYQC8t/R6rb ud3AbWWNFUhyMaBDkMa7i+gzUjgnKHDePrnR5XqZiZSGH8nNqtSbA5ETCyF1c/smf2QNPr VY1IBFukJuU4z71pyixVmq/GvuRPuKeDbbLkd9rFv9o+L6/yWspzVybCP+BqComqfMjQKx MR5EC4tHPc+7EgrLYUOta3AbZcD+DNEoZbyW6EP0HUHXVVWdzxAxgP+1joaXAFC4v2nhRH VJWpriLoEd1a9sF8rvEc86UhICMJEw+GU6WDpJn2vH6zs3bxrfcOuURXqs7t0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695027832; a=rsa-sha256; cv=none; b=EncYh3LlDM1GfBjTbYZw/3dMAFGBZr2AsogAvHRkHLo1UUCBbIHeI73YdJJ/rLOybWJdv0 ZFtSDaOgDt2539l8LKlTPnOOTbnyzGIwurOJHX2QvR9FmFkv4PuW4wcY3rfMNt0SB3aiqc KnC5M0K6QlyzkKQgZAcgAjUyTlzVpUXPJmYfllE6+vNGtkYmTGl7p1VntKWxA7U1LVPl3y HxSMExnjRhDOICc+mmMnu7zWXfhbRTr8PaiwiTij8KjPaXZpJ50+yiJnEabD3tpVrwW49S O3pUZvZ8tVeZs9bS4bTDIFBDD03XFqaiEm9d9k2jM7zL/VnsOg43TiMDG2lwpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695027832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M599usNpJwhr50n9Xo/gCDqu4vEM1VG9Akj+u2nxOd0=; b=kNAAzwew+yAEXSRUu1MCl1OkaF+1wEYgFKpFdQFxdLgKZIMUWqIwZsoAw2corHdamUt6b/ LrxcWgMEYHko5hjGqSTOF9jOB1oWm+7AIBo/wRmyNKbdS1mzE0L/EdkuDL1ZrjV8RqLbUS G8pbuRSXy60zyTgGQvUJT9HiVQIkDXztl7vofE1nOBLZxuyQs1yXZFC3jURY+uUepAemxr LeIut6WBd8+KRmKXMmylHkphAG9zxdHtW2YzSCin2jN6WT8a/DIBE5aR7pIG2v36O0OFfk j9niRl5RkqrE6MfWiBC0FDO+jq29yFTUA65lkHTZZ19PYDI2yJS52K/UUnkDxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpzP44ZDXz9q5; Mon, 18 Sep 2023 09:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38I93qkR064415; Mon, 18 Sep 2023 09:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38I93qrM064412; Mon, 18 Sep 2023 09:03:52 GMT (envelope-from git) Date: Mon, 18 Sep 2023 09:03:52 GMT Message-Id: <202309180903.38I93qrM064412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b15f6400376a - main - swapon.2: correct FreeBSD release that introduced swapoff List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b15f6400376a90d3b00aa3ac00666f683f975376 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b15f6400376a90d3b00aa3ac00666f683f975376 commit b15f6400376a90d3b00aa3ac00666f683f975376 Author: Ed Maste AuthorDate: 2023-09-18 09:01:38 +0000 Commit: Ed Maste CommitDate: 2023-09-18 09:01:38 +0000 swapon.2: correct FreeBSD release that introduced swapoff It was introduced in 92da00bb245b, after 5.0 and beforen 5.1. Reported in https://github.com/ziglang/zig/issues/16590. --- lib/libc/sys/swapon.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2 index 1a64d39f3029..c0c12d9dde68 100644 --- a/lib/libc/sys/swapon.2 +++ b/lib/libc/sys/swapon.2 @@ -158,4 +158,4 @@ system call appeared in The .Fn swapoff system call appeared in -.Fx 5.0 . +.Fx 5.1 . From nobody Mon Sep 18 09:50:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq0QY3lSYz4stnn; Mon, 18 Sep 2023 09:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq0QY2Bb1z3STV; Mon, 18 Sep 2023 09:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695030613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUn8Oo19Kr68+7GB8qdzvRQPK7hLDNAQpCKSB3V8FR8=; b=RJ/p37JYVNZRrcPVMbVpQePjOOlJ2L5QBhuuNeWurApqyWXV5tQWtjapUpei/MvaTJDLi/ smosAnsPilXoWXTxSb43Pcy2YiFxmFhRx/9cxZodpTxHiMzavQxxXI3FZLq7Sy4vAdBmWB Z12PHO1Uf7JEV4HNYFqG55kUYEMcicv3Dp3l73yGm0idzEGz7KIiKb3dDDRjQqbaH+uJS/ tO97Tw2OUAXsFIWjYmWocmgu/rj7rbloJhj7XqcucJKyTYPyaU9H8W+ZYFK+nw+Gij0wla 9FYwUK8UlCYxLA4FwNNnb6CuMaf2xPlN3ouAVhwthxvVDltSXAM98HqoSDXgGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695030613; a=rsa-sha256; cv=none; b=kWVtGgDjFzRrhWLYqLi9Z/wAnLRoQ4YszJx6xZMOG9Ldey+xBSE+FbNm3lq+9gRNB8MERi YOu3UTLjD8o02VnDjt0FMq8Cxthl7tzaF+yW2ThsctuEB/ZpxaNABWV1PneCzeSd9CqLaS Od0hLW8Bs7NyMtkko1yMwH49mG3SoLd5r8jk6L4hTnlNo0v8O4kbrbKlT7K6qdnuXmQ/e9 tfwnZDvo7/TgWstNlzKy+7ukqeyDfc2ZrOvmiN44mOasWPLCWVfiXzmloDg6wg8Y4bRcjF VJWbnWzYDmBQlVPpc9l3/NI8cDS0cWjqUvwD8xhc6a6PXUtiWZF7GCsIqygJJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695030613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PUn8Oo19Kr68+7GB8qdzvRQPK7hLDNAQpCKSB3V8FR8=; b=lX7Tu8oNYljl+5VrP2C2YDccxacGAL2rnn1QOt2xV0LTq9Qgk+foaY8mJGnIMUVcPZUYNU IKvKOLutA82Q92MmXVCX7h7n6bythiEijBjrb/hA0wjO9LcjiLESPxYrQVB402pHnLCsav 5+PxuMbfzyykw9U0dneec+vMQLMlN8GhEiST6hMO5LJRFXXjynoUl0NeMSo0BkRvcpMMhQ JLlv/JPM15HcuQ8a0G8rw5u928XNxSrs/YYMbqyoBBrMww12x0hW74wGU2chEwNkxWky5u /lfVqoRVmRVduJzlE8AmWhQ9Bu7Y7VJ77vJwzC6NpQoD8+qmvCzzN/9ETzlkUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq0QY1JgVzB8h; Mon, 18 Sep 2023 09:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38I9oDq3036515; Mon, 18 Sep 2023 09:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38I9oDec036502; Mon, 18 Sep 2023 09:50:13 GMT (envelope-from git) Date: Mon, 18 Sep 2023 09:50:13 GMT Message-Id: <202309180950.38I9oDec036502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8ee97b1928e7 - main - freebsd-update: do not restart sshd when updating jail/basedir List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ee97b1928e75f7f81a870ffb063010778e0a129 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee97b1928e75f7f81a870ffb063010778e0a129 commit 8ee97b1928e75f7f81a870ffb063010778e0a129 Author: Ed Maste AuthorDate: 2023-09-16 20:46:16 +0000 Commit: Ed Maste CommitDate: 2023-09-18 09:47:01 +0000 freebsd-update: do not restart sshd when updating jail/basedir In 6cd1bc531609 for PR 263489 I changed freebsd-update to restart sshd after upgrade, to avoid an upgrade-related incompatibility that made it impossible to login. This is intended to avoid losing access to remote hosts, and ought not apply to upgrading jails (from outside). PR: 263489, 272282 Reported by: otis Reviewed by: otis, kevans MFC after: 3 days Sponsored by: The FreeBSD Foundation Fixes: 6cd1bc531609 ("freebsd-update: restart sshd after upgrade") Differential Revision: https://reviews.freebsd.org/D41890 --- usr.sbin/freebsd-update/freebsd-update.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 57023557839b..9cdff05c24e4 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3036,9 +3036,10 @@ Kernel updates have been installed. Please reboot and run install_from_index INDEX-NEW || return 1 install_delete INDEX-OLD INDEX-NEW || return 1 - # Restart sshd if running (PR263489). Note that this does not - # affect child sshd processes handling existing sessions. - if service sshd status >/dev/null 2>/dev/null; then + # Restart host sshd if running (PR263489). Note that this does + # not affect child sshd processes handling existing sessions. + if [ "$BASEDIR" = / ] && \ + service sshd status >/dev/null 2>/dev/null; then echo echo "Restarting sshd after upgrade" service sshd restart From nobody Mon Sep 18 10:05:08 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq0ln1V29z4svgC; Mon, 18 Sep 2023 10:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq0ln0pZPz3TVp; Mon, 18 Sep 2023 10:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695031509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a7P+V9r/boXCKlhpFfpEAGISj/uQNHLuXyEJTWJhDHc=; b=KM5pRpSh4+cSetodpi121nT/qppAtRFuz93eXisi/gvVXawLi1M9Gp2fg2bV7wxZp1yU5D 1VaCFZ25bt+79rsboKP7aaU/UKO6E22Ch+McDqg4CX67WOKgzUdj7oMD1g5WKcVjHVRT0T lIXQjKYCAZYR03ZhuM2Irya9b6/Ogc+xdesZuAfixUlVy2VR0XHSHy9sxSbGEeF+wzvOJF M61I8tPO/HwlzqnloCRuBwMMglkn6kPIQq1DOCV4j88zTKNqt+MIP97lz0XwXSQJHE3FbQ 5XXUh8InWuX7mfuNyb5hnEstyW/cVhnuQCfHGw0U1S2u7EpVvycY3EgWgFxVOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695031509; a=rsa-sha256; cv=none; b=r9wMwHR8FC70tSY+zjnmwre8fWIB7u/wicgT9r6oYkMUWangrx4DhTTGVFxeXrJiG4FyIt wORCAPyjihS/sbRTexZ+D+777vpIO7ENV1N+LjdM5s8FdtmWPofWyLtPKDdCRW1DLAsZiQ 0rfqA7c2xdmHNOnEd8X7dybZhxd15uCol3UXZPOx6M+VRq5MUQUGrVqOOzqjct5gE6tOv5 A3JfYa071x3bZu84balDThplzMQ8TaN+Y/LDZC0R+oULtEZ9gDtQrtckl1PA9DToEDEUcw FlUc49MbMuol6UobFUOeB5HqXM18e1u/yCbHqTqwzAE1PJuZxBkU05LbmQJVfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695031509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a7P+V9r/boXCKlhpFfpEAGISj/uQNHLuXyEJTWJhDHc=; b=BkgFXkCT70p1BF3D3sp6J9kBaq5lXxMOPUyQey51xqZ5LoXLiwZDw3+bMBKQ2ysXpnUWRg 75dMU0SYNRz/TebABXiy+m8uon5SuikS0WfG0v1iMCKRFEfmzg4v2ckDSUHTBoi8YSdaMm Sd/IxNft2VEAL46fkkXy2eozPWFhnriTsKeSYOwXkUrH5gaPKHze6dpgOP5/cPljVDEUG+ 1ftLQvvvZhWZwgr69btjjdEA0D/mOQKZZ/UNMmey2cjLWyEc0sz+q/tOGtVM8CSHliWo61 vYSi7QMw0rLJold/lcy8ECtznwDe2sYaWddzv1loV12N4LiTH+ZFSGqCqn5K/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq0lm6rHxzBx1; Mon, 18 Sep 2023 10:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IA587v063927; Mon, 18 Sep 2023 10:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IA58fL063924; Mon, 18 Sep 2023 10:05:08 GMT (envelope-from git) Date: Mon, 18 Sep 2023 10:05:08 GMT Message-Id: <202309181005.38IA58fL063924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 501edb1cc76b - main - Fix typo in RELNOTES (objump -> objdump) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 501edb1cc76bcdefa1032ea5f28655b115bb2560 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=501edb1cc76bcdefa1032ea5f28655b115bb2560 commit 501edb1cc76bcdefa1032ea5f28655b115bb2560 Author: Kenta Kubo AuthorDate: 2023-09-17 13:55:16 +0000 Commit: Ed Maste CommitDate: 2023-09-18 10:04:21 +0000 Fix typo in RELNOTES (objump -> objdump) Pull Request: https://github.com/freebsd/freebsd-src/pull/847 --- RELNOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index f3d717525929..c5686a4f30fb 100644 --- a/RELNOTES +++ b/RELNOTES @@ -128,7 +128,7 @@ d198b8774d2c: swap. See growfs(7). 86edb11e7491: - llvm-objump is now always installed as objdump. + llvm-objdump is now always installed as objdump. 616f32ea6da7: mta_start_script along with othermta rc.d script has been retired. From nobody Mon Sep 18 11:38:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq2pz3xYFz4t3Rr; Mon, 18 Sep 2023 11:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq2pz3RbLz4F28; Mon, 18 Sep 2023 11:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695037083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cgy70eLtuYIRfMDKSpoCBljoJoSKUklphy0QSy0Y1kU=; b=p6FIPka3hSaMGrxBly1W2Mj4MnxL96TIRKGPr8LO0vSDF75l3DBAZp7hN/9Ma2jx6aN8CT 8O6pXX4ABsdGQ9xhugzxhsRT2OIbAD1SGNp1wmzlMFt9v+DIVa4RDw/CTrLp0DdtXH/LGi uPF/pv7N0ncKOiuPLRuiw7dL4ufxDa/uaiaGkvOm8dq18Dh86NDUBqxV3unb7Ow/phdTZ5 J+4O252leQ22OiHidBewo6an9k06ka2Dep/CAEtw4V70MGf4kwoC6nh64LgoS3okGJu8XE IQINREOeoK9J7bCUIAYbq3wIWtiEiNq7OmGqQngKKnvxOI5ZOf7HOxBoOxZNCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695037083; a=rsa-sha256; cv=none; b=a4WFQ96DK1rluY68PXOsLP47XobuBdcamV8AHoBNEIwObN/2Xiw4dmGtq2wBS25UJhBxPV U1htVX0bRyQf2uRBRUKh8gghHmF47ghELQk7y33JzTkDV5Ga0lcRl1nXmUOKGMp0OeiMFs mVFkphliWuesg2XASLLAIBpy7hfKQ7YHrj0Ktl9I9J8y/0G43LYNQvCiKX7HVIfaU9h10B dr2ZYSLfZ+2TX5TLcOMiFFRzwMqiHAU4Uop0os8pFaYBNyow9O4e8UBxC9Ywhg1YJv0KMf 6vignfcsZWviJiVnqBjOHXfwKHj/TLbHaBIw9bhZ/Ybdgly8UZ9wznZpHPHvAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695037083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cgy70eLtuYIRfMDKSpoCBljoJoSKUklphy0QSy0Y1kU=; b=ZxCvNnVrMTpe65sBgQRSkZ3aJdNklU+cU2R3nlnkgKXiXpZmnSnRWPrEHiKaQKnJcH1i0Y 3nWUIQcq6bZkC6YF7vb8GUrrz6POn1oT/vpcwwI6V416ZpUKFsMrOlHE6d97SrZ81VqCsc SsWxDwZodvotlPz5FOhcUeqi/cf+bxxRygnvoQNa2LmGuYNuwUPVQK1I8CT7svnN81nCSl Se11JyEi7pcH4Wwga+lf7mZmLhap70KFKNNS6uA5pZ/dAQty6h5CbOC75aP9gzqokL9hTm A8eCXkHbudAKFBU5c/zaAg9EPnuWpLmHblf0sV73noEHWdIntUIRPB0yTHyyoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq2pz2TsPzVG8; Mon, 18 Sep 2023 11:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IBc3Pb013373; Mon, 18 Sep 2023 11:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IBc35B013370; Mon, 18 Sep 2023 11:38:03 GMT (envelope-from git) Date: Mon, 18 Sep 2023 11:38:03 GMT Message-Id: <202309181138.38IBc35B013370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 8dc9b10e388d - main - save-entropy: Add manual page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8dc9b10e388da19d63b3dd718a8243e8e969091d Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc9b10e388da19d63b3dd718a8243e8e969091d commit 8dc9b10e388da19d63b3dd718a8243e8e969091d Author: Fernando Apesteguía AuthorDate: 2023-09-07 08:28:43 +0000 Commit: Fernando Apesteguía CommitDate: 2023-09-18 11:33:59 +0000 save-entropy: Add manual page Succinct manual page for save-entropy(8). PR: 223998 Reported by: AJ Jordan Reviewed by: carlavilla@, delphij@, lwhsu@, pauamma_gundo.com Approved by: delphi, lwhsu (src) Differential Revision: https://reviews.freebsd.org/D41768 --- libexec/save-entropy/Makefile | 1 + libexec/save-entropy/save-entropy.8 | 97 +++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile index 1c7eabf36c7f..0c541606411f 100644 --- a/libexec/save-entropy/Makefile +++ b/libexec/save-entropy/Makefile @@ -1,4 +1,5 @@ SCRIPTS= save-entropy.sh +MAN= save-entropy.8 .include diff --git a/libexec/save-entropy/save-entropy.8 b/libexec/save-entropy/save-entropy.8 new file mode 100644 index 000000000000..f7a93c8866fc --- /dev/null +++ b/libexec/save-entropy/save-entropy.8 @@ -0,0 +1,97 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Fernando Apesteguia +.\" +.\" 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. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS 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 AUTHOR OR 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. +.\" +.Dd September 18, 2023 +.Dt SAVE-ENTROPY 8 +.Os +.Sh NAME +.Nm save-entropy +.Nd Save bits of entropy to feed /dev/random at startup +.Sh SYNOPSIS +.Nm save-entropy +.Sh DESCRIPTION +The +.Nm +command is used to save entropy data from +.Pa /dev/random +to files in a specified output location. +The files saved are used at startup to provide additional entropy for +.Pa /dev/random . +The output file will be different in every invocation until the maximum number +of different files is reached. +(See +.Em entropy_save_num +for details). +By default this script is invoked via +.Xr cron 8 +every eleven minutes approximately. +.Pp +This command does nothing if executed inside a +.Xr jail 8 . +.Pp +Three variables in +.Pa /etc/rc.conf +regulate the behavior of the script: +.Bl -tag -width Ds +.It Va entropy_dir +Specify the directory for saved entropy files. +Defaults to +.Pa /var/db/entropy . +If set to "NO" it disables caching entropy via +.Xr cron 8 . +This setting is shared with +.Pa /etc/rc.d/random . +.It Va entropy_save_sz +Size of the entropy cache files. +Defaults to 4096. +.It Va entropy_save_num +Number of entropy cache files to save. +Defaults to 8. +.El +.Sh FILES +.Bl -tag -width Ds +.It Pa /etc/rc.conf +.El +.Sh EXIT STATUS +.Ex -std +Errors will be recorded in the system log. +.Sh SEE ALSO +.Xr syslog 3 , +.Xr random 4 , +.Xr rc.conf 5 , +.Xr cron 8 +.Sh HISTORY +The +.Nm +command first appeared in +.Fx 5.0 . +.Sh AUTHORS +The +.Nm +command was originally written by +.An Doug Barton . +This manual page was written by +.An Fernando Apesteguia . From nobody Mon Sep 18 13:23:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq58r6JDLz4tC6R; Mon, 18 Sep 2023 13:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq58r646Qz4QLv; Mon, 18 Sep 2023 13:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ORCokQ/rZVjfa21WvPmFcg2c10bxdamA3flXKWeyARM=; b=yiU/28KbERhrhlR15MdFTEbraaNMBcNZI4CA1fe0/1kRJNAKaHm8EyYeoeO8bQiGvUIziw hOMz9yq/ClIDLXZiScamRHah0gW1figYaaLyxuZY5DFiQ+wrQX/Yq8ivF1EU2KaXJur6JL Xq8yDeCSS14njvRUjwqTdzPou13Wa8MT5fkVLMUNk88RoFHPsBmdc4TKDTn+6Neu9sCev+ lnQO7/Tdnv32qwy38FQ31o32gQBBkRqWDnN0SrCod7TpHPLJ6/xWgeHLuMvsyu7Wftss5K Bs9roAlwik5JEbTufIMHl6rX/US7j0o0z74pS4QWmlOICfhkj0nLYgPmmKkXnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043420; a=rsa-sha256; cv=none; b=A1kMUMaDc5V9z6NQYQvU2sG90ycuxXgE35xx2zI7qwoH+uO9enPJa+9HIpyf8IfpLzgN2T toN8ehFrvIKh7cf1oMu9hL2QqOMcqbkHbcGZ++4/u8RXFqC34vIW+T9gS+ELAoAuXK3YWy T6/H13CMth/stUr9tN23DQSuWYSO0SLuuyTzoCU5mfdVJDJwEuHnAphGzYiec7GaWtOaGB 2QFgVPQkqv5gmTV9sC1HlyXfjiguoO/KyERjItT/SQGrojb+qXpXrs4IOQQ/hVPY3UvIta ZnGvp78l47nRn0Z3p3x2hHzCZliCrGxlBthM+v2N6aKfwoxIKszEVppmFrFwQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ORCokQ/rZVjfa21WvPmFcg2c10bxdamA3flXKWeyARM=; b=yRF1/n4fSgVMwyGGqIsg/t71Q/yYrAAl5nZv4cIO+OgCm4XS0BMZiRmNH6iKJhL5I99VpZ 9UJzb/XtiWya5OkRPwZhDhoe9mLI6GmgXy2Ex9/AEwo3Jh4+B6jSpnUNqiLHnYk3xpkjP/ pySXZo7nC7tByQbPVydgscFFQgespacMy4QeLxMoU3tkAarCBJP/rj9b+XqjX25mWP/FHb uqJ/JkQ+HcKJxrI9HofmQhMupQBLNhxdK4W8aMgHyVXD+LVHc0cyRpIZadzQnWgr1q+uHY bAaHZGfRq/ZVMjgLOrbKc4WiLTDH+QLExVfcLmkZ8FJ+T1Cv7f+GwVqrg7cfmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq58r4yDnzY8f; Mon, 18 Sep 2023 13:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDNexY096637; Mon, 18 Sep 2023 13:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDNeNu096634; Mon, 18 Sep 2023 13:23:40 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:23:40 GMT Message-Id: <202309181323.38IDNeNu096634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9e88711f28dc - main - arm64: zynqmp: Add firmware driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e88711f28dc9afa7d68ae8dd027d2399a2a290b Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9e88711f28dc9afa7d68ae8dd027d2399a2a290b commit 9e88711f28dc9afa7d68ae8dd027d2399a2a290b Author: Emmanuel Vadot AuthorDate: 2023-09-07 07:56:45 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:26 +0000 arm64: zynqmp: Add firmware driver The ZynqMP SoC have a MCU running a firmware to control clocks, resets, fpga loading etc ... Add a driver that can be use to communicate with it. For now only the clock and reset part are implemented. Differential Revision: https://reviews.freebsd.org/D41811 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/conf/files.arm64 | 2 + sys/dev/firmware/xilinx/pm_defs.h | 380 ++++++++++++++++++++ sys/dev/firmware/xilinx/zynqmp_firmware.c | 511 +++++++++++++++++++++++++++ sys/dev/firmware/xilinx/zynqmp_firmware_if.m | 109 ++++++ 4 files changed, 1002 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 02dcadc0aa5c..987a1ea6cd09 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -698,3 +698,5 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt +dev/firmware/xilinx/zynqmp_firmware.c optional fdt soc_xilinx_zynq +dev/firmware/xilinx/zynqmp_firmware_if.m optional fdt soc_xilinx_zynq diff --git a/sys/dev/firmware/xilinx/pm_defs.h b/sys/dev/firmware/xilinx/pm_defs.h new file mode 100644 index 000000000000..3461dd7820ad --- /dev/null +++ b/sys/dev/firmware/xilinx/pm_defs.h @@ -0,0 +1,380 @@ +/* + * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* ZynqMP power management enums and defines */ + +#ifndef PM_DEFS_H +#define PM_DEFS_H + +/********************************************************************* + * Macro definitions + ********************************************************************/ + +/* + * Version number is a 32bit value, like: + * (PM_VERSION_MAJOR << 16) | PM_VERSION_MINOR + */ +#define PM_VERSION_MAJOR 1U +#define PM_VERSION_MINOR 1U + +#define PM_VERSION ((PM_VERSION_MAJOR << 16U) | PM_VERSION_MINOR) + +/** + * PM API versions + */ +/* Expected version of firmware APIs */ +#define FW_API_BASE_VERSION (1U) +/* Expected version of firmware API for feature check */ +#define FW_API_VERSION_2 (2U) +/* Version of APIs implemented in ATF */ +#define ATF_API_BASE_VERSION (1U) + +/* Capabilities for RAM */ +#define PM_CAP_ACCESS 0x1U +#define PM_CAP_CONTEXT 0x2U + +#define MAX_LATENCY (~0U) +#define MAX_QOS 100U + +/* State arguments of the self suspend */ +#define PM_STATE_CPU_IDLE 0x0U +#define PM_STATE_SUSPEND_TO_RAM 0xFU + +/* APU processor states */ +#define PM_PROC_STATE_FORCEDOFF 0U +#define PM_PROC_STATE_ACTIVE 1U +#define PM_PROC_STATE_SLEEP 2U +#define PM_PROC_STATE_SUSPENDING 3U + +#define EM_FUNID_NUM_MASK 0xF0000U + +#define PM_GET_CALLBACK_DATA 0xa01 +#define PM_SET_SUSPEND_MODE 0xa02 +#define PM_GET_TRUSTZONE_VERSION 0xa03 + +/********************************************************************* + * Enum definitions + ********************************************************************/ + +enum pm_api_id { + /* Miscellaneous API functions: */ + PM_GET_API_VERSION = 1, /* Do not change or move */ + PM_SET_CONFIGURATION, + PM_GET_NODE_STATUS, + PM_GET_OP_CHARACTERISTIC, + PM_REGISTER_NOTIFIER, + /* API for suspending of PUs: */ + PM_REQ_SUSPEND, + PM_SELF_SUSPEND, + PM_FORCE_POWERDOWN, + PM_ABORT_SUSPEND, + PM_REQ_WAKEUP, + PM_SET_WAKEUP_SOURCE, + PM_SYSTEM_SHUTDOWN, + /* API for managing PM slaves: */ + PM_REQ_NODE, + PM_RELEASE_NODE, + PM_SET_REQUIREMENT, + PM_SET_MAX_LATENCY, + /* Direct control API functions: */ + PM_RESET_ASSERT, + PM_RESET_GET_STATUS, + PM_MMIO_WRITE, + PM_MMIO_READ, + PM_INIT_FINALIZE, + PM_FPGA_LOAD, + PM_FPGA_GET_STATUS, + PM_GET_CHIPID, + PM_SECURE_RSA_AES, + PM_SECURE_SHA, + PM_SECURE_RSA, + PM_PINCTRL_REQUEST, + PM_PINCTRL_RELEASE, + PM_PINCTRL_GET_FUNCTION, + PM_PINCTRL_SET_FUNCTION, + PM_PINCTRL_CONFIG_PARAM_GET, + PM_PINCTRL_CONFIG_PARAM_SET, + PM_IOCTL, + /* API to query information from firmware */ + PM_QUERY_DATA, + /* Clock control API functions */ + PM_CLOCK_ENABLE, + PM_CLOCK_DISABLE, + PM_CLOCK_GETSTATE, + PM_CLOCK_SETDIVIDER, + PM_CLOCK_GETDIVIDER, + PM_CLOCK_SETRATE, + PM_CLOCK_GETRATE, + PM_CLOCK_SETPARENT, + PM_CLOCK_GETPARENT, + PM_SECURE_IMAGE, + /* FPGA PL Readback */ + PM_FPGA_READ, + PM_SECURE_AES, + /* PLL control API functions */ + PM_PLL_SET_PARAMETER, + PM_PLL_GET_PARAMETER, + PM_PLL_SET_MODE, + PM_PLL_GET_MODE, + /* PM Register Access API */ + PM_REGISTER_ACCESS, + PM_EFUSE_ACCESS, + PM_FPGA_GET_VERSION, + PM_FPGA_GET_FEATURE_LIST, + PM_FEATURE_CHECK = 63, + PM_API_MAX +}; + +enum pm_query_id { + PM_QID_INVALID = 0, + PM_QID_CLOCK_GET_NAME, + PM_QID_CLOCK_GET_TOPOLOGY, + PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS, + PM_QID_CLOCK_GET_PARENTS, + PM_QID_CLOCK_GET_ATTRIBUTES, + PM_QID_PINCTRL_GET_NUM_PINS, + PM_QID_PINCTRL_GET_NUM_FUNCTIONS, + PM_QID_PINCTRL_GET_NUM_FUNCTION_GROUPS, + PM_QID_PINCTRL_GET_FUNCTION_NAME, + PM_QID_PINCTRL_GET_FUNCTION_GROUPS, + PM_QID_PINCTRL_GET_PIN_GROUPS, + PM_QID_CLOCK_GET_NUM_CLOCKS, + PM_QID_CLOCK_GET_MAX_DIVISOR, +}; + +enum pm_node_id { + NODE_UNKNOWN = 0, + NODE_APU, + NODE_APU_0, + NODE_APU_1, + NODE_APU_2, + NODE_APU_3, + NODE_RPU, + NODE_RPU_0, + NODE_RPU_1, + NODE_PLD, + NODE_FPD, + NODE_OCM_BANK_0, + NODE_OCM_BANK_1, + NODE_OCM_BANK_2, + NODE_OCM_BANK_3, + NODE_TCM_0_A, + NODE_TCM_0_B, + NODE_TCM_1_A, + NODE_TCM_1_B, + NODE_L2, + NODE_GPU_PP_0, + NODE_GPU_PP_1, + NODE_USB_0, + NODE_USB_1, + NODE_TTC_0, + NODE_TTC_1, + NODE_TTC_2, + NODE_TTC_3, + NODE_SATA, + NODE_ETH_0, + NODE_ETH_1, + NODE_ETH_2, + NODE_ETH_3, + NODE_UART_0, + NODE_UART_1, + NODE_SPI_0, + NODE_SPI_1, + NODE_I2C_0, + NODE_I2C_1, + NODE_SD_0, + NODE_SD_1, + NODE_DP, + NODE_GDMA, + NODE_ADMA, + NODE_NAND, + NODE_QSPI, + NODE_GPIO, + NODE_CAN_0, + NODE_CAN_1, + NODE_EXTERN, + NODE_APLL, + NODE_VPLL, + NODE_DPLL, + NODE_RPLL, + NODE_IOPLL, + NODE_DDR, + NODE_IPI_APU, + NODE_IPI_RPU_0, + NODE_GPU, + NODE_PCIE, + NODE_PCAP, + NODE_RTC, + NODE_LPD, + NODE_VCU, + NODE_IPI_RPU_1, + NODE_IPI_PL_0, + NODE_IPI_PL_1, + NODE_IPI_PL_2, + NODE_IPI_PL_3, + NODE_PL, + NODE_GEM_TSU, + NODE_SWDT_0, + NODE_SWDT_1, + NODE_CSU, + NODE_PJTAG, + NODE_TRACE, + NODE_TESTSCAN, + NODE_PMU, + NODE_MAX, +}; + +enum pm_request_ack { + REQ_ACK_NO = 1, + REQ_ACK_BLOCKING, + REQ_ACK_NON_BLOCKING, +}; + +enum pm_abort_reason { + ABORT_REASON_WKUP_EVENT = 100, + ABORT_REASON_PU_BUSY, + ABORT_REASON_NO_PWRDN, + ABORT_REASON_UNKNOWN, +}; + +enum pm_suspend_reason { + SUSPEND_REASON_PU_REQ = 201, + SUSPEND_REASON_ALERT, + SUSPEND_REASON_SYS_SHUTDOWN, +}; + +enum pm_ram_state { + PM_RAM_STATE_OFF = 1, + PM_RAM_STATE_RETENTION, + PM_RAM_STATE_ON, +}; + +enum pm_opchar_type { + PM_OPCHAR_TYPE_POWER = 1, + PM_OPCHAR_TYPE_TEMP, + PM_OPCHAR_TYPE_LATENCY, +}; + +/** + * @PM_RET_SUCCESS: success + * @PM_RET_ERROR_ARGS: illegal arguments provided (deprecated) + * @PM_RET_ERROR_NOTSUPPORTED: feature not supported (deprecated) + * @PM_RET_ERROR_NOT_ENABLED: feature is not enabled + * @PM_RET_ERROR_INTERNAL: internal error + * @PM_RET_ERROR_CONFLICT: conflict + * @PM_RET_ERROR_ACCESS: access rights violation + * @PM_RET_ERROR_INVALID_NODE: invalid node + * @PM_RET_ERROR_DOUBLE_REQ: duplicate request for same node + * @PM_RET_ERROR_ABORT_SUSPEND: suspend procedure has been aborted + * @PM_RET_ERROR_TIMEOUT: timeout in communication with PMU + * @PM_RET_ERROR_NODE_USED: node is already in use + */ +enum pm_ret_status { + PM_RET_SUCCESS = (0U), + PM_RET_ERROR_ARGS = (1U), + PM_RET_ERROR_NOTSUPPORTED = (4U), + PM_RET_ERROR_NOT_ENABLED = (29U), + PM_RET_ERROR_INTERNAL = (2000U), + PM_RET_ERROR_CONFLICT = (2001U), + PM_RET_ERROR_ACCESS = (2002U), + PM_RET_ERROR_INVALID_NODE = (2003U), + PM_RET_ERROR_DOUBLE_REQ = (2004U), + PM_RET_ERROR_ABORT_SUSPEND = (2005U), + PM_RET_ERROR_TIMEOUT = (2006U), + PM_RET_ERROR_NODE_USED = (2007U), + PM_RET_ERROR_NO_FEATURE = (2008U) +}; + +/** + * @PM_INITIAL_BOOT: boot is a fresh system startup + * @PM_RESUME: boot is a resume + * @PM_BOOT_ERROR: error, boot cause cannot be identified + */ +enum pm_boot_status { + PM_INITIAL_BOOT, + PM_RESUME, + PM_BOOT_ERROR, +}; + +/** + * @PMF_SHUTDOWN_TYPE_SHUTDOWN: shutdown + * @PMF_SHUTDOWN_TYPE_RESET: reset/reboot + * @PMF_SHUTDOWN_TYPE_SETSCOPE_ONLY: set the shutdown/reboot scope + */ +enum pm_shutdown_type { + PMF_SHUTDOWN_TYPE_SHUTDOWN, + PMF_SHUTDOWN_TYPE_RESET, + PMF_SHUTDOWN_TYPE_SETSCOPE_ONLY, +}; + +/** + * @PMF_SHUTDOWN_SUBTYPE_SUBSYSTEM: shutdown/reboot APU subsystem only + * @PMF_SHUTDOWN_SUBTYPE_PS_ONLY: shutdown/reboot entire PS (but not PL) + * @PMF_SHUTDOWN_SUBTYPE_SYSTEM: shutdown/reboot entire system + */ +enum pm_shutdown_subtype { + PMF_SHUTDOWN_SUBTYPE_SUBSYSTEM, + PMF_SHUTDOWN_SUBTYPE_PS_ONLY, + PMF_SHUTDOWN_SUBTYPE_SYSTEM, +}; + +/** + * @PM_PLL_PARAM_DIV2: Enable for divide by 2 function inside the PLL + * @PM_PLL_PARAM_FBDIV: Feedback divisor integer portion for the PLL + * @PM_PLL_PARAM_DATA: Feedback divisor fractional portion for the PLL + * @PM_PLL_PARAM_PRE_SRC: Clock source for PLL input + * @PM_PLL_PARAM_POST_SRC: Clock source for PLL Bypass mode + * @PM_PLL_PARAM_LOCK_DLY: Lock circuit config settings for lock windowsize + * @PM_PLL_PARAM_LOCK_CNT: Lock circuit counter setting + * @PM_PLL_PARAM_LFHF: PLL loop filter high frequency capacitor control + * @PM_PLL_PARAM_CP: PLL charge pump control + * @PM_PLL_PARAM_RES: PLL loop filter resistor control + */ +enum pm_pll_param { + PM_PLL_PARAM_DIV2, + PM_PLL_PARAM_FBDIV, + PM_PLL_PARAM_DATA, + PM_PLL_PARAM_PRE_SRC, + PM_PLL_PARAM_POST_SRC, + PM_PLL_PARAM_LOCK_DLY, + PM_PLL_PARAM_LOCK_CNT, + PM_PLL_PARAM_LFHF, + PM_PLL_PARAM_CP, + PM_PLL_PARAM_RES, + PM_PLL_PARAM_MAX, +}; + +/** + * @PM_PLL_MODE_RESET: PLL is in reset (not locked) + * @PM_PLL_MODE_INTEGER: PLL is locked in integer mode + * @PM_PLL_MODE_FRACTIONAL: PLL is locked in fractional mode + */ +enum pm_pll_mode { + PM_PLL_MODE_RESET, + PM_PLL_MODE_INTEGER, + PM_PLL_MODE_FRACTIONAL, + PM_PLL_MODE_MAX, +}; + +/** + * @PM_CLOCK_DIV0_ID: Clock divider 0 + * @PM_CLOCK_DIV1_ID: Clock divider 1 + */ +enum pm_clock_div_id { + PM_CLOCK_DIV0_ID, + PM_CLOCK_DIV1_ID, +}; + +/** + * EM API IDs + */ +enum em_api_id { + EM_SET_ACTION = 1, + EM_REMOVE_ACTION, + EM_SEND_ERRORS, +}; + +#endif /* PM_DEFS_H */ diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware.c b/sys/dev/firmware/xilinx/zynqmp_firmware.c new file mode 100644 index 000000000000..8ee6c9a21377 --- /dev/null +++ b/sys/dev/firmware/xilinx/zynqmp_firmware.c @@ -0,0 +1,511 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include + +#include "zynqmp_firmware_if.h" + +enum { + IOCTL_GET_RPU_OPER_MODE = 0, + IOCTL_SET_RPU_OPER_MODE = 1, + IOCTL_RPU_BOOT_ADDR_CONFIG = 2, + IOCTL_TCM_COMB_CONFIG = 3, + IOCTL_SET_TAPDELAY_BYPASS = 4, + IOCTL_SET_SGMII_MODE = 5, + IOCTL_SD_DLL_RESET = 6, + IOCTL_SET_SD_TAPDELAY = 7, + /* Ioctl for clock driver */ + IOCTL_SET_PLL_FRAC_MODE = 8, + IOCTL_GET_PLL_FRAC_MODE = 9, + IOCTL_SET_PLL_FRAC_DATA = 10, + IOCTL_GET_PLL_FRAC_DATA = 11, + IOCTL_WRITE_GGS = 12, + IOCTL_READ_GGS = 13, + IOCTL_WRITE_PGGS = 14, + IOCTL_READ_PGGS = 15, + /* IOCTL for ULPI reset */ + IOCTL_ULPI_RESET = 16, + /* Set healthy bit value */ + IOCTL_SET_BOOT_HEALTH_STATUS = 17, + IOCTL_AFI = 18, + /* Probe counter read/write */ + IOCTL_PROBE_COUNTER_READ = 19, + IOCTL_PROBE_COUNTER_WRITE = 20, + IOCTL_OSPI_MUX_SELECT = 21, + /* IOCTL for USB power request */ + IOCTL_USB_SET_STATE = 22, + /* IOCTL to get last reset reason */ + IOCTL_GET_LAST_RESET_REASON = 23, + /* AI engine NPI ISR clear */ + IOCTL_AIE_ISR_CLEAR = 24, + /* Register SGI to ATF */ + IOCTL_REGISTER_SGI = 25, +}; + +typedef int (*zynqmp_callfn_t)(register_t, register_t, register_t, uint32_t *payload); + +struct zynqmp_firmware_softc { + struct simplebus_softc sc; + device_t dev; + zynqmp_callfn_t callfn; +}; + +/* SMC calling methods */ +#define PM_SIP_SVC 0xC2000000 + +static int +zynqmp_call_smc(uint32_t id, uint32_t a0, uint32_t a1, uint32_t a2, uint32_t a3, uint32_t *payload, bool ignore_error) +{ + struct arm_smccc_res res; + uint64_t args[3]; + + args[0] = id | PM_SIP_SVC; + args[1] = ((uint64_t)a1 << 32) | a0; + args[2] = ((uint64_t)a3 << 32) | a2; + arm_smccc_smc(args[0], args[1], args[2], 0, 0, 0, 0, 0, &res); + if (payload != NULL) { + payload[0] = res.a0 & 0xFFFFFFFF; + payload[1] = res.a0 >> 32; + payload[2] = res.a1 & 0xFFFFFFFF; + payload[3] = res.a1 >> 32; + if (!ignore_error && payload[0] != PM_RET_SUCCESS) { + printf("%s: fail %x\n", __func__, payload[0]); + return (EINVAL); + } + } + return (0); +} + +/* Firmware methods */ +static int +zynqmp_get_api_version(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_API_VERSION, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "API version = %d.%d\n", + payload[1] >> 16, payload[1] & 0xFFFF); +out: + return (rv); +} + +static int +zynqmp_get_chipid(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_CHIPID, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "ID Code = %x Version = %x\n", + payload[1], payload[2]); +out: + return (rv); +} + +static int +zynqmp_get_trustzone_version(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_TRUSTZONE_VERSION, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "Trustzone Version = %x\n", + payload[1]); +out: + return (rv); +} + +/* zynqmp_firmware methods */ +static int +zynqmp_firmware_clock_enable(device_t dev, uint32_t clkid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_ENABLE, clkid, 0, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_disable(device_t dev, uint32_t clkid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_DISABLE, clkid, 0, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getstate(device_t dev, uint32_t clkid, bool *enabled) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETSTATE, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *enabled = payload[1] == 1 ? true : false; + +out: + return (rv); +} + +static int +zynqmp_firmware_clock_setdivider(device_t dev, uint32_t clkid, uint32_t div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_SETDIVIDER, clkid, div, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getdivider(device_t dev, uint32_t clkid, uint32_t *div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETDIVIDER, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *div = payload[1]; + +out: + return (rv); +} + +static int +zynqmp_firmware_clock_setparent(device_t dev, uint32_t clkid, uint32_t parentid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_SETPARENT, clkid, parentid, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getparent(device_t dev, uint32_t clkid, uint32_t *parentid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETPARENT, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *parentid = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_pll_get_mode(device_t dev, uint32_t pllid, uint32_t *mode) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_IOCTL, 0, IOCTL_GET_PLL_FRAC_MODE, pllid, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *mode = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_pll_get_frac_data(device_t dev, uint32_t pllid, uint32_t *data) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_IOCTL, 0, IOCTL_GET_PLL_FRAC_DATA, pllid, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *data = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_clock_get_fixedfactor(device_t dev, uint32_t clkid, uint32_t *mult, uint32_t *div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_QUERY_DATA, PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS, clkid, 0, 0, payload, true); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *mult = payload[1]; + *div = payload[2]; +out: + return (rv); +} + +static int +zynqmp_firmware_query_data(device_t dev, uint32_t qid, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t *data) +{ + struct zynqmp_firmware_softc *sc; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_QUERY_DATA, qid, arg1, arg2, arg3, data, true); + /* + * PM_QID_CLOCK_GET_NAME always success and if the clock name couldn't + * be found the clock name will be all null byte + */ + if (qid == 1) + rv = 0; + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_reset_assert(device_t dev, uint32_t resetid, bool enable) +{ + struct zynqmp_firmware_softc *sc; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_RESET_ASSERT, resetid, enable, 0, 0, NULL, true); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + + return (rv); +} + +static int +zynqmp_firmware_reset_get_status(device_t dev, uint32_t resetid, bool *status) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_RESET_GET_STATUS, resetid, 0, 0, 0, payload, true); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); + } + *status = payload[1]; + + return (rv); +} + +/* Simplebus methods */ +static struct simplebus_devinfo * +zynqmp_firmware_setup_dinfo(device_t dev, phandle_t node, + struct simplebus_devinfo *di) +{ + struct simplebus_softc *sc; + struct simplebus_devinfo *ndi; + + sc = device_get_softc(dev); + if (di == NULL) + ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO); + else + ndi = di; + if (ofw_bus_gen_setup_devinfo(&ndi->obdinfo, node) != 0) { + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + + /* reg resources is from the parent but interrupts is on the node itself */ + resource_list_init(&ndi->rl); + ofw_bus_reg_to_rl(dev, OF_parent(node), sc->acells, sc->scells, &ndi->rl); + ofw_bus_intr_to_rl(dev, node, &ndi->rl, NULL); + + return (ndi); +} + +static device_t +zynqmp_firmware_add_device(device_t dev, phandle_t node, u_int order, + const char *name, int unit, struct simplebus_devinfo *di) +{ + struct simplebus_devinfo *ndi; + device_t cdev; + + if ((ndi = zynqmp_firmware_setup_dinfo(dev, node, di)) == NULL) + return (NULL); + cdev = device_add_child_ordered(dev, order, name, unit); + if (cdev == NULL) { + device_printf(dev, "<%s>: device_add_child failed\n", + ndi->obdinfo.obd_name); + resource_list_free(&ndi->rl); + ofw_bus_gen_destroy_devinfo(&ndi->obdinfo); + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + device_set_ivars(cdev, ndi); + + return(cdev); +} + +static int +zynqmp_firmware_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "xlnx,zynqmp-firmware")) + return (ENXIO); + device_set_desc(dev, "ZynqMP Firmware"); + return (0); +} + +static int +zynqmp_firmware_attach(device_t dev) +{ + struct zynqmp_firmware_softc *sc; + phandle_t node, child; + device_t cdev; + + sc = device_get_softc(dev); + sc->dev = dev; + + if (bootverbose) { + zynqmp_get_api_version(sc); + zynqmp_get_chipid(sc); + zynqmp_get_trustzone_version(sc); + } + + /* Attach children */ + node = ofw_bus_get_node(dev); + for (child = OF_child(node); child != 0; child = OF_peer(child)) { + cdev = zynqmp_firmware_add_device(dev, child, 0, NULL, -1, NULL); + if (cdev != NULL) + device_probe_and_attach(cdev); + } + + return (bus_generic_attach(dev)); +} + +static device_method_t zynqmp_firmware_methods[] = { + /* device_if */ + DEVMETHOD(device_probe, zynqmp_firmware_probe), + DEVMETHOD(device_attach, zynqmp_firmware_attach), + + /* zynqmp_firmware_if */ + DEVMETHOD(zynqmp_firmware_clock_enable, zynqmp_firmware_clock_enable), + DEVMETHOD(zynqmp_firmware_clock_disable, zynqmp_firmware_clock_disable), + DEVMETHOD(zynqmp_firmware_clock_getstate, zynqmp_firmware_clock_getstate), + DEVMETHOD(zynqmp_firmware_clock_setdivider, zynqmp_firmware_clock_setdivider), + DEVMETHOD(zynqmp_firmware_clock_getdivider, zynqmp_firmware_clock_getdivider), + DEVMETHOD(zynqmp_firmware_clock_setparent, zynqmp_firmware_clock_setparent), + DEVMETHOD(zynqmp_firmware_clock_getparent, zynqmp_firmware_clock_getparent), + DEVMETHOD(zynqmp_firmware_pll_get_mode, zynqmp_firmware_pll_get_mode), + DEVMETHOD(zynqmp_firmware_pll_get_frac_data, zynqmp_firmware_pll_get_frac_data), + DEVMETHOD(zynqmp_firmware_clock_get_fixedfactor, zynqmp_firmware_clock_get_fixedfactor), + DEVMETHOD(zynqmp_firmware_query_data, zynqmp_firmware_query_data), + DEVMETHOD(zynqmp_firmware_reset_assert, zynqmp_firmware_reset_assert), + DEVMETHOD(zynqmp_firmware_reset_get_status, zynqmp_firmware_reset_get_status), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_firmware, zynqmp_firmware_driver, zynqmp_firmware_methods, + sizeof(struct zynqmp_firmware_softc), simplebus_driver); + +EARLY_DRIVER_MODULE(zynqmp_firmware, simplebus, zynqmp_firmware_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_LATE); +MODULE_VERSION(zynqmp_firmware, 1); diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m new file mode 100644 index 000000000000..1007d721952d --- /dev/null +++ b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m @@ -0,0 +1,109 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG +# +# 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. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS 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 AUTHOR OR 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. +# +# $FreeBSD$ + +INTERFACE zynqmp_firmware; + +METHOD int clock_enable { + device_t dev; + uint32_t clkid; +}; + +METHOD int clock_disable { + device_t dev; + uint32_t clkid; +}; + +METHOD int clock_getstate { *** 68 LINES SKIPPED *** From nobody Mon Sep 18 13:23:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq58t0wM8z4tC43; Mon, 18 Sep 2023 13:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq58t0Cw5z4Qlj; Mon, 18 Sep 2023 13:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aGF+XGcO9ULG3gTsydklGOJuQQPRdVk89IQkHVdAUps=; b=GiyVlQmHK4yiy3BdpVWHSeOdy6EilUeZU07HUFnYMP6nXpN61Y6P8tydsyEZmrqehMzfsR kb2RK4hcbAc32+8pDjLh/zYirjEFzTHdBMCyc5JVppg7slN960FSq41MnKE6Wzq0TEljB/ CqNSML/lw5Ov9ufUDSxA7eW2dyocODSAwZKqCCqk6Jg1fYhE0QxYe/Z1VzwhAZw+UjVtE7 TEWpiiubTq/o6Sgyf3f3Ata+mKWNEt2JZORoBEwIGenv44UnSKVx9Tk93JWZMqIZiUNBU7 XZVYy70gvokYX2pnfLCv15DluL5RwVv547Qtauv5u0eB2VACyoN1SevZVnkOjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043422; a=rsa-sha256; cv=none; b=xmmi1M3xPGT4xCq3sJMTPpommVhuru/IT+4ZIoamYLImnWUnM8ia9RP3Fc+rmwqIxThJai uUctM3li8Xoq7PMuesk69SW9qp7UHGITcFpT8oH2FfUNx737hNmJ6THxeKIbexoPUwd786 Lw4qWmNKCjaI4+Xvt30PhYWo/oy7ch4C462smBCvz/5lbRL7Iug8/WYleKJnaVQOpQID+O R22LjzUuWfBjAP3Fgfq17kyQOGEFwWYpy5x/Ae4jHNWjQvYxpUaibuUx/OH1m1WQgGmdGe wyTxmUytG0y60Sa9sssMpsZxh3PMun+kJA4Iu7KShvRS99wDPGvngfjMXSnEDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aGF+XGcO9ULG3gTsydklGOJuQQPRdVk89IQkHVdAUps=; b=sDydakBZ5lDPnWYrencgB9BeLtjESpktuyZkabhvJ1318V/Hayc9FRiqtThzhMm64qrMRl kCJiXe6zeHXqWEPMQSPAk3nQUB3g5iybhyQVphLHFcvmAqFzjHZuKm1uqe2uTEefyqTwe1 29z0aOSqjBFO8L+DBQEKGD+Au8jlocVXsJ0Lu4vdbXOUrqI70COhu8SmyQQZPFVgvhih76 8WU33tnx0rudAsuaY+dPzrhHQPhCCqr4I8lKg2TeW6WaQJoiWXAnzQxEKlDU2ysIHPHxKb qcKx1JkWN0tOG1kIn6FfG75kZF6y0makCZweZJ0OfBU8zz7S11UaW3Qu7qPO1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq58s5ljhzYNk; Mon, 18 Sep 2023 13:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDNfiJ096679; Mon, 18 Sep 2023 13:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDNfJ5096676; Mon, 18 Sep 2023 13:23:41 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:23:41 GMT Message-Id: <202309181323.38IDNfJ5096676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4e579ad04772 - main - arm64: zynqmp: Add clock driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e579ad047720775ab580b74192c7de8a3386fea Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4e579ad047720775ab580b74192c7de8a3386fea commit 4e579ad047720775ab580b74192c7de8a3386fea Author: Emmanuel Vadot AuthorDate: 2023-09-07 07:57:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:26 +0000 arm64: zynqmp: Add clock driver Add clock and reset drivers for the ZynqMP SoC. The clocks are discovered by talking to the firmware as the topology isn't fixed on this SoC. Differential Revision: https://reviews.freebsd.org/D41812 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/conf/files.arm64 | 7 + sys/dev/clk/xilinx/zynqmp_clk_div.c | 140 +++++++++ sys/dev/clk/xilinx/zynqmp_clk_div.h | 38 +++ sys/dev/clk/xilinx/zynqmp_clk_fixed.c | 101 ++++++ sys/dev/clk/xilinx/zynqmp_clk_fixed.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_gate.c | 102 ++++++ sys/dev/clk/xilinx/zynqmp_clk_gate.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_mux.c | 89 ++++++ sys/dev/clk/xilinx/zynqmp_clk_mux.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_pll.c | 132 ++++++++ sys/dev/clk/xilinx/zynqmp_clk_pll.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clock.c | 562 ++++++++++++++++++++++++++++++++++ sys/dev/clk/xilinx/zynqmp_reset.c | 253 +++++++++++++++ 13 files changed, 1556 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 987a1ea6cd09..dc78840646bb 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -700,3 +700,10 @@ arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt dev/firmware/xilinx/zynqmp_firmware.c optional fdt soc_xilinx_zynq dev/firmware/xilinx/zynqmp_firmware_if.m optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clock.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_div.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_fixed.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_gate.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_mux.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_pll.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_reset.c optional fdt soc_xilinx_zynq diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c new file mode 100644 index 000000000000..cc6e4d73e92d --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_div.c @@ -0,0 +1,140 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +#define DIV_ROUND_CLOSEST(n, d) (((n) + (d) / 2) / (d)) + +struct zynqmp_clk_div_softc { + device_t firmware; + enum zynqmp_clk_div_type type; + uint32_t id; +}; + +static int +zynqmp_clk_div_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_div_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_div_softc *sc; + uint32_t div; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GETDIVIDER(sc->firmware, sc->id, &div); + if (rv != 0) { + printf("%s: Error while getting divider for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + if (sc->type == CLK_DIV_TYPE_DIV0) + div &= 0xFFFF; + else + div = div >> 16; + *freq = howmany((unsigned long long)*freq, div + 1); + return (0); +} + +static int +zynqmp_clk_div_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + struct zynqmp_clk_div_softc *sc; + uint32_t div; + int rv; + + sc = clknode_get_softc(clk); + + div = DIV_ROUND_CLOSEST(fparent, *fout); + if (sc->type == CLK_DIV_TYPE_DIV0) { + div &= 0xFFFF; + div |= 0xFFFF << 16; + } else { + div <<= 16; + div |= 0xFFFF; + } + + rv = ZYNQMP_FIRMWARE_CLOCK_SETDIVIDER(sc->firmware, sc->id, div); + if (rv != 0) { + printf("%s: Error while setting divider for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + return (rv); +} + +static clknode_method_t zynqmp_clk_div_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_div_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_div_recalc), + CLKNODEMETHOD(clknode_set_freq, zynqmp_clk_div_set_freq), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_div_clknode, zynqmp_clk_div_clknode_class, + zynqmp_clk_div_clknode_methods, sizeof(struct zynqmp_clk_div_softc), clknode_class); + +int +zynqmp_clk_div_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef, enum zynqmp_clk_div_type type) +{ + struct clknode *clk; + struct zynqmp_clk_div_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_div_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + sc->type = type; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.h b/sys/dev/clk/xilinx/zynqmp_clk_div.h new file mode 100644 index 000000000000..f0dc07bf63e6 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_div.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#ifndef _ZYNQMP_CLK_DIV_H_ +#define _ZYNQMP_CLK_DIV_H_ + +enum zynqmp_clk_div_type { + CLK_DIV_TYPE_DIV0 = 0, + CLK_DIV_TYPE_DIV1 +}; + +int zynqmp_clk_div_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef, enum zynqmp_clk_div_type type); + +#endif /* _ZYNQMP_CLK_DIV_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c new file mode 100644 index 000000000000..94de0491acb6 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c @@ -0,0 +1,101 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_fixed_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_fixed_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_fixed_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_fixed_softc *sc; + uint32_t mult, div; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GET_FIXEDFACTOR(sc->firmware, sc->id, &mult, &div); + if (rv != 0) { + printf("%s: Error while getting fixed factor for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + *freq = (*freq * mult) / div; + return (0); +} + +static clknode_method_t zynqmp_clk_fixed_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_fixed_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_fixed_recalc), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_fixed_clknode, zynqmp_clk_fixed_clknode_class, + zynqmp_clk_fixed_clknode_methods, sizeof(struct zynqmp_clk_fixed_softc), clknode_class); + +int +zynqmp_clk_fixed_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_fixed_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_fixed_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.h b/sys/dev/clk/xilinx/zynqmp_clk_fixed.h new file mode 100644 index 000000000000..c014ea7b5457 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#ifndef _ZYNQMP_CLK_FIXED_H_ +#define _ZYNQMP_CLK_FIXED_H_ + +int zynqmp_clk_fixed_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_FIXED_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.c b/sys/dev/clk/xilinx/zynqmp_clk_gate.c new file mode 100644 index 000000000000..180c7db38c09 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.c @@ -0,0 +1,102 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_gate_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_gate_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_set_gate(struct clknode *clk, bool enable) +{ + struct zynqmp_clk_gate_softc *sc; + int rv; + + sc = clknode_get_softc(clk); + if (enable) + rv = ZYNQMP_FIRMWARE_CLOCK_ENABLE(sc->firmware, sc->id); + else + rv = ZYNQMP_FIRMWARE_CLOCK_DISABLE(sc->firmware, sc->id); + if (rv != 0) { + printf("%s: Error %sbling %s\n", + __func__, + enable == true ? "ena" : "disa", + clknode_get_name(clk)); + return (EINVAL); + } + return (0); +} + +static clknode_method_t zynqmp_clk_gate_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_gate_init), + CLKNODEMETHOD(clknode_set_gate, zynqmp_clk_set_gate), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_gate_clknode, zynqmp_clk_gate_clknode_class, + zynqmp_clk_gate_clknode_methods, sizeof(struct zynqmp_clk_gate_softc), clknode_class); + +int +zynqmp_clk_gate_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_gate_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_gate_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.h b/sys/dev/clk/xilinx/zynqmp_clk_gate.h new file mode 100644 index 000000000000..bc6e9f218d41 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#ifndef _ZYNQMP_CLK_GATE_H_ +#define _ZYNQMP_CLK_GATE_H_ + +int zynqmp_clk_gate_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_GATE_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.c b/sys/dev/clk/xilinx/zynqmp_clk_mux.c new file mode 100644 index 000000000000..6826ee5123fe --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.c @@ -0,0 +1,89 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_mux_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_mux_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_mux_set_mux(struct clknode *clk, int idx) +{ + + printf("%s: called for %s\n", __func__, clknode_get_name(clk)); + return (0); +} + +static clknode_method_t zynqmp_clk_mux_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_mux_init), + CLKNODEMETHOD(clknode_set_mux, zynqmp_clk_mux_set_mux), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_mux_clknode, zynqmp_clk_mux_clknode_class, + zynqmp_clk_mux_clknode_methods, sizeof(struct zynqmp_clk_mux_softc), clknode_class); + +int +zynqmp_clk_mux_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_mux_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_mux_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.h b/sys/dev/clk/xilinx/zynqmp_clk_mux.h new file mode 100644 index 000000000000..4768accd2c9e --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#ifndef _ZYNQMP_CLK_MUX_H_ +#define _ZYNQMP_CLK_MUX_H_ + +int zynqmp_clk_mux_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_MUX_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.c b/sys/dev/clk/xilinx/zynqmp_clk_pll.c new file mode 100644 index 000000000000..6e5da9533859 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.c @@ -0,0 +1,132 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_pll_softc { + device_t firmware; + uint32_t id; +}; + +enum pll_mode { + PLL_MODE_INT = 0, + PLL_MODE_FRAC, + PLL_MODE_ERROR, +}; + +static int +zynqmp_clk_pll_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_pll_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_pll_softc *sc; + uint64_t pll_freq, pll_frac; + uint32_t div, mode, frac; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GETDIVIDER(sc->firmware, sc->id, &div); + if (rv != 0) { + printf("%s: Error while getting divider for %s\n", + __func__, + clknode_get_name(clk)); + } + rv = ZYNQMP_FIRMWARE_PLL_GET_MODE(sc->firmware, sc->id, &mode); + if (rv != 0) { + printf("%s: Error while getting mode for %s\n", + __func__, + clknode_get_name(clk)); + } + if (mode == PLL_MODE_ERROR) + return (0); + + pll_freq = *freq * div; + if (mode == PLL_MODE_FRAC) { + ZYNQMP_FIRMWARE_PLL_GET_FRAC_DATA(sc->firmware, sc->id, &frac); + pll_frac = (*freq * frac) / (1 << 16); + pll_freq += pll_frac; + } + + *freq = pll_freq; + return (0); +} + +static int +zynqmp_clk_pll_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + + /* TODO probably at one point */ + return (ENOTSUP); +} + +static clknode_method_t zynqmp_clk_pll_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_pll_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_pll_recalc), + CLKNODEMETHOD(clknode_set_freq, zynqmp_clk_pll_set_freq), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_pll_clknode, zynqmp_clk_pll_clknode_class, + zynqmp_clk_pll_clknode_methods, sizeof(struct zynqmp_clk_pll_softc), clknode_class); + +int +zynqmp_clk_pll_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_pll_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_pll_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.h b/sys/dev/clk/xilinx/zynqmp_clk_pll.h new file mode 100644 index 000000000000..c905efc1755f --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#ifndef _ZYNQMP_CLK_PLL_H_ +#define _ZYNQMP_CLK_PLL_H_ + +int zynqmp_clk_pll_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_PLL_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clock.c b/sys/dev/clk/xilinx/zynqmp_clock.c new file mode 100644 index 000000000000..76f23cec38d0 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clock.c @@ -0,0 +1,562 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS 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 AUTHOR OR 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. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +#define ZYNQMP_MAX_NAME_LEN 16 +#define ZYNQMP_MAX_NODES 6 +#define ZYNQMP_MAX_PARENTS 100 + +#define ZYNQMP_CLK_IS_VALID (1 << 0) +#define ZYNQMP_CLK_IS_EXT (1 << 2) + +#define ZYNQMP_GET_NODE_TYPE(x) (x & 0x7) +#define ZYNQMP_GET_NODE_CLKFLAGS(x) ((x >> 8) & 0xFF) +#define ZYNQMP_GET_NODE_TYPEFLAGS(x) ((x >> 24) & 0xF) + +enum ZYNQMP_NODE_TYPE { + CLK_NODE_TYPE_NULL = 0, + CLK_NODE_TYPE_MUX, + CLK_NODE_TYPE_PLL, + CLK_NODE_TYPE_FIXED, + CLK_NODE_TYPE_DIV0, + CLK_NODE_TYPE_DIV1, + CLK_NODE_TYPE_GATE, +}; + +/* + * Clock IDs in the firmware starts at 0 but + * exported clocks (and so clock exposed by the clock framework) + * starts at 1 + */ +#define ZYNQMP_ID_TO_CLK(x) ((x) + 1) +#define CLK_ID_TO_ZYNQMP(x) ((x) - 1) + +struct zynqmp_clk { + TAILQ_ENTRY(zynqmp_clk) next; + struct clknode_init_def clkdef; + uint32_t id; + uint32_t parentids[ZYNQMP_MAX_PARENTS]; + uint32_t topology[ZYNQMP_MAX_NODES]; + uint32_t attributes; +}; + +struct zynqmp_clock_softc { + device_t dev; + device_t parent; + phandle_t node; + clk_t clk_pss_ref; + clk_t clk_video; + clk_t clk_pss_alt_ref; + clk_t clk_aux_ref; + clk_t clk_gt_crx_ref; + struct clkdom *clkdom; +}; + +struct name_resp { + char name[16]; +}; + +struct zynqmp_clk_softc { + struct zynqmp_clk *clk; + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static clknode_method_t zynqmp_clk_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_init), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_clknode, zynqmp_clk_clknode_class, + zynqmp_clk_clknode_methods, sizeof(struct zynqmp_clk_softc), clknode_class); + +static int +zynqmp_clk_register(struct clkdom *clkdom, device_t fw, struct zynqmp_clk *clkdef) +{ + struct clknode *clknode; *** 683 LINES SKIPPED *** From nobody Mon Sep 18 13:24:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq59V1BLXz4tBqx; Mon, 18 Sep 2023 13:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq59V0j20z4R2s; Mon, 18 Sep 2023 13:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfoC/5JN28RkgZjUEplVOQlhpMNlSSCf+5vMftToS0M=; b=KaLjvNAxg9bFN9OWRAF/BXh1gPSkuaOZb6spfUrSa2nE+DUJ3fOdLXm64NyMIXHLlDUZnG k27bcc6IIvtPalPWfJEpQbo/aXBGFbx4fuhmqTkXjFk0rDrOihgQAg+3YgQhuxzIWhSObS 8QhpgGaoC7t5g6S9ge8X19/HmtCzpRpVrDFIAO1hTtf3215ic4r6RNPj4Mn+wB90MAXU9Z 2zFNlEdAekKDUW8wXQJEQsPH8/kjKmuLc2L5YAgewWGOHgXBHa602o7JgxBr39sAnLNGnO mzds8R5ilsNcZynzb/LfhQzfHuP5LKsHjuF5ej7W6baAAH4q23Ogrd3Cjy3IVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043454; a=rsa-sha256; cv=none; b=QFCqvM6SkanR6Fz++990qIOeETgCHmTPf+lr+x1waJNzWcvPWYgVU8hDbvvZsDOtjbaYj7 oP9542bbOfMlX0HO43w3mPSsVHOHE3TjVTzCJViSJHu3BM5NKWViHcZyCA5Uu545cCYOX8 WPo0OtWsD0gwDvGhxqTXf7j/VLE/6hQAJFOfrvrQCjhJ8w0/lZNnN3JlYqQ1HokU/GiDSn pjOARFJVNNe6WgcMH0vXrR+AAKnsNC1K7Zfbrltm+y3GvwLocmxbc0KRxq7JmQRAw+nh2c jck9ClbcK0YM+lA6/LuMhPtiS56noQouLMjQI9Hx7RUCUdr+zzuQfFEvHkbpkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfoC/5JN28RkgZjUEplVOQlhpMNlSSCf+5vMftToS0M=; b=fusE2jo6uCjTSN6nzk3JWCPzI59/UmGocM7KgXWVHrEgDOV1zJyey2TxRTi4tLqxiftKHE ElwmyM04+BEx2TWcsgcl/6ptPqlKsHN2qk2M7DRzLR7obBQ4x0ciJMGd+uigp9HndNDBk1 nzAjG5bho4XPW9i73TW3pnQvJ8pROXJJ5W8ImSisa/wF6/eO3p8tNkWUOcpRiobA+AMR9Q UQSjeQ/ocEtb/ZK/hLr2hJAfZ+asIR5bIbEKbM6OaEEySIbfGy1EN3DEF0FftUDAUHMMhR kOCfeJse2l7dQEvn1kr5lXIZ42Cv5hZh9LopCdwpCXkBmutXcKf3Zn2zCJjPOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq59T6t4HzXnp; Mon, 18 Sep 2023 13:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOD6O096909; Mon, 18 Sep 2023 13:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDODFk096906; Mon, 18 Sep 2023 13:24:13 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:13 GMT Message-Id: <202309181324.38IDODFk096906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8c7e747491ad - main - sdhci: fdt: Remove sdhci_generic compatible string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c7e747491ad636d6ee4069a74ddb24814870540 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8c7e747491ad636d6ee4069a74ddb24814870540 commit 8c7e747491ad636d6ee4069a74ddb24814870540 Author: Emmanuel Vadot AuthorDate: 2023-09-06 08:59:18 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:48 +0000 sdhci: fdt: Remove sdhci_generic compatible string This was used when we had our own DTS, it's not used anymore. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41807 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/sdhci/sdhci_fdt.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 4a355d6514ad..16748dd4982c 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -70,12 +70,11 @@ #define MAX_SLOTS 6 #define SDHCI_FDT_ARMADA38X 1 -#define SDHCI_FDT_GENERIC 2 -#define SDHCI_FDT_XLNX_ZY7 3 -#define SDHCI_FDT_QUALCOMM 4 -#define SDHCI_FDT_RK3399 5 -#define SDHCI_FDT_RK3568 6 -#define SDHCI_FDT_XLNX_ZMP 7 +#define SDHCI_FDT_XLNX_ZY7 2 +#define SDHCI_FDT_QUALCOMM 3 +#define SDHCI_FDT_RK3399 4 +#define SDHCI_FDT_RK3568 5 +#define SDHCI_FDT_XLNX_ZMP 6 #define RK3399_GRF_EMMCCORE_CON0 0xf000 #define RK3399_CORECFG_BASECLKFREQ 0xff00 @@ -118,7 +117,6 @@ static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, - { "sdhci_generic", SDHCI_FDT_GENERIC }, { "qcom,sdhci-msm-v4", SDHCI_FDT_QUALCOMM }, { "rockchip,rk3399-sdhci-5.1", SDHCI_FDT_RK3399 }, { "xlnx,zy7_sdhci", SDHCI_FDT_XLNX_ZY7 }, @@ -516,9 +514,6 @@ sdhci_fdt_probe(device_t dev) sc->quirks = SDHCI_QUIRK_BROKEN_AUTO_STOP; device_set_desc(dev, "ARMADA38X SDHCI controller"); break; - case SDHCI_FDT_GENERIC: - device_set_desc(dev, "generic fdt SDHCI controller"); - break; case SDHCI_FDT_QUALCOMM: sc->quirks = SDHCI_QUIRK_ALL_SLOTS_NON_REMOVABLE | SDHCI_QUIRK_BROKEN_SDMA_BOUNDARY; From nobody Mon Sep 18 13:24:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq59W2S6Zz4tCFp; Mon, 18 Sep 2023 13:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq59W1glkz4RTr; Mon, 18 Sep 2023 13:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zk3O8l3Xwl+GpezgDx5TyPQ5psJ+0w8sUyhQah+cuYw=; b=LRs60wyPkY8v36hTrB4T6Yt2jRhfyNY4dTJIGwsowDou5FU99i7Po84EjKLcmKMiloALBp qxQzKIbNjgKcigVt/oJ0vkwsa5cws+aHK84x4uQtTrhsti1YfKfZxpkwYgixTUUAlMi86M bS/p3Wa79FKDrS+Q3LLcdI8RDGLdS5ZGRa6tZs9AlUYO38NL15grh3lMue5umoB7dSkcOg RqSXRSAQgq7U3wXTlJXM4ktwirYKmUMu6I/eTlNIXAa4tkFZLRvxBZ1Q0CK0F84Qbmo1FP DNUcS4u/yN3r17eOQtOjr3uL7/6PX3bEwBXad9q5yHcKnfiMWhcOJAJc/iuNSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043455; a=rsa-sha256; cv=none; b=Ef8jiM98CT1YpBQg75HuPDRK+8W4sksrcIHa5icVSWsWqM2cdN0/nB0OkN0dVazWUstKZm 4iGgiBcD66G0qaT1YjXSVjsiLdgweMStb9owOIHb6nNR2tyqu4U934xjJ/Jf/rBXaP07sO IE0OExR/18nVvX6riKueNdyQEkZSf16kRYUdhhQ46xLuY/7BxDOZ7SJILkKYZnfJmXiWnT wgMBrTVR4vzJt0hlBDVVAPJckk3caTeOI63386efW22K+h8xVd5/j5bLtdbk7A20a9XKkJ sKnYq59gid+P5gcGP2iGIlX3pQ04L6wxabHfoelb+xnDWCuH710wnam8IKOqDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zk3O8l3Xwl+GpezgDx5TyPQ5psJ+0w8sUyhQah+cuYw=; b=pTvL1V8i+C9RqX4zOWbinO2W4KfAP3k66wfnT8PK8rU04QgD64BrSRfbCNnLK71yY02KRs 795vRFrA+3T8vRRGifN43MhqkZ9v+vjZiTJNHTY6RE3xP1eFS9VqBJ2/vuf1K/4GljEnP/ FQE3wizayU6IoLLUJQY/hWdF08WNpObPC5Vfzt9Gw2iPgSXwT6MLrfkw8cr9d1p7OQ1+7v glPRrEph8ELxcJm8fEwW29MsJUt17XoAzgSaxO8aOdjdEq14zP+0qQmFcx4Wt7VUBrBcwf LPbSMEXTFmejgjb2wIQU6q/LjXZrVbuKWBkV8AECDyz2YXz4wQyoywED1zxXkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq59W0kRwzYDG; Mon, 18 Sep 2023 13:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOFhg096963; Mon, 18 Sep 2023 13:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOFG5096960; Mon, 18 Sep 2023 13:24:15 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:15 GMT Message-Id: <202309181324.38IDOFG5096960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 9377d7049c84 - main - sdhci: fdt: Always enable clock for ZynqMP and RK3399 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9377d7049c846d1e35c8fc8809c23e6413909fca Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9377d7049c846d1e35c8fc8809c23e6413909fca commit 9377d7049c846d1e35c8fc8809c23e6413909fca Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:07:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:51 +0000 sdhci: fdt: Always enable clock for ZynqMP and RK3399 Those two (in fact all of the supported one in this driver except RK3568) always needs the clocks to be enabled. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41808 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/sdhci/sdhci_fdt.c | 59 +++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 16748dd4982c..372b08a3b78a 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -268,13 +268,9 @@ sdhci_init_rk3399_emmccardclk(device_t dev) } static int -sdhci_init_rk3399(device_t dev) +sdhci_init_clocks(device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(dev); - struct syscon *grf = NULL; - phandle_t node; - uint64_t freq; - uint32_t mask, val; int error; /* Get and activate clocks */ @@ -288,11 +284,6 @@ sdhci_init_rk3399(device_t dev) device_printf(dev, "cannot enable xin clock\n"); return (ENXIO); } - error = clk_get_freq(sc->clk_xin, &freq); - if (error != 0) { - device_printf(dev, "cannot get xin clock frequency\n"); - return (ENXIO); - } error = clk_get_by_ofw_name(dev, 0, "clk_ahb", &sc->clk_ahb); if (error != 0) { device_printf(dev, "cannot get ahb clock\n"); @@ -304,6 +295,25 @@ sdhci_init_rk3399(device_t dev) return (ENXIO); } + return (0); +} + +static int +sdhci_init_rk3399(device_t dev) +{ + struct sdhci_fdt_softc *sc = device_get_softc(dev); + struct syscon *grf = NULL; + phandle_t node; + uint64_t freq; + uint32_t mask, val; + int error; + + error = clk_get_freq(sc->clk_xin, &freq); + if (error != 0) { + device_printf(dev, "cannot get xin clock frequency\n"); + return (ENXIO); + } + /* Register clock */ sdhci_init_rk3399_emmccardclk(dev); @@ -561,7 +571,7 @@ sdhci_fdt_attach(device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(dev); struct sdhci_slot *slot; - int err, slots, rid, i; + int err, slots, rid, i, compat; sc->dev = dev; @@ -574,24 +584,33 @@ sdhci_fdt_attach(device_t dev) return (ENOMEM); } - if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == - SDHCI_FDT_RK3399) { - /* Initialize SDHCI */ - err = sdhci_init_rk3399(dev); + compat = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + switch (compat) { + case SDHCI_FDT_RK3399: + case SDHCI_FDT_XLNX_ZMP: + err = sdhci_init_clocks(dev); if (err != 0) { - device_printf(dev, "Cannot init RK3399 SDHCI\n"); + device_printf(dev, "Cannot init clocks\n"); return (err); } - } - - if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == - SDHCI_FDT_RK3568) { + if (compat == SDHCI_FDT_RK3399) { + err = sdhci_init_rk3399(dev); + if (err != 0) { + device_printf(dev, "Cannot init RK3399 SDHCI\n"); + return (err); + } + } + break; + case SDHCI_FDT_RK3568: /* setup & enable clocks */ if (clk_get_by_ofw_name(dev, 0, "core", &sc->clk_core)) { device_printf(dev, "cannot get core clock\n"); return (ENXIO); } clk_enable(sc->clk_core); + break; + default: + break; } /* Scan all slots. */ From nobody Mon Sep 18 13:24:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq59X30fFz4tCFw; Mon, 18 Sep 2023 13:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq59X2V1qz4RKP; Mon, 18 Sep 2023 13:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pe3S/z+up3Y383VOe+hbwhy/CW+jBfvngZF0SU6FS+A=; b=AeJaLAT+J3p6WoiQE1MRA9/mwP71eur10WPAaOmwEHqqJKAY4sKpoztBde3MMvjJ40Kjhw 4YKrV01c8fPuuy01OuENFaHK5IYXpAr/CAvTJK1f+AUS96CrNZNtNeujjkTx0K3p9vDWwx 1s0s8ZdLGNUaAyfyYjHt+WAIOqLtO+kLwfGKH1tqX7TJseDINmNyA0scpW1+Fj9qO4MEtT 0N7nfPf7bfzmAdj1uARKloPtSzR2xp/y0/gCJebMcpg7rgBKzyPNV02KXnDSJGofnvr0GL fQG7logMeCDwR2Vp7l83vV3oT6+ypafkcu8dtxirNCMIVtXg+o0j8iv7yBbBHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043456; a=rsa-sha256; cv=none; b=TbwzBNsHhltpKb9RLMIOoVUyGQxV8u8rWNVSPdcZE74n94FTbU+0JRaxW+vBYDVJWe5tJC r6dN9+dwdqYNAErhBpNmLVxWWSmt0r+G5AOwd9NBS8o4YrsCL75qD5exf8SmqI6fHzPwDt iq13yUYLVdHRZyMnn2KBfdu1t1lWlVU6t3TnPsR5YIMuZbiQSp18HPYdX4biSKH3lzdeiu 1VlZn2GHRYf/nhFQjf4znph2anOVk2PCRLqxXIF/OmLfL7wLkBq+Rv6+QRisQ4a2004ZRz VX91dctFtYuNw0fXAcxvntIE4LQXkcsFxZhIxaGDMrDmLUrrzutqkngUWWR7/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pe3S/z+up3Y383VOe+hbwhy/CW+jBfvngZF0SU6FS+A=; b=ecbVbWEqKzn/T+u1skbqL6oWqKZ3SL/D1ftdyGZ3WVsj4GNzfac9TypOMctyf7nD09+JL9 xKPAi4nOcmEq/JruH8RPf5DlzCa+QPTMUGuFNykbbPFI73TBnnrCuAe4XqJbZvDcGvjFkp CoKRavrY6/1N7l4a2Xytud2QxNEE0DwqBE91wMLnJXjNOwEkMwtKonD8KQ/kMzkou5fcaI PHs2Pt1hzJhnRAKXFAPvv7I9PKymmhyBhzTZp6Da+QECuIm7pDOOcvK2MNg1OHB/jo5uy/ xQIQY4YV/ehiCJn2e6hHUEs290Vfhno9/clYxNNr/slIlA3EaeATMfWw5lq8SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq59X1XYdzXWS; Mon, 18 Sep 2023 13:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOGT5097023; Mon, 18 Sep 2023 13:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOG8t097020; Mon, 18 Sep 2023 13:24:16 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:16 GMT Message-Id: <202309181324.38IDOG8t097020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0ee5d6fcfc63 - main - sdhci: fdt: Always try to get the phy and the syscon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 commit 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72 Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:28:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:53 +0000 sdhci: fdt: Always try to get the phy and the syscon Per the bindings the phy and the syscon can always be present not just for RK3399. Reviewed-by: bz Differiential Revision: https://reviews.freebsd.org/D41809 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/sdhci/sdhci_fdt.c | 75 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 372b08a3b78a..f3a9b5091f6b 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -146,6 +146,8 @@ struct sdhci_fdt_softc { clk_t clk_ahb; /* ahb clock */ clk_t clk_core; /* core clock */ phy_t phy; /* phy to be used */ + + struct syscon *syscon; /* Handle to the syscon */ }; struct rk3399_emmccardclk_sc { @@ -299,54 +301,71 @@ sdhci_init_clocks(device_t dev) } static int -sdhci_init_rk3399(device_t dev) +sdhci_init_phy(struct sdhci_fdt_softc *sc) { - struct sdhci_fdt_softc *sc = device_get_softc(dev); - struct syscon *grf = NULL; - phandle_t node; - uint64_t freq; - uint32_t mask, val; int error; - error = clk_get_freq(sc->clk_xin, &freq); - if (error != 0) { - device_printf(dev, "cannot get xin clock frequency\n"); - return (ENXIO); - } - - /* Register clock */ - sdhci_init_rk3399_emmccardclk(dev); - /* Enable PHY */ - error = phy_get_by_ofw_name(dev, 0, "phy_arasan", &sc->phy); + error = phy_get_by_ofw_name(sc->dev, 0, "phy_arasan", &sc->phy); + if (error == ENOENT) + return (0); if (error != 0) { - device_printf(dev, "Could not get phy\n"); + device_printf(sc->dev, "Could not get phy\n"); return (ENXIO); } error = phy_enable(sc->phy); if (error != 0) { - device_printf(dev, "Could not enable phy\n"); + device_printf(sc->dev, "Could not enable phy\n"); return (ENXIO); } + + return (0); +} + +static int +sdhci_get_syscon(struct sdhci_fdt_softc *sc) +{ + phandle_t node; + /* Get syscon */ - node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(sc->dev); if (OF_hasprop(node, "arasan,soc-ctl-syscon") && - syscon_get_by_ofw_property(dev, node, - "arasan,soc-ctl-syscon", &grf) != 0) { - device_printf(dev, "cannot get grf driver handle\n"); + syscon_get_by_ofw_property(sc->dev, node, + "arasan,soc-ctl-syscon", &sc->syscon) != 0) { + device_printf(sc->dev, "cannot get syscon handle\n"); return (ENXIO); } + return (0); +} + +static int +sdhci_init_rk3399(device_t dev) +{ + struct sdhci_fdt_softc *sc = device_get_softc(dev); + uint64_t freq; + uint32_t mask, val; + int error; + + error = clk_get_freq(sc->clk_xin, &freq); + if (error != 0) { + device_printf(dev, "cannot get xin clock frequency\n"); + return (ENXIO); + } + + /* Register clock */ + sdhci_init_rk3399_emmccardclk(dev); + /* Disable clock multiplier */ mask = RK3399_CORECFG_CLOCKMULTIPLIER; val = 0; - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); /* Set base clock frequency */ mask = RK3399_CORECFG_BASECLKFREQ; val = SHIFTIN((freq + (1000000 / 2)) / 1000000, RK3399_CORECFG_BASECLKFREQ); - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); return (0); } @@ -593,6 +612,14 @@ sdhci_fdt_attach(device_t dev) device_printf(dev, "Cannot init clocks\n"); return (err); } + if ((err = sdhci_init_phy(sc)) != 0) { + device_printf(dev, "Cannot init phy\n"); + return (err); + } + if ((err = sdhci_get_syscon(sc)) != 0) { + device_printf(dev, "Cannot get syscon handle\n"); + return (err); + } if (compat == SDHCI_FDT_RK3399) { err = sdhci_init_rk3399(dev); if (err != 0) { From nobody Mon Sep 18 13:24:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq59Y40lSz4tCG4; Mon, 18 Sep 2023 13:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq59Y31Wlz4RQ6; Mon, 18 Sep 2023 13:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLDxrhvW053dDG5zhuelRPPTukNLR0yCYg4phg+CwDI=; b=F1F4lWgX45QlGe7qIc5Dd32eE+8vHeZ5yvHEzYadvj24z1GEQpc05dLsUSxH2R16BwpAlD 1AYKbBa4uJMchREx8E8Vge0/O4RefDRNrpM3L8ipMlAcR8x4bvwJfYsFnV8WTUZp2qzNry +LYJJu5eFvsYCgP51xNZUQMo7N0X68fK8VzAmuqV7msWNVFtPA/X/ssaPmZzbkhwcqTLIt OkdKtfi+7/2UkpQbQhepUNkDraOSOCrspWWZWsnf0CS/nZQr/DN0ioAVu+IAQhhP+Hohx0 t66UH9rQCxGb6BMv2Y2aD7H5IVnA4itQZrIsw0B5rCfIIWM7ecTzGDW0X2x3Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043457; a=rsa-sha256; cv=none; b=w8oCeVjq7sMeNCjCFDg50PAa93/HTu7liVNSTU/LeVh+FXL3KdT75sGM+ish+rBXtL2ntE jxvh4vChgtDCm3Ca/5foL3Vvkb1QY4VnfnAUiVN4yWXYaboLE8Yl7dcDeTp8Zo1ivwVneR HtIk6UVPip+Kkn9WSd3JuvNTi30f8XijA23vse7zegG0Doz3gyfPf7iBNV/3rXQXERdcpG VCyIum5SIhw4JG92RWWKcg1plGlTcJJOyRLHG1jkbrAOwhASVAcV37ZBBywh3xBAihr7kZ XnHsEQMpSrDrNLMsnUILkrO+VK3zmXuLTabAW7qTK6KYDp4FTUmQEEfbaakRNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gLDxrhvW053dDG5zhuelRPPTukNLR0yCYg4phg+CwDI=; b=EV6ghK3X1WPmwq0Xb1ImGw9rs0lvwOTrM6r5stjeGnREJsk5nUgrJsVNkVYVB8zjn6Qhkf Je/BUN/pXlbDayeFe9NlbjvUJXtYU0OYo2t1EFQkPdsXN5qD9Wo34QTmBnjxRe614z437w Bw6OLsv3WbNdzpJP1Qv4rqDM15TgZuvAuMZugKduasKrGODW6arJAp/EjG3f+URsDOThYE iTv1gd2OK1x8Y5xgYVuoKD6mBd0z9KSARsi3QVX4kSGhROFwdEzANDlBv9V85UtO2YofP8 VwDplIcO5171EIMlo5dKqbrmKlZh0BqfWFTdEsyXUE+3wG2vv9qCep8jMdq2jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq59Y25cdzYQG; Mon, 18 Sep 2023 13:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOH53097075; Mon, 18 Sep 2023 13:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOHPA097072; Mon, 18 Sep 2023 13:24:17 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:17 GMT Message-Id: <202309181324.38IDOHPA097072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 81a4fe38a6ce - main - sdhci: fdt: Correctly export clock per the binding List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81a4fe38a6ce818bb7cba548bb2c697429fa9479 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=81a4fe38a6ce818bb7cba548bb2c697429fa9479 commit 81a4fe38a6ce818bb7cba548bb2c697429fa9479 Author: Emmanuel Vadot AuthorDate: 2023-09-06 15:54:47 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:23:55 +0000 sdhci: fdt: Correctly export clock per the binding The binding says that we can have one or two clocks to export. The first one is the actual sdclock while the second is the sample clock. Both have the same parent, clk_xin. Correctly export the clocks for RK3399 and ZynqMP. No need to use a high ID as before, we have our own clock domain so use ids starting at 1 as all exported clocks should be. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41810 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/sdhci/sdhci_fdt.c | 92 ++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 57 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index f3a9b5091f6b..0ed1b57e7dc8 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -113,8 +113,6 @@ #define LOWEST_SET_BIT(mask) ((((mask) - 1) & (mask)) ^ (mask)) #define SHIFTIN(x, mask) ((x) * LOWEST_SET_BIT(mask)) -#define EMMCCARDCLK_ID 1000 - static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, { "qcom,sdhci-msm-v4", SDHCI_FDT_QUALCOMM }, @@ -150,37 +148,36 @@ struct sdhci_fdt_softc { struct syscon *syscon; /* Handle to the syscon */ }; -struct rk3399_emmccardclk_sc { +struct sdhci_exported_clocks_sc { device_t clkdev; - bus_addr_t reg; }; static int -rk3399_emmccardclk_init(struct clknode *clk, device_t dev) +sdhci_exported_clocks_init(struct clknode *clk, device_t dev) { clknode_init_parent_idx(clk, 0); return (0); } -static clknode_method_t rk3399_emmccardclk_clknode_methods[] = { +static clknode_method_t sdhci_exported_clocks_clknode_methods[] = { /* Device interface */ - CLKNODEMETHOD(clknode_init, rk3399_emmccardclk_init), + CLKNODEMETHOD(clknode_init, sdhci_exported_clocks_init), CLKNODEMETHOD_END }; -DEFINE_CLASS_1(rk3399_emmccardclk_clknode, rk3399_emmccardclk_clknode_class, - rk3399_emmccardclk_clknode_methods, sizeof(struct rk3399_emmccardclk_sc), +DEFINE_CLASS_1(sdhci_exported_clocks_clknode, sdhci_exported_clocks_clknode_class, + sdhci_exported_clocks_clknode_methods, sizeof(struct sdhci_exported_clocks_sc), clknode_class); static int -rk3399_ofw_map(struct clkdom *clkdom, uint32_t ncells, +sdhci_clock_ofw_map(struct clkdom *clkdom, uint32_t ncells, phandle_t *cells, struct clknode **clk) { + int id = 1; /* Our clock id starts at 1 */ - if (ncells == 0) - *clk = clknode_find_by_id(clkdom, EMMCCARDCLK_ID); - else - return (ERANGE); + if (ncells != 0) + id = cells[1]; + *clk = clknode_find_by_id(clkdom, id); if (*clk == NULL) return (ENXIO); @@ -188,30 +185,29 @@ rk3399_ofw_map(struct clkdom *clkdom, uint32_t ncells, } static void -sdhci_init_rk3399_emmccardclk(device_t dev) +sdhci_export_clocks(struct sdhci_fdt_softc *sc) { struct clknode_init_def def; - struct rk3399_emmccardclk_sc *sc; + struct sdhci_exported_clocks_sc *clksc; struct clkdom *clkdom; struct clknode *clk; - clk_t clk_parent; bus_addr_t paddr; bus_size_t psize; const char **clknames; phandle_t node; int i, nclocks, ncells, error; - node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(sc->dev); if (ofw_reg_to_paddr(node, 0, &paddr, &psize, NULL) != 0) { - device_printf(dev, "cannot parse 'reg' property\n"); + device_printf(sc->dev, "cannot parse 'reg' property\n"); return; } error = ofw_bus_parse_xref_list_get_length(node, "clocks", "#clock-cells", &ncells); if (error != 0 || ncells != 2) { - device_printf(dev, "couldn't find parent clocks\n"); + device_printf(sc->dev, "couldn't find parent clocks\n"); return; } @@ -221,47 +217,31 @@ sdhci_init_rk3399_emmccardclk(device_t dev) if (nclocks <= 0) return; - if (nclocks != 1) { - device_printf(dev, "Having %d clock instead of 1, aborting\n", - nclocks); - return; - } + clkdom = clkdom_create(sc->dev); + clkdom_set_ofw_mapper(clkdom, sdhci_clock_ofw_map); + + for (i = 0; i < nclocks; i++) { + memset(&def, 0, sizeof(def)); + def.id = i + 1; /* Exported clock IDs starts at 1 */ + def.name = clknames[i]; + def.parent_names = malloc(sizeof(char *) * 1, M_OFWPROP, M_WAITOK); + def.parent_names[0] = clk_get_name(sc->clk_xin); + def.parent_cnt = 1; - clkdom = clkdom_create(dev); - clkdom_set_ofw_mapper(clkdom, rk3399_ofw_map); - - memset(&def, 0, sizeof(def)); - def.id = EMMCCARDCLK_ID; - def.name = clknames[0]; - def.parent_names = malloc(sizeof(char *) * ncells, M_OFWPROP, M_WAITOK); - for (i = 0; i < ncells; i++) { - error = clk_get_by_ofw_index(dev, 0, i, &clk_parent); - if (error != 0) { - device_printf(dev, "cannot get clock %d\n", error); + clk = clknode_create(clkdom, &sdhci_exported_clocks_clknode_class, &def); + if (clk == NULL) { + device_printf(sc->dev, "cannot create clknode\n"); return; } - def.parent_names[i] = clk_get_name(clk_parent); - if (bootverbose) - device_printf(dev, "clk parent: %s\n", - def.parent_names[i]); - clk_release(clk_parent); - } - def.parent_cnt = ncells; - - clk = clknode_create(clkdom, &rk3399_emmccardclk_clknode_class, &def); - if (clk == NULL) { - device_printf(dev, "cannot create clknode\n"); - return; - } - sc = clknode_get_softc(clk); - sc->reg = paddr; - sc->clkdev = device_get_parent(dev); + clksc = clknode_get_softc(clk); + clksc->clkdev = device_get_parent(sc->dev); - clknode_register(clkdom, clk); + clknode_register(clkdom, clk); + } if (clkdom_finit(clkdom) != 0) { - device_printf(dev, "cannot finalize clkdom initialization\n"); + device_printf(sc->dev, "cannot finalize clkdom initialization\n"); return; } @@ -353,9 +333,6 @@ sdhci_init_rk3399(device_t dev) return (ENXIO); } - /* Register clock */ - sdhci_init_rk3399_emmccardclk(dev); - /* Disable clock multiplier */ mask = RK3399_CORECFG_CLOCKMULTIPLIER; val = 0; @@ -612,6 +589,7 @@ sdhci_fdt_attach(device_t dev) device_printf(dev, "Cannot init clocks\n"); return (err); } + sdhci_export_clocks(sc); if ((err = sdhci_init_phy(sc)) != 0) { device_printf(dev, "Cannot init phy\n"); return (err); From nobody Mon Sep 18 13:24:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq5BH0Gk7z4tCCy; Mon, 18 Sep 2023 13:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq5BG6xSvz4SXV; Mon, 18 Sep 2023 13:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNwC9szYXwZF2sdeJaJbAoDjis82NlZepDUtMOedcrU=; b=LrL79uYSY1mTxGsDqgYrMEmJGlKarv0Gir1/TcbWQ/YSADZ3p3W9aou+KqFdk00pxwJQhV fdi8a2pY9IhiCEGA90m22OOu/ImUHEMQQFsvUeB+jkuRSzur5Ptqof4cIB7OPYAtXeQ5/y 52AVYUP6HWLfBT+wQ3rio+D+VfsSErssEpvKogklbCpT5t9cobhlzj0HkdCP/p3lvKs6Mq FFt5dfj9S8RALK0yuEryc3R8xyPMp5gVSMFgmxdMRfCyXfm4lLiVGDlNq0MmPJtLNgf2CV 1rcXnpcXmmLspcN+qD2V6QfTHRB+1m20brjsEJztfpfqibfzTPATh1FzuvznKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043495; a=rsa-sha256; cv=none; b=sTh3zARtOGOgAaxHmG58s7WrRVfjunyyACRBIeRP/UNv34RG8+pbO50trlJL+wb95N8dwk LqMgr/qlrPfAsepwC6G2vKiFUacAUxd+b5nsAnpZiKE7bmDehF56ZKviGtjxa/D+7sK5zy pmWNoYzn7rxPjgKDhpzwfwbXIG/12ZImaCfPjJQ+K8db3V2b9/q6atTaxBTDSXbVxYukdn Nnftytaz99JigJDG2zzamhHzx0YdlYjV+L5WwnN8FN8Vope8hZaRBAEn7k3UL3GButp7cG gCKpOUfbQ8Cn6PUWI8JLFFQJoshPcVlfRpuSU+HIbogpEespnycPXl7NPUSnVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNwC9szYXwZF2sdeJaJbAoDjis82NlZepDUtMOedcrU=; b=uSVEcQA/jaKHKy4Tj+9LDvjAyHGFmdU3r8pNi1rc0xpJPbgIxx3aRWLWgicWozt+mgwOBz ZLJE43OnlJsgskz7wO+jHmGEK6zhDznPIpjU93NYhBvWfqCX7EKAhm6YUTckBKBUun0BL8 eeQbaeFob2eO3vHtLL/nrYCHcfvjYOSGOH6/SkyNMKh6KORkZP0L/Phk13zt04G+bhE+Ad BkwqojC/+wGs36h4nK0oSfjrIZhCT2qv3ffcesCFrlyK2WsHSURL0vvhdqPbFdrPYZLa9/ 7aWIgXLJ7ljsMYnnm6GRcTDqKEJW83mW6VHAvLa6zdgio6Om+v+ypXpn3KLOVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq5BG62FmzYNn; Mon, 18 Sep 2023 13:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOs9J097326; Mon, 18 Sep 2023 13:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOsbc097323; Mon, 18 Sep 2023 13:24:54 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:54 GMT Message-Id: <202309181324.38IDOsbc097323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: bdbbbbb32104 - main - if_cgem: Cleanup compatible and add new ones List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdbbbbb32104569fccd786d9cc07d17f6231a713 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=bdbbbbb32104569fccd786d9cc07d17f6231a713 commit bdbbbbb32104569fccd786d9cc07d17f6231a713 Author: Emmanuel Vadot AuthorDate: 2023-09-12 14:49:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:24:24 +0000 if_cgem: Cleanup compatible and add new ones - Remove cdns,gem, it's the generic binding but for all platform that include this one we need specific drivers setup so remove it. - Remove cdns,macb, it's the generic binding for Atmel AT91 which we don't suport - Remove cadence,gem, it's not an official binding and seems to be only used in some obscure ARM11 SoC. - Note that the cdns,zynq* are deprecated - Add the new Xilinx compatible for zynq and zynqmp Reviewed-by: mhorne Tested-by: skibo, Milan Obuch Differential Revision: https://reviews.freebsd.org/D41856 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/cadence/if_cgem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 1aa5d4955d93..43e35b2bf849 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -106,14 +106,13 @@ #define HWQUIRK_PCLK 8 static struct ofw_compat_data compat_data[] = { - { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, - { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, + { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, /* Deprecated */ + { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, /* Deprecated */ + { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, + { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "sifive,fu540-c000-gem", HWQUIRK_PCLK }, { "sifive,fu740-c000-gem", HWQUIRK_PCLK }, - { "cdns,gem", HWQUIRK_NONE }, - { "cdns,macb", HWQUIRK_NONE }, - { "cadence,gem", HWQUIRK_NONE }, { NULL, 0 } }; From nobody Mon Sep 18 13:24:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq5BJ6ScQz4tC5p; Mon, 18 Sep 2023 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq5BJ1mypz4SdJ; Mon, 18 Sep 2023 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh0CQWBcDB3FwCr8F8QXx4BTUIpUm34G30y6RqmTBSw=; b=pjzvQoUbYfEYOXvRljEfaqUbKTt8efuq9eDWBgJV0Ku2WG81LEGOrQ2z9qktiDxdBW1CPb RySy0UVtpr5D4+Yjuwm1RVWkWaR/1sNIuTamqRyhI7S70Cw1H4cqxnWfjA28/eg3klDffE pdztk+a/oH+XN9dcnxTNRZPHmQia19y8lig8FRxvDSjBTZ68nOgRb+uv92JFDUZj/SnFra qCpdKbnmM337SyGswOq1Pc00i7Tv2jILCPF4WTRPNdXB7W4HKrOjD/1SR95reCdBRPpB8q CrIzhNOqDHwSTKpEmKI/hytgp4aARv/kItbYVcpwK/16seRauPqGXpkLWW3VSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695043496; a=rsa-sha256; cv=none; b=T8pFKlh26mRVspH2Z40LejZuUn0YhFy22Q9wx5zhBL70xLQU0gQaPCBnk7DAOz9wNr4nHs oGn+lBILcxEhO2XU3WlBURpArwFJynb3DwU727x1G+a4y4TXW/Lz780610bPVfZwS+H+RN wNSxsWhTP9nOEscoL/V+HpyQdSQ9wn32uZd0vXYTaLTQTBxYga06H5ZvYiES90zrjU1Ebk 2PumD8panTlXGdjiqc8MBHBIu5YLYgcGKd83/zLJp1tPSEe5gBq5cEspEK2U009VA1FgGl 9REbPHGVTG/R4F9zJzgmWuPm37Pmn3nVMtZR7C+QuvPLpIxPNFVnxPZCQl/YzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695043496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh0CQWBcDB3FwCr8F8QXx4BTUIpUm34G30y6RqmTBSw=; b=TlprTVjopFdsnt7nvcM7xlAou3Lz/4ShpV0D8+7olwVqv9ea1y0/2DndB3zJXc59TEsruC jhB0AMIZiWA1BkxCXBEJ3fZLL947lkAX6tGEzfi1zNpwhz9FkwzfAqJcwC07kujNanYbGp XIRCIbw2czFU4feWJibGUOawDYn4aN6q5Qpk8jyhO1qTdpnn7gxxA0K1O5mW+ylywRZb2c O5/lvphGMFeMyFDxJyuekxCkbptuJmSh0aPLv/rYnnqEtxMcopX3l+FU4ULs8iw1ylBNyg BM2llWNXQFQLZdZ4X9IZYFr8hbGZtKhHX8jIDLUm6qfDVH4hj3JGduJUXGfbCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq5BH72KDzYDK; Mon, 18 Sep 2023 13:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IDOtOF097365; Mon, 18 Sep 2023 13:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IDOtte097362; Mon, 18 Sep 2023 13:24:55 GMT (envelope-from git) Date: Mon, 18 Sep 2023 13:24:55 GMT Message-Id: <202309181324.38IDOtte097362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4c52dde5bda0 - main - if_cgem: Rewrite clock part List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c52dde5bda099936d43820da84e569dccc6f475 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4c52dde5bda099936d43820da84e569dccc6f475 commit 4c52dde5bda099936d43820da84e569dccc6f475 Author: Emmanuel Vadot AuthorDate: 2023-09-14 08:57:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-18 13:24:27 +0000 if_cgem: Rewrite clock part - pclk and hclk are mandatory so always try to get them. Don't make it fatal if it fails as some platform (like Zynq) don't have a proper clock driver. - Always use pclk for the reference clock. - Try to get all the possible clocks and enable them. Reviewed-by: mhorne Tested-by: Milan Obuch Differential Revision: https://reviews.freebsd.org/D41857 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/cadence/if_cgem.c | 118 +++++++++++++++++++++++++++++++++------------- 1 file changed, 86 insertions(+), 32 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 43e35b2bf849..6e4a62f6e5ee 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -102,17 +102,15 @@ #define HWQUIRK_NONE 0 #define HWQUIRK_NEEDNULLQS 1 #define HWQUIRK_RXHANGWAR 2 -#define HWQUIRK_TXCLK 4 -#define HWQUIRK_PCLK 8 static struct ofw_compat_data compat_data[] = { - { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, /* Deprecated */ - { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, /* Deprecated */ - { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, - { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, - { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, - { "sifive,fu540-c000-gem", HWQUIRK_PCLK }, - { "sifive,fu740-c000-gem", HWQUIRK_PCLK }, + { "cdns,zynq-gem", HWQUIRK_RXHANGWAR }, /* Deprecated */ + { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS }, /* Deprecated */ + { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR }, + { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS }, + { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS }, + { "sifive,fu540-c000-gem", HWQUIRK_NONE }, + { "sifive,fu740-c000-gem", HWQUIRK_NONE }, { NULL, 0 } }; @@ -129,7 +127,11 @@ struct cgem_softc { struct callout tick_ch; uint32_t net_ctl_shadow; uint32_t net_cfg_shadow; - clk_t ref_clk; + clk_t clk_pclk; + clk_t clk_hclk; + clk_t clk_txclk; + clk_t clk_rxclk; + clk_t clk_tsuclk; int neednullqs; int phy_contype; @@ -1497,9 +1499,9 @@ cgem_mediachange(struct cgem_softc *sc, struct mii_data *mii) WR4(sc, CGEM_NET_CFG, sc->net_cfg_shadow); - if (sc->ref_clk != NULL) { + if (sc->clk_pclk != NULL) { CGEM_UNLOCK(sc); - if (clk_set_freq(sc->ref_clk, ref_clk_freq, 0)) + if (clk_set_freq(sc->clk_pclk, ref_clk_freq, 0)) device_printf(sc->dev, "could not set ref clk to %d\n", ref_clk_freq); CGEM_LOCK(sc); @@ -1744,19 +1746,47 @@ cgem_attach(device_t dev) sc->neednullqs = 1; if ((hwquirks & HWQUIRK_RXHANGWAR) != 0) sc->rxhangwar = 1; - if ((hwquirks & HWQUIRK_TXCLK) != 0) { - if (clk_get_by_ofw_name(dev, 0, "tx_clk", &sc->ref_clk) != 0) - device_printf(dev, - "could not retrieve reference clock.\n"); - else if (clk_enable(sc->ref_clk) != 0) - device_printf(dev, "could not enable clock.\n"); + /* + * Both pclk and hclk are mandatory but we don't have a proper + * clock driver for Zynq so don't make it fatal if we can't + * get them. + */ + if (clk_get_by_ofw_name(dev, 0, "pclk", &sc->clk_pclk) != 0) + device_printf(dev, + "could not retrieve pclk.\n"); + else { + if (clk_enable(sc->clk_pclk) != 0) + device_printf(dev, "could not enable pclk.\n"); + } + if (clk_get_by_ofw_name(dev, 0, "hclk", &sc->clk_hclk) != 0) + device_printf(dev, + "could not retrieve hclk.\n"); + else { + if (clk_enable(sc->clk_hclk) != 0) + device_printf(dev, "could not enable hclk.\n"); + } + + /* Optional clocks */ + if (clk_get_by_ofw_name(dev, 0, "tx_clk", &sc->clk_txclk) == 0) { + if (clk_enable(sc->clk_txclk) != 0) { + device_printf(dev, "could not enable tx_clk.\n"); + err = ENXIO; + goto err_pclk; + } + } + if (clk_get_by_ofw_name(dev, 0, "rx_clk", &sc->clk_rxclk) == 0) { + if (clk_enable(sc->clk_rxclk) != 0) { + device_printf(dev, "could not enable rx_clk.\n"); + err = ENXIO; + goto err_tx_clk; + } } - if ((hwquirks & HWQUIRK_PCLK) != 0) { - if (clk_get_by_ofw_name(dev, 0, "pclk", &sc->ref_clk) != 0) - device_printf(dev, - "could not retrieve reference clock.\n"); - else if (clk_enable(sc->ref_clk) != 0) - device_printf(dev, "could not enable clock.\n"); + if (clk_get_by_ofw_name(dev, 0, "tsu_clk", &sc->clk_tsuclk) == 0) { + if (clk_enable(sc->clk_tsuclk) != 0) { + device_printf(dev, "could not enable tsu_clk.\n"); + err = ENXIO; + goto err_rx_clk; + } } node = ofw_bus_get_node(dev); @@ -1768,7 +1798,8 @@ cgem_attach(device_t dev) RF_ACTIVE); if (sc->mem_res == NULL) { device_printf(dev, "could not allocate memory resources.\n"); - return (ENOMEM); + err = ENOMEM; + goto err_tsu_clk; } /* Get IRQ resource. */ @@ -1824,7 +1855,7 @@ cgem_attach(device_t dev) if (err) { device_printf(dev, "could not set up dma mem for descs.\n"); cgem_detach(dev); - return (ENOMEM); + goto err; } /* Get a MAC address. */ @@ -1841,12 +1872,29 @@ cgem_attach(device_t dev) device_printf(dev, "could not set interrupt handler.\n"); ether_ifdetach(ifp); cgem_detach(dev); - return (err); + goto err; } cgem_add_sysctls(dev); return (0); + +err_tsu_clk: + if (sc->clk_tsuclk) + clk_release(sc->clk_tsuclk); +err_rx_clk: + if (sc->clk_rxclk) + clk_release(sc->clk_rxclk); +err_tx_clk: + if (sc->clk_txclk) + clk_release(sc->clk_txclk); +err_pclk: + if (sc->clk_pclk) + clk_release(sc->clk_pclk); + if (sc->clk_hclk) + clk_release(sc->clk_hclk); +err: + return (err); } static int @@ -1923,13 +1971,19 @@ cgem_detach(device_t dev) sc->mbuf_dma_tag = NULL; } - if (sc->ref_clk != NULL) { - clk_release(sc->ref_clk); - sc->ref_clk = NULL; - } - bus_generic_detach(dev); + if (sc->clk_tsuclk) + clk_release(sc->clk_tsuclk); + if (sc->clk_rxclk) + clk_release(sc->clk_rxclk); + if (sc->clk_txclk) + clk_release(sc->clk_txclk); + if (sc->clk_pclk) + clk_release(sc->clk_pclk); + if (sc->clk_hclk) + clk_release(sc->clk_hclk); + CGEM_LOCK_DESTROY(sc); return (0); From nobody Mon Sep 18 14:53:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq78P0bjMz4tJrf; Mon, 18 Sep 2023 14:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq78N71cHz4dsn; Mon, 18 Sep 2023 14:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695048805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rIi8eGgMmS2XDg9onTp/NBNR/TpV0OhfGEWTWDigxY=; b=fBgWeAikAZ3ceVYDh81iEoXu1oxSBVxjrVHQ6r73PAsJ/Mp4IsCSovnet+xpH02FAbn7Fi LTQnDwUr83zOQrG5WLspcTHopT8ywfMU89p7DsFBsWs216/2rAUxbiIr3N2JdmrOJyPDie bj2cz/wgE9IZ0tg5/MPbXZR1Kx6K7COeTMtLqD84OwJTrkypHylFo4HxYjVabwSlm/PL6C D7efwtqnUxg0WvKYZc3xfEoEeKdWM+fXrvw3dv76wpqxvzAigBdiwN1BjaPItCdQcXz5Qx LoAvsyLf9U7hEbV7RzWD7T8O6sjJJT5AUoEQL7oyhHVCCXu7DUgoSfYoKgG5Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695048805; a=rsa-sha256; cv=none; b=PibgJqTOjPoJ1yPEg6/jKpMutVLmg06YkjNWOrlOWfuFDdTm0+63mKeCgudQo3p7ihrmR4 URu3llfG+uG/rHSWdX99NRfbtGJjthWY8mdlJG9xaaMIwZHbXgXHJOH4HtE9NoMDhJTy5B AofuVPZkw0Rn0pR1z33FYwqQ6n9Xp0pQNaqunNZWzFF+BiL+IEV6Rvs/+CEWAy/OXEPZXj ZJ77TG67w1xrMh0olCfDc9Vq/oheNIC/B27pP7LVhJMoEte1rdZIddCD2v89sOtnjs/HYg owf5Lm3hadDj0NibHKnmVAyYzd9kORNmme2ngJoISaIU4DW37gLvQpA8TTWvqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695048805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rIi8eGgMmS2XDg9onTp/NBNR/TpV0OhfGEWTWDigxY=; b=Ia12btwG4wGULhwyo5VtPhiec+5DR5hF+NZ9AF7s343A2nKIZpGGc6X8V/dFw7s9pCAZ9+ dOyZYUlleQxFo3B7VxCUcD/e+39IycBHZBRJDbr0tqirk5QsJvhoi3uB90Wl8ZlUi4AEQU bk0K93kukqjh2iYrE32CjqfZbs7dsrDTK2XW8iZDlGJNAnOu1AOAuvUeTzX/3iyHcHL8PV skVYXNLPXb4AJbwKRFyTokk0kpfkJ0aMjIADJ76P8WljF8bzt3+h8j/zvXr6RjmgKmmUep EdVyCoj2r8KCutbp/5b0HFgxwtVVVRxM4PxvUCfnKoqtiTB/NB+wgiXi+C9NLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq78N65JLzbFv; Mon, 18 Sep 2023 14:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IErORL045985; Mon, 18 Sep 2023 14:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IErOZe045982; Mon, 18 Sep 2023 14:53:24 GMT (envelope-from git) Date: Mon, 18 Sep 2023 14:53:24 GMT Message-Id: <202309181453.38IErOZe045982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 794328fbc174 - main - linux(4): Staticize lsiginfo_to_siginfo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 794328fbc174360a09b6ad341624e9bce46f0d2e Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=794328fbc174360a09b6ad341624e9bce46f0d2e commit 794328fbc174360a09b6ad341624e9bce46f0d2e Author: Dmitry Chagin AuthorDate: 2023-09-18 14:52:43 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-18 14:52:43 +0000 linux(4): Staticize lsiginfo_to_siginfo It's not used outside of linux_signal.c While here fix the indentation. MFC after: 1 week --- sys/compat/linux/linux_signal.c | 2 +- sys/compat/linux/linux_signal.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 5b4f9c2adc6a..e3e3fc74a6a9 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -766,7 +766,7 @@ siginfo_to_lsiginfo(const siginfo_t *si, l_siginfo_t *lsi, l_int sig) } } -int +static int lsiginfo_to_siginfo(struct thread *td, const l_siginfo_t *lsi, siginfo_t *si, int sig) { diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h index 3ef64c0007fb..3f3599f4027e 100644 --- a/sys/compat/linux/linux_signal.h +++ b/sys/compat/linux/linux_signal.h @@ -31,9 +31,7 @@ int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *); void siginfo_to_lsiginfo(const siginfo_t *si, l_siginfo_t *lsi, l_int sig); -int lsiginfo_to_siginfo(struct thread *td, const l_siginfo_t *lsi, - siginfo_t *si, int sig); int linux_copyin_sigset(struct thread *td, l_sigset_t *, l_size_t, sigset_t *, - sigset_t **); + sigset_t **); #endif /* _LINUX_SIGNAL_H_ */ From nobody Mon Sep 18 14:53:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rq78Q1Qtzz4tK3F; Mon, 18 Sep 2023 14:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rq78Q0gqsz4dnt; Mon, 18 Sep 2023 14:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695048806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JYngVSsj0Eh4AGJiVshLa8SgVFXZHC8PFgkTASSsggQ=; b=pDWXnR1ISTMkwpEAidh8kkh5NDihbJdgCsKtBr/uMxK8jcoDtwj/ETPu8yIVcCNaS4Dq/W MSOXCgqtGL0OCNokV3wZjmlMJE9D3Vtu/8NWrWGlJulFZ+pkIbWfKzUwdGZUsCwrbL1Tzz TEvS6ztCWP7IoFD6rbcMJvZSVqL1h3ImLKiaCtK5XesJlSwID7cwHgh8qQfL5PlDbBRoRz OKUEqVDj0In4M6kjX6oVAdtngNJDDgxi9So7yGqy5b2JoVgcrGR7nBsW9gfYXKJsLw5bIb T3X8ywSaSP/4h2x9hcYpGetSdTJACLrlahQ4CDqBc3vMTBnUOFgOTmpMcfh8DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695048806; a=rsa-sha256; cv=none; b=FeYEzxg4uOi+DR4wR+G8VA1yxdJ5jMg502EzGfSZ5MfkXPurYfAoiVB92dPg0CCKOK3BMp dW5qJBmTPhjvrWZoF7E4wy8DGysR5mLVA8bXdM1Gy38nliPzoVO1vEb1ClMzt/zNZztkHs QHeNCvIKcF6SfYZYdjhT5bAMQpmNt3x8rjAAI476pJlBwGgldk/QjiXoOy3ExCJH5SXoO7 oZDv4xNHwc+Wc5AH10d5yBsjB9srEFIILymRYGsX6XucuMBhh2mN8UCH57ouJKaxJLlkHF o1jdGblEmHgB7TPLxhiAflOjzAFGVRsBlDsshiqUqzxbdUz+8K5psz1jw4rhQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695048806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JYngVSsj0Eh4AGJiVshLa8SgVFXZHC8PFgkTASSsggQ=; b=QL8yN8+jQNfzhTLvlrD0L1ZeeuPua1cVu/gyfRzBBTt6vXyJb0Ebxc6jqJUnx7i8n39V0x p40n0aHrQg9GFWTWq66jfFVLDbqQ8X/dZ0Xsstyr1sP7NdiKl+aDsIXKfKrAte3r/D3RxY 2O5z8isidsEkScOET2pezhA1yafYswALRc3VtT9QasK5OAfFfPGHGKKaVey3fGI/fmBFTH U6ydw8gHNtmr1WTjMoSMR0734O6O5Zg92uu4cCBoXJJvr/xjFKa61mjk7Lye/Xxr9vHplZ si1trwJMng0xIdMYSd0aAqywVcrifzTw//bEWfkzBDcsy3c874NTzNAGdH5lSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rq78P6rXHzbFw; Mon, 18 Sep 2023 14:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IErP02046042; Mon, 18 Sep 2023 14:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IErP3M046039; Mon, 18 Sep 2023 14:53:25 GMT (envelope-from git) Date: Mon, 18 Sep 2023 14:53:25 GMT Message-Id: <202309181453.38IErP3M046039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b Author: Dmitry Chagin AuthorDate: 2023-09-18 14:53:01 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-18 14:53:01 +0000 linux(4): On Linux SIGKILL can not be reset to default MFC after: 1 week --- sys/compat/linux/linux_signal.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index e3e3fc74a6a9..9a84700b3949 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, if (!LINUX_SIG_VALID(linux_sig)) return (EINVAL); + sig = linux_to_bsd_signal(linux_sig); osa = (linux_osa != NULL) ? &oact : NULL; if (linux_nsa != NULL) { @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, linux_ktrsigset(&linux_nsa->lsa_mask, sizeof(linux_nsa->lsa_mask)); #endif + if ((sig == SIGKILL || sig == SIGSTOP) && + nsa->sa_handler == SIG_DFL) + return (EINVAL); } else nsa = NULL; - sig = linux_to_bsd_signal(linux_sig); error = kern_sigaction(td, sig, nsa, osa, 0); if (error != 0) From nobody Mon Sep 18 18:13:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqCZl14bmz4tYV6; Mon, 18 Sep 2023 18:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqCZl0ZG0z3cC7; Mon, 18 Sep 2023 18:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695060783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4shHBlS+pWyujTi+6qEeS9qY+6C+dGe0CyHGs7v/4j8=; b=qkCGHESIhzCqWwSMx6KSdYHLFECWM9fl4OkX8EBGMk/+Sb6guFPWVK86ATfVBbqf4cd3oA 3nSRpTMcBaWVA+lbSJxXdHBaIc+S3etuLdV090yXpwpbW26ywety2GJpqu0yJRAQ73jWb/ BzZL4JRQfuhDVfwClOkDEh3uw74HxM0olUrB7LI/zwtf7CU54ssARtZ5XcvnsAs3BI78W2 +75VQTZnfV6KxYbueDyyHLhaCZkvUt5YRBANfwBIEhjMqrIDIZtxj+Nl8yUWkJy9U8ummA 5PIm/2M2dahheh3Bw9lRxf2vQ0aC3Y5FOKpaMFUc/SQtbWMVB0F5FsRQ9rIWow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695060783; a=rsa-sha256; cv=none; b=sxsbLpfW/ObPRdAE/ogajcb0XtGuHTohDYTRaJTKNnSLYNYMS69O88J9bAFNmx/XTwk2/z f7U+d8Qrvei7mBJF/zl/BoFfLfLTjNZCcEqm9vri29TBbWvvIakNaNuaXzBAd9yZkR21PZ IGMnXcqx3di8TFVUOCYhTaS5FPlWDoA2itGSNcgte07xISkgaGGus6hnMM+VzQKH2PQJQx uLVqBcxCz8iym2UV5kqx56jGX5EaunWT8rDw9lmmYSlRFt1WQpw+DaA5CthNyRXTVocmdg IOnCCIaOuOW989G1P7DdU7jrz1SuaL0cUqf2uD3+6QD/otyJhEEdwWzJ4K3cAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695060783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4shHBlS+pWyujTi+6qEeS9qY+6C+dGe0CyHGs7v/4j8=; b=il1DuftGCDRrxgz2hWybNhT5sXSgnlYFMbSojd9CoUOHIw42Lm9trAm3lydAhKznqvS5cU +GmuBFXjRhDIY3zzzxACKcb4N6sr9pdPElBefDcvUeQBh+O00XsKT+hv3iHUi3wGxHJGGJ mqf+FFmtQkS8WVJBGL4UEo/xOWAfQNRb3SWDrHcnb/LrlCkBcEKxhfYs/wR0gbkMyn96vq UaGcUxrs3B8f+gs9kKMuQKYrcxCpuPPAwfdw0gw/xYCToupVUvO9aJgWVK7aqfeqb0AJEx HG9AGvawE4ZsSXifb2ioPfJuLk25oirPTkZyAcg5owciQyDznOuR7Ql4PeTQlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqCZk6lhXzh5W; Mon, 18 Sep 2023 18:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IID2H2078304; Mon, 18 Sep 2023 18:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IID2Ov078301; Mon, 18 Sep 2023 18:13:02 GMT (envelope-from git) Date: Mon, 18 Sep 2023 18:13:02 GMT Message-Id: <202309181813.38IID2Ov078301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b57df6fbcc48 - main - ndp: cope with unresolved neighbours List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b57df6fbcc484f1941bf306cb60a3adaf538df69 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b57df6fbcc484f1941bf306cb60a3adaf538df69 commit b57df6fbcc484f1941bf306cb60a3adaf538df69 Author: Kristof Provost AuthorDate: 2023-09-18 17:01:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-18 18:12:45 +0000 ndp: cope with unresolved neighbours If we've not (yet) resolved a neighbour nda_lladdr will be NULL, and NLA_DATA_LEN(neigh->nda_lladdr) will dereference a NULL pointer. Avoid that by checking nda_lladdr first, and only dereferencing if it's not NULL. Test case: ping6 -c 1 ndp -a Reviewed by: melifaro MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41903 --- usr.sbin/ndp/ndp_netlink.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index ace3e5e5fa11..954d16995b5a 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -230,9 +230,12 @@ print_entry(struct snl_parsed_neigh *neigh, struct snl_parsed_link_simple *link) .sdl_family = AF_LINK, .sdl_type = link->ifi_type, .sdl_len = sizeof(struct sockaddr_dl), - .sdl_alen = NLA_DATA_LEN(neigh->nda_lladdr), }; - memcpy(sdl.sdl_data, NLA_DATA(neigh->nda_lladdr), sdl.sdl_alen); + + if (neigh->nda_lladdr) { + sdl.sdl_alen = NLA_DATA_LEN(neigh->nda_lladdr), + memcpy(sdl.sdl_data, NLA_DATA(neigh->nda_lladdr), sdl.sdl_alen); + } addrwidth = strlen(host_buf); if (addrwidth < W_ADDR) From nobody Mon Sep 18 18:40:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqDBN12Djz4tbDp; Mon, 18 Sep 2023 18:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqDBM75pdz3gWh; Mon, 18 Sep 2023 18:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695062428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9E7SEdNqBWbElrgv1UJiWog/MM4kbl80B15ZEsDJv0=; b=jv66z9Ewd4vDA4uyhUP0eff/i1n0TuIeTIXEFCe0ECeMaFaxPg2vUAHcGHILXYR9/F3QTO vtAbON8HUR5+HseMsHL5GVWzCchLdwtJOMq6No1LZhbtKkSl0q5e9WDBqSb7Hnucr7Qp6B roOsEEjUUhE8xKSfeCLirlJw1912/VkwZGwc7KKqs/Ubx9iEFXaKmB/lqhnL2W26o84IAO PL7DtcNuMvDmzrJMZb/Ie6Eb17EJtaSLzoHTMgGnNBkovvuPFtzqueLQV8bBqA8+wfDuFH CYs1mzv4hN/nlUs7TQJZ6qWQKfwWMNxLeXwhKKKRnXaT1YRw0y/9PqZtTb5uWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695062428; a=rsa-sha256; cv=none; b=lze//9KJ9bcSGBjNZ5+vGlv2HsfR+fanHk7YGX/CW+JjWh9A5XIClzyIktZScTSKdeCTbO uoECs1LYE5Eg9a05oBufE3Lr/g8UvLOclMp49/g3aHpsdqp+bCWm+8UHP9xire1dlUsigY abs1S6LXnlfqXuq4EiEVI0nvK3WWUfECD+qd8ZtzsWURIUFVteQFdMuE22hzqhOASIJ/ja iTHaPlzqcoUvOucbHha498LGT1Ao9M79AseXUqO4+VlPmQ5GwzEMQqzMTAalQCGsQYeDNR JkE2uUdsCbHZ9nGSgt3+Brrzh+HU4pVf0w7obmPBjhp72J8OlkvBwAAhQEgHTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695062428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9E7SEdNqBWbElrgv1UJiWog/MM4kbl80B15ZEsDJv0=; b=Kvh7uPMSb95YUJX/uYOiIJCDBjyQOROd/dDvPfdAeiQjKSB3fXT/xwWn2VOY1Ishjzpd/b eAepgGpFK2wscyCFLFdVPJpmC4tRYkYh5TwfZACSWCVgAkOu8BEty+WaQIoNkOLWTjyJw+ 55ylLD+qXF8GLFayXkL6FDgGsI1qI4i9QmPQO2oCyG5G8JFMa75XWLJfKJaX5V7nlhEqNL 5Fh4rbpQVQv6N9Elvo43+otaim3eQ+dVZA5ScQKUA7rdw2C6Fu2Bi3wa6LV4S9IigQ+buK 2Bj0pV54b2GD0D85C7dQlQ8vtm1Twde2hRAFl2GAtqvo8fLQW0/0ANty3gqxZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqDBM5zBRzj0W; Mon, 18 Sep 2023 18:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IIeRnP020311; Mon, 18 Sep 2023 18:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IIeRoM020308; Mon, 18 Sep 2023 18:40:27 GMT (envelope-from git) Date: Mon, 18 Sep 2023 18:40:27 GMT Message-Id: <202309181840.38IIeRoM020308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 40b9b2995f0f - main - Update jobs.mk to leverage -jC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40b9b2995f0f4b09cbdc9aa88f1f21f05bd1cc88 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=40b9b2995f0f4b09cbdc9aa88f1f21f05bd1cc88 commit 40b9b2995f0f4b09cbdc9aa88f1f21f05bd1cc88 Author: Simon J. Gerraty AuthorDate: 2023-09-18 18:40:07 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-18 18:40:07 +0000 Update jobs.mk to leverage -jC With bmake-20230909 we can use -j1.5C to use 1.5*ncpu bmake will set .MAKE.JOBS.C=yes if this is supported, and in that case jobs.mk will use JOB_MAX_C as default for JOB_MAX. Remove logic from local.sys.mk which is now handled by jobs.mk Also use latest dirdeps-targets.mk and meta.{autodep,subdir}.mk --- share/mk/dirdeps-targets.mk | 11 ++++++----- share/mk/jobs.mk | 24 ++++++++++++++++-------- share/mk/local.sys.mk | 20 -------------------- share/mk/meta.autodep.mk | 11 ++++++++--- share/mk/meta.subdir.mk | 4 ++-- 5 files changed, 32 insertions(+), 38 deletions(-) diff --git a/share/mk/dirdeps-targets.mk b/share/mk/dirdeps-targets.mk index 6201efe1e402..821ae50e3ffa 100644 --- a/share/mk/dirdeps-targets.mk +++ b/share/mk/dirdeps-targets.mk @@ -1,5 +1,5 @@ # RCSid: -# $Id: dirdeps-targets.mk,v 1.24 2020/12/11 18:15:43 sjg Exp $ +# $Id: dirdeps-targets.mk,v 1.25 2023/05/11 05:07:28 sjg Exp $ # # @(#) Copyright (c) 2019-2020 Simon J. Gerraty # @@ -113,16 +113,17 @@ tqtdeps := ${DIRDEPS_TARGETS_MACHINE_LIST:@m@${tdeps:M*.$m,*}@:S,/${.MAKE.DEPEND .endif # now work out what we want in DIRDEPS +DIRDEPS = ${ptdeps} .if empty(REQUESTED_MACHINE) # we want them all just as found -DIRDEPS = ${ptdeps} ${mqtdeps} ${tqtdeps} +DIRDEPS += ${mqtdeps} ${tqtdeps} .else # we only want those that match REQUESTED_MACHINE/REQUESTED_TARGET_SPEC # or REQUESTED_TARGET_SPEC (TARGET_SPEC) -DIRDEPS = \ - ${ptdeps:@d@$d.${REQUESTED_TARGET_SPEC:U${TARGET_SPEC:U${REQUESTED_MACHINE}}}@} \ +DIRDEPS += \ ${mqtdeps:M*.${REQUESTED_MACHINE}} \ - ${tqtdeps:M*.${REQUESTED_TARGET_SPEC:U${TARGET_SPEC}}} + ${tqtdeps:M*.${REQUESTED_TARGET_SPEC:U${TARGET_SPEC}}} \ + .endif # clean up DIRDEPS := ${DIRDEPS:O:u} diff --git a/share/mk/jobs.mk b/share/mk/jobs.mk index 62fe9eeae030..0643e6481082 100644 --- a/share/mk/jobs.mk +++ b/share/mk/jobs.mk @@ -1,4 +1,4 @@ -# $Id: jobs.mk,v 1.9 2023/04/27 18:10:27 sjg Exp $ +# $Id: jobs.mk,v 1.14 2023/09/11 16:52:44 sjg Exp $ # # @(#) Copyright (c) 2012-2023, Simon J. Gerraty # @@ -29,11 +29,14 @@ # # ${MAKE} -j${JOB_MAX} target > ${JOB_LOGDIR}/target.log 2>&1 # -# JOB_MAX defaults to 8 but should normally be derrived based on the -# number of cpus available. The wrapper script 'mk' makes that easy. +# JOB_MAX should be something like 1.2 - 1.5 times the number of +# available CPUs. +# If bmake sets .MAKE.JOBS.C=yes we can use -jC and +# JOB_MAX defaults to JOB_MAX_C (default 1.33C). +# Otherwise we use 8. # -now_utc ?= ${%s:L:gmtime} +now_utc ?= ${%s:L:localtime} .if !defined(start_utc) start_utc := ${now_utc} .endif @@ -70,14 +73,19 @@ NEWLOG = : .endif .if ${.MAKE.JOBS:U0} > 0 -JOB_MAX= ${.MAKE.JOBS} +JOB_MAX = ${.MAKE.JOBS} .else # This should be derrived from number of cpu's -JOB_MAX?= 8 -JOB_ARGS+= -j${JOB_MAX} +.if ${.MAKE.JOBS.C:Uno} == "yes" +# 1.2 - 1.5 times nCPU works well on most machines that support -jC +JOB_MAX_C ?= 1.33C +JOB_MAX ?= ${JOB_MAX_C} +.endif +JOB_MAX ?= 8 +JOB_ARGS += -j${JOB_MAX} .endif -# we need to reset .MAKE.LEVEL to 0 do that +# we need to reset .MAKE.LEVEL to 0 so that # build orchestration works as expected (DIRDEPS_BUILD) ${.TARGETS:M*-jobs}: @${NEWLOG} ${JOB_NEWLOG_ARGS} ${JOB_LOG} diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 2f684ba0975c..59b1a7c14a7c 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -58,26 +58,6 @@ _PREMK_LIBDIR:= ${LIBDIR} .include "src.sys.mk" .-include -.if make(*-jobs) && empty(JOB_MAX) -# provide a reasonable? default for JOB_MAX based on ncpu -JOB_MAX_FACTOR?= 1.33 -NPROC?= ${(type nproc || true) 2> /dev/null:L:sh:M/*:[1]} -NPROC:= ${NPROC} -.if !empty(NPROC) -ncpu!= ${NPROC} -.elif ${.MAKE.OS:NDarwin:NFreeBSD} == "" -ncpu!= sysctl -n hw.ncpu -.endif -.if ${ncpu:U0} > 1 -.if ${JOB_MAX_FACTOR} == 1 -JOB_MAX:= ${ncpu} -.else -jm!= echo ${ncpu} \* ${JOB_MAX_FACTOR} | bc -JOB_MAX:= ${jm:R} -.endif -.endif -.endif - # this will be set via local.meta.sys.env.mk if appropriate MK_host_egacy?= no diff --git a/share/mk/meta.autodep.mk b/share/mk/meta.autodep.mk index cd08ac3b3520..6785d2ebf874 100644 --- a/share/mk/meta.autodep.mk +++ b/share/mk/meta.autodep.mk @@ -1,4 +1,4 @@ -# $Id: meta.autodep.mk,v 1.56 2022/09/09 17:44:29 sjg Exp $ +# $Id: meta.autodep.mk,v 1.59 2023/08/19 17:35:32 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -139,6 +139,10 @@ FORCE_DPADD += ${_nonlibs:@x@${DPADD:M*/$x}@} .END: gendirdeps .endif +.if ${LOCAL_DEPENDS_GUARD:U} == "no" +.depend: +.endif + # if we don't have OBJS, then .depend isn't useful .if !target(.depend) && (!empty(OBJS) || ${.ALLTARGETS:M*.o} != "") # some makefiles and/or targets contain @@ -206,7 +210,8 @@ _depend = .endif .if ${UPDATE_DEPENDFILE} == "yes" -gendirdeps: ${_DEPENDFILE} +gendirdeps: beforegendirdeps .WAIT ${_DEPENDFILE} +beforegendirdeps: .endif .if !target(${_DEPENDFILE}) @@ -300,7 +305,7 @@ ${_DEPENDFILE}: .PRECIOUS CLEANFILES += *.meta filemon.* *.db # these make it easy to gather some stats -now_utc = ${%s:L:gmtime} +now_utc = ${%s:L:localtime} start_utc := ${now_utc} meta_stats= meta=${empty(.MAKE.META.FILES):?0:${.MAKE.META.FILES:[#]}} \ diff --git a/share/mk/meta.subdir.mk b/share/mk/meta.subdir.mk index 39cf875d6b77..d9caae4edbcc 100644 --- a/share/mk/meta.subdir.mk +++ b/share/mk/meta.subdir.mk @@ -1,4 +1,4 @@ -# $Id: meta.subdir.mk,v 1.12 2020/08/19 17:51:53 sjg Exp $ +# $Id: meta.subdir.mk,v 1.13 2021/01/05 22:24:37 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -17,7 +17,7 @@ .if !defined(NO_SUBDIR) && !empty(SUBDIR) .if make(destroy*) || make(clean*) .MAKE.MODE = compat -.if !commands(destroy) +.if !commands(obj) .-include .endif .elif ${.MAKE.LEVEL} == 0 From nobody Mon Sep 18 20:04:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqG3b2pDjz4thPH; Mon, 18 Sep 2023 20:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqG3b28BQz4LRd; Mon, 18 Sep 2023 20:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695067483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaofA3DuCyM4kmPXqX8ItnF1XBWbhkqhYbiOQ5C7tY0=; b=ZQ/eqaOCI8SMOA+n8ULFENU0S2qRJ0R5uxGloRuDH/oiZ9LRSCULjM3kebAH1Dx2vZ3MCu HWyCLJwIwzo02n6rPgN4hTeduxOG+LW/amW7UQUmiORPXLNQfjdvPByrwg2g6xc4jgxC7d ccOdT9o+JhskD2HBiVYOJtccuHjebWNndYLVLgswDavXO7kDZIqCqZnHMO2LXfaiXYY7VR dNLVoGDKFHrtXphEAl0zLOTCprMf6yajfmg/PwZ6okiuOwXKI+UE6bbEAeE2f/UsO+hvM5 f8AsGISwsfDVZsP8wMewT0CyUq2/c/1MAh0fTA7Cqx3ZFgeFXR/K3Thc49vw8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695067483; a=rsa-sha256; cv=none; b=RjmzdN7ucbBe0Dyl49rnt2KYVJCzb6LUZb/V3BSuBY8Z1rdKROSFyVpnpTxae0GuNSqcZ8 /RLd04YxEdzIs0RvRuin5jZgTH8j/G6jiD/lFhvB4X6e8nt/pRIYcMjTmX+PwM26q64/80 A6zxpSJIJnJXn56rEg2/UzprBdVxZmolXfL6s4kXQg9yHDDnO5/sT6wWHcQfOSkLfAMbKa fA96KDn+HamBkKGaCBQLsXN4CGTVeWc0AxRtgVY6mGMHujR1frpnlBT6bIyuTRQcZe6C/J dMmBfuY/0047TtAOjKlUfkoyWr+5rziDZFMg5esqv8L8TlD0ARjjgDE5QNDL3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695067483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaofA3DuCyM4kmPXqX8ItnF1XBWbhkqhYbiOQ5C7tY0=; b=nIwORbXCO3G2Fl1ueoa5MipDqN1qOBI8yClR1HHKBWDnOwaILKmMqciajs8dpasDw3ZCA3 1bXYSDI2qCqhX7OLVgJhi7oncMQbbQB5v0DmipsAXNcwvdZ073vEau0Kwj/f0Y8I2JPXy5 H2NvjFrasJxzoycQ0UG1u06SxqywkVvgtdBcmnFEc7HL70H9WjrNJT56d73OFq7Zcfp6D6 tihc1Pwn6unwXVkENltsh1n/UKZToOy8XrL6GYACpA89haoUVOR3RqXND0SOYdCOO5qKIk TXxDMpTO+LwWTEBpw5/CvPjnKzzFgUYUT6fv51SrS9jP0fFR0tMTojIsoSlhVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqG3b148WzkJs; Mon, 18 Sep 2023 20:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IK4h7r061560; Mon, 18 Sep 2023 20:04:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IK4hMJ061557; Mon, 18 Sep 2023 20:04:43 GMT (envelope-from git) Date: Mon, 18 Sep 2023 20:04:43 GMT Message-Id: <202309182004.38IK4hMJ061557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: ccb576a83cc9 - main - virtio: use bool for boolean functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccb576a83cc959070de59454d4dcd6395f7ae91a Auto-Submitted: auto-generated The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb576a83cc959070de59454d4dcd6395f7ae91a commit ccb576a83cc959070de59454d4dcd6395f7ae91a Author: Mina Galić AuthorDate: 2023-09-18 20:02:37 +0000 Commit: Olivier Houchard CommitDate: 2023-09-18 20:03:26 +0000 virtio: use bool for boolean functions Summary: these static functions: - vq_ring_use_indirect and these public functions: - virtio_bus_is_modern - virtio_with_feature - virtqueue_empty - virtqueue_full exclusively return a boolean value. Change their return values to bool. Sponsored by: The FreeBSD Foundation Reviewers: bryanv Reviewed By: bryanv Subscribers: cognet, imp Differential Revision: https://reviews.freebsd.org/D41848 --- sys/dev/virtio/mmio/virtio_mmio.c | 4 ++-- sys/dev/virtio/pci/virtio_pci.c | 2 +- sys/dev/virtio/pci/virtio_pci.h | 2 +- sys/dev/virtio/pci/virtio_pci_legacy.c | 4 ++-- sys/dev/virtio/pci/virtio_pci_modern.c | 4 ++-- sys/dev/virtio/virtio.c | 4 ++-- sys/dev/virtio/virtio.h | 4 ++-- sys/dev/virtio/virtio_bus_if.m | 2 +- sys/dev/virtio/virtqueue.c | 16 ++++++++-------- sys/dev/virtio/virtqueue.h | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/dev/virtio/mmio/virtio_mmio.c b/sys/dev/virtio/mmio/virtio_mmio.c index 36c6a255c385..6059ef76eceb 100644 --- a/sys/dev/virtio/mmio/virtio_mmio.c +++ b/sys/dev/virtio/mmio/virtio_mmio.c @@ -73,7 +73,7 @@ static int vtmmio_read_ivar(device_t, device_t, int, uintptr_t *); static int vtmmio_write_ivar(device_t, device_t, int, uintptr_t); static uint64_t vtmmio_negotiate_features(device_t, uint64_t); static int vtmmio_finalize_features(device_t); -static int vtmmio_with_feature(device_t, uint64_t); +static bool vtmmio_with_feature(device_t, uint64_t); static void vtmmio_set_virtqueue(struct vtmmio_softc *sc, struct virtqueue *vq, uint32_t size); static int vtmmio_alloc_virtqueues(device_t, int, int, @@ -489,7 +489,7 @@ vtmmio_finalize_features(device_t dev) return (0); } -static int +static bool vtmmio_with_feature(device_t dev, uint64_t feature) { struct vtmmio_softc *sc; diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c index 4849affae58c..1470dc83949c 100644 --- a/sys/dev/virtio/pci/virtio_pci.c +++ b/sys/dev/virtio/pci/virtio_pci.c @@ -267,7 +267,7 @@ vtpci_negotiate_features(struct vtpci_common *cn, return (features); } -int +bool vtpci_with_feature(struct vtpci_common *cn, uint64_t feature) { return ((cn->vtpci_features & feature) != 0); diff --git a/sys/dev/virtio/pci/virtio_pci.h b/sys/dev/virtio/pci/virtio_pci.h index 2d123ebdbb53..401cba25bbf4 100644 --- a/sys/dev/virtio/pci/virtio_pci.h +++ b/sys/dev/virtio/pci/virtio_pci.h @@ -117,7 +117,7 @@ int vtpci_reinit(struct vtpci_common *cn); uint64_t vtpci_negotiate_features(struct vtpci_common *cn, uint64_t child_features, uint64_t host_features); -int vtpci_with_feature(struct vtpci_common *cn, uint64_t feature); +bool vtpci_with_feature(struct vtpci_common *cn, uint64_t feature); int vtpci_read_ivar(struct vtpci_common *cn, int index, uintptr_t *result); int vtpci_write_ivar(struct vtpci_common *cn, int index, uintptr_t value); diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c index 88a8323bdd6f..72d637fb0f55 100644 --- a/sys/dev/virtio/pci/virtio_pci_legacy.c +++ b/sys/dev/virtio/pci/virtio_pci_legacy.c @@ -86,7 +86,7 @@ static int vtpci_legacy_register_vq_msix(device_t, int idx, struct vtpci_interrupt *); static uint64_t vtpci_legacy_negotiate_features(device_t, uint64_t); -static int vtpci_legacy_with_feature(device_t, uint64_t); +static bool vtpci_legacy_with_feature(device_t, uint64_t); static int vtpci_legacy_alloc_virtqueues(device_t, int, int, struct vq_alloc_info *); static int vtpci_legacy_setup_interrupts(device_t, enum intr_type); @@ -379,7 +379,7 @@ vtpci_legacy_negotiate_features(device_t dev, uint64_t child_features) return (features); } -static int +static bool vtpci_legacy_with_feature(device_t dev, uint64_t feature) { struct vtpci_legacy_softc *sc; diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index 2fa921dd9141..84d9511798e0 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -111,7 +111,7 @@ static int vtpci_modern_register_vq_msix(device_t, int idx, static uint64_t vtpci_modern_negotiate_features(device_t, uint64_t); static int vtpci_modern_finalize_features(device_t); -static int vtpci_modern_with_feature(device_t, uint64_t); +static bool vtpci_modern_with_feature(device_t, uint64_t); static int vtpci_modern_alloc_virtqueues(device_t, int, int, struct vq_alloc_info *); static int vtpci_modern_setup_interrupts(device_t, enum intr_type); @@ -469,7 +469,7 @@ vtpci_modern_finalize_features(device_t dev) return (0); } -static int +static bool vtpci_modern_with_feature(device_t dev, uint64_t feature) { struct vtpci_modern_softc *sc; diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c index 0637e0299333..45a657542e28 100644 --- a/sys/dev/virtio/virtio.c +++ b/sys/dev/virtio/virtio.c @@ -200,7 +200,7 @@ virtio_filter_transport_features(uint64_t features) return (features & mask); } -int +bool virtio_bus_is_modern(device_t dev) { uintptr_t modern; @@ -275,7 +275,7 @@ virtio_setup_intr(device_t dev, enum intr_type type) return (VIRTIO_BUS_SETUP_INTR(device_get_parent(dev), type)); } -int +bool virtio_with_feature(device_t dev, uint64_t feature) { diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index b3ef98cbd167..96ebaf653428 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -92,7 +92,7 @@ void virtio_describe(device_t dev, const char *msg, int virtio_describe_sbuf(struct sbuf *sb, uint64_t features, struct virtio_feature_desc *desc); uint64_t virtio_filter_transport_features(uint64_t features); -int virtio_bus_is_modern(device_t dev); +bool virtio_bus_is_modern(device_t dev); void virtio_read_device_config_array(device_t dev, bus_size_t offset, void *dst, int size, int count); @@ -106,7 +106,7 @@ int virtio_finalize_features(device_t dev); int virtio_alloc_virtqueues(device_t dev, int flags, int nvqs, struct vq_alloc_info *info); int virtio_setup_intr(device_t dev, enum intr_type type); -int virtio_with_feature(device_t dev, uint64_t feature); +bool virtio_with_feature(device_t dev, uint64_t feature); void virtio_stop(device_t dev); int virtio_config_generation(device_t dev); int virtio_reinit(device_t dev, uint64_t features); diff --git a/sys/dev/virtio/virtio_bus_if.m b/sys/dev/virtio/virtio_bus_if.m index 8d7b6db7d488..848c6ac05b62 100644 --- a/sys/dev/virtio/virtio_bus_if.m +++ b/sys/dev/virtio/virtio_bus_if.m @@ -56,7 +56,7 @@ METHOD int finalize_features { device_t dev; } DEFAULT virtio_bus_default_finalize_features; -METHOD int with_feature { +METHOD bool with_feature { device_t dev; uint64_t feature; }; diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c index cc7b0a8ed064..53e7de587195 100644 --- a/sys/dev/virtio/virtqueue.c +++ b/sys/dev/virtio/virtqueue.c @@ -128,7 +128,7 @@ static void vq_ring_init(struct virtqueue *); static void vq_ring_update_avail(struct virtqueue *, uint16_t); static uint16_t vq_ring_enqueue_segments(struct virtqueue *, struct vring_desc *, uint16_t, struct sglist *, int, int); -static int vq_ring_use_indirect(struct virtqueue *, int); +static bool vq_ring_use_indirect(struct virtqueue *, int); static void vq_ring_enqueue_indirect(struct virtqueue *, void *, struct sglist *, int, int); static int vq_ring_enable_interrupt(struct virtqueue *, uint16_t); @@ -418,14 +418,14 @@ virtqueue_nfree(struct virtqueue *vq) return (vq->vq_free_cnt); } -int +bool virtqueue_empty(struct virtqueue *vq) { return (vq->vq_nentries == vq->vq_free_cnt); } -int +bool virtqueue_full(struct virtqueue *vq) { @@ -733,20 +733,20 @@ vq_ring_enqueue_segments(struct virtqueue *vq, struct vring_desc *desc, return (idx); } -static int +static bool vq_ring_use_indirect(struct virtqueue *vq, int needed) { if ((vq->vq_flags & VIRTQUEUE_FLAG_INDIRECT) == 0) - return (0); + return (false); if (vq->vq_max_indirect_size < needed) - return (0); + return (false); if (needed < 2) - return (0); + return (false); - return (1); + return (true); } static void diff --git a/sys/dev/virtio/virtqueue.h b/sys/dev/virtio/virtqueue.h index a98dc4728259..b5c60b0ce951 100644 --- a/sys/dev/virtio/virtqueue.h +++ b/sys/dev/virtio/virtqueue.h @@ -85,8 +85,8 @@ vm_paddr_t virtqueue_avail_paddr(struct virtqueue *vq); vm_paddr_t virtqueue_used_paddr(struct virtqueue *vq); uint16_t virtqueue_index(struct virtqueue *vq); -int virtqueue_full(struct virtqueue *vq); -int virtqueue_empty(struct virtqueue *vq); +bool virtqueue_full(struct virtqueue *vq); +bool virtqueue_empty(struct virtqueue *vq); int virtqueue_size(struct virtqueue *vq); int virtqueue_nfree(struct virtqueue *vq); int virtqueue_nused(struct virtqueue *vq); From nobody Mon Sep 18 20:04:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqG3c3zJtz4tgrP; Mon, 18 Sep 2023 20:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqG3c3R0tz4LJd; Mon, 18 Sep 2023 20:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695067484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HGVBneMWfURldtx1pNm2bmv8zOiHL32UT74MLi8Vmxg=; b=kgOuNwpfmf9lvrFOZ4qapMkTsmeFM+Ip54O2Ezf+XZNKcUE+E7CSpH4lLtXa7c4J6V1EQ0 IRoO2ul6lNOWpPDw8blMTsVu+dc8MlvUzBZvUIzhXR3IEKWiRoR1+eKwMDHkmopWNcIxH5 1Icv1OCD0WunskZyW0+dWJgsD62dZjkZxaQ6h0iqZcbRwkOE5I0CTgn5K8is1b3ludOeS7 7ZRdcUdad1/P93VpmIVSdpnRmjlTZ2IKfr+5NzagrNTVnocohT1f2/hqSLoacDl5UEZR60 uXSuGldOgZdQAG1ufTKsv04/oR0iWWOLjNLI9HM9acqXf49vF9cwquiIG4cXOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695067484; a=rsa-sha256; cv=none; b=g7Oi2eJ7TmLzT6vmn969nyBP6Eks62wCaTsAROTFcOrnB4RGpVoD+CPqcMBHIIEMI8yBha mA99p9rwFacmoE3C8FUCZURvEYPgWW2cfIV/q7EJBDHRW1taeSerFFry2WnqHEFrXclEEU jTS1druxd9iZ3EdGySmWKWhEEnfjJN+wykVq83U/nEuMoMbEWwv7khuHfGCjY5ZFEhyecG Sx2J02G+lOpAuHqAn3iT+SX4Q5YBTcymOUeCw9w0B4wqG3tcpNtwWEOG5LZWMg9lj+sBCF 0cwcUmdIahYu4QI5M0XPS4TStaAT8cNPCuwFZebXRRF9NpbIV1sI+Iw8wO7nvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695067484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HGVBneMWfURldtx1pNm2bmv8zOiHL32UT74MLi8Vmxg=; b=mdnvWDQG4CW2A08Uf8txvovQkU9J3kei4Wb4gj/7UcpY9WUyQ4VnKzhbi5EXOZw2gup17s iVqdu4l1C24l/POZg1e5tvuSLiqHM5DHXwPDWjB63CPas6IBYTyewzfAf5TWYxsn5LgeD8 iC4oU/kNkzzEa65HMgRy31ekUJ7VKjiVkXP+I5fMUxUc5Dzlnt1RNsWy6qFL4bUPebY39Y RxNP8mhW1v9orrVH2NbylowP12EpITCOOwkhs2BIbn/tEhvESxW3cgOSp8319bOn3pWWXZ FLVBIbOoItc+P679aX0ZfZ357/QmNvdavPWSixUfEuxJP1DfeUjbiXm6z2iWUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqG3c1x7mzkw9; Mon, 18 Sep 2023 20:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IK4i5Y061602; Mon, 18 Sep 2023 20:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IK4iTQ061599; Mon, 18 Sep 2023 20:04:44 GMT (envelope-from git) Date: Mon, 18 Sep 2023 20:04:44 GMT Message-Id: <202309182004.38IK4iTQ061599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: 180c02405b12 - main - virtio: remove virtio_alloc_virtqueues' flags arg List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 180c02405b12e08bbb69bb693a38077db0c85e9b Auto-Submitted: auto-generated The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=180c02405b12e08bbb69bb693a38077db0c85e9b commit 180c02405b12e08bbb69bb693a38077db0c85e9b Author: Mina Galić AuthorDate: 2023-09-18 20:02:42 +0000 Commit: Olivier Houchard CommitDate: 2023-09-18 20:03:31 +0000 virtio: remove virtio_alloc_virtqueues' flags arg Summary: the flags argument is unused. Its initial design idea has been superceded by the addition of virtio_setup_intr and related APIs. Sponsored by: The FreeBSD Foundation Reviewers: bryanv Reviewed By: bryanv Subscribers: cognet, imp Differential Revision: https://reviews.freebsd.org/D41850 --- sys/dev/virtio/balloon/virtio_balloon.c | 2 +- sys/dev/virtio/block/virtio_blk.c | 2 +- sys/dev/virtio/console/virtio_console.c | 2 +- sys/dev/virtio/gpu/virtio_gpu.c | 2 +- sys/dev/virtio/mmio/virtio_mmio.c | 4 ++-- sys/dev/virtio/network/if_vtnet.c | 12 ++---------- sys/dev/virtio/pci/virtio_pci.c | 2 +- sys/dev/virtio/pci/virtio_pci.h | 2 +- sys/dev/virtio/pci/virtio_pci_legacy.c | 6 +++--- sys/dev/virtio/pci/virtio_pci_modern.c | 6 +++--- sys/dev/virtio/random/virtio_random.c | 2 +- sys/dev/virtio/scsi/virtio_scsi.c | 2 +- sys/dev/virtio/virtio.c | 5 ++--- sys/dev/virtio/virtio.h | 2 +- sys/dev/virtio/virtio_bus_if.m | 1 - 15 files changed, 21 insertions(+), 31 deletions(-) diff --git a/sys/dev/virtio/balloon/virtio_balloon.c b/sys/dev/virtio/balloon/virtio_balloon.c index c5d0e54dbee4..e1c373291d0b 100644 --- a/sys/dev/virtio/balloon/virtio_balloon.c +++ b/sys/dev/virtio/balloon/virtio_balloon.c @@ -314,7 +314,7 @@ vtballoon_alloc_virtqueues(struct vtballoon_softc *sc) VQ_ALLOC_INFO_INIT(&vq_info[1], 0, vtballoon_vq_intr, sc, &sc->vtballoon_deflate_vq, "%s deflate", device_get_nameunit(dev)); - return (virtio_alloc_virtqueues(dev, 0, nvqs, vq_info)); + return (virtio_alloc_virtqueues(dev, nvqs, vq_info)); } static void diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index eb693c7f2f51..43952a93dc75 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -707,7 +707,7 @@ vtblk_alloc_virtqueue(struct vtblk_softc *sc) vtblk_vq_intr, sc, &sc->vtblk_vq, "%s request", device_get_nameunit(dev)); - return (virtio_alloc_virtqueues(dev, 0, 1, &vq_info)); + return (virtio_alloc_virtqueues(dev, 1, &vq_info)); } static void diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c index d8048d0f1f6e..b69a473cf8a4 100644 --- a/sys/dev/virtio/console/virtio_console.c +++ b/sys/dev/virtio/console/virtio_console.c @@ -543,7 +543,7 @@ vtcon_alloc_virtqueues(struct vtcon_softc *sc) portidx++; } - error = virtio_alloc_virtqueues(dev, 0, nvqs, info); + error = virtio_alloc_virtqueues(dev, nvqs, info); free(info, M_TEMP); return (error); diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 0472bc98b3ba..0009d7bb3ec1 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -429,7 +429,7 @@ vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) VQ_ALLOC_INFO_INIT(&vq_info[0], 0, NULL, sc, &sc->vtgpu_ctrl_vq, "%s control", device_get_nameunit(dev)); - return (virtio_alloc_virtqueues(dev, 0, nvqs, vq_info)); + return (virtio_alloc_virtqueues(dev, nvqs, vq_info)); } static int diff --git a/sys/dev/virtio/mmio/virtio_mmio.c b/sys/dev/virtio/mmio/virtio_mmio.c index 6059ef76eceb..c706f91ecd15 100644 --- a/sys/dev/virtio/mmio/virtio_mmio.c +++ b/sys/dev/virtio/mmio/virtio_mmio.c @@ -76,7 +76,7 @@ static int vtmmio_finalize_features(device_t); static bool vtmmio_with_feature(device_t, uint64_t); static void vtmmio_set_virtqueue(struct vtmmio_softc *sc, struct virtqueue *vq, uint32_t size); -static int vtmmio_alloc_virtqueues(device_t, int, int, +static int vtmmio_alloc_virtqueues(device_t, int, struct vq_alloc_info *); static int vtmmio_setup_intr(device_t, enum intr_type); static void vtmmio_stop(device_t); @@ -537,7 +537,7 @@ vtmmio_set_virtqueue(struct vtmmio_softc *sc, struct virtqueue *vq, } static int -vtmmio_alloc_virtqueues(device_t dev, int flags, int nvqs, +vtmmio_alloc_virtqueues(device_t dev, int nvqs, struct vq_alloc_info *vq_info) { struct vtmmio_virtqueue *vqx; diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index f7ad385b3955..6445a9ebb998 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1018,10 +1018,9 @@ vtnet_alloc_virtqueues(struct vtnet_softc *sc) struct vq_alloc_info *info; struct vtnet_rxq *rxq; struct vtnet_txq *txq; - int i, idx, flags, nvqs, error; + int i, idx, nvqs, error; dev = sc->vtnet_dev; - flags = 0; nvqs = sc->vtnet_max_vq_pairs * 2; if (sc->vtnet_flags & VTNET_FLAG_CTRL_VQ) @@ -1059,14 +1058,7 @@ vtnet_alloc_virtqueues(struct vtnet_softc *sc) &sc->vtnet_ctrl_vq, "%s ctrl", device_get_nameunit(dev)); } - /* - * TODO: Enable interrupt binding if this is multiqueue. This will - * only matter when per-virtqueue MSIX is available. - */ - if (sc->vtnet_flags & VTNET_FLAG_MQ) - flags |= 0; - - error = virtio_alloc_virtqueues(dev, flags, nvqs, info); + error = virtio_alloc_virtqueues(dev, nvqs, info); free(info, M_TEMP); return (error); diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c index 1470dc83949c..b9aa36ef6d0f 100644 --- a/sys/dev/virtio/pci/virtio_pci.c +++ b/sys/dev/virtio/pci/virtio_pci.c @@ -324,7 +324,7 @@ vtpci_write_ivar(struct vtpci_common *cn, int index, uintptr_t value) } int -vtpci_alloc_virtqueues(struct vtpci_common *cn, int flags, int nvqs, +vtpci_alloc_virtqueues(struct vtpci_common *cn, int nvqs, struct vq_alloc_info *vq_info) { device_t dev; diff --git a/sys/dev/virtio/pci/virtio_pci.h b/sys/dev/virtio/pci/virtio_pci.h index 401cba25bbf4..2449cfc2826c 100644 --- a/sys/dev/virtio/pci/virtio_pci.h +++ b/sys/dev/virtio/pci/virtio_pci.h @@ -122,7 +122,7 @@ bool vtpci_with_feature(struct vtpci_common *cn, uint64_t feature); int vtpci_read_ivar(struct vtpci_common *cn, int index, uintptr_t *result); int vtpci_write_ivar(struct vtpci_common *cn, int index, uintptr_t value); -int vtpci_alloc_virtqueues(struct vtpci_common *cn, int flags, int nvqs, +int vtpci_alloc_virtqueues(struct vtpci_common *cn, int nvqs, struct vq_alloc_info *vq_info); int vtpci_setup_interrupts(struct vtpci_common *cn, enum intr_type type); void vtpci_release_child_resources(struct vtpci_common *cn); diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c index 72d637fb0f55..9853546e1af2 100644 --- a/sys/dev/virtio/pci/virtio_pci_legacy.c +++ b/sys/dev/virtio/pci/virtio_pci_legacy.c @@ -87,7 +87,7 @@ static int vtpci_legacy_register_vq_msix(device_t, int idx, static uint64_t vtpci_legacy_negotiate_features(device_t, uint64_t); static bool vtpci_legacy_with_feature(device_t, uint64_t); -static int vtpci_legacy_alloc_virtqueues(device_t, int, int, +static int vtpci_legacy_alloc_virtqueues(device_t, int, struct vq_alloc_info *); static int vtpci_legacy_setup_interrupts(device_t, enum intr_type); static void vtpci_legacy_stop(device_t); @@ -390,7 +390,7 @@ vtpci_legacy_with_feature(device_t dev, uint64_t feature) } static int -vtpci_legacy_alloc_virtqueues(device_t dev, int flags, int nvqs, +vtpci_legacy_alloc_virtqueues(device_t dev, int nvqs, struct vq_alloc_info *vq_info) { struct vtpci_legacy_softc *sc; @@ -399,7 +399,7 @@ vtpci_legacy_alloc_virtqueues(device_t dev, int flags, int nvqs, sc = device_get_softc(dev); cn = &sc->vtpci_common; - return (vtpci_alloc_virtqueues(cn, flags, nvqs, vq_info)); + return (vtpci_alloc_virtqueues(cn, nvqs, vq_info)); } static int diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index 84d9511798e0..6e3b08e244c0 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -112,7 +112,7 @@ static int vtpci_modern_register_vq_msix(device_t, int idx, static uint64_t vtpci_modern_negotiate_features(device_t, uint64_t); static int vtpci_modern_finalize_features(device_t); static bool vtpci_modern_with_feature(device_t, uint64_t); -static int vtpci_modern_alloc_virtqueues(device_t, int, int, +static int vtpci_modern_alloc_virtqueues(device_t, int, struct vq_alloc_info *); static int vtpci_modern_setup_interrupts(device_t, enum intr_type); static void vtpci_modern_stop(device_t); @@ -507,7 +507,7 @@ vtpci_modern_write_features(struct vtpci_modern_softc *sc, uint64_t features) } static int -vtpci_modern_alloc_virtqueues(device_t dev, int flags, int nvqs, +vtpci_modern_alloc_virtqueues(device_t dev, int nvqs, struct vq_alloc_info *vq_info) { struct vtpci_modern_softc *sc; @@ -524,7 +524,7 @@ vtpci_modern_alloc_virtqueues(device_t dev, int flags, int nvqs, return (E2BIG); } - return (vtpci_alloc_virtqueues(cn, flags, nvqs, vq_info)); + return (vtpci_alloc_virtqueues(cn, nvqs, vq_info)); } static int diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index d54e2e6b70d4..0b6ee1dcbf6b 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -265,7 +265,7 @@ vtrnd_alloc_virtqueue(struct vtrnd_softc *sc) VQ_ALLOC_INFO_INIT(&vq_info, 0, NULL, sc, &sc->vtrnd_vq, "%s request", device_get_nameunit(dev)); - return (virtio_alloc_virtqueues(dev, 0, 1, &vq_info)); + return (virtio_alloc_virtqueues(dev, 1, &vq_info)); } static void diff --git a/sys/dev/virtio/scsi/virtio_scsi.c b/sys/dev/virtio/scsi/virtio_scsi.c index 0355962c7af9..f6278434e5f9 100644 --- a/sys/dev/virtio/scsi/virtio_scsi.c +++ b/sys/dev/virtio/scsi/virtio_scsi.c @@ -504,7 +504,7 @@ vtscsi_alloc_virtqueues(struct vtscsi_softc *sc) vtscsi_request_vq_intr, sc, &sc->vtscsi_request_vq, "%s request", device_get_nameunit(dev)); - return (virtio_alloc_virtqueues(dev, 0, nvqs, vq_info)); + return (virtio_alloc_virtqueues(dev, nvqs, vq_info)); } static void diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c index 45a657542e28..8cfb045183b8 100644 --- a/sys/dev/virtio/virtio.c +++ b/sys/dev/virtio/virtio.c @@ -260,12 +260,11 @@ virtio_finalize_features(device_t dev) } int -virtio_alloc_virtqueues(device_t dev, int flags, int nvqs, +virtio_alloc_virtqueues(device_t dev, int nvqs, struct vq_alloc_info *info) { - return (VIRTIO_BUS_ALLOC_VIRTQUEUES(device_get_parent(dev), flags, - nvqs, info)); + return (VIRTIO_BUS_ALLOC_VIRTQUEUES(device_get_parent(dev), nvqs, info)); } int diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index 96ebaf653428..855dafd63033 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -103,7 +103,7 @@ void virtio_read_ivar(device_t dev, int ivar, uintptr_t *val); void virtio_write_ivar(device_t dev, int ivar, uintptr_t val); uint64_t virtio_negotiate_features(device_t dev, uint64_t child_features); int virtio_finalize_features(device_t dev); -int virtio_alloc_virtqueues(device_t dev, int flags, int nvqs, +int virtio_alloc_virtqueues(device_t dev, int nvqs, struct vq_alloc_info *info); int virtio_setup_intr(device_t dev, enum intr_type type); bool virtio_with_feature(device_t dev, uint64_t feature); diff --git a/sys/dev/virtio/virtio_bus_if.m b/sys/dev/virtio/virtio_bus_if.m index 848c6ac05b62..57ae90bdc917 100644 --- a/sys/dev/virtio/virtio_bus_if.m +++ b/sys/dev/virtio/virtio_bus_if.m @@ -63,7 +63,6 @@ METHOD bool with_feature { METHOD int alloc_virtqueues { device_t dev; - int flags; int nvqs; struct vq_alloc_info *info; }; From nobody Mon Sep 18 21:05:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqHQ90GFPz4tlW3; Mon, 18 Sep 2023 21:05:53 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqHQ83347z4Rbp; Mon, 18 Sep 2023 21:05:52 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 38IL5g3L099545 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Sep 2023 00:05:45 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 38IL5g3L099545 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 38IL5gVG099544; Tue, 19 Sep 2023 00:05:42 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 19 Sep 2023 00:05:42 +0300 From: Konstantin Belousov To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202309181453.38IErP3M046039@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4RqHQ83347z4Rbp On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > The branch main has been updated by dchagin: > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > Author: Dmitry Chagin > AuthorDate: 2023-09-18 14:53:01 +0000 > Commit: Dmitry Chagin > CommitDate: 2023-09-18 14:53:01 +0000 > > linux(4): On Linux SIGKILL can not be reset to default > > MFC after: 1 week > --- > sys/compat/linux/linux_signal.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > index e3e3fc74a6a9..9a84700b3949 100644 > --- a/sys/compat/linux/linux_signal.c > +++ b/sys/compat/linux/linux_signal.c > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > if (!LINUX_SIG_VALID(linux_sig)) > return (EINVAL); > + sig = linux_to_bsd_signal(linux_sig); > > osa = (linux_osa != NULL) ? &oact : NULL; > if (linux_nsa != NULL) { > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > linux_ktrsigset(&linux_nsa->lsa_mask, > sizeof(linux_nsa->lsa_mask)); > #endif > + if ((sig == SIGKILL || sig == SIGSTOP) && > + nsa->sa_handler == SIG_DFL) > + return (EINVAL); This is excessive: look at kern_sigaction() around line 822. > } else > nsa = NULL; > - sig = linux_to_bsd_signal(linux_sig); > > error = kern_sigaction(td, sig, nsa, osa, 0); > if (error != 0) From nobody Mon Sep 18 21:12:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqHYL5sBbz4tlb2; Mon, 18 Sep 2023 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqHYL5FBhz4Rw6; Mon, 18 Sep 2023 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695071526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgldPE2tYySSsVC/6LGbjis2nkqQRzwsrdhynHZfHhc=; b=whgNcQbQ1qVaReSNDsCxp1+JPCYqBWphppNxobFM7aGFiMD/m4YfPRN3/ZDOWg7HUZIAcg xC9PylvDpYtQEPoVR+JjSrjFdmdwPmWHvPsB6XsAlKgPwAIYXpsIXrz9DQN19X4pV75vEy mfmkoelcfX4t1v/mWBHHk1laUVRhXIB7u2+kGk9Pr71raycjfjFzkLUuolW6BlNdX98B9B 20Ubn+trZFv/fHWfo5eoJrD62IVknKuKX58vNBxM+dMHHGECQYzgKqfdPkj4y+T9phq0La 9ttYw+Nj3S3O5g3FBTSs5XvlB1YeqURa+UCmVLUBnIu8IcwP7eXQ6Rve2gFenQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695071526; a=rsa-sha256; cv=none; b=tCAmkekJwZFSnzumZ/xJSTRpECRGSOcqEzgGBbIm2zlon0cyiyBgp3WOBzczuGfUwjEaiL aa1GsLOmGOI7VtDADMvWV4hIkNd9YK+ECCw/QaiXeikGV7jvrC3o9r1ataZqz+vYTeVYnM XjTj8qMtEd7LshdYRGvO+M42tTa+i+YtebQN2YWcs90mNJe6iUJRLTnkHlkXTu1nJzwUxG TH/gfJ0ern7nAca/xR6vlS7ydfBQcvp+s2MJNR5+7VGhWG3QaWPoO4vONk8KEdG3p00hpj OMuLRExpT13fkSkWrDgeOjLtGWXTaMjKAcbyFmjePZvv27ZD9UW+s7noL2GmfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695071526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WgldPE2tYySSsVC/6LGbjis2nkqQRzwsrdhynHZfHhc=; b=OnPrTjc5F3rdwoSrkDX+iwC5BosxmT4kf17E++Rf51x6XUdEQ42+i8mFsAjwRdZKKOwoAX KpAazbVZfaAxWcEvh7nwneGNMKh7VzpmbWARbPylvK+KutDFeCkpbYjmD8V7fWpGMckbZf Nq8CYDhtO9Mq7w5NwYIoSwb/rJxULElf08diev7I7RUU5gefm+Nh4S2sQ9+VOCYO2rW+lH azspxO686zewAGVv5tC8Ra5LSBhPfTovEYZh4zEDiOM9kV9hyf2Z5s2ztuR7XzO8uPX0cm Nzs0imrYroTOP2Z6IGCe1MHEZkvVUfoPi6MhXf5Z8A1GM0jcwFi8YHPFvNYRMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqHYL4KhXzmVb; Mon, 18 Sep 2023 21:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILC6H6078514; Mon, 18 Sep 2023 21:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILC6Y8078511; Mon, 18 Sep 2023 21:12:06 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:12:06 GMT Message-Id: <202309182112.38ILC6Y8078511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c9130a46bca2 - main - drm2: whack set-but-not-used warns List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9130a46bca272492b4f29429ed340504b8eced7 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c9130a46bca272492b4f29429ed340504b8eced7 commit c9130a46bca272492b4f29429ed340504b8eced7 Author: Mateusz Guzik AuthorDate: 2023-09-18 21:11:26 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-18 21:11:26 +0000 drm2: whack set-but-not-used warns --- sys/dev/drm2/drm_fops.c | 2 +- sys/dev/drm2/ttm/ttm_lock.c | 2 +- sys/dev/drm2/ttm/ttm_tt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/drm2/drm_fops.c b/sys/dev/drm2/drm_fops.c index 5d040e92ed12..316d21a8e731 100644 --- a/sys/dev/drm2/drm_fops.c +++ b/sys/dev/drm2/drm_fops.c @@ -536,7 +536,7 @@ void drm_event_wakeup(struct drm_pending_event *e) { struct drm_file *file_priv; - struct drm_device *dev; + struct drm_device *dev __diagused; file_priv = e->file_priv; dev = file_priv->minor->dev; diff --git a/sys/dev/drm2/ttm/ttm_lock.c b/sys/dev/drm2/ttm/ttm_lock.c index 9a8cafbf2abc..1884acb12118 100644 --- a/sys/dev/drm2/ttm/ttm_lock.c +++ b/sys/dev/drm2/ttm/ttm_lock.c @@ -245,7 +245,7 @@ static void ttm_vt_lock_remove(struct ttm_base_object **p_base) { struct ttm_base_object *base = *p_base; struct ttm_lock *lock = container_of(base, struct ttm_lock, base); - int ret; + int ret __diagused; *p_base = NULL; ret = __ttm_vt_unlock(lock); diff --git a/sys/dev/drm2/ttm/ttm_tt.c b/sys/dev/drm2/ttm/ttm_tt.c index 55131c73bdc3..d52df50adeb3 100644 --- a/sys/dev/drm2/ttm/ttm_tt.c +++ b/sys/dev/drm2/ttm/ttm_tt.c @@ -243,7 +243,7 @@ void ttm_dma_tt_fini(struct ttm_dma_tt *ttm_dma) void ttm_tt_unbind(struct ttm_tt *ttm) { - int ret; + int ret __diagused; if (ttm->state == tt_bound) { ret = ttm->func->unbind(ttm); From nobody Mon Sep 18 21:59:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcD05Kfz4tp3r; Mon, 18 Sep 2023 21:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcC6Wcpz4cFW; Mon, 18 Sep 2023 21:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnuz+zxiO1V9iDIqMyNBMu8XDLcf1El5qLWM+HY5Zdg=; b=ThN7S+qn7oV0rCXZ5ffB3HtXERUmjfZrvGW05zZbyTGwmlicfoo7JT7TKLkkae1dmc4CZG efqL3nY7utLaUl652yRtR+s3ZfAecSrl7h2WcS/xbrvOkjfPCj22Y7pnI4MV69EB/BIdFy tTVjEilobD4lLkghFZ+M0beXJVTbcmoaiLef8zsNo0TEWzfPlKIObXVryWI7Vi8+sECvcf WwFVgDSj12IpADFl95xhrvVLbuVob0W09uaJpsg9tiMhOq2oOZAjGYzji3gbitKPwZj5gA L+90xSaiO4r3KPRo30Cjmy3ynAx3pV6ooypMOrqFfHs7st9nmh/1FVYC2T0bRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074379; a=rsa-sha256; cv=none; b=KCFQrY600rW5gNBmIPYMhzuXqrAPPU2wTyN9d/Y1FVobz35irQyG5qiPmA4qJgxoA0N7hc BJLN7UbTWB+pClgTWNjCthSMGfNLtlqqfqNbCMGas25uL3mRxIA5pmefhipU0Is3QiEOjI 4/RGZ/idNRfoUgx4MefR4ouZUDYeONmnntsFTvbyuQPPET9w4e3STP98bWEDxgDsKbjiF6 xaq9UcXl8CeER163NcHYR+rsmQG/WpqjnjXe83jaQn3bB4PTwYbkmXG1x+SFNwDiQz70Te LBmZPkSOzfOaj5KiEuMb3/QwHlFg0jbvIo6sQTmX7HWicF94ZJqPQ67T5A/Lyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnuz+zxiO1V9iDIqMyNBMu8XDLcf1El5qLWM+HY5Zdg=; b=siDhHWZyfPGTD9wCLDO5gevtKeMdLCHlZ3WtClnfguwaho7bLJM+hKwlQrwkptxBCPgOeF zwp04Je2rxwadbaeNnh5G6ZUwplxAmzUZXizW2ucDCdZ5Sp6kh3aB7lCp07v42DgGElaoD obYEKnmAEyDYAghlYU8hAHZg2TIet1esnEWV0kk31prQBh2PYPgyovYIRg6OyOICfE+uJK vJ9d9974u1OYe5LW1w7xjL7RJGVsW/uC53fmAxnIyBRE00ZDL/9PlgLoN7BHIMndrV2MRI juAGH51a3MrsXPVLklCawkW7D+O6NNJgrkkJ5LFXGSYrvGvTWFCcrOOCPt0Zlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcC5LVWznYK; Mon, 18 Sep 2023 21:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxdOh045132; Mon, 18 Sep 2023 21:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxdcC045129; Mon, 18 Sep 2023 21:59:39 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:39 GMT Message-Id: <202309182159.38ILxdcC045129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a8f5c9d3305f - main - bsdinstall.8: Set Bl's -width correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8f5c9d3305feb8e846e2ebb6511e350c2702eca Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8f5c9d3305feb8e846e2ebb6511e350c2702eca commit a8f5c9d3305feb8e846e2ebb6511e350c2702eca Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 17:49:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:09 +0000 bsdinstall.8: Set Bl's -width correctly MFC after: 3 days --- usr.sbin/bsdinstall/bsdinstall.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 44a577c8e430..58f4e8e6dcdd 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -23,7 +23,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 18, 2022 +.Dd September 18, 2023 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -69,7 +69,7 @@ For interactive use, most users will be interested only in the and .Cm script targets. -.Bl -tag -width ".Cm jail Ar destination" +.Bl -tag -width "jail destination" .It Cm auto Run the standard interactive installation, including disk partitioning. .It Cm jail Ar destination @@ -272,7 +272,7 @@ Many are used internally during installation and have reasonable default values for most installation scenarios. Others are set by various interactive user prompts, and can be usefully overridden when making scripted or customized installers. -.Bl -tag -width ".Ev BSDINSTALL_DISTSITE" +.Bl -tag -width "BSDINSTALL_DISTSITE" .It Ev TMPDIR The directory to use for temporary files. Default: From nobody Mon Sep 18 21:59:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcF0bKmz4tpLt; Mon, 18 Sep 2023 21:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcF03Ysz4cfg; Mon, 18 Sep 2023 21:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31E4iqTLrOH6LviqUvZsHP1j/5uWQc0vo57CjyvYzK8=; b=scqVlJfW41hNp18KwmwIQA6UHdi+8RI+n8eBsSX+UX81rfP5WwmOeZyXGqSdDM1fOmL7Ch vcj6HkeMlp0vIZt0GW8ggltCu2b1uITKfhvPFktk6Rbe03HRi62iUxb+q2u3bEP3d8mXwP hOq0iPr2kKlScxGUbar//23UGHrhmngh7ZrghBsJh6JGNtmIywpoU0sYO4ekeFFpfkzOAD B3aK4fJgw1mDMjokdL1CG07jCShxN38sjWiHOVolpc1+cAP8++b0wZ+9qHnnIqBMdkG+jy zRO6lhL4GFYdN1L/wFMymGg4V1Hs5Xe4YdN4MK1mUESwayvaD3PACodvz4HtcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074381; a=rsa-sha256; cv=none; b=jDD4on7vp8swSexDPPQoZI3trKmMGfjDl4VYc6dzI+iFvT4iYISyGijXCljJr2H4V6KKBh SN6aZtMBtM/oJ8H8MevPySUGa+G4mLl2eIQx3N8FEaXi00YYyB323rtPtiOvtgmA2A9CcK MumzzO5lXsGhmWKUvFG/z7qGmpCmBCqDMSy3/GIIIFuC1kEAlzMXXedo7Ve2JP8LNKTo9W S/SKeQy/PP6FrpQGms7dRYYplKe0aLuwaxoPU3O7/eMplTbB2iUtoR8SzLNOrQ+TrzaiHE QkJbAHcgiWC7zhzS6zgIlk631aHX7kIqJvcRlulsf3r8QwGuzUXecij4i+uNEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31E4iqTLrOH6LviqUvZsHP1j/5uWQc0vo57CjyvYzK8=; b=hVkHPvdVMksyip9B7gVR6Swf8jAlZ8QTuIv1qM6UHPg8FcDE3QyL9RwtnN/h+lMts6qc1i 1VbAc9XdsvmrtC1Q2MSSroWTkO5yMPE8IJ2OUkv09VlfoY81o5qIdcIX7yJPh9OGlmNhb8 FXg0mRI/NNaVa9PgkADE+0pKtyEkXsF0Ribk7ta9aoVLt+IvApCMtRyAMsr9LWw8f9SxyF laRIw54aFKOPfAJujae18+5FwPhSQ9CKBK+EofjESWgUt4fkD3FHpBDHScXU+m+R8pW38a 86J38bgzqTPsOPcRMKpGJhyoWf1rbubRMtPBhYfde3yE+DdZhu/8Al1wBdq/vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcD5xcSznLX; Mon, 18 Sep 2023 21:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxeCY045178; Mon, 18 Sep 2023 21:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxeEX045175; Mon, 18 Sep 2023 21:59:40 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:40 GMT Message-Id: <202309182159.38ILxeEX045175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: fea2cffb8659 - main - bsdinstall.8: Document BSDINSTALL_SKIP_* variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fea2cffb8659da1590401e04ce8cbf823c9da66c Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=fea2cffb8659da1590401e04ce8cbf823c9da66c commit fea2cffb8659da1590401e04ce8cbf823c9da66c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:11:30 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:09 +0000 bsdinstall.8: Document BSDINSTALL_SKIP_* variables Fixes: 17f4ded55180 bsdinstall: add variables to allow skipping MFC after: 3 days --- usr.sbin/bsdinstall/bsdinstall.8 | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 58f4e8e6dcdd..77da9622d4d7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -323,6 +323,58 @@ Default: Path to a log file for the installation. Default: .Dq Pa $TMPDIR/bsdinstall_log +.It Ev BSDINSTALL_SKIP_HARDENING +If not empty, the +.Cm auto +target +will not invoke the +.Cm hardening +target. +.It Ev BSDINSTALL_SKIP_HOSTNAME +If not empty, the +.Cm auto +target +will not invoke the +.Cm hostname +target. +.It Ev BSDINSTALL_SKIP_KEYMAP +If not empty, the +.Cm auto +target +will not invoke the +.Cm keymap +target. +.It Ev BSDINSTALL_SKIP_MANUAL +If not empty, the +.Cm auto +target will not offer to open a shell in the new system +for final manual modifications. +.It Ev BSDINSTALL_SKIP_SERVICES +If not empty, the +.Cm auto +target +will not invoke the +.Cm services +target. +.It Ev BSDINSTALL_SKIP_TIME +If not empty, the +.Cm auto +target +will not invoke the +.Cm time +target. +.It Ev BSDINSTALL_SKIP_USERS +If not empty, the +.Cm auto +target +will not invoke the +.Cm adduser +target. +.It Ev BSDINSTALL_SKIP_FINALCONFIG +If not empty, the +.Cm auto +target will not show the final configuration dialog, +where earlier configuration choices can be revisited. .It Ev BSDINSTALL_TMPETC Directory where files destined for the new system's .Pa /etc From nobody Mon Sep 18 21:59:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcG3tfvz4tpRR; Mon, 18 Sep 2023 21:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcG1D38z4d0L; Mon, 18 Sep 2023 21:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9K9ZdRgIcFcvRpu5eh0VEIN27RzCLBXIsT2Lx4K/eag=; b=GmogkDlyAc2VQDLalvHpLe8DeCOJyWjsvs8LQRJzmhw0b14BD0EcEo2w16fHJOjISnF3/E yPtJ4qth9EPbnWysV2jh4UrepxsoZJWw2gQNhUkmSulKpDbslXLNWy/OcBGpgrM4n+Ahy4 APWRckj1nxqtO2RZLqBUEqi/KdjIwYKJZL07Pr78EY0GRszFw7KYO8oRol1Ep1ECI0O7GU PXwagUzOYZ8UeDzXh4bUrXmiIXKiKd+j/aEwj9x9/rKlq6Sc3HZUKSRpVLs38NGkZr8Jmg riHDkkl11uTeaOedvsOilGaJJ25lCJVE4ZE8Mu0Dz27n8OUnSm8pc+jf7mOarg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074382; a=rsa-sha256; cv=none; b=qBrCGaLZoVmmlUt4y01/4bcSZjrliVM9V0Tp7Dke042xcqHMzI8dATB4LaZnHgcbIir8UM g+4JwsQtyyd5glibVpV735QkfvDnYKaKntr9Nl15s/5qXEuhrUNm6Dg5OmD2tCrijWwbRh drfRaWyudw3fPWDms15/Oo7G4kidM4wszEtS/l4KgXmpT6OVH7x5047PyXq9jV7gNnCnb8 fyCANvw6iojS8dy2/sVj6lTLfPudkGA/5X6jphpA7f0cO+cr9a2BcnwNnr/ofx5t2Vj0Tz CxTPZIbmhXEjZAtHYWYNtNy9AMd0potF6T1gJS4RxHXjUPay51Ofr3Q0CzBZQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9K9ZdRgIcFcvRpu5eh0VEIN27RzCLBXIsT2Lx4K/eag=; b=CPaIp5dSKnHr2IK9mBjdafeiqdUNO0B3pWg3mLEc0Z4vmGmn7JQzpGhRdMfjFuzGWHpapw xxSK7/XkLzVoeyFmK4JL9D5/0ht1EHH6vN7UYOgIe52fai5Co5R4soWIxNUU7ojgHWuNsk iXdp4jI0rmLkKj7KkexA0YiezlHwHMdAU7mIdW+2Ks4edpSTDZmUyMMwmnSwMGsOWIQq7W 6A/Gu6HHY9QDcN2cb5zWD8+sMZcnlP9a+A9WqB0wNQeFLS5TZB5iGPgIdjBNfK08CGwtWs EPbO2JX2CWLefsMzqweXnHVpUmzvgEwvI+a3jA+fghz3Q7oDZlO0n7sEByY2DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcF6cZKznYL; Mon, 18 Sep 2023 21:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxfVe045227; Mon, 18 Sep 2023 21:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxfjD045224; Mon, 18 Sep 2023 21:59:41 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:41 GMT Message-Id: <202309182159.38ILxfjD045224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 735637f7d687 - main - daemon.8: Use Dv for signal names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 735637f7d68777d0befa4b9a9291f3fc02b5ed00 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=735637f7d68777d0befa4b9a9291f3fc02b5ed00 commit 735637f7d68777d0befa4b9a9291f3fc02b5ed00 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:28:27 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:09 +0000 daemon.8: Use Dv for signal names MFC after: 3 days --- usr.sbin/daemon/daemon.8 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 4c7064fc9b67..35b877039e4a 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -69,7 +69,9 @@ specified by the other options. .It Fl H , Fl -sighup Close .Pa output_file -and re-open it when signal SIGHUP is received, for interoperability with +and re-open it when signal +.Dv SIGHUP +is received, for interoperability with .Xr newsyslog 1 and similar log rotation / archival mechanisms. If .Fl -output-file @@ -89,7 +91,8 @@ and .Fl -sighup the absolute path needs to be provided to ensure .Nm -can re-open the file after a SIGHUP. +can re-open the file after a +.Dv SIGHUP . .It Fl m , Fl -output-mask Ar output_mask Redirect output from the child process stdout (1), stderr (2), or both (3). This value specifies what is sent to syslog and the log file. @@ -177,7 +180,9 @@ waits until it terminates to keep the pid file(s) locked and removes them after the process exits or restarts the program. In this case if the monitoring .Nm -receives software termination signal (SIGTERM) it forwards it to the +receives software termination signal +.Pq Dv SIGTERM +it forwards it to the spawned process. Normally it will cause the child to exit, remove the pidfile(s) and then terminate. From nobody Mon Sep 18 21:59:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcH1zXFz4tp5x; Mon, 18 Sep 2023 21:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcH1TYjz4cs2; Mon, 18 Sep 2023 21:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BmdQkU+LBuoAie9hAstH5mQklonwGNSdpXECNe3eNtU=; b=ENoLQBUGsibusmYCq4MCPhccax1dDvwXOLjn0YgwBfeyz94fOzRM5az8908rD3nYJSYG9m 3WfSj0lH1FnLD7pGupjWKwkTAGitWSCSisKbrqp/300AwN+pJ+gGIAssOzqF6gmgEv7od5 ycsdS06JkQeKitBc2L2Yxch9KgwG7Ur89B0bOeqiPZvdNKctd0xNxZQ12RFx4KtnNZ5RWe jyIEq2gWzR813/iS43ihyCU0Qh0W9X3zriKinmlPEEBit2ntGroc44BTPi5exDLHiWxT5w ydxPj1z/DHjvu4VLc1Ffs2tuMEvIdpjSlA59TFXNuaunvZna5unQ3xDR4cjMLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074383; a=rsa-sha256; cv=none; b=NwhD8jV0d/IL0f94Ayw35WeSnSIKIUktIW6ePP/WTmbkXXdZ57kYt1je9vSZHDXaXFpgCR Xm0BWYT6PVjUcRRujNXge2vIZDJtr6GsKquYp754HQzgFMK9MgghiEN2/zcf/cR0r8C2NK FYXxyYQm4AIS6OtIhJrFTqJ0Hf4W05+DE3fNpvxrCXxYZEXwoujUD4GIhNAQVHkr9ToO3/ ZbsRGSJ+jAjFeJEaaWKr0z8YBdSIMKDGjBXrmeB9weKJTyjXWs662qQD76G8z6YCq+YXqj 3TgTHtQKEww2iPt6NCMUuY70NB8NMXDBdpfpXUDaQjfKmu3Yc2PHVB06CWyqzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BmdQkU+LBuoAie9hAstH5mQklonwGNSdpXECNe3eNtU=; b=NX9F66AbQ1s2smbNmDyZO9EB7Whcka1DQBsAmAEwg3x0O5Lcqcy/yvZaWtljytYlkxrZhC +QK14a3LVWR+8krINA7H36srt043wi1rBsWL4i2cUSs8bPkLFu0OkwoBKS4H6TJwGT8xbo uBxh4ZX/YPKSPo8JZM5VfQoew7EHPIzwLMN48KaHfwywlOt56/mOXbbSXj+ibpb2wzIgrJ iZdJyyTo44L2lWU+gRChcfSFUvkJfPRSXnk3xjJZo78GIXECnM+FiyJQbgQdHEVluoeICA KXWne1BZWDEuAw06AcyFe1BrR+DOP8feZpJjDyZRHRAIjLBWbE1qEhQRN72uQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcH0F0GzmsV; Mon, 18 Sep 2023 21:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxgu9045269; Mon, 18 Sep 2023 21:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxgBA045266; Mon, 18 Sep 2023 21:59:42 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:42 GMT Message-Id: <202309182159.38ILxgBA045266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a5bc8e8a5863 - main - daemon.8: Use Cm where appropriate List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5bc8e8a5863c4aea5ed7ebe2ebc2332c287545c Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=a5bc8e8a5863c4aea5ed7ebe2ebc2332c287545c commit a5bc8e8a5863c4aea5ed7ebe2ebc2332c287545c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:36:33 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 daemon.8: Use Cm where appropriate MFC after: 3 days --- usr.sbin/daemon/daemon.8 | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 35b877039e4a..87b9bec0b3e8 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -94,9 +94,15 @@ the absolute path needs to be provided to ensure can re-open the file after a .Dv SIGHUP . .It Fl m , Fl -output-mask Ar output_mask -Redirect output from the child process stdout (1), stderr (2), or both (3). +Redirect output from the child process stdout +.Pq Cm 1 , +stderr +.Pq Cm 2 , +or both +.Pq Cm 3 . This value specifies what is sent to syslog and the log file. -The default is 3. +The default is +.Cm 3 . .It Fl p , Fl -child-pidfile Ar child_pidfile Write the ID of the created process into the .Ar child_pidfile @@ -148,17 +154,29 @@ The default is the daemonized invocation. Login name of the user to execute the program under. Requires adequate superuser privileges. .It Fl s , Fl -syslog-priority Ar syslog_priority -These priorities are accepted: emerg, alert, crit, err, warning, -notice, info, and debug. -The default is notice. +These priorities are accepted: +.Cm emerg , alert , crit , err , warning , +.Cm notice , info , +and +.Cm debug . +The default is +.Cm notice . .It Fl l , Fl -syslog-facility Ar syslog_facility -These facilities are accepted: auth, authpriv, console, cron, daemon, -ftp, kern, lpr, mail, news, ntp, security, syslog, user, uucp, and -local0, ..., local7. -The default is daemon. +These facilities are accepted: +.Cm auth , authpriv , console , cron , daemon , +.Cm ftp , kern , lpr , mail , news , ntp , security , +.Cm syslog , user , uucp , +and +local facilities from +.Cm local0 +to +.Cm local7 . +The default is +.Cm daemon . .It Fl T , Fl -syslog-tag Ar syslog_tag Set the tag which is appended to all syslog messages. -The default is daemon. +The default is +.Cm daemon . .El .Pp If any of the options From nobody Mon Sep 18 21:59:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcJ2nVQz4tpFX; Mon, 18 Sep 2023 21:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcJ29QVz4cxk; Mon, 18 Sep 2023 21:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jUuKUeS3ilbnsDjU2lFKe932k5l+cweJg+5R9rIEsDI=; b=wJhyMjUQkhYe2/Ju1sMcBL+gxDArfJODyHmGtYydzvVC0h3Lkj+eNOKPRddTko8UlhiJCZ swOF2B+TFovJ5Kd2NzogZrIGUfejTkGFv2L73Txe7HiqXLFyK4pZKRnMoltsEpZu7qnWSq 5HAYQrRjFkDXj/UeZfZXQuJ2dErsdWa1IT9txb/72gx5hLozj2zInu7uz33rva7pKQFtTe QnaL6RUkSzptcVTJjaxwmwyXHnKVctvHm/kl4c+X0HqcZKMWrlvM03O9jS3NzwtQ5BLplo lR1T7Ojjtxmam7kEpbKhAkhe/Rntmjkudz3zWi0KE2IjUh6LZCNdZO4s+/ZYLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074384; a=rsa-sha256; cv=none; b=cRltiTjoyZh0xDt5Dk/qDthVBWkwJy1pl8RE93SUwuZRO5FfDT63EBXKqcoQXCJeswZzAr s7VutVP8+mxeyO++eFeTILnY9wr2WRlowwKq/nIcrr4nLWcdQdfP1XBpyOcwEt0jqFoBFx zb2vdJdcNc6HKh8/94zx79/1A3o/3MG6cOfllImmVcDhm9Sqw10aV9PZW7lxlPUfIp3jM8 o+i0PluMmhAB+KWC8WsJ0ICJmk4XiySJCcJMjvYGyKj2vcCm0ihUHYfN9aEhk8WDPGbKdG VBF+tWjEjL8ChsCgOfQ7IDj3AGUvSL4GAp8/y+IUc1w50ukBdkTtGzMpV+O6kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jUuKUeS3ilbnsDjU2lFKe932k5l+cweJg+5R9rIEsDI=; b=aFH/bkR0TZQ9WOT3CNgk6tnBTGsYdArfcdTIXS4LPZNMzTNlhvM+AYPOUTDCabQbGiudJT axws9WfZuacKskHBb4Eer/Mh2UYggD47LsbhtwUuT9SZvb/1gJwzSE7WF6rpX8rjRXBgyw DM5KM/MP4wEgCOAo1hEKDub+VA3h+ahQhySAQT6Byyev0M+jSH0bqbjpZqc7xXpry3k2Iz yNKAc+aclUhJsuPyns5ntiYJcfA1wH7yakzLJ8nsEK66g3gTqUVQ+A+dmi5R1082r7sfeR 38/pl8B7U6Q34Mimrpmq7+dcZXa6gVl3uUcAECcf3g797NHbXnfKOuPSA7A+aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcJ14yBznNq; Mon, 18 Sep 2023 21:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxisn045315; Mon, 18 Sep 2023 21:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxiRN045312; Mon, 18 Sep 2023 21:59:44 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:44 GMT Message-Id: <202309182159.38ILxiRN045312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ee23e1e49666 - main - daemon.8: Sort options in DESCRIPTION List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee23e1e49666e2c6edd0e5d749d3562587dcb9a7 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee23e1e49666e2c6edd0e5d749d3562587dcb9a7 commit ee23e1e49666e2c6edd0e5d749d3562587dcb9a7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:40:23 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 daemon.8: Sort options in DESCRIPTION MFC after: 3 days --- usr.sbin/daemon/daemon.8 | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 87b9bec0b3e8..5ccf18566240 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -76,11 +76,28 @@ is received, for interoperability with and similar log rotation / archival mechanisms. If .Fl -output-file is not specified, this flag is ignored. -.It Fl S , Fl -syslog -Enable syslog output. -This is implicitly applied if other syslog parameters are provided. -The default values are daemon, notice, and daemon for facility, priority, and -tag, respectively. +.It Fl l , Fl -syslog-facility Ar syslog_facility +These facilities are accepted: +.Cm auth , authpriv , console , cron , daemon , +.Cm ftp , kern , lpr , mail , news , ntp , security , +.Cm syslog , user , uucp , +and +local facilities from +.Cm local0 +to +.Cm local7 . +The default is +.Cm daemon . +.It Fl m , Fl -output-mask Ar output_mask +Redirect output from the child process stdout +.Pq Cm 1 , +stderr +.Pq Cm 2 , +or both +.Pq Cm 3 . +This value specifies what is sent to syslog and the log file. +The default is +.Cm 3 . .It Fl o , Fl -output-file Ar output_file Append output from the daemonized process to .Pa output_file . @@ -93,66 +110,55 @@ the absolute path needs to be provided to ensure .Nm can re-open the file after a .Dv SIGHUP . -.It Fl m , Fl -output-mask Ar output_mask -Redirect output from the child process stdout -.Pq Cm 1 , -stderr -.Pq Cm 2 , -or both -.Pq Cm 3 . -This value specifies what is sent to syslog and the log file. -The default is -.Cm 3 . -.It Fl p , Fl -child-pidfile Ar child_pidfile -Write the ID of the created process into the -.Ar child_pidfile +.It Fl P , Fl -supervisor-pidfile Ar supervisor_pidfile +Write the ID of the +.Nm +process into the +.Ar supervisor_pidfile using the .Xr pidfile 3 functionality. The program is executed in a spawned child process while the .Nm waits until it terminates to keep the -.Ar child_pidfile +.Ar supervisor_pidfile locked and removes it after the process exits. The -.Ar child_pidfile +.Ar supervisor_pidfile owner is the user who runs the .Nm regardless of whether the .Fl -user option is used or not. -.It Fl P , Fl -supervisor-pidfile Ar supervisor_pidfile -Write the ID of the -.Nm -process into the -.Ar supervisor_pidfile +.It Fl p , Fl -child-pidfile Ar child_pidfile +Write the ID of the created process into the +.Ar child_pidfile using the .Xr pidfile 3 functionality. The program is executed in a spawned child process while the .Nm waits until it terminates to keep the -.Ar supervisor_pidfile +.Ar child_pidfile locked and removes it after the process exits. The -.Ar supervisor_pidfile +.Ar child_pidfile owner is the user who runs the .Nm regardless of whether the .Fl -user option is used or not. -.It Fl r , Fl -restart -Supervise and restart the program after a one-second delay if it has -been terminated. .It Fl R , Fl -restart-delay Ar restart_delay_seconds Supervise and restart the program after the specified delay if it has been terminated. -.It Fl t , Fl -title Ar title -Set the title for the daemon process. -The default is the daemonized invocation. -.It Fl u , Fl -user Ar user -Login name of the user to execute the program under. -Requires adequate superuser privileges. +.It Fl r , Fl -restart +Supervise and restart the program after a one-second delay if it has +been terminated. +.It Fl S , Fl -syslog +Enable syslog output. +This is implicitly applied if other syslog parameters are provided. +The default values are daemon, notice, and daemon for facility, priority, and +tag, respectively. .It Fl s , Fl -syslog-priority Ar syslog_priority These priorities are accepted: .Cm emerg , alert , crit , err , warning , @@ -161,22 +167,16 @@ and .Cm debug . The default is .Cm notice . -.It Fl l , Fl -syslog-facility Ar syslog_facility -These facilities are accepted: -.Cm auth , authpriv , console , cron , daemon , -.Cm ftp , kern , lpr , mail , news , ntp , security , -.Cm syslog , user , uucp , -and -local facilities from -.Cm local0 -to -.Cm local7 . -The default is -.Cm daemon . .It Fl T , Fl -syslog-tag Ar syslog_tag Set the tag which is appended to all syslog messages. The default is .Cm daemon . +.It Fl t , Fl -title Ar title +Set the title for the daemon process. +The default is the daemonized invocation. +.It Fl u , Fl -user Ar user +Login name of the user to execute the program under. +Requires adequate superuser privileges. .El .Pp If any of the options From nobody Mon Sep 18 21:59:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcK3WRjz4tnxs; Mon, 18 Sep 2023 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcK31Mrz4dDt; Mon, 18 Sep 2023 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZarewCyGp9MDOp0JprEPuSSO6bKkySyD+GhFY2c63M=; b=L4cmcBqvOlV47Yxc5Bs4Aqb3JP6ANWb6D8obVEsyVCaQYzuVqZg8TgJ9rfIkvak2ygVayY InCmk4DQfi6Vg1dLiUu7CkTI/q2suf9pnvPlAT/MTaW/0Kad2jxn00KI6pEPhbvMfmRU1B ho3AdSVhz/7PKnIRcP0MZTCIPd/9p5EbZBVEu73s4WnGexlsnZBe4kivrb1vPMenSA1v1Q SbxSYHhSAsJ4pCWpJZQ6c0Eg4e/XmPb6EivHvzG0DQNfg0H9HEuaATJG4mZuZqs2q7COZ/ KRyMF0IgtwUX1uIf8RhyLvoB33hkL0d50jaUvRbRvPp+n+YNw484CpSxNCzlHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074385; a=rsa-sha256; cv=none; b=ofWr+WkP4hkhdqzpRvbVepy+OnSFtTNcU+nPj7KH3Kqhamuh/f2r9MD0UM77bUSxGBDHz1 OVM4VVJRJg1MkHjUr57EHH+ihJmJWYj2qZiqzf6DqYD8fm0zihhNXGO5LPkg9QoAzXKpWD 3DCvdV8ckgcIeCx/TwV/7Nv5faQHUE4J+EfaYN7SPV8CtlxCJIkTjBT6f9hTNvcDf/rfiU ggFT8Yvx/DLjDVd4AsfUGWPpIduUclKuH1m/+mtyk7qBM8oAeKjL62Ea1YMZPSkRLVzOg/ BPdCPkDBKtVEvTbv+Jvr0SYPpRrlLYAmkyEZtW3RpJQC4xtG4eYdaXMBY7+2Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZarewCyGp9MDOp0JprEPuSSO6bKkySyD+GhFY2c63M=; b=Dbo+A4oCUzMUNaWxBCuOu04R9kK22NtAqr8704O+ZrP4q/muFqxQ47FjMnAhlZMxxEspBs U6uvnd2wxU4YGoSMgTFHU7vhixzmp31du+n+T0q6TAKqqfSLGRy4XwTXW0BWeNEed0DVZi Cq3VG3NtrzosnsTWlcFa/BHnciC73mn7H7z9bdLcU5vHkthUKHAhOs1Jpqo/rQLznYS7Vu ikQCmUoLm82EnV1I/zJiSEzWZVqPzL3FHraukBS+T+USwmFAJo6b3eLKKQDZTepDm0qknO lhCgcUv/ysrtcLqeEIuYokHV6bbWYFSSLXMAVMmvcEL+KeFBvwjMWx1iMDMS5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcK273Kzn8t; Mon, 18 Sep 2023 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxjb2045366; Mon, 18 Sep 2023 21:59:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxjva045363; Mon, 18 Sep 2023 21:59:45 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:45 GMT Message-Id: <202309182159.38ILxjva045363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c1207678f7eb - main - daemon.8: Document -u sets HOME, USER, and SHELL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1207678f7ebd546a0705dabc3218e49abe06a99 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1207678f7ebd546a0705dabc3218e49abe06a99 commit c1207678f7ebd546a0705dabc3218e49abe06a99 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:17:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 daemon.8: Document -u sets HOME, USER, and SHELL Fixes: 6b3ad1d73732 When -u option is used also set USER, HOME and SHELL MFC after: 3 days --- usr.sbin/daemon/daemon.8 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/daemon/daemon.8 b/usr.sbin/daemon/daemon.8 index 5ccf18566240..fce08bc90e62 100644 --- a/usr.sbin/daemon/daemon.8 +++ b/usr.sbin/daemon/daemon.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 14, 2021 +.Dd September 18, 2023 .Dt DAEMON 8 .Os .Sh NAME @@ -176,6 +176,11 @@ Set the title for the daemon process. The default is the daemonized invocation. .It Fl u , Fl -user Ar user Login name of the user to execute the program under. +Environment variables +.Ev HOME , USER , +and +.Ev SHELL +are set accordingly. Requires adequate superuser privileges. .El .Pp From nobody Mon Sep 18 21:59:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcL4csGz4tpY3; Mon, 18 Sep 2023 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcL44Wyz4d2P; Mon, 18 Sep 2023 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tcXDLGTzXnjtOY6pSNRLjTCdGINhTX/qx6HUZ+5akHc=; b=vvazdbGUbR5l4OmLs7Nigb5uyhLfExkc7sJGfniXk9vx1IzVykQmZvHvmmN8mOqnx4rNHR hGzD2CDJAYScr1eJ0Hmr5U3vAB2HARHRvLXoG41dO6qZ0mubsP3hb434hSiv+rb/ycrhXa /XbivAcHrgW96I8j1oQzEluBlEOWKX5f7PFMTpS6FQHKahjbKdXMfCsscucxA6Of+StV+x yRMnEhCeQHy5NFubI69JeSL0cT0ysV30VluvjvIbLgQ5nODK8lMhB1DRz+B61nNkDIKANT 8vILxjH8L1oV2vJ/sh/HKd+WO1TqbMcvN5KXeZzQFgrEOSdEwx0IYfTp5jLekg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074386; a=rsa-sha256; cv=none; b=VNFsbqUZjK5E9DgtBOu8HjKc31AEu2hDn9VNeGPhGq5U0ffT97fMFEWTE5yul0AFYmiwWC nX7JOF2Fb4NXZASvF0FkTYXhbG+AAaqrzPACbELlX97P2H+h4a8f0Y2+3CvlyWKcFN0t72 Oarn89tWObm5/fstkHaTJ5mchq1ser3E7Jm96gtoq6Ns6CO/WY4O6EZ06m+N0yd7vus49g AqCsojn5RBNkjOo+uBwv9t9PO0uQ9XLiKJfDo2dJcmxUL1uDAn9edY9na7z0Wp9KNJOkjr UMSBDQpj1ZlWkXEShmDZ/YpZEaovfohMoXehLJzMeCB3S9pHyPr12PK8PCQkSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tcXDLGTzXnjtOY6pSNRLjTCdGINhTX/qx6HUZ+5akHc=; b=BIw1EdOGug42vzphctFJQl53XZc7lo3uyzv+3FX8O0xLMz+hDiK4AK5R+SWVHbq0VtKET0 PM9z7uC+vMG7WXt7jhIP7vadxDo3OumaKqm1B00YdtY+M5kMREQ0x9kNG1tDVgApPccadz ULs3MvtLC5WKKzn9Svlx6SwsYSyPE3bUVnuUolHiIkyzLk2LVga9Bz2OlovsdW5p3NWjzb nRJWrVzft/SJdubYIWRYNCOXGRkS/iChpXozsZGmZUXp0ilOhEh8sIO0e5UVGrMkWtXnox 51I7I8kGUwnFKbjpSO0uUVap/6xxntUnvFoZA4VREViD/GJY3O6GTuaEMlB1XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcL37msznm9; Mon, 18 Sep 2023 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxkEK045405; Mon, 18 Sep 2023 21:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxkVD045402; Mon, 18 Sep 2023 21:59:46 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:46 GMT Message-Id: <202309182159.38ILxkVD045402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b7961dba30e6 - main - rc.conf.5: Pet mdoc linters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7961dba30e60fb0d1a5383cf03e5ea2fd2ff607 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b7961dba30e60fb0d1a5383cf03e5ea2fd2ff607 commit b7961dba30e60fb0d1a5383cf03e5ea2fd2ff607 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:47:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 rc.conf.5: Pet mdoc linters MFC after: 3 days --- share/man/man5/rc.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 4d7d25fd71d1..17c92ee663f7 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 11, 2023 +.Dd September 18, 2023 .Dt RC.CONF 5 .Os .Sh NAME @@ -3990,7 +3990,7 @@ The configuration filename used by utility. The default value is .Pa /etc/jail.conf . -.Pa /etc/jail. Ns Ao Va jname Ac Ns Pa .conf +.Pa /etc/jail\&. Ns Ao Va jname Ac Ns Pa .conf and .Pa /etc/jail.conf.d/ Ns Ao Va jname Ac Ns Pa .conf will also be used if From nobody Mon Sep 18 21:59:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcM6Gwtz4tpJP; Mon, 18 Sep 2023 21:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcM4TGFz4d6L; Mon, 18 Sep 2023 21:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH4WhZw99K8G+RSNDbi4uoPmnv5pziqLvQJsSpIeanM=; b=KTph7QKr0Il313EUVhnH5CCg11nnQhOt/TNxwXs5iDpSurWAsK37cJGCuztD7GWktTJqOu 7Y8dSIcc6Frcm42cRuDcc4C4u26yttNlvyHF+he3y+/BkvF5Ys+loY1hHX3AgqGrMwBja5 1vG6JdmR8Ieyw9f7r+a0v4haQfq03zOXGUWg+VGFVOW8hXQgxNrdIsCnAktFLIVUR8X1Tf SxUkkEl3g25b+/pPinQicJGTLJjXx7zdDhABtO92zeePmwYiUIuNF8ho1EO2coPw9TxU4s irR/kX0qI/G5x8zpTWm/an3k5FshEga344/KF2KkW/prmNlr93G7+OGOzn6ttg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074387; a=rsa-sha256; cv=none; b=QMpb+jgvuIMfZmgrRs6U08nJvzziEDa2MyVdtZxgS8LhsXeX0x27voy6ncCAb3IgiLDkOh PPnoQFLbU9v6h535mmjTeQsgbL6uLx9RozLhY7Q1WpGWwaqliSVyyMPRo4Kygr9Oa4IVtz hbeSv3C4xu4px/dpIHpPqnEbArUUj8FYDBXMU7wkRbVtIgqA7UR6sv0cJM+h4JKhbrjPID lbxABsyuY/406CXBFIB08MAKrRpoUhEnJgyz5CWgjN27SihEzFFzi55kyEe1NIhkwMaWXV wKBfmbGg5dnUFWR0mU/arXk887sma9sUdZvdWchAIKVKBCM6G9T5S9ZWivsYQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vH4WhZw99K8G+RSNDbi4uoPmnv5pziqLvQJsSpIeanM=; b=u+qMrkAGFSV3/R8IbSgNHn7LgVX/1XSQMegVIK99QLoaCDDRVZaEnw9plRpIeh0FWRFkmh Ris4I5dpzP82UGnqJCwYwrp3attpr/gWtw009tIUNXpKaPSvxvfO2plOFjvOqQ1ngmrUiI wnFIPH+/v4hJtzAb8tFvIpfp5RAvhnUUW3Hbm+u0SjmkF/qftde9Kxken4GMY/pqFtLyAi Yui2VcBxG4GsKKIuF7N95hdnXFyf6fGMHrhcJCu5LqpYcXznZ/BbIKhCKEgSBgQZop4+zk 0Go7QWIPcwjTGPSNrx9RF9p7ex0h3nz1K/1RShsRmZju18FgQeRPEAcLM40ICA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcM3YhjznNr; Mon, 18 Sep 2023 21:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxl4e045451; Mon, 18 Sep 2023 21:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxlaQ045448; Mon, 18 Sep 2023 21:59:47 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:47 GMT Message-Id: <202309182159.38ILxlaQ045448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5e3a8a4a035e - main - rc.conf.5: Document _setup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e3a8a4a035e6ff779cf54217870a259eb593d97 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e3a8a4a035e6ff779cf54217870a259eb593d97 commit 5e3a8a4a035e6ff779cf54217870a259eb593d97 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 18:53:45 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 rc.conf.5: Document _setup Fixes: c9be47b34dd8 rc: add ${name}_setup script support MFC after: 3 days --- share/man/man5/rc.conf.5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 17c92ee663f7..a76cb1a04e0a 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -250,6 +250,11 @@ such as PostgreSQL will not inherit the OOM killer protection. .Pp This variable has no effect on services running within a .Xr jail 8 . +.It Ao Ar name Ac Ns Va _setup +.Pq Vt str +Run the specified setup script right before starting the actual service +command. +Useful for automatic configuration file generation. .It Ao Ar name Ac Ns Va _umask .Pq Vt int Run the service using this From nobody Mon Sep 18 21:59:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcN6b1kz4tpVg; Mon, 18 Sep 2023 21:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcN5XTKz4d4Q; Mon, 18 Sep 2023 21:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2uPeTRrwX1+FoWNuC4V24fXw25Z2D9yYjv0iTMJlV8=; b=S3zuHiYAkaQCTDUXfY1AHIUrBe0PEv7l0GwZqhuSaVUfZx5qftXgb3gi1V2ANRgTYBhijR 5ce0BvKkbHJR2gjcRUH73KROaZoYH4H22b4o4aAdGZ8TXxWRUxx6LlAzzrEbzTIu5SEkLb rGKvT+SskN1mqm2csliYdhJvBUg6MDNE2KMJDKQbNVaKRFA+MPx4WtNZZr7epLsye/wR2T i9aSNSa1jCkKOLl+dJWJo8tzbRWcYu+sV9Tt237LcS0xPoK+uixQySoCIynLyuH43NjUAU leuALE8pnjpsnXpw0JI+IAWthEa+WP3HQ65EOjSBcP8QmsfW2LDfOCcGJYif6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074388; a=rsa-sha256; cv=none; b=ejCDDkGc2J1ZWHUo0QJbRUp/6ggtB9BZhi6g+JPAcGpSXsvYC7mTdvJHRaHfrD7nhEk3NU 3d05hRpYjWSluZBBAIDUezB/97+innzJcdJ2NhB4CQTfHLgZnGG1c+hZ7oRIiLnoU311B0 p2WiElrjQwqXBE2gw49giXbb4g6tB9fx/OJA+j4J2tQVfHArUmwdY4ouEdKj/g5SIkHToh rnaZ/thp/xaAPd6GdJgmNemKQ8PKvReHp8QKgdQQiJfDIqNpiGvNfBylTmUbrgC6lp2jM/ OiJpu79eFwXJqOJUXqLl9sXtixnfCqzsJk66/h5w6FtbZG2BFwrO4Ym8DzCARw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2uPeTRrwX1+FoWNuC4V24fXw25Z2D9yYjv0iTMJlV8=; b=j5f0ICI1R283zs1PakPBuKvUNq9TMY1PQLjWuVAbyCRPHKSLK07yboDPvBnVQZx9TWha+D rQnlKOB+iQRpAUcDACou6VcC7dsck+1p2RPbK4b1qMNjrQVQ18GJBfQccL5L/SPEnSlUOh NIALh0okCmAHq9bC+jwTjT2z4YFL5e9UyuoFzKuvgzzCM8k4U0pWXlvTztGAvgyeGyLSrv pLtIQyT+gu4oTjCSsoroACFtRERxxhhUWrd/n8YYi/oehCphdxe+GA4DL14C7aWp6e2Kfm wMzeB61k6ao/BdPed6+PVNXTlaLeToVbfarO5MWc+zpOGpNgyqKpAxpNBkzTxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcN4bj4zn8v; Mon, 18 Sep 2023 21:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxmVm045493; Mon, 18 Sep 2023 21:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxmTh045490; Mon, 18 Sep 2023 21:59:48 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:48 GMT Message-Id: <202309182159.38ILxmTh045490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d13b8b3e7255 - main - at.man: Fix mdoc(7) macro usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d13b8b3e7255ad01b25ab512983af88d78fc1e53 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d13b8b3e7255ad01b25ab512983af88d78fc1e53 commit d13b8b3e7255ad01b25ab512983af88d78fc1e53 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:12:31 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 at.man: Fix mdoc(7) macro usage MFC after: 3 days --- usr.bin/at/at.man | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man index 58d53e2e75d5..328be8f346b9 100644 --- a/usr.bin/at/at.man +++ b/usr.bin/at/at.man @@ -81,15 +81,15 @@ or to run a job at a specific time of day. (If that time is already past, the next day is assumed.) As an alternative, the following keywords may be specified: -.Em midnight , -.Em noon , +.Cm midnight , +.Cm noon , or -.Em teatime +.Cm teatime (4pm) and time-of-day may be suffixed with -.Em AM +.Cm AM or -.Em PM +.Cm PM for running in the morning or the evening. The day on which the job is to be run may also be specified by giving a date in the form @@ -101,34 +101,35 @@ or giving a date of the forms .Ar DD.MM.YY , .Ar MM/DD/YYYY , .Ar MM/DD/YY , -.Ar MMDDYYYY , or +.Ar MMDDYYYY , +or .Ar MMDDYY . The specification of a date must follow the specification of the time of day. Time can also be specified as: -.Op Em now -.Em + Ar count \%time-units , +.Op Cm now +.Cm \&+ Ar count \%time-units , where the time-units can be -.Em minutes , -.Em hours , -.Em days , -.Em weeks , -.Em months +.Cm minutes , +.Cm hours , +.Cm days , +.Cm weeks , +.Cm months or -.Em years +.Cm years and .Nm may be told to run the job today by suffixing the time with -.Em today +.Cm today and to run the job tomorrow by suffixing the time with -.Em tomorrow . +.Cm tomorrow . .Pp For example, to run a job at 4pm three days from now, use -.Nm at Ar 4pm + 3 days , +.Ql at 4pm + 3 days , to run a job at 10:00am on July 31, use -.Nm at Ar 10am Jul 31 +.Ql at 10am Jul 31 and to run a job at 1am tomorrow, use -.Nm at Ar 1am tomorrow . +.Ql at 1am tomorrow . .Pp The .Nm at @@ -151,7 +152,7 @@ The working directory, the environment (except for the variables .Ev TERMCAP , .Ev DISPLAY and -.Em _ ) +.Ev _ ) and the .Ar umask are retained from the time of invocation. From nobody Mon Sep 18 21:59:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcQ00Hpz4tpFn; Mon, 18 Sep 2023 21:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcP6Yy1z4d57; Mon, 18 Sep 2023 21:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyoK1M+eHWfPDvnu2JwmalrVaHyYWefYTLhnIk3Xe4I=; b=eB+RBgF7qwgzD7lmxjXM3+aTGZZv2yaDg7uiVJT31Mzr8F+VLE5PIkl3vvl1iHPjWkVXOI rfv/02ncVSCziyAqULdh5LXKi16UyHlDnQHuivbKf7F10m2wQT0Gl8agualM1S+7u5hSKd OIHiAbO0IVx62gYnY/M+wxBs33PkseHQ12y3pwy4r8HQY57c1DpYdzFEgGqm/rVUvklkl3 an/AlJWjFB14ekeEMvBmpKVChUKSJ6oo2zFDEHEw3QzmonSyxSXMFYLRfbs5gKphuNTuFh iAt2uESpYkZtNVRofVJlf/aH7cMgM+bF4kqljjVDZZQFAWAfCeCb9zJ+Iw+YvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074389; a=rsa-sha256; cv=none; b=He/m34D0Da1UJljElgJYQFeXUZjTfsPY7fHoInSacuCrr9Hyu+AcQH+Xit0E3DNJjzY+EW WWS+hBmlA47UFojleddBYeq1CKMvaWu46HKGKuO0pCmstOZ/stN+ckpB1lmQBLNwRx1rhQ N5sv1CMbqUNJryjT7MjbwSVlDMFg84tUMkYk8/SExdmDTrr/36F7LpPoZipi4LnlbKSBeE J0YV9EB17zKFIICDwdPgWQ4PejBqJ4tmVW568Z1i+pA4jIv9WlBdhP2H4JQk2+RLctKZgE 11R553wbXPpOcp9HMLMCjaiBfH6Bh4SbrOYbfm+ItNyiDWOO/8NtfWKFS18OTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kyoK1M+eHWfPDvnu2JwmalrVaHyYWefYTLhnIk3Xe4I=; b=nx50z6TsDBI8xyHkjDhr836PVluYRZ/T0/uDyuqsz3fqX0mOKYOi7958cjFn7+8DYBEfyQ EgYsS1R0zBLjwjjzzvr1r1O80EcTwY/b3FqJkEVCGsQsRgxOnwwc5n3cLeEGYtCMcN/CuS xrghblGIFpSVzquKa1SOrkqEkGr5YCfuklhX+ANX+LdKw8RG8rgQC3mct2OAGzuVujECK3 oQleq4galzxNX8302yK7Rifci5VBrEg+a4UhTpyKRrnKbWptql1eqc8cHN8jR4DmP959td BZriYG3qd8gv1DCLcRIjs43bd69sc/GcqhzVrBncgA4nTJsIpbFf/qmLw1y0qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcP5fzYzmsW; Mon, 18 Sep 2023 21:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxn9P045541; Mon, 18 Sep 2023 21:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxnvi045538; Mon, 18 Sep 2023 21:59:49 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:49 GMT Message-Id: <202309182159.38ILxnvi045538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: cd056e3cd4e4 - main - at.man: Move examples to the EXAMPLES section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd056e3cd4e421fd50245bb2aa6f989b23e861bc Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=cd056e3cd4e421fd50245bb2aa6f989b23e861bc commit cd056e3cd4e421fd50245bb2aa6f989b23e861bc Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:17:52 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 at.man: Move examples to the EXAMPLES section MFC after: 3 days --- usr.bin/at/at.man | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man index 328be8f346b9..a1002da6545f 100644 --- a/usr.bin/at/at.man +++ b/usr.bin/at/at.man @@ -1,4 +1,4 @@ -.Dd August 11, 2018 +.Dd September 18, 2023 .Dt "AT" 1 .Os .Sh NAME @@ -124,13 +124,6 @@ may be told to run the job today by suffixing the time with and to run the job tomorrow by suffixing the time with .Cm tomorrow . .Pp -For example, to run a job at 4pm three days from now, use -.Ql at 4pm + 3 days , -to run a job at 10:00am on July 31, use -.Ql at 10am Jul 31 -and to run a job at 1am tomorrow, use -.Ql at 1am tomorrow . -.Pp The .Nm at utility also supports the @@ -328,6 +321,22 @@ deny permission control .It Pa _ATJOB_DIR/_LOCKFILE job-creation lock file .El +.Sh EXAMPLES +To run a job at 4pm three days from now, use: +.Bd -literal -offset indent +at 4pm + 3 days +.Ed +.Pp +To run a job at 10:00am on July 31, use: +.Bd -literal -offset indent +at 10am Jul 31 +.Ed +.Pp +To run a job at 1am tomorrow, use: +.Bd -literal -offset indent +at 1am tomorrow +.Ed +.Pp .Sh SEE ALSO .Xr nice 1 , .Xr sh 1 , From nobody Mon Sep 18 21:59:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcR1Z3Sz4tpRh; Mon, 18 Sep 2023 21:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcR0jFYz4dN3; Mon, 18 Sep 2023 21:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJW5ULHNQD6ouYbA5PF//wY5di0Y4u9MAp7JNzzCEdA=; b=PqOhiDn3NDBaDXIPNE4Gy+w/8L8Elhwe/vLOHlVs9ngjRnm7/btL0GTP7OAYe2Kwa3FbBj i25brDXWu2YrsoKQgO7dfS/lfJZWKm/Fq1yVhsrQPAkLJub5VSA1wW32KzbAy/qyK99Yp5 TLgUkGLLYG6WESQIcznAvsQSlCK03KJARJHcJp5IJo7w1hQXcBensBkhHQbH0So3mtxRXX wuqtETr7o3OpKnvwtyxcfODmLnSqygVBzHJ1ILSqF/flPb+UrTbi+9Q+3iUKjXJCSdgzTs eUi78ywEeQTMFnox53Yces987TdskrrQ+/exqmyEJCGfdxFsTNvRyyCRXJjxPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074391; a=rsa-sha256; cv=none; b=Ho7+i7aV1TInRgnRnd1ZtAufnFvamdGmMsD0vOS4fdapogyz6nMzQc67+HlRNCa+bPfpah E+kYq+aTTWPqkVauH9zXa8rBkszbyFPPKZZuhy7wpKxc9iEpNGKTfwdCegLtmAmo/Ej76R S+mGQwtQURTwg7YGCkQg4O4k9tLxH8oklRlB0QgtB81mM+YBPWBkICSx6V4p6SiOtLN+Qe djmtfDMP6hRl0rjPJrUtvsIRiKBpT0e1PFxcGLseLqyLDp/XuLk+TJiJVTUGkNMgWyJxfS GKsPhKkq4m/UWTjzrz89hHqraNOsVzbX9ciMIgV6ND4aQGKQjKkC3L074E+K/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJW5ULHNQD6ouYbA5PF//wY5di0Y4u9MAp7JNzzCEdA=; b=Lxkx0IqJrdHZ4NmwD5Qp6zmy93OlEKtqMwLgSQaEFUXffb178iqxc8JTZypJ7FkRXlb8Ft V4hxFCseUmtckPJCMZDfwCRSmG0BPGYB90jKDGeLbwaZo56Wo8oRxaKKYERAMwQgmfIHn2 hSIBbY/LGUwYseCWQiFUzjmNwNNKQyrQ10mhFXh7cK2cbsbuXHcslX/dy8v++R7uJWlMFz ZXxn8UgZC8b7sTtfEgXgC78BI6ayCFWd/dZM27VQzuF49ZxUvpil3Zu5P9llAAGxSLPoyf Jf5JVtYpta/58+msLlP7rIdjytqy9zEebShUhy5oIvRCeGwBhw953KDLQARwaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcQ6gYCznmB; Mon, 18 Sep 2023 21:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxoh6045586; Mon, 18 Sep 2023 21:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxoIk045583; Mon, 18 Sep 2023 21:59:50 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:50 GMT Message-Id: <202309182159.38ILxoIk045583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: adbc93c4cc86 - main - tmpfs.5: Fix the use of Bl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adbc93c4cc862b6fc6e7992f6e8c78745d0d36eb Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=adbc93c4cc862b6fc6e7992f6e8c78745d0d36eb commit adbc93c4cc862b6fc6e7992f6e8c78745d0d36eb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:24:22 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Fix the use of Bl MFC after: 3 days --- share/man/man5/tmpfs.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index a89be6885d3e..ac5ddbf759d3 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -51,7 +51,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 21, 2022 +.Dd September 18, 2023 .Dt TMPFS 5 .Os .Sh NAME @@ -108,7 +108,7 @@ The following options are available when mounting .Nm file systems: -.Bl -tag -width "It Cm maxfilesize" +.Bl -tag -width "maxfilesize" .It Cm gid Specifies the group ID of the root inode of the file system. Defaults to the mount point's GID. From nobody Mon Sep 18 21:59:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcS44kVz4tpP6; Mon, 18 Sep 2023 21:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcS1Dvxz4dmk; Mon, 18 Sep 2023 21:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/rYXL0utDFjJ/6qRugr97g2hRr7iE5AjrIp6dSFQnQ=; b=aCOVcTp4MYFZh9yNcBjhzCB4w9PV4USbKJBw0Yf8rxr2yHLXIfqyKhWDvptOKdL+OZNRX5 nqo5fXxnI6v6giOOct8OP/bUPGZ4q/dLR1mL4AyB4FT7vlEhBwNC/w/Wd9xyBzHpYr/08t 4NNQWjR9cprW+uL2MNt/U2HAN+5atXmT1cMv3wiu/AK1FEnaRN6PgYq7vmImBrsqQ4K87v Ag7X6M5EcXG534J1kon6Dx/bexu4/ClVqJ/PhBHoBb1ipoKmO/mf4ccOkk1Dq92I7mWjIe 1p3qaOly8fNzJiLgI4fBkY0NqmsKmI0OOu4Tgb/xbi7BW3Hezfu/7qnXwenTWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074392; a=rsa-sha256; cv=none; b=MLkmQx5AzEIhc+v8WI/nb6QCtipzeWgXwcOEtnYjIctKUvrJsXjTArg7xnJSBfqSE1h4AH uiE7d667R7Dqh8Aw5Ll3mQkHtt2APbhErsGbPTb6FE/pqzc1UJQCi99XJfb3JsJqJhuyoV 8bYjABA1B+JdWcSXoU4Dp49eF4U6afRP8ZUtNJWYoczFvmRw8enme0Dja0SEG4Fi0QZswT M513jxxB3kAoLLiEpRjO5h1eFupmlSbDR6GdoZUS5gIVMafPzTRgYfigQjKHR4Ofx9JbnZ GOXreZbQb2ixYII8O4MTENAFcnuposiFqq/6koGjfmU8DUrB/yBYxx5LJwa7ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/rYXL0utDFjJ/6qRugr97g2hRr7iE5AjrIp6dSFQnQ=; b=A8vBZeTkzVjkuJVtTDzv6KDEgL2XhJaFaJmdNo9ORhOm3UGh3KF+xe04VeVeKLUnynooyb I8cdawn4liWoCHLPZLlsurEK0TUJS0kCrZxjcQTN/c+ItCJXdXrfA3J/9DiA+o+3gkSCtI rAv0MBF5M6D34SV0A3/xmTeTSwncuWCt8jsH031ljDujouaDxwkrBpmBLzH7BCWxV5pQbv R0DHVS4djuniSyMuIRRwyB7umhhlCa2+UqNFyyJbNOqPpz2gzz1oFG1xK+Kxeel/c7cSx1 h4Z/swiX0iXxunlMN0aFbaS/BHIwuBOpeHDeRtr6HMRyyoc/eBbL0CBHOZGQjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcS0LMCzn8w; Mon, 18 Sep 2023 21:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxpFq045637; Mon, 18 Sep 2023 21:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxpo1045634; Mon, 18 Sep 2023 21:59:51 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:51 GMT Message-Id: <202309182159.38ILxpo1045634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0789d988a95e - main - tmpfs.5: Keep the style of option descriptions consistent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0789d988a95eba5bd45fbe82a4ebd4dc7e957797 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=0789d988a95eba5bd45fbe82a4ebd4dc7e957797 commit 0789d988a95eba5bd45fbe82a4ebd4dc7e957797 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:29:42 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Keep the style of option descriptions consistent MFC after: 3 days --- share/man/man5/tmpfs.5 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index ac5ddbf759d3..1644e1c5d1bb 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -110,37 +110,37 @@ mounting file systems: .Bl -tag -width "maxfilesize" .It Cm gid -Specifies the group ID of the root inode of the file system. -Defaults to the mount point's GID. +Set the group ID of the root inode of the file system. +The default is the mount point's GID. .It Cm uid -Specifies the user ID of the root inode of the file system. -Defaults to the mount point's UID. +Set the user ID of the root inode of the file system. +The default is the mount point's UID. .It Cm mode -Specifies the mode (in octal notation) of the root inode of the file system. -Defaults to the mount point's mode. +Set the mode (in octal notation) of the root inode of the file system. +The default is the mount point's mode. .It Cm nonc Do not use namecache to resolve names to files for the created mount. This saves memory, but currently might impair scalability for highly used mounts on large machines. .It Cm inodes -Specifies the maximum number of nodes available to the file system. +Set the maximum number of nodes available to the file system. If not specified, the file system chooses a reasonable maximum based on the file system size, which can be limited with the .Cm size option. .It Cm size -Specifies the total file system size in bytes, unless suffixed +Set the total file system size in bytes, unless suffixed with one of k, m, g, t, or p, which denote byte, kilobyte, megabyte, gigabyte, terabyte and petabyte respectively. If zero (the default) or a value larger than SIZE_MAX - PAGE_SIZE is given, the available amount of memory (including main memory and swap space) will be used. .It Cm maxfilesize -Specifies the maximum file size in bytes. -Defaults to the maximum possible value. +Set the maximum file size in bytes. +The default is the maximum possible value. .It Cm easize -Specifies the maximum memory size used by extended attributes in bytes. -Defaults to 16 megabytes. +Set the maximum memory size used by extended attributes in bytes. +The default is 16 megabytes. .El .Sh EXAMPLES Mount a From nobody Mon Sep 18 21:59:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcT3tfCz4tpP7; Mon, 18 Sep 2023 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcT2ZNXz4dhc; Mon, 18 Sep 2023 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eZAu9y+56F/yIAqyym9ACHdELsAelxBlWb+3D2XxaE=; b=X0azVO4rj3SBN+usVQ8uS6IV+KR4QDI1Mtx9uSWlQoKQipdTv898OoviG5vVIh7ce5ij8l RBZi1nsutNtS6BC7wLWUVeFApSkcGDLkeyIIOQpixblcVU2eZESQ3ndA/o2EzAdMVvvAqX 2zoIRq482tV972jK8njEk9FewQPBFqyc8vw3jPLuWNj1qR0VlXeSprPeeebXHCsWOYOoIj c4bCpN8GXRj1vBVcSPFOwnbwCLE6E3Uanxn1odbOkd6f3zIfMy7phxiRXJKrZXUicWugVK 6tSP42ePZEXYvEyb1sN4MS7tghXQIU0hw5jFOnzgYY/GCcepjQpHDbBlxtaCWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074393; a=rsa-sha256; cv=none; b=ugeFyvYfEsn8VnK5mPOzSqg8bo+IcoWe5OXLkHU5KE+2G11v6vZGQl4NBeWgwYNLbGKPct LFbkRhio0B1Y6IKdjoKz/8pYOZInjkk5GvW/Rk9KOT4MnHGx1LhCBSuN7sas6EU7L7TIIQ ZLbokNCVCVYT/dZuPtHBtw5XHhOm5lJ24QXpmD5h5GEc4A1b/rErFbFyTLyrL6NuxLkiMe 3/YKVYx5PfaufWKqhxBRhGIfY6vlqV5kye1pXp1hdvfgbUuCFMrEOYTWsibMDdgbe+31z0 T9pZuaBPXer0S0uDHWHdaWaDHiSGu3sDDrrRCHaR48vgcKPa1S2nsEoEHMPRRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eZAu9y+56F/yIAqyym9ACHdELsAelxBlWb+3D2XxaE=; b=lgT4gEtjsz5UHvW5V6BNJuM8cIvXgwqjNQXsWGmXDRygAZljR7Sqz4KN9YjQLoHvv89Hpn DbwRgcqaYkw0EIpTFsZinvFGsTy68PdzKxrj4nKLb698D052u7km1F11jYQ/P6wKbk+bla MEotA4+f7/kIddjtyY6HHMiblTMqwLz3tRb4c88KTzQp20TeckaVQckJdkRiAdcYVj3Y7X hUomCOKri6dHlwyEDkHl7+nu2Pl1JAFewq7KnoQ/9RHMIGwlaACBsj/MZQEDQQsi3yVH0k EqPLKW0Tg3Me/EjGnbz+ds+5I+1U+ljKCdjP99Jzp67+oj3rq/q8EXLgGe7WSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcT1Nlyzngk; Mon, 18 Sep 2023 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxrC2045682; Mon, 18 Sep 2023 21:59:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxrIK045679; Mon, 18 Sep 2023 21:59:53 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:53 GMT Message-Id: <202309182159.38ILxrIK045679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e69a5788273b - main - tmpfs.5: Sort option descriptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e69a5788273b4f531a49054e0238424826375633 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e69a5788273b4f531a49054e0238424826375633 commit e69a5788273b4f531a49054e0238424826375633 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:31:24 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Sort option descriptions MFC after: 3 days --- share/man/man5/tmpfs.5 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index 1644e1c5d1bb..8999fef40f46 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -109,12 +109,21 @@ mounting .Nm file systems: .Bl -tag -width "maxfilesize" +.It Cm easize +Set the maximum memory size used by extended attributes in bytes. +The default is 16 megabytes. .It Cm gid Set the group ID of the root inode of the file system. The default is the mount point's GID. -.It Cm uid -Set the user ID of the root inode of the file system. -The default is the mount point's UID. +.It Cm inodes +Set the maximum number of nodes available to the file system. +If not specified, the file system chooses a reasonable maximum based on +the file system size, which can be limited with the +.Cm size +option. +.It Cm maxfilesize +Set the maximum file size in bytes. +The default is the maximum possible value. .It Cm mode Set the mode (in octal notation) of the root inode of the file system. The default is the mount point's mode. @@ -122,12 +131,6 @@ The default is the mount point's mode. Do not use namecache to resolve names to files for the created mount. This saves memory, but currently might impair scalability for highly used mounts on large machines. -.It Cm inodes -Set the maximum number of nodes available to the file system. -If not specified, the file system chooses a reasonable maximum based on -the file system size, which can be limited with the -.Cm size -option. .It Cm size Set the total file system size in bytes, unless suffixed with one of k, m, g, t, or p, which denote byte, kilobyte, @@ -135,12 +138,9 @@ megabyte, gigabyte, terabyte and petabyte respectively. If zero (the default) or a value larger than SIZE_MAX - PAGE_SIZE is given, the available amount of memory (including main memory and swap space) will be used. -.It Cm maxfilesize -Set the maximum file size in bytes. -The default is the maximum possible value. -.It Cm easize -Set the maximum memory size used by extended attributes in bytes. -The default is 16 megabytes. +.It Cm uid +Set the user ID of the root inode of the file system. +The default is the mount point's UID. .El .Sh EXAMPLES Mount a From nobody Mon Sep 18 21:59:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcV44Mhz4tp6P; Mon, 18 Sep 2023 21:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcV3T32z4dvy; Mon, 18 Sep 2023 21:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rytz0GmOn1+NgT0/XzfiAJSERGSleLIJWlA0dd+HWk=; b=Q8symku2Rp8g4VRnKCwTrmLah9VT5+adUa0pYU0EviUD7ghl/hEDFOfN09d8Q+2EZ9v9z/ sD0Enh6d7ZUxrhAKrM9s1wWAzL0+pWC5zXYgBSszzancjJUKVI9Tf8kZooFQ7g2bMMFZe/ GUrhzchp7o29al6jl4hPzKIikKFLqaiyc4+F/KaKAg+LiWT7q0JEn9L+zd7tDZ6cuA6Bv9 0ZdMKXF5phAntCcRkMTPrk8GWxSoMddmxSx/2f0dErZVJcX4dujnIrwGeDGUfhroinpK9e 7tOIq6VEFYziYbj2Hyr8z59HP7D0TloTcL+Xln9j5cB0nmBEn6ATE1sSWj0Gzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074394; a=rsa-sha256; cv=none; b=wlnfOWsoCNOOSl78J5zs8JV5Yy6KW8mJSRRZiQyIiCMxuM9B1bN1j7B6cmkOiELme21TBW MeDUZUnsp7uzijXyCiGhJiCgceaHHR67+L/6FtGw2TWX5IZdRQLDCi+2sQMOPVOIVi++6Y VNTmIyWu6R6VXftxFz2Q8uNuAvg2cgJ9UGnhoGuqOZs734nvewkuRyYkR4qbO6mEoU5gEY 1DMn6pbmCzf1XAgICglmnIrtutxfFgcvwAa+fX9/g+hIZNSrcVm5o1XVBBw7z0e2SgoR1H GQkT82twTOlE1vnj8vtf+IGz3u2PXOoMstG4AwsUWFNYF6/9tZj52Kldiwp40A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rytz0GmOn1+NgT0/XzfiAJSERGSleLIJWlA0dd+HWk=; b=tE2w+wNfU7Mt7/NWSJI9vPM89IQERz/PGdvnGzKLsIZ475Xjtu7d+DAKE0OhSlZ9OHGvG/ 9EfHxX+DFW7WTiCFvpBnbDVK0v51GZHDdl2LAHzADDjZ3qBxW/nIJbsECnFX3qzgLzHhhL h9+uZAo53C/H4lVSWhz+NYN1/Q9Phjeu07k8Yy6t+/HYPoa9tAL8VyyKFVasHRWKqmS89o k/uwUgKJxNEZKwCX9UNUtV9PeXxhbaCDLdzkyNk/zsrDO0+aKZkWNoiAyHmM2vNgDDjvh7 rQhMjfWG/XG7VcnN93am38iaegN0eFzvkhXnvC5ytkdUEOFCMioQdyup2B/bww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcV2S1QzmsX; Mon, 18 Sep 2023 21:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxsFv045721; Mon, 18 Sep 2023 21:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxs1N045718; Mon, 18 Sep 2023 21:59:54 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:54 GMT Message-Id: <202309182159.38ILxs1N045718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: fade2298889d - main - tmpfs.5: Document option pgread List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fade2298889d588c15705b44e336ff02cc96f956 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=fade2298889d588c15705b44e336ff02cc96f956 commit fade2298889d588c15705b44e336ff02cc96f956 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:38:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Document option pgread Fixes: 765ad5b28d3f tmpfs: add the "pgread" mount option MFC after: 7 days --- share/man/man5/tmpfs.5 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index 8999fef40f46..33ed055d7f30 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -131,6 +131,8 @@ The default is the mount point's mode. Do not use namecache to resolve names to files for the created mount. This saves memory, but currently might impair scalability for highly used mounts on large machines. +.It Cm pgread +Enable pgcache read for the mount. .It Cm size Set the total file system size in bytes, unless suffixed with one of k, m, g, t, or p, which denote byte, kilobyte, From nobody Mon Sep 18 21:59:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcW59VBz4tpYG; Mon, 18 Sep 2023 21:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcW4Ncyz4dwZ; Mon, 18 Sep 2023 21:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bh5F2RJg5AUbsLaNC7xW7ch7SO6kzh7zO3PghDghUdw=; b=Bmy0v0X5LnCXZ9cEeuTZrm7bSwesyooAC9L2BlraLABEz0pQKYJG6YnUWqNC0hKaY/ZMr9 UgZnTJt6Rn53h+ron/xOoU3tBzUHFw00a7xzLJLR70gC8v3SCJglr+xVpUfH4sM23P3Fv3 2UEP/wPwRAcFCMDPVI3bPOEUIeMMq9Wc4P3K3BXvCOjNMK6d0C4JXfp9v5LnxHTuixRSNQ /40MoTsqRN+U1v1CgZBaBe5IN4GQNHigZHNEFVZUVyS8n9JapVtlQrQ6IjQ3bXm5GnkN4S /oEO20ZTMC1FRrcOBxy4EadwQohv1hcjzBq3SbKma+o54ndj63RA0TG37jmJyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074395; a=rsa-sha256; cv=none; b=jBNdafaUlboyv68b1DhXzFH8LutC/IulxbKjmHMuNoWj9CRkmoiOQE/K6HZXEy/JRTnHOe kF7p66kIK53uNOV5ep3IVcOMnFW3sFKu5xFrjFWHXTLR/gbzEb4qAg4Fsvq6F1J1ZJJNLu yoIIfqRlJ1F9bHjln962nRtpU1/W+/Sag6ogrYec/oVh9BA1M28GlzrkL744Pnez/JqH6t Ze7qJ+Cu2Zq/Gt0pzWQUN9z6Lo3e54JXIhYUKCg5l0sJDSEjr/zdXLhwZUeMQOcIM+eSvb MB3tVB6XI4NuoFIWBdDGHzo3BodHkFXBcxiZOrTsZWZJCvdQU7URIDhOMQbwkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bh5F2RJg5AUbsLaNC7xW7ch7SO6kzh7zO3PghDghUdw=; b=VBzblupja+y/EKKL33heFD15ekkKEoDk1Tfl1kgKSeK/2UjMLrCRZ4Nr3fLqEVfr5SXf0/ 7ParV9zlynZ+8H45WUODOmI71FaMCajfBF8xVosklCyb7WPWxuZDNDxQhn4/ZP0yJx+Pub BmrnqnbqKmWRCXkmlK8SOBNKuRZkbi4KURVuX76CAtJJVewJJ67T6cWnW3D1Z5YfXonhKV ifQ2l3CImf/TcsmHfw380uX146fF+x4q5cxUmKN3hiY+H2Yo/5MDXURM92QNaOeU5v4XQl X2kjWYl8sX4jdYHs0D0/ct8ibh6TiR0EDwhZH0DAsAdjtUAwlD9vCbOQZc28MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcW3RTyznNs; Mon, 18 Sep 2023 21:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxtFJ045761; Mon, 18 Sep 2023 21:59:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxtJG045758; Mon, 18 Sep 2023 21:59:55 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:55 GMT Message-Id: <202309182159.38ILxtJG045758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 942cc861f2cb - main - tmpfs.5: Document option nosymfollow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 942cc861f2cb5af287f15aa9b1bd56527f113032 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=942cc861f2cb5af287f15aa9b1bd56527f113032 commit 942cc861f2cb5af287f15aa9b1bd56527f113032 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:43:15 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Document option nosymfollow Fixes: 15df90218bb6 tmpfs: support the nosymfollow mount option MFC after: 7 days --- share/man/man5/tmpfs.5 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index 33ed055d7f30..c442b868dd1d 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -131,6 +131,10 @@ The default is the mount point's mode. Do not use namecache to resolve names to files for the created mount. This saves memory, but currently might impair scalability for highly used mounts on large machines. +.It Cm nosymfollow +Do not follow +.Xr symlink 7 Ap s +on the mounted file system. .It Cm pgread Enable pgcache read for the mount. .It Cm size From nobody Mon Sep 18 21:59:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcY05Hcz4tpW1; Mon, 18 Sep 2023 21:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcX5JqJz4dpc; Mon, 18 Sep 2023 21:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ+Wm2M1t4sE67KxF3YPyh5vV5xhSiKbKqmCQw1yqGc=; b=MdyZCaFh7jL25gP6xWEyreDwtybno46QBHWG8liIFroKBTwlYEcI3C4MXAHCB8oTHKnBhG zJFaGI6ta4cH3GWvgrjmhzW+MHdFidlErb0aVbEgDg0mfDv+GZY4aX6nVHFUWD2wlCy/1+ dECVWxbWwT0bPG3UJv6bh5et/qv72A4p8SvuWKM/7utMt9AF0ftLv5QYr/H0zEQZ9FVJ21 HLOHpvhW3pNg665RyBcy+Zg4/9gLYgpQSCJ3WYlCjQQsYxUDagDBp7H5hMaZE1uhSxfVaE VFQiqezO7L7V/7lTOdEo6alAWSjqEb7YP6SX3L8LDzHS1XWzGyYN35Zn4hppjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074396; a=rsa-sha256; cv=none; b=WRGZc/MaUCEW0/BjouSm0iS0j7rOnxKtIaQkcT3ad2ASu2S9s5lXsLkiNLJhAsand8Yu4h mdXaDrLnJS32WKmuN6jpaIhx62QB9Jsoa5081bWC/rHTrLeioR9N7N5a2VjuYNwAgpn1rQ l4v86WNKlkAzru7sbQEjLLGtYcME8IOsYyXnDevftwvFvkx5lejmOFRGIJBYnLonUHyMtE u2UR4miACfjWaq6YGjV+l38enar2YyvbFEHvsYGGJr4qk7b1NNvlxekopf8DAjSNwwUbAy jVqPwg1ILYgeh3M4eLfwFAjV3ycsZEjAsVH5OBCR2lUrCZY8RueMMxQSdxi/nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ+Wm2M1t4sE67KxF3YPyh5vV5xhSiKbKqmCQw1yqGc=; b=wo9WQtKugO5njLS6qCo1FyKLeYS+MUyOzhqv6FI2J+m69vqYuEKeBcS5bGG1YbkV41wKAK sUVWNlEVCb+j1N+FxDVU5p4oPvLqpR/yIhT9eTjBllGS0YSYoX8M8d7j5bXY1DyBHvY344 BAOhWPnrSQN9Y72BuXBuEobNo9Kim3PUf2omatxj/eU6j00NOG4N9kRwsTfIrSQCau4UyQ tsqwwf+0SF5c3MKwBGRLgFi6vnbj/HMRw8tR+OTR1Ci+p9dY/cZIN/cZZF5VHD+CKCdITo yVhDJ5LHAFrZLBUKooz4t7oXJPzVN7GPKo08YtP1MA34kC9+gGFLwHZ06Lu9Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcX4PhgznmC; Mon, 18 Sep 2023 21:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxujP045804; Mon, 18 Sep 2023 21:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxu0X045801; Mon, 18 Sep 2023 21:59:56 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:56 GMT Message-Id: <202309182159.38ILxu0X045801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6a1de1912d52 - main - tmpfs.5: Document option nomtime List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a1de1912d5216512a73dd97c4ee454d44b8fffb Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a1de1912d5216512a73dd97c4ee454d44b8fffb commit 6a1de1912d5216512a73dd97c4ee454d44b8fffb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 19:51:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Document option nomtime Fixes: c1e84733ac7e tmpfs: add nomtime mount option, MFC after: 7 days --- share/man/man5/tmpfs.5 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index c442b868dd1d..8fff1c15815d 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -127,6 +127,13 @@ The default is the maximum possible value. .It Cm mode Set the mode (in octal notation) of the root inode of the file system. The default is the mount point's mode. +.It Cm nomtime +Disable the tracking of mtime updates caused by writes to the +shared mapped areas backed by +.Nm +files. +This option removes periodic scans, +which downgrade read-write-mapped pages to read-only to note the writes. .It Cm nonc Do not use namecache to resolve names to files for the created mount. This saves memory, but currently might impair scalability for highly From nobody Mon Sep 18 21:59:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcZ0qggz4tpfC; Mon, 18 Sep 2023 21:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcY6LTcz4dgH; Mon, 18 Sep 2023 21:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnGo0xeS9Ds36cXToyFC3f1n8L+Vzzr+j3WhV+Vh1uM=; b=VzMgJLJQdeVcaedRfel2XODfHG1YLB9U0PUp9JlB0cfULO5pG7/hstoUVvMq4n1U2Cw2o6 DUDoNRGgTLuAFeefQDPHJIAT4IIdHeEb7dSz6V2pVgWIRDRp6nmNaWN+RZWbskmDbdfZ76 tJm/a4bzoUTFC5nTyx3ziPm2XddBFwr4ys5lbkWcEJ9WhP4YbAY+qZEnIHsKTd/qMtMWqM Thy5C1D6Bi7khZ0hHShI7AU8i773R/LwsUa9T4QAPYejI3INtlz3PEHIFClorn8U6nsV/J Y6OKGGyGMM9fj+MijG1l3r2BUK/NwAkj48znjLDM1W7Rgi11WdTRfcPZuKpmsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074397; a=rsa-sha256; cv=none; b=PuK/qKuMpV3qeSSpag4+LmFA5gV+sT+0VeImjlatBuY20pxXrhEbzeAj++A9VZ5KGmxtpK ZcDeNRFEQZuYgPbCy6Lhcv80uQCDZHFPVOS+Y/+2k8AxboU4UO3goDezobPvKWvHLiKk0M xOqmxDd7fv6QA49V1Ty0DUE1sXj8zcfVRevaOzI9EjtPFKieCKlAjjISCzJJL4wa30p6iO crm3yIadJswEV6ElSUbH0nsj7s+w8OupCZ6pPChm6dMnTDDmBevpqsnp7GbbnfprriyFlA sKs0XuxfLo5TcAP/IK4vM8Y202iC3fVFzZTdeu6h9ljp0QSWVNZzQI4vzdAbrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bnGo0xeS9Ds36cXToyFC3f1n8L+Vzzr+j3WhV+Vh1uM=; b=m/3oiaHMALUkE/P9yp/r2mgsOnBBwk8B6f/gGfwpPXhi+8w9aI9fO0WL+1RW9ouoQSCz00 KqHyxpTh/MuN07w+X4UgQtlgx6zMtOB+5N1e0PmPt0X7Xbbd8CWiAKJO8ELx5t7YcSqej8 tWuDFIPbun6fwj8ktGJliegvH3A11y+Mr1yd1AG8qZi1noGX0kpb5FPR82DTR/G/qWoP7o s8MgcIHcI+4SDpObxbDv9GFjYMH97hrhnY1J5eqiTTrgS6zuTuggzUzjWeUjG63kCkwtgU KzEMTdJzf83mBDgQYdAJj8zPdlbZzBCM4cBBCMfAdw6BJXYgVTLcLS4Kh5xtNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcY5NYRznYM; Mon, 18 Sep 2023 21:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxvHU045843; Mon, 18 Sep 2023 21:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxvX0045840; Mon, 18 Sep 2023 21:59:57 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:57 GMT Message-Id: <202309182159.38ILxvX0045840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 1d225179fd5d - main - tmpfs.5: Document option union List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d225179fd5d7eb932486a94abb8b76be7e44241 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d225179fd5d7eb932486a94abb8b76be7e44241 commit 1d225179fd5d7eb932486a94abb8b76be7e44241 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 20:29:09 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Document option union As noted in 59169d915600333b7d9187097f157865ba642256, tmpfs(5) supports the union option just fine. MFC after: 7 days --- share/man/man5/tmpfs.5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index 8fff1c15815d..bf07f06de026 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -154,6 +154,9 @@ main memory and swap space) will be used. .It Cm uid Set the user ID of the root inode of the file system. The default is the mount point's UID. +.It Cm union +Refer to +.Xr mount 8 . .El .Sh EXAMPLES Mount a From nobody Mon Sep 18 21:59:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqJcb111Dz4tpW5; Mon, 18 Sep 2023 21:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqJcb009Xz4dxf; Mon, 18 Sep 2023 21:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16Zuh073RalXUp5v4cSDB6QAkwZo/Qk3h2FYnC4Pb3M=; b=rpNx1CIodthkm85k7YmFX/Syo64KAhW8shmFEtxrqsia3vwJVft2bG2SgGHw/0DCWcQff1 Qc1GdfkKr6soEefsP3bkf9EXvDXllK85a4ztWWWC2Prt2Li2k29UBOUTayOh2Lp5DJxqRk ZKDKe17Avn+RRtZl6G29oxG07UPkNRF8ELrHd2x3V0CXjooYDkgpV12QS5F4lLh4TtRs+z xtBgBLoFoYcjfRAIFxz4mWnTGExNK2k21Sruu1isznGRJ4StBKjMMsQDska7QKhUQW2DGW 0d7epBx3i5aXOll/eNFYoqU3hgIHhI7ah+5NS5QoNYcXcnUwsNtzTOhaQ86fVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695074399; a=rsa-sha256; cv=none; b=S4nvoNlF5vHuMWHyoxonZzpmIkRelkucpeg7BjdW2lMa5gtzEjOyjKrj0QWt30hn4ag6ok EJhJE4g95XbKGg+eO0Ie6qteknymkL8J7NxvDEboyL3DZds+fyCPGz5Lm/qfBLXTYouU8o E/6rd0wLUW2/h+0JmkIojj+1IGHdAm7HJBv0UFWTDciTtNuO5kwN4HhSl2kZijNFWIMkVu FTDMrE+MN/ZCHFfLtja3g/hp9SvHaxcwsrhGkVouoa87Ql6nNjdBZoUeM2pIUt2X+lmZnY YKDbr4iKRiYjQeVEehB0ej24VvgTOOJ41y6Gxj8pmf75lqvd5zuJwXsKbWR7Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695074399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16Zuh073RalXUp5v4cSDB6QAkwZo/Qk3h2FYnC4Pb3M=; b=ikSEW08+axjKSmbMnFSDZQ8la3ODOGP1JBBub/efWWDN1HLHpMVeOXV8GxpWkVz9vZ2fNI 2Zyno0eeEMMusU65l3xAhI2n/WX8oekBTxBFaXrRIA7i0kVZwj541Tp1m+n6vgu82rd8Gn dovYYmuWGQYgFVxwhUlOQtvI0Iy1xcUQxypJT7Fyu3KjSTZGbmAyBJHe0GiWwIMnuiZnWW 6SFONfrm0rkSkkUN83abprq1Nb3sGuAo6pHHPntdiCu2+ZhQbFkqK6WkaustO3XDtaXfDx McnJddkRokAsK8BSz5sn6nEsivxtVWKOQK6eUotFALWguQ9vY6ZORRL1qJgkcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqJcZ67hGzmsY; Mon, 18 Sep 2023 21:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38ILxwnt045891; Mon, 18 Sep 2023 21:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ILxwIM045888; Mon, 18 Sep 2023 21:59:58 GMT (envelope-from git) Date: Mon, 18 Sep 2023 21:59:58 GMT Message-Id: <202309182159.38ILxwIM045888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b2bd87bb01a9 - main - tmpfs.5: Document option export List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2bd87bb01a97b5b025614a6bfccb8e109c201cd Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2bd87bb01a97b5b025614a6bfccb8e109c201cd commit b2bd87bb01a97b5b025614a6bfccb8e109c201cd Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-18 21:58:08 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-18 21:59:10 +0000 tmpfs.5: Document option export This is a no-op option supported for the sake of NFS. MFC after: 7 days --- share/man/man5/tmpfs.5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index bf07f06de026..c01aefd8550a 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -112,6 +112,12 @@ file systems: .It Cm easize Set the maximum memory size used by extended attributes in bytes. The default is 16 megabytes. +.It Cm export +Accept the +.Cm export +option for compatibility with +.Xr nfsv4 4 . +This option does nothing. .It Cm gid Set the group ID of the root inode of the file system. The default is the mount point's GID. From nobody Tue Sep 19 04:19:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqT212Fjfz4tKH0; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqT211c2fz4SLP; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695097145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m530ozhqUlA0GlDyw94kn/w3eIlonG1c0bmiHFI2e8=; b=MESPVeNE/VaDPAiHziWehqKpc5a3c787nCV+W1NM11dbzTYGEDyFSlN0Ip3xZNoO64RQGa TIYm117LpoapaHejkOH+fZQVeJGMZIs75v3uSnFaOC08vzmaOB4BP+A11MdlxbzcqfsEaO 6Nq6uX2giVEHLXRM6tBphVlI/3y6RPQ7IRSk61Nb4D7Rp0W0AhBJFT3bgf1BKQTmS7OKX5 IVs4cxdYP1zEgvbHpXSFM4PGv5/9gTmvQ59DQ5CF4WrqYMbnLEGnrLqx29xwdULW5oSteB nLa3ZGn+aWFB3K0UJSeoVaUy+yvl+78h45hT8FrTKwokq+depYRWgVXxRs/6Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695097145; a=rsa-sha256; cv=none; b=MT2PCKR5SiMsDTxNX4ZlUjkU7A1u1WHmfibdVX87SIu2gfuoAM4BZad5g9+ARtJa4QVbGT OD8z5uBXaInZk2YV8HBoy9D3brrtrAjddPHd86OxZAd/mZuw0td+50MUt+hZQStCgevASN vsRzTCeNeOV2Oe5d64HAr0ajqLeaAmlQUKh8fC8gpnxUcRoLmSQwGA4esV8eiQQEyHu0zR DX+Ne31rnemXiPnnV4+L1W7769ivqm9szZxQT7zaPeRDQvFEbwS3/c9DEANGXerLlf7oNm RyD1VaY8y7tSfAb55Tnue1CHtn0PLHvpn5g+a1UDt4f1oG3lyNIr9k1pfS4z5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695097145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m530ozhqUlA0GlDyw94kn/w3eIlonG1c0bmiHFI2e8=; b=v7M9BfDKNYeH5aiZxXGbTeRraRtd3gDnhkPM37yaJLwfpuspCukegsslw2/A9cUJ5J7vZs 51L758sq635LyR9fRxFzbZuGO75h9czqe43+6ePQtPp8pHqo6mSjPfe95g74J+K18JtsAT FZRpEmqu/4j8nIffV88SZNJqt/ym+2NkKgw7Qyv0rmYno/E4f5BWF/jkzBc4NDLif1QNpE 8AvAwhFIZuhtAYg9zazVJKdQYGPLH7ndFypmrmgYsnMjMgHfJg+eEDvNLV8/NhLnKGOb8A ksiqWuQ+73qYZc2T5ZELCJX+Xw0qR4TrPYnHhcw2tUA3ivhQ7CqDE/EcM0IOQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqT210VpRz1070; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38J4J54K077844; Tue, 19 Sep 2023 04:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38J4J4RV077841; Tue, 19 Sep 2023 04:19:04 GMT (envelope-from git) Date: Tue, 19 Sep 2023 04:19:04 GMT Message-Id: <202309190419.38J4J4RV077841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 8f76bb7dad48 - main - unbound: Vendor import 1.18.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 commit 8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 Merge: b2bd87bb01a9 401770e05c71 Author: Cy Schubert AuthorDate: 2023-09-19 04:17:09 +0000 Commit: Cy Schubert CommitDate: 2023-09-19 04:17:09 +0000 unbound: Vendor import 1.18.0 Release notes at https://www.nlnetlabs.nl/news/2023/Aug/30/unbound-1.18.0-released/ MFC after: 2 weeks Merge commit '401770e05c71ecb5ae61a59d316069b4b78bf622' into main contrib/unbound/Makefile.in | 43 +- contrib/unbound/README.md | 2 +- contrib/unbound/acx_nlnetlabs.m4 | 36 +- contrib/unbound/acx_python.m4 | 61 +- contrib/unbound/cachedb/cachedb.c | 57 +- contrib/unbound/cachedb/redis.c | 28 +- contrib/unbound/compat/getentropy_solaris.c | 2 +- contrib/unbound/config.guess | 51 +- contrib/unbound/config.h.in | 25 +- contrib/unbound/config.h.in~ | 1456 ++++++++++++++++++++ contrib/unbound/config.sub | 72 +- contrib/unbound/configure | 170 ++- contrib/unbound/configure.ac | 99 +- contrib/unbound/contrib/Dockerfile.tests | 4 +- contrib/unbound/contrib/README | 3 + contrib/unbound/contrib/aaaa-filter-iterator.patch | 4 +- contrib/unbound/contrib/unbound.init_yocto | 139 ++ contrib/unbound/daemon/acl_list.c | 2 + contrib/unbound/daemon/acl_list.h | 8 +- contrib/unbound/daemon/cachedump.c | 28 +- contrib/unbound/daemon/remote.c | 236 ++-- contrib/unbound/daemon/remote.h | 2 +- contrib/unbound/daemon/stats.c | 53 +- contrib/unbound/daemon/stats.h | 7 + contrib/unbound/daemon/worker.c | 471 ++++--- contrib/unbound/dns64/dns64.c | 4 +- contrib/unbound/dnstap/dnstap.c | 7 +- contrib/unbound/dnstap/dnstap.h | 4 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 39 +- contrib/unbound/doc/Changelog | 323 +++++ contrib/unbound/doc/README | 2 +- contrib/unbound/doc/README.DNS64 | 20 + contrib/unbound/doc/example.conf.in | 32 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 58 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 147 +- contrib/unbound/edns-subnet/subnetmod.c | 27 +- contrib/unbound/iterator/iter_delegpt.c | 39 + contrib/unbound/iterator/iter_delegpt.h | 25 + contrib/unbound/iterator/iter_resptype.c | 7 + contrib/unbound/iterator/iter_scrub.c | 43 +- contrib/unbound/iterator/iter_utils.c | 43 +- contrib/unbound/iterator/iter_utils.h | 7 +- contrib/unbound/iterator/iterator.c | 259 ++-- contrib/unbound/iterator/iterator.h | 23 +- contrib/unbound/libunbound/libworker.c | 16 +- contrib/unbound/libunbound/unbound-event.h | 6 +- contrib/unbound/libunbound/unbound.h | 116 +- contrib/unbound/services/authzone.c | 10 +- contrib/unbound/services/cache/dns.c | 50 +- contrib/unbound/services/cache/infra.c | 75 +- contrib/unbound/services/cache/infra.h | 5 +- contrib/unbound/services/listen_dnsport.c | 153 +- contrib/unbound/services/localzone.c | 20 +- contrib/unbound/services/localzone.h | 2 + contrib/unbound/services/mesh.c | 385 +++--- contrib/unbound/services/mesh.h | 14 +- contrib/unbound/services/modstack.c | 10 +- contrib/unbound/services/outside_network.c | 28 + contrib/unbound/services/rpz.c | 230 +++- contrib/unbound/services/rpz.h | 16 +- contrib/unbound/sldns/rrdef.c | 12 +- contrib/unbound/sldns/rrdef.h | 7 +- contrib/unbound/sldns/str2wire.c | 94 +- contrib/unbound/sldns/str2wire.h | 4 +- contrib/unbound/sldns/wire2str.c | 19 +- contrib/unbound/smallapp/unbound-anchor.c | 3 +- contrib/unbound/smallapp/unbound-checkconf.c | 2 +- contrib/unbound/smallapp/unbound-control.c | 54 +- contrib/unbound/smallapp/unbound-host.c | 5 +- contrib/unbound/testdata/00-lint.tdir/00-lint.pre | 14 + contrib/unbound/testdata/cachedb_cached_ede.crpl | 91 ++ .../unbound/testdata/edns_downstream_cookies.rpl | 235 ++++ .../testdata/ip_ratelimit.tdir/ip_ratelimit.conf | 28 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.dsc | 16 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.post | 13 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.pre | 24 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.test | 165 +++ .../testdata/ip_ratelimit.tdir/unbound_control.key | 39 + .../testdata/ip_ratelimit.tdir/unbound_control.pem | 22 + .../testdata/ip_ratelimit.tdir/unbound_server.key | 39 + .../testdata/ip_ratelimit.tdir/unbound_server.pem | 22 + .../unbound/testdata/iter_cname_minimise_nx.rpl | 246 ++++ contrib/unbound/testdata/iter_failreply.rpl | 132 ++ contrib/unbound/testdata/iter_ignore_empty.rpl | 198 +++ contrib/unbound/testdata/iter_nat64.rpl | 117 ++ contrib/unbound/testdata/iter_nat64_prefix.rpl | 119 ++ contrib/unbound/testdata/iter_nat64_prefix48.rpl | 118 ++ .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 +++ .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 +++ .../testdata/serve_expired_0ttl_servfail.rpl | 129 ++ .../serve_expired_cached_servfail_refresh.rpl | 145 ++ .../stat_values.tdir/stat_values_cachedb.conf | 36 + .../stat_values_downstream_cookies.conf | 32 + contrib/unbound/testdata/subnet_cached_ede.crpl | 114 ++ .../unbound/testdata/subnet_global_prefetch.crpl | 236 ++++ .../subnet_global_prefetch_always_forward.crpl | 167 +++ .../testdata/subnet_global_prefetch_expired.crpl | 241 ++++ contrib/unbound/testdata/val_any_negcache.rpl | 240 ++++ contrib/unbound/util/config_file.c | 153 +- contrib/unbound/util/config_file.h | 65 +- contrib/unbound/util/configlexer.lex | 15 +- contrib/unbound/util/configparser.y | 148 +- contrib/unbound/util/data/msgencode.c | 148 +- contrib/unbound/util/data/msgencode.h | 42 +- contrib/unbound/util/data/msgparse.c | 98 +- contrib/unbound/util/data/msgparse.h | 18 +- contrib/unbound/util/data/msgreply.c | 95 +- contrib/unbound/util/data/msgreply.h | 30 +- contrib/unbound/util/edns.c | 59 + contrib/unbound/util/edns.h | 59 + contrib/unbound/util/fptr_wlist.c | 8 + contrib/unbound/util/iana_ports.inc | 4 + contrib/unbound/util/module.c | 16 +- contrib/unbound/util/module.h | 14 +- contrib/unbound/util/net_help.c | 70 +- contrib/unbound/util/net_help.h | 23 + contrib/unbound/util/netevent.c | 229 +-- contrib/unbound/util/netevent.h | 70 +- contrib/unbound/util/regional.c | 2 +- contrib/unbound/util/rfc_1982.c | 74 + contrib/unbound/util/rfc_1982.h | 63 + contrib/unbound/util/siphash.c | 187 +++ contrib/unbound/util/siphash.h | 43 + contrib/unbound/util/storage/lruhash.c | 25 +- contrib/unbound/util/storage/lruhash.h | 5 +- contrib/unbound/util/storage/slabhash.c | 18 + contrib/unbound/util/storage/slabhash.h | 9 + contrib/unbound/util/timehist.c | 44 +- contrib/unbound/util/timeval_func.c | 113 ++ contrib/unbound/util/timeval_func.h | 53 + contrib/unbound/validator/autotrust.c | 2 + contrib/unbound/validator/val_kcache.c | 10 +- contrib/unbound/validator/val_kcache.h | 4 +- contrib/unbound/validator/val_kentry.c | 48 +- contrib/unbound/validator/val_kentry.h | 37 +- contrib/unbound/validator/val_neg.c | 7 +- contrib/unbound/validator/val_nsec.c | 19 +- contrib/unbound/validator/val_nsec.h | 5 +- contrib/unbound/validator/val_sigcrypt.c | 43 +- contrib/unbound/validator/val_utils.c | 19 +- contrib/unbound/validator/validator.c | 137 +- lib/libunbound/Makefile | 6 +- lib/libunbound/config.h | 6 +- 148 files changed, 9439 insertions(+), 1708 deletions(-) diff --cc contrib/unbound/README.md index c3d9bc2492ef,000000000000..c220da030458 mode 100644,000000..100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@@ -1,40 -1,0 +1,40 @@@ +# Unbound + - [![Travis Build Status](https://travis-ci.org/NLnetLabs/unbound.svg?branch=master)](https://travis-ci.org/NLnetLabs/unbound) ++[![Github Build Status](https://github.com/NLnetLabs/unbound/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/NLnetLabs/unbound/actions) +[![Packaging status](https://repology.org/badge/tiny-repos/unbound.svg)](https://repology.org/project/unbound/versions) +[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/unbound.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:unbound) +[![Documentation Status](https://readthedocs.org/projects/unbound/badge/?version=latest)](https://unbound.readthedocs.io/en/latest/?badge=latest) +[![Mastodon Follow](https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social)](https://fosstodon.org/@nlnetlabs) + +Unbound is a validating, recursive, caching DNS resolver. It is designed to be +fast and lean and incorporates modern features based on open standards. If you +have any feedback, we would love to hear from you. Don’t hesitate to +[create an issue on Github](https://github.com/NLnetLabs/unbound/issues/new) +or post a message on the [Unbound mailing list](https://lists.nlnetlabs.nl/mailman/listinfo/unbound-users). +You can learn more about Unbound by reading our +[documentation](https://unbound.docs.nlnetlabs.nl/). + +## Compiling + +Make sure you have the C toolchain, OpenSSL and its include files, and libexpat +installed. Unbound can be compiled and installed using: + +``` +./configure && make && make install +``` + +You can use libevent if you want. libevent is useful when using many (10000) +outgoing ports. By default max 256 ports are opened at the same time and the +builtin alternative is equally capable and a little faster. + +Use the `--with-libevent=dir` configure option to compile Unbound with libevent +support. + +## Unbound configuration + +All of Unbound's configuration options are described in the man pages, which +will be installed and are available on the Unbound +[documentation page](https://unbound.docs.nlnetlabs.nl/). + +An example configuration file is located in +[doc/example.conf](https://github.com/NLnetLabs/unbound/blob/master/doc/example.conf.in). diff --cc contrib/unbound/config.h.in~ index 000000000000,f31354d01408..f31354d01408 mode 000000,100644..100644 --- a/contrib/unbound/config.h.in~ +++ b/contrib/unbound/config.h.in~ diff --cc contrib/unbound/contrib/unbound.init_yocto index 000000000000,4eba752bc55c..4eba752bc55c mode 000000,100644..100644 --- a/contrib/unbound/contrib/unbound.init_yocto +++ b/contrib/unbound/contrib/unbound.init_yocto diff --cc contrib/unbound/testdata/00-lint.tdir/00-lint.pre index 000000000000,507f5e1e9454..507f5e1e9454 mode 000000,100644..100644 --- a/contrib/unbound/testdata/00-lint.tdir/00-lint.pre +++ b/contrib/unbound/testdata/00-lint.tdir/00-lint.pre diff --cc contrib/unbound/testdata/cachedb_cached_ede.crpl index 000000000000,5eade545105f..5eade545105f mode 000000,100644..100644 --- a/contrib/unbound/testdata/cachedb_cached_ede.crpl +++ b/contrib/unbound/testdata/cachedb_cached_ede.crpl diff --cc contrib/unbound/testdata/edns_downstream_cookies.rpl index 000000000000,820bc5a7ca70..820bc5a7ca70 mode 000000,100644..100644 --- a/contrib/unbound/testdata/edns_downstream_cookies.rpl +++ b/contrib/unbound/testdata/edns_downstream_cookies.rpl diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf index 000000000000,ae7d0cda0d9d..ae7d0cda0d9d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc index 000000000000,a6f6192360cd..a6f6192360cd mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post index 000000000000,1f86d008587d..1f86d008587d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre index 000000000000,c4589a0ea4fe..c4589a0ea4fe mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test index 000000000000,f58b7edcbe2a..f58b7edcbe2a mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key index 000000000000,753a4ef6162e..753a4ef6162e mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem index 000000000000,a1edf7017f1d..a1edf7017f1d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key index 000000000000,370a7bbb2f22..370a7bbb2f22 mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem index 000000000000,986807310f2b..986807310f2b mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem diff --cc contrib/unbound/testdata/iter_cname_minimise_nx.rpl index 000000000000,080055208daf..080055208daf mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_cname_minimise_nx.rpl +++ b/contrib/unbound/testdata/iter_cname_minimise_nx.rpl diff --cc contrib/unbound/testdata/iter_failreply.rpl index 000000000000,393714196d89..393714196d89 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_failreply.rpl +++ b/contrib/unbound/testdata/iter_failreply.rpl diff --cc contrib/unbound/testdata/iter_ignore_empty.rpl index 000000000000,c70dd7e8df7b..c70dd7e8df7b mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_ignore_empty.rpl +++ b/contrib/unbound/testdata/iter_ignore_empty.rpl diff --cc contrib/unbound/testdata/iter_nat64.rpl index 000000000000,dde0a25596c1..dde0a25596c1 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64.rpl +++ b/contrib/unbound/testdata/iter_nat64.rpl diff --cc contrib/unbound/testdata/iter_nat64_prefix.rpl index 000000000000,ecb6508dcf55..ecb6508dcf55 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64_prefix.rpl +++ b/contrib/unbound/testdata/iter_nat64_prefix.rpl diff --cc contrib/unbound/testdata/iter_nat64_prefix48.rpl index 000000000000,e7c32e8ffc6a..e7c32e8ffc6a mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64_prefix48.rpl +++ b/contrib/unbound/testdata/iter_nat64_prefix48.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl index 000000000000,45b51444bccd..45b51444bccd mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl index 000000000000,0fcde9f2ddb6..0fcde9f2ddb6 mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl index 000000000000,aad7aa8c984f..aad7aa8c984f mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl diff --cc contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl index 000000000000,664de9aa8732..664de9aa8732 mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl +++ b/contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl diff --cc contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf index 000000000000,b5e9b0e02932..b5e9b0e02932 mode 000000,100644..100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf diff --cc contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf index 000000000000,21e78829fc8e..21e78829fc8e mode 000000,100644..100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf diff --cc contrib/unbound/testdata/subnet_cached_ede.crpl index 000000000000,36bb28fcc180..36bb28fcc180 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_cached_ede.crpl +++ b/contrib/unbound/testdata/subnet_cached_ede.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch.crpl index 000000000000,2f005d43b905..2f005d43b905 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl index 000000000000,ccfe5dfd6ea1..ccfe5dfd6ea1 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch_expired.crpl index 000000000000,de1b780553a9..de1b780553a9 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch_expired.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch_expired.crpl diff --cc contrib/unbound/testdata/val_any_negcache.rpl index 000000000000,77aacba8cc13..77aacba8cc13 mode 000000,100644..100644 --- a/contrib/unbound/testdata/val_any_negcache.rpl +++ b/contrib/unbound/testdata/val_any_negcache.rpl diff --cc contrib/unbound/util/config_file.c index d0b9904e133d,000000000000..71c6d245794f mode 100644,000000..100644 --- a/contrib/unbound/util/config_file.c +++ b/contrib/unbound/util/config_file.c @@@ -1,2670 -1,0 +1,2711 @@@ +/* + * util/config_file.c - reads and stores the config file for unbound. + * + * Copyright (c) 2007, NLnet Labs. All rights reserved. + * + * This software is open source. - * ++ * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: - * ++ * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. - * ++ * + * 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. - * ++ * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. - * ++ * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS 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 COPYRIGHT + * HOLDER OR 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. + */ + +/** + * \file + * + * This file contains functions for the config file. + */ + +#include "config.h" +#include +#include +#ifdef HAVE_TIME_H +#include +#endif +#include "util/log.h" +#include "util/configyyrename.h" +#include "util/config_file.h" +#include "configparser.h" +#include "util/net_help.h" +#include "util/data/msgparse.h" +#include "util/module.h" +#include "util/regional.h" +#include "util/fptr_wlist.h" +#include "util/data/dname.h" ++#include "util/random.h" +#include "util/rtt.h" +#include "services/cache/infra.h" +#include "sldns/wire2str.h" +#include "sldns/parseutil.h" +#include "iterator/iterator.h" +#ifdef HAVE_GLOB_H +# include +#endif +#ifdef CLIENT_SUBNET +#include "edns-subnet/edns-subnet.h" +#endif +#ifdef HAVE_PWD_H +#include +#endif + +/** from cfg username, after daemonize setup performed */ +uid_t cfg_uid = (uid_t)-1; +/** from cfg username, after daemonize setup performed */ +gid_t cfg_gid = (gid_t)-1; +/** for debug allow small timeout values for fast rollovers */ +int autr_permit_small_holddown = 0; +/** size (in bytes) of stream wait buffers max */ +size_t stream_wait_max = 4 * 1024 * 1024; +size_t http2_query_buffer_max = 4 * 1024 * 1024; +size_t http2_response_buffer_max = 4 * 1024 * 1024; + +/** global config during parsing */ +struct config_parser_state* cfg_parser = 0; + +/** init ports possible for use */ +static void init_outgoing_availports(int* array, int num); + - struct config_file* ++/** init cookie with random data */ ++static void init_cookie_secret(uint8_t* cookie_secret, size_t cookie_secret_len); ++ ++struct config_file* +config_create(void) +{ + struct config_file* cfg; + cfg = (struct config_file*)calloc(1, sizeof(struct config_file)); + if(!cfg) + return NULL; + /* the defaults if no config is present */ + cfg->verbosity = 1; + cfg->stat_interval = 0; + cfg->stat_cumulative = 0; + cfg->stat_extended = 0; + cfg->stat_inhibit_zero = 1; + cfg->num_threads = 1; + cfg->port = UNBOUND_DNS_PORT; + cfg->do_ip4 = 1; + cfg->do_ip6 = 1; + cfg->do_udp = 1; + cfg->do_tcp = 1; + cfg->tcp_reuse_timeout = 60 * 1000; /* 60s in milisecs */ + cfg->max_reuse_tcp_queries = 200; + cfg->tcp_upstream = 0; + cfg->udp_upstream_without_downstream = 0; + cfg->tcp_mss = 0; + cfg->outgoing_tcp_mss = 0; + cfg->tcp_idle_timeout = 30 * 1000; /* 30s in millisecs */ + cfg->tcp_auth_query_timeout = 3 * 1000; /* 3s in millisecs */ + cfg->do_tcp_keepalive = 0; + cfg->tcp_keepalive_timeout = 120 * 1000; /* 120s in millisecs */ ++ cfg->sock_queue_timeout = 0; /* do not check timeout */ + cfg->ssl_service_key = NULL; + cfg->ssl_service_pem = NULL; + cfg->ssl_port = UNBOUND_DNS_OVER_TLS_PORT; + cfg->ssl_upstream = 0; + cfg->tls_cert_bundle = NULL; + cfg->tls_win_cert = 0; + cfg->tls_use_sni = 1; + cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT; + if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit; + cfg->http_max_streams = 100; + cfg->http_query_buffer_size = 4*1024*1024; + cfg->http_response_buffer_size = 4*1024*1024; + cfg->http_nodelay = 1; + cfg->use_syslog = 1; + cfg->log_identity = NULL; /* changed later with argv[0] */ + cfg->log_time_ascii = 0; + cfg->log_queries = 0; + cfg->log_replies = 0; + cfg->log_tag_queryreply = 0; + cfg->log_local_actions = 0; + cfg->log_servfail = 0; +#ifndef USE_WINSOCK +# ifdef USE_MINI_EVENT + /* select max 1024 sockets */ + cfg->outgoing_num_ports = 960; + cfg->num_queries_per_thread = 512; +# else + /* libevent can use many sockets */ + cfg->outgoing_num_ports = 4096; + cfg->num_queries_per_thread = 1024; +# endif + cfg->outgoing_num_tcp = 10; + cfg->incoming_num_tcp = 10; +#else + cfg->outgoing_num_ports = 48; /* windows is limited in num fds */ + cfg->num_queries_per_thread = 24; + cfg->outgoing_num_tcp = 2; /* leaves 64-52=12 for: 4if,1stop,thread4 */ - cfg->incoming_num_tcp = 2; ++ cfg->incoming_num_tcp = 2; +#endif + cfg->stream_wait_size = 4 * 1024 * 1024; + cfg->edns_buffer_size = 1232; /* from DNS flagday recommendation */ + cfg->msg_buffer_size = 65552; /* 64 k + a small margin */ + cfg->msg_cache_size = 4 * 1024 * 1024; + cfg->msg_cache_slabs = 4; + cfg->jostle_time = 200; + cfg->rrset_cache_size = 4 * 1024 * 1024; + cfg->rrset_cache_slabs = 4; + cfg->host_ttl = 900; + cfg->bogus_ttl = 60; + cfg->min_ttl = 0; + cfg->max_ttl = 3600 * 24; + cfg->max_negative_ttl = 3600; + cfg->prefetch = 0; + cfg->prefetch_key = 0; + cfg->deny_any = 0; + cfg->infra_cache_slabs = 4; + cfg->infra_cache_numhosts = 10000; + cfg->infra_cache_min_rtt = 50; + cfg->infra_cache_max_rtt = 120000; + cfg->infra_keep_probing = 0; + cfg->delay_close = 0; + cfg->udp_connect = 1; + if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) + goto error_exit; + init_outgoing_availports(cfg->outgoing_avail_ports, 65536); + if(!(cfg->username = strdup(UB_USERNAME))) goto error_exit; +#ifdef HAVE_CHROOT + if(!(cfg->chrootdir = strdup(CHROOT_DIR))) goto error_exit; +#endif + if(!(cfg->directory = strdup(RUN_DIR))) goto error_exit; + if(!(cfg->logfile = strdup(""))) goto error_exit; + if(!(cfg->pidfile = strdup(PIDFILE))) goto error_exit; + if(!(cfg->target_fetch_policy = strdup("3 2 1 0 0"))) goto error_exit; + cfg->fast_server_permil = 0; + cfg->fast_server_num = 3; + cfg->donotqueryaddrs = NULL; + cfg->donotquery_localhost = 1; + cfg->root_hints = NULL; + cfg->use_systemd = 0; + cfg->do_daemonize = 1; + cfg->if_automatic = 0; + cfg->if_automatic_ports = NULL; + cfg->so_rcvbuf = 0; + cfg->so_sndbuf = 0; + cfg->so_reuseport = REUSEPORT_DEFAULT; + cfg->ip_transparent = 0; + cfg->ip_freebind = 0; + cfg->ip_dscp = 0; + cfg->num_ifs = 0; + cfg->ifs = NULL; + cfg->num_out_ifs = 0; + cfg->out_ifs = NULL; + cfg->stubs = NULL; + cfg->forwards = NULL; + cfg->auths = NULL; +#ifdef CLIENT_SUBNET + cfg->client_subnet = NULL; + cfg->client_subnet_zone = NULL; + cfg->client_subnet_opcode = LDNS_EDNS_CLIENT_SUBNET; + cfg->client_subnet_always_forward = 0; + cfg->max_client_subnet_ipv4 = 24; + cfg->max_client_subnet_ipv6 = 56; + cfg->min_client_subnet_ipv4 = 0; + cfg->min_client_subnet_ipv6 = 0; + cfg->max_ecs_tree_size_ipv4 = 100; + cfg->max_ecs_tree_size_ipv6 = 100; +#endif + cfg->views = NULL; + cfg->acls = NULL; + cfg->tcp_connection_limits = NULL; + cfg->harden_short_bufsize = 1; + cfg->harden_large_queries = 0; + cfg->harden_glue = 1; + cfg->harden_dnssec_stripped = 1; + cfg->harden_below_nxdomain = 1; + cfg->harden_referral_path = 0; + cfg->harden_algo_downgrade = 0; ++ cfg->harden_unknown_additional = 0; + cfg->use_caps_bits_for_id = 0; + cfg->caps_whitelist = NULL; + cfg->private_address = NULL; + cfg->private_domain = NULL; + cfg->unwanted_threshold = 0; + cfg->hide_identity = 0; + cfg->hide_version = 0; + cfg->hide_trustanchor = 0; + cfg->hide_http_user_agent = 0; + cfg->identity = NULL; + cfg->version = NULL; + cfg->http_user_agent = NULL; + cfg->nsid_cfg_str = NULL; + cfg->nsid = NULL; + cfg->nsid_len = 0; + cfg->auto_trust_anchor_file_list = NULL; + cfg->trust_anchor_file_list = NULL; + cfg->trust_anchor_list = NULL; + cfg->trusted_keys_file_list = NULL; + cfg->trust_anchor_signaling = 1; + cfg->root_key_sentinel = 1; + cfg->domain_insecure = NULL; + cfg->val_date_override = 0; + cfg->val_sig_skew_min = 3600; /* at least daylight savings trouble */ + cfg->val_sig_skew_max = 86400; /* at most timezone settings trouble */ + cfg->val_max_restart = 5; + cfg->val_clean_additional = 1; + cfg->val_log_level = 0; + cfg->val_log_squelch = 0; + cfg->val_permissive_mode = 0; + cfg->aggressive_nsec = 1; + cfg->ignore_cd = 0; + cfg->serve_expired = 0; + cfg->serve_expired_ttl = 0; + cfg->serve_expired_ttl_reset = 0; + cfg->serve_expired_reply_ttl = 30; + cfg->serve_expired_client_timeout = 0; + cfg->ede_serve_expired = 0; + cfg->serve_original_ttl = 0; + cfg->zonemd_permissive_mode = 0; + cfg->add_holddown = 30*24*3600; + cfg->del_holddown = 30*24*3600; + cfg->keep_missing = 366*24*3600; /* one year plus a little leeway */ + cfg->permit_small_holddown = 0; + cfg->key_cache_size = 4 * 1024 * 1024; + cfg->key_cache_slabs = 4; + cfg->neg_cache_size = 1 * 1024 * 1024; + cfg->local_zones = NULL; + cfg->local_zones_nodefault = NULL; +#ifdef USE_IPSET + cfg->local_zones_ipset = NULL; +#endif + cfg->local_zones_disable_default = 0; + cfg->local_data = NULL; + cfg->local_zone_overrides = NULL; + cfg->unblock_lan_zones = 0; + cfg->insecure_lan_zones = 0; + cfg->python_script = NULL; + cfg->dynlib_file = NULL; + cfg->remote_control_enable = 0; + cfg->control_ifs.first = NULL; + cfg->control_ifs.last = NULL; + cfg->control_port = UNBOUND_CONTROL_PORT; + cfg->control_use_cert = 1; + cfg->minimal_responses = 1; + cfg->rrset_roundrobin = 1; + cfg->unknown_server_time_limit = 376; - cfg->max_udp_size = 4096; - if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key"))) ++ cfg->max_udp_size = 1232; /* value taken from edns_buffer_size */ ++ if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key"))) + goto error_exit; - if(!(cfg->server_cert_file = strdup(RUN_DIR"/unbound_server.pem"))) ++ if(!(cfg->server_cert_file = strdup(RUN_DIR"/unbound_server.pem"))) + goto error_exit; - if(!(cfg->control_key_file = strdup(RUN_DIR"/unbound_control.key"))) ++ if(!(cfg->control_key_file = strdup(RUN_DIR"/unbound_control.key"))) + goto error_exit; - if(!(cfg->control_cert_file = strdup(RUN_DIR"/unbound_control.pem"))) ++ if(!(cfg->control_cert_file = strdup(RUN_DIR"/unbound_control.pem"))) + goto error_exit; + +#ifdef CLIENT_SUBNET + if(!(cfg->module_conf = strdup("subnetcache validator iterator"))) goto error_exit; +#else + if(!(cfg->module_conf = strdup("validator iterator"))) goto error_exit; +#endif - if(!(cfg->val_nsec3_key_iterations = ++ if(!(cfg->val_nsec3_key_iterations = + strdup("1024 150 2048 150 4096 150"))) goto error_exit; +#if defined(DNSTAP_SOCKET_PATH) + if(!(cfg->dnstap_socket_path = strdup(DNSTAP_SOCKET_PATH))) + goto error_exit; +#endif + cfg->dnstap_bidirectional = 1; + cfg->dnstap_tls = 1; + cfg->disable_dnssec_lame_check = 0; ++ cfg->ip_ratelimit_cookie = 0; + cfg->ip_ratelimit = 0; + cfg->ratelimit = 0; + cfg->ip_ratelimit_slabs = 4; + cfg->ratelimit_slabs = 4; + cfg->ip_ratelimit_size = 4*1024*1024; + cfg->ratelimit_size = 4*1024*1024; + cfg->ratelimit_for_domain = NULL; + cfg->ratelimit_below_domain = NULL; + cfg->ip_ratelimit_factor = 10; + cfg->ratelimit_factor = 10; + cfg->ip_ratelimit_backoff = 0; + cfg->ratelimit_backoff = 0; + cfg->outbound_msg_retry = 5; + cfg->max_sent_count = 32; + cfg->max_query_restarts = 11; + cfg->qname_minimisation = 1; + cfg->qname_minimisation_strict = 0; + cfg->shm_enable = 0; + cfg->shm_key = 11777; + cfg->edns_client_strings = NULL; + cfg->edns_client_string_opcode = 65001; + cfg->dnscrypt = 0; + cfg->dnscrypt_port = 0; + cfg->dnscrypt_provider = NULL; + cfg->dnscrypt_provider_cert = NULL; + cfg->dnscrypt_provider_cert_rotated = NULL; + cfg->dnscrypt_secret_key = NULL; + cfg->dnscrypt_shared_secret_cache_size = 4*1024*1024; + cfg->dnscrypt_shared_secret_cache_slabs = 4; + cfg->dnscrypt_nonce_cache_size = 4*1024*1024; + cfg->dnscrypt_nonce_cache_slabs = 4; + cfg->pad_responses = 1; + cfg->pad_responses_block_size = 468; /* from RFC8467 */ + cfg->pad_queries = 1; + cfg->pad_queries_block_size = 128; /* from RFC8467 */ +#ifdef USE_IPSECMOD + cfg->ipsecmod_enabled = 1; + cfg->ipsecmod_ignore_bogus = 0; + cfg->ipsecmod_hook = NULL; + cfg->ipsecmod_max_ttl = 3600; + cfg->ipsecmod_whitelist = NULL; + cfg->ipsecmod_strict = 0; +#endif ++ cfg->do_answer_cookie = 0; ++ memset(cfg->cookie_secret, 0, sizeof(cfg->cookie_secret)); ++ cfg->cookie_secret_len = 16; ++ init_cookie_secret(cfg->cookie_secret, cfg->cookie_secret_len); +#ifdef USE_CACHEDB + if(!(cfg->cachedb_backend = strdup("testframe"))) goto error_exit; + if(!(cfg->cachedb_secret = strdup("default"))) goto error_exit; +#ifdef USE_REDIS + if(!(cfg->redis_server_host = strdup("127.0.0.1"))) goto error_exit; ++ cfg->redis_server_path = NULL; ++ cfg->redis_server_password = NULL; + cfg->redis_timeout = 100; + cfg->redis_server_port = 6379; + cfg->redis_expire_records = 0; +#endif /* USE_REDIS */ +#endif /* USE_CACHEDB */ +#ifdef USE_IPSET + cfg->ipset_name_v4 = NULL; + cfg->ipset_name_v6 = NULL; +#endif + cfg->ede = 0; + return cfg; +error_exit: + config_delete(cfg); + return NULL; +} + +struct config_file* config_create_forlib(void) +{ + struct config_file* cfg = config_create(); + if(!cfg) return NULL; + /* modifications for library use, less verbose, less memory */ + free(cfg->chrootdir); + cfg->chrootdir = NULL; + cfg->verbosity = 0; + cfg->outgoing_num_ports = 16; /* in library use, this is 'reasonable' + and probably within the ulimit(maxfds) of the user */ + cfg->outgoing_num_tcp = 2; + cfg->msg_cache_size = 1024*1024; + cfg->msg_cache_slabs = 1; + cfg->rrset_cache_size = 1024*1024; + cfg->rrset_cache_slabs = 1; + cfg->infra_cache_slabs = 1; + cfg->use_syslog = 0; + cfg->key_cache_size = 1024*1024; + cfg->key_cache_slabs = 1; + cfg->neg_cache_size = 100 * 1024; + cfg->donotquery_localhost = 0; /* allow, so that you can ask a + forward nameserver running on localhost */ + cfg->val_log_level = 2; /* to fill why_bogus with */ + cfg->val_log_squelch = 1; + cfg->minimal_responses = 0; + cfg->harden_short_bufsize = 1; + return cfg; +} + +/** check that the value passed is >= 0 */ +#define IS_NUMBER_OR_ZERO \ + if(atoi(val) == 0 && strcmp(val, "0") != 0) return 0 +/** check that the value passed is > 0 */ +#define IS_NONZERO_NUMBER \ + if(atoi(val) == 0) return 0 +/** check that the value passed is not 0 and a power of 2 */ +#define IS_POW2_NUMBER \ + if(atoi(val) == 0 || !is_pow2((size_t)atoi(val))) return 0 +/** check that the value passed is yes or no */ +#define IS_YES_OR_NO \ + if(strcmp(val, "yes") != 0 && strcmp(val, "no") != 0) return 0 +/** put integer_or_zero into variable */ +#define S_NUMBER_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = atoi(val); } +/** put integer_nonzero into variable */ +#define S_NUMBER_NONZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NONZERO_NUMBER; cfg->var = atoi(val); } +/** put integer_or_zero into unsigned */ +#define S_UNSIGNED_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = (unsigned)atoi(val); } +/** put integer_or_zero into size_t */ +#define S_SIZET_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NUMBER_OR_ZERO; cfg->var = (size_t)atoi(val); } +/** put integer_nonzero into size_t */ +#define S_SIZET_NONZERO(str, var) if(strcmp(opt, str) == 0) \ + { IS_NONZERO_NUMBER; cfg->var = (size_t)atoi(val); } +/** put yesno into variable */ +#define S_YNO(str, var) if(strcmp(opt, str) == 0) \ + { IS_YES_OR_NO; cfg->var = (strcmp(val, "yes") == 0); } +/** put memsize into variable */ +#define S_MEMSIZE(str, var) if(strcmp(opt, str)==0) \ + { return cfg_parse_memsize(val, &cfg->var); } +/** put pow2 number into variable */ +#define S_POW2(str, var) if(strcmp(opt, str)==0) \ + { IS_POW2_NUMBER; cfg->var = (size_t)atoi(val); } +/** put string into variable */ +#define S_STR(str, var) if(strcmp(opt, str)==0) \ + { free(cfg->var); return (cfg->var = strdup(val)) != NULL; } +/** put string into strlist */ +#define S_STRLIST(str, var) if(strcmp(opt, str)==0) \ + { return cfg_strlist_insert(&cfg->var, strdup(val)); } +/** put string into strlist if not present yet*/ +#define S_STRLIST_UNIQ(str, var) if(strcmp(opt, str)==0) \ + { if(cfg_strlist_find(cfg->var, val)) { return 0;} \ + return cfg_strlist_insert(&cfg->var, strdup(val)); } +/** append string to strlist */ +#define S_STRLIST_APPEND(str, var) if(strcmp(opt, str)==0) \ + { return cfg_strlist_append(&cfg->var, strdup(val)); } + +int config_set_option(struct config_file* cfg, const char* opt, + const char* val) +{ + char buf[64]; + if(!opt) return 0; + if(opt[strlen(opt)-1] != ':' && strlen(opt)+2stat_interval = 0; + else if(atoi(val) == 0) + return 0; + else cfg->stat_interval = atoi(val); + } else if(strcmp(opt, "num-threads:") == 0) { + /* not supported, library must have 1 thread in bgworker */ + return 0; + } else if(strcmp(opt, "outgoing-port-permit:") == 0) { - return cfg_mark_ports(val, 1, ++ return cfg_mark_ports(val, 1, + cfg->outgoing_avail_ports, 65536); + } else if(strcmp(opt, "outgoing-port-avoid:") == 0) { - return cfg_mark_ports(val, 0, ++ return cfg_mark_ports(val, 0, + cfg->outgoing_avail_ports, 65536); + } else if(strcmp(opt, "local-zone:") == 0) { + return cfg_parse_local_zone(cfg, val); + } else if(strcmp(opt, "val-override-date:") == 0) { + if(strcmp(val, "") == 0 || strcmp(val, "0") == 0) { + cfg->val_date_override = 0; + } else if(strlen(val) == 14) { + cfg->val_date_override = cfg_convert_timeval(val); + return cfg->val_date_override != 0; + } else { + if(atoi(val) == 0) return 0; + cfg->val_date_override = (uint32_t)atoi(val); + } - } else if(strcmp(opt, "local-data-ptr:") == 0) { ++ } else if(strcmp(opt, "local-data-ptr:") == 0) { + char* ptr = cfg_ptr_reverse((char*)opt); + return cfg_strlist_insert(&cfg->local_data, ptr); + } else if(strcmp(opt, "logfile:") == 0) { + cfg->use_syslog = 0; + free(cfg->logfile); + return (cfg->logfile = strdup(val)) != NULL; + } + else if(strcmp(opt, "log-time-ascii:") == 0) + { IS_YES_OR_NO; cfg->log_time_ascii = (strcmp(val, "yes") == 0); + log_set_time_asc(cfg->log_time_ascii); } + else S_SIZET_NONZERO("max-udp-size:", max_udp_size) + else S_YNO("use-syslog:", use_syslog) + else S_STR("log-identity:", log_identity) + else S_YNO("extended-statistics:", stat_extended) + else S_YNO("statistics-inhibit-zero:", stat_inhibit_zero) + else S_YNO("statistics-cumulative:", stat_cumulative) + else S_YNO("shm-enable:", shm_enable) + else S_NUMBER_OR_ZERO("shm-key:", shm_key) + else S_YNO("do-ip4:", do_ip4) + else S_YNO("do-ip6:", do_ip6) + else S_YNO("do-udp:", do_udp) + else S_YNO("do-tcp:", do_tcp) + else S_YNO("prefer-ip4:", prefer_ip4) + else S_YNO("prefer-ip6:", prefer_ip6) + else S_YNO("tcp-upstream:", tcp_upstream) + else S_YNO("udp-upstream-without-downstream:", + udp_upstream_without_downstream) + else S_NUMBER_NONZERO("tcp-mss:", tcp_mss) + else S_NUMBER_NONZERO("outgoing-tcp-mss:", outgoing_tcp_mss) + else S_NUMBER_NONZERO("tcp-auth-query-timeout:", tcp_auth_query_timeout) + else S_NUMBER_NONZERO("tcp-idle-timeout:", tcp_idle_timeout) + else S_NUMBER_NONZERO("max-reuse-tcp-queries:", max_reuse_tcp_queries) + else S_NUMBER_NONZERO("tcp-reuse-timeout:", tcp_reuse_timeout) + else S_YNO("edns-tcp-keepalive:", do_tcp_keepalive) + else S_NUMBER_NONZERO("edns-tcp-keepalive-timeout:", tcp_keepalive_timeout) ++ else S_NUMBER_OR_ZERO("sock-queue-timeout:", sock_queue_timeout) + else S_YNO("ssl-upstream:", ssl_upstream) + else S_YNO("tls-upstream:", ssl_upstream) + else S_STR("ssl-service-key:", ssl_service_key) + else S_STR("tls-service-key:", ssl_service_key) + else S_STR("ssl-service-pem:", ssl_service_pem) + else S_STR("tls-service-pem:", ssl_service_pem) + else S_NUMBER_NONZERO("ssl-port:", ssl_port) + else S_NUMBER_NONZERO("tls-port:", ssl_port) + else S_STR("ssl-cert-bundle:", tls_cert_bundle) + else S_STR("tls-cert-bundle:", tls_cert_bundle) + else S_YNO("tls-win-cert:", tls_win_cert) + else S_YNO("tls-system-cert:", tls_win_cert) + else S_STRLIST("additional-ssl-port:", tls_additional_port) + else S_STRLIST("additional-tls-port:", tls_additional_port) + else S_STRLIST("tls-additional-ports:", tls_additional_port) + else S_STRLIST("tls-additional-port:", tls_additional_port) + else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys) + else S_STR("tls-ciphers:", tls_ciphers) + else S_STR("tls-ciphersuites:", tls_ciphersuites) + else S_YNO("tls-use-sni:", tls_use_sni) + else S_NUMBER_NONZERO("https-port:", https_port) + else S_STR("http-endpoint:", http_endpoint) + else S_NUMBER_NONZERO("http-max-streams:", http_max_streams) + else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size) + else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size) + else S_YNO("http-nodelay:", http_nodelay) + else S_YNO("http-notls-downstream:", http_notls_downstream) + else S_YNO("interface-automatic:", if_automatic) + else S_STR("interface-automatic-ports:", if_automatic_ports) + else S_YNO("use-systemd:", use_systemd) + else S_YNO("do-daemonize:", do_daemonize) + else S_NUMBER_NONZERO("port:", port) + else S_NUMBER_NONZERO("outgoing-range:", outgoing_num_ports) + else S_SIZET_OR_ZERO("outgoing-num-tcp:", outgoing_num_tcp) + else S_SIZET_OR_ZERO("incoming-num-tcp:", incoming_num_tcp) + else S_MEMSIZE("stream-wait-size:", stream_wait_size) + else S_SIZET_NONZERO("edns-buffer-size:", edns_buffer_size) *** 4018 LINES SKIPPED *** From nobody Tue Sep 19 08:47:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqZzd39s5z4tcf8; Tue, 19 Sep 2023 08:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqZzd2fB3z3MrP; Tue, 19 Sep 2023 08:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695113245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jezjNbhIoUJseogiPw2i7JT1p7ONn6Myxnjn5rY/0SU=; b=n6PEtVeVdChF5SLG7uO+cVz6FNe/rEdc+Kun/OF+nBQTPzaZJoWUTyTGinDDwQysRI6joy Bm1aNEFX8okmLPdHBhVjkGuL58xapv5xTJFu5LyUZLbBWiTgsvOPWE7MrEzqs0vGAiHXQG n5ve+g0qkISPObtUjQ47BHcyl9LNtND6t6/09wNolelbOsyx6ONGELESg86T7Pyq93/zC3 jeSsuY38kdaD4MMMael7evMCGwziJlP5t5M4qC5qwIU1klxWiJhf9Uh+3+l/Ublxv46WE7 jEcWqsa4VKGyTaqdfmyGOJUDCQuFYybKHthMzSxRwzMBRkrDwduHq3sP2dJEQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695113245; a=rsa-sha256; cv=none; b=dkg9Dhz2XebmSHcHckvQQYI2LbBhxl87GIh8Qf72VL7qlspNaBgPpYtpEvdKK6mmaj1AAY c97G6JImFe4rf5vNYnHt0tPIGVexNGsykjYDqFPlLuyvMWoH6x4OpiNI+iuSt9y25uuVr3 DiR0u6WVTt+e+0V7sTgRLDZ8m0X8RHi8Ib0BIAcfsRfWbkaKXKfq78xsTdqVz+HJYhV/K/ jIpZ7tbR3InBQaoWHf2o2pAdXmTq6jUNyyknyWrfXqBLihY01y1VRQPMAEIzNHmeTfpeyN gRj8otaVxJADd0OJGhDgnWLoJS+6luPia3IPG+hrUoayH/Z87+psVQT3l1t8cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695113245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jezjNbhIoUJseogiPw2i7JT1p7ONn6Myxnjn5rY/0SU=; b=pPfEIUIQBiY8Ek/8xGwih2HbZ5SJs668DWDwuR++HbFHkQHb6gF6LGdMvjc2QsFefpI2vw zk5DqZCyzqSMbjLKsEMmjnhtTTXsO+grwFbQ2Oemd62utOJr/kzM3/T4qMx4N4/bKVDQnC 1Gyma59ra8kchprxTD8kuJvl1n63xxmMFSWtqrxel4KG9RPTGecvFAJjRz+6ApzBP6+rLF 7hv+bFPczvqFH10m2yzCxrD0Br7+3GLygMRutx1nU9yRLHZ8vToWszNw5fce/ssXENo8IN a1A3u3nokhSQ8RGoniA3mRks2sQ0XAXf4MqdZhC7v0DpnI7yvnlJXTmqvC/gYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqZzd1gywz16Kk; Tue, 19 Sep 2023 08:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38J8lPSM027214; Tue, 19 Sep 2023 08:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38J8lP4h027211; Tue, 19 Sep 2023 08:47:25 GMT (envelope-from git) Date: Tue, 19 Sep 2023 08:47:25 GMT Message-Id: <202309190847.38J8lP4h027211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a2d1360142f6 - main - ping: The -C option is also supported for IPv6. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2d1360142f609485c9301df08cc99140743ef2b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a2d1360142f609485c9301df08cc99140743ef2b commit a2d1360142f609485c9301df08cc99140743ef2b Author: Dag-Erling Smørgrav AuthorDate: 2023-09-19 08:47:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-19 08:47:11 +0000 ping: The -C option is also supported for IPv6. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: rscheff, allanjude Differential Revision: https://reviews.freebsd.org/D41881 --- sbin/ping/main.c | 2 +- sbin/ping/ping.8 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 47d20f569008..6321178e1228 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -211,7 +211,7 @@ usage(void) "Z" #endif "] " - "[-b bufsiz] [-c count] [-e gateway]\n" + "[-b bufsiz] [-C pcp] [-c count] [-e gateway]\n" "\t [-I interface] [-i wait] [-k addrtype] [-l preload] " "[-m hoplimit]\n" "\t [-p pattern]" diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8 index 7419aef51dfa..34ffc98c3a40 100644 --- a/sbin/ping/ping.8 +++ b/sbin/ping/ping.8 @@ -27,7 +27,7 @@ .\" .\" @(#)ping.8 8.2 (Berkeley) 12/11/93 .\" -.Dd November 20, 2022 +.Dd September 15, 2023 .Dt PING 8 .Os .Sh NAME @@ -81,6 +81,7 @@ packets to network hosts .Op Fl 6AaDdEfHNnOoquvYyZ .Op Fl .\& Ns Ar chars .Op Fl b Ar bufsiz +.Op Fl C Ar pcp .Op Fl c Ar count .Op Fl e Ar gateway .Op Fl I Ar interface From nobody Tue Sep 19 10:05:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqcjK4rqkz4tjhD; Tue, 19 Sep 2023 10:05:09 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqcjK301Mz3Ws6; Tue, 19 Sep 2023 10:05:09 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 38JA57dm067104; Tue, 19 Sep 2023 13:05:07 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 38JA579f067103; Tue, 19 Sep 2023 13:05:07 +0300 (MSK) (envelope-from dchagin) Date: Tue, 19 Sep 2023 13:05:07 +0300 From: Dmitry Chagin To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Queue-Id: 4RqcjK301Mz3Ws6 On Tue, Sep 19, 2023 at 12:05:42AM +0300, Konstantin Belousov wrote: > On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > > The branch main has been updated by dchagin: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > Author: Dmitry Chagin > > AuthorDate: 2023-09-18 14:53:01 +0000 > > Commit: Dmitry Chagin > > CommitDate: 2023-09-18 14:53:01 +0000 > > > > linux(4): On Linux SIGKILL can not be reset to default > > > > MFC after: 1 week > > --- > > sys/compat/linux/linux_signal.c | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > > index e3e3fc74a6a9..9a84700b3949 100644 > > --- a/sys/compat/linux/linux_signal.c > > +++ b/sys/compat/linux/linux_signal.c > > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > if (!LINUX_SIG_VALID(linux_sig)) > > return (EINVAL); > > + sig = linux_to_bsd_signal(linux_sig); > > > > osa = (linux_osa != NULL) ? &oact : NULL; > > if (linux_nsa != NULL) { > > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > linux_ktrsigset(&linux_nsa->lsa_mask, > > sizeof(linux_nsa->lsa_mask)); > > #endif > > + if ((sig == SIGKILL || sig == SIGSTOP) && > > + nsa->sa_handler == SIG_DFL) > > + return (EINVAL); > This is excessive: look at kern_sigaction() around line 822. > Well, I checkd that before, Bruce added this check a long time ago, however, Bruce's change allows the handler to be set to SIG_DFL. And I haven't found an explicit statement of how it should be in POSIX, so I think it's Linux specific > > } else > > nsa = NULL; > > - sig = linux_to_bsd_signal(linux_sig); > > > > error = kern_sigaction(td, sig, nsa, osa, 0); > > if (error != 0) From nobody Tue Sep 19 10:42:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqdXX1DZ6z4tlms; Tue, 19 Sep 2023 10:42:36 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqdXW4Fvfz3dbH; Tue, 19 Sep 2023 10:42:35 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 38JAgR24001761 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Sep 2023 13:42:30 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 38JAgR24001761 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 38JAgQqx001760; Tue, 19 Sep 2023 13:42:26 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 19 Sep 2023 13:42:26 +0300 From: Konstantin Belousov To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4RqdXW4Fvfz3dbH On Tue, Sep 19, 2023 at 01:05:07PM +0300, Dmitry Chagin wrote: > On Tue, Sep 19, 2023 at 12:05:42AM +0300, Konstantin Belousov wrote: > > On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > > > The branch main has been updated by dchagin: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > Author: Dmitry Chagin > > > AuthorDate: 2023-09-18 14:53:01 +0000 > > > Commit: Dmitry Chagin > > > CommitDate: 2023-09-18 14:53:01 +0000 > > > > > > linux(4): On Linux SIGKILL can not be reset to default > > > > > > MFC after: 1 week > > > --- > > > sys/compat/linux/linux_signal.c | 5 ++++- > > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > > > index e3e3fc74a6a9..9a84700b3949 100644 > > > --- a/sys/compat/linux/linux_signal.c > > > +++ b/sys/compat/linux/linux_signal.c > > > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > > if (!LINUX_SIG_VALID(linux_sig)) > > > return (EINVAL); > > > + sig = linux_to_bsd_signal(linux_sig); > > > > > > osa = (linux_osa != NULL) ? &oact : NULL; > > > if (linux_nsa != NULL) { > > > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > linux_ktrsigset(&linux_nsa->lsa_mask, > > > sizeof(linux_nsa->lsa_mask)); > > > #endif > > > + if ((sig == SIGKILL || sig == SIGSTOP) && > > > + nsa->sa_handler == SIG_DFL) > > > + return (EINVAL); > > This is excessive: look at kern_sigaction() around line 822. > > > > Well, I checkd that before, Bruce added this check a long time ago, > however, Bruce's change allows the handler to be set to SIG_DFL. > And I haven't found an explicit statement of how it should be in POSIX, > so I think it's Linux specific > If kern_sigaction() allows to change SIGKILL or SIGSTOP disposition from default, we have a serious issue. The check above simply repeats the check from kern_sigaction(). From nobody Tue Sep 19 11:47:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqfyv5Z7Kz4tq1r; Tue, 19 Sep 2023 11:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqfyv50wsz4Ggw; Tue, 19 Sep 2023 11:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695124023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjqcVajX0IVtvQOPnWNL93D+9fDoPeXe4NG0WSJsjik=; b=P/rrCk5l4eUySqvZzytdxmu1tCRccyXLJi+IjF3ovtPmU3yVHSqpyrwz9Fny7BkjR6FQdf hOvcFigyvIxUBVddrHdXQKfvrcGsC7Hbjf7OTYpCekUuJbimUF/Ox+gQb8V6dymc7a9WQo QKkXh1+isO3pO6KBq0zXKkStmrlQobb5AvlM3yeHCAiydeEB4N+bWaNIFlbOQSPQKNL0cR MS5iKD1vialh3yflE6YiCuOEmX8/HTGB0WcHn1xuL1FZw0+WTNQxXiz5hL7cMgy9qVEc7I s2w+ydZudngMhPEZxdkvuxCtmlTzR5nUZTNgtAFJZf1NC8LNd72rM/d0qRAB0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695124023; a=rsa-sha256; cv=none; b=qHBnI8Z7Pu4dsVzpxgkl+l+giUMTFi7TTbXAc76z7ysWE9IUoPFGyNIg3fcZlFhCUDFohN RAoEsKz9UbxACyWYdYqc3BaiPBgYBHCMgUwQykW2HN0BQWGqq7n6ntQ3okjD6cwVlv3UTA Lh7mtfjh5jrrekzN/8h87BI2e2UCLbAaFvdJlRDwwpXO9RMtE5uikDpRLhi2RUFzKlch8r 2njqgvaKi7qW07b0IHqw8fHrOXotZoSiSFq2mxqpiLbRpmg4RrfyLjlPjK7QgHEnYtD8KW dXCkGgN7Ewh9l9Ce8wrLgEwIlSacmzbVav9DmJfaycpr3dYkvyt0Le2fQ/YDBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695124023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjqcVajX0IVtvQOPnWNL93D+9fDoPeXe4NG0WSJsjik=; b=AolEGoih9OtlOMY+8uyhCEDg9ZdB0LaSdxghWFB4YLggeuzlLD86mHw5zMPnekKNoYVO1o GMFNTvPVSwd96Xz9EYAOTqglSxIi1wOCWrkQQsOmq7MWuk0BiItqGoro8gx/LV7a7MqeYm 8wTkpsn+2entrPI7GxxrOL37G5kyzivvqBaDc/ZwNrQ2R2Ppt1p06zFGR73fzEj7Yzbkzo ho/rWYn2ZuwkEpfYSoerpehYOgCrFjnKg11iUzB0XoAO1mnja2zrKu9GJLhH8V5DrjoEys gijF7Ad0Ufx9ce7DMf46fxmkMBBKq1CtSuqLyfbVGus5SnIR57MSjyp7OaxkxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqfyv3zHGz1BKf; Tue, 19 Sep 2023 11:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JBl3TM025801; Tue, 19 Sep 2023 11:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JBl37F025798; Tue, 19 Sep 2023 11:47:03 GMT (envelope-from git) Date: Tue, 19 Sep 2023 11:47:03 GMT Message-Id: <202309191147.38JBl37F025798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8a99263e9da1 - main - ObsoleteFiles: cleanup more old libclang_rt files for powerpc64le List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a99263e9da1f04ede967cfa1ea6d52d258dcbe5 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a99263e9da1f04ede967cfa1ea6d52d258dcbe5 commit 8a99263e9da1f04ede967cfa1ea6d52d258dcbe5 Author: Dimitry Andric AuthorDate: 2023-09-19 11:45:57 +0000 Commit: Dimitry Andric CommitDate: 2023-09-19 11:45:57 +0000 ObsoleteFiles: cleanup more old libclang_rt files for powerpc64le PR: 273776 MFC after: 3 days --- ObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 10bf398e721a..eb0394722aa9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -509,14 +509,18 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-armhf.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-armhf.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-x86_64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-armhf.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-x86_64.a OLD_DIRS+=usr/lib/clang/15.0.7/lib/freebsd From nobody Tue Sep 19 12:39:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqh7J5wbnz4tslm; Tue, 19 Sep 2023 12:39:24 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqh7J24Jjz4Kt3; Tue, 19 Sep 2023 12:39:24 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 38JCdLIr067599; Tue, 19 Sep 2023 15:39:21 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 38JCdLg0067598; Tue, 19 Sep 2023 15:39:21 +0300 (MSK) (envelope-from dchagin) Date: Tue, 19 Sep 2023 15:39:21 +0300 From: Dmitry Chagin To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Queue-Id: 4Rqh7J24Jjz4Kt3 On Tue, Sep 19, 2023 at 01:42:26PM +0300, Konstantin Belousov wrote: > On Tue, Sep 19, 2023 at 01:05:07PM +0300, Dmitry Chagin wrote: > > On Tue, Sep 19, 2023 at 12:05:42AM +0300, Konstantin Belousov wrote: > > > On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > > > > The branch main has been updated by dchagin: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > > > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > Author: Dmitry Chagin > > > > AuthorDate: 2023-09-18 14:53:01 +0000 > > > > Commit: Dmitry Chagin > > > > CommitDate: 2023-09-18 14:53:01 +0000 > > > > > > > > linux(4): On Linux SIGKILL can not be reset to default > > > > > > > > MFC after: 1 week > > > > --- > > > > sys/compat/linux/linux_signal.c | 5 ++++- > > > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > > > > index e3e3fc74a6a9..9a84700b3949 100644 > > > > --- a/sys/compat/linux/linux_signal.c > > > > +++ b/sys/compat/linux/linux_signal.c > > > > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > > > > if (!LINUX_SIG_VALID(linux_sig)) > > > > return (EINVAL); > > > > + sig = linux_to_bsd_signal(linux_sig); > > > > > > > > osa = (linux_osa != NULL) ? &oact : NULL; > > > > if (linux_nsa != NULL) { > > > > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > linux_ktrsigset(&linux_nsa->lsa_mask, > > > > sizeof(linux_nsa->lsa_mask)); > > > > #endif > > > > + if ((sig == SIGKILL || sig == SIGSTOP) && > > > > + nsa->sa_handler == SIG_DFL) > > > > + return (EINVAL); > > > This is excessive: look at kern_sigaction() around line 822. > > > > > > > Well, I checkd that before, Bruce added this check a long time ago, > > however, Bruce's change allows the handler to be set to SIG_DFL. > > And I haven't found an explicit statement of how it should be in POSIX, > > so I think it's Linux specific > > > > If kern_sigaction() allows to change SIGKILL or SIGSTOP disposition from > default, we have a serious issue. The check above simply repeats the > check from kern_sigaction(). Hmm, why? Native kern_sigaction check: if ((sig == SIGKILL || sig == SIGSTOP) && act->sa_handler != SIG_DFL) { ^^^^^^^ this allows to set sa_handler to SIG_DFL, but Linux forbids this mtx_unlock(&ps->ps_mtx); PROC_UNLOCK(p); return (EINVAL); } And I found in the POSIX: It is unspecified whether an attempt to set the action for a signal that cannot be caught or ignored to SIG_DFL is ignored or causes an error to be returned with errno set to [EINVAL]. The sigaction() function may fail if: [EINVAL] An attempt was made to set the action to SIG_DFL for a signal that cannot be caught or ignored (or both). Linux returns EINVAL in that case, FreeBSD does not, both are valid? From nobody Tue Sep 19 13:22:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqj5Z3KBKz4tvlK; Tue, 19 Sep 2023 13:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqj5Z2gN5z4NwB; Tue, 19 Sep 2023 13:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695129778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Baw7qefSTMPJv5/NlgtJN81lRroby0FGdR5yCMgknA=; b=wLvQioRT7Pr5Ux9YesL97EzGwVfP6QlZkgajBUeoR4w57zfev+P5ellvGQKuhlVs7Mv5d7 kd7w2ampuoC53nmNk6u3u0zcJsEW6uRuhRWrseleHaYGWhc+wXlwB0vhPrxkDNer0QSzmM gjUfWNbugCA+tnTmlkZpWq5Tcj0IGEyCZTvvyR5omqi0FENZD6o2NPr3aUa2GGCrFmnWgH KfRMqX66HC/cxE8eAmo6CKb98iMp1k0yeawErhsZ04HwheHdWjVXzET8CWYe+D8L/dUnfC MPv0TilNoEBZUaBRwxHk0Irj1rBsvgh8AVcS0NPt5phqaK8tASR9xHnGB9NX5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695129778; a=rsa-sha256; cv=none; b=bPgXGlZjRhxS2fm4J26xXNc3QGmgTIsZdsCIX2c8/S8fLkCYHFu3jngqwXcn6nCnGF9ACK ohdOgdqhGn+V6/wQdCA18nr4wIwTN67sOqzFlt6NL67ZbRqvc5E0HFUb4o2q6ra1Sw6kb3 /SI0FiXWYQKM6bvtIsUx13LQzQAW63kmRyrxIG3xZEo7uwY7SNlzkfOmt9fxGjMiWXiOdN FP7Px0SFv9lZI4Okc61DLlBz24baVrsrMBrGW8h6fmfoaxqSztfFxCmoCrGWfMCpRyVEDl UnF/sD/taeLg1eg9cBNF2f7E6VHvz7Y+uVNLbjlHwF4L+YtpR8EjzUqjDDbFJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695129778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Baw7qefSTMPJv5/NlgtJN81lRroby0FGdR5yCMgknA=; b=NQzvp87wbszzIDM0qZqrI3Q6B0hsw/dYDlDe+SBEa/I4XSHduEzqLSSUZeIw33a5636rxk POkQSFGg39nRgvcdtxqfnIBWwItGkz772EFQ+ZMlMA8n1cpFHsAo9RXCgnYPI6pq+V3rmp 3ra8FgJxIOnteWGj96LZyjcq4b7hcPh3LloEKo7X61As0LaMIpAYVXj+Ch+km5dfSY7u+G lQR7K5meThAm5tVT0QZ6zoD1Ed/e/Ve+trbTMj3bFs3pz+6YIVvOe/V28HSpzgTNynTBgL 2GEjXmaDFEfYU5cgsENrKEtsAT2chILN8XXSegP77xqcnzVgWNQCgmftyak4YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqj5Z1mTQzj7; Tue, 19 Sep 2023 13:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JDMwBE091399; Tue, 19 Sep 2023 13:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JDMwfe091396; Tue, 19 Sep 2023 13:22:58 GMT (envelope-from git) Date: Tue, 19 Sep 2023 13:22:58 GMT Message-Id: <202309191322.38JDMwfe091396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 75556db552c9 - main - dummynet: fix comment typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75556db552c993dd4948c8e0ae83cc386c350451 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=75556db552c993dd4948c8e0ae83cc386c350451 commit 75556db552c993dd4948c8e0ae83cc386c350451 Author: Igor Ostapenko AuthorDate: 2023-09-19 11:18:36 +0000 Commit: Ed Maste CommitDate: 2023-09-19 13:22:19 +0000 dummynet: fix comment typo Signed-off-by: Igor Ostapenko Pull-request: https://github.com/freebsd/freebsd-src/pull/848 --- sys/netpfil/ipfw/ip_dn_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c index a8957bcb479f..3e6bd0e229b5 100644 --- a/sys/netpfil/ipfw/ip_dn_io.c +++ b/sys/netpfil/ipfw/ip_dn_io.c @@ -865,7 +865,7 @@ tag_mbuf(struct mbuf *m, int dir, struct ip_fw_args *fwa) dt->if_index = fwa->ifp->if_index; dt->if_idxgen = fwa->ifp->if_idxgen; } - /* dt->output tame is updated as we move through */ + /* dt->output_time is updated as we move through */ dt->output_time = V_dn_cfg.curr_time; dt->iphdr_off = (dir & PROTO_LAYER2) ? ETHER_HDR_LEN : 0; return 0; From nobody Tue Sep 19 13:35:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqjNF28RXz4twjS; Tue, 19 Sep 2023 13:35:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqjND60xmz4SrS; Tue, 19 Sep 2023 13:35:40 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 38JDZVH2045495 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Sep 2023 16:35:35 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 38JDZVH2045495 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 38JDZVDL045494; Tue, 19 Sep 2023 16:35:31 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 19 Sep 2023 16:35:31 +0300 From: Konstantin Belousov To: Dmitry Chagin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4RqjND60xmz4SrS On Tue, Sep 19, 2023 at 03:39:21PM +0300, Dmitry Chagin wrote: > On Tue, Sep 19, 2023 at 01:42:26PM +0300, Konstantin Belousov wrote: > > On Tue, Sep 19, 2023 at 01:05:07PM +0300, Dmitry Chagin wrote: > > > On Tue, Sep 19, 2023 at 12:05:42AM +0300, Konstantin Belousov wrote: > > > > On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > > > > > The branch main has been updated by dchagin: > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > > > > > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > Author: Dmitry Chagin > > > > > AuthorDate: 2023-09-18 14:53:01 +0000 > > > > > Commit: Dmitry Chagin > > > > > CommitDate: 2023-09-18 14:53:01 +0000 > > > > > > > > > > linux(4): On Linux SIGKILL can not be reset to default > > > > > > > > > > MFC after: 1 week > > > > > --- > > > > > sys/compat/linux/linux_signal.c | 5 ++++- > > > > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > > > > > index e3e3fc74a6a9..9a84700b3949 100644 > > > > > --- a/sys/compat/linux/linux_signal.c > > > > > +++ b/sys/compat/linux/linux_signal.c > > > > > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > > > > > > if (!LINUX_SIG_VALID(linux_sig)) > > > > > return (EINVAL); > > > > > + sig = linux_to_bsd_signal(linux_sig); > > > > > > > > > > osa = (linux_osa != NULL) ? &oact : NULL; > > > > > if (linux_nsa != NULL) { > > > > > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > linux_ktrsigset(&linux_nsa->lsa_mask, > > > > > sizeof(linux_nsa->lsa_mask)); > > > > > #endif > > > > > + if ((sig == SIGKILL || sig == SIGSTOP) && > > > > > + nsa->sa_handler == SIG_DFL) > > > > > + return (EINVAL); > > > > This is excessive: look at kern_sigaction() around line 822. > > > > > > > > > > Well, I checkd that before, Bruce added this check a long time ago, > > > however, Bruce's change allows the handler to be set to SIG_DFL. > > > And I haven't found an explicit statement of how it should be in POSIX, > > > so I think it's Linux specific > > > > > > > If kern_sigaction() allows to change SIGKILL or SIGSTOP disposition from > > default, we have a serious issue. The check above simply repeats the > > check from kern_sigaction(). > > Hmm, why? Native kern_sigaction check: > > if ((sig == SIGKILL || sig == SIGSTOP) && > act->sa_handler != SIG_DFL) { > > ^^^^^^^ this allows to set sa_handler to SIG_DFL, > but Linux forbids this > > mtx_unlock(&ps->ps_mtx); > PROC_UNLOCK(p); > return (EINVAL); > } > > And I found in the POSIX: > > It is unspecified whether an attempt to set the action for a signal that > cannot be caught or ignored to SIG_DFL is ignored or causes an error to > be returned with errno set to [EINVAL]. > > The sigaction() function may fail if: > [EINVAL] > An attempt was made to set the action to SIG_DFL for a > signal that cannot be caught or ignored (or both). > > Linux returns EINVAL in that case, FreeBSD does not, both are valid? Ah, I see. Thank you for the explanation. What was the commit where bde added the check? From nobody Tue Sep 19 13:45:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqjbH2rLtz4tx1v; Tue, 19 Sep 2023 13:45:15 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqjbH0WqPz4VLq; Tue, 19 Sep 2023 13:45:14 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 38JDjBGF067886; Tue, 19 Sep 2023 16:45:11 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 38JDjB35067885; Tue, 19 Sep 2023 16:45:11 +0300 (MSK) (envelope-from dchagin) Date: Tue, 19 Sep 2023 16:45:11 +0300 From: Dmitry Chagin To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 227d01c1bc7c - main - linux(4): On Linux SIGKILL can not be reset to default Message-ID: References: <202309181453.38IErP3M046039@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU] X-Rspamd-Queue-Id: 4RqjbH0WqPz4VLq On Tue, Sep 19, 2023 at 04:35:31PM +0300, Konstantin Belousov wrote: > On Tue, Sep 19, 2023 at 03:39:21PM +0300, Dmitry Chagin wrote: > > On Tue, Sep 19, 2023 at 01:42:26PM +0300, Konstantin Belousov wrote: > > > On Tue, Sep 19, 2023 at 01:05:07PM +0300, Dmitry Chagin wrote: > > > > On Tue, Sep 19, 2023 at 12:05:42AM +0300, Konstantin Belousov wrote: > > > > > On Mon, Sep 18, 2023 at 02:53:25PM +0000, Dmitry Chagin wrote: > > > > > > The branch main has been updated by dchagin: > > > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > > > > > > > > commit 227d01c1bc7caf2e838ee6eef1e6a3cc81d79d1b > > > > > > Author: Dmitry Chagin > > > > > > AuthorDate: 2023-09-18 14:53:01 +0000 > > > > > > Commit: Dmitry Chagin > > > > > > CommitDate: 2023-09-18 14:53:01 +0000 > > > > > > > > > > > > linux(4): On Linux SIGKILL can not be reset to default > > > > > > > > > > > > MFC after: 1 week > > > > > > --- > > > > > > sys/compat/linux/linux_signal.c | 5 ++++- > > > > > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > > > > > > > diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c > > > > > > index e3e3fc74a6a9..9a84700b3949 100644 > > > > > > --- a/sys/compat/linux/linux_signal.c > > > > > > +++ b/sys/compat/linux/linux_signal.c > > > > > > @@ -170,6 +170,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > > > > > > > > if (!LINUX_SIG_VALID(linux_sig)) > > > > > > return (EINVAL); > > > > > > + sig = linux_to_bsd_signal(linux_sig); > > > > > > > > > > > > osa = (linux_osa != NULL) ? &oact : NULL; > > > > > > if (linux_nsa != NULL) { > > > > > > @@ -180,9 +181,11 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, > > > > > > linux_ktrsigset(&linux_nsa->lsa_mask, > > > > > > sizeof(linux_nsa->lsa_mask)); > > > > > > #endif > > > > > > + if ((sig == SIGKILL || sig == SIGSTOP) && > > > > > > + nsa->sa_handler == SIG_DFL) > > > > > > + return (EINVAL); > > > > > This is excessive: look at kern_sigaction() around line 822. > > > > > > > > > > > > > Well, I checkd that before, Bruce added this check a long time ago, > > > > however, Bruce's change allows the handler to be set to SIG_DFL. > > > > And I haven't found an explicit statement of how it should be in POSIX, > > > > so I think it's Linux specific > > > > > > > > > > If kern_sigaction() allows to change SIGKILL or SIGSTOP disposition from > > > default, we have a serious issue. The check above simply repeats the > > > check from kern_sigaction(). > > > > Hmm, why? Native kern_sigaction check: > > > > if ((sig == SIGKILL || sig == SIGSTOP) && > > act->sa_handler != SIG_DFL) { > > > > ^^^^^^^ this allows to set sa_handler to SIG_DFL, > > but Linux forbids this > > > > mtx_unlock(&ps->ps_mtx); > > PROC_UNLOCK(p); > > return (EINVAL); > > } > > > > And I found in the POSIX: > > > > It is unspecified whether an attempt to set the action for a signal that > > cannot be caught or ignored to SIG_DFL is ignored or causes an error to > > be returned with errno set to [EINVAL]. > > > > The sigaction() function may fail if: > > [EINVAL] > > An attempt was made to set the action to SIG_DFL for a > > signal that cannot be caught or ignored (or both). > > > > Linux returns EINVAL in that case, FreeBSD does not, both are valid? > Ah, I see. Thank you for the explanation. > > What was the commit where bde added the check? e6eeb36d From nobody Tue Sep 19 14:12:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqkBD3qhZz4tyRK; Tue, 19 Sep 2023 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqkBD3YF7z4Yfq; Tue, 19 Sep 2023 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695132724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yss0VbdIRQ4hUcmH/k/I08ZaH0yLBkox9DNXj9SIASY=; b=fmw/wDuYb2bdPI/Z6ErLZ8LvcPfjq8RjAxcbBdTG7My2XX5sfxTgD0una3Rjij8bJ2OEgg m7cTrSIWdZrCHtnMCgX+Gazd4XpsEWk3z8SK7nWeP2Pv40V5aVFl3P8oT14TFTinGrUMGN o7K0BZ4JESe99rePa7RSZjCZF30LwVMOV7YyLzGJW85MH/BYXDDcATfecJQ71F6yJRc5HN 63ipg1JRgHq5qGJXPBkoUyKguNw5/dJ+N6zRa2C0Ftp39LgDr06h1NlKLe5qR9JQcGWF4K tnR95ysomG8rOBm5i1aPv+tYPr7oll+2tBuzW5TbY5OeWo6S39v/fRnX377Bhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695132724; a=rsa-sha256; cv=none; b=AZ6Glh28hWd+yL+TfcfMXt2ef5ALchf93dple7HtpxK1kDb8WxB75AjkhWwpy4QUAKQMho LJFJ7y8tyroyLMpSaC5uC9VnYTSJohl0IvjG8v7U0Ou0LRi85/rnXKRIiIK0q4KWq7KUsP 8ZM7sHwWzTLRFvd66GCKW2uSPcnojlyGb5Bey2eThmGaxTBGspwP5cx0zbt5WvyozRjbSm BwheBtHvayd8/Sn85b2w9qMn+I/T636N/1jwvtwjutMdFlKaTnKlrJ37PLnsH+Fi8resDo 9k6qL4oRqTFK9g66MVIpYTi17zVB01HHlxulSwH14tMVtHD5E+VyiZ/W3aACWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695132724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yss0VbdIRQ4hUcmH/k/I08ZaH0yLBkox9DNXj9SIASY=; b=iPSCU459AYdCovsXvWNWSVCGIpchu7XtzEWlTeNDdFMpooVyR7EvhhTz6G3/YoSRmPa2VI OV9mOgQRLjQMM175vcqLXillKA4NSeIu+bh+Gu7Cqde79TilLU4uz/UkKAw9omHHYLNFo0 nWNWFPjBTOjLm46DueecuLCBh5MSnn+S+pouZk5aondOS5zYMis2h9izASCom/4Q7zO2ls zg/M7WytH6UU4qTVI7z93e+GblsC8WmhKh8zygWkwnm8btG+E9YXLx45KFOMQm+8teikk+ 43iwiTfVsWWsN7/TzFgiB+kqesKYx/3w3EKH3JDCoxhROisyntP+Qa22x1C6sQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqkBD2dV2z27Q; Tue, 19 Sep 2023 14:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JEC4XF072918; Tue, 19 Sep 2023 14:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JEC4go072915; Tue, 19 Sep 2023 14:12:04 GMT (envelope-from git) Date: Tue, 19 Sep 2023 14:12:04 GMT Message-Id: <202309191412.38JEC4go072915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: a687910fc435 - main - Cleanup pthread locks in ofed RDMA verbs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a687910fc4352117413b8e0275383e4c687d4c4c Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=a687910fc4352117413b8e0275383e4c687d4c4c commit a687910fc4352117413b8e0275383e4c687d4c4c Author: Sean Lim AuthorDate: 2023-09-18 23:56:30 +0000 Commit: Eric van Gyzen CommitDate: 2023-09-19 14:10:42 +0000 Cleanup pthread locks in ofed RDMA verbs On FreeBSD, pthread mutex, cond, and spinlocks allocate memory. On Linux-based systems, these calls do not allocate memory. So there was a safe assumption that the ofed RDMA verb calls do not need to explicitly destroy the pthread locks. This assumption is false on FreeBSD. So let us rearrange the code to cleanup the pthread locks. Reviewed by: delphij MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41105 --- contrib/ofed/libcxgb4/dev.c | 9 ++- contrib/ofed/libcxgb4/verbs.c | 79 +++++++++++++---------- contrib/ofed/libibcm/cm.c | 3 +- contrib/ofed/libibverbs/cmd.c | 110 ++++++++++++++++++++++++++++----- contrib/ofed/libibverbs/device.c | 87 +++++++++++++++++++++++--- contrib/ofed/libibverbs/driver.h | 5 +- contrib/ofed/libibverbs/libibverbs.map | 3 + contrib/ofed/libibverbs/verbs.c | 42 ++++++++++--- contrib/ofed/libibverbs/verbs.h | 5 +- contrib/ofed/libmlx4/mlx4.c | 39 ++++++++++-- contrib/ofed/libmlx4/mlx4.h | 3 +- contrib/ofed/libmlx4/srq.c | 15 ++++- contrib/ofed/libmlx4/verbs.c | 28 +++++++-- contrib/ofed/libmlx5/mlx5.c | 68 +++++++++++++++++--- contrib/ofed/libmlx5/verbs.c | 63 +++++++++++++++---- contrib/ofed/librdmacm/cma.c | 3 +- 16 files changed, 453 insertions(+), 109 deletions(-) diff --git a/contrib/ofed/libcxgb4/dev.c b/contrib/ofed/libcxgb4/dev.c index 89494f9b46d7..d3c289dad9f2 100644 --- a/contrib/ofed/libcxgb4/dev.c +++ b/contrib/ofed/libcxgb4/dev.c @@ -519,7 +519,9 @@ found: return NULL; } - pthread_spin_init(&dev->lock, PTHREAD_PROCESS_PRIVATE); + if (pthread_spin_init(&dev->lock, PTHREAD_PROCESS_PRIVATE)) + goto err; + dev->ibv_dev.ops = &c4iw_dev_ops; dev->chip_version = CHELSIO_CHIP_VERSION(hca_table[i].device >> 8); dev->abi_version = abi_version; @@ -554,6 +556,11 @@ found: } return &dev->ibv_dev; + +err: + free(dev); + + return NULL; } static __attribute__((constructor)) void cxgb4_register_driver(void) diff --git a/contrib/ofed/libcxgb4/verbs.c b/contrib/ofed/libcxgb4/verbs.c index 04d765dff3f6..4e44b2285fff 100644 --- a/contrib/ofed/libcxgb4/verbs.c +++ b/contrib/ofed/libcxgb4/verbs.c @@ -190,7 +190,9 @@ struct ibv_cq *c4iw_create_cq(struct ibv_context *context, int cqe, PDBG("%s c4iw_create_cq_resp reserved field modified by kernel\n", __FUNCTION__); - pthread_spin_init(&chp->lock, PTHREAD_PROCESS_PRIVATE); + ret = pthread_spin_init(&chp->lock, PTHREAD_PROCESS_PRIVATE); + if (ret) + goto err2; #ifdef STALL_DETECTION gettimeofday(&chp->time, NULL); #endif @@ -203,12 +205,12 @@ struct ibv_cq *c4iw_create_cq(struct ibv_context *context, int cqe, chp->cq.queue = mmap(NULL, chp->cq.memsize, PROT_READ|PROT_WRITE, MAP_SHARED, context->cmd_fd, resp.key); if (chp->cq.queue == MAP_FAILED) - goto err2; + goto err3; chp->cq.ugts = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, context->cmd_fd, resp.gts_key); if (chp->cq.ugts == MAP_FAILED) - goto err3; + goto err4; if (dev_is_t4(chp->rhp)) chp->cq.ugts += 1; @@ -216,7 +218,7 @@ struct ibv_cq *c4iw_create_cq(struct ibv_context *context, int cqe, chp->cq.ugts += 5; chp->cq.sw_queue = calloc(chp->cq.size, sizeof *chp->cq.queue); if (!chp->cq.sw_queue) - goto err4; + goto err5; PDBG("%s cqid 0x%x key %" PRIx64 " va %p memsize %lu gts_key %" PRIx64 " va %p qid_mask 0x%x\n", @@ -228,10 +230,12 @@ struct ibv_cq *c4iw_create_cq(struct ibv_context *context, int cqe, pthread_spin_unlock(&dev->lock); INC_STAT(cq); return &chp->ibv_cq; -err4: +err5: munmap(MASKED(chp->cq.ugts), c4iw_page_size); -err3: +err4: munmap(chp->cq.queue, chp->cq.memsize); +err3: + pthread_spin_destroy(&chp->lock); err2: (void)ibv_cmd_destroy_cq(&chp->ibv_cq); err1: @@ -265,6 +269,7 @@ int c4iw_destroy_cq(struct ibv_cq *ibcq) if (ret) { return ret; } + verbs_cleanup_cq(ibcq); munmap(MASKED(chp->cq.ugts), c4iw_page_size); munmap(chp->cq.queue, chp->cq.memsize); @@ -273,6 +278,7 @@ int c4iw_destroy_cq(struct ibv_cq *ibcq) pthread_spin_unlock(&dev->lock); free(chp->cq.sw_queue); + pthread_spin_destroy(&chp->lock); free(chp); return 0; } @@ -337,38 +343,40 @@ static struct ibv_qp *create_qp_v0(struct ibv_pd *pd, qhp->wq.rq.qid = resp.rqid; qhp->wq.rq.size = resp.rq_size; qhp->wq.rq.memsize = resp.rq_memsize; - pthread_spin_init(&qhp->lock, PTHREAD_PROCESS_PRIVATE); + ret = pthread_spin_init(&qhp->lock, PTHREAD_PROCESS_PRIVATE); + if (ret) + goto err3; dbva = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.sq_db_gts_key); if (dbva == MAP_FAILED) - goto err3; + goto err4; qhp->wq.sq.udb = dbva; qhp->wq.sq.queue = mmap(NULL, qhp->wq.sq.memsize, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.sq_key); if (qhp->wq.sq.queue == MAP_FAILED) - goto err4; + goto err5; dbva = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.rq_db_gts_key); if (dbva == MAP_FAILED) - goto err5; + goto err6; qhp->wq.rq.udb = dbva; qhp->wq.rq.queue = mmap(NULL, qhp->wq.rq.memsize, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.rq_key); if (qhp->wq.rq.queue == MAP_FAILED) - goto err6; + goto err7; qhp->wq.sq.sw_sq = calloc(qhp->wq.sq.size, sizeof (struct t4_swsqe)); if (!qhp->wq.sq.sw_sq) - goto err7; + goto err8; qhp->wq.rq.sw_rq = calloc(qhp->wq.rq.size, sizeof (uint64_t)); if (!qhp->wq.rq.sw_rq) - goto err8; + goto err9; PDBG("%s sq dbva %p sq qva %p sq depth %u sq memsize %lu " " rq dbva %p rq qva %p rq depth %u rq memsize %lu\n", @@ -385,16 +393,18 @@ static struct ibv_qp *create_qp_v0(struct ibv_pd *pd, pthread_spin_unlock(&dev->lock); INC_STAT(qp); return &qhp->ibv_qp; -err8: +err9: free(qhp->wq.sq.sw_sq); -err7: +err8: munmap((void *)qhp->wq.rq.queue, qhp->wq.rq.memsize); -err6: +err7: munmap(MASKED(qhp->wq.rq.udb), c4iw_page_size); -err5: +err6: munmap((void *)qhp->wq.sq.queue, qhp->wq.sq.memsize); -err4: +err5: munmap(MASKED(qhp->wq.sq.udb), c4iw_page_size); +err4: + pthread_spin_destroy(&qhp->lock); err3: (void)ibv_cmd_destroy_qp(&qhp->ibv_qp); err2: @@ -448,12 +458,14 @@ static struct ibv_qp *create_qp(struct ibv_pd *pd, fprintf(stderr, "libcxgb4 warning - downlevel iw_cxgb4 driver. " "MA workaround disabled.\n"); } - pthread_spin_init(&qhp->lock, PTHREAD_PROCESS_PRIVATE); + ret = pthread_spin_init(&qhp->lock, PTHREAD_PROCESS_PRIVATE); + if (ret) + goto err3; dbva = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.sq_db_gts_key); if (dbva == MAP_FAILED) - goto err3; + goto err4; qhp->wq.sq.udb = dbva; if (!dev_is_t4(qhp->rhp)) { unsigned long segment_offset = 128 * (qhp->wq.sq.qid & @@ -471,12 +483,12 @@ static struct ibv_qp *create_qp(struct ibv_pd *pd, PROT_READ|PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.sq_key); if (qhp->wq.sq.queue == MAP_FAILED) - goto err4; + goto err5; dbva = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.rq_db_gts_key); if (dbva == MAP_FAILED) - goto err5; + goto err6; qhp->wq.rq.udb = dbva; if (!dev_is_t4(qhp->rhp)) { unsigned long segment_offset = 128 * (qhp->wq.rq.qid & @@ -493,22 +505,22 @@ static struct ibv_qp *create_qp(struct ibv_pd *pd, PROT_READ|PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.rq_key); if (qhp->wq.rq.queue == MAP_FAILED) - goto err6; + goto err7; qhp->wq.sq.sw_sq = calloc(qhp->wq.sq.size, sizeof (struct t4_swsqe)); if (!qhp->wq.sq.sw_sq) - goto err7; + goto err8; qhp->wq.rq.sw_rq = calloc(qhp->wq.rq.size, sizeof (uint64_t)); if (!qhp->wq.rq.sw_rq) - goto err8; + goto err9; if (t4_sq_onchip(&qhp->wq)) { qhp->wq.sq.ma_sync = mmap(NULL, c4iw_page_size, PROT_WRITE, MAP_SHARED, pd->context->cmd_fd, resp.ma_sync_key); if (qhp->wq.sq.ma_sync == MAP_FAILED) - goto err9; + goto err10; qhp->wq.sq.ma_sync += (A_PCIE_MA_SYNC & (c4iw_page_size - 1)); } @@ -534,18 +546,20 @@ static struct ibv_qp *create_qp(struct ibv_pd *pd, pthread_spin_unlock(&dev->lock); INC_STAT(qp); return &qhp->ibv_qp; -err9: +err10: free(qhp->wq.rq.sw_rq); -err8: +err9: free(qhp->wq.sq.sw_sq); -err7: +err8: munmap((void *)qhp->wq.rq.queue, qhp->wq.rq.memsize); -err6: +err7: munmap(MASKED(qhp->wq.rq.udb), c4iw_page_size); -err5: +err6: munmap((void *)qhp->wq.sq.queue, qhp->wq.sq.memsize); -err4: +err5: munmap(MASKED(qhp->wq.sq.udb), c4iw_page_size); +err4: + pthread_spin_destroy(&qhp->lock); err3: (void)ibv_cmd_destroy_qp(&qhp->ibv_qp); err2: @@ -625,6 +639,7 @@ int c4iw_destroy_qp(struct ibv_qp *ibqp) free(qhp->wq.rq.sw_rq); free(qhp->wq.sq.sw_sq); + pthread_spin_destroy(&qhp->lock); free(qhp); return 0; } diff --git a/contrib/ofed/libibcm/cm.c b/contrib/ofed/libibcm/cm.c index 07ba481afa3d..da3412eb2fce 100644 --- a/contrib/ofed/libibcm/cm.c +++ b/contrib/ofed/libibcm/cm.c @@ -232,7 +232,8 @@ static struct cm_id_private *ib_cm_alloc_id(struct ib_cm_device *device, memset(cm_id_priv, 0, sizeof *cm_id_priv); cm_id_priv->id.device = device; cm_id_priv->id.context = context; - pthread_mutex_init(&cm_id_priv->mut, NULL); + if (pthread_mutex_init(&cm_id_priv->mut, NULL)) + goto err; if (pthread_cond_init(&cm_id_priv->cond, NULL)) goto err; diff --git a/contrib/ofed/libibverbs/cmd.c b/contrib/ofed/libibverbs/cmd.c index 0a9cc3831d41..488ffedd146b 100644 --- a/contrib/ofed/libibverbs/cmd.c +++ b/contrib/ofed/libibverbs/cmd.c @@ -679,6 +679,7 @@ int ibv_cmd_create_srq_ex(struct ibv_context *context, struct ibv_create_srq_resp *resp, size_t resp_size) { struct verbs_xrcd *vxrcd = NULL; + int ret = 0; IBV_INIT_CMD_RESP(cmd, cmd_size, CREATE_XSRQ, resp, resp_size); @@ -705,8 +706,17 @@ int ibv_cmd_create_srq_ex(struct ibv_context *context, cmd->cq_handle = attr_ex->cq->handle; } - if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) - return errno; + ret = pthread_mutex_init(&srq->srq.mutex, NULL); + if (ret) + goto err; + ret = pthread_cond_init(&srq->srq.cond, NULL); + if (ret) + goto err_mutex; + + if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) { + ret = errno; + goto err_cond; + } (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); @@ -715,8 +725,6 @@ int ibv_cmd_create_srq_ex(struct ibv_context *context, srq->srq.srq_context = attr_ex->srq_context; srq->srq.pd = attr_ex->pd; srq->srq.events_completed = 0; - pthread_mutex_init(&srq->srq.mutex, NULL); - pthread_cond_init(&srq->srq.cond, NULL); /* * check that the last field is available. @@ -744,6 +752,12 @@ int ibv_cmd_create_srq_ex(struct ibv_context *context, attr_ex->attr.max_sge = resp->max_sge; return 0; +err_cond: + pthread_cond_destroy(&srq->srq.cond); +err_mutex: + pthread_mutex_destroy(&srq->srq.mutex); +err: + return ret; } @@ -837,6 +851,9 @@ int ibv_cmd_destroy_srq(struct ibv_srq *srq) pthread_cond_wait(&srq->cond, &srq->mutex); pthread_mutex_unlock(&srq->mutex); + pthread_cond_destroy(&srq->cond); + pthread_mutex_destroy(&srq->mutex); + return 0; } @@ -887,6 +904,31 @@ static int create_qp_ex_common(struct verbs_qp *qp, return 0; } +static int create_qp_handle_resp_common_cleanup(struct verbs_qp *qp) +{ + pthread_cond_destroy(&qp->qp.cond); + pthread_mutex_destroy(&qp->qp.mutex); +} + +static int create_qp_handle_resp_common_init(struct verbs_qp *qp) +{ + int ret = 0; + + ret = pthread_mutex_init(&qp->qp.mutex, NULL); + if (ret) + return ret; + ret = pthread_cond_init(&qp->qp.cond, NULL); + if (ret) + goto err; + + return ret; + +err: + pthread_mutex_destroy(&qp->qp.mutex); + + return ret; +} + static void create_qp_handle_resp_common(struct ibv_context *context, struct verbs_qp *qp, struct ibv_qp_init_attr_ex *qp_attr, @@ -913,8 +955,6 @@ static void create_qp_handle_resp_common(struct ibv_context *context, qp->qp.qp_type = qp_attr->qp_type; qp->qp.state = IBV_QPS_RESET; qp->qp.events_completed = 0; - pthread_mutex_init(&qp->qp.mutex, NULL); - pthread_cond_init(&qp->qp.cond, NULL); qp->comp_mask = 0; if (vext_field_avail(struct verbs_qp, xrcd, vqp_sz) && @@ -977,9 +1017,15 @@ int ibv_cmd_create_qp_ex2(struct ibv_context *context, cmd->comp_mask = IBV_CREATE_QP_EX_KERNEL_MASK_IND_TABLE; } + err = create_qp_handle_resp_common_init(qp); + if (err) + return err; + err = write(context->cmd_fd, cmd, cmd_size); - if (err != cmd_size) - return errno; + if (err != cmd_size) { + err = errno; + goto err; + } (void)VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); @@ -987,6 +1033,11 @@ int ibv_cmd_create_qp_ex2(struct ibv_context *context, vqp_sz); return 0; + +err: + create_qp_handle_resp_common_cleanup(qp); + + return err; } int ibv_cmd_create_qp_ex(struct ibv_context *context, @@ -1008,8 +1059,15 @@ int ibv_cmd_create_qp_ex(struct ibv_context *context, if (err) return err; - if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) - return errno; + err = create_qp_handle_resp_common_init(qp); + if (err) + return err; + + err = write(context->cmd_fd, cmd, cmd_size); + if (err != cmd_size) { + err = errno; + goto err; + } (void)VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); @@ -1032,6 +1090,11 @@ int ibv_cmd_create_qp_ex(struct ibv_context *context, create_qp_handle_resp_common(context, qp, attr_ex, resp, vxrcd, vqp_sz); return 0; + +err: + create_qp_handle_resp_common_cleanup(qp); + + return err; } int ibv_cmd_create_qp(struct ibv_pd *pd, @@ -1098,6 +1161,7 @@ int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp, struct ibv_open_qp *cmd, size_t cmd_size, struct ibv_create_qp_resp *resp, size_t resp_size) { + int err = 0; struct verbs_xrcd *xrcd; IBV_INIT_CMD_RESP(cmd, cmd_size, OPEN_QP, resp, resp_size); @@ -1115,8 +1179,18 @@ int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp, cmd->qpn = attr->qp_num; cmd->qp_type = attr->qp_type; - if (write(context->cmd_fd, cmd, cmd_size) != cmd_size) - return errno; + err = pthread_mutex_init(&qp->qp.mutex, NULL); + if (err) + return err; + err = pthread_cond_init(&qp->qp.cond, NULL); + if (err) + goto err_mutex; + + err = write(context->cmd_fd, cmd, cmd_size); + if (err != cmd_size) { + err = errno; + goto err_cond; + } (void) VALGRIND_MAKE_MEM_DEFINED(resp, resp_size); @@ -1131,8 +1205,6 @@ int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp, qp->qp.qp_type = attr->qp_type; qp->qp.state = IBV_QPS_UNKNOWN; qp->qp.events_completed = 0; - pthread_mutex_init(&qp->qp.mutex, NULL); - pthread_cond_init(&qp->qp.cond, NULL); qp->comp_mask = 0; if (vext_field_avail(struct verbs_qp, xrcd, vqp_sz)) { qp->comp_mask = VERBS_QP_XRCD; @@ -1140,6 +1212,13 @@ int ibv_cmd_open_qp(struct ibv_context *context, struct verbs_qp *qp, } return 0; + +err_cond: + pthread_cond_destroy(&qp->qp.cond); +err_mutex: + pthread_mutex_destroy(&qp->qp.mutex); + + return err; } int ibv_cmd_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, @@ -1644,6 +1723,9 @@ int ibv_cmd_destroy_qp(struct ibv_qp *qp) pthread_cond_wait(&qp->cond, &qp->mutex); pthread_mutex_unlock(&qp->mutex); + pthread_cond_destroy(&qp->cond); + pthread_mutex_destroy(&qp->mutex); + return 0; } diff --git a/contrib/ofed/libibverbs/device.c b/contrib/ofed/libibverbs/device.c index d5cd2173cd8b..c3d0dbf573ab 100644 --- a/contrib/ofed/libibverbs/device.c +++ b/contrib/ofed/libibverbs/device.c @@ -132,13 +132,22 @@ __be64 __ibv_get_device_guid(struct ibv_device *device) } default_symver(__ibv_get_device_guid, ibv_get_device_guid); -void verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context, +int verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context, struct ibv_comp_channel *channel, void *cq_context) { + int err = 0; + cq->context = context; cq->channel = channel; + err = pthread_mutex_init(&cq->mutex, NULL); + if (err) + return err; + err = pthread_cond_init(&cq->cond, NULL); + if (err) + goto err; + if (cq->channel) { pthread_mutex_lock(&context->mutex); ++cq->channel->refcnt; @@ -148,8 +157,19 @@ void verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context, cq->cq_context = cq_context; cq->comp_events_completed = 0; cq->async_events_completed = 0; - pthread_mutex_init(&cq->mutex, NULL); - pthread_cond_init(&cq->cond, NULL); + + return err; + +err: + pthread_mutex_destroy(&cq->mutex); + + return err; +} + +void verbs_cleanup_cq(struct ibv_cq *cq) +{ + pthread_cond_destroy(&cq->cond); + pthread_mutex_destroy(&cq->mutex); } static struct ibv_cq_ex * @@ -158,6 +178,7 @@ __lib_ibv_create_cq_ex(struct ibv_context *context, { struct verbs_context *vctx = verbs_get_ctx(context); struct ibv_cq_ex *cq; + int err = 0; if (cq_attr->wc_flags & ~IBV_CREATE_CQ_SUP_WC_FLAGS) { errno = EOPNOTSUPP; @@ -165,12 +186,20 @@ __lib_ibv_create_cq_ex(struct ibv_context *context, } cq = vctx->priv->create_cq_ex(context, cq_attr); + if (!cq) + return NULL; - if (cq) - verbs_init_cq(ibv_cq_ex_to_cq(cq), context, - cq_attr->channel, cq_attr->cq_context); + err = verbs_init_cq(ibv_cq_ex_to_cq(cq), context, + cq_attr->channel, cq_attr->cq_context); + if (err) + goto err; return cq; + +err: + context->ops.destroy_cq(ibv_cq_ex_to_cq(cq)); + + return NULL; } struct ibv_context *__ibv_open_device(struct ibv_device *device) @@ -198,6 +227,11 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device) context = verbs_device->ops->alloc_context(device, cmd_fd); if (!context) goto err; + + if (pthread_mutex_init(&context->mutex, NULL)) { + verbs_device->ops->free_context(context); + goto err; + } } else { struct verbs_ex_private *priv; @@ -212,8 +246,7 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device) priv = calloc(1, sizeof(*priv)); if (!priv) { errno = ENOMEM; - free(context_ex); - goto err; + goto err_context; } context_ex->priv = priv; @@ -221,9 +254,12 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device) context_ex->sz = sizeof(*context_ex); context = &context_ex->context; + if (pthread_mutex_init(&context->mutex, NULL)) + goto verbs_err; + ret = verbs_device->ops->init_context(verbs_device, context, cmd_fd); if (ret) - goto verbs_err; + goto err_mutex; /* * In order to maintain backward/forward binary compatibility * with apps compiled against libibverbs-1.1.8 that use the @@ -247,12 +283,14 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device) context->device = device; context->cmd_fd = cmd_fd; - pthread_mutex_init(&context->mutex, NULL); return context; +err_mutex: + pthread_mutex_destroy(&context->mutex); verbs_err: free(context_ex->priv); +err_context: free(context_ex); err: close(cmd_fd); @@ -267,6 +305,7 @@ int __ibv_close_device(struct ibv_context *context) struct verbs_context *context_ex; struct verbs_device *verbs_device = verbs_get_device(context->device); + pthread_mutex_destroy(&context->mutex); context_ex = verbs_get_ctx(context); if (context_ex) { verbs_device->ops->uninit_context(verbs_device, context); @@ -393,3 +432,31 @@ void __ibv_ack_async_event(struct ibv_async_event *event) } } default_symver(__ibv_ack_async_event, ibv_ack_async_event); + +int __ibv_init_wq(struct ibv_wq *wq) +{ + int err = 0; + wq->events_completed = 0; + err = pthread_mutex_init(&wq->mutex, NULL); + if (err) + return err; + + err = pthread_cond_init(&wq->cond, NULL); + if (err) + goto err; + + return err; + +err: + pthread_mutex_destroy(&wq->mutex); + + return err; +} +default_symver(__ibv_init_wq, ibv_init_wq); + +void __ibv_cleanup_wq(struct ibv_wq *wq) +{ + pthread_cond_destroy(&wq->mutex); + pthread_mutex_destroy(&wq->mutex); +} +default_symver(__ibv_cleanup_wq, ibv_cleanup_wq); diff --git a/contrib/ofed/libibverbs/driver.h b/contrib/ofed/libibverbs/driver.h index ec87afd7f11e..60824bf27e37 100644 --- a/contrib/ofed/libibverbs/driver.h +++ b/contrib/ofed/libibverbs/driver.h @@ -130,9 +130,12 @@ verbs_get_device(const struct ibv_device *dev) typedef struct verbs_device *(*verbs_driver_init_func)(const char *uverbs_sys_path, int abi_version); void verbs_register_driver(const char *name, verbs_driver_init_func init_func); -void verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context, +int verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context, struct ibv_comp_channel *channel, void *cq_context); +void verbs_cleanup_cq(struct ibv_cq *cq); +int ibv_init_wq(struct ibv_wq *wq); +void ibv_cleanup_wq(struct ibv_wq *wq); int ibv_cmd_get_context(struct ibv_context *context, struct ibv_get_context *cmd, size_t cmd_size, struct ibv_get_context_resp *resp, diff --git a/contrib/ofed/libibverbs/libibverbs.map b/contrib/ofed/libibverbs/libibverbs.map index b49c09a06ce3..d94743389f47 100644 --- a/contrib/ofed/libibverbs/libibverbs.map +++ b/contrib/ofed/libibverbs/libibverbs.map @@ -136,4 +136,7 @@ IBVERBS_PRIVATE_14 { ibv_query_gid_type; verbs_register_driver; verbs_init_cq; + verbs_cleanup_cq; + ibv_init_wq; + ibv_cleanup_wq; }; diff --git a/contrib/ofed/libibverbs/verbs.c b/contrib/ofed/libibverbs/verbs.c index aec8706fd0cc..5c23406e69e7 100644 --- a/contrib/ofed/libibverbs/verbs.c +++ b/contrib/ofed/libibverbs/verbs.c @@ -455,13 +455,23 @@ struct ibv_cq *__ibv_create_cq(struct ibv_context *context, int cqe, void *cq_co struct ibv_comp_channel *channel, int comp_vector) { struct ibv_cq *cq; + int err = 0; cq = context->ops.create_cq(context, cqe, channel, comp_vector); - if (cq) - verbs_init_cq(cq, context, channel, cq_context); + if (!cq) + return NULL; + + err = verbs_init_cq(cq, context, channel, cq_context); + if (err) + goto err; return cq; + +err: + context->ops.destroy_cq(cq); + + return NULL; } default_symver(__ibv_create_cq, ibv_create_cq); @@ -529,16 +539,26 @@ struct ibv_srq *__ibv_create_srq(struct ibv_pd *pd, return NULL; srq = pd->context->ops.create_srq(pd, srq_init_attr); - if (srq) { - srq->context = pd->context; - srq->srq_context = srq_init_attr->srq_context; - srq->pd = pd; - srq->events_completed = 0; - pthread_mutex_init(&srq->mutex, NULL); - pthread_cond_init(&srq->cond, NULL); - } + if (!srq) + return NULL; + + srq->context = pd->context; + srq->srq_context = srq_init_attr->srq_context; + srq->pd = pd; + srq->events_completed = 0; + if (pthread_mutex_init(&srq->mutex, NULL)) + goto err; + if (pthread_cond_init(&srq->cond, NULL)) + goto err_mutex; return srq; + +err_mutex: + pthread_mutex_destroy(&srq->mutex); +err: + pd->context->ops.destroy_srq(srq); + + return NULL; } default_symver(__ibv_create_srq, ibv_create_srq); @@ -558,6 +578,8 @@ default_symver(__ibv_query_srq, ibv_query_srq); int __ibv_destroy_srq(struct ibv_srq *srq) { + pthread_cond_destroy(&srq->cond); + pthread_mutex_destroy(&srq->mutex); return srq->context->ops.destroy_srq(srq); } default_symver(__ibv_destroy_srq, ibv_destroy_srq); diff --git a/contrib/ofed/libibverbs/verbs.h b/contrib/ofed/libibverbs/verbs.h index 498275561280..bea817e36fc9 100644 --- a/contrib/ofed/libibverbs/verbs.h +++ b/contrib/ofed/libibverbs/verbs.h @@ -2166,11 +2166,8 @@ static inline struct ibv_wq *ibv_create_wq(struct ibv_context *context, } wq = vctx->create_wq(context, wq_init_attr); - if (wq) { + if (wq) wq->events_completed = 0; - pthread_mutex_init(&wq->mutex, NULL); - pthread_cond_init(&wq->cond, NULL); - } return wq; } diff --git a/contrib/ofed/libmlx4/mlx4.c b/contrib/ofed/libmlx4/mlx4.c index 229c2670b5ed..db8a07d48381 100644 --- a/contrib/ofed/libmlx4/mlx4.c +++ b/contrib/ofed/libmlx4/mlx4.c @@ -147,6 +147,7 @@ static int mlx4_init_context(struct verbs_device *v_device, struct ibv_get_context cmd; struct mlx4_alloc_ucontext_resp resp; int i; + int ret; struct mlx4_alloc_ucontext_resp_v3 resp_v3; __u16 bf_reg_size; struct mlx4_device *dev = to_mdev(&v_device->device); @@ -185,15 +186,22 @@ static int mlx4_init_context(struct verbs_device *v_device, for (i = 0; i < MLX4_PORTS_NUM; ++i) context->port_query_cache[i].valid = 0; - pthread_mutex_init(&context->qp_table_mutex, NULL); + ret = pthread_mutex_init(&context->qp_table_mutex, NULL); + if (ret) + return ret; for (i = 0; i < MLX4_QP_TABLE_SIZE; ++i) context->qp_table[i].refcnt = 0; for (i = 0; i < MLX4_NUM_DB_TYPE; ++i) context->db_list[i] = NULL; - mlx4_init_xsrq_table(&context->xsrq_table, context->num_qps); - pthread_mutex_init(&context->db_list_mutex, NULL); + ret = mlx4_init_xsrq_table(&context->xsrq_table, context->num_qps); + if (ret) + goto err; + + ret = pthread_mutex_init(&context->db_list_mutex, NULL); + if (ret) + goto err_xsrq; context->uar = mmap(NULL, dev->page_size, PROT_WRITE, MAP_SHARED, cmd_fd, 0); @@ -212,14 +220,18 @@ static int mlx4_init_context(struct verbs_device *v_device, } else { context->bf_buf_size = bf_reg_size / 2; context->bf_offset = 0; - pthread_spin_init(&context->bf_lock, PTHREAD_PROCESS_PRIVATE); + ret = pthread_spin_init(&context->bf_lock, PTHREAD_PROCESS_PRIVATE); + if (ret) + goto err_db_list; } } else { context->bf_page = NULL; context->bf_buf_size = 0; } - pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); + ret = pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); + if (ret) + goto err_bf_lock; ibv_ctx->ops = mlx4_ctx_ops; context->hca_core_clock = NULL; @@ -248,6 +260,17 @@ static int mlx4_init_context(struct verbs_device *v_device, return 0; +err_bf_lock: + if (context->bf_buf_size) + pthread_spin_destroy(&context->bf_lock); +err_db_list: + pthread_mutex_destroy(&context->db_list_mutex); +err_xsrq: + mlx4_cleanup_xsrq_table(&context->xsrq_table); +err: + pthread_mutex_destroy(&context->qp_table_mutex); + + return ret; } static void mlx4_uninit_context(struct verbs_device *v_device, @@ -255,6 +278,12 @@ static void mlx4_uninit_context(struct verbs_device *v_device, { struct mlx4_context *context = to_mctx(ibv_ctx); + pthread_mutex_destroy(&context->qp_table_mutex); + mlx4_cleanup_xsrq_table(&context->xsrq_table); + pthread_mutex_destroy(&context->db_list_mutex); + pthread_spin_destroy(&context->bf_lock); + pthread_spin_destroy(&context->uar_lock); + munmap(context->uar, to_mdev(&v_device->device)->page_size); if (context->bf_page) munmap(context->bf_page, to_mdev(&v_device->device)->page_size); diff --git a/contrib/ofed/libmlx4/mlx4.h b/contrib/ofed/libmlx4/mlx4.h index 864ef9eccc60..5b3dd547b5fe 100644 --- a/contrib/ofed/libmlx4/mlx4.h +++ b/contrib/ofed/libmlx4/mlx4.h @@ -414,7 +414,8 @@ int mlx4_destroy_srq(struct ibv_srq *srq); int mlx4_destroy_xrc_srq(struct ibv_srq *srq); int mlx4_alloc_srq_buf(struct ibv_pd *pd, struct ibv_srq_attr *attr, struct mlx4_srq *srq); -void mlx4_init_xsrq_table(struct mlx4_xsrq_table *xsrq_table, int size); +void mlx4_cleanup_xsrq_table(struct mlx4_xsrq_table *xsrq_table); +int mlx4_init_xsrq_table(struct mlx4_xsrq_table *xsrq_table, int size); struct mlx4_srq *mlx4_find_xsrq(struct mlx4_xsrq_table *xsrq_table, uint32_t srqn); int mlx4_store_xsrq(struct mlx4_xsrq_table *xsrq_table, uint32_t srqn, struct mlx4_srq *srq); diff --git a/contrib/ofed/libmlx4/srq.c b/contrib/ofed/libmlx4/srq.c index b8d25bb343da..da709c630450 100644 --- a/contrib/ofed/libmlx4/srq.c +++ b/contrib/ofed/libmlx4/srq.c @@ -172,14 +172,20 @@ int mlx4_alloc_srq_buf(struct ibv_pd *pd, struct ibv_srq_attr *attr, return 0; } -void mlx4_init_xsrq_table(struct mlx4_xsrq_table *xsrq_table, int size) +void mlx4_cleanup_xsrq_table(struct mlx4_xsrq_table *xsrq_table) { + pthread_mutex_destroy(&xsrq_table->mutex); +} + +int mlx4_init_xsrq_table(struct mlx4_xsrq_table *xsrq_table, int size) +{ + int ret; memset(xsrq_table, 0, sizeof *xsrq_table); xsrq_table->num_xsrq = size; xsrq_table->shift = ffs(size) - 1 - MLX4_XSRQ_TABLE_BITS; xsrq_table->mask = (1 << xsrq_table->shift) - 1; - pthread_mutex_init(&xsrq_table->mutex, NULL); + return pthread_mutex_init(&xsrq_table->mutex, NULL); } struct mlx4_srq *mlx4_find_xsrq(struct mlx4_xsrq_table *xsrq_table, uint32_t srqn) @@ -257,7 +263,7 @@ struct ibv_srq *mlx4_create_xrc_srq(struct ibv_context *context, srq->ext_srq = 1; if (mlx4_alloc_srq_buf(attr_ex->pd, &attr_ex->attr, srq)) - goto err; + goto err_spl; srq->db = mlx4_alloc_db(to_mctx(context), MLX4_DB_TYPE_RQ); if (!srq->db) @@ -290,6 +296,8 @@ err_db: err_free: free(srq->wrid); mlx4_free_buf(&srq->buf); +err_spl: + pthread_spin_destroy(&srq->lock); *** 468 LINES SKIPPED *** From nobody Tue Sep 19 15:08:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqlRJ2QKhz4v2Fq; Tue, 19 Sep 2023 15:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqlRJ1xDtz4g52; Tue, 19 Sep 2023 15:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695136108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYhOtD28BCqWnweqVOUdUO9umGWeTqZ7R7BrmlPTts0=; b=WqurGTuj8WfhwhcjyCl3GeMaW3OAOijZafGc+2K2Fx04hOVjn1CskkVth+IMA55n0L32yw vTKzJ2xPyZFOOb0OXz8YBCGgZgLxlJqwWzzLppZZXvaP7WZXYhekSyeWMEejLSOXDdcA6B BrGc6ZjpLM0f77fVTnpl0W81JZDrGxPxdU5oPtV5xWm8Zj4rGtRZ/AhvGeDG/CmVljGvrV 0ilwPrfStMTgQt1hFRnDRhJjlKCcOxI9mXKtEM1OSpq9FjtOpNCUuJ7nQjDAu+HvW3DaPO Ll8eKSN9BfjmJvIxtLSZEPvy8lYpf9Mgy8usVqT9qtgpMJvjBjoIJ0v9x35AoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695136108; a=rsa-sha256; cv=none; b=TlalIcj0+xWUOIBBLHS4//HDgwDWVtze8MXxnA0U4CMpQIcbLO1YU5VYpGidH8GCKW0NxP ZHBA2Ax7UfkMmVEJ8JLoUdTp728fQx6Eu28RQai+bP6ohCtBpNDQtQSmPtCEiYFYwXJjdH zPNe3Hi6Wql/eNiUqN77G6PKLVywuVANE1jRavAx5VEhs/KoDw6h5ZmgWicBO51ZQeua4X ngGVsUvGIi/BhKV1EAPUX8ThMkktfantu2+rwjyI1gIbxUr9jcenz1VlPWx77/AuMR3Ahh wv3yoEdaUA9DL/UXvajbn4yv5Dysb96hfBXfqtbvc2FeXL/ut4XZ+h7x1r46GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695136108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYhOtD28BCqWnweqVOUdUO9umGWeTqZ7R7BrmlPTts0=; b=rcH6BZJ2xX+E5gyPS+TwXc738ESiy0vVqneEYgrcuQwDsB3vDYOwNnj9FfUkUsHAp/dgGk FNTrvMJdGRiYx4ZN0uptZWv5+Nwbjwb4XaazSCiuQqBAfckYTWzNjDQzw6FSREMAyUloTZ Fsm3s+cH9FZvhCUMHIhTg2B8sPjVEtOugAl8zixFZMHDlxTOxwweBOJ4u3hrzIhO1ch6cY frsqOhwUC6KVIaHt2PkGSZguer8M0wLbREKAjcjohqI7wqlSYjtKeS9wPnQb+f6722uc4c 6DT6sWycOEIQW/UtsxWB9lKaL4C94M4BwG0ZLlVsLVP3PwA0dfW1yJo8ACRhcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqlRJ0zlZz3KC; Tue, 19 Sep 2023 15:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JF8SON058607; Tue, 19 Sep 2023 15:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JF8RWG058602; Tue, 19 Sep 2023 15:08:27 GMT (envelope-from git) Date: Tue, 19 Sep 2023 15:08:27 GMT Message-Id: <202309191508.38JF8RWG058602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ec994981447e - main - sqlite3: Vendor import of sqlite3 3.43.1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec994981447e8a974426660b5071bc405280af73 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ec994981447e8a974426660b5071bc405280af73 commit ec994981447e8a974426660b5071bc405280af73 Merge: a687910fc435 fa2bb1440e13 Author: Cy Schubert AuthorDate: 2023-09-19 15:06:50 +0000 Commit: Cy Schubert CommitDate: 2023-09-19 15:06:50 +0000 sqlite3: Vendor import of sqlite3 3.43.1 Release notes at https://www.sqlite.org/releaselog/3_43_1.html. Obtained from: https://www.sqlite.org/2023/sqlite-autoconf-3430100.tar.gz MFC after: 2 weeks Merge commit 'fa2bb1440e13602676feec708ac7a9a3bb5ce5c8' into main contrib/sqlite3/Makefile.am | 2 +- contrib/sqlite3/Makefile.in | 2 +- contrib/sqlite3/Makefile.msc | 27 + contrib/sqlite3/configure | 20 +- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/shell.c | 1019 +++- contrib/sqlite3/sqlite3.1 | 161 +- contrib/sqlite3/sqlite3.c | 7881 +++++++++++++++++++++--------- contrib/sqlite3/sqlite3.h | 106 +- contrib/sqlite3/sqlite3ext.h | 4 + contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 20 +- contrib/sqlite3/tea/configure.ac | 2 +- contrib/sqlite3/tea/generic/tclsqlite3.c | 33 +- 14 files changed, 6509 insertions(+), 2772 deletions(-) From nobody Tue Sep 19 16:45:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqnZv3MVVz4v82q; Tue, 19 Sep 2023 16:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqnZv2rp2z4tSl; Tue, 19 Sep 2023 16:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695141911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpq6eDLhjr478+/gAq60JhRx1oGwq9jWsMmE4dwauhU=; b=lcQ9dc+dOjKv0fVKuFJ/bJyFL2Tw3srpepweeh30dDpGHbBUUXdL3zKSvXU+I759bh0AaI eUBpqRM7d3N3+cdE6rlmi0Lw4u5SQCfVSmH5JqcXaP+1f+CLABkFZpL5tfnQCte0cZNBLZ LN+OmSm26/tdRmlgCO/T/8Aqqi8zqni1sli8lKmvHxycIM5EQpBqHm+JX26BJPHg7uVmpi ieIcOd8V7qI7rxzFznHJwMae7xI/vy3QMjEyWoxBGN4I7L8QQsFlAkZoVbMhvWHrX48sRg Z3tgFCwlAJ1SqJnyekZ9OJ/qeo7yg9eCK5J5BicqA/zT1F86KQzW8TQNHRTNuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695141911; a=rsa-sha256; cv=none; b=mweoP6SSdO1cFojyHpVSbp+OsIGz/9QbSniPZs5O5Reqpan8/gCr9GQsh/70X6/WupPGOH 9DjTfU2M5Jzd/2rsDtHsqxihoqR0BvxtSow1d+XBspfPI47eawTuJYp2mDMGZrtpZKTCpq fuIIUNK10vZ//czhdi1iGFo8iRtrjGQ8dX8d4xj4kyDcNOl/1QbNRpm70jfKXsGhcnZI8K UcmsmWUjO8R42lkavl1nGdCGA4ZJL1ZSpiWPsXTX//1ZCRaMnDY/RtyeRZ3KYGg3mFQX3Y WW8xRZrj7RsVQIh1y2Qu+FkE/OD+I10S41gINHf6MDwStRYE3RhsnQ/GAnV6PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695141911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpq6eDLhjr478+/gAq60JhRx1oGwq9jWsMmE4dwauhU=; b=iwZCMsn04aNJdrvmuVBqchVjc0yY/6uu0lBt3PSYTsL5p9hGaP0Eb/JyNJbdbK9WU/YeZq fLqIz+lcievobK6Tm3vWw4ixmxA/eXn1bLOO6H9QwqeSgrt+3ic4f8NuHT9vmwK9/4DS6T 303bikTTXKM5CgT7QtUoJN7MNHpp6wIHYotuZIpXsiVRbQgSOrVXgEyy0VVMmPcIImA2UF bud2QCbJNcbNAO3jrLDU6/erC6a250oEMNqWDW1uLBgz/AgQ3P8Jmsk8onW8l18Dj5lQga +mjMyAuCGVlOWs9GuKlyOoDqLCskUjVqgm7fywo31ckpHHiPkP6IAFGTRAZKtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqnZv1qZKz61N; Tue, 19 Sep 2023 16:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JGjBjB024118; Tue, 19 Sep 2023 16:45:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JGjBA1024115; Tue, 19 Sep 2023 16:45:11 GMT (envelope-from git) Date: Tue, 19 Sep 2023 16:45:11 GMT Message-Id: <202309191645.38JGjBA1024115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 2bcef59d428a - main - psm: recognize post-IBM trackpoints on Thinkpads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bcef59d428a672a9144c574b4b4f42f5f0e5b2a Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2bcef59d428a672a9144c574b4b4f42f5f0e5b2a commit 2bcef59d428a672a9144c574b4b4f42f5f0e5b2a Author: Gleb Smirnoff AuthorDate: 2023-09-19 16:41:04 +0000 Commit: Gleb Smirnoff CommitDate: 2023-09-19 16:41:04 +0000 psm: recognize post-IBM trackpoints on Thinkpads Newer Thinkpads come with trackpoints from different vendors. They are mostly compatible with the original one. Not sure all features are going to work, but at least this fixes resume operation. Tested on: Thinkpad X1 Carbon 7th Gen Reviewed by: wulf, imp Diffrential Revision: https://reviews.FreeBSD.org/D41871 --- sys/dev/atkbdc/psm.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 318112e2e3e5..1a02dbcec020 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -297,6 +297,16 @@ enum { typedef struct trackpointinfo { struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; + enum { + TRACKPOINT_VENDOR_IBM = 0x01, + TRACKPOINT_VENDOR_ALPS = 0x02, + TRACKPOINT_VENDOR_ELAN = 0x03, + TRACKPOINT_VENDOR_NXP = 0x04, + TRACKPOINT_VENDOR_JYT = 0x05, + TRACKPOINT_VENDOR_SYNAPTICS = 0x06, + TRACKPOINT_VENDOR_UNKNOWN = 0x07, + } vendor; + int firmware; int sensitivity; int inertia; int uplateau; @@ -431,7 +441,6 @@ struct psm_softc { /* Driver status information */ gesture_t gesture; /* Gesture context */ elantechhw_t elanhw; /* Elantech hardware information */ elantechaction_t elanaction; /* Elantech action context */ - int tphw; /* TrackPoint hardware information */ trackpointinfo_t tpinfo; /* TrackPoint configuration */ mousemode_t mode; /* operation mode */ mousemode_t dflt_mode; /* default operation mode */ @@ -1995,7 +2004,7 @@ psmattach(device_t dev) sc->config |= PSM_CONFIG_INITAFTERSUSPEND; break; default: - if (sc->synhw.infoMajor >= 4 || sc->tphw > 0) + if (sc->synhw.infoMajor >= 4 || sc->tpinfo.sysctl_tree != NULL) sc->config |= PSM_CONFIG_INITAFTERSUSPEND; break; } @@ -6950,7 +6959,7 @@ static int enable_trackpoint(struct psm_softc *sc, enum probearg arg) { KBDC kbdc = sc->kbdc; - int id; + int vendor, firmware; /* * If called from enable_synaptics(), make sure that passthrough @@ -6962,14 +6971,14 @@ enable_trackpoint(struct psm_softc *sc, enum probearg arg) if (sc->synhw.capPassthrough) synaptics_passthrough_on(sc); - if (send_aux_command(kbdc, 0xe1) != PSM_ACK || - read_aux_data(kbdc) != 0x01) + if (send_aux_command(kbdc, 0xe1) != PSM_ACK) goto no_trackpoint; - id = read_aux_data(kbdc); - if (id < 0x01) + vendor = read_aux_data(kbdc); + if (vendor <= 0 || vendor >= TRACKPOINT_VENDOR_UNKNOWN) + goto no_trackpoint; + firmware = read_aux_data(kbdc); + if (firmware < 0x01) goto no_trackpoint; - if (arg == PROBE) - sc->tphw = id; if (!trackpoint_support) goto no_trackpoint; @@ -6983,9 +6992,13 @@ enable_trackpoint(struct psm_softc *sc, enum probearg arg) * a guest device. */ if (!sc->synhw.capPassthrough) { - sc->hw.hwid = id; + sc->hw.hwid = firmware; sc->hw.buttons = 3; } + VDLOG(2, sc->dev, LOG_NOTICE, "Trackpoint v=0x%x f=0x%x", + vendor, firmware); + sc->tpinfo.vendor = vendor; + sc->tpinfo.firmware = firmware; } set_trackpoint_parameters(sc); From nobody Tue Sep 19 16:53:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqnn41YZWz4v8JN; Tue, 19 Sep 2023 16:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqnn40zlMz3Bmq; Tue, 19 Sep 2023 16:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695142440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=loyvQ9CNQrqMYEVCxGy/kAMZcAX6rr7rwfgl88Uhdi4=; b=LbcvC6tfx48UcKoWk9LIT3cjueEOSIgxk+N6IKY6n3oJkJRFMX8S8Achv9BwFsNczOXs7c gbPszenQE9s2sfTd4W08BNx7FtIs3tOFrJROGUeA91B7nbpl+pWFk1IH9EvyYmCnFJZDhy 0X9vI+DAj46zaIyp6wwBvoG7eXGHFvTWFSU3/c3XO3ck/Q5hGUgclcV0i7StExtzVm7ifi zn6Eu02J5vfqwBX3oV8XYAr87JMDJjXYgz2GAiOpPBrmRfLiN1YOqqPUda0DJLBWU6GabN WebdUdtwOE/tL2aC+7WuZJLBBp4697lqFyW2ztX1UBOBN48kLr8vc1XEuVrmMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695142440; a=rsa-sha256; cv=none; b=MyOmoC2vxlfs1WO47lDUtWA9FGFiWuxobgPXbGIgf6WQyl/uAy5LNk7DCsgqJkTLtE8hQQ 1ogjMeWTwrh8ELGH/KCzFB6xqW/GIO0vo3J3CDgwebeJHEDpRCnATdixePhdsim51eMty4 HXZ2blrLgK2SNwoSC4aM4astZBw1Xw90BK3i+laBg9931Z15TLj8daMx2aL051Qqwj+kmt Y3Ti7N/pISYu/O+C265QrWbbM8pGQkRn2VeA7HOl/RT6eQv6aTAp9xeMYuUuaQzvnDwOhc o57vea1SRrYHDXjEXlIlLtorc7wQrLc5LffRVLaT68VuEaAbfZw7dII+pFcdSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695142440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=loyvQ9CNQrqMYEVCxGy/kAMZcAX6rr7rwfgl88Uhdi4=; b=mJvyVC+1E9iLND6Fp7asAw88c+cMWEdGDyUV4UiVf8/RPfZYT5C88qqarSyCak8b1HI0MA knxiBbbT0J/4UXlVRdqOubOVCmZL6VmLEqnf4sawMl9y9ydMxPiadUea4FzDH77fTwjCu2 VxMFjRogTvcpjxL8zg6gsMgV1cvnbbkMD3WOlF6qzL+9b8HMt0DTE9Mjc9YV2yK3ZEXpvD 5Y4URDgKyuYhsrtmU28m8nubCYbEJW7mw99jJubGW2NFjh8JVIi/P5xtyZV2fPS/k8dOIS tR8Z+fTgvGTVatn9vOF4gGIjbLavG1x3nuwsEyHF+D7xqxzJHqaSRvIvbF0NHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqnn403rXz6Xw; Tue, 19 Sep 2023 16:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JGrxwl040495; Tue, 19 Sep 2023 16:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JGrxF9040492; Tue, 19 Sep 2023 16:53:59 GMT (envelope-from git) Date: Tue, 19 Sep 2023 16:53:59 GMT Message-Id: <202309191653.38JGrxF9040492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1843dfb05ed8 - main - libfido2: backport hidraw(4) support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1843dfb05ed80149f5a412180af882e3cb8f451b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1843dfb05ed80149f5a412180af882e3cb8f451b commit 1843dfb05ed80149f5a412180af882e3cb8f451b Author: Ed Maste AuthorDate: 2023-09-19 16:50:13 +0000 Commit: Ed Maste CommitDate: 2023-09-19 16:53:47 +0000 libfido2: backport hidraw(4) support PR: 273596 Submitted by: David Horn Obtained from: libfido2 2c9dfaae2a56, 930160388700 --- contrib/libfido2/src/hid_freebsd.c | 97 ++++++++++++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 10 deletions(-) diff --git a/contrib/libfido2/src/hid_freebsd.c b/contrib/libfido2/src/hid_freebsd.c index 5aefe69c1bec..5151690afc0a 100644 --- a/contrib/libfido2/src/hid_freebsd.c +++ b/contrib/libfido2/src/hid_freebsd.c @@ -1,13 +1,17 @@ /* - * Copyright (c) 2020 Yubico AB. All rights reserved. + * Copyright (c) 2020-2022 Yubico AB. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ -#include +#include #include #include +#if __FreeBSD_version >= 1300500 +#include +#define USE_HIDRAW /* see usbhid(4) and hidraw(4) on FreeBSD 13+ */ +#endif #include #include @@ -57,8 +61,60 @@ is_fido(int fd) return (usage_page == 0xf1d0); } +#ifdef USE_HIDRAW +static int +copy_info_hidraw(fido_dev_info_t *di, const char *path) +{ + int fd = -1; + int ok = -1; + struct usb_device_info udi; + struct hidraw_devinfo devinfo; + char rawname[129]; + + memset(di, 0, sizeof(*di)); + memset(&udi, 0, sizeof(udi)); + memset(&devinfo, 0, sizeof(devinfo)); + memset(rawname, 0, sizeof(rawname)); + + if ((fd = fido_hid_unix_open(path)) == -1 || is_fido(fd) == 0) + goto fail; + + if (ioctl(fd, IOCTL_REQ(USB_GET_DEVICEINFO), &udi) == -1) { + if (ioctl(fd, IOCTL_REQ(HIDIOCGRAWINFO), &devinfo) == -1 || + ioctl(fd, IOCTL_REQ(HIDIOCGRAWNAME(128)), rawname) == -1 || + (di->path = strdup(path)) == NULL || + (di->manufacturer = strdup(UHID_VENDOR)) == NULL || + (di->product = strdup(rawname)) == NULL) + goto fail; + di->vendor_id = devinfo.vendor; + di->product_id = devinfo.product; + } else { + if ((di->path = strdup(path)) == NULL || + (di->manufacturer = strdup(udi.udi_vendor)) == NULL || + (di->product = strdup(udi.udi_product)) == NULL) + goto fail; + di->vendor_id = (int16_t)udi.udi_vendorNo; + di->product_id = (int16_t)udi.udi_productNo; + } + + ok = 0; +fail: + if (fd != -1 && close(fd) == -1) + fido_log_error(errno, "%s: close %s", __func__, path); + + if (ok < 0) { + free(di->path); + free(di->manufacturer); + free(di->product); + explicit_bzero(di, sizeof(*di)); + } + + return (ok); +} +#endif /* USE_HIDRAW */ + static int -copy_info(fido_dev_info_t *di, const char *path) +copy_info_uhid(fido_dev_info_t *di, const char *path) { int fd = -1; int ok = -1; @@ -81,14 +137,13 @@ copy_info(fido_dev_info_t *di, const char *path) (di->manufacturer = strdup(udi.udi_vendor)) == NULL || (di->product = strdup(udi.udi_product)) == NULL) goto fail; - di->vendor_id = (int16_t)udi.udi_vendorNo; di->product_id = (int16_t)udi.udi_productNo; ok = 0; fail: - if (fd != -1) - close(fd); + if (fd != -1 && close(fd) == -1) + fido_log_error(errno, "%s: close %s", __func__, path); if (ok < 0) { free(di->path); @@ -106,17 +161,35 @@ fido_hid_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen) char path[64]; size_t i; - *olen = 0; - if (ilen == 0) return (FIDO_OK); /* nothing to do */ if (devlist == NULL || olen == NULL) return (FIDO_ERR_INVALID_ARGUMENT); - for (i = *olen = 0; i < MAX_UHID && *olen < ilen; i++) { + *olen = 0; + +#ifdef USE_HIDRAW + for (i = 0; i < MAX_UHID && *olen < ilen; i++) { + snprintf(path, sizeof(path), "/dev/hidraw%zu", i); + if (copy_info_hidraw(&devlist[*olen], path) == 0) { + devlist[*olen].io = (fido_dev_io_t) { + fido_hid_open, + fido_hid_close, + fido_hid_read, + fido_hid_write, + }; + ++(*olen); + } + } + /* hidraw(4) is preferred over uhid(4) */ + if (*olen != 0) + return (FIDO_OK); +#endif /* USE_HIDRAW */ + + for (i = 0; i < MAX_UHID && *olen < ilen; i++) { snprintf(path, sizeof(path), "/dev/uhid%zu", i); - if (copy_info(&devlist[*olen], path) == 0) { + if (copy_info_uhid(&devlist[*olen], path) == 0) { devlist[*olen].io = (fido_dev_io_t) { fido_hid_open, fido_hid_close, @@ -153,6 +226,10 @@ fido_hid_open(const char *path) ugd.ugd_data = buf; ugd.ugd_maxlen = sizeof(buf); + /* + * N.B. if ctx->fd is an hidraw(4) device, the ioctl() below puts it in + * uhid(4) compat mode, which we need to keep fido_hid_write() as-is. + */ if ((r = ioctl(ctx->fd, IOCTL_REQ(USB_GET_REPORT_DESC), &ugd) == -1) || ugd.ugd_actlen > sizeof(buf) || fido_hid_get_report_len(ugd.ugd_data, ugd.ugd_actlen, From nobody Tue Sep 19 17:07:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqp5B4Cnmz4v99m; Tue, 19 Sep 2023 17:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqp5B3rv1z3Cn7; Tue, 19 Sep 2023 17:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695143278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtAFOTGzLXWz+Fetm9SZei0eMlFKGL8zj6wJxj81Hv0=; b=vDob3x0XFEEsyns38a3brBst5ItpBnycd0RgzUZZoyXYr4ymhFNQvtoB/TKhgPNMnYBWBs xk+FiPczq7TpiICL6apyy/xzP43TJyfpB/Kz5irXzHO5Lc0mnsC7iXl1g7qa4f3uZHcRZb GPSVlqtjYSHc/bnd0fPMIYRDmY1q0G9UTE985y2SSSFFGbER7wke+6dbM+VokcU2ourlab /0sdWAsDVnkDwAoJMRZAPpxlyOfeEnpbt3IlY1STZ7YypCbmxLT7RUN8LswZikrP6sfYwj Ryhl0eoaoU4DoT9mpbMjWBlAO+ldDF+z/VeIyhcX0/PqB5/PJ6FfcIry7J5WaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695143278; a=rsa-sha256; cv=none; b=vaRUBX50d+qvrlgB59v74vci0NINu1H2P4lJ/yNiDR/rkZHuFMqfX1b0eecIacU9iOzGF/ fbt/nuLo6E1qvRABROqEKaoyTsVBvOpzfuyoapJpbNtPc6+Hu6PSDdEt+BiWuP/GFgnaC8 IWJowSE46gIM0OsO7Nyk667x09lQrDE5xTMBRRKp1d732iA42GKk4UaHXFMqycxKRs/5d7 cvm6qssG+RPqingsxBdXuJ0/kVuxF/xx5P9oFKCO1UQYbL9fdZ5J4iQLtBTWpFEtU5p+5H 3/UiCGn8jvuY/1T7CptpF+iRGd4fkbCQwQ0EdujSV305rc6KunggRzRklOEHAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695143278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtAFOTGzLXWz+Fetm9SZei0eMlFKGL8zj6wJxj81Hv0=; b=p9z3YLYO5Jqnpc4ilafhUEhhaAoyxUzJeJsleriqIBgUIMb3gnvxcXQq0FgAICG0qGUOEB A6tvS7+KIM1ZXVPya7IzGtRpE9YiDmirNC7NgDlCZJMVENPPBVSchAw+ewopYRtfZQIrxA Y4lUWinZ4uGnNEDssH8Xs1BTEC50tsiaeFbfj5sokEeE3vK3CyH3Vc7L2FhDFof5QkGzYW 6kqPHsMFugdad6+S0cOCjuCNmmtW3RQjc5x8jUH22HVSUIzlpLWBUCn75dJbVDamSblQ8c vPEl0GdrJhj5wSxqX5iDI+Sq5gwxjdwpc/c8OCAwJZuM+zmMlJRY0MswHc5+Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqp5B2vswz6Yq; Tue, 19 Sep 2023 17:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JH7w7g058631; Tue, 19 Sep 2023 17:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JH7w9X058628; Tue, 19 Sep 2023 17:07:58 GMT (envelope-from git) Date: Tue, 19 Sep 2023 17:07:58 GMT Message-Id: <202309191707.38JH7w9X058628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2ccfa855b2fc - main - libfido2: update to 1.13.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ccfa855b2fc331819953e3de1b1c15ce5b95a7e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2ccfa855b2fc331819953e3de1b1c15ce5b95a7e commit 2ccfa855b2fc331819953e3de1b1c15ce5b95a7e Merge: 1843dfb05ed8 00db45a65823 Author: Ed Maste AuthorDate: 2023-09-19 17:06:12 +0000 Commit: Ed Maste CommitDate: 2023-09-19 17:06:12 +0000 libfido2: update to 1.13.0 Some highlights from NEWS entries: ** Improved OpenSSL 3.0 compatibility. ** Support for hidraw(4) on FreeBSD; gh#597. ** Improved support for FIDO 2.1 authenticators. PR: 273596 Relnotes: Yes Sponsored by: The FreeBSD Foundation contrib/libfido2/CMakeLists.txt | 142 ++++++-- contrib/libfido2/LICENSE | 4 +- contrib/libfido2/NEWS | 41 +++ contrib/libfido2/README.adoc | 114 +++++-- contrib/libfido2/examples/CMakeLists.txt | 12 +- contrib/libfido2/examples/README.adoc | 17 +- contrib/libfido2/examples/assert.c | 33 +- contrib/libfido2/examples/cred.c | 29 +- contrib/libfido2/examples/extern.h | 8 +- contrib/libfido2/examples/info.c | 101 +++++- contrib/libfido2/examples/manifest.c | 1 + contrib/libfido2/examples/reset.c | 1 + contrib/libfido2/examples/retries.c | 3 +- contrib/libfido2/examples/select.c | 5 +- contrib/libfido2/examples/setpin.c | 3 +- contrib/libfido2/examples/util.c | 65 +++- contrib/libfido2/fuzz/CMakeLists.txt | 55 ++- contrib/libfido2/fuzz/Dockerfile | 22 +- contrib/libfido2/fuzz/Makefile | 35 +- contrib/libfido2/fuzz/README | 22 +- contrib/libfido2/fuzz/build-coverage | 7 +- contrib/libfido2/fuzz/clock.c | 1 + contrib/libfido2/fuzz/dummy.h | 5 +- contrib/libfido2/fuzz/export.gnu | 32 +- contrib/libfido2/fuzz/functions.txt | 404 ++++++++++++++--------- contrib/libfido2/fuzz/fuzz_assert.c | 43 ++- contrib/libfido2/fuzz/fuzz_bio.c | 5 +- contrib/libfido2/fuzz/fuzz_cred.c | 10 +- contrib/libfido2/fuzz/fuzz_credman.c | 5 +- contrib/libfido2/fuzz/fuzz_hid.c | 5 +- contrib/libfido2/fuzz/fuzz_largeblob.c | 5 +- contrib/libfido2/fuzz/fuzz_mgmt.c | 34 +- contrib/libfido2/fuzz/fuzz_netlink.c | 5 +- contrib/libfido2/fuzz/fuzz_pcsc.c | 269 +++++++++++++++ contrib/libfido2/fuzz/libfuzzer.c | 61 +++- contrib/libfido2/fuzz/mutator_aux.c | 21 +- contrib/libfido2/fuzz/mutator_aux.h | 22 +- contrib/libfido2/fuzz/pcsc.c | 153 +++++++++ contrib/libfido2/fuzz/preload-fuzz.c | 1 + contrib/libfido2/fuzz/preload-snoop.c | 1 + contrib/libfido2/fuzz/report.tgz | Bin 323706 -> 357005 bytes contrib/libfido2/fuzz/summary.txt | 77 +++-- contrib/libfido2/fuzz/udev.c | 3 +- contrib/libfido2/fuzz/wiredata_fido2.h | 77 ++++- contrib/libfido2/fuzz/wiredata_u2f.h | 1 + contrib/libfido2/fuzz/wrap.c | 67 +++- contrib/libfido2/fuzz/wrapped.sym | 10 + contrib/libfido2/man/CMakeLists.txt | 53 ++- contrib/libfido2/man/check.sh | 1 + contrib/libfido2/man/eddsa_pk_new.3 | 32 +- contrib/libfido2/man/es256_pk_new.3 | 32 +- contrib/libfido2/man/es384_pk_new.3 | 164 +++++++++ contrib/libfido2/man/fido2-assert.1 | 27 +- contrib/libfido2/man/fido2-cred.1 | 27 +- contrib/libfido2/man/fido2-token.1 | 51 ++- contrib/libfido2/man/fido_assert_allow_cred.3 | 45 ++- contrib/libfido2/man/fido_assert_new.3 | 37 ++- contrib/libfido2/man/fido_assert_set_authdata.3 | 33 +- contrib/libfido2/man/fido_assert_verify.3 | 33 +- contrib/libfido2/man/fido_bio_dev_get_info.3 | 27 +- contrib/libfido2/man/fido_bio_enroll_new.3 | 27 +- contrib/libfido2/man/fido_bio_info_new.3 | 27 +- contrib/libfido2/man/fido_bio_template.3 | 27 +- contrib/libfido2/man/fido_cbor_info_new.3 | 169 +++++++++- contrib/libfido2/man/fido_cred_exclude.3 | 45 ++- contrib/libfido2/man/fido_cred_new.3 | 29 +- contrib/libfido2/man/fido_cred_set_authdata.3 | 46 ++- contrib/libfido2/man/fido_cred_verify.3 | 27 +- contrib/libfido2/man/fido_credman_metadata_new.3 | 27 +- contrib/libfido2/man/fido_dev_enable_entattest.3 | 38 ++- contrib/libfido2/man/fido_dev_get_assert.3 | 27 +- contrib/libfido2/man/fido_dev_get_touch_begin.3 | 27 +- contrib/libfido2/man/fido_dev_info_manifest.3 | 31 +- contrib/libfido2/man/fido_dev_largeblob_get.3 | 34 +- contrib/libfido2/man/fido_dev_make_cred.3 | 27 +- contrib/libfido2/man/fido_dev_open.3 | 27 +- contrib/libfido2/man/fido_dev_set_io_functions.3 | 27 +- contrib/libfido2/man/fido_dev_set_pin.3 | 29 +- contrib/libfido2/man/fido_init.3 | 27 +- contrib/libfido2/man/fido_strerr.3 | 27 +- contrib/libfido2/man/rs256_pk_new.3 | 32 +- contrib/libfido2/openbsd-compat/bsd-asprintf.c | 88 +++++ contrib/libfido2/openbsd-compat/clock_gettime.c | 1 + contrib/libfido2/openbsd-compat/endian_win32.c | 1 + contrib/libfido2/openbsd-compat/openbsd-compat.h | 5 + contrib/libfido2/regress/CMakeLists.txt | 57 +++- contrib/libfido2/regress/assert.c | 14 +- contrib/libfido2/regress/compress.c | 268 +++++++++++++++ contrib/libfido2/regress/cred.c | 15 +- contrib/libfido2/regress/dev.c | 43 ++- contrib/libfido2/regress/eddsa.c | 159 +++++++++ contrib/libfido2/regress/es256.c | 199 +++++++++++ contrib/libfido2/regress/es384.c | 213 ++++++++++++ contrib/libfido2/regress/rs256.c | 201 +++++++++++ contrib/libfido2/src/CMakeLists.txt | 31 +- contrib/libfido2/src/aes256.c | 1 + contrib/libfido2/src/assert.c | 206 ++++++++---- contrib/libfido2/src/authkey.c | 26 +- contrib/libfido2/src/bio.c | 116 ++++--- contrib/libfido2/src/blob.c | 1 + contrib/libfido2/src/blob.h | 1 + contrib/libfido2/src/buf.c | 1 + contrib/libfido2/src/cbor.c | 52 ++- contrib/libfido2/src/compress.c | 145 +++++++- contrib/libfido2/src/config.c | 28 +- contrib/libfido2/src/cred.c | 45 ++- contrib/libfido2/src/credman.c | 162 +++++---- contrib/libfido2/src/dev.c | 229 +++---------- contrib/libfido2/src/diff_exports.sh | 1 + contrib/libfido2/src/ecdh.c | 1 + contrib/libfido2/src/eddsa.c | 14 +- contrib/libfido2/src/err.c | 1 + contrib/libfido2/src/es256.c | 66 ++-- contrib/libfido2/src/es384.c | 296 +++++++++++++++++ contrib/libfido2/src/export.gnu | 22 +- contrib/libfido2/src/export.llvm | 22 +- contrib/libfido2/src/export.msvc | 22 +- contrib/libfido2/src/extern.h | 30 +- contrib/libfido2/src/fallthrough.h | 21 ++ contrib/libfido2/src/fido.h | 46 ++- contrib/libfido2/src/fido/bio.h | 26 +- contrib/libfido2/src/fido/config.h | 26 +- contrib/libfido2/src/fido/credman.h | 26 +- contrib/libfido2/src/fido/eddsa.h | 28 +- contrib/libfido2/src/fido/err.h | 26 +- contrib/libfido2/src/fido/es256.h | 26 +- contrib/libfido2/src/fido/es384.h | 59 ++++ contrib/libfido2/src/fido/param.h | 57 +++- contrib/libfido2/src/fido/rs256.h | 26 +- contrib/libfido2/src/fido/types.h | 78 ++++- contrib/libfido2/src/hid.c | 1 + contrib/libfido2/src/hid_freebsd.c | 1 + contrib/libfido2/src/hid_hidapi.c | 13 +- contrib/libfido2/src/hid_linux.c | 50 ++- contrib/libfido2/src/hid_netbsd.c | 1 + contrib/libfido2/src/hid_openbsd.c | 101 +++--- contrib/libfido2/src/hid_osx.c | 26 +- contrib/libfido2/src/hid_unix.c | 1 + contrib/libfido2/src/hid_win.c | 5 +- contrib/libfido2/src/info.c | 171 +++++++++- contrib/libfido2/src/io.c | 26 +- contrib/libfido2/src/iso7816.c | 1 + contrib/libfido2/src/iso7816.h | 1 + contrib/libfido2/src/largeblob.c | 34 +- contrib/libfido2/src/log.c | 1 + contrib/libfido2/src/netlink.c | 1 + contrib/libfido2/src/netlink.h | 1 + contrib/libfido2/src/nfc.c | 350 ++++++++++++++++++++ contrib/libfido2/src/nfc_linux.c | 387 +++------------------- contrib/libfido2/src/packed.h | 1 + contrib/libfido2/src/pcsc.c | 394 ++++++++++++++++++++++ contrib/libfido2/src/pin.c | 77 +++-- contrib/libfido2/src/random.c | 1 + contrib/libfido2/src/reset.c | 1 + contrib/libfido2/src/rs1.c | 3 +- contrib/libfido2/src/rs256.c | 29 +- contrib/libfido2/src/time.c | 1 + contrib/libfido2/src/touch.c | 109 ++++++ contrib/libfido2/src/tpm.c | 3 +- contrib/libfido2/src/types.c | 17 +- contrib/libfido2/src/u2f.c | 93 ++++-- contrib/libfido2/src/util.c | 31 ++ contrib/libfido2/src/webauthn.h | 75 ++++- contrib/libfido2/src/winhello.c | 122 +++++-- contrib/libfido2/tools/CMakeLists.txt | 12 +- contrib/libfido2/tools/assert_get.c | 7 +- contrib/libfido2/tools/assert_verify.c | 30 +- contrib/libfido2/tools/base64.c | 1 + contrib/libfido2/tools/bio.c | 1 + contrib/libfido2/tools/config.c | 1 + contrib/libfido2/tools/cred_make.c | 7 +- contrib/libfido2/tools/cred_verify.c | 1 + contrib/libfido2/tools/credman.c | 1 + contrib/libfido2/tools/extern.h | 4 +- contrib/libfido2/tools/fido2-assert.c | 1 + contrib/libfido2/tools/fido2-attach.sh | 1 + contrib/libfido2/tools/fido2-cred.c | 1 + contrib/libfido2/tools/fido2-detach.sh | 1 + contrib/libfido2/tools/fido2-token.c | 1 + contrib/libfido2/tools/fido2-unprot.sh | 1 + contrib/libfido2/tools/include_check.sh | 1 + contrib/libfido2/tools/largeblob.c | 59 +++- contrib/libfido2/tools/pin.c | 26 +- contrib/libfido2/tools/test.sh | 46 +-- contrib/libfido2/tools/token.c | 159 ++++++++- contrib/libfido2/tools/util.c | 70 +++- contrib/libfido2/udev/70-u2f.rules | 39 ++- contrib/libfido2/udev/CMakeLists.txt | 1 + contrib/libfido2/udev/check.sh | 1 + contrib/libfido2/udev/fidodevs | 3 + contrib/libfido2/udev/genrules.awk | 32 +- contrib/libfido2/windows/build.ps1 | 32 +- contrib/libfido2/windows/const.ps1 | 14 +- contrib/libfido2/windows/cygwin.ps1 | 2 + contrib/libfido2/windows/release.ps1 | 30 +- lib/libfido2/Makefile | 6 +- 196 files changed, 7592 insertions(+), 1733 deletions(-) diff --cc contrib/libfido2/fuzz/fuzz_pcsc.c index 000000000000,cf6210b71be5..cf6210b71be5 mode 000000,100644..100644 --- a/contrib/libfido2/fuzz/fuzz_pcsc.c +++ b/contrib/libfido2/fuzz/fuzz_pcsc.c diff --cc contrib/libfido2/fuzz/pcsc.c index 000000000000,f6a3e9bdd773..f6a3e9bdd773 mode 000000,100644..100644 --- a/contrib/libfido2/fuzz/pcsc.c +++ b/contrib/libfido2/fuzz/pcsc.c diff --cc contrib/libfido2/fuzz/report.tgz index d78f4628de59,e984ee9dc765..e984ee9dc765 Binary files differ diff --cc contrib/libfido2/man/es384_pk_new.3 index 000000000000,e865913b7807..e865913b7807 mode 000000,100644..100644 --- a/contrib/libfido2/man/es384_pk_new.3 +++ b/contrib/libfido2/man/es384_pk_new.3 diff --cc contrib/libfido2/openbsd-compat/bsd-asprintf.c index 000000000000,fbcb8679258f..fbcb8679258f mode 000000,100644..100644 --- a/contrib/libfido2/openbsd-compat/bsd-asprintf.c +++ b/contrib/libfido2/openbsd-compat/bsd-asprintf.c diff --cc contrib/libfido2/regress/compress.c index 000000000000,7afc8bb339a7..7afc8bb339a7 mode 000000,100644..100644 --- a/contrib/libfido2/regress/compress.c +++ b/contrib/libfido2/regress/compress.c diff --cc contrib/libfido2/regress/eddsa.c index 000000000000,06236987ed17..06236987ed17 mode 000000,100644..100644 --- a/contrib/libfido2/regress/eddsa.c +++ b/contrib/libfido2/regress/eddsa.c diff --cc contrib/libfido2/regress/es256.c index 000000000000,3a62a415977e..3a62a415977e mode 000000,100644..100644 --- a/contrib/libfido2/regress/es256.c +++ b/contrib/libfido2/regress/es256.c diff --cc contrib/libfido2/regress/es384.c index 000000000000,b55ce015e17a..b55ce015e17a mode 000000,100644..100644 --- a/contrib/libfido2/regress/es384.c +++ b/contrib/libfido2/regress/es384.c diff --cc contrib/libfido2/regress/rs256.c index 000000000000,799396f07a02..799396f07a02 mode 000000,100644..100644 --- a/contrib/libfido2/regress/rs256.c +++ b/contrib/libfido2/regress/rs256.c diff --cc contrib/libfido2/src/es384.c index 000000000000,013d285ef7f0..013d285ef7f0 mode 000000,100644..100644 --- a/contrib/libfido2/src/es384.c +++ b/contrib/libfido2/src/es384.c diff --cc contrib/libfido2/src/fallthrough.h index 000000000000,bdfd30fd63eb..bdfd30fd63eb mode 000000,100644..100644 --- a/contrib/libfido2/src/fallthrough.h +++ b/contrib/libfido2/src/fallthrough.h diff --cc contrib/libfido2/src/fido/es384.h index 000000000000,b4b4ca71ccbe..b4b4ca71ccbe mode 000000,100644..100644 --- a/contrib/libfido2/src/fido/es384.h +++ b/contrib/libfido2/src/fido/es384.h diff --cc contrib/libfido2/src/nfc.c index 000000000000,2e97d5fc50da..2e97d5fc50da mode 000000,100644..100644 --- a/contrib/libfido2/src/nfc.c +++ b/contrib/libfido2/src/nfc.c diff --cc contrib/libfido2/src/pcsc.c index 000000000000,d7bd6c65ed60..d7bd6c65ed60 mode 000000,100644..100644 --- a/contrib/libfido2/src/pcsc.c +++ b/contrib/libfido2/src/pcsc.c diff --cc contrib/libfido2/src/touch.c index 000000000000,6844e2c2dbc0..6844e2c2dbc0 mode 000000,100644..100644 --- a/contrib/libfido2/src/touch.c +++ b/contrib/libfido2/src/touch.c diff --cc contrib/libfido2/src/util.c index 000000000000,25281bb51b28..25281bb51b28 mode 000000,100644..100644 --- a/contrib/libfido2/src/util.c +++ b/contrib/libfido2/src/util.c diff --cc lib/libfido2/Makefile index 86ac1153f384,000000000000..dc985e2797ed mode 100644,000000..100644 --- a/lib/libfido2/Makefile +++ b/lib/libfido2/Makefile @@@ -1,78 -1,0 +1,82 @@@ +PACKAGE=ssh +LIB= fido2 +PRIVATELIB= +DIST= ${SRCTOP}/contrib/libfido2 + +.PATH: ${DIST}/src ${DIST} + +SRCS+= aes256.c +SRCS+= assert.c +SRCS+= authkey.c +SRCS+= bio.c +SRCS+= blob.c +SRCS+= buf.c +SRCS+= cbor.c +SRCS+= compress.c +SRCS+= config.c +SRCS+= cred.c +SRCS+= credman.c +SRCS+= dev.c +SRCS+= ecdh.c +SRCS+= eddsa.c +SRCS+= err.c +SRCS+= es256.c ++SRCS+= es384.c +SRCS+= hid_freebsd.c +SRCS+= hid_unix.c +SRCS+= hid.c +SRCS+= info.c +SRCS+= io.c +SRCS+= iso7816.c +SRCS+= largeblob.c +SRCS+= log.c +SRCS+= pin.c +SRCS+= random.c +SRCS+= reset.c +SRCS+= rs1.c +SRCS+= rs256.c +SRCS+= time.c ++SRCS+= touch.c +SRCS+= tpm.c +SRCS+= types.c +SRCS+= u2f.c ++SRCS+= util.c + +SRCS+= openbsd-compat/freezero.c +SRCS+= openbsd-compat/recallocarray.c + +CFLAGS+= -I ${DIST}/src -I${SRCTOP}/contrib/libcbor/src -I${.CURDIR}/../libcbor +CFLAGS+= -D_FIDO_INTERNAL +CFLAGS+= -DHAVE_ARC4RANDOM_BUF ++CFLAGS+= -DHAVE_ASPRINTF +CFLAGS+= -DHAVE_CLOCK_GETTIME +CFLAGS+= -DHAVE_DEV_URANDOM +CFLAGS+= -DHAVE_ERR_H +CFLAGS+= -DHAVE_EXPLICIT_BZERO +CFLAGS+= -DHAVE_GETLINE +CFLAGS+= -DHAVE_GETOPT +CFLAGS+= -DHAVE_GETPAGESIZE +CFLAGS+= -DHAVE_GETRANDOM +CFLAGS+= -DHAVE_OPENSSLV_H +CFLAGS+= -DHAVE_READPASSPHRASE +CFLAGS+= -DHAVE_SIGNAL_H +CFLAGS+= -DHAVE_STRLCAT +CFLAGS+= -DHAVE_STRLCPY +CFLAGS+= -DHAVE_STRSEP +CFLAGS+= -DHAVE_SYSCONF +CFLAGS+= -DHAVE_SYS_RANDOM_H +CFLAGS+= -DHAVE_TIMESPECSUB +CFLAGS+= -DHAVE_TIMINGSAFE_BCMP +CFLAGS+= -DHAVE_UNISTD_H +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L +CFLAGS+= -DTLS=__thread +CFLAGS+= -D_FIDO_MAJOR=1 - CFLAGS+= -D_FIDO_MINOR=10 ++CFLAGS+= -D_FIDO_MINOR=13 +CFLAGS+= -D_FIDO_PATCH=0 + +LIBADD= crypto z + +WARNS=2 +MAN= + +.include From nobody Tue Sep 19 17:39:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqpnh6YWyz4vC34; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqpnh65Xtz3H1N; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695145176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4R4jzOtn6X9L3VrvZMTwMjDboYUjg1aFVh6c17LRfw=; b=b/9IIdcrU+XaPeZq/XHIR623k5UZLk/Z1WxJdw8s3S0/2GCcONvnYrOfl6bMzKIDWP0DMP XaVHbRM6MwJXjIe0Y/UMnuE1aGgbd7B+yDddddcstZIfEOQfMJSQGJes4CAjD3xwj17j8k +8iBXJBmuSym430pkpJztoxggh3IGi6ubzzNJcagRTynM5I/u61q274JMohhrn1QiQTn8P y3YVdehVicCt+nsccU2xY06FZtdjDFn63bd2+kCqlXRO5gahL3QQeXqk9NB0cLjLMeVKuh dK+d6U9SLSLgDG4gWbCLSV39vLZFxmucHMshEdj/bgyqS1S+vz1czQziP6z7yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695145176; a=rsa-sha256; cv=none; b=YOq/vkT7Hqr0FVVIQoitScAmh79+j6L4/vuWlBxHbIEKvC0zmf/k3YElcnGmwZyfxoQh+O rWqDu96HhA1BmxEnqt9MwnmJxZnKyszuRV0q7FleSxsaSZ60ORYXtxJWQ7s9YWX3XIrd03 3xlhg6jBXAmFzBK8Wq5xopRC+diCqnkJqt4vo/62Rmo+JY4ToW8qI2Jnv7dsZq+FB+FwF1 67UrwFyZgPoZc+JMfINhnnZOYz0+z5MKVHfrDktX94n+C8mnUZcR6j2Y7VetwTmL//k0xi eq8Y8lxHhNjlgoVkrCHiQoGO+VwlASi0xaG419j+lpQF+cXd85+wKu4ijNqymQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695145176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4R4jzOtn6X9L3VrvZMTwMjDboYUjg1aFVh6c17LRfw=; b=YtjM7cBzBrOL/36NOauWtDiqV47AmD3qfk+dT+xmmlOVxcxNqsg1C1OvfZKL7ndc9R5atx RzW2U+f/HB1/7hvFv7rZl9hwo43jq9VfXykZoft2fq1UNksYusg8RHl5vFKfG7PrxckDUV FbDoXsTY1tiRmu5Hnp6lJju7wIcHIxWJlONiwRM6cUGT4FnAHFw4mmL3Y/DTBSxDv7FqXk i7171SUFfMOfhq6f3d3qMfWtzBxEqjTCFs9jcQQqMQCzdlyggK8+JznEM9vN8IX3+ksMib m+s+IKkoRFc1Q3JJ4tHy4m83Asww0DNOEJOtuQ5hSVpxbrYerRVcd+Ttt9N90g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqpnh58nRz7cv; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JHdaVE008845; Tue, 19 Sep 2023 17:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JHdaE8008842; Tue, 19 Sep 2023 17:39:36 GMT (envelope-from git) Date: Tue, 19 Sep 2023 17:39:36 GMT Message-Id: <202309191739.38JHdaE8008842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2a78083fc2a1 - main - route(8): fix `route not found` exit code and warn with netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a78083fc2a14af863afb098925b0682698a2838 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a78083fc2a14af863afb098925b0682698a2838 commit 2a78083fc2a14af863afb098925b0682698a2838 Author: R. Christian McDonald AuthorDate: 2023-09-19 16:46:49 +0000 Commit: Kristof Provost CommitDate: 2023-09-19 17:34:02 +0000 route(8): fix `route not found` exit code and warn with netlink Fix route(8) incorrectly returning a zero exit code even when unable to find the specified route with route -n get . Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41882 --- sbin/route/route_netlink.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 0dbd90151e10..cad1c8030535 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -271,22 +271,27 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs hdr = snl_read_reply(ss, hdr->nlmsg_seq); if (nl_type == NL_RTM_GETROUTE) { - if (hdr->nlmsg_type == NL_RTM_NEWROUTE) + if (hdr->nlmsg_type == NL_RTM_NEWROUTE) { print_getmsg(h, hdr, dst); - else { - snl_parse_errmsg(ss, hdr, &e); - if (e.error == ESRCH) - warn("route has not been found"); - else - warn("message indicates error %d", e.error); + return (0); } - - return (0); } - if (snl_parse_errmsg(ss, hdr, &e)) + if (snl_parse_errmsg(ss, hdr, &e)) { + switch (e.error) { + case (ESRCH): + warnx("route has not been found"); + break; + default: + if (e.error == 0) + break; + warnc(e.error, "message indicates error"); + } + return (e.error); + } } + return (EINVAL); } From nobody Wed Sep 20 11:29:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrGXW4m9nz4tXC6; Wed, 20 Sep 2023 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrGXW4Bfhz4ftS; Wed, 20 Sep 2023 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rhOK3NXaYiAnF+iFu42lef/r/pUUTP7HdUyQd5oo+0=; b=u8OCKD/mUCtx4HkqrVMjyzhwWUZ7uZWsE8WgPRcoqwnn/ZnMa5b0iq/lth+PyQ3SKoBb7c G+CaazOqNJGZ1OqsFVcChnl/UxSBxp2hPqbmyVyyDhIfsgWiNiGNkn6W8ZGk8zpjAAEcG/ M4QZxv0TRjtK29AJ+up2Kpkwo06oey6DCStWbrB6dv9fJJvZqlXisDX3xF//cVRbYoAenF KDm0t/YSA07dJ+38ATzP2lzKQd9E5z9gHvsYcVxwCvFnWgJAA5uUSDhrn7nHeBuFGduOXW uD6z9diB/tn4xoXAD/njdBxNDFJT+/KrqZxygury60M1EzAtWKdJ1THLBoMkXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695209387; a=rsa-sha256; cv=none; b=Xbw45hqqBoki1kakVr7dtPa91OtEKE+uy6DdY1jH6I9emw1jCz/M5n30wY8QavgQvtcB90 JBwM9yGuJKIc8IFNeODkSSI8ytGdWqNUT2UnNgWV9hGLX/SBdMMXM7IRLUPAJHvcLwKm1p Et047b6zwxJCEcGheASd51Ahcf4tTg6Lr4Ex8S2Jig5vTU+T4p49XkTSfNp/GKShegR6r0 /UBLzNd84Pi4riw2v5gP/cTmMK+4otOyTXgS16A4FJIhKL3hY8Mc1mUa9QcVNlFxfU4LRz CoQDgTfCCnHiIHejSXgP6RnngHmZUVcO25VGY5RHpyCeYU1PnjeAgAmNRaeq7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/rhOK3NXaYiAnF+iFu42lef/r/pUUTP7HdUyQd5oo+0=; b=o/lCAv7FJcVcICPIKAFFVBwbzT7oLiUp6rH4YQQNpbQojtFA7keuNbL/wsBhb3fIHqR6xh 87DO0bFMMbcQCtmtJOnIYRbkUEAGKDDtkiWFDuWT1khv6j/MiVvYbASRSTTxXFOT3Tx/pW 335n6kMII6V0gfVKSz137nT9njR+qkrITB72NcCs20B9+OM6Fio5lasu7EHUohpI2/6nJb I7K7jWc7FTrbuc5izfUziDpnWx2mSjmL7nh3G0TpWwzTS/RP/KVcuYes9VwedU6C6CNS0F zXPgi7zwvOsmHNCdjDa9XWe/oQlEDh8JOgs1gMraMTcJzkZKAmmu1QBGyLv5dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrGXW3CGQztqM; Wed, 20 Sep 2023 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KBTl4w087468; Wed, 20 Sep 2023 11:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KBTlvE087465; Wed, 20 Sep 2023 11:29:47 GMT (envelope-from git) Date: Wed, 20 Sep 2023 11:29:47 GMT Message-Id: <202309201129.38KBTlvE087465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8ee478dfd46d - main - release: stop generating mergemaster databases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ee478dfd46dd972715a65134cef96fa5ef57dd0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee478dfd46dd972715a65134cef96fa5ef57dd0 commit 8ee478dfd46dd972715a65134cef96fa5ef57dd0 Author: Ed Maste AuthorDate: 2023-09-09 13:19:11 +0000 Commit: Ed Maste CommitDate: 2023-09-20 11:28:40 +0000 release: stop generating mergemaster databases mergemaster was deprecated some time ago and will be removed from FreeBSD 15. Reviewed by: imp Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41797 --- release/Makefile | 8 +------- release/tools/vmimage.subr | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1ea3f6a284a5..3af7825c2684 100644 --- a/release/Makefile +++ b/release/Makefile @@ -118,13 +118,7 @@ clean: beforeclean base.txz: mkdir -p ${DISTDIR} cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} -# TODO: Add NO_ROOT mode to mm-tree.sh -.if !defined(NO_ROOT) -# Set up mergemaster root database - sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \ - "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \ - -D "${.OBJDIR}/${DISTDIR}/base" -.endif + # Bootstrap etcupdate(8) database. sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f8b132875cdc..6db8bea7c978 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -56,14 +56,11 @@ vm_install_base() { installworld installkernel distribution || \ err "\n\nCannot install the base system to ${DESTDIR}." - # Bootstrap etcupdate(8) and mergemaster(8) databases. + # Bootstrap etcupdate(8) database. mkdir -p ${DESTDIR}/var/db/etcupdate etcupdate extract -B \ -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate - sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ - -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ - -D ${DESTDIR} echo '# Custom /etc/fstab for FreeBSD VM images' \ > ${DESTDIR}/etc/fstab From nobody Wed Sep 20 11:35:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrGg30JrQz4tXmT; Wed, 20 Sep 2023 11:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrGg26tcnz3CML; Wed, 20 Sep 2023 11:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKk9AYHu6T+4hgeZhDQbcmpI+Ygm7rE8uUJ+LJ/fIvE=; b=DkYLvEVm8dV+8KUl8xgl7RmWXTTnqB4WHdAOJ8gsX7K+Gv6/0wR8kCGWePOZ1sVk9+AL3D 6owN63OMxc1XZxcxDMLqw3zOF3ZDTlf1+AvjqE3TjtcFqi264Zub7nuQWUW4RalwYRZ42M qXXFYIw7957kdMDcoAwvXWt9ZTck/o90DDcEBU3+b0LYm34YjVGTn+X6dMa0vE6MknKPX1 IyEOrg+0kfQB/e2HIh3j1yVVX3y5qs4wL9eXRpbwRmUuPgcQ9oj00Xl4fTOsKg75sVIfTQ oOQNq0hURxa60Ik4T2mljmuJgN2LGTMSV2R9RcpZLDgP+l+kgHBAznBVL69AKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695209727; a=rsa-sha256; cv=none; b=QWqp8GUDlO0mI+2EwMJ6IoxLfgMiNcJbDwHPi1+87v3skpdwhBosff5ue604+MUZFpXCNw 9MThEiAaqE9HWdJkTJClJULKPzbEFub6Yt+0AZisPC/GM66oxggezdSUGE3aNbA4zo5PVm a+tmEGJE2zyXN6WcCbAjRPMFRjEFZrdE4RVx9Kgns/b1cJ8dAXWQd0mAxdJq8uh8E+k4oy KqVnUDczlCqhnicERGdW85QAhIUpJ2cHFyTAvsy2Fu2Kg6k7BoBRXJiN/288rCWUdu7sQI AGiHq8QB5EPjS6qCcm39JnNIB0oNgVjxlaKUQtdSzZxkFIEuQLtHfQA3kPBXVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sKk9AYHu6T+4hgeZhDQbcmpI+Ygm7rE8uUJ+LJ/fIvE=; b=XdFlVHM1BSwrAnpKxKCMl5de+p4l9WCHdmYTiGqnLPsgeAdIyFYLC5iGo31zfztHSbAmmB rxRyk9BZx68mp71To1s7T4oQABtyPiJXTffrDvBnr6Vg4o7XzYAW25HCq5aAG0290dgV81 fXQbqAG9BWEGsYGv1KHJ/K+XZ59+0ADf0cRGO6inrNyymgrPhpIuGNXJc5qoADm9+eRiBq MYPmvKqJW5EolrfZQVr08xV44pgs8awMJfufR0OFdhnnklgGDnRpMtZuXAK2TmSc5puh7q v0865/ftblh3rZYY803HjXRMjvCqo4rReuGdOsHkET4zYtjUUifwDEtZFtk9VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrGg25csVzv9D; Wed, 20 Sep 2023 11:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KBZQwi003067; Wed, 20 Sep 2023 11:35:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KBZQcf003064; Wed, 20 Sep 2023 11:35:26 GMT (envelope-from git) Date: Wed, 20 Sep 2023 11:35:26 GMT Message-Id: <202309201135.38KBZQcf003064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d5ef73a71f0e - main - Add deprecation notices to publickey(5) tools List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5ef73a71f0e2fbc4dc9b907a6e59a15599c50b3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ef73a71f0e2fbc4dc9b907a6e59a15599c50b3 commit d5ef73a71f0e2fbc4dc9b907a6e59a15599c50b3 Author: Ed Maste AuthorDate: 2023-09-20 11:31:14 +0000 Commit: Ed Maste CommitDate: 2023-09-20 11:31:14 +0000 Add deprecation notices to publickey(5) tools Reviewed by: imp, manu MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40144 --- usr.bin/chkey/chkey.1 | 4 ++++ usr.bin/keylogin/keylogin.1 | 4 ++++ usr.bin/keylogout/keylogout.1 | 4 ++++ usr.bin/newkey/newkey.8 | 4 ++++ usr.sbin/keyserv/keyserv.8 | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1 index 0721c07e8c14..508227ba9601 100644 --- a/usr.bin/chkey/chkey.1 +++ b/usr.bin/chkey/chkey.1 @@ -9,6 +9,10 @@ .Nd change your encryption key .Sh SYNOPSIS .Nm +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available as of +.Fx 15.0. .Sh DESCRIPTION The .Nm diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1 index a8a429e6c786..32a3e8e1b5b4 100644 --- a/usr.bin/keylogin/keylogin.1 +++ b/usr.bin/keylogin/keylogin.1 @@ -9,6 +9,10 @@ .Nd decrypt and store secret key .Sh SYNOPSIS .Nm +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available as of +.Fx 15.0. .Sh DESCRIPTION The .Nm diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1 index 54cd5a575c51..1480a83aece5 100644 --- a/usr.bin/keylogout/keylogout.1 +++ b/usr.bin/keylogout/keylogout.1 @@ -8,6 +8,10 @@ .Sh SYNOPSIS .Nm .Op Fl f +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available as of +.Fx 15.0. .Sh DESCRIPTION The .Nm diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8 index 966692b5968c..51dca6688bd0 100644 --- a/usr.bin/newkey/newkey.8 +++ b/usr.bin/newkey/newkey.8 @@ -10,6 +10,10 @@ .Fl h Ar hostname .Nm .Fl u Ar username +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available as of +.Fx 15.0. .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/keyserv/keyserv.8 b/usr.sbin/keyserv/keyserv.8 index af8acd2fd642..17007c7d8f40 100644 --- a/usr.sbin/keyserv/keyserv.8 +++ b/usr.sbin/keyserv/keyserv.8 @@ -16,6 +16,10 @@ .Op Fl n .Op Fl p Ar path .Op Fl v +.Sh DEPRECATION NOTICE +.Nm +is deprecated and is not available as of +.Fx 15.0. .Sh DESCRIPTION The .Nm From nobody Wed Sep 20 11:37:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrGjr322Tz4tXMn; Wed, 20 Sep 2023 11:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrGjr2SWpz3CgT; Wed, 20 Sep 2023 11:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRSNrAtV0v/btheq/uyQLP4bYifL4wmtWJj6ByX1uy0=; b=a7+Y1+x9tqKLe8u0/2iC/Czg47mu2hCfgAoH7lVBq7xx/fPKcHxADKK87uP7bMqbxze7nE zv1ExlaTsFz4xiug78AcARkDIWf76dFmHteD3n3bRxJmQYrTonzlc/z0GTUoZzWPcaXSwf 0TqCLfAeyfoVoqmlrkLu7YdnLr634aWJHJPyN+zWA1cXX2bRQYqIqYXw7+5mmBkXN16t3R x7R6+PAi8+GKetlN8Rpv0TPZu0ukVftKkEUayeUicSNrOBR5H18BrsQvyk2LySPTErKMoM Q0IdFRz/dV6Yd1ew9RHTGJJiKjAQ2scJ2a97pJd6FDVl/EMilT4C1OHnE9LIqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695209872; a=rsa-sha256; cv=none; b=YXsKBW4ycBzY8TsbCQ5tvuNatsV0UfgHidI4VOXraGm4FpZDhF8cB7dJDNMWtZLdtT+rJX y4D6T4ft7t5ytZRRQRqsfL5QbHHIcA2HUXUdY3CaXzNPbITRdrRbM2K93cLv31mEWIySux CvZmpChaubrcxJMrG/DPcRBCCLtFmz2QQGpWPCkXLlejBQQ4VTnWMiT5lc8r0AkVGDPm6t gGLpfWFSye//IUxRCgeVSrloJPqy4psgXzAqCqKQRpsYKH5ZdS3fp5pGPRWqD70JLeabjd YKRb3uCH/NVsGyFNhUXSd3ic+xxfyi9KahvX/lxbbnd8EYS5b0f88q0jvIl/GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRSNrAtV0v/btheq/uyQLP4bYifL4wmtWJj6ByX1uy0=; b=DDyo0PG2L8LFXURKCgbpptojAYvfSVchImoyQj2RoMtavNqyQ0ICkuxBqeE/+xjtFQeo7U 0gIuuLZAIZMHzFsubzVmoZointORN4hWVOh24HWf2nLiqPB3vdquGnVJHWr8OOGMEOBNgO gj8LfH3D4WAGElA+LFY/I0NUXExWyiiUeQkpGkLQ1vWIWsF4O+ONwm7ru3OqE1dDfskmO/ fROSHBwgSmSL1h/7KtSEBK6cZgAY79i7K780EIpYUAzMc3FTfWF3t4xWkgriXNKBxP3NKu yYg3UMlofkFE7wAevZQVpvOHCS0C1+OnKOdL2YMffSRAi4Fbf0m0vMKOEwKbDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrGjr1W3dzvB1; Wed, 20 Sep 2023 11:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KBbqiL003503; Wed, 20 Sep 2023 11:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KBbqRl003500; Wed, 20 Sep 2023 11:37:52 GMT (envelope-from git) Date: Wed, 20 Sep 2023 11:37:52 GMT Message-Id: <202309201137.38KBbqRl003500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 84696cf10c73 - main - makefs: remove ISO9660 Archimedes extension support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84696cf10c7391651198294676e9227ec01440bb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=84696cf10c7391651198294676e9227ec01440bb commit 84696cf10c7391651198294676e9227ec01440bb Author: Ed Maste AuthorDate: 2023-03-30 16:30:44 +0000 Commit: Ed Maste CommitDate: 2023-09-20 11:37:19 +0000 makefs: remove ISO9660 Archimedes extension support We have no need to create ISO images with RISC OS specific metadata. Reviewed by: imp Relnotes: yes Obtained from: OpenBSD a435da44c07f Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39344 --- usr.sbin/makefs/cd9660.c | 20 +---- usr.sbin/makefs/cd9660.h | 1 - usr.sbin/makefs/cd9660/Makefile.inc | 2 +- usr.sbin/makefs/cd9660/cd9660_archimedes.c | 124 ----------------------------- usr.sbin/makefs/cd9660/cd9660_archimedes.h | 50 ------------ usr.sbin/makefs/makefs.8 | 9 +-- 6 files changed, 4 insertions(+), 202 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index cc56421a873c..3429e2a33b4c 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -108,7 +108,6 @@ #include "makefs.h" #include "cd9660.h" #include "cd9660/iso9660_rrip.h" -#include "cd9660/cd9660_archimedes.h" static void cd9660_finalize_PVD(iso9660_disk *); static cd9660node *cd9660_allocate_cd9660node(void); @@ -201,7 +200,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure) diskStructure->rock_ridge_move_count = 0; diskStructure->rr_moved_dir = 0; - diskStructure->archimedes_enabled = 0; diskStructure->chrp_boot = 0; diskStructure->include_padding_areas = 1; @@ -281,8 +279,6 @@ cd9660_prep_opts(fsinfo_t *fsopts) "Omit trailing periods in filenames"), OPT_BOOL('\0', "allow-lowercase", allow_lowercase, "Allow lowercase characters in filenames"), - OPT_BOOL('\0', "archimedes", archimedes_enabled, - "Enable Archimedes structure"), OPT_BOOL('\0', "no-trailing-padding", include_padding_areas, "Include padding areas"), @@ -528,10 +524,6 @@ cd9660_makefs(const char *image, const char *dir, fsnode *root, if (diskStructure->verbose_level > 0) printf("%s: done converting tree\n", __func__); - /* non-SUSP extensions */ - if (diskStructure->archimedes_enabled) - archimedes_convert_tree(diskStructure->rootNode); - /* Rock ridge / SUSP init pass */ if (diskStructure->rock_ridge_enabled) { cd9660_susp_initialize(diskStructure, diskStructure->rootNode, @@ -1599,11 +1591,6 @@ cd9660_level1_convert_filename(iso9660_disk *diskStructure, const char *oldname, found_ext = 1; } } else { - /* cut RISC OS file type off ISO name */ - if (diskStructure->archimedes_enabled && - *oldname == ',' && strlen(oldname) == 4) - break; - /* Enforce 12.3 / 8 */ if (namelen == 8 && !found_ext) break; @@ -1666,12 +1653,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, found_ext = 1; } } else { - /* cut RISC OS file type off ISO name */ - if (diskStructure->archimedes_enabled && - *oldname == ',' && strlen(oldname) == 4) - break; - - if (islower((unsigned char)*oldname)) + if (islower((unsigned char)*oldname)) *newname++ = toupper((unsigned char)*oldname); else if (isupper((unsigned char)*oldname) || isdigit((unsigned char)*oldname)) diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h index b7324322d383..bc826a414a6d 100644 --- a/usr.sbin/makefs/cd9660.h +++ b/usr.sbin/makefs/cd9660.h @@ -250,7 +250,6 @@ typedef struct _iso9660_disk { unsigned rock_ridge_move_count; cd9660node *rr_moved_dir; - int archimedes_enabled; int chrp_boot; /* Spec breaking options */ diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc index e596309a6243..ec949f1413dc 100644 --- a/usr.sbin/makefs/cd9660/Makefile.inc +++ b/usr.sbin/makefs/cd9660/Makefile.inc @@ -3,4 +3,4 @@ CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ SRCS+= cd9660_strings.c cd9660_debug.c cd9660_eltorito.c \ - cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c + cd9660_write.c cd9660_conversion.c iso9660_rrip.c diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.c b/usr.sbin/makefs/cd9660/cd9660_archimedes.c deleted file mode 100644 index 93560da40d54..000000000000 --- a/usr.sbin/makefs/cd9660/cd9660_archimedes.c +++ /dev/null @@ -1,124 +0,0 @@ -/* $NetBSD: cd9660_archimedes.c,v 1.1 2009/01/10 22:06:29 bjh21 Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1998, 2009 Ben Harris - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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. - */ -/* - * cd9660_archimedes.c - support for RISC OS "ARCHIMEDES" extension - * - * RISC OS CDFS looks for a special block at the end of the System Use - * Field for each file. If present, this contains the RISC OS load - * and exec address (used to hold the file timestamp and type), the - * file attributes, and a flag indicating whether the first character - * of the filename should be replaced with '!' (since many special - * RISC OS filenames do). - */ - -#include -#include -#include -#include -#include -#include - -#include "makefs.h" -#include "cd9660.h" -#include "cd9660_archimedes.h" - -/* - * Convert a Unix time_t (non-leap seconds since 1970-01-01) to a RISC - * OS time (non-leap(?) centiseconds since 1900-01-01(?)). - */ - -static u_int64_t -riscos_date(time_t unixtime) -{ - u_int64_t base; - - base = 31536000ULL * 70 + 86400 * 17; - return (((u_int64_t)unixtime) + base)*100; -} - -/* - * Add "ARCHIMEDES" metadata to a node if that seems appropriate. - * - * We touch regular files with names matching /,[0-9a-f]{3}$/ and - * directories matching /^!/. - */ -static void -archimedes_convert_node(cd9660node *node) -{ - struct ISO_ARCHIMEDES *arc; - size_t len; - int type = -1; - uint64_t stamp; - - if (node->su_tail_data != NULL) - /* Something else already has the tail. */ - return; - - len = strlen(node->node->name); - if (len < 1) return; - - if (len >= 4 && node->node->name[len-4] == ',') - /* XXX should support ,xxx and ,lxa */ - type = strtoul(node->node->name + len - 3, NULL, 16); - if (type == -1 && node->node->name[0] != '!') - return; - if (type == -1) type = 0; - - assert(sizeof(*arc) == 32); - arc = ecalloc(1, sizeof(*arc)); - - stamp = riscos_date(node->node->inode->st.st_mtime); - - memcpy(arc->magic, "ARCHIMEDES", 10); - cd9660_731(0xfff00000 | (type << 8) | (stamp >> 32), arc->loadaddr); - cd9660_731(stamp & 0x00ffffffffULL, arc->execaddr); - arc->ro_attr = RO_ACCESS_UR | RO_ACCESS_OR; - arc->cdfs_attr = node->node->name[0] == '!' ? CDFS_PLING : 0; - node->su_tail_data = (void *)arc; - node->su_tail_size = sizeof(*arc); -} - -/* - * Add "ARCHIMEDES" metadata to an entire tree recursively. - */ -void -archimedes_convert_tree(cd9660node *node) -{ - cd9660node *cn; - - assert(node != NULL); - - archimedes_convert_node(node); - - /* Recurse on children. */ - TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) - archimedes_convert_tree(cn); -} diff --git a/usr.sbin/makefs/cd9660/cd9660_archimedes.h b/usr.sbin/makefs/cd9660/cd9660_archimedes.h deleted file mode 100644 index 0766a940bb35..000000000000 --- a/usr.sbin/makefs/cd9660/cd9660_archimedes.h +++ /dev/null @@ -1,50 +0,0 @@ -/* $NetBSD: cd9660_archimedes.h,v 1.1 2009/01/10 22:06:29 bjh21 Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1998, 2009 Ben Harris - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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. - */ -/* - * cd9660_archimedes.c - support for RISC OS "ARCHIMEDES" extension - */ - -struct ISO_ARCHIMEDES { - char magic[10]; /* "ARCHIMEDES" */ - unsigned char loadaddr[4]; /* Load address, little-endian */ - unsigned char execaddr[4]; /* Exec address, little-endian */ - unsigned char ro_attr; /* RISC OS attributes */ -#define RO_ACCESS_UR 0x01 /* Owner read */ -#define RO_ACCESS_UW 0x02 /* Owner write */ -#define RO_ACCESS_L 0x04 /* Locked */ -#define RO_ACCESS_OR 0x10 /* Public read */ -#define RO_ACCESS_OW 0x20 /* Public write */ - unsigned char cdfs_attr; /* Extra attributes for CDFS */ -#define CDFS_PLING 0x01 /* Filename begins with '!' */ - char reserved[12]; -}; - -extern void archimedes_convert_tree(cd9660node *); diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8 index 2ffa512a3b9e..eaa0ab2955df 100644 --- a/usr.sbin/makefs/makefs.8 +++ b/usr.sbin/makefs/makefs.8 @@ -33,7 +33,8 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 5, 2022 +.Dd March 31, 2023 + .Dt MAKEFS 8 .Os .Sh NAME @@ -365,12 +366,6 @@ version id. Allow multiple dots in a filename. .It Sy applicationid Application ID of the image. -.It Sy archimedes -Use the -.Ql ARCHIMEDES -extension to encode -.Tn RISC OS -metadata. .It Sy bootimagedir Boot image directory. This option is not implemented. From nobody Wed Sep 20 14:42:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrLq32lDMz4tlSv; Wed, 20 Sep 2023 14:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrLq32TNQz3dWW; Wed, 20 Sep 2023 14:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695220959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2zKXWNGiOS1Xt/gj2Tus68qkVmCk6s/8bHc8auHv5M=; b=t7Cr2X34mlwLZ4hcrAITxdQttDl6Sv3s/Q0flo5hgmjw23+zg4UNdvPjdQJHh2b10PRjTL 37LlceSZFFRGO2s6YHDfyDmDILSFDZzAX7pdZLSw9ROCbxZovGSZSGvoMjEYPf8lA2MjQo GZZ1xyoAGzIV78aksomIN9yPlXuKo1lCvFYyFnBLHGfA6Zi/8vcUc2v9mtcm2szmJeWeYx diybBja041MfU7tX9p8s9GsafUBJQk0vxlkIcHzhKkYpBYGNwb2uonLegHQlUPLdNZ3eyX NDpkXhr1ZzS2t2VdwiOe3U5ClfwyOuxE/P7K8Zwy8Ay7pAgA2vCrckWrkwI5pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695220959; a=rsa-sha256; cv=none; b=rq+TAEiqEw3ldXkY/V9jbEFfyobNfrBVHPuXAS7pCzuTtpLGYQz1yIy1hvh7L86whOTCFQ EwLxhf6Wb7V2Vv+y3UjPDZpv0HMHcPRuGHJeknuCL4YrOCoN0gpaSpKmr+6BUJgjGbRJ4q NcAkOcMzHyLKGGUYB+B52TlYRdQc95zDjOZOrlO04aS78n2zcBCVCVAnQFfA82iu33F6kV NOvx88EB7G3p/AmEnkwLKLLEuq6UqLExNKJFJ/tCzidBUUBe04j2ETJ0Stopn/cGjbBOzi aN8KyhVb+pgymhDJPnoHoe7DmGQipx2EareXy7I03Um99CW0a4K9/upLwHzAHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695220959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2zKXWNGiOS1Xt/gj2Tus68qkVmCk6s/8bHc8auHv5M=; b=BP1VclY2H5e1q6I2w0qGiPJUG62N8kgJ1q+ju77Af0o0DLmyFEJ9YmoSvzMwBOKSfJ6U2c bq5EgI14YgT+emfPaNiJEx4P+2V24EPEZ30nfoRlnLvbXTOZAeK8qAih5B7H/8dI9zXEF0 cb3OpFVQIXDt/KyURnEZ98s2ii5uG0X/BJ2GJXg3ePto0wDMvPz/28rQpFH+ZggSu2d1qt KRmFTgmwU+GxS4dCnjPNSdb2aQvfzRxIQPam1LLFfsQIwNF56wuD3CRf5E8+jqxM9zdZuQ P2tV7hIlaPvDuPGqt0gpuUKmmtG8XFoxEzA5UN20vFrtCQ/MUU+9hnGAjqDP2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrLq31Wchz10cH; Wed, 20 Sep 2023 14:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KEgd9m018173; Wed, 20 Sep 2023 14:42:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KEgdli018170; Wed, 20 Sep 2023 14:42:39 GMT (envelope-from git) Date: Wed, 20 Sep 2023 14:42:39 GMT Message-Id: <202309201442.38KEgdli018170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 948e11aaf420 - main - local-unbound: remove stray config.h.in backup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 948e11aaf420cd7d493cc2e118cacc06d18653fe Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=948e11aaf420cd7d493cc2e118cacc06d18653fe commit 948e11aaf420cd7d493cc2e118cacc06d18653fe Author: Mina Galic AuthorDate: 2023-09-20 14:39:37 +0000 Commit: Cy Schubert CommitDate: 2023-09-20 14:41:58 +0000 local-unbound: remove stray config.h.in backup despite being ignored in our main .gitignore, such files can still be merged from vendor branches. Reviewed by: cy Fixes: 8f76bb7dad (unbound: Vendor import 1.18.0) MFC after: 2 weeks X-MFC with: 8f76bb7dad Differential Revision: https://reviews.freebsd.org/D41920 --- contrib/unbound/config.h.in~ | 1456 ------------------------------------------ 1 file changed, 1456 deletions(-) diff --git a/contrib/unbound/config.h.in~ b/contrib/unbound/config.h.in~ deleted file mode 100644 index f31354d01408..000000000000 --- a/contrib/unbound/config.h.in~ +++ /dev/null @@ -1,1456 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* apply the noreturn attribute to a function that exits the program */ -#undef ATTR_NORETURN - -/* apply the weak attribute to a symbol */ -#undef ATTR_WEAK - -/* Directory to chroot to */ -#undef CHROOT_DIR - -/* Define this to enable client subnet option. */ -#undef CLIENT_SUBNET - -/* Do sha512 definitions in config.h */ -#undef COMPAT_SHA512 - -/* Command line arguments used with configure */ -#undef CONFCMDLINE - -/* Pathname to the Unbound configuration file */ -#undef CONFIGFILE - -/* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work - */ -#undef DARWIN_BROKEN_SETREUID - -/* Whether daemon is deprecated */ -#undef DEPRECATED_DAEMON - -/* Deprecate RSA 1024 bit length, makes that an unsupported key */ -#undef DEPRECATE_RSA_1024 - -/* Define this to enable kernel based UDP source port randomization. */ -#undef DISABLE_EXPLICIT_PORT_RANDOMISATION - -/* default dnstap socket path */ -#undef DNSTAP_SOCKET_PATH - -/* Define if you want to use debug lock checking (slow). */ -#undef ENABLE_LOCK_CHECKS - -/* Define this if you enabled-allsymbols from libunbound to link binaries to - it for smaller install size, but the libunbound export table is polluted by - internal symbols */ -#undef EXPORT_ALL_SYMBOLS - -/* Define to 1 if you have the `accept4' function. */ -#undef HAVE_ACCEPT4 - -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_uniform' function. */ -#undef HAVE_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Whether the C compiler accepts the "format" attribute */ -#undef HAVE_ATTR_FORMAT - -/* Whether the C compiler accepts the "noreturn" attribute */ -#undef HAVE_ATTR_NORETURN - -/* Whether the C compiler accepts the "unused" attribute */ -#undef HAVE_ATTR_UNUSED - -/* Whether the C compiler accepts the "weak" attribute */ -#undef HAVE_ATTR_WEAK - -/* If we have be64toh */ -#undef HAVE_BE64TOH - -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ -#undef HAVE_BIO_SET_CALLBACK_EX - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_BSD_STRING_H - -/* Define to 1 if you have the `chown' function. */ -#undef HAVE_CHOWN - -/* Define to 1 if you have the `chroot' function. */ -#undef HAVE_CHROOT - -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ -#undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA - -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ -#undef HAVE_CRYPTO_THREADID_SET_CALLBACK - -/* Define to 1 if you have the `ctime_r' function. */ -#undef HAVE_CTIME_R - -/* Define to 1 if you have the `daemon' function. */ -#undef HAVE_DAEMON - -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you - don't. */ -#undef HAVE_DECL_ARC4RANDOM - -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 - if you don't. */ -#undef HAVE_DECL_ARC4RANDOM_UNIFORM - -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if - you don't. */ -#undef HAVE_DECL_EVSIGNAL_ASSIGN - -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_NTOP - -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you - don't. */ -#undef HAVE_DECL_INET_PTON - -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', - and to 0 if you don't. */ -#undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW - -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED25519 - -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_ED448 - -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you - don't. */ -#undef HAVE_DECL_NID_SECP384R1 - -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 - if you don't. */ -#undef HAVE_DECL_NID_X9_62_PRIME256V1 - -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you - don't. */ -#undef HAVE_DECL_REALLOCARRAY - -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you - don't. */ -#undef HAVE_DECL_REDISCONNECT - -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 - if you don't. */ -#undef HAVE_DECL_SK_SSL_COMP_POP_FREE - -/* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ -#undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS - -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to - 0 if you don't. */ -#undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO - -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCAT - -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you - don't. */ -#undef HAVE_DECL_STRLCPY - -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if - you don't. */ -#undef HAVE_DECL_XML_STOPPARSER - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the `DSA_SIG_set0' function. */ -#undef HAVE_DSA_SIG_SET0 - -/* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H - -/* Define to 1 if you have the `endprotoent' function. */ -#undef HAVE_ENDPROTOENT - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the `endservent' function. */ -#undef HAVE_ENDSERVENT - -/* Define to 1 if you have the `ENGINE_cleanup' function. */ -#undef HAVE_ENGINE_CLEANUP - -/* Define to 1 if you have the `ERR_free_strings' function. */ -#undef HAVE_ERR_FREE_STRINGS - -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ -#undef HAVE_ERR_LOAD_CRYPTO_STRINGS - -/* Define to 1 if you have the `event_assign' function. */ -#undef HAVE_EVENT_ASSIGN - -/* Define to 1 if you have the `event_base_free' function. */ -#undef HAVE_EVENT_BASE_FREE - -/* Define to 1 if you have the `event_base_get_method' function. */ -#undef HAVE_EVENT_BASE_GET_METHOD - -/* Define to 1 if you have the `event_base_new' function. */ -#undef HAVE_EVENT_BASE_NEW - -/* Define to 1 if you have the `event_base_once' function. */ -#undef HAVE_EVENT_BASE_ONCE - -/* Define to 1 if you have the header file. */ -#undef HAVE_EVENT_H - -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ -#undef HAVE_EVP_AES_256_CBC - -/* Define to 1 if you have the `EVP_cleanup' function. */ -#undef HAVE_EVP_CLEANUP - -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' - function. */ -#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED - -/* Define to 1 if you have the `EVP_DigestVerify' function. */ -#undef HAVE_EVP_DIGESTVERIFY - -/* Define to 1 if you have the `EVP_dss1' function. */ -#undef HAVE_EVP_DSS1 - -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ -#undef HAVE_EVP_ENCRYPTINIT_EX - -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ -#undef HAVE_EVP_MAC_CTX_SET_PARAMS - -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ -#undef HAVE_EVP_MD_CTX_NEW - -/* Define to 1 if you have the `EVP_sha1' function. */ -#undef HAVE_EVP_SHA1 - -/* Define to 1 if you have the `EVP_sha256' function. */ -#undef HAVE_EVP_SHA256 - -/* Define to 1 if you have the `EVP_sha512' function. */ -#undef HAVE_EVP_SHA512 - -/* Define to 1 if you have the `ev_default_loop' function. */ -#undef HAVE_EV_DEFAULT_LOOP - -/* Define to 1 if you have the `ev_loop' function. */ -#undef HAVE_EV_LOOP - -/* Define to 1 if you have the header file. */ -#undef HAVE_EXPAT_H - -/* Define to 1 if you have the `explicit_bzero' function. */ -#undef HAVE_EXPLICIT_BZERO - -/* Define to 1 if you have the `fcntl' function. */ -#undef HAVE_FCNTL - -/* Define to 1 if you have the `FIPS_mode' function. */ -#undef HAVE_FIPS_MODE - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fsync' function. */ -#undef HAVE_FSYNC - -/* Whether getaddrinfo is available */ -#undef HAVE_GETADDRINFO - -/* Define to 1 if you have the `getauxval' function. */ -#undef HAVE_GETAUXVAL - -/* Define to 1 if you have the `getentropy' function. */ -#undef HAVE_GETENTROPY - -/* Define to 1 if you have the `getifaddrs' function. */ -#undef HAVE_GETIFADDRS - -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define to 1 if you have the `getpwnam' function. */ -#undef HAVE_GETPWNAM - -/* Define to 1 if you have the `getrlimit' function. */ -#undef HAVE_GETRLIMIT - -/* Define to 1 if you have the `gettid' function. */ -#undef HAVE_GETTID - -/* Define to 1 if you have the `glob' function. */ -#undef HAVE_GLOB - -/* Define to 1 if you have the header file. */ -#undef HAVE_GLOB_H - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_GRP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_HIREDIS_HIREDIS_H - -/* Define to 1 if you have the `HMAC_Init_ex' function. */ -#undef HAVE_HMAC_INIT_EX - -/* If we have htobe64 */ -#undef HAVE_HTOBE64 - -/* Define to 1 if you have the header file. */ -#undef HAVE_IFADDRS_H - -/* Define to 1 if you have the `if_nametoindex' function. */ -#undef HAVE_IF_NAMETOINDEX - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the `inet_ntop' function. */ -#undef HAVE_INET_NTOP - -/* Define to 1 if you have the `inet_pton' function. */ -#undef HAVE_INET_PTON - -/* Define to 1 if you have the `initgroups' function. */ -#undef HAVE_INITGROUPS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* if the function 'ioctlsocket' is available */ -#undef HAVE_IOCTLSOCKET - -/* Define to 1 if you have the header file. */ -#undef HAVE_IPHLPAPI_H - -/* Define to 1 if you have the `isblank' function. */ -#undef HAVE_ISBLANK - -/* Define to 1 if you have the `kill' function. */ -#undef HAVE_KILL - -/* Use portable libbsd functions */ -#undef HAVE_LIBBSD - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBKERN_OSBYTEORDER_H - -/* Define if we have LibreSSL */ -#undef HAVE_LIBRESSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_NET_TSTAMP_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOGIN_CAP_H - -/* If have GNU libc compatible malloc */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_TCP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETIOAPI_H - -/* Use libnettle for crypto */ -#undef HAVE_NETTLE - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_DSA_COMPAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETTLE_EDDSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define this to use nghttp2 client. */ -#undef HAVE_NGHTTP2 - -/* Define to 1 if you have the header file. */ -#undef HAVE_NGHTTP2_NGHTTP2_H - -/* Use libnss for crypto */ -#undef HAVE_NSS - -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ -#undef HAVE_OPENSSL_ADD_ALL_DIGESTS - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_BN_H - -/* Define to 1 if you have the `OPENSSL_config' function. */ -#undef HAVE_OPENSSL_CONFIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CONF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_CORE_NAMES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_DSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ENGINE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ -#undef HAVE_OPENSSL_INIT_CRYPTO - -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ -#undef HAVE_OPENSSL_INIT_SSL - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_PARAM_BUILD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RAND_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_RSA_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_OPENSSL_SSL_H - -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ -#undef HAVE_OSSL_PARAM_BLD_NEW - -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ -#undef HAVE_PTHREAD_SPINLOCK_T - -/* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H - -/* Define if you have Python libraries and header files. */ -#undef HAVE_PYTHON - -/* Define to 1 if you have the `random' function. */ -#undef HAVE_RANDOM - -/* Define to 1 if you have the `RAND_cleanup' function. */ -#undef HAVE_RAND_CLEANUP - -/* If we have reallocarray(3) */ -#undef HAVE_REALLOCARRAY - -/* Define to 1 if you have the `recvmsg' function. */ -#undef HAVE_RECVMSG - -/* Define to 1 if you have the `sendmsg' function. */ -#undef HAVE_SENDMSG - -/* Define to 1 if you have the `setregid' function. */ -#undef HAVE_SETREGID - -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - -/* Define to 1 if you have the `setreuid' function. */ -#undef HAVE_SETREUID - -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - -/* Define to 1 if you have the `setsid' function. */ -#undef HAVE_SETSID - -/* Define to 1 if you have the `setusercontext' function. */ -#undef HAVE_SETUSERCONTEXT - -/* Define to 1 if you have the `SHA512_Update' function. */ -#undef HAVE_SHA512_UPDATE - -/* Define to 1 if you have the `shmget' function. */ -#undef HAVE_SHMGET - -/* Define to 1 if you have the `sigprocmask' function. */ -#undef HAVE_SIGPROCMASK - -/* Define to 1 if you have the `sleep' function. */ -#undef HAVE_SLEEP - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - -/* Using Solaris threads */ -#undef HAVE_SOLARIS_THREADS - -/* Define to 1 if you have the `srandom' function. */ -#undef HAVE_SRANDOM - -/* Define if you have the SSL libraries installed. */ -#undef HAVE_SSL - -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_PROTOS - -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ -#undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ -#undef HAVE_SSL_CTX_SET_CIPHERSUITES - -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ -#undef HAVE_SSL_CTX_SET_SECURITY_LEVEL - -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' - function. */ -#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB - -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ -#undef HAVE_SSL_GET0_ALPN_SELECTED - -/* Define to 1 if you have the `SSL_get0_peername' function. */ -#undef HAVE_SSL_GET0_PEERNAME - -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ -#undef HAVE_SSL_GET1_PEER_CERTIFICATE - -/* Define to 1 if you have the `SSL_set1_host' function. */ -#undef HAVE_SSL_SET1_HOST - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - -/* Define to 1 if you have the `strlcpy' function. */ -#undef HAVE_STRLCPY - -/* Define to 1 if you have the `strptime' function. */ -#undef HAVE_STRPTIME - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ -#undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST - -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ -#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN - -/* Define if you have Swig libraries and header files. */ -#undef HAVE_SWIG - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if systemd should be used */ -#undef HAVE_SYSTEMD - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IPC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_RESOURCE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHA2_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SHM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TARGETCONDITIONALS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the `tzset' function. */ -#undef HAVE_TZSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `usleep' function. */ -#undef HAVE_USLEEP - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINDOWS_H - -/* Using Windows threads */ -#undef HAVE_WINDOWS_THREADS - -/* Define to 1 if you have the header file. */ -#undef HAVE_WINSOCK2_H - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to 1 if you have the `writev' function. */ -#undef HAVE_WRITEV - -/* Define to 1 if you have the header file. */ -#undef HAVE_WS2TCPIP_H - -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ -#undef HAVE_X509_VERIFY_PARAM_SET1_HOST - -/* Define to 1 if you have the `_beginthreadex' function. */ -#undef HAVE__BEGINTHREADEX - -/* If HMAC_Init_ex() returns void */ -#undef HMAC_INIT_EX_RETURNS_VOID - -/* if lex has yylex_destroy */ -#undef LEX_HAS_YYLEX_DESTROY - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Define to the maximum message length to pass to syslog. */ -#undef MAXSYSLOGMSGLEN - -/* Define if memcmp() does not compare unsigned bytes */ -#undef MEMCMP_IS_BROKEN - -/* Define if mkdir has one argument. */ -#undef MKDIR_HAS_ONE_ARG - -/* Define if the network stack does not fully support nonblocking io (causes - lower performance). */ -#undef NONBLOCKING_IS_BROKEN - -/* Put -D_ALL_SOURCE define in config.h */ -#undef OMITTED__D_ALL_SOURCE - -/* Put -D_BSD_SOURCE define in config.h */ -#undef OMITTED__D_BSD_SOURCE - -/* Put -D_DEFAULT_SOURCE define in config.h */ -#undef OMITTED__D_DEFAULT_SOURCE - -/* Put -D_GNU_SOURCE define in config.h */ -#undef OMITTED__D_GNU_SOURCE - -/* Put -D_LARGEFILE_SOURCE=1 define in config.h */ -#undef OMITTED__D_LARGEFILE_SOURCE_1 - -/* Put -D_POSIX_C_SOURCE=200112 define in config.h */ -#undef OMITTED__D_POSIX_C_SOURCE_200112 - -/* Put -D_XOPEN_SOURCE=600 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_600 - -/* Put -D_XOPEN_SOURCE_EXTENDED=1 define in config.h */ -#undef OMITTED__D_XOPEN_SOURCE_EXTENDED_1 - -/* Put -D__EXTENSIONS__ define in config.h */ -#undef OMITTED__D__EXTENSIONS__ - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* default pidfile location */ -#undef PIDFILE - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Return type of signal handlers, but autoconf 2.70 says 'your code may - safely assume C89 semantics that RETSIGTYPE is void.' */ -#undef RETSIGTYPE - -/* if REUSEPORT is enabled by default */ -#undef REUSEPORT_DEFAULT - -/* default rootkey location */ -#undef ROOT_ANCHOR_FILE - -/* default rootcert location */ -#undef ROOT_CERT_FILE - -/* version number for resource files */ -#undef RSRC_PACKAGE_VERSION - -/* Directory to chdir to */ -#undef RUN_DIR - -/* Shared data */ -#undef SHARE_DIR - -/* The size of `pthread_t', as computed by sizeof. */ -#undef SIZEOF_PTHREAD_T - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `time_t', as computed by sizeof. */ -#undef SIZEOF_TIME_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* define if (v)snprintf does not return length needed, (but length used) */ -#undef SNPRINTF_RET_BROKEN - -/* Define to 1 if libsodium supports sodium_set_misuse_handler */ -#undef SODIUM_MISUSE_HANDLER - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* use default strptime. */ -#undef STRPTIME_WORKS - -/* Use win32 resources and API */ -#undef UB_ON_WINDOWS - -/* the SYSLOG_FACILITY to use, default LOG_DAEMON */ -#undef UB_SYSLOG_FACILITY - -/* default username */ -#undef UB_USERNAME - -/* use to enable lightweight alloc assertions, for debug use */ -#undef UNBOUND_ALLOC_LITE - -/* use malloc not regions, for debug use */ -#undef UNBOUND_ALLOC_NONREGIONAL - -/* use statistics for allocs and frees, for debug use */ -#undef UNBOUND_ALLOC_STATS - -/* define this to enable debug checks. */ -#undef UNBOUND_DEBUG - -/* Define to 1 to use cachedb support */ -#undef USE_CACHEDB - -/* Define to 1 to enable dnscrypt support */ -#undef USE_DNSCRYPT - -/* Define to 1 to enable dnscrypt with xchacha20 support */ -#undef USE_DNSCRYPT_XCHACHA20 - -/* Define to 1 to enable dnstap support */ -#undef USE_DNSTAP - -/* Define this to enable DSA support. */ -#undef USE_DSA - -/* Define this to enable ECDSA support. */ -#undef USE_ECDSA - -/* Define this to enable an EVP workaround for older openssl */ -#undef USE_ECDSA_EVP_WORKAROUND - -/* Define this to enable ED25519 support. */ -#undef USE_ED25519 - -/* Define this to enable ED448 support. */ -#undef USE_ED448 - -/* Define this to enable GOST support. */ -#undef USE_GOST - -/* Define to 1 to use ipsecmod support. */ -#undef USE_IPSECMOD - -/* Define to 1 to use ipset support */ -#undef USE_IPSET - -/* Define if you enable libevent */ -#undef USE_LIBEVENT - -/* Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a - default outgoing port range. This is only for the libunbound on Linux and - does not affect unbound resolving daemon itself. This may severely limit - the number of available outgoing ports and thus decrease randomness. Define - this only when the target system restricts (e.g. some of SELinux enabled - distributions) the use of non-ephemeral ports. */ -#undef USE_LINUX_IP_LOCAL_PORT_RANGE - -/* Define if you want to use internal select based events */ -#undef USE_MINI_EVENT - -/* Define this to enable client TCP Fast Open. */ -#undef USE_MSG_FASTOPEN - -/* Define this to enable client TCP Fast Open. */ -#undef USE_OSX_MSG_FASTOPEN - -/* Define this to use hiredis client. */ -#undef USE_REDIS - -/* Define this to enable SHA1 support. */ -#undef USE_SHA1 - -/* Define this to enable SHA256 and SHA512 support. */ -#undef USE_SHA2 - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Define this to enable server TCP Fast Open. */ -#undef USE_TCP_FASTOPEN - -/* Whether the windows socket API is used */ -#undef USE_WINSOCK - -/* the version of the windows API enabled */ -#undef WINVER - -/* Define if you want dynlib module. */ *** 500 LINES SKIPPED *** From nobody Wed Sep 20 15:41:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrN705hHcz4tprZ; Wed, 20 Sep 2023 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrN705C7Tz4Kv4; Wed, 20 Sep 2023 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695224492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZVmjMn4ZuykFlZijd8BFJGqMQjlSwyJ5OV/SfzA/lk=; b=ewSfU/FreXU9adVTkHOzozFY05F+y2wBH86GtMRnJ5LAB+n++vsjAW4r8drN9cEGDTcfu1 RwNQOW6vUkdYWcHkxHiVn4O6nUXvC2ZLI2ukUZqJFDii1uOczMxif/o1rqCA+0kS9pztCG ubxYG3vXm5lC7eabccla38FyjvpmXj9W56qhd4H80CJWLHV8PC1hqnoew0m2BgihqMUvGO IAD3YezVwPeiUHmOGtO8zgt+/KbTOx2/a8Z/59+Vrri1LE4ukB5bqSIoBMY1SOrHikzgJQ LPuRbNp/cBjnzY0boycG47ejSu+tQ/Nh671xIh9YHobn1z20O29obwfYDyRbVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695224492; a=rsa-sha256; cv=none; b=JNPSxccPwF5kqoWd7qqEc+opwLoHFd+QA7qWatZLfUL1KWWYs2JswG5twy5cKrYyZwf79z PyjSsgb57HyjVkyiKYj2U8mapcljdLQjjM4mF3TIZuP7Wp7MVwGB8VoN11ABDvL0IsAvY4 xky8mFCFwLzfsTI3rBmgv6gHgX6NHUcpiRzdvU9VJegVeizL2rER1niE1wvmBXHdMe68V1 p8ebha8UpneYt9S7OcFAfJvtmeiYfqGLs+5oGUdhtPtIM1JVTZVM6lx0PsFu00lk4D8xVo 4kOmGE+8OllVgr/RfD34UUE/bTYvWQvNjwC0VWZt8bDYn/hsUTDp/FOiB0sGSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695224492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZVmjMn4ZuykFlZijd8BFJGqMQjlSwyJ5OV/SfzA/lk=; b=w5BfosDaG3lo/hJx/QRo5whH+YJYLG975gUQ1Pc6dfy9EhS5x37KjN/X04wn0DvG26eo3v ocpSQjl5+3HH2RFwRVDeo5mUW51TqLeBULJdKhQZ8DwYbgD0fMYcWqIn4AAOxcAiYQX5qD TCkFC5qi9K/3TJyn3AP25RcBlKNsFKwSX6s7/smxruIZKUdwTwfyXTGByus9LwOx1sxd95 oJoTSAzSyCXmSRN0oytojsBfcgPS4fG1q33JJlFQrZYkCrZuP5KYBlDbXLM+4+5sLzwVKc kWReARwwO64VT3AREln9ejTDj3pU/y529OzJTufvbr+362Vjb/MXgLDTh1QuMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrN703z90z11yg; Wed, 20 Sep 2023 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KFfWW3017110; Wed, 20 Sep 2023 15:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KFfW0g017107; Wed, 20 Sep 2023 15:41:32 GMT (envelope-from git) Date: Wed, 20 Sep 2023 15:41:32 GMT Message-Id: <202309201541.38KFfW0g017107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 8789e3b0214e - main - rpcbind: Add flag for foreground mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8789e3b0214e1bea8452d62b41ac2e32547686a4 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=8789e3b0214e1bea8452d62b41ac2e32547686a4 commit 8789e3b0214e1bea8452d62b41ac2e32547686a4 Author: Stephen J. Kiernan AuthorDate: 2023-08-31 16:59:41 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-09-20 15:40:52 +0000 rpcbind: Add flag for foreground mode Added the -N flag to enable foreground mode. It is useful to be able to run rpcbind in foreground mode when starting from launcher applications. The existing debug flag is not sufficient as it enables additional debug messages. Update man page to document the added flag. Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41674 --- usr.sbin/rpcbind/rpcbind.8 | 9 +++++++-- usr.sbin/rpcbind/rpcbind.c | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/usr.sbin/rpcbind/rpcbind.8 b/usr.sbin/rpcbind/rpcbind.8 index c0efb1e838ef..270cab88823c 100644 --- a/usr.sbin/rpcbind/rpcbind.8 +++ b/usr.sbin/rpcbind/rpcbind.8 @@ -1,7 +1,7 @@ .\" @(#)rpcbind.1m 1.19 92/09/14 SMI; from SVr4 .\" Copyright 1989 AT&T .\" Copyright 1991 Sun Microsystems, Inc. -.Dd April 19, 2017 +.Dd August 31, 2023 .Dt RPCBIND 8 .Os .Sh NAME @@ -9,7 +9,7 @@ .Nd universal addresses to RPC program number mapper .Sh SYNOPSIS .Nm -.Op Fl 6adiLlswW +.Op Fl 6adiLlNswW .Op Fl h Ar bindip .Sh DESCRIPTION The @@ -122,6 +122,11 @@ Without this flag, local connections are only allowed over a local socket, .Pa /var/run/rpcbind.sock . .It Fl l Turn on libwrap connection logging. +.It Fl N +Run in foreground mode. +In this mode, +.Nm +will not fork when it starts. .It Fl s Cause .Nm diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c index 0f7da00198a9..31064558fb6c 100644 --- a/usr.sbin/rpcbind/rpcbind.c +++ b/usr.sbin/rpcbind/rpcbind.c @@ -94,6 +94,7 @@ int oldstyle_local = 0; #ifdef LIBWRAP int libwrap = 0; #endif +int nofork = 0; int verboselog = 0; static char **hosts = NULL; @@ -226,7 +227,7 @@ main(int argc, char *argv[]) } else { printf("\n"); } - } else { + } else if (!nofork) { if (daemon(0, 0)) err(1, "fork failed"); } @@ -809,7 +810,7 @@ parseargs(int argc, char *argv[]) #else #define WRAPOP "" #endif - while ((c = getopt(argc, argv, "6adh:iLls" WRAPOP WSOP)) != -1) { + while ((c = getopt(argc, argv, "6adh:iLlNs" WRAPOP WSOP)) != -1) { switch (c) { case '6': ipv6_only = 1; @@ -839,6 +840,9 @@ parseargs(int argc, char *argv[]) case 'l': verboselog = 1; break; + case 'N': + nofork = 1; + break; case 's': runasdaemon = 1; break; From nobody Wed Sep 20 16:07:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrNhn4PCvz4trR0; Wed, 20 Sep 2023 16:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrNhn3qj6z4PG6; Wed, 20 Sep 2023 16:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euT0CJKemqC0CXMZ42K9UaiUatr0lcsTcR+ribbAk30=; b=FvE+eP1PTj5vjVHD9s8VjmdJMFi/fHl57j8y5Yr8gMcsLN19zdkZB9QfbiHZxYe2WNpCiC UPuYupQBQCgtXFA7QqPYzGSsInY/rbVobBbZYO/joENSSwg/sonROqOWBzuHE0g6eX9QtG DmoaHvWZ54RkNl2KaXR6gOGGaOMLESmOtLl7p093SZXsArRVlS7Udse8FU43V9o6bmYEjE lXjAkbgNf/r0iNqXDTPQrTQQGeAUIeHovSwSIXApbyBnofBazcSxA9dzbJ17GnDwPKdJ7C DQL7693CW5wA1wcz5idaBijOLnRcdqOHBATeGBPXgW9R1oT3qSqOvarl/LMhWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695226041; a=rsa-sha256; cv=none; b=RSbyNiZ3UhNX77dLx03KNuvXvLqvhmVViJsum7xWRV1p0nC2B63yR9LsC1OR+SWgcozZkk /qFmXN8o+dERb5c/VQyxLGAt7G14BG1xmeLfX9HBobCGyZ9dkq0rDXHInFmzSfM19OMwLo xXLIZ/GBYrwrfuykeE3dXvhgRgBQcEaAm0e+S0WrRrMxOXrxL1VMlnw1Ei1ZiOxdAn7UhR JiuS4zyfz9tbGljm7dzkS8xQ8bp7cSRjhca1CuisZcNqX0GTEThsv38BKR+xBny3Paua0T ZdfMbFq9P/FWKOeDvuMbMUc7EX6aaM7Wh4p6Iu0NxyZ18XEYnqJzYz66Ek+XoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=euT0CJKemqC0CXMZ42K9UaiUatr0lcsTcR+ribbAk30=; b=I6ivdh/BdSpSn4uClRJBxDbJo/J05IQnLhwBnSVJRv3Epcz16Wz3pgTpUNp5DioyXFFr4L lGVoeQm6z64UPWrV2fH6yHw6u93URg/B19IHuKqNits8GwdbVvI5f0HIcdGVj2/3e4jXOr 8w4iJDWx08s3KKHg3OpRlEXr2DmeoVhz8hDDbPS4TGogeMFZqB72t15QgF2fiG67GHWMD+ 5unqaHFjLSFrn/x7LJmJuGBpTJeil5ecYb39eYr4D7QSOidmFnY9celJO5wXwnsEUdBKPj QLghEodobS06bofUw2NauDJGDUN/fflTO8FQsCFQvOYF7ILvw867B2V2Hj9Ljg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrNhn2sdxz12jl; Wed, 20 Sep 2023 16:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KG7LwQ052766; Wed, 20 Sep 2023 16:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KG7LX1052763; Wed, 20 Sep 2023 16:07:21 GMT (envelope-from git) Date: Wed, 20 Sep 2023 16:07:21 GMT Message-Id: <202309201607.38KG7LX1052763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c643e82dba0b - main - arm64: Fix errata workarounds that depend on smccc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 commit c643e82dba0b17b2716de4c9d44a3c9c547cbbd5 Author: Andrew Turner AuthorDate: 2023-09-18 16:34:51 +0000 Commit: Andrew Turner CommitDate: 2023-09-20 16:01:10 +0000 arm64: Fix errata workarounds that depend on smccc Some arm64 errata depend on calling into the firmware via the SMCCC interface. This needs to happen after the psci driver has attached as they share the interface. Fix this by allowing the workarounds to mark when they depend on device drivers attaching. This is only an issue on CPU 0 as the workarounds are applied later for the non-boot CPUs. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41916 --- sys/arm64/arm64/cpu_errata.c | 46 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c index 38148ff7066c..6c294ff1237c 100644 --- a/sys/arm64/arm64/cpu_errata.c +++ b/sys/arm64/arm64/cpu_errata.c @@ -47,6 +47,9 @@ struct cpu_quirks { cpu_quirk_install *quirk_install; u_int midr_mask; u_int midr_value; +#define CPU_QUIRK_POST_DEVICE (1 << 0) /* After device attach */ + /* e.g. needs SMCCC */ + u_int flags; }; static enum { @@ -85,11 +88,13 @@ static struct cpu_quirks cpu_quirks[] = { .midr_value = CPU_ID_RAW(CPU_IMPL_CAVIUM, CPU_PART_THUNDERX2, 0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = 0, .midr_value = 0, .quirk_install = install_ssbd_workaround, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, @@ -173,8 +178,8 @@ install_thunderx_bcast_tlbi_workaround(void) } } -void -install_cpu_errata(void) +static void +install_cpu_errata_flags(u_int mask, u_int flags) { u_int midr; size_t i; @@ -183,8 +188,43 @@ install_cpu_errata(void) for (i = 0; i < nitems(cpu_quirks); i++) { if ((midr & cpu_quirks[i].midr_mask) == - cpu_quirks[i].midr_value) { + cpu_quirks[i].midr_value && + (cpu_quirks[i].flags & mask) == flags) { cpu_quirks[i].quirk_install(); } } } + +/* + * Install any CPU errata we need. On CPU 0 we only install the errata that + * don't depend on device drivers as this is called early in the boot process. + * On other CPUs the device drivers have already attached so install all + * applicable errata. + */ +void +install_cpu_errata(void) +{ + /* + * Only install early CPU errata on CPU 0, device drivers may not + * have attached and some workarounds depend on them, e.g. to query + * SMCCC. + */ + if (PCPU_GET(cpuid) == 0) { + install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, 0); + } else { + install_cpu_errata_flags(0, 0); + } +} + +/* + * Install any errata workarounds that depend on device drivers, e.g. use + * SMCCC to install a workaround. + */ +static void +install_cpu_errata_late(void *dummy __unused) +{ + MPASS(PCPU_GET(cpuid) == 0); + install_cpu_errata_flags(CPU_QUIRK_POST_DEVICE, CPU_QUIRK_POST_DEVICE); +} +SYSINIT(install_cpu_errata_late, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, + install_cpu_errata_late, NULL); From nobody Wed Sep 20 16:07:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrNhp5Hn9z4trMb; Wed, 20 Sep 2023 16:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrNhp4k1Sz4PNj; Wed, 20 Sep 2023 16:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVlwDaC7zJqJStVUG0qwG1NhDQCKwgRtYWyGZTzyYx4=; b=NtA00TRDXJG+DvK48XIHdtQGKTZMEx0elhIqpyp3ql2DGpgqATXNXKjMAzKvbwC/fHuS/H 0ImUIdAlhHG8+3i9E7IfT2mkBGSIETP58YGDbbMTEIaI2X2CFlc2OHI4jbC66JouyZdzbO 7PvhMjEAZnQeCiu8eMJsW0ylDPrWfZgrJUoKxBxYSp4F4H8a2cnyZG8issTp80g9iZHv9M A9eGIRgkvXJ487msEiQNMwuHrSik6dGwUqVUcv8IAdRVpXChx3CIfIE4nmyChc81ESwnJ4 Sc67ciGu+/ZcW39ZTu5Q+sGzUtozvq4Ek0aujXdmjSAw0le/8lVsq3WYFOadfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695226042; a=rsa-sha256; cv=none; b=v9gi1A2BZI7SZR5+R0wcjjhWu0rseDK4xymfSTKurcHIdhEWO0Palf5LWToFefkvlfmQtg gEn0clg+75J7u+hYrxtU2SyvW9prGkDuqkBLTQ5/i3MoXN25nmR9sAbS+fLoXOxEd4DvXa NbBABLtGX7wx8Baa5v0P0UzGToyaq+CLpk4HpXGAe/oY0XZx3gwDCFmDbrWOtjh51KqYov 6uN1Hjl0TPwovjua+OXm80oA8xMDV+/tsc9P5leqUpmbbJ0NtqOQ5LNlQIm073mkAd6IAt yeOgw26Jfly461x9iSjPnFGqXiqMjIOECZRq3z1Gf4BAiF+18MXPznO3m4IW8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695226042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aVlwDaC7zJqJStVUG0qwG1NhDQCKwgRtYWyGZTzyYx4=; b=yepKjxaxTTtkewp0QL9VVSiS+3TI6ncoL2aoMLBCvnTJouAvhuoNTQw854kwRGkf+v+845 zFz6i44muTTYdXl1F6TfcPrT/rRfX5bUcLqPyVNhs0xyC7pQcXNVBnVBlWZSpf2wXDsUla BcS36fzhVluVSbCmUc4T1PmPQ2FRPTkEjutupirztAgBcIDf4SUXnt7c2YoLUGdLi93w/C Kt4JgLH68ELF3wByWZjnthG+TTcydFaNJTQRD2jsg6rFP5RBHOOK6U+8cjSdgCCBGgL/9F AY0tfdIpf3FtR6N/YL9iNx835HhADtq3Fe90x1uMhfG1bMCb5BrsiPPPLGAdMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrNhp3qg0z129c; Wed, 20 Sep 2023 16:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KG7MrY052812; Wed, 20 Sep 2023 16:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KG7MGs052809; Wed, 20 Sep 2023 16:07:22 GMT (envelope-from git) Date: Wed, 20 Sep 2023 16:07:22 GMT Message-Id: <202309201607.38KG7MGs052809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8a723e2bd868 - main - Check SMCCC is ready before using List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a723e2bd8683b0e046ed9d03178082f84c8cf26 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8a723e2bd8683b0e046ed9d03178082f84c8cf26 commit 8a723e2bd8683b0e046ed9d03178082f84c8cf26 Author: Andrew Turner AuthorDate: 2023-09-19 09:11:48 +0000 Commit: Andrew Turner CommitDate: 2023-09-20 16:01:37 +0000 Check SMCCC is ready before using Add asserts to check SMCCC has been initialised before callers try to use it. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41917 --- sys/dev/psci/smccc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/psci/smccc.c b/sys/dev/psci/smccc.c index 5c5e140abab1..9008eb2fbd39 100644 --- a/sys/dev/psci/smccc.c +++ b/sys/dev/psci/smccc.c @@ -43,7 +43,7 @@ #define SMCCC_VERSION_1_0 0x10000 /* Assume 1.0 until we detect a later version */ -static uint32_t smccc_version = SMCCC_VERSION_1_0; +static uint32_t smccc_version; void smccc_init(void) @@ -51,6 +51,7 @@ smccc_init(void) int32_t features; uint32_t ret; + smccc_version = SMCCC_VERSION_1_0; features = psci_features(SMCCC_VERSION); if (features != PSCI_RETVAL_NOT_SUPPORTED) { ret = psci_call(SMCCC_VERSION, 0, 0, 0); @@ -69,6 +70,7 @@ smccc_init(void) uint32_t smccc_get_version(void) { + MPASS(smccc_version != 0); return (smccc_version); } @@ -76,6 +78,7 @@ int32_t smccc_arch_features(uint32_t smccc_func_id) { + MPASS(smccc_version != 0); if (smccc_version == SMCCC_VERSION_1_0) return (PSCI_RETVAL_NOT_SUPPORTED); @@ -90,6 +93,7 @@ int smccc_arch_workaround_1(void) { + MPASS(smccc_version != 0); KASSERT(smccc_version != SMCCC_VERSION_1_0, ("SMCCC arch workaround 1 called with an invalid SMCCC interface")); return (psci_call(SMCCC_ARCH_WORKAROUND_1, 0, 0, 0)); @@ -99,6 +103,7 @@ int smccc_arch_workaround_2(int enable) { + MPASS(smccc_version != 0); KASSERT(smccc_version != SMCCC_VERSION_1_0, ("SMCCC arch workaround 2 called with an invalid SMCCC interface")); return (psci_call(SMCCC_ARCH_WORKAROUND_2, enable, 0, 0)); From nobody Wed Sep 20 16:50:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrPfx09rVz4tv0s; Wed, 20 Sep 2023 16:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrPfw6t0cz4WbV; Wed, 20 Sep 2023 16:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695228649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGNi32zsHD3xeRbJXoMos8dYUbIEcmH/hen1N2znfRE=; b=xfELXm64vqmfRhjrQT67G69fMH1xNsEYZEWvS8zX00BmDB8+nYG2cDEl3ddelFPwlSqFes 7xlwovwHpCOnxU7F1giuYAVlBtvEX5bQpSjPJuq3wcBl0IRshk5Hh/Hftwn58XeCpXTtjZ EpUhX3pw2p1yYx8CJTUo+ixqpZFq9vcehcfuT5NnSata4yqQzcR6sr+rff/xqtiKA+K9hA kdp3bFCiflYagdjNm453aW5Kj/kTiRxx0XFSFXhBMu2iuo3OJ08mvhIEoFGDTNh5rhRIXT +kBay0r7MUB/o/i/ZhAAepvadLwgeBpWROZudnsSZKFkCB8t/8Ldp+VDq0XyBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695228649; a=rsa-sha256; cv=none; b=jZiK7e0eUkNQsLJMDMGMEIhf04pAVFZT4a9xKVEnP5mc3fA5rXyGALDMwMtAHGrljh6H6T 2MsL9knbbIOzn7xXKATnrbg6B0Vr5wlO9yhMLmivP8zu05mpLit5h9ZLgLyVNpozBElkCM vTQDQEEYbhQpV7mwOrSIsvL0OZsr+LqBKXOww/+xqFLAtwBnTi37bLjxTVclwxPNG7JgJV JUfcI68Oc/IK6wo+t6/ISlWS89rvLYLYwykYfhhFga9Ahllp/NDYTyqmmuTr/YTaLY+58t UZVfjP1dUc3WNyYqdCV20nrbp7OUSD8lWHYNlkOv19a5hupXORrZOL8JKBPxYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695228649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UGNi32zsHD3xeRbJXoMos8dYUbIEcmH/hen1N2znfRE=; b=Y/pIPDH0A0CRWKytyxc2kMszWRjU68n67nqKQoF+VoU5oLACOWX16Xe9w7gJm0j87Qf5rY Kn6ssoFlWNS7kJ/UWvHoH/4hwBmehEEGFVYM5SXOFW+HiGM/fippZQ+NpW6vwZwfzIQWYl c5cRJhhSM+S5UMRG+RvNBrjrfpBOjNHKJfdS3669nNk7bBZZtriquNe2ptn4QZhTp2LT/u PZQcLH86xw7+h/nk8nIy49koRJbfsH1jQEK4COBjU4xThy2zHaUvnwvKzuCIM76EomTmry eDH+cSYLGFDE9th/1yFCabqxH+8qxYdQiOJ5NZ43Y8pzQNhodoP0fmca4n229A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrPfw5yzWz13JV; Wed, 20 Sep 2023 16:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KGomxq029843; Wed, 20 Sep 2023 16:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KGomjg029840; Wed, 20 Sep 2023 16:50:48 GMT (envelope-from git) Date: Wed, 20 Sep 2023 16:50:48 GMT Message-Id: <202309201650.38KGomjg029840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Juraj Lutter Subject: git: 39f4633b3d23 - main - freebsd-update: Allow for upper/lowercase y/n List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39f4633b3d2354c01a290d5f422dce7874061769 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=39f4633b3d2354c01a290d5f422dce7874061769 commit 39f4633b3d2354c01a290d5f422dce7874061769 Author: Juraj Lutter AuthorDate: 2023-09-17 16:15:27 +0000 Commit: Juraj Lutter CommitDate: 2023-09-20 16:50:11 +0000 freebsd-update: Allow for upper/lowercase y/n Allow for upper/lowercase y/n in "Does this look right?" question. Reviewed by: emaste Approved by: emaste Differential revision: https://reviews.freebsd.org/D40434 --- usr.sbin/freebsd-update/freebsd-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9cdff05c24e4..29633b51b26c 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1202,10 +1202,10 @@ fetch_progress () { continuep () { while read -p "Does this look reasonable (y/n)? " CONTINUE; do case "${CONTINUE}" in - y*) + [yY]*) return 0 ;; - n*) + [nN]*) return 1 ;; esac From nobody Wed Sep 20 17:38:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrQjh6qv3z4txLn; Wed, 20 Sep 2023 17:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrQjh61rcz4fH2; Wed, 20 Sep 2023 17:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695231496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ncsbrzZSUtkDF5LXZMmtHxX/c6BLP8Xq80tsYj7977g=; b=kSAzCpEM70rcXOzCdSQ7WQiFnly2p3ZJnmXwb3LrhBXMIO0zmOELJwymFrMwwx2ib02b7D Jd/JmeLpV2S4cTo0t+UUs0c2TvWi+9Zy9z4U5bFPFEUUy1dMmqB0FBsVDO6koKM1pxhC95 Fx2pWscFuhIoc7Ck2EyZDjFvpP3n40pYR+bWze9pF6qx9AFiuvLk24N3+fhSoTKGPbyO2S MGG9G32BpNmwkdOBjjJ6CNKHul+iR4WiUIE+RbqUFuietRBtQpHXoqFvimExq6pLbf+yuh dk2e54iE7EDRD/xE4i2BcTos3OcxwXPsxT8jIhuFL8zOQUUcaMueDOkpLa/vIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695231496; a=rsa-sha256; cv=none; b=Ree4d0kD6qQ4YlP2itagSdTDfxwAhGeUSWS0ziMkHRWriOjwT9Y7prLPIYB1XeEAIyiA38 BptdTuaUBnhGJtqpJGTEot6B5OhajNonqhAn9/di6/P2f7R3VIhkok+iKVJEjihmLA8/kg GhblpFUVXHmRARzjpaikKlQDYkFrw8OfeTPIRkdOR4EdsRHzHAUbjUeew/cEV7puOEpEaY 7QrZ0n2poADuZqAvarB5xmRgf2SoF9D8uZNMAd42nQswm/EMHSUWtFG7b1ovaWKBcpwfI5 rnZV4ijTUGDRr/ihy4blEy2hmFzwk6ZZysj3bUGvZe7oZP+W4JqvXS36ySn30Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695231496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ncsbrzZSUtkDF5LXZMmtHxX/c6BLP8Xq80tsYj7977g=; b=O1SD57C713GEcrRJLO++RxBNYa46NE2jursg85zHlk4rE311QsTClulsj8HrxkwCQQXue+ BNY6v9wY0kqM6YZlqq5fW2pSuadYu2JO/SSp0UAxAP1LHeTWDuS5occKtaz3k81/IVF7fs yJOXlmiZ8dspkk8JUg/yellOKMNV3HRA4siyOVHVeynymca0LDxyUeyBOeBRlPqEFjvXIU dA9PuyjbU1b+EjeuoQTB9P54cODFB0sGElkqOzxGs7HeJEmAq1BhZTnZNwLZ9VDTvMQw5W oZ+JOE3n10+izYQlcdBPhNnDaDHdZPJm0mesTLKd9WExAUIPeobg0TGb6S1yHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrQjh52Fpz14Wh; Wed, 20 Sep 2023 17:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KHcGnH002246; Wed, 20 Sep 2023 17:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KHcGRU002243; Wed, 20 Sep 2023 17:38:16 GMT (envelope-from git) Date: Wed, 20 Sep 2023 17:38:16 GMT Message-Id: <202309201738.38KHcGRU002243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: e39e6bef6725 - main - arm/allwinner: fix variables initialization in clkng List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e39e6bef6725bde54f94aac7f0cda47c2170dc48 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e39e6bef6725bde54f94aac7f0cda47c2170dc48 commit e39e6bef6725bde54f94aac7f0cda47c2170dc48 Author: Nicolas Provost AuthorDate: 2023-09-20 08:49:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-20 17:37:50 +0000 arm/allwinner: fix variables initialization in clkng Signed-off-by: Nicolas Provost Pull-Request: https://github.com/freebsd/freebsd-src/pull/849 --- sys/arm/allwinner/clkng/aw_clk_m.c | 2 +- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/clkng/aw_clk_m.c b/sys/arm/allwinner/clkng/aw_clk_m.c index 1d3d5a9878f7..2728ff230a9f 100644 --- a/sys/arm/allwinner/clkng/aw_clk_m.c +++ b/sys/arm/allwinner/clkng/aw_clk_m.c @@ -135,7 +135,7 @@ static uint64_t aw_clk_m_find_best(struct aw_clk_m_sc *sc, uint64_t fparent, uint64_t *fout, uint32_t *factor_m) { - uint64_t cur, best; + uint64_t cur, best = 0; uint32_t m, max_m, min_m; *factor_m = 0; diff --git a/sys/arm/allwinner/clkng/aw_clk_nm.c b/sys/arm/allwinner/clkng/aw_clk_nm.c index a1cba2db5f76..61592eb04de1 100644 --- a/sys/arm/allwinner/clkng/aw_clk_nm.c +++ b/sys/arm/allwinner/clkng/aw_clk_nm.c @@ -136,7 +136,7 @@ static uint64_t aw_clk_nm_find_best(struct aw_clk_nm_sc *sc, uint64_t fparent, uint64_t *fout, uint32_t *factor_n, uint32_t *factor_m) { - uint64_t cur, best; + uint64_t cur, best = 0; uint32_t m, n, max_m, max_n, min_m, min_n; *factor_n = *factor_m = 0; From nobody Wed Sep 20 23:28:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrZV22gGQz4vKfC; Wed, 20 Sep 2023 23:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrZV229knz4d85; Wed, 20 Sep 2023 23:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695252522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZfhHX8NxBiu2wG911QwBZTuFQQIdOhS9+3O6g2pm/0=; b=jVyB7uOIZbr9cFnmfPbKcCUctb0A1R8oJV2EUcOcIyJ3HHMK24R3qtV5D23GtiGcyQM76z RVukFrBuxiA/rGgJ8nLAXj0+JkMNy5O1AswQNp22W69uG00WQ+VG1IHjL3zlxzlhMdwvcy pRCWMzR98z6vGLVidAY0EBWG8smyQJIhNlccnYHlQvnDcZv9tP/w6+vDMoEtRGdMm096g1 nVbU1X2NfR9QRjGxC3Vb0o0MmT1XdRqhfHPGYZfKHO9orNVlV5IQDs1lUCBXWF/XhfdV1T g7LA/OmKZfhSyj9f13Jwl3wq5IRp8NGl5FWI/Gw3KTcpzc8PN8Wg0cHaQYw14g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695252522; a=rsa-sha256; cv=none; b=G7mZHI186F4nnnTc8nHJRr5BbtTz+Kodn05YmayExETaI4EfrdcdKX3SL1m7B67j6SA2Tq 5t4WbXRs2bY1tfrOE7vC0JINsSeKHnFAzmxBXhoY3PouTTYnVJho5og+cFrpHB8RgDQHaw 6YL2urzHEYrvJiOWUZ6vk10e9sH8tw6dampBDdD8NWSyI9UqHhtgx7qg1MM/iX9uZpN52v CAsS4APWpjEN8vGtldJjn+OAMAafwiJ7wv6HUa2hwVOedcigrcSmTGotnL6lEfvYKg4wgv H9oZ4g7T6n1rRkUbKcQHHODhz+2HCug2vg9yI4OcWHpPQH1/2jUFDaBtCZZQMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695252522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZfhHX8NxBiu2wG911QwBZTuFQQIdOhS9+3O6g2pm/0=; b=KmPDJFfMS7zt3tsZVLe5vSS6bU0RCgBSha/DGMmNGaB7xT5r/YXhW/WY7J+c+tpyXCnbYF XKgr+LkQsfPf9GvL4HWvSJA8J7wf6M8okobT2fzJG6jTEMxnprHKLEPwMgC7jbu9XP/VSk 05QRwDf46f3iAro2P/HBj+p0LiaFctrWvm6rzvwBGNuX9tiyyMLJ3zTQl87jmBWa6/uVzH LY41FEEpUk4amRAK3i8va/Qf5dx1NxA3YsqM9I5QbKnJk25wsmqkcxsmlIm1E9E5oWBZf+ PHBdrByEQAj7JgqHFRW8hMWtC7AH46+xmST5kkUWuwIKpofB/5uuG3v4TljdGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrZV21CsYzpL; Wed, 20 Sep 2023 23:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KNSgaY090135; Wed, 20 Sep 2023 23:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KNSgI6090132; Wed, 20 Sep 2023 23:28:42 GMT (envelope-from git) Date: Wed, 20 Sep 2023 23:28:42 GMT Message-Id: <202309202328.38KNSgI6090132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: febba4622b60 - main - CONTRIBUTING.md: add author identity info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: febba4622b605bfda0f44ae3c943ccdaa914cdeb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=febba4622b605bfda0f44ae3c943ccdaa914cdeb commit febba4622b605bfda0f44ae3c943ccdaa914cdeb Author: Ed Maste AuthorDate: 2023-09-19 14:12:03 +0000 Commit: Ed Maste CommitDate: 2023-09-20 23:28:28 +0000 CONTRIBUTING.md: add author identity info We do not want @users.noreply.github.com addresses. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41918 --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90c2a4bfab39..62a11d8498c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,6 +75,13 @@ submission does not meet the limited scope for pull requests accepted here. Sometimes it is easier to review a GitHub pull request than to do the review in Phabricator, so that's also allowed. +### Author Name and Email + +We require that contributions are associated with a unique identity. +The author email address should not be `@users.noreply.github.com`. +Do note that your name and email address will become a permanent and immutable +part of the public Git history of the FreeBSD source tree. + ## Style Avoid adding trailing newlines and whitespace. These slow down the integration From nobody Thu Sep 21 00:59:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrcVx0qWBz4vQ6Z; Thu, 21 Sep 2023 00:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrcVx0630z4mYq; Thu, 21 Sep 2023 00:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695257977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UjDQPOXjlgJVQd40zumDTZimFhiO+xNQZzPO95esN7Y=; b=KUREsmk3Vwi0IVcW+kCgNUBlaLKqmPCF2fzBC6e7iRvHLqroQyx2ttKTeFlW/gqTPtEoYi qwxFNM5IHIk5dSIXJLqYc9LPfDRFPxSigCdHMRa05gQpQ/b4wfPKR9xlqQuWFAaw1iTe1q 5AL4Wy9Ppribjzs6eiRN8gyXIpSIgiT93eOdnnHbddoWrxEr95EPYY1zvU3QkU7Zq3TeqQ dDjyebyqre2PNNXNWq/FpicLJM8bV4XfVSGkEHQ3heyJa/xCjF8j6hd3c0geCg9vEKLRen QzzLW8v7mlYSRgFxIl4QWJzauk1f2Kr/FvQA1IGctzrcnhoTpWx14kqw9xcOow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695257977; a=rsa-sha256; cv=none; b=YHL2NUuLiQ3YRSNSrZ1Zp2n1MJR8c8VNSfFCOzC+hw0FGNskumH2/o/BoPfVcme/kLWgU6 zjt4ShIonRHvlzbQBi53EI/EeCD4WkR9h1bkqExy19A+y45ElZwOb+svl0iSwMVuxZoyiC bEO73HgMXyFcdT/vt+ADCCFqdKB6awiJbzD5sV+00b3aMvzruGKygmwTVyWIGgb2A5Ynx0 Onod7rzLzEe3r3ylYk8kG+Z6xR7EEv2rCqGaLMZHeu6V/b+ZUnm2TAGhYFVdqg7o4BeMlW U5VZcmKL2BPtaj+f7ux6F4nIIut3nosjwULpIp/Iihgpg0Jssuhg35oFkOSEKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695257977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UjDQPOXjlgJVQd40zumDTZimFhiO+xNQZzPO95esN7Y=; b=Ym7PA8cn6GZXoU8AmNb/NpWvB8lsEHecdvvrQoJKvAD0X4XLqVSgw/5jugtw9F5g+EVW8n 6OPSEVCDRulMvv7dUiGyF3M+9xemfyECsJFNn20McAlpyJCZ+UdfLIJxO8Z1/xK47WbCqO /J1FAC/wuChbDLHByTIidIsdmX5rfu9c6rH9OHMgNfsDJIBKt1j9gbSS02QA9/kMKO5gIY lQmgFEZPaVLRNS1UXotLTrSIcuB96sHCzQwd6fr3tJATqf7YozfAJ43b3ASyC3yLPlU2c3 JldhU8b4b842NiDj6zTjKGjZxYFrcjYlJoOhJ/g2Xcn4eoNahujd9PJTM08Ehw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrcVw6HWYz3X8; Thu, 21 Sep 2023 00:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38L0xaVi044100; Thu, 21 Sep 2023 00:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L0xadA044097; Thu, 21 Sep 2023 00:59:36 GMT (envelope-from git) Date: Thu, 21 Sep 2023 00:59:36 GMT Message-Id: <202309210059.38L0xadA044097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c584bb9cac16 - main - vfs_remount_ro(): mnt_lockref should be only accessed after vfs_op_enter() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c584bb9cac16bc200ac45cc8b709e7e7e99e24bb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c584bb9cac16bc200ac45cc8b709e7e7e99e24bb commit c584bb9cac16bc200ac45cc8b709e7e7e99e24bb Author: Konstantin Belousov AuthorDate: 2023-09-20 03:42:31 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-21 00:59:11 +0000 vfs_remount_ro(): mnt_lockref should be only accessed after vfs_op_enter() PR: 273953 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_mount.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 45ab9cfc93cc..8364081585f8 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3004,6 +3004,7 @@ vfs_remount_ro(struct mount *mp) struct vnode *vp_covered, *rootvp; int error; + vfs_op_enter(mp); KASSERT(mp->mnt_lockref > 0, ("vfs_remount_ro: mp %p is not busied", mp)); KASSERT((mp->mnt_kern_flag & MNTK_UNMOUNT) == 0, @@ -3012,17 +3013,19 @@ vfs_remount_ro(struct mount *mp) rootvp = NULL; vp_covered = mp->mnt_vnodecovered; error = vget(vp_covered, LK_EXCLUSIVE | LK_NOWAIT); - if (error != 0) + if (error != 0) { + vfs_op_exit(mp); return (error); + } VI_LOCK(vp_covered); if ((vp_covered->v_iflag & VI_MOUNT) != 0) { VI_UNLOCK(vp_covered); vput(vp_covered); + vfs_op_exit(mp); return (EBUSY); } vp_covered->v_iflag |= VI_MOUNT; VI_UNLOCK(vp_covered); - vfs_op_enter(mp); vn_seqc_write_begin(vp_covered); MNT_ILOCK(mp); From nobody Thu Sep 21 04:13:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrhp83shpz4tSCx; Thu, 21 Sep 2023 04:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrhp829jsz3Q1t; Thu, 21 Sep 2023 04:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695269584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PRmpjTtHhSPx+FAXAMmx3eZ8e4hGN6a6Dlnv83dPAzE=; b=YQx5OPVNLxC8BM19LgAY9DFLrnYtfr/XHEdS6sJsULPeL3xoOyhT7qOHIswztQN9TeMJEj RfstS8UnDRNq1m0U7TNwrT2JMv3+zkzQFBRD31lxw+qBSBh12u+UI9SLTnt9CQ4VpEPDOm TaGbQ55qE57oH05F7H99uL044ZbBq/kaGiKksjuAS3rIv8ssMwEr5U2kHX13hgNtUZQji2 ihaV3x4gdd965O+dlGNX3xaPwQWHkrKgas3ByhmMZGQQ4hZ/a7qWg4QT350CoFOVFHtyGv KgkkjOqfXvLQ35LUj+ncnMz90bKX2VNzxU9FRTCMgCd7riudri0zEwmrLukzDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695269584; a=rsa-sha256; cv=none; b=DkPgse6EJr6lk1dY/jJZw05/Bl1SeIW1kMovRFgCuX1qJLFnniq/Obm4uIOfuQ+mKDEUHt MnAiHAD67QG4c5LBJLiEO1g0ahLpx6efACC9uc1wkOp37r6FGbIlZ5OmgJyeI95aoRkIeP QMhLHUy88An7ybCk+ZhF2159uyE1xVUopOHu8UJ7V8nVKY4oQBAMdxyDb+7XjCbSc8M+yl acJpNo/LSm1sm2K/9KaNLaSqyRTu+cGo2uVmhSifRf7eo5nzWuyGxVkwO0FIFohIVKP9YF sYjo/m5gg2rWqNn9fo04xVELHg7esCx64j+VPf4/psX+t4jl/UKy/pqy89XlVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695269584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PRmpjTtHhSPx+FAXAMmx3eZ8e4hGN6a6Dlnv83dPAzE=; b=uEel1XuwQW0Gjy6feHWCldekWlxnmL7L3M/fCREzR9V4T67x93zYWhU/F/iUWPIPKU7N32 5TnRZsjZVMZlQWqY3i0ed1ZpvOHd2UZ/ZadDW6xoYkas+LxBDkqbi5OTJVkzNt9IeuMftq 7suKMC8TYid9m1SR0NcVfntLIZFc4rQq+fMjSVAjJEaLDqwiyx5fb66AdEh9IIuOW/+FBB U9UP4PFudcSYtL49eNMktGeTu+cCszHPCh02pAFuLGSnkwIVsSctcWxm1ExqUgsov9H8Qu OI4itk8p5P6mK0Jf2kCsGqPM4rBu6Dg+n+JOGG1sbHgp3moDNtMflZAyKOTIuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrhp81G28z8FR; Thu, 21 Sep 2023 04:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38L4D4g2076516; Thu, 21 Sep 2023 04:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L4D42w076513; Thu, 21 Sep 2023 04:13:04 GMT (envelope-from git) Date: Thu, 21 Sep 2023 04:13:04 GMT Message-Id: <202309210413.38L4D42w076513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: cf7974fd9e55 - main - sysctl: Update 'master' copy of vnet SYSCTLs on kernel environment variables change List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf7974fd9e554552989237c3d6bc736d672ac7c6 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cf7974fd9e554552989237c3d6bc736d672ac7c6 commit cf7974fd9e554552989237c3d6bc736d672ac7c6 Author: Zhenlei Huang AuthorDate: 2023-09-21 04:11:28 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-21 04:11:28 +0000 sysctl: Update 'master' copy of vnet SYSCTLs on kernel environment variables change Complete phase three of 3da1cf1e88f8. With commit 110113bc086f, vnet sysctl variables can be loader tunable but the feature is limited. When the kernel modules have been initialized, any changes (e.g. via kenv) to kernel environment variable will not affect subsequently created VNETs. This change relexes the limitation by listening on kernel environment variable's set / unset events, and then update the 'master' copy of vnet SYSCTL or restore it to its initial value. With this change, TUNABLE_XXX_FETCH can be greately eliminated for vnet loader tunables. Reviewed by: glebius Fixes: 110113bc086f sysctl(9): Enable vnet sysctl variables to be loader tunable MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41825 --- sys/kern/kern_environment.c | 3 ++ sys/kern/kern_sysctl.c | 107 +++++++++++++++++++++++++++++++++++++++++++- sys/kern/link_elf.c | 2 + sys/kern/link_elf_obj.c | 8 ++++ sys/net/vnet.c | 33 ++++++++++++++ sys/net/vnet.h | 6 +++ sys/sys/eventhandler.h | 5 +++ 7 files changed, 162 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 761734674bdf..a0967d044a96 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -666,6 +667,7 @@ kern_setenv(const char *name, const char *value) kenvp[i + 1] = NULL; mtx_unlock(&kenv_lock); } + EVENTHANDLER_INVOKE(setenv, name); return (0); } @@ -689,6 +691,7 @@ kern_unsetenv(const char *name) kenvp[i] = NULL; mtx_unlock(&kenv_lock); zfree(oldenv, M_KENV); + EVENTHANDLER_INVOKE(unsetenv, name); return (0); } mtx_unlock(&kenv_lock); diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index a1d502d58bff..780eb6099b07 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -127,6 +127,7 @@ static int sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del, int recurse); static int sysctl_old_kernel(struct sysctl_req *, const void *, size_t); static int sysctl_new_kernel(struct sysctl_req *, void *, size_t); +static int name2oid(char *, int *, int *, struct sysctl_oid **); static struct sysctl_oid * sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) @@ -512,8 +513,14 @@ sysctl_register_oid(struct sysctl_oid *oidp) if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE && (oidp->oid_kind & CTLFLAG_TUN) != 0 && (oidp->oid_kind & CTLFLAG_NOFETCH) == 0) { - /* only fetch value once */ - oidp->oid_kind |= CTLFLAG_NOFETCH; +#ifdef VIMAGE + /* + * Can fetch value multiple times for VNET loader tunables. + * Only fetch once for non-VNET loader tunables. + */ + if ((oidp->oid_kind & CTLFLAG_VNET) == 0) +#endif + oidp->oid_kind |= CTLFLAG_NOFETCH; /* try to fetch value from kernel environment */ sysctl_load_tunable_by_oid_locked(oidp); } @@ -969,6 +976,102 @@ sysctl_register_all(void *arg) } SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, NULL); +#ifdef VIMAGE +static void +sysctl_setenv_vnet(void *arg __unused, char *name) +{ + struct sysctl_oid *oidp; + int oid[CTL_MAXNAME]; + int error, nlen; + + SYSCTL_WLOCK(); + error = name2oid(name, oid, &nlen, &oidp); + if (error) + goto out; + + if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE && + (oidp->oid_kind & CTLFLAG_VNET) != 0 && + (oidp->oid_kind & CTLFLAG_TUN) != 0 && + (oidp->oid_kind & CTLFLAG_NOFETCH) == 0) { + /* Update value from kernel environment */ + sysctl_load_tunable_by_oid_locked(oidp); + } +out: + SYSCTL_WUNLOCK(); +} + +static void +sysctl_unsetenv_vnet(void *arg __unused, char *name) +{ + struct sysctl_oid *oidp; + int oid[CTL_MAXNAME]; + int error, nlen; + + SYSCTL_WLOCK(); + /* + * The setenv / unsetenv event handlers are invoked by kern_setenv() / + * kern_unsetenv() without exclusive locks. It is rare but still possible + * that the invoke order of event handlers is different from that of + * kern_setenv() and kern_unsetenv(). + * Re-check environment variable string to make sure it is unset. + */ + if (testenv(name)) + goto out; + error = name2oid(name, oid, &nlen, &oidp); + if (error) + goto out; + + if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE && + (oidp->oid_kind & CTLFLAG_VNET) != 0 && + (oidp->oid_kind & CTLFLAG_TUN) != 0 && + (oidp->oid_kind & CTLFLAG_NOFETCH) == 0) { + size_t size; + + switch (oidp->oid_kind & CTLTYPE) { + case CTLTYPE_INT: + case CTLTYPE_UINT: + size = sizeof(int); + break; + case CTLTYPE_LONG: + case CTLTYPE_ULONG: + size = sizeof(long); + break; + case CTLTYPE_S8: + case CTLTYPE_U8: + size = sizeof(int8_t); + break; + case CTLTYPE_S16: + case CTLTYPE_U16: + size = sizeof(int16_t); + break; + case CTLTYPE_S32: + case CTLTYPE_U32: + size = sizeof(int32_t); + break; + case CTLTYPE_S64: + case CTLTYPE_U64: + size = sizeof(int64_t); + break; + case CTLTYPE_STRING: + MPASS(oidp->oid_arg2 > 0); + size = oidp->oid_arg2; + break; + default: + goto out; + } + vnet_restore_init(oidp->oid_arg1, size); + } +out: + SYSCTL_WUNLOCK(); +} + +/* + * Register the kernel's setenv / unsetenv events. + */ +EVENTHANDLER_DEFINE(setenv, sysctl_setenv_vnet, NULL, EVENTHANDLER_PRI_ANY); +EVENTHANDLER_DEFINE(unsetenv, sysctl_unsetenv_vnet, NULL, EVENTHANDLER_PRI_ANY); +#endif + /* * "Staff-functions" * diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 568f1e1dbd95..eb7ce3828deb 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -506,6 +506,7 @@ link_elf_init(void* arg) TAILQ_INIT(&set_pcpu_list); #ifdef VIMAGE TAILQ_INIT(&set_vnet_list); + vnet_save_init((void *)VNET_START, VNET_STOP - VNET_START); #endif } @@ -767,6 +768,7 @@ parse_vnet(elf_file_t ef) return (ENOSPC); } memcpy((void *)ef->vnet_base, (void *)ef->vnet_start, size); + vnet_save_init((void *)ef->vnet_base, size); elf_set_add(&set_vnet_list, ef->vnet_start, ef->vnet_stop, ef->vnet_base); diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index d4ad963e8181..0b2befc02c1a 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -547,6 +547,8 @@ link_elf_link_preload(linker_class_t cls, const char *filename, memcpy(vnet_data, ef->progtab[pb].addr, ef->progtab[pb].size); ef->progtab[pb].addr = vnet_data; + vnet_save_init(ef->progtab[pb].addr, + ef->progtab[pb].size); #endif } else if ((ef->progtab[pb].name != NULL && strcmp(ef->progtab[pb].name, ".ctors") == 0) || @@ -1120,6 +1122,12 @@ link_elf_load_file(linker_class_t cls, const char *filename, } else bzero(ef->progtab[pb].addr, shdr[i].sh_size); +#ifdef VIMAGE + if (ef->progtab[pb].addr != (void *)mapbase && + strcmp(ef->progtab[pb].name, VNET_SETNAME) == 0) + vnet_save_init(ef->progtab[pb].addr, + ef->progtab[pb].size); +#endif /* Update all symbol values with the offset. */ for (j = 0; j < ef->ddbsymcnt; j++) { es = &ef->ddbsymtab[j]; diff --git a/sys/net/vnet.c b/sys/net/vnet.c index c4a623698341..ac937125a19d 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -178,6 +178,11 @@ static MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data"); */ VNET_DEFINE_STATIC(char, modspace[VNET_MODMIN] __aligned(__alignof(void *))); +/* + * A copy of the initial values of all virtualized global variables. + */ +static uintptr_t vnet_init_var; + /* * Global lists of subsystem constructor and destructors for vnets. They are * registered via VNET_SYSINIT() and VNET_SYSUNINIT(). Both lists are @@ -356,6 +361,7 @@ vnet_data_startup(void *dummy __unused) df->vnd_len = VNET_MODMIN; TAILQ_INSERT_HEAD(&vnet_data_free_head, df, vnd_link); sx_init(&vnet_data_free_lock, "vnet_data alloc lock"); + vnet_init_var = (uintptr_t)malloc(VNET_BYTES, M_VNET_DATA, M_WAITOK); } SYSINIT(vnet_data, SI_SUB_KLD, SI_ORDER_FIRST, vnet_data_startup, NULL); @@ -473,6 +479,33 @@ vnet_data_copy(void *start, int size) VNET_LIST_RUNLOCK(); } +/* + * Save a copy of the initial values of virtualized global variables. + */ +void +vnet_save_init(void *start, size_t size) +{ + MPASS(vnet_init_var != 0); + MPASS(VNET_START <= (uintptr_t)start && + (uintptr_t)start + size <= VNET_STOP); + memcpy((void *)(vnet_init_var + ((uintptr_t)start - VNET_START)), + start, size); +} + +/* + * Restore the 'master' copies of virtualized global variables to theirs + * initial values. + */ +void +vnet_restore_init(void *start, size_t size) +{ + MPASS(vnet_init_var != 0); + MPASS(VNET_START <= (uintptr_t)start && + (uintptr_t)start + size <= VNET_STOP); + memcpy(start, + (void *)(vnet_init_var + ((uintptr_t)start - VNET_START)), size); +} + /* * Support for special SYSINIT handlers registered via VNET_SYSINIT() * and VNET_SYSUNINIT(). diff --git a/sys/net/vnet.h b/sys/net/vnet.h index 1d37fe85eec3..5485889ceaa7 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -311,6 +311,12 @@ void *vnet_data_alloc(int size); void vnet_data_copy(void *start, int size); void vnet_data_free(void *start_arg, int size); +/* + * Interfaces to manipulate the initial values of virtualized global variables. + */ +void vnet_save_init(void *, size_t); +void vnet_restore_init(void *, size_t); + /* * Virtual sysinit mechanism, allowing network stack components to declare * startup and shutdown methods to be run when virtual network stack diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 47024ecf87a9..c0d9811dd1b9 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -326,4 +326,9 @@ struct ifaddr; typedef void (*rt_addrmsg_fn)(void *, struct ifaddr *, int); EVENTHANDLER_DECLARE(rt_addrmsg, rt_addrmsg_fn); +/* Kernel environment variable change event */ +typedef void (*env_change_fn)(void *, const char *); +EVENTHANDLER_DECLARE(setenv, env_change_fn); +EVENTHANDLER_DECLARE(unsetenv, env_change_fn); + #endif /* _SYS_EVENTHANDLER_H_ */ From nobody Thu Sep 21 07:51:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrnfj01LSz4tk0X; Thu, 21 Sep 2023 07:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrnfh6ZjGz4JS9; Thu, 21 Sep 2023 07:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695282716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nx4snmfbGb0a5S1eoULGo0LnEHFRVTDcZ4L3Ca7y/MQ=; b=kppJOmKcTzi8Eee/MZpAx/5dF32C2t+LoS9n7f8FPfAcR1UhPxiPJ6JJY807PBdSlFG7vW AAhxWQRgYsvmIjsCmqhGxarYj53iQIzSLc6JcdYbHNwi40SdoyEjmlnReNfhD1GW3QoZcl v41NdmMYWsUnX3FDm99D/R8RBGa6w7utK8q08OA3tVYhCKNI6nDNRyIOnoM2I11wCcwSez 24HLBnIQdxYPgR6k3qGyvewE9RKn1/Rp9mqNKEp0s8LEptD56DG36v771YxxCCF5/ycdgD rnCf1znlagKoC7xZrdvzV8rLf9tCJMuMe3R91ReA+HH4hdDud7QfzA0Ike5JKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695282716; a=rsa-sha256; cv=none; b=ADc/tiwbuTixaEQc1r93ArUmnJoqo4HqzeU11DloDtcn1IOGiqF6yoTpXfe++DBzrEChWr D2eW3SGr9VOtEpjfXXxXvBiiqxU4OTGkg5XSL+kjdzbJzXEVN2dwz0MzY9rICJEkinjf1w /ge3fbMrg5z8oJ87T/XRkLr6Vv+im4M03dCvuu4IpUr+P3buYB7syuF4GHrom3qxMzeH1C eQ00gjYjwaIr5d96ytxED1sBspYvpwmGC6DnyMBS1tQEU0Pni24Sx8o2uTPLubALvvOubq EumWXBZjo5/9HkhhYzNLx9n9RCmcILioR0Dz0SvRHV6TDJgh2Z0/UczDoQDpnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695282716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nx4snmfbGb0a5S1eoULGo0LnEHFRVTDcZ4L3Ca7y/MQ=; b=myTw4YshS/ghz2RHvhNRGqQiyWIvwD7KcV+Bz+UvDwn3KUida2ml+E9EsppAVCvzBzMveN XakwyYlmtKmBvwbrRlD3tgij/rTHG+nwfvC9/ZjuyO+Iop423AA+Fyu/4mj+g+AouwaZ6j 1lLTu+KtBBHC7+X1VAQcATndP9RntTuZ9+OapGU9drBPE1NfdiAZPB7jW+qcUvUaUoYpmx bfYFoT59C0NdKDach0r6SH3gXB9i944NoCd9pfq30nDPmhjNeHWqrOZoOEuphUp9unnjko ia2GR+wR8UkgxmWXWpe0wPbKMfaEbedg9V0D34yhayXylE9DYW/r8neCOvxckQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrnfh5fPNzWMn; Thu, 21 Sep 2023 07:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38L7puEH039534; Thu, 21 Sep 2023 07:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L7puQi039531; Thu, 21 Sep 2023 07:51:56 GMT (envelope-from git) Date: Thu, 21 Sep 2023 07:51:56 GMT Message-Id: <202309210751.38L7puQi039531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: c0e249d32c78 - main - bsdinstall: avoid conflicts with fd 3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0e249d32c780ee8240fe8b3b8144078a8eec41f Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c0e249d32c780ee8240fe8b3b8144078a8eec41f commit c0e249d32c780ee8240fe8b3b8144078a8eec41f Author: Lars Kellogg-Stedman AuthorDate: 2023-08-15 15:44:02 +0000 Commit: Corvin Köhne CommitDate: 2023-09-21 06:41:48 +0000 bsdinstall: avoid conflicts with fd 3 Throughout the bsdinstall script fd 3 is used by f_dprintf (set through $TERMINAL_STDOUT_PASSTHRU). In several places in the bsdinstalls scripts, we use fd 3 to juggle stdout when calling out to other tools, which can cause the installer to fail with a "Bad file descriptor" error when f_dprintf attempts to use it. This commit replaces all constructs like this: exec 3>&1 SOME_VARIABLE=$(some command 2>&1 1>&3) exec 3>&- With: exec 5>&1 SOME_VARIABLE=$(some command 2>&1 1>&5) exec 5>&- PR: 273148 Reviewed by: corvink Fixes: 1f7746d81f53447ac15cc99395bb714d4dd0a4da ("bsdinstall: stop messing with file descriptors") MFC after: 1 week --- usr.sbin/bsdinstall/scripts/auto | 22 +++++++++++----------- usr.sbin/bsdinstall/scripts/fetchmissingdists | 6 +++--- usr.sbin/bsdinstall/scripts/hardening | 6 +++--- usr.sbin/bsdinstall/scripts/jail | 16 ++++++++-------- usr.sbin/bsdinstall/scripts/mirrorselect | 12 ++++++------ usr.sbin/bsdinstall/scripts/netconfig | 12 ++++++------ usr.sbin/bsdinstall/scripts/netconfig_ipv4 | 6 +++--- usr.sbin/bsdinstall/scripts/netconfig_ipv6 | 6 +++--- usr.sbin/bsdinstall/scripts/script | 13 ++++++------- usr.sbin/bsdinstall/scripts/services | 6 +++--- usr.sbin/bsdinstall/scripts/time | 12 ++++++------ 11 files changed, 58 insertions(+), 59 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index fd5b634696ae..95084f1bdcc3 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -159,13 +159,13 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" if [ -n "$DISTMENU" ]; then - exec 3>&1 + exec 5>&1 EXTRA_DISTS=$( eval dialog \ --backtitle \"$OSNAME Installer\" \ --title \"Distribution Select\" --nocancel --separate-output \ --checklist \"Choose optional system components to install:\" \ 0 0 0 $DISTMENU \ - 2>&1 1>&3 ) + 2>&1 1>&5 ) for dist in $EXTRA_DISTS; do export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" done @@ -301,13 +301,13 @@ case $CURARCH in ;; esac -exec 3>&1 +exec 5>&1 PARTMODE=`echo $PMODES | xargs dialog --backtitle "$OSNAME Installer" \ --title "Partitioning" \ --item-help \ --menu "How would you like to partition your disk?" \ - 0 0 0 2>&1 1>&3` || exit 1 -exec 3>&- + 0 0 0 2>&1 1>&5` || exit 1 +exec 5>&- case "$PARTMODE" in "$msg_auto_zfs") # ZFS @@ -340,10 +340,10 @@ esac [ -f /usr/libexec/bsdinstall/local.pre-fetch ] && f_dprintf "Running local.pre-fetch" && sh /usr/libexec/bsdinstall/local.pre-fetch "$BSDINSTALL_CHROOT" if [ -n "$FETCH_DISTRIBUTIONS" ]; then - exec 3>&1 - export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&3) + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) FETCH_RESULT=$? - exec 3>&- + exec 5>&- [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" fi @@ -371,7 +371,7 @@ fi bsdinstall adduser finalconfig() { - exec 3>&1 + exec 5>&1 REVISIT=$(dialog --backtitle "$OSNAME Installer" \ --title "Final Configuration" --no-cancel --menu \ "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \ @@ -383,8 +383,8 @@ finalconfig() { "Services" "Set daemons to run on startup" \ "System Hardening" "Set security options" \ "Time Zone" "Set system timezone" \ - "Handbook" "Install $OSNAME Handbook (requires network)" 2>&1 1>&3) - exec 3>&- + "Handbook" "Install $OSNAME Handbook (requires network)" 2>&1 1>&5) + exec 5>&- case "$REVISIT" in "Add User") diff --git a/usr.sbin/bsdinstall/scripts/fetchmissingdists b/usr.sbin/bsdinstall/scripts/fetchmissingdists index a1ce9e4e0ca5..d37acc96b92c 100644 --- a/usr.sbin/bsdinstall/scripts/fetchmissingdists +++ b/usr.sbin/bsdinstall/scripts/fetchmissingdists @@ -61,10 +61,10 @@ BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist" mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST" if [ -z "$BSDINSTALL_DISTSITE" ]; then - exec 3>&1 - BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) + exec 5>&1 + BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&5) MIRROR_BUTTON=$? - exec 3>&- + exec 5>&- test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fi diff --git a/usr.sbin/bsdinstall/scripts/hardening b/usr.sbin/bsdinstall/scripts/hardening index b9e259ff1a13..a77fcdeaf540 100755 --- a/usr.sbin/bsdinstall/scripts/hardening +++ b/usr.sbin/bsdinstall/scripts/hardening @@ -34,7 +34,7 @@ echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening echo -n > $BSDINSTALL_TMPETC/sysctl.conf.hardening echo -n > $BSDINSTALL_TMPBOOT/loader.conf.hardening -exec 3>&1 +exec 5>&1 FEATURES=$( bsddialog --backtitle "$OSNAME Installer" \ --title "System Hardening" --nocancel --separate-output \ --checklist "Choose system security hardening options:" \ @@ -49,9 +49,9 @@ FEATURES=$( bsddialog --backtitle "$OSNAME Installer" \ "7 disable_syslogd" "Disable opening Syslogd network socket (disables remote logging)" ${disable_syslogd:-off} \ "8 secure_console" "Enable console password prompt" ${secure_console:-off} \ "9 disable_ddtrace" "Disallow DTrace destructive-mode" ${disable_ddtrace:-off} \ -2>&1 1>&3 ) +2>&1 1>&5 ) retval=$? -exec 3>&- +exec 5>&- if [ $retval -ne $BSDDIALOG_OK ]; then exit 1 diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index e5822087e97b..ab095f44ba39 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -66,10 +66,10 @@ fi test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST -a -z "$BSDINSTALL_DISTSITE" ]; then - exec 3>&1 - BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) + exec 5>&1 + BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&5) MIRROR_BUTTON=$? - exec 3>&- + exec 5>&- test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error "Could not download $BSDINSTALL_DISTSITE/MANIFEST" @@ -81,13 +81,13 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then if [ ! "$nonInteractive" == "YES" ] then - exec 3>&1 + exec 5>&1 EXTRA_DISTS=$(echo $DISTMENU | xargs -o bsddialog \ --backtitle "$OSNAME Installer" \ --title "Distribution Select" --no-cancel --separate-output \ --checklist "Choose optional system components to install:" \ 0 0 0 \ - 2>&1 1>&3) + 2>&1 1>&5) for dist in $EXTRA_DISTS; do export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" done @@ -103,10 +103,10 @@ done FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS` # Trim white space if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$BSDINSTALL_DISTSITE" ]; then - exec 3>&1 - BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3) + exec 5>&1 + BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&5) MIRROR_BUTTON=$? - exec 3>&- + exec 5>&- test $MIRROR_BUTTON -eq 0 || error "No mirror selected" export BSDINSTALL_DISTSITE fi diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 82a726c009b6..901f816206ba 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -35,7 +35,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig" : ${BSDDIALOG_ESC=5} : ${BSDDIALOG_ERROR=255} -exec 3>&1 +exec 5>&1 MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ @@ -88,9 +88,9 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ ftp://ftp5.us.freebsd.org "USA #5 - IPv6"\ ftp://ftp11.us.freebsd.org "USA #11 - IPv6"\ ftp://ftp14.us.freebsd.org "USA #14"\ - 2>&1 1>&3` + 2>&1 1>&5` MIRROR_BUTTON=$? -exec 3>&- +exec 5>&- _UNAME_R=`uname -r` _UNAME_R=${_UNAME_R%-p*} @@ -113,13 +113,13 @@ $BSDDIALOG_ERROR | $BSDDIALOG_CANCEL | $BSDDIALOG_ESC) $BSDDIALOG_OK) ;; $BSDDIALOG_EXTRA) - exec 3>&1 + exec 5>&1 BSDINSTALL_DISTSITE=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" \ --inputbox "Please enter the URL to an alternate $OSNAME mirror:" \ - 0 74 "$BSDINSTALL_DISTSITE" 2>&1 1>&3` + 0 74 "$BSDINSTALL_DISTSITE" 2>&1 1>&5` MIRROR_BUTTON=$? - exec 3>&- + exec 5>&- test $MIRROR_BUTTON -eq $BSDDIALOG_OK || exec $0 $@ ;; esac diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index bdbbd42b3328..99c129ab61f5 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -71,10 +71,10 @@ if [ -z "$INTERFACES" ]; then exit 1 fi -exec 3>&1 -INTERFACE=`echo $BSDDIALOG_ITEMS | xargs -o bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' --menu 'Please select a network interface to configure:' 0 0 0 2>&1 1>&3` +exec 5>&1 +INTERFACE=`echo $BSDDIALOG_ITEMS | xargs -o bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' --menu 'Please select a network interface to configure:' 0 0 0 2>&1 1>&5` if [ $? -eq $BSDDIALOG_CANCEL ]; then exit 1; fi -exec 3>&- +exec 5>&- : > $BSDINSTALL_TMPETC/._rc.conf.net @@ -182,13 +182,13 @@ else exit 0 fi -exec 3>&1 +exec 5>&1 RESOLV=$(echo "${RESOLV}" | xargs -o bsddialog --backtitle "$OSNAME Installer" \ --title 'Network Configuration' \ --mixedform 'Resolver Configuration' 0 0 0 \ -2>&1 1>&3) +2>&1 1>&5) if [ $? -eq $BSDDIALOG_CANCEL ]; then exec $0; fi -exec 3>&- +exec 5>&- echo ${RESOLV} | tr ' ' '\n' | \ awk ' diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 index 7be4a59194c5..3da1803cd0d1 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 +++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 @@ -71,14 +71,14 @@ IP_ADDRESS=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $2); }'` NETMASK=`ifconfig $INTERFACE inet | awk '/inet/ {printf("%s\n", $4); }'` ROUTER=`netstat -rn -f inet | awk '/default/ {printf("%s\n", $2);}'` -exec 3>&1 +exec 5>&1 IF_CONFIG=$(bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' --form 'Static Network Interface Configuration' 0 0 0 \ 'IP Address' 1 1 "$IP_ADDRESS" 1 20 16 0 \ 'Subnet Mask' 2 1 "$NETMASK" 2 20 16 0 \ 'Default Router' 3 1 "$ROUTER" 3 20 16 0 \ -2>&1 1>&3) +2>&1 1>&5) if [ $? -eq $BSDDIALOG_CANCEL ]; then exit 1; fi -exec 3>&- +exec 5>&- echo $INTERFACE $IF_CONFIG | awk -v prefix="$IFCONFIG_PREFIX" '{ diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 b/usr.sbin/bsdinstall/scripts/netconfig_ipv6 index f2d864c539c4..00ef8791de4b 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 +++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv6 @@ -107,13 +107,13 @@ END { printf "\"Default Router\" %d 1 \"%s\" %d 16 50 50 0 ", n, dfr, n; }'` -exec 3>&1 +exec 5>&1 IF_CONFIG=$(echo ${ADDRS} | xargs -o bsddialog --backtitle "$OSNAME Installer" \ --title 'Network Configuration' \ --mixedform 'Static IPv6 Network Interface Configuration' 0 0 0 \ -2>&1 1>&3) +2>&1 1>&5) if [ $? -eq $BSDDIALOG_CANCEL ]; then exit 1; fi -exec 3>&- +exec 5>&- echo ${IF_CONFIG} | tr ' ' '\n' | \ awk -v iface="${INTERFACE}" ' diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 1c617835c274..ae1c6b3011fa 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -114,13 +114,12 @@ fi bsdinstall mount # Fetch missing distribution files, if any -( - exec 3>&1 - export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&3) - FETCH_RESULT=$? - exec 3>&- - return $FETCH_RESULT -) || error "Could not fetch remote distributions" +exec 5>&1 +export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) +FETCH_RESULT=$? +exec 5>&- + +[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" # Unpack distributions bsdinstall checksum diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services index 025aaa444cd1..93282effbb3f 100755 --- a/usr.sbin/bsdinstall/scripts/services +++ b/usr.sbin/bsdinstall/scripts/services @@ -40,7 +40,7 @@ fi echo -n > $BSDINSTALL_TMPETC/rc.conf.services -exec 3>&1 +exec 5>&1 DAEMONS=$( bsddialog --backtitle "$OSNAME Installer" \ --title "System Configuration" --no-cancel --separate-output \ --checklist "Choose the services you would like to be started at boot:" \ @@ -55,9 +55,9 @@ DAEMONS=$( bsddialog --backtitle "$OSNAME Installer" \ powerd "Adjust CPU frequency dynamically if supported" \ ${powerd_enable:-off} \ dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \ -2>&1 1>&3 ) +2>&1 1>&5 ) retval=$? -exec 3>&- +exec 5>&- if [ $retval -ne $BSDDIALOG_OK ]; then exit 1 diff --git a/usr.sbin/bsdinstall/scripts/time b/usr.sbin/bsdinstall/scripts/time index bba58d291cbd..1d66fa4d5fcf 100755 --- a/usr.sbin/bsdinstall/scripts/time +++ b/usr.sbin/bsdinstall/scripts/time @@ -37,7 +37,7 @@ TZ="${BSDINSTALL_CHROOT}/etc/localtime" export TZ # Set date -exec 3>&1 +exec 5>&1 DATE=$(bsddialog --backtitle "$OSNAME Installer" \ --title 'Time & Date' \ --ok-label 'Set Date' \ @@ -45,11 +45,11 @@ DATE=$(bsddialog --backtitle "$OSNAME Installer" \ --default-no \ --date-format '%Y%m%d%H%M.%S' \ --datebox '' 0 40 \ -2>&1 1>&3) && date $DATE -exec 3>&- +2>&1 1>&5) && date $DATE +exec 5>&- # Set time -exec 3>&1 +exec 5>&1 TIME=$(bsddialog --backtitle "$OSNAME Installer" \ --title 'Time & Date' \ --ok-label 'Set Time' \ @@ -57,8 +57,8 @@ TIME=$(bsddialog --backtitle "$OSNAME Installer" \ --default-no \ --time-format '%H%M.%S' \ --timebox '' 0 40 \ -2>&1 1>&3) && date $TIME -exec 3>&- +2>&1 1>&5) && date $TIME +exec 5>&- # Switch back if [ -n "$saved_TZ" ]; then From nobody Thu Sep 21 09:27:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrqnd1ncKz4tqjN; Thu, 21 Sep 2023 09:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrqnc6vSVz4VhB; Thu, 21 Sep 2023 09:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695288484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u17C3gdlQUrc4OybqJJs6fO2fDOwYLZvMdgQLrz8jCM=; b=LuQz7pY+ypwas9ZhVpWUOaRkWko0Pzg7rrWfAZAAVLsfTVcnrkF34bfACJZFwHCC+rcR29 XKJcXl9g9++KIkysvtrrkKEBWlhbhqKMZhy0lIfuBYgd5hiwSert7P7bC8Dtv0v/d5ulK/ IlEKJoH3V9tDCamdicXlcoBFVcBhGt14wG36oqSCoN+vUPQgfpq2KqWWuvYIqXptt9tyO1 sCBONWgZWXajG6FDk/f4uK8HdPupsOGidM7QYCoKcA132Jt2u0Muz+q6GAdiw/ujH5zpi+ 7g/gstHGNwoy1hU10ZcFIfyGAa19A4DjC3+/UOLRQd2f+JMW0gFrvrET8wpr1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695288484; a=rsa-sha256; cv=none; b=cY+ARaW72SOhUwYVMYsFayRmDxyeBCxCA90JHE6U9iPlp4TMmBTpjrOAvQyvo9K+0W+XWI G6hGekWZoMYsw/UJLEuom2WiDuwg82/9RQGF4sgAxJcBpkGZxLjCEVeHItSF/9/c/YVBP0 UhHlY9vIYvRG271moYQaIQVHgyV8Quq0Lyl/khs+X64gtohNSnEKp/ZGTwgSK0rTU8I1F8 uOB0p8uC1dKByC/OUwv/Q5eyupgGzbinQgMuzTZK2cPJ7zdbG4sBrepRtOWfZ/lf+U3xCd Tun8vGGUG2wStVhUgpCet+9M/uZ9/Rn4q7wvB/ad+739z99p1xAiF+hHeu25kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695288484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u17C3gdlQUrc4OybqJJs6fO2fDOwYLZvMdgQLrz8jCM=; b=x79PRHnnV+m4CcYoGDXfVTeWBOqBGY49iQogfSY71iO2uVu1qF88saxlrxsMb5I6iGJ2ut 2RNOwuieaATP38r2aXNH+eKefFwWMguOVb07PDHlgAuYVbGkeIDRh9IY4LG5J9ETclJtA4 1GQ0VY3nRzG2TQDv0YlOUaySwj+Xr0ghvBXQv3XgYPdzZk/Y/+x6y0Jk3Hztb4TRE2KDXq //vak/K8SDrQTd0M3adaT2TOH67KTIQnNZn7wMaL6bzxVO6ejk0Bopy+bsHrWuhUnohnT4 lu3Kj905yIO4kQZixsOBQB7KF5nUOzs+X6XilPFll0bZ/BQVQOeU4ds8DzY2tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrqnc5y72zYC6; Thu, 21 Sep 2023 09:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38L9S4xm091644; Thu, 21 Sep 2023 09:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L9Rwp2091623; Thu, 21 Sep 2023 09:27:58 GMT (envelope-from git) Date: Thu, 21 Sep 2023 09:27:58 GMT Message-Id: <202309210927.38L9Rwp2091623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: cbfe997563d2 - main - zfs: merge openzfs/zfs@4647353c8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbfe997563d24cdbfe77d1763f2582fbace3ee2f Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=cbfe997563d24cdbfe77d1763f2582fbace3ee2f commit cbfe997563d24cdbfe77d1763f2582fbace3ee2f Merge: c0e249d32c78 4647353c8b2b Author: Martin Matuska AuthorDate: 2023-09-21 09:25:53 +0000 Commit: Martin Matuska CommitDate: 2023-09-21 09:27:28 +0000 zfs: merge openzfs/zfs@4647353c8 Notable upstream pull request merges: #15240 bbac1d297 Update the behavior of mountpoint property #15240 c63aabaf1 Improve the handling of sharesmb,sharenfs properties #15248 741c215ba Fix l2arc_apply_transforms ztest crash #15274 ee720ad7b Retire z_nr_znodes #15278 90149552b ZIL: Fix potential race on flush deferring #15279 e923bcd16 Update the MOS directory on spa_upgrade_errlog() #15281 529bec7d7 zed: Allow autoreplace and fault LEDs for removed vdevs #15288 7228ba111 cmd: add 'help' subcommand to zpool and zfs #15297 4647353c8 status: report pool suspension state under failmode=continue Obtained from: OpenZFS OpenZFS commit: 4647353c8b2b5ca506da45bb9b01e1f3ef521847 sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 1 + .../openzfs/cmd/zed/zed.d/statechange-led.sh | 2 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 36 +++++++++++++++-- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 31 ++++++++++++++ sys/contrib/openzfs/cmd/ztest.c | 2 +- .../openzfs/include/os/freebsd/spl/sys/debug.h | 40 +++++++++++------- .../openzfs/include/os/linux/spl/sys/debug.h | 38 +++++++++++------ .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 1 - sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 3 +- sys/contrib/openzfs/lib/libshare/os/linux/nfs.c | 47 ++++++++++++++++++++-- sys/contrib/openzfs/lib/libspl/include/assert.h | 15 ++++++- sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 19 +++++---- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 3 +- sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c | 10 +++-- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 8 ++-- sys/contrib/openzfs/module/Makefile.in | 2 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 1 - .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 7 ++-- .../openzfs/module/os/linux/zfs/zfs_znode.c | 2 - sys/contrib/openzfs/module/zfs/arc.c | 11 ++--- sys/contrib/openzfs/module/zfs/dbuf.c | 2 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 9 +++++ sys/contrib/openzfs/module/zfs/spa_misc.c | 4 +- sys/contrib/openzfs/module/zfs/zil.c | 9 +++++ .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../cli_root/zfs_mount/zfs_mount_006_pos.ksh | 2 +- .../cli_root/zfs_mount/zfs_mount_008_pos.ksh | 4 +- .../cli_root/zfs_mount/zfs_mount_012_pos.ksh | 15 ++++--- .../cli_root/zfs_program/zfs_program_json.ksh | 4 +- .../cli_root/zfs_set/mountpoint_002_pos.ksh | 12 ++++-- .../cli_root/zfs_set/zfs_set_003_neg.ksh | 10 +++-- sys/modules/zfs/zfs_config.h | 6 +-- sys/modules/zfs/zfs_gitrev.h | 2 +- 34 files changed, 264 insertions(+), 98 deletions(-) diff --cc sys/modules/zfs/zfs_config.h index 55cb3596bc17,000000000000..f0c1dd4726a8 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1134 -1,0 +1,1134 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->copy_file_range() is available */ +/* #undef HAVE_VFS_COPY_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* file_operations_extend takes .copy_file_range() and .clone_file_range() */ +/* #undef HAVE_VFS_FILE_OPERATIONS_EXTEND */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ +/* #undef HAVE_VFS_ITERATE_SHARED */ + *** 228 LINES SKIPPED *** From nobody Thu Sep 21 09:47:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrrDG5Zvyz4tsGF; Thu, 21 Sep 2023 09:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrrDG54X5z4Wws; Thu, 21 Sep 2023 09:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695289662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2ZieZEnLPrCpM+mKcD0AJJTvFZRKZaH0m0NIi1y7+8=; b=AvW5h8cuxYeeAKI8DGLXpM9zdQ4ezRiIsHF2/ZvryWOL9ziQoCTADN4MWFNKHlnxVwYAUp qtdRHdQobH3bijTGZOsSwtBAZqnzl0kJpy92uCcbfgVhegnwI5J6RI5TTLQfuRJuDdhN3c 1V0Dai0jawEoBGyGP8uc10okMMRBHgBgaxZbDKmh8CCoQ18NmE2RpXgMVItO7pkWetkfS1 IJJfgsBiUfVhQn4xyfbVmN+A96ICtuGEgJX72d3SkeT5G58Fxnf8l+7jQEgtIWMzAZ9/Tt Drsvc3CoPSsz01QRk0iOph8vNEBntBFxF7M6tl9hd9UO9pTYKp12sbaTTzn2OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695289662; a=rsa-sha256; cv=none; b=xNEXUR4eshJ5oDrmgKv9O2yUK3SuNwj2AxpWjZ+52v/WlacVkNisWikynDvEwNRgsWqUce TR7NvznfW2A33+0BqJ1AG7Nawu67DM9Xc2Kxqqdx2Se8sPB4PpQJE/oXVqN0WQ5VAWB0eT c1cs51BYw8uQS1t+ZWRrvdQPVdAaOwYtUtTQ1Xf6pgTmrxjQqfbLLap5slQVAR88QwX60v wImYWafdO/qsAnbuDWrzbzcspfCMZuL3PcUM9mgzNxH9TmN0keKM/5lTpot0Iy19VI2JDb vLqH9zYsF8ebFRkUtdVl7SyGm+6e812PMQ5X0Ob9kDngwL2LAngMpndaKlTXYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695289662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2ZieZEnLPrCpM+mKcD0AJJTvFZRKZaH0m0NIi1y7+8=; b=rMWPpT9BSSVxadsHWJpjMTIzDvNmUHPOcYuAJg+HbdD3hrT1bF4YTvtBZOfqYUGDE4fdlM lEp+YB1vtuc2bZVABODLproNU7TmhfHM3M/bDI69QnGwgzEnNfSo/MwFlG8rwkD3/NildA s84VqG5j0HiMp13h40TxhE7f572U1Dzm7D6wO5gdCwhddQ19oWff9Qc0AGWBAfNFYXLOG5 yZPRjd7dR/FMhKl4JEWhAW2ojH/YxrgzSPQpoqkpX71zOvvYyROPfSUkNGwbhTyeBXYXeD TpjpLRbzTKUwE9W4YZtX5JaUoqwpcqMkwAPdiWJYrZwJH/kP+xPjZV+p3ZaEGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrrDG47NhzZRw; Thu, 21 Sep 2023 09:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38L9lght025248; Thu, 21 Sep 2023 09:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L9lgu0025245; Thu, 21 Sep 2023 09:47:42 GMT (envelope-from git) Date: Thu, 21 Sep 2023 09:47:42 GMT Message-Id: <202309210947.38L9lgu0025245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 843bea18711d - main - arm64: Move all BP hardening quirks later List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 843bea18711d726cd2f0a3c3f9144b218e4de3e8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=843bea18711d726cd2f0a3c3f9144b218e4de3e8 commit 843bea18711d726cd2f0a3c3f9144b218e4de3e8 Author: Andrew Turner AuthorDate: 2023-09-21 09:32:55 +0000 Commit: Andrew Turner CommitDate: 2023-09-21 09:32:55 +0000 arm64: Move all BP hardening quirks later Some quirks were missed due to the change being initially written on a branch where they are all merged. Move all calls to install_psci_bp_hardening until after device drivers have attached. Sponsored by: Arm Ltd --- sys/arm64/arm64/cpu_errata.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm64/arm64/cpu_errata.c b/sys/arm64/arm64/cpu_errata.c index 6c294ff1237c..fee22240bb0e 100644 --- a/sys/arm64/arm64/cpu_errata.c +++ b/sys/arm64/arm64/cpu_errata.c @@ -67,21 +67,25 @@ static struct cpu_quirks cpu_quirks[] = { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, .midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A57,0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, .midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A72,0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, .midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A73,0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, .midr_value = CPU_ID_RAW(CPU_IMPL_ARM, CPU_PART_CORTEX_A75,0,0), .quirk_install = install_psci_bp_hardening, + .flags = CPU_QUIRK_POST_DEVICE, }, { .midr_mask = CPU_IMPL_MASK | CPU_PART_MASK, From nobody Thu Sep 21 10:53:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrsgw74Gwz4txBd; Thu, 21 Sep 2023 10:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrsgw6ZPQz4fMd; Thu, 21 Sep 2023 10:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695293596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG1pWiZIDFF9NQRSnpIu8W7RZpcmA69lhisDvmkW/M4=; b=UReHIrBgd8gVwwW8E8be+qbj/ZqIQN2mN7mMcvmwVfgIoIrfn/z+VQlJE0BIY3JwmDy95h Lgzt8uJBXx39WoJ1p++eAhdZsWiYqyQsF3kPke1WuqY5HrFSQEev4NEKhcEipoHq0Gz9A1 rn0uGNCxszdkB+kyqWpZBTcuzxMfCpFk1CEHqQpZQPmFbjAU9ACsTDR1Heu9rhtlzX7XK2 1NHLArhZCbtzWQe/1RHIIlMl1aSWE8yK/AOLYaKHirPQAWfLMPdSDxCgrNxls6zCbK0jV6 QcWAF2RxFzCVO5/hmWcHyZSBG8n48jlLJC749GkXePDssFLUKH9zI3Y+Yb1W6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695293596; a=rsa-sha256; cv=none; b=eX8WuUszzMg/GC7YVsUWCQdxhvqIHaXn1DRSc9ehnMDYJ/so+ZsK1YK9+VIoYiNToKgylL 33aviKdL0EXcaeIZmX4jhMDipwddF5w3ogo6s0RlpND9Chl0gBMgBaHuVjwClyeVv+hm+7 CkhW0XAQr9M88lX/Qzz1d8PX46uv5KMEXUMF7T3pFTqA/jZwL2Ss6NClnBwmoBHpZcs6oT bSv/OmSOvgJlsH9vWHtbWh18hIVOzrSlrDpy1hRwWJ7di/GtEsGudk5J04gkytHJNocm7a pKaRXjWXJfh1lU02m8dYr0w3UUkxcRafsijRoYwJo3Vnfd//CJKDybvc6lzjeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695293596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG1pWiZIDFF9NQRSnpIu8W7RZpcmA69lhisDvmkW/M4=; b=rvP7bxYSzYCTo3LBXVc2oOrULBUTPuAaVimrsaulhRJFqEJdcVy1u5OKHoUeDOem0YYx/1 cL7T9DXsRnOry+1Kp0vbSI+doit/2XEo310eIHp1bvqEUlEBuHaH/grTzO95OBDrGeIs7y KHvHRhwuA34EV0ZfrteiGop+YtDUSE3L63Did4tFv3KJ8LkOGG0SGQeFK8/zoi0Gj8u5zK neVaBX5nsCrnBUdmc/PY3IZswaPH10pq7OMuRjnARy4JjYV0g9BKxHSMkr6Vr518nb8NBf +CjfIFphPUCtmfC1Y+GXCzXyA5kYGMCB+8FHMn0Q5lwqVxXV5fw8YQkGTKhsxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrsgw5dPLzbQd; Thu, 21 Sep 2023 10:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LArGpQ040650; Thu, 21 Sep 2023 10:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LArGMN040647; Thu, 21 Sep 2023 10:53:16 GMT (envelope-from git) Date: Thu, 21 Sep 2023 10:53:16 GMT Message-Id: <202309211053.38LArGMN040647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 4386935191c5 - main - vtgpu: Fix the physical memory size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4386935191c576fa62a52d52734e264fe8329a67 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4386935191c576fa62a52d52734e264fe8329a67 commit 4386935191c576fa62a52d52734e264fe8329a67 Author: Andrew Turner AuthorDate: 2023-09-21 10:50:29 +0000 Commit: Andrew Turner CommitDate: 2023-09-21 10:50:29 +0000 vtgpu: Fix the physical memory size Use the correct endian switching function when switching to a little endian 64-bit address. Even on a little-endian machine this will truncate the address to a 32-bit value. Sponsored by: Arm Ltd --- sys/dev/virtio/gpu/virtio_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 0009d7bb3ec1..f18eef985cc6 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -565,7 +565,7 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); s.req.backing.nr_entries = htole32(1); - s.req.mem[0].addr = htole32(sc->vtgpu_fb_info.fb_pbase); + s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase); s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, From nobody Thu Sep 21 10:54:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrsjj754Mz4txBl; Thu, 21 Sep 2023 10:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrsjj6CD4z4fGK; Thu, 21 Sep 2023 10:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695293689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56sth2Jk8i/KRZj/Ecozgx0Td/TcdpZvvGnMGfspu74=; b=SAZfzlyZv3PB+VsxBjQhhuI7975RsgQBd+RvGeuHXJeuKAJzZHMKpnXbWL5JszTAqKHvPw HA2kgc/DgO20R3py1zNI97vETztPmH85zhKZs3XSZEfo1R5q2ANocUgXfiorc0Ob56R+E6 OC0SAUmbGCBDzCS1to/VCxPIFJMaF8kj9WsMSWyzkSTlvlcSHjdsFlgBpYrZGTTDYuSju5 h0kKUc3Oi2N7mW/wl4UHvzLTCR52OSQTjUdXoqONJBk5q16eFyXZ4yPzNGxLiI94j/gy9E Xvo1cdfqW4jH7+nPkhmc2/tq0RNrdW/pT1TqRjYYluGKmN4SlBxsQvZT1MUNFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695293689; a=rsa-sha256; cv=none; b=FnsYBrZesQg0zriAUjn5y0dJwTO8S1FLEvjSvicWLKEb2kii7zhdgA0Fuz8wzQiXDw8kgF NGGk4PVXVzbC+DvmUshIHdF+IaBdKlZjxEZFcJ2MYYi7frW5Lc7xUFI4u+eg8UY9gTLbIE t8DmF2p0N5Edgf5Y3NOvATvFCTNGgSDClxCmyEOz5BjRlnH6UXAebzNQipIAcV/em5TTUJ n/c6zwapS1r9oi4+SXLms2NegbpCXhCf95I20lDuVix63PKjuYFjjCADDxtMeq8kiVgSxS dhJ6vzaXb7zORdgcWuzPLJ9fYymRLwGkT1MZ9INUFTClV5oBKTLMx6BRxXuXtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695293689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=56sth2Jk8i/KRZj/Ecozgx0Td/TcdpZvvGnMGfspu74=; b=qJEm53TMterbU8By2YyZhiRWpK3ZEzqFWzY3P9Nc25N4d6Ag4xnQiHF4WhKTzLlloulKle pneFUnBwTwxIqcu0a/pxZJkIlVtAxp9Ghi4SZrl3WJPzOtZLk91X8G99M9VFMdsXtTHsuc pG/BMYi9smJGIltqwwHnJ3hd7ZvZggocAyzgfvW7qrL5MotdXuwXo0lSAY9JfsYEqqfeiR ua6UOrvzQ2zLL8VHxQjBTJFcprnN8SHTD37E1lUIZ+iKArjMWPzlrKehxtiDWGx9SHrZzQ 1CHcEw4CfSaUahNwOtRGJLeNaO/+aDmC5s4Lp+SpWGxIQugvWLUQYbC5DlJbxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrsjj4z4SzbSQ; Thu, 21 Sep 2023 10:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LAsnsa040979; Thu, 21 Sep 2023 10:54:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LAsnXq040976; Thu, 21 Sep 2023 10:54:49 GMT (envelope-from git) Date: Thu, 21 Sep 2023 10:54:49 GMT Message-Id: <202309211054.38LAsnXq040976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 159599c4a2bb - main - msgdef: fix NO and SI locales List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e Auto-Submitted: auto-generated The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e commit 159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e Author: Yuri Pankov AuthorDate: 2023-09-21 10:45:54 +0000 Commit: Yuri Pankov CommitDate: 2023-09-21 10:54:21 +0000 msgdef: fix NO and SI locales Fix circular symlinks by providing separate source for nn_NO.ISO8859-1, nn_NO.ISO8859-15, and sl_SI.ISO8859-2 (re)generated from CLDR. PR: 260841 Reviewed by: imp (previous version) Fixes: 0a36787e4c1f ("locales: separate unicode from other locales") Differential Revision: https://reviews.freebsd.org/D41899 --- share/msgdef/Makefile | 5 ++--- share/msgdef/nn_NO.ISO8859-15.src | 8 ++++++++ share/msgdef/sl_SI.ISO8859-2.src | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index cf268c72d783..e52e02e4adf9 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MESSAGES @@ -28,6 +27,7 @@ LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R LOCALES+= sk_SK.ISO8859-2 +LOCALES+= sl_SI.ISO8859-2 LOCALES+= sr_RS.ISO8859-5 LOCALES+= tr_TR.ISO8859-9 LOCALES+= uk_UA.CP1251 @@ -47,6 +47,7 @@ LOCALES+= fr_FR.ISO8859-15 LOCALES+= hu_HU.ISO8859-2 LOCALES+= ro_RO.ISO8859-2 LOCALES+= nb_NO.ISO8859-15 +LOCALES+= nn_NO.ISO8859-15 LOCALES+= lt_LT.ISO8859-13 LOCALES+= pl_PL.ISO8859-2 @@ -105,13 +106,11 @@ SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-1 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-1 -SAME+= sr_RS.ISO8859-2 sl_SI.ISO8859-2 SAME+= is_IS.ISO8859-15 is_IS.ISO8859-1 SAME+= it_IT.ISO8859-15 it_IT.ISO8859-1 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-15 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-1 SAME+= nb_NO.ISO8859-15 nb_NO.ISO8859-1 -SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-15 SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_PT.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_BR.ISO8859-1 diff --git a/share/msgdef/nn_NO.ISO8859-15.src b/share/msgdef/nn_NO.ISO8859-15.src new file mode 100644 index 000000000000..4dd2bca424d6 --- /dev/null +++ b/share/msgdef/nn_NO.ISO8859-15.src @@ -0,0 +1,8 @@ +# yesexpr +^(([jJ]([aA])?)|([jJ])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE][iI])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +ja:j:JA:J:yes:y:YES:Y +# nostr +nei:n:NEI:N:no:n:NO:N diff --git a/share/msgdef/sl_SI.ISO8859-2.src b/share/msgdef/sl_SI.ISO8859-2.src new file mode 100644 index 000000000000..a52851e8b8e4 --- /dev/null +++ b/share/msgdef/sl_SI.ISO8859-2.src @@ -0,0 +1,8 @@ +# yesexpr +^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +da:d:DA:D:yes:y:YES:Y +# nostr +ne:n:NE:N:no:n:NO:N From nobody Thu Sep 21 14:03:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rrxtx0KfBz4vBTy; Thu, 21 Sep 2023 14:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rrxtw6xQYz3Zx2; Thu, 21 Sep 2023 14:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695304985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xbIBREcyHU1kivM9SUk/ECiRd5t6JhBJyCLZCUl5Jo=; b=gG+pDIQCD+bgj9P2a/AA7F8c3/ENVZmDa9eEHUstRc2vDnSyemoDuSDJldiL21i08NthVC qdyGoze9P/EgZQYDrTlLGmPMnx0vLZQsQS/PQ0IE1aLyMyDLFU6a5sDQmFuGQ4sSHfcxHd UWr+vHR9IPmVnk8HyXafkNQq1BA/mFjNmnhiOu+ln+VTeQFCOueqpD0wRz1rD+J9BqjrAo +OIH2jQfXYuRj7jgehaFAwzsAktdoa04he9aL+Po1fTzY3B38nwq9cg9cV9F9+MZAxU6Qb yQ/EzB5fAfWhCJR45S8TjPniyw7TTX7J3sxS8lsN2Lz3wW0CmcQSx9n4YuvQlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695304985; a=rsa-sha256; cv=none; b=sVhfu2CmWgu27AqZb/qvp0Hkm0Y1eY5GYT04YYMrY0N/lItDPWp66K8fObahH7u/GzRPLr AGJIYK9JU6bY2zyzjyXkwvY8+gSHjVMLZoo5g42nW81M7HPATE+eJiYBRbgjlikE31GoEe fKPkgnZpxDIlhNz12WU14h/V9i++8IeqjBrjuZmQJRnEZUbA5s9m/WmWez66Rv7bLcqclu XCIjFMdUYMc92aTtuCYp/kDQfSuL+FzeFRyu4TOPyK6S8niO/I/wUjPKFyJNYR9oJ3Dqjc Iz7VctJGIugfJB4B2Zik37nBTmfLx/o7K+dxFPisZetEYXtyoF+RxoKR3LB+hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695304985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xbIBREcyHU1kivM9SUk/ECiRd5t6JhBJyCLZCUl5Jo=; b=yI6LRRJ5vaagc6r1EQYX3ENkXe1wzoA0n2+xr6WCYHyQYODVH6bP5WWEjeDTF2qVx+C6mn y5xDyXnzrqkjj8rcAcdI3JIzBgLc40r+8wujsTbRF26OKsnEVkA177eOS1JedKmEG4A8C1 ywsA+U20zb3lAEsmT1mfTmuk8YENLEDaovkDt1hpWrThIdIBBpJzILI2fENcSLqwriW1bm MYrVFvM53Xn4P6d4/W0gLgT2WBlkS5C9MO0yzprCGI42iIlyUS85gJjQhw/mWgg9nsyXth U8aPhJhtbi3X6i3X69NWKz24YPn7xqpm1NJg+pDbn/sw/G6KoyuftW9I7KQFyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rrxtw61dbzh65; Thu, 21 Sep 2023 14:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LE34iX056568; Thu, 21 Sep 2023 14:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LE34Mm056565; Thu, 21 Sep 2023 14:03:04 GMT (envelope-from git) Date: Thu, 21 Sep 2023 14:03:04 GMT Message-Id: <202309211403.38LE34Mm056565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: fb619c94c679 - main - fusefs: fix some bugs updating atime during close List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb619c94c679e939496fe0cf94b8d2cba95e6e63 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=fb619c94c679e939496fe0cf94b8d2cba95e6e63 commit fb619c94c679e939496fe0cf94b8d2cba95e6e63 Author: Alan Somers AuthorDate: 2023-09-20 21:37:31 +0000 Commit: Alan Somers CommitDate: 2023-09-21 14:02:31 +0000 fusefs: fix some bugs updating atime during close When using cached attributes, we must update a file's atime during close, if it has been read since the last attribute refresh. But, * Don't update atime if we lack write permissions to the file or if the file system is readonly. * If the daemon fails our atime update request for any reason, don't report this as a failure for VOP_CLOSE. PR: 270749 Reported by: Jamie Landeg-Jones MFC after: 1 week Sponsored by: Axcient Reviewed by: pfg Differential Revision: https://reviews.freebsd.org/D41925 --- sys/fs/fuse/fuse_vnops.c | 27 ++++++++-- tests/sys/fs/fusefs/access.cc | 2 +- tests/sys/fs/fusefs/default_permissions.cc | 42 ++++++++++++++- tests/sys/fs/fusefs/read.cc | 85 ++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 6 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index be2885528570..21ee378b24c6 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -779,6 +779,7 @@ static int fuse_vnop_close(struct vop_close_args *ap) { struct vnode *vp = ap->a_vp; + struct mount *mp = vnode_mount(vp); struct ucred *cred = ap->a_cred; int fflag = ap->a_fflag; struct thread *td = ap->a_td; @@ -794,12 +795,30 @@ fuse_vnop_close(struct vop_close_args *ap) return 0; err = fuse_flush(vp, cred, pid, fflag); - if (err == 0 && (fvdat->flag & FN_ATIMECHANGE)) { + if (err == 0 && (fvdat->flag & FN_ATIMECHANGE) && !vfs_isrdonly(mp)) { struct vattr vap; + struct fuse_data *data; + int dataflags; + int access_e = 0; - VATTR_NULL(&vap); - vap.va_atime = fvdat->cached_attrs.va_atime; - err = fuse_internal_setattr(vp, &vap, td, NULL); + data = fuse_get_mpdata(mp); + dataflags = data->dataflags; + if (dataflags & FSESS_DEFAULT_PERMISSIONS) { + struct vattr va; + + fuse_internal_getattr(vp, &va, cred, td); + access_e = vaccess(vp->v_type, va.va_mode, va.va_uid, + va.va_gid, VWRITE, cred); + } + if (access_e == 0) { + VATTR_NULL(&vap); + vap.va_atime = fvdat->cached_attrs.va_atime; + /* + * Ignore errors setting when setting atime. That + * should not cause close(2) to fail. + */ + fuse_internal_setattr(vp, &vap, td, NULL); + } } /* TODO: close the file handle, if we're sure it's no longer used */ if ((fvdat->flag & FN_SIZECHANGE) != 0) { diff --git a/tests/sys/fs/fusefs/access.cc b/tests/sys/fs/fusefs/access.cc index 3d6cddb9417b..5762269fac7b 100644 --- a/tests/sys/fs/fusefs/access.cc +++ b/tests/sys/fs/fusefs/access.cc @@ -55,7 +55,7 @@ void expect_lookup(const char *relpath, uint64_t ino) } /* - * Expect tha FUSE_ACCESS will never be called for the given inode, with any + * Expect that FUSE_ACCESS will never be called for the given inode, with any * bits in the supplied access_mask set */ void expect_noaccess(uint64_t ino, mode_t access_mask) diff --git a/tests/sys/fs/fusefs/default_permissions.cc b/tests/sys/fs/fusefs/default_permissions.cc index 1a1ee5a54aed..9a931c823689 100644 --- a/tests/sys/fs/fusefs/default_permissions.cc +++ b/tests/sys/fs/fusefs/default_permissions.cc @@ -30,7 +30,7 @@ /* * Tests for the "default_permissions" mount option. They must be in their own - * file so they can be run as an unprivileged user + * file so they can be run as an unprivileged user. */ extern "C" { @@ -163,6 +163,7 @@ class Fspacectl: public DefaultPermissions {}; class Lookup: public DefaultPermissions {}; class Open: public DefaultPermissions {}; class PosixFallocate: public DefaultPermissions {}; +class Read: public DefaultPermissions {}; class Setattr: public DefaultPermissions {}; class Unlink: public DefaultPermissions {}; class Utimensat: public DefaultPermissions {}; @@ -1239,6 +1240,45 @@ TEST_F(Rename, ok_to_remove_src_because_of_stickiness) ASSERT_EQ(0, rename(FULLSRC, FULLDST)) << strerror(errno); } +// Don't update atime during close after read, if we lack permissions to write +// that file. +TEST_F(Read, atime_during_close) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + struct stat sb; + uint64_t ino = 42; + int fd; + ssize_t bufsize = 100; + uint8_t buf[bufsize]; + const char *CONTENTS = "abcdefgh"; + ssize_t fsize = sizeof(CONTENTS); + + expect_getattr(FUSE_ROOT_ID, S_IFDIR | 0755, UINT64_MAX, 1); + FuseTest::expect_lookup(RELPATH, ino, S_IFREG | 0755, fsize, + 1, UINT64_MAX, 0, 0); + expect_open(ino, 0, 1); + expect_read(ino, 0, fsize, fsize, CONTENTS); + EXPECT_CALL(*m_mock, process( + ResultOf([&](auto in) { + return (in.header.opcode == FUSE_SETATTR); + }, Eq(true)), + _) + ).Times(0); + expect_flush(ino, 1, ReturnErrno(0)); + expect_release(ino, FuseTest::FH); + + fd = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd) << strerror(errno); + + /* Ensure atime will be different than during lookup */ + nap(); + + ASSERT_EQ(fsize, read(fd, buf, bufsize)) << strerror(errno); + + close(fd); +} + TEST_F(Setattr, ok) { const char FULLPATH[] = "mountpoint/some_file.txt"; diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index cf2159df646b..24a1ef17c4db 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -57,6 +57,14 @@ void expect_lookup(const char *relpath, uint64_t ino, uint64_t size) } }; +class RofsRead: public Read { +public: +virtual void SetUp() { + m_ro = true; + Read::SetUp(); +} +}; + class Read_7_8: public FuseTest { public: virtual void SetUp() { @@ -454,6 +462,48 @@ TEST_F(Read, atime_during_close) close(fd); } +/* + * When not using -o default_permissions, the daemon may make its own decisions + * regarding access permissions, and these may be unpredictable. If it rejects + * our attempt to set atime, that should not cause close(2) to fail. + */ +TEST_F(Read, atime_during_close_eacces) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + const char *CONTENTS = "abcdefgh"; + struct stat sb; + uint64_t ino = 42; + int fd; + ssize_t bufsize = strlen(CONTENTS); + uint8_t buf[bufsize]; + + expect_lookup(RELPATH, ino, bufsize); + expect_open(ino, 0, 1); + expect_read(ino, 0, bufsize, bufsize, CONTENTS); + EXPECT_CALL(*m_mock, process( + ResultOf([&](auto in) { + uint32_t valid = FATTR_ATIME; + return (in.header.opcode == FUSE_SETATTR && + in.header.nodeid == ino && + in.body.setattr.valid == valid); + }, Eq(true)), + _) + ).WillOnce(Invoke(ReturnErrno(EACCES))); + expect_flush(ino, 1, ReturnErrno(0)); + expect_release(ino, FuseTest::FH); + + fd = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd) << strerror(errno); + + /* Ensure atime will be different than during lookup */ + nap(); + + ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno); + + ASSERT_EQ(0, close(fd)); +} + /* A cached atime should be flushed during FUSE_SETATTR */ TEST_F(Read, atime_during_setattr) { @@ -1321,6 +1371,41 @@ INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, tuple(true, 1), tuple(true, 2))); +/* With read-only mounts, fuse should never update atime during close */ +TEST_F(RofsRead, atime_during_close) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + const char *CONTENTS = "abcdefgh"; + struct stat sb; + uint64_t ino = 42; + int fd; + ssize_t bufsize = strlen(CONTENTS); + uint8_t buf[bufsize]; + + expect_lookup(RELPATH, ino, bufsize); + expect_open(ino, 0, 1); + expect_read(ino, 0, bufsize, bufsize, CONTENTS); + EXPECT_CALL(*m_mock, process( + ResultOf([&](auto in) { + return (in.header.opcode == FUSE_SETATTR); + }, Eq(true)), + _) + ).Times(0); + expect_flush(ino, 1, ReturnErrno(0)); + expect_release(ino, FuseTest::FH); + + fd = open(FULLPATH, O_RDONLY); + ASSERT_LE(0, fd) << strerror(errno); + + /* Ensure atime will be different than during lookup */ + nap(); + + ASSERT_EQ(bufsize, read(fd, buf, bufsize)) << strerror(errno); + + close(fd); +} + /* fuse_init_out.time_gran controls the granularity of timestamps */ TEST_P(TimeGran, atime_during_setattr) { From nobody Thu Sep 21 14:44:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RryqG11VSz4tVw5; Thu, 21 Sep 2023 14:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RryqG0W5Sz4GTC; Thu, 21 Sep 2023 14:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695307498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQ8TTkCks6WLI40D+r/SDJYUf/NL/eMBzRVDAEL3T1I=; b=r7F1V4KnuoYEGOqIDhyVFigIbEn2SZACQSkq+83JC7Q5w2K708wUje8mP6g11TOdznKiSY ZTG8RRz7O+LiSPAiWoZTDPF1TGBpzKHPDsWM6mQJVZL5CHtOOxLRruAC/vGCB8EobbExtN BUGZRuueWI4XKb6Q1vNzkuySJa/gM6tQdKzcryudVYUn46YhkZzl/ni/8MXcafKB4//BXR rYKiU55hY7ZhKhyM2QpH1lC0Ha9c7Fg6kK25pMMWCyxO+Mjr8TMLsF/dfCNyIROY1uutHW wAhXFeq2VJLY1Lo9sJa6LZpkTdVfsqO/8AzyWlZjWDENQHHZWAP0WZitfdQvZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695307498; a=rsa-sha256; cv=none; b=SfDcIcDwXr6vEBHejRUObv+GkV97penwJRfgk+DUW9Z6QEGnhMtoZgKdrgUBDJpocmuCWO hFPVAQMG8qXvwGzbmgtGVcmYGrSaVGhIYPMig0Op0obeVnpiyZqPHfiBoJJw4KWBjSeJo0 vLCIHWwWe/FU3h6lbJyNxped9GrWeseo+ZK+pWNgtCbqiAVg2xvp/XJrxNUWsdRglnZEWt ragtmV884smJEO2DVNuPlxKdwbkayciBAQP9FWsLNvWcp54j+sq1oRbCdsiPmWWKeJ9thP 246w8S8yRsvddn62Qed6WbjiPU+uqLsBYxojUoZDilkc4IEvSkAmQPBxQ78e6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695307498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQ8TTkCks6WLI40D+r/SDJYUf/NL/eMBzRVDAEL3T1I=; b=aPymQjBpWLLPKqW9kP0ItSNGBdNqCLBk3QgTmlOu32tnrpcftqjqOUamNRVH+x2M9lsd8z pYwBjt6+OqTMj5tNOqQgPEVULIbhcr89qTs0CPUjZlSJ4pFIo47nipF1HcYDnD1RpvBrMM b+XZJYPAPUfzcFqMxUDnIZ5iB/ZN1fm+YxUI9hLcWkcv00/aqppVeILuPbdWkbGR5U6yUu kHEhe1WWrCzsKLGCgnQGQo3NZCiwCNNaodEvH+Bnsu14bf2w26bKqezHKFxGpxPAsdNoWr IE7Zjvx7YWE3V+MJKHh8QZEmqup/cvG5/eql2DMx7idkdVDVDe7ehFXiC+kzFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RryqF6VPPzjXY; Thu, 21 Sep 2023 14:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LEivi2023071; Thu, 21 Sep 2023 14:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LEivgB023068; Thu, 21 Sep 2023 14:44:57 GMT (envelope-from git) Date: Thu, 21 Sep 2023 14:44:57 GMT Message-Id: <202309211444.38LEivgB023068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7d154c4dc64e - main - mprutil: "fix user reply buffer (64)..." warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d154c4dc64e61af7ca536c4e9927fa07c675a83 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7d154c4dc64e61af7ca536c4e9927fa07c675a83 commit 7d154c4dc64e61af7ca536c4e9927fa07c675a83 Author: Alan Somers AuthorDate: 2023-02-22 22:06:43 +0000 Commit: Alan Somers CommitDate: 2023-09-21 14:38:24 +0000 mprutil: "fix user reply buffer (64)..." warnings Depending on the card's firmware version, it may return different length responses for MPI2_FUNCTION_IOC_FACTS. But the first part of the response contains the length of the rest, so query it first to get the length and then use that to size the buffer for the full response. Also, correctly zero-initialize MPI2_IOC_FACTS_REQUEST. It only worked by luck before. PR: 264848 Reported by: Julien Cigar MFC after: 1 week Sponsored by: Axcient Reviewed by: scottl, imp Differential Revision: https://reviews.freebsd.org/D38739 --- sys/dev/mpr/mpr.c | 2 +- sys/dev/mpr/mpr_user.c | 4 ++-- sys/dev/mps/mps.c | 2 +- sys/dev/mps/mps_user.c | 4 ++-- usr.sbin/mpsutil/mps_cmd.c | 40 +++++++++++++++++++++++++++------------- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 72993be8834e..23f7ff0c3e9a 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -1871,7 +1871,7 @@ mpr_setup_sysctl(struct mpr_softc *sc) SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "msg_version", CTLFLAG_RD, sc->msg_version, - strlen(sc->msg_version), "message interface version"); + strlen(sc->msg_version), "message interface version (deprecated)"); SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "io_cmds_active", CTLFLAG_RD, diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index d9dc3d2377a2..f2847ae36d66 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -852,7 +852,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mpr_printf(sc, "%s: user reply buffer (%d) " "smaller than returned buffer (%d)\n", __func__, data->ReplySize, sz); @@ -1077,7 +1077,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mpr_printf(sc, "%s: user reply buffer (%d) smaller " "than returned buffer (%d)\n", __func__, data->ReplySize, sz); diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index 43362b96b7b6..f358ab8a73a9 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -1719,7 +1719,7 @@ mps_setup_sysctl(struct mps_softc *sc) SYSCTL_ADD_STRING(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "msg_version", CTLFLAG_RD, sc->msg_version, - strlen(sc->msg_version), "message interface version"); + strlen(sc->msg_version), "message interface version (deprecated)"); SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO, "io_cmds_active", CTLFLAG_RD, diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c index cf2fdb2b2adb..3d1b478d81b1 100644 --- a/sys/dev/mps/mps_user.c +++ b/sys/dev/mps/mps_user.c @@ -851,7 +851,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mps_printf(sc, "%s: user reply buffer (%d) " "smaller than returned buffer (%d)\n", __func__, data->ReplySize, sz); @@ -1005,7 +1005,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) rpl = (MPI2_DEFAULT_REPLY *)cm->cm_reply; sz = rpl->MsgLength * 4; - if (sz > data->ReplySize) { + if (bootverbose && sz > data->ReplySize) { mps_printf(sc, "%s: user reply buffer (%d) smaller " "than returned buffer (%d)\n", __func__, data->ReplySize, sz); diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index 448e4cea602f..2101bbba73b0 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -721,25 +721,39 @@ mps_pass_command(int fd, void *req, uint32_t req_len, void *reply, return (0); } +/* Return the length in bytes of the device's MPI2_IOC_FACTS reply */ +static size_t +mps_get_ioc_factslen(int fd) +{ + MPI2_IOC_FACTS_REQUEST req; + const size_t factslen = 4; + char factsbuf[4] = {0}; + MPI2_IOC_FACTS_REPLY *facts = (MPI2_IOC_FACTS_REPLY*)factsbuf; + int error; + + bzero(&req, sizeof(req)); + req.Function = MPI2_FUNCTION_IOC_FACTS; + error = mps_pass_command(fd, &req, sizeof(MPI2_IOC_FACTS_REQUEST), + factsbuf, factslen, NULL, 0, NULL, 0, 10); + + if (error) + return (0); + + /* The card's response is measured in dwords */ + return (facts->MsgLength * 4); +} + MPI2_IOC_FACTS_REPLY * mps_get_iocfacts(int fd) { MPI2_IOC_FACTS_REPLY *facts; MPI2_IOC_FACTS_REQUEST req; - char msgver[8], sysctlname[128]; - size_t len, factslen; + size_t factslen; int error; - snprintf(sysctlname, sizeof(sysctlname), "dev.%s.%d.msg_version", - is_mps ? "mps" : "mpr", mps_unit); - - factslen = sizeof(MPI2_IOC_FACTS_REPLY); - len = sizeof(msgver); - error = sysctlbyname(sysctlname, msgver, &len, NULL, 0); - if (error == 0) { - if (strncmp(msgver, "2.6", sizeof(msgver)) == 0) - factslen += 4; - } + factslen = mps_get_ioc_factslen(fd); + if (factslen == 0) + return (NULL); facts = malloc(factslen); if (facts == NULL) { @@ -747,7 +761,7 @@ mps_get_iocfacts(int fd) return (NULL); } - bzero(&req, factslen); + bzero(&req, sizeof(req)); req.Function = MPI2_FUNCTION_IOC_FACTS; #if 1 From nobody Thu Sep 21 15:07:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrzKX4PMdz4tX4m; Thu, 21 Sep 2023 15:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrzKX3jgfz4Kdr; Thu, 21 Sep 2023 15:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695308864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=janKJLhczrfGLDwxQz2CtyZSFvu2FdViCb8d75sFdmo=; b=N3YE+u+BkRPvjQyl991uQWwjkTIpy1B/wY9GXp7VX/HqMhjwIrFeypdQBgp/vVX1zn1Zte 3PJVJQec2oUeXiSn3CH/8EETcNIPxiFqa3lZsToxkMHjREk5u8JmmzN6Z9PdoCHBEx6Cbz jXtEFYspYKol+3kqk+j/sNbTDzISNfZifwcj1cyju4wD+/1cm9gpDW2qKuPq0flBKGpvJz r5EMynROLcEmc8aVU/WFm8GY8sObZrgApJUQorgyyCPdDgJa6VhPoW0GZenWSbb2GL9G0N tLRXiwXdRQ7hDUA+zWijPJHn/IvrAPVprzGat0hh7Ohql5oH0rMA3OVv4CcMBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695308864; a=rsa-sha256; cv=none; b=O5SK2Jn6du3Y5k4Re9RFIVVUnVsLOrQFQO9UdRCgGSwrXOe4JYwrGCONIWHeuGDEJFVGRg ncoMcn5lZslC6bqGWLMj13LVXeOvFGMslYcfHlkWtWMl9mFOewZp3DkuHqKcUAaqbdzy6K hAlRVcHTK717A3nSvUHVQ8lRD+RplCYuGGa0u6X7ACntOLE5JZuiSk/U7vQ3LHc9//9pB0 DVr3Rp6uPw46kp2dbcm+h6ThZStiKszc2L6Bzal4ByivfxWwe9v2L4Laxr+xhlSFqa0cOA 5zTjSiPVlkhoeg1FpxYlUIEcwMdazwhrL4dDDRdRRwmkCWp8LEaiGbTnHGYyhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695308864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=janKJLhczrfGLDwxQz2CtyZSFvu2FdViCb8d75sFdmo=; b=wSKCIAsN12qnAgUBbLxH7avPaTIyEn1efS6o8ieGeDhTNXKfznGaP0oDxnSa8YYwDUcXRe LUArGHdzV8hi/F+S+gf30zxrpVRBqt/Gohkas9pa3fK7NlKSJSV4GzEufHpLMClyaVIH3H D35wTzHI4+fDELYkfHKplug6Sqf6w8ujsoOq521U1SAvDnG1imLMBOGX10l6OW4h8fzOfe NA91yvLFoIoT3YKGVXqQ/xN4rynbgR5/km+U5VP2vxM7/5S5x5tP+lAiR0wla1Ua+RvKcr u/NtO784OoEvYS3XLVS6yjF5t84pgOz370PL/YwpzdS0L8ZQc0IumxtRJvZRaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrzKX2TcpzjZJ; Thu, 21 Sep 2023 15:07:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LF7ibi057609; Thu, 21 Sep 2023 15:07:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LF7iAN057606; Thu, 21 Sep 2023 15:07:44 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:07:44 GMT Message-Id: <202309211507.38LF7iAN057606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b15b39521644 - main - libcrypto: complete the support for the 0.9.8 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b15b39521644ebffdcc091bd283ed410b0ae9274 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b15b39521644ebffdcc091bd283ed410b0ae9274 commit b15b39521644ebffdcc091bd283ed410b0ae9274 Author: Pierre Pronchery AuthorDate: 2023-09-21 11:42:06 +0000 Commit: Ed Maste CommitDate: 2023-09-21 15:07:24 +0000 libcrypto: complete the support for the 0.9.8 API When importing OpenSSL 3 in base, some but not all source files implementing the deprecated 0.9.8 API were imported. With this change, it becomes possible again to compile software targeting this API. PR: 272220 Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") Reviewed by: emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/851 --- secure/lib/libcrypto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index d8ae91bb3272..dc701d90451e 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -196,14 +196,14 @@ SRCS+= des_enc.c fcrypt_b.c .endif # dh -SRCS+= dh_ameth.c dh_asn1.c dh_backend.c dh_check.c dh_err.c dh_gen.c +SRCS+= dh_ameth.c dh_asn1.c dh_backend.c dh_check.c dh_depr.c dh_err.c dh_gen.c SRCS+= dh_group_params.c dh_kdf.c dh_key.c dh_lib.c dh_meth.c dh_pmeth.c SRCS+= dh_prn.c dh_rfc5114.c # dsa -SRCS+= dsa_ameth.c dsa_asn1.c dsa_backend.c dsa_check.c dsa_err.c dsa_gen.c -SRCS+= dsa_key.c dsa_lib.c dsa_meth.c dsa_ossl.c dsa_pmeth.c dsa_prn.c -SRCS+= dsa_sign.c dsa_vrf.c +SRCS+= dsa_ameth.c dsa_asn1.c dsa_backend.c dsa_check.c dsa_depr.c dsa_err.c +SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_meth.c dsa_ossl.c dsa_pmeth.c +SRCS+= dsa_prn.c dsa_sign.c dsa_vrf.c # dso SRCS+= dso_dlfcn.c dso_err.c dso_lib.c From nobody Thu Sep 21 15:38:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs01467Dtz4tbKx; Thu, 21 Sep 2023 15:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0145h75z4Pch; Thu, 21 Sep 2023 15:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bIW0w2F66pxBUmDosymSgIfkDJ9gYiQ7IsRlYjwp4iI=; b=r4ctkC/kGqY9OJ4WpJjs9kQN1WM31ae/cHbi+CCRk/LOPFiuMiUG9YkoxJ1ZPyD3AY5Lvn aQgzsRXlL4Wi+vY3JdcQP/fQT3WGTEFu82l/HQdSOOpFnX5W1+2Q5dlhHNlarw/7ebb4Wb CUOzO3Ov+ODZPQKzFEtJ0i7wsMi279JnMZOr/uWxNmEtlHnIZRsEa2ttQxGvCvYwqloKb1 dELwr1/QGk4r71Qxb9HEIjSHHDRTIwh9Ex53J7Z6+QR/hOgLGKILxzDay1br7px8zrsk12 ucleB8i829HSkxZCr1oBIUCz2u6EbeskXsk8GUEkEd7R7btbr008G1HMjuEhcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310712; a=rsa-sha256; cv=none; b=gtQMxYNu7kt+CCcqVDDdj0BJPvNlLcVb5S9c63TquGCQD8KyjtZNF17+KMEFzNNW1bxhcD Cq7Ch8h+YylftdjLLUc0WfWSotQGirga09GgqiADrH/1wPaG34ok13U/qskjRSoEZaGW2S kyDKh89tIzWXEBeEl8kkkRmI1EvlaOScYu20BUShBhOGoPACkkwo+GxSdAUBAr9NywKeu6 BokfpKZFK0n7Ib2ZKsQuKnQkq6y1SeVCy5qmF7Cd5uWGZ+ApaI891JBUiEv/ImZsOgApYz JG2nxBT+Jo8IdNMETJNfz1KxSPU2LLtRLRk1Cj2/jNMYLi0agzE9NSe4KC5pCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bIW0w2F66pxBUmDosymSgIfkDJ9gYiQ7IsRlYjwp4iI=; b=eFpAAMYYTWBSjR6N7FTioOYDLPdX3SaAVlwM55hgLoimf+pKexGHQkQ4G577UNtwY/icOw xInUHBHd/qLZnkg2JEJ26bqOWKfmtnaNAxpDrceU7yzhNEy8DTp5jeK5er589BsNtxWN9M 5/atr8JNMFYp1nVjrSWaVsHFzOsqE6eL0nfoq0iznyS7irf/8W/wdLKAG76hwNmoUFqmkl jCQL5aShV+I9KDjC9QCw4dE/ZM9BpTrXc+WGoxXeqE83Q583mOUNwiEi3va7t9RC4URs09 0Gu+EUjbIWh9IVY29HnoVgWLpSemsejDiHzr0tFY3RSub0NycI0/b9JYjhqJ4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0144RvWzkmT; Thu, 21 Sep 2023 15:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LFcWiT008047; Thu, 21 Sep 2023 15:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFcWEe008044; Thu, 21 Sep 2023 15:38:32 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:38:32 GMT Message-Id: <202309211538.38LFcWEe008044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8f37b3a142f2 - main - libcrypto: fix the FIPS provider on amd64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 commit 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 Author: Pierre Pronchery AuthorDate: 2023-09-04 17:57:35 +0000 Commit: Ed Maste CommitDate: 2023-09-21 15:38:02 +0000 libcrypto: fix the FIPS provider on amd64 This corrects the list of source files required for the FIPS provider. To test: ``` INSTALL PASSED enter AES-128-CBC encryption password: Verifying - enter AES-128-CBC encryption password: U2FsdGVkX1+MGm7LbZou29UWU+KAyBX/PxF5T1pO9VM= ``` Reviewed by: emaste Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/837 Differential Revision: https://reviews.freebsd.org/D41720 --- secure/lib/libcrypto/modules/fips/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index b674126bb6cf..8843cb9717c9 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -32,25 +32,25 @@ SRCS+= mem_clr.c .endif # crypto/aes -SRCS+= aes_cbc.c aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c +SRCS+= aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c .if defined(ASM_aarch64) -SRCS+= aes_core.c aesv8-armx.S vpaes-armv8.S +SRCS+= aes_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto .elif defined(ASM_amd64) -SRCS+= aes_core.c aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S -SRCS+= aesni-x86_64.S vpaes-x86_64.S +SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S +SRCS+= aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S .elif defined(ASM_arm) -SRCS+= aes-armv4.S aesv8-armx.S bsaes-armv7.S +SRCS+= aes_cbc.c aes-armv4.S aesv8-armx.S bsaes-armv7.S .elif defined(ASM_i386) -SRCS+= aes_core.c aesni-x86.S vpaes-x86.S +SRCS+= aes-586.S aesni-x86.S vpaes-x86.S .elif defined(ASM_powerpc) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .elif defined(ASM_powerpc64le) -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S .else -SRCS+= aes_core.c +SRCS+= aes_cbc.c aes_core.c .endif # crypto/bn From nobody Thu Sep 21 15:40:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs03n4jqCz4tbF7; Thu, 21 Sep 2023 15:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs03n4FqJz4PtK; Thu, 21 Sep 2023 15:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrD84ZmnNnKDhQTX0nZ+gUTBNI7lsu9wtHAWUGpmApg=; b=N3EHomnKy5ew3vQSfnj6Smah2t5mBPMnj9wEMYz+s92O7xoCs/eKWMm0RFrJu+3u+EZMUU lUV74tWRQcGXfcGNZ38d1m/n0LVpgajzn71o6U/v5XVszV8cO6Gq/eEhlTKD0yOJuTMIk1 j9L81vjwmmopmkJUltLprEX3RYpdiaG1PfvWwVqM87DJ09BrprrqGHhbfaK5da3nKhMopv eFqTNjRjVwfhj1sgbSXpA9AfnC2jXJDMN0asW8ZFn/6Oz2QCGhGvfAZ9D35ZOVwDIOqOWY ZmvpgwzlepkEqgGd1S9+EqHlSVNzagn90gvzg/cAJ8wjAD0VFOaWkLa+l2O3AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310853; a=rsa-sha256; cv=none; b=vJ73QnkRnkmdDYGwsXPJw1vKLvD6tfYJGLHbPQJgVSRR8ns02SqzbR1uCQ0dgh9WWBXEUn YIEhYAW8BFRaz/h7nNtQNdEPZrHr94j04mLcbutKMswcJ3KZXDHCypepVEnq3g+dSTQp+5 LoMG8DgYweyCSmbmGrTq/99V7WG4vdcSRHZg76NFL8VsnS+N09HV9VYWk/79UXCzBhRN8t LCg/YooI9zTsakADFgsuZipJ7Gnc42dcvzKq6A6vAWXfNw4dviUWfwj8ouOd/VvaUcB0I5 NP2Sbs5TiNnknEeyFZNcJTAY82DjO6dOLzP7QBvACN6B37IXEAbKhrpKC8Xl6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrD84ZmnNnKDhQTX0nZ+gUTBNI7lsu9wtHAWUGpmApg=; b=azEBvnZDaw/XqwwhU5DiZRhqAZJq/63mHCcfXRZb8T1dOCwDaK8ckMQz3L8FiIv+iMGOlr T6f9WjhiMwt1OyGFpWu+3pAQiEHjEShjuAM7i31jg2g9tz1JSombzBHWWJq39H1m0HOR9f yscZx6EK3dqOCIQYiEoUtcrqRqAgXq2WTl4/cF26n5Nilgh5z8ify0fKllPmxyRq8mu2zb Jw8CwQr9tm5BUy03nIZw1ZpaMjgx6kHFH0K1YZYcvd2mcyJQC+HmL7M1q3KOJC4bE/4AMA GKiVFE+6bEQxu0g8Txw2ZkmNJWrsauYS/3tz/RwX8unAI11M798QbH52H3aXZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs03n3Jwnzkk6; Thu, 21 Sep 2023 15:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LFerh0018235; Thu, 21 Sep 2023 15:40:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFertX018226; Thu, 21 Sep 2023 15:40:53 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:40:53 GMT Message-Id: <202309211540.38LFertX018226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: e5236d25f2c0 - main - fusefs: fix unused variables from fb619c94c67 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5236d25f2c0709acf3547e6af45f4bb4eec4f02 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e5236d25f2c0709acf3547e6af45f4bb4eec4f02 commit e5236d25f2c0709acf3547e6af45f4bb4eec4f02 Author: Alan Somers AuthorDate: 2023-09-21 15:38:06 +0000 Commit: Alan Somers CommitDate: 2023-09-21 15:40:49 +0000 fusefs: fix unused variables from fb619c94c67 PR: 270749 Reported by: cy MFC after: 1 week MFC with: fb619c94c679e939496fe0cf94b8d2cba95e6e63 Sponsored by: Axcient --- tests/sys/fs/fusefs/default_permissions.cc | 1 - tests/sys/fs/fusefs/read.cc | 2 -- 2 files changed, 3 deletions(-) diff --git a/tests/sys/fs/fusefs/default_permissions.cc b/tests/sys/fs/fusefs/default_permissions.cc index 9a931c823689..4b04297d97ac 100644 --- a/tests/sys/fs/fusefs/default_permissions.cc +++ b/tests/sys/fs/fusefs/default_permissions.cc @@ -1246,7 +1246,6 @@ TEST_F(Read, atime_during_close) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; - struct stat sb; uint64_t ino = 42; int fd; ssize_t bufsize = 100; diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index 24a1ef17c4db..3df0420facb9 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -472,7 +472,6 @@ TEST_F(Read, atime_during_close_eacces) const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; const char *CONTENTS = "abcdefgh"; - struct stat sb; uint64_t ino = 42; int fd; ssize_t bufsize = strlen(CONTENTS); @@ -1377,7 +1376,6 @@ TEST_F(RofsRead, atime_during_close) const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; const char *CONTENTS = "abcdefgh"; - struct stat sb; uint64_t ino = 42; int fd; ssize_t bufsize = strlen(CONTENTS); From nobody Thu Sep 21 16:00:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0V53HF0z4tcVN; Thu, 21 Sep 2023 16:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V52pfpz4R9s; Thu, 21 Sep 2023 16:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukwP2P1RMmt46dlEuJW67xcF+p+evFiy3yt6TCIwJK0=; b=xCqXmlNxIrEjjCAtNdB68Iyi9d+BxvdtHceoEZloopYkNo0Ca8U/akkO1IcOjfiqQwI+aL khJrJzXb7CxlcI/eX9W4JeP9YMG4kEtBxEBHcZX55s2b6UZey5zAdXOqm/d4ADjIX1HJaH Xr36goJH5E5XgQBD8CePpIx9RVKL2xHOgMa8jUmYayxPVQza/Vcn4xIrdKJTE+8uvTTMlN IN46I/Z//RISSP4mcfo3ij1JXS9R+vzD9dRMZMa8SYpKDHWyTCmzIxmDTn2oJ5ZNSdSCFm iRfZEznQ7hQsDG9v5C/vY4/JS2qA4XgxlKGTRPYKuFGCNE6+GR2it1tQqWmdLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312013; a=rsa-sha256; cv=none; b=xkYwdbruJEGdmJZ3LGp+HMsXtxsMnGpSEiEAe3YMLgTytXVVcU3eReVUxrnYuvsDD70Z5+ 0gkix1I93BBkPBKkOkNBx3k6FUqngFhoKXPDO+ZdjksnT0Vm6ulgRtmvOLcH4NQpnmHT6Z xOxbgdjufD+p8Z6nG9hs7NH/MPNqUUqcgGeaFuqwspuL6hNgEc4SRJ81Q9isWGF/TDsiJ6 aZ5WbPcmtp3B9L3tDH1NcyB/Tox7koqhYP5sENl8OMc9oG8vJvnmcpuHeM43g2qcLhXP9k GO92JxL7jMmBDj47GmKdnD03HDdnNLAlplcQD4k8pri71l1tEzn6bYl0N3IDAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ukwP2P1RMmt46dlEuJW67xcF+p+evFiy3yt6TCIwJK0=; b=J8YL95AslL+OdhdAZKfnwiFRSxd/sKE3KZKYcUbJT6G2ylm9aql3SSxMiwo7CI4Dy2OEIa IH7ap/ZsobDRNEFLZ7iE4zFL4SVIMsZ3S5SiNtWSkOZNQZfRwyFjJOth9TfL5nxy2JpszP oGplp6u1xCivi+UtDV20HpJqWcnnsPtpnc/2TnfberSJPwUUKp3GN+t6eHbXt3ESeQ7IlA P/cWOKr0wFDCfCczCgxhv3UK4bDSzCRacmylXvuKQR9rEHqvq83x0fuJuIO34XZZH92OVl h1rdjBdPwjEKacjXI6TD/IgqN/coUyy82c6i3BaXLj7E3KdAj1gboTr+XjXeuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0V51rtCzklM; Thu, 21 Sep 2023 16:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Den047621; Thu, 21 Sep 2023 16:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0DQ8047610; Thu, 21 Sep 2023 16:00:13 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:13 GMT Message-Id: <202309211600.38LG0DQ8047610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8ae54db63970 - main - arm64: rockchip: clk: Define PLIST macro in rk_cru.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae54db63970e9370d3d88f6eb57c102e085a128 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae54db63970e9370d3d88f6eb57c102e085a128 commit 8ae54db63970e9370d3d88f6eb57c102e085a128 Author: Emmanuel Vadot AuthorDate: 2023-09-19 15:59:34 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:02 +0000 arm64: rockchip: clk: Define PLIST macro in rk_cru.h We use it in all clock drivers so no need to define it everywhere --- sys/arm64/rockchip/clk/rk3288_cru.c | 1 - sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 1 - sys/arm64/rockchip/clk/rk_cru.h | 4 ++++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/arm64/rockchip/clk/rk3288_cru.c index cadb1f586a1a..e35481e94c13 100644 --- a/sys/arm64/rockchip/clk/rk3288_cru.c +++ b/sys/arm64/rockchip/clk/rk3288_cru.c @@ -525,7 +525,6 @@ static struct rk_clk_armclk_rates rk3288_armclk_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin24m", "xin32k"}; PLIST(armclk_p)= {"apll_core", "gpll_core"}; PLIST(ddrphy_p) = {"dpll_ddr", "gpll_ddr"}; diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index f969c8d758a5..1f48ce6c23a2 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -636,8 +636,6 @@ static struct rk_clk_pll_rate rk3328_pll_frac_rates[] = { }; /* Clock parents */ -#define PLIST(_name) static const char *_name[] - PLIST(pll_src_p) = {"xin24m"}; PLIST(xin24m_rtc32k_p) = {"xin24m", "clk_rtc32k"}; diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/arm64/rockchip/clk/rk3399_cru.c index 3d43d832792f..3bff0e64ea34 100644 --- a/sys/arm64/rockchip/clk/rk3399_cru.c +++ b/sys/arm64/rockchip/clk/rk3399_cru.c @@ -695,7 +695,6 @@ static struct rk_clk_armclk_rates rk3399_cpu_b_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin32k"}; PLIST(armclkl_p) = {"clk_core_l_lpll_src", "clk_core_l_bpll_src", diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index b00e987abcfa..55f230036199 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -42,6 +42,10 @@ #include /* Macro for defining various types of clocks. */ + +/* Parent list */ +#define PLIST(_name) static const char *_name[] + /* Pure gate */ #define GATE(_idx, _clkname, _pname, _o, _s) \ { \ From nobody Thu Sep 21 16:00:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0V63MRhz4tcgN; Thu, 21 Sep 2023 16:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V639mnz4RXY; Thu, 21 Sep 2023 16:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9Jeq5Dvomtxz+6boN25rchS7LJIq2Xc/LQHmJFC5gA=; b=vmHBQh7AzUAIj7fQ/uhCbf9IYJZEdymR+lylVgeqARFOZQ0DgXUh14STiCVlEF+SV5a1Hs N9j6VTkXDcAH8Kwug/ZlixTxWiUnoXtHYlobPPW01wl+rg4cJUFPclm/eEUVVPtjoXgSdm me6S+tK6D6Fa4lqRVPPZR43R7TaIDFhH/YgFSnqQSicqY573I2QfVLMwCf2ArYLdZvwWWL oXI/WqcLHPZcRv2SmPly2DJ2+2PDcAm9hQqmNkT/pmvsnmzc6abBXp8sygUVB4rqCStZlI CC3g6b4mVGXv1IfRVSEBfiToMtPkAEhl7irin94gUAhSbUltfSY8hbQSzqULsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312014; a=rsa-sha256; cv=none; b=WwKaUq0Hl3tXqazuADQcFFdc+++pALQsTnVm8i4qtZUKyiO0tz1h4BiBhn6G8Zt7AW3tqB wKDbYZYEeHxF+nCM0NjaFn4LGGApW/J7xR/Y+sI1Or83fv3blRaCFYajtGlK0DDOju8Abl h1hIbsP0Wtqu5v4PmOMcIHWc4j0r/7Cdb0oC/tQpc44ik+QkJOq2QeRHwH9cHCIlDdkDyt 0jkG/scXJuPwutZk0Mp65n81E2oeZ3t0PRJDZIYawT93UVOMtW3hpiLSm9AWuLXfAnPBUj yXKPk9lL5zvCK3KrU+QWVmCQbtKJnEd8n6pRBbWEwd0BWy4Rt/OD344cu28eZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9Jeq5Dvomtxz+6boN25rchS7LJIq2Xc/LQHmJFC5gA=; b=yn6YwoYdM5WZYEwpUcLKlUHou8HjJv0TPiBhuJHSaSZU6KqnonrDXfJD0CRAEukekOazxF jN0KSZkTrEv5jxDjWSP7mJbBiCsl8rEOSDuyKvBfv3aAwGh5BILLscYfi5w6v0TQMo+CkF qsFjAfwLDZlMA7dBjU3Tr8nu9zPuL1xmPto5IAo5UF/IsB+08Ajwp3JuEQldI+OhCeOMIR 3icNU0Jqnyc6OQuSh3r149FV/rj0+4yvuu81dKVM6SmGEond40JPjDqBKFY+AaC6aEjFi2 D0QB3ubf86YFbthaaKfQiXo+RPiA9VcX3Lk1tPgRG3dLpEWJcuoeKRASuKMhjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0V61wQ1zlKW; Thu, 21 Sep 2023 16:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0EGS048294; Thu, 21 Sep 2023 16:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0E1T048288; Thu, 21 Sep 2023 16:00:14 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:14 GMT Message-Id: <202309211600.38LG0E1T048288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7b6ae431cf70 - main - arm64: rockchip: rk3568_pmucru: Rewrite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b6ae431cf70cd8683270b3e315a14e61d666522 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7b6ae431cf70cd8683270b3e315a14e61d666522 commit 7b6ae431cf70cd8683270b3e315a14e61d666522 Author: Emmanuel Vadot AuthorDate: 2023-08-15 10:16:57 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:04 +0000 arm64: rockchip: rk3568_pmucru: Rewrite Rewrite correctly the clocks for pmucru : - Export all clocks - Use names from the TRM - Respect clock topology Fixes: a48301a5e094 ("Add initial clocks support for Rockchip RK3568 SoC.") --- sys/arm64/rockchip/clk/rk3568_pmucru.c | 304 +++++++++++++-------------------- 1 file changed, 115 insertions(+), 189 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3568_pmucru.c b/sys/arm64/rockchip/clk/rk3568_pmucru.c index ee75a4c18927..f93864851e0a 100644 --- a/sys/arm64/rockchip/clk/rk3568_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3568_pmucru.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021, 2022 Soren Schmidt + * Copyright (c) 2023, Emmanuel Vadot * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,12 +47,11 @@ #include -#define RK3568_PLLSEL_CON(x) ((x) * 0x20) -#define RK3568_CLKSEL_CON(x) ((x) * 0x4 + 0x100) -#define RK3568_CLKGATE_CON(x) ((x) * 0x4 + 0x180) -#define RK3568_SOFTRST_CON(x) ((x) * 0x4 + 0x200) +#define CRU_PLLSEL_CON(x) ((x) * 0x20) +#define CRU_CLKSEL_CON(x) ((x) * 0x4 + 0x100) +#define CRU_CLKGATE_CON(x) ((x) * 0x4 + 0x180) -#define PNAME(_name) static const char *_name[] +#define PLIST(_name) static const char *_name[] /* PLL clock */ #define RK_PLL(_id, _name, _pnames, _off, _shift) \ @@ -63,131 +63,32 @@ .clkdef.parent_names = _pnames, \ .clkdef.parent_cnt = nitems(_pnames), \ .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .base_offset = RK3568_PLLSEL_CON(_off), \ + .base_offset = CRU_PLLSEL_CON(_off), \ .mode_reg = 0x80, \ .mode_shift = _shift, \ .rates = rk3568_pll_rates, \ }, \ } -/* Composite */ -#define RK_COMPOSITE(_id, _name, _pnames, _o, _ms, _mw, _ds, _dw, _go, _gw, _f)\ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no mux */ -#define RK_COMPNOMUX(_id, _name, _pname, _o, _ds, _dw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Fixed factor mux/div */ -#define RK_FACTOR(_id, _name, _pname, _mult, _div) \ -{ \ - .type = RK_CLK_FIXED, \ - .clk.fixed = &(struct clk_fixed_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .mult = _mult, \ - .div = _div, \ - }, \ -} - -/* Fractional */ -#define RK_FRACTION(_id, _name, _pname, _o, _go, _gw, _f) \ -{ \ - .type = RK_CLK_FRACT, \ - .clk.fract = &(struct rk_clk_fract_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_FRACT_HAVE_GATE | _f, \ - }, \ -} - -/* Multiplexer */ -#define RK_MUX(_id, _name, _pnames, _o, _ms, _mw, _f) \ -{ \ - .type = RK_CLK_MUX, \ - .clk.mux = &(struct rk_clk_mux_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .shift = _ms, \ - .width = _mw, \ - .mux_flags = _f, \ - }, \ -} - -#define RK_GATE(_id, _name, _pname, _o, _s) \ -{ \ - .id = _id, \ - .name = _name, \ - .parent_name = _pname, \ - .offset = RK3568_CLKGATE_CON(_o), \ - .shift = _s, \ -} - extern struct rk_clk_pll_rate rk3568_pll_rates[]; /* Parent clock defines */ -PNAME(mux_pll_p) = { "xin24m" }; -PNAME(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; -PNAME(sclk_uart0_p) = { "sclk_uart0_div", "sclk_uart0_frac", "xin24m" }; -PNAME(clk_rtc32k_pmu_p) = { "clk_32k_pvtm", "xin32k", "clk_rtc32k_frac" }; -PNAME(ppll_usb480m_cpll_gpll_p) = { "ppll", "usb480m", "cpll", "gpll"}; -PNAME(clk_usbphy0_ref_p) = { "clk_ref24m", "xin_osc0_usbphy0_g" }; -PNAME(clk_usbphy1_ref_p) = { "clk_ref24m", "xin_osc0_usbphy1_g" }; -PNAME(clk_mipidsiphy0_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy0_g" }; -PNAME(clk_mipidsiphy1_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy1_g" }; -PNAME(clk_wifi_p) = { "clk_wifi_osc0", "clk_wifi_div" }; -PNAME(clk_pciephy0_ref_p) = { "clk_pciephy0_osc0", "clk_pciephy0_div" }; -PNAME(clk_pciephy1_ref_p) = { "clk_pciephy1_osc0", "clk_pciephy1_div" }; -PNAME(clk_pciephy2_ref_p) = { "clk_pciephy2_osc0", "clk_pciephy2_div" }; -PNAME(clk_hdmi_ref_p) = { "hpll", "hpll_ph0" }; -PNAME(clk_pdpmu_p) = { "ppll", "gpll" }; -PNAME(clk_pwm0_p) = { "xin24m", "clk_pdpmu" }; +PLIST(mux_pll_p) = { "xin24m" }; +PLIST(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; +PLIST(sclk_uart0_p) = { "sclk_uart0_div", "sclk_uart0_frac", "xin24m" }; +PLIST(sclk_uart0_div_p) = { "ppll", "usb480m", "cpll", "gpll" }; +PLIST(clk_rtc32k_pmu_p) = { "clk_32k_pvtm", "xin32k", "clk_osc0_div32k" }; +PLIST(clk_usbphy0_ref_p) = { "clk_ref24m", "xin_osc0_usbphy0_g" }; +PLIST(clk_usbphy1_ref_p) = { "clk_ref24m", "xin_osc0_usbphy1_g" }; +PLIST(clk_mipidsiphy0_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy0_g" }; +PLIST(clk_mipidsiphy1_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy1_g" }; +PLIST(clk_wifi_p) = { "clk_wifi_osc0", "clk_wifi_div" }; +PLIST(clk_pciephy0_ref_p) = { "clk_pciephy0_osc0", "clk_pciephy0_div" }; +PLIST(clk_pciephy1_ref_p) = { "clk_pciephy1_osc0", "clk_pciephy1_div" }; +PLIST(clk_pciephy2_ref_p) = { "clk_pciephy2_osc0", "clk_pciephy2_div" }; +PLIST(clk_hdmi_ref_p) = { "hpll", "hpll_ph0" }; +PLIST(clk_pdpmu_p) = { "ppll", "gpll" }; +PLIST(clk_pwm0_p) = { "xin24m", "clk_pdpmu" }; /* CLOCKS */ static struct rk_clk rk3568_clks[] = { @@ -198,83 +99,108 @@ static struct rk_clk rk3568_clks[] = { LINK("usb480m"), LINK("clk_32k_pvtm"), - /* SRC_CLK */ - RK_MUX(CLK_RTC_32K, "clk_rtc_32k", clk_rtc32k_pmu_p, 0, 6, 2, 0), - RK_MUX(0, "sclk_uart0_mux", sclk_uart0_p, 4, 10, 2, 0), + /* Fixed clocks */ + FFACT(0, "ppll_ph0", "ppll", 1, 2), + FFACT(0, "ppll_ph180", "ppll", 1, 2), + FFACT(0, "hpll_ph0", "hpll", 1, 2), /* PLL's */ RK_PLL(PLL_PPLL, "ppll", mux_pll_p, 0, 0), RK_PLL(PLL_HPLL, "hpll", mux_pll_p, 2, 2), - /* PD_PMU */ - RK_FACTOR(0, "ppll_ph0", "ppll", 1, 2), - RK_FACTOR(0, "ppll_ph180", "ppll", 1, 2), - RK_FACTOR(0, "hpll_ph0", "hpll", 1, 2), - RK_MUX(CLK_PDPMU, "clk_pdpmu", clk_pdpmu_p, 2, 15, 1, 0), - RK_COMPNOMUX(PCLK_PDPMU, "pclk_pdpmu", "clk_pdpmu", 2, 0, 5, 0, 2, 0), - RK_COMPNOMUX(CLK_I2C0, "clk_i2c0", "clk_pdpmu", 3, 0, 7, 1, 1, 0), - RK_FRACTION(CLK_RTC32K_FRAC, "clk_rtc32k_frac", "xin24m", 1, 0, 1, 0), - RK_COMPNOMUX(XIN_OSC0_DIV, "xin_osc0_div", "xin24m", 0, 0, 5, 0, 0, 0), - RK_COMPOSITE(CLK_UART0_DIV, "sclk_uart0_div", - ppll_usb480m_cpll_gpll_p, 4, 8, 2, 0, 7, 1, 3, 0), - RK_FRACTION(CLK_UART0_FRAC, "sclk_uart0_frac", - "sclk_uart0_div", 5, 1, 4, 0), - RK_MUX(DBCLK_GPIO0, "dbclk_gpio0_c", xin24m_32k_p, 6, 15, 1, 0), - RK_COMPOSITE(CLK_PWM0, "clk_pwm0", clk_pwm0_p, 6, 7, 1, 0, 7, 1, 7, 0), - RK_COMPNOMUX(CLK_REF24M, "clk_ref24m", "clk_pdpmu", 7, 0, 6, 2, 0, 0), - RK_MUX(CLK_USBPHY0_REF, "clk_usbphy0_ref", - clk_usbphy0_ref_p, 8, 0, 1, 0), - RK_MUX(CLK_USBPHY1_REF, "clk_usbphy1_ref", - clk_usbphy1_ref_p, 8, 1, 1, 0), - RK_MUX(CLK_MIPIDSIPHY0_REF, "clk_mipidsiphy0_ref", - clk_mipidsiphy0_ref_p, 8, 2, 1, 0), - RK_MUX(CLK_MIPIDSIPHY1_REF, "clk_mipidsiphy1_ref", - clk_mipidsiphy1_ref_p, 8, 3, 1, 0), - RK_COMPNOMUX(CLK_WIFI_DIV, "clk_wifi_div", - "clk_pdpmu", 8, 8, 6, 2, 5, 0), - RK_MUX(CLK_WIFI, "clk_wifi", clk_wifi_p, 8, 15, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY0_DIV, "clk_pciephy0_div", - "ppll_ph0", 9, 0, 3, 2, 7, 0), - RK_MUX(CLK_PCIEPHY0_REF, "clk_pciephy0_ref", - clk_pciephy0_ref_p, 9, 3, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY1_DIV, "clk_pciephy1_div", - "ppll_ph0", 9, 4, 3, 2, 9, 0), - RK_MUX(CLK_PCIEPHY1_REF, "clk_pciephy1_ref", - clk_pciephy1_ref_p, 9, 7, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY2_DIV, "clk_pciephy2_div", - "ppll_ph0", 9, 8, 3, 2, 11, 0), - RK_MUX(CLK_PCIEPHY2_REF, "clk_pciephy2_ref", - clk_pciephy2_ref_p, 9, 11, 1, 0), - RK_MUX(CLK_HDMI_REF, "clk_hdmi_ref", clk_hdmi_ref_p, 8, 7, 1, 0), + /* PMUCRU_PMUCLKSEL_CON00 */ + CDIV(0, "xin_osc0_div_div", "xin24m", 0, 0, 0, 5), + MUX(0, "clk_rtc_32k_mux", clk_rtc32k_pmu_p, 0, 0, 6, 2), + + /* PMUCRU_PMUCLKSEL_CON01 */ + FRACT(0, "clk_osc0_div32k", "xin24m", 0, 1), + + /* PMUCRU_PMUCLKSEL_CON02 */ + CDIV(0, "pclk_pdpmu_pre", "clk_pdpmu", 0, 2, 0, 5), + MUX(CLK_PDPMU, "clk_pdpmu", clk_pdpmu_p, 0, 2, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON03 */ + CDIV(0, "clk_i2c0_div", "clk_pdpmu", 0, 3, 0, 7), + + /* PMUCRU_PMUCLKSEL_CON04 */ + CDIV(0, "sclk_uart0_div_div", "sclk_uart0_div_sel", 0, 4, 0, 7), + MUX(0, "sclk_uart0_div_sel", sclk_uart0_div_p, 0, 4, 8, 2), + MUX(0, "sclk_uart0_mux", sclk_uart0_p, 0, 4, 10, 2), + + /* PMUCRU_PMUCLKSEL_CON05 */ + FRACT(0, "sclk_uart0_frac_div", "sclk_uart0_div", 0, 5), + + /* PMUCRU_PMUCLKSEL_CON06 */ + CDIV(0, "clk_pwm0_div", "clk_pwm0_sel", 0, 6, 0, 7), + MUX(0, "clk_pwm0_sel", clk_pwm0_p, 0, 6, 7, 1), + MUX(0, "dbclk_gpio0_sel", xin24m_32k_p, 0, 6, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON07 */ + CDIV(0, "clk_ref24m_div", "clk_pdpmu", 0, 7, 0, 6), + + /* PMUCRU_PMUCLKSEL_CON08 */ + MUX(CLK_USBPHY0_REF, "clk_usbphy0_ref", clk_usbphy0_ref_p, 0, 8, 0, 1), + MUX(CLK_USBPHY1_REF, "clk_usbphy1_ref", clk_usbphy1_ref_p, 0, 8, 1, 1), + MUX(CLK_MIPIDSIPHY0_REF, "clk_mipidsiphy0_ref", clk_mipidsiphy0_ref_p, 0, 8, 2, 1), + MUX(CLK_MIPIDSIPHY1_REF, "clk_mipidsiphy1_ref", clk_mipidsiphy1_ref_p, 0, 8, 3, 1), + MUX(CLK_HDMI_REF, "clk_hdmi_ref", clk_hdmi_ref_p, 0, 8, 7, 1), + CDIV(0, "clk_wifi_div_div", "clk_pdpmu", 0, 8, 8, 6), + MUX(CLK_WIFI, "clk_wifi", clk_wifi_p, 0, 8, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON09 */ + CDIV(0, "clk_pciephy0_div_div", "ppll_ph0", 0, 9, 0, 3), + MUX(CLK_PCIEPHY0_REF, "clk_pciephy0_ref", + clk_pciephy0_ref_p, 0, 9, 3, 1), + CDIV(0, "clk_pciephy1_div_div", "ppll_ph0", 0, 9, 4, 3), + MUX(CLK_PCIEPHY1_REF, "clk_pciephy1_ref", + clk_pciephy1_ref_p, 0, 9, 7, 1), + CDIV(0, "clk_pciephy2_div_div", "ppll_ph0", 0, 9, 8, 3), + MUX(CLK_PCIEPHY2_REF, "clk_pciephy2_ref", + clk_pciephy2_ref_p, 0, 9, 11, 1), }; /* GATES */ static struct rk_cru_gate rk3568_gates[] = { - RK_GATE(PCLK_PMU, "pclk_pmu", "pclk_pdpmu", 0, 6), - RK_GATE(DBCLK_GPIO0, "dbclk_gpio0", "dbclk_gpio0_c", 1, 10), - RK_GATE(CLK_PMU, "clk_pmu", "xin24m", 0, 7), - RK_GATE(PCLK_I2C0, "pclk_i2c0", "pclk_pdpmu", 1, 0), - RK_GATE(PCLK_UART0, "pclk_uart0", "pclk_pdpmu", 1, 2), - RK_GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 1, 5), - RK_GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pdpmu", 1, 9), - RK_GATE(PCLK_PWM0, "pclk_pwm0", "pclk_pdpmu", 1, 6), - RK_GATE(CLK_CAPTURE_PWM0_NDFT, "clk_capture_pwm0_ndft", "xin24m", 1, 8), - RK_GATE(PCLK_PMUPVTM, "pclk_pmupvtm", "pclk_pdpmu", 1, 11), - RK_GATE(CLK_PMUPVTM, "clk_pmupvtm", "xin24m", 1, 12), - RK_GATE(CLK_CORE_PMUPVTM, "clk_core_pmupvtm", "xin24m", 1, 13), - RK_GATE(XIN_OSC0_USBPHY0_G, "xin_osc0_usbphy0_g", "xin24m", 2, 1), - RK_GATE(XIN_OSC0_USBPHY1_G, "xin_osc0_usbphy1_g", "xin24m", 2, 2), - RK_GATE(XIN_OSC0_MIPIDSIPHY0_G, "xin_osc0_mipidsiphy0_g", - "xin24m", 2, 3), - RK_GATE(XIN_OSC0_MIPIDSIPHY1_G, "xin_osc0_mipidsiphy1_g", - "xin24m", 2, 4), - RK_GATE(CLK_WIFI_OSC0, "clk_wifi_osc0", "xin24m", 2, 6), - RK_GATE(CLK_PCIEPHY0_OSC0, "clk_pciephy0_osc0", "xin24m", 2, 8), - RK_GATE(CLK_PCIEPHY1_OSC0, "clk_pciephy1_osc0", "xin24m", 2, 10), - RK_GATE(CLK_PCIEPHY2_OSC0, "clk_pciephy2_osc0", "xin24m", 2, 12), - RK_GATE(CLK_PCIE30PHY_REF_M, "clk_pcie30phy_ref_m", "ppll_ph0", 2, 13), - RK_GATE(CLK_PCIE30PHY_REF_N, "clk_pcie30phy_ref_n", "ppll_ph180", 2,14), - RK_GATE(XIN_OSC0_EDPPHY_G, "xin_osc0_edpphy_g", "xin24m", 2, 15), + /* PMUCRU_PMUGATE_CON00 */ + GATE(XIN_OSC0_DIV, "xin_osc0_div", "xin_osc0_div_div", 0, 0), + GATE(CLK_RTC_32K, "clk_rtc_32k", "clk_rtc_32k_mux", 0, 1), + GATE(PCLK_PDPMU, "pclk_pdpmu", "pclk_pdpmu_pre", 0, 2), + GATE(PCLK_PMU, "pclk_pmu", "pclk_pdpmu", 0, 6), + GATE(CLK_PMU, "clk_pmu", "xin24m", 0, 7), + + /* PMUCRU_PMUGATE_CON01 */ + GATE(PCLK_I2C0, "pclk_i2c0", "pclk_pdpmu", 1, 0), + GATE(CLK_I2C0, "clk_i2c0", "clk_i2c0_div", 1, 1), + GATE(PCLK_UART0, "pclk_uart0", "pclk_pdpmu", 1, 2), + GATE(CLK_UART0_DIV, "sclk_uart0_div", "sclk_uart0_div_div", 1, 3), + GATE(CLK_UART0_FRAC, "sclk_uart0_frac", "sclk_uart0_frac_div", 1, 4), + GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 1, 5), + GATE(PCLK_PWM0, "pclk_pwm0", "pclk_pdpmu", 1, 6), + GATE(CLK_PWM0, "clk_pwm0", "clk_pwm0_div", 1, 7), + GATE(CLK_CAPTURE_PWM0_NDFT, "clk_capture_pwm0_ndft", "xin24m", 1, 8), + GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pdpmu", 1, 9), + GATE(DBCLK_GPIO0, "dbclk_gpio0", "dbclk_gpio0_sel", 1, 10), + GATE(PCLK_PMUPVTM, "pclk_pmupvtm", "pclk_pdpmu", 1, 11), + GATE(CLK_PMUPVTM, "clk_pmupvtm", "xin24m", 1, 12), + GATE(CLK_CORE_PMUPVTM, "clk_core_pmupvtm", "xin24m", 1, 13), + + /* PMUCRU_PMUGATE_CON02 */ + GATE(CLK_REF24M, "clk_ref24m", "clk_ref24m_div", 2, 0), + GATE(XIN_OSC0_USBPHY0_G, "xin_osc0_usbphy0_g", "xin24m", 2, 1), + GATE(XIN_OSC0_USBPHY1_G, "xin_osc0_usbphy1_g", "xin24m", 2, 2), + GATE(XIN_OSC0_MIPIDSIPHY0_G, "xin_osc0_mipidsiphy0_g", "xin24m", 2, 3), + GATE(XIN_OSC0_MIPIDSIPHY1_G, "xin_osc0_mipidsiphy1_g", "xin24m", 2, 4), + GATE(CLK_WIFI_DIV, "clk_wifi_div", "clk_wifi_div_div", 2, 5), + GATE(CLK_WIFI_OSC0, "clk_wifi_osc0", "xin24m", 2, 6), + GATE(CLK_PCIEPHY0_DIV, "clk_pciephy0_div", "clk_pciephy0_div_div", 2, 7), + GATE(CLK_PCIEPHY0_OSC0, "clk_pciephy0_osc0", "xin24m", 2, 8), + GATE(CLK_PCIEPHY1_DIV, "clk_pciephy1_div", "clk_pciephy1_div_div", 2, 9), + GATE(CLK_PCIEPHY1_OSC0, "clk_pciephy1_osc0", "xin24m", 2, 10), + GATE(CLK_PCIEPHY2_DIV, "clk_pciephy2_div", "clk_pciephy2_div_div", 2, 11), + GATE(CLK_PCIEPHY2_OSC0, "clk_pciephy2_osc0", "xin24m", 2, 12), + GATE(CLK_PCIE30PHY_REF_M, "clk_pcie30phy_ref_m", "ppll_ph0", 2, 13), + GATE(CLK_PCIE30PHY_REF_N, "clk_pcie30phy_ref_n", "ppll_ph180", 2, 14), + GATE(XIN_OSC0_EDPPHY_G, "xin_osc0_edpphy_g", "xin24m", 2, 15), }; static int From nobody Thu Sep 21 16:00:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0V73tFlz4tcdF; Thu, 21 Sep 2023 16:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V73YKhz4RNb; Thu, 21 Sep 2023 16:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXdeQvhbXDp9E2zypeLbHRYCgYpXmZ0vzVkCP9PnggM=; b=dOsrWECRmVdCVBWEcP07DhQ51o+67HrxT2SH+twHMqksDj/DfXW4JvN5TPTVKufJ+d4zx2 wQKGjfgaz6wgOF1MKAE9gNjdF5d7lGHmIYrOV4rZd92oMgmUaayPVWxEBNWeqTuy3e1MWh fn/hqQcI8ZSO6JQo3iP9qThDUblpCK4L02mby8eHOnyZODeSzR2lrB/TdzXxgJ/AoZgpwz U7LAIMyZjT3cX5oHmpOKlD2lnNDFcPgdZzyi1SGsxTBIP88pAfmZ+X5ip7HF9GmxVayKIr fBnLLg9z7Efdw/DIhPJv+mQIv0pHAwyyEFQcDN5FnlKGOlk2LYEd3HKalyiKhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312015; a=rsa-sha256; cv=none; b=px2a5UaKbu6DBM2wcMzUy3600H4Vwop8mwSossJpgrDFQ//FJfye9EsJDJ7waTpbmitgpS eLvNK4d2We2dNBk49/2Wr/8zrgVmuq7upkLwf7vpr2TzYKvblmjKr7qUU1RvQgzsaRzbtT BP49HTcVY+4nIVbz0QfojXjVqxiB2sSUdrmWd5y+oj2dPR839OHOg7xoBNeRX6Gq3kLO7W 6llvNljZThefaLLTkHxu8Sar4y/5ZYTDbjTBGthq/v/AE4HTc4UNNl9EQQEw95mUmULwa8 pktPOCUrOs4ymIPKFeKFMaEf7FwI5PCCsTuWRUKWPaglP80SvwG+MvOSNoGmxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXdeQvhbXDp9E2zypeLbHRYCgYpXmZ0vzVkCP9PnggM=; b=Iw77/ISqwRjWwojvSAAa4n5dM+YOEoPO+q/OKvkNPs4GPzT+BAXq2a6JASMCn6um7MRfqO 3RKmDizY8caKWlzYkZZcwWJx6IZkP8ljSmoT93onTv/LwRceXzSExdi5IiOVNEYdOXtotS qFL8Rgucp0xyK2a61cee8oKF6idKFAzcSwPyhFgATcd5LtUj3/TUhgqz/Fx+/rdm4KYx8x fc4qTUQ6oBjANODsKQjIE/elRABZsN9EgIR6J4y/a+ODfPWTd4f8Vl3gwz5XEOqdKL/fzK eHzEL64KvBFIgNziGmK9GqgB2E0C8e6hMIfB+Bv+TIyx0FSdb5XFRhNOBn8uSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0V72cs3zlYG; Thu, 21 Sep 2023 16:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0FdY048969; Thu, 21 Sep 2023 16:00:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0FiI048952; Thu, 21 Sep 2023 16:00:15 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:15 GMT Message-Id: <202309211600.38LG0FiI048952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 50a0f1ce28b7 - main - arm64: rockchip: rk3568_cru: Rewrite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50a0f1ce28b7f04fc23915fb06124242632a013c Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=50a0f1ce28b7f04fc23915fb06124242632a013c commit 50a0f1ce28b7f04fc23915fb06124242632a013c Author: Emmanuel Vadot AuthorDate: 2023-08-15 08:26:29 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:06 +0000 arm64: rockchip: rk3568_cru: Rewrite Rewrite correctly the clocks for cru : - Export all clocks - Use names from the TRM - Respect clock topology Fixes: a48301a5e094 ("Add initial clocks support for Rockchip RK3568 SoC.") --- sys/arm64/rockchip/clk/rk3568_cru.c | 1991 +++++++++++++++++++------------- sys/arm64/rockchip/clk/rk3568_pmucru.c | 2 - 2 files changed, 1184 insertions(+), 809 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3568_cru.c b/sys/arm64/rockchip/clk/rk3568_cru.c index 4b91e066dcf0..f5992323c3bd 100644 --- a/sys/arm64/rockchip/clk/rk3568_cru.c +++ b/sys/arm64/rockchip/clk/rk3568_cru.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021, 2022 Soren Schmidt + * Copyright (c) 2023, Emmanuel Vadot * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,12 +48,10 @@ #define RK3568_PLLSEL_CON(x) ((x) * 0x20) -#define RK3568_CLKSEL_CON(x) ((x) * 0x4 + 0x100) -#define RK3568_CLKGATE_CON(x) ((x) * 0x4 + 0x300) +#define CRU_CLKSEL_CON(x) ((x) * 0x4 + 0x100) +#define CRU_CLKGATE_CON(x) ((x) * 0x4 + 0x300) #define RK3568_SOFTRST_CON(x) ((x) * 0x4 + 0x400) -#define PNAME(_name) static const char *_name[] - #define RK_PLLRATE(_hz, _ref, _fb, _post1, _post2, _dspd) \ { \ .freq = _hz, \ @@ -80,165 +79,6 @@ }, \ } -/* Clock for ARM core(s) */ -#define RK_ARMDIV(_id, _nm, _pn, _r, _off, _ds, _dw, _ms, _mw, _mp, _ap)\ -{ \ - .type = RK_CLK_ARMCLK, \ - .clk.armclk = &(struct rk_clk_armclk_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _nm, \ - .clkdef.parent_names = _pn, \ - .clkdef.parent_cnt = nitems(_pn), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_off), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .main_parent = _mp, \ - .alt_parent = _ap, \ - .rates = _r, \ - .nrates = nitems(_r), \ - }, \ -} - -/* Composite */ -#define RK_COMPOSITE(_id, _name, _pnames, _o, _ms, _mw, _ds, _dw, _go, _gw,_f)\ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no mux */ -#define RK_COMPNOMUX(_id, _name, _pname, _o, _ds, _dw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no div */ -#define RK_COMPNODIV(_id, _name, _pnames, _o, _ms, _mw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite div only */ -#define RK_COMPDIV(_id, _name, _pname, _o, _ds, _dw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .flags = _f, \ - }, \ -} - - -/* Fixed factor mux/div */ -#define RK_FACTOR(_id, _name, _pname, _mult, _div) \ -{ \ - .type = RK_CLK_FIXED, \ - .clk.fixed = &(struct clk_fixed_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .mult = _mult, \ - .div = _div, \ - }, \ -} - -/* Fractional */ -#define RK_FRACTION(_id, _name, _pname, _o, _go, _gw, _f) \ -{ \ - .type = RK_CLK_FRACT, \ - .clk.fract = &(struct rk_clk_fract_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_FRACT_HAVE_GATE | _f, \ - }, \ -} - -/* Multiplexer */ -#define RK_MUX(_id, _name, _pnames, _o, _ms, _mw, _f) \ -{ \ - .type = RK_CLK_MUX, \ - .clk.mux = &(struct rk_clk_mux_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .shift = _ms, \ - .width = _mw, \ - .mux_flags = _f, \ - }, \ -} - -#define RK_GATE(_id, _name, _pname, _o, _s) \ -{ \ - .id = _id, \ - .name = _name, \ - .parent_name = _pname, \ - .offset = RK3568_CLKGATE_CON(_o), \ - .shift = _s, \ -} - struct rk_clk_pll_rate rk3568_pll_rates[] = { /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd */ RK_PLLRATE(2208000000, 1, 92, 1, 1, 1), @@ -322,113 +162,113 @@ static struct rk_clk_armclk_rates rk3568_armclk_rates[] = { }; /* Parent clock defines */ -PNAME(mux_pll_p) = { "xin24m" }; -PNAME(mux_usb480m_p) = { "xin24m", "usb480m_phy", "clk_rtc_32k" }; -PNAME(mux_armclk_p) = { "apll", "gpll" }; -PNAME(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", +PLIST(mux_pll_p) = { "xin24m" }; +PLIST(mux_usb480m_p) = { "xin24m", "usb480m_phy", "clk_rtc_32k" }; +PLIST(mux_armclk_p) = { "apll", "gpll" }; +PLIST(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", "i2s0_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", +PLIST(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", "i2s0_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s1_8ch_tx_p) = { "clk_i2s1_8ch_tx_src", "clk_i2s1_8ch_tx_frac", +PLIST(clk_i2s1_8ch_tx_p) = { "clk_i2s1_8ch_tx_src", "clk_i2s1_8ch_tx_frac", "i2s1_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s1_8ch_rx_p) = { "clk_i2s1_8ch_rx_src", "clk_i2s1_8ch_rx_frac", +PLIST(clk_i2s1_8ch_rx_p) = { "clk_i2s1_8ch_rx_src", "clk_i2s1_8ch_rx_frac", "i2s1_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s2_2ch_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", +PLIST(clk_i2s2_2ch_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", "i2s2_mclkin", "xin_osc0_half"}; -PNAME(clk_i2s3_2ch_tx_p) = { "clk_i2s3_2ch_tx_src", "clk_i2s3_2ch_tx_frac", +PLIST(clk_i2s3_2ch_tx_p) = { "clk_i2s3_2ch_tx_src", "clk_i2s3_2ch_tx_frac", "i2s3_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s3_2ch_rx_p) = { "clk_i2s3_2ch_rx_src", "clk_i2s3_2ch_rx_frac", +PLIST(clk_i2s3_2ch_rx_p) = { "clk_i2s3_2ch_rx_src", "clk_i2s3_2ch_rx_frac", "i2s3_mclkin", "xin_osc0_half" }; -PNAME(mclk_spdif_8ch_p) = { "mclk_spdif_8ch_src", "mclk_spdif_8ch_frac" }; -PNAME(sclk_audpwm_p) = { "sclk_audpwm_src", "sclk_audpwm_frac" }; -PNAME(sclk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; -PNAME(sclk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; -PNAME(sclk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; -PNAME(sclk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; -PNAME(sclk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; -PNAME(sclk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; -PNAME(sclk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; -PNAME(sclk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; -PNAME(sclk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; -PNAME(mpll_gpll_cpll_npll_p) = { "mpll", "gpll", "cpll", "npll" }; -PNAME(gpll_cpll_npll_p) = { "gpll", "cpll", "npll" }; -PNAME(npll_gpll_p) = { "npll", "gpll" }; -PNAME(cpll_gpll_p) = { "cpll", "gpll" }; -PNAME(gpll_cpll_p) = { "gpll", "cpll" }; -PNAME(gpll_cpll_npll_vpll_p) = { "gpll", "cpll", "npll", "vpll" }; -PNAME(apll_gpll_npll_p) = { "apll", "gpll", "npll" }; -PNAME(sclk_core_pre_p) = { "sclk_core_src", "npll" }; -PNAME(gpll150_gpll100_gpll75_xin24m_p) = { "gpll_150m", "gpll_100m", "gpll_75m", +PLIST(mclk_spdif_8ch_p) = { "mclk_spdif_8ch_src", "mclk_spdif_8ch_frac" }; +PLIST(sclk_audpwm_p) = { "sclk_audpwm_src", "sclk_audpwm_frac" }; +PLIST(sclk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; +PLIST(sclk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; +PLIST(sclk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; +PLIST(sclk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; +PLIST(sclk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; +PLIST(sclk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; +PLIST(sclk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; +PLIST(sclk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; +PLIST(sclk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; +PLIST(mpll_gpll_cpll_npll_p) = { "mpll", "gpll", "cpll", "npll" }; +PLIST(gpll_cpll_npll_p) = { "gpll", "cpll", "npll" }; +PLIST(npll_gpll_p) = { "npll", "gpll" }; +PLIST(cpll_gpll_p) = { "cpll", "gpll" }; +PLIST(gpll_cpll_p) = { "gpll", "cpll" }; +PLIST(gpll_cpll_npll_vpll_p) = { "gpll", "cpll", "npll", "vpll" }; +PLIST(apll_gpll_npll_p) = { "apll", "gpll", "npll" }; +PLIST(sclk_core_pre_p) = { "sclk_core_src", "npll" }; +PLIST(gpll150_gpll100_gpll75_xin24m_p) = { "clk_gpll_div_150m", "clk_gpll_div_100m", "clk_gpll_div_75m", "xin24m" }; -PNAME(clk_gpu_pre_mux_p) = { "clk_gpu_src", "gpu_pvtpll_out" }; -PNAME(clk_npu_pre_ndft_p) = { "clk_npu_src", "dummy"}; -PNAME(clk_npu_p) = { "clk_npu_pre_ndft", "npu_pvtpll_out" }; -PNAME(dpll_gpll_cpll_p) = { "dpll", "gpll", "cpll" }; -PNAME(clk_ddr1x_p) = { "clk_ddrphy1x_src", "dpll" }; -PNAME(gpll200_gpll150_gpll100_xin24m_p) = { "gpll_200m", "gpll_150m", - "gpll_100m", "xin24m" }; -PNAME(gpll100_gpll75_gpll50_p) = { "gpll_100m", "gpll_75m", "cpll_50m" }; -PNAME(i2s0_mclkout_tx_p) = { "clk_i2s0_8ch_tx", "xin_osc0_half" }; -PNAME(i2s0_mclkout_rx_p) = { "clk_i2s0_8ch_rx", "xin_osc0_half" }; -PNAME(i2s1_mclkout_tx_p) = { "clk_i2s1_8ch_tx", "xin_osc0_half" }; -PNAME(i2s1_mclkout_rx_p) = { "clk_i2s1_8ch_rx", "xin_osc0_half" }; -PNAME(i2s2_mclkout_p) = { "clk_i2s2_2ch", "xin_osc0_half" }; -PNAME(i2s3_mclkout_tx_p) = { "clk_i2s3_2ch_tx", "xin_osc0_half" }; -PNAME(i2s3_mclkout_rx_p) = { "clk_i2s3_2ch_rx", "xin_osc0_half" }; -PNAME(mclk_pdm_p) = { "gpll_300m", "cpll_250m", "gpll_200m", "gpll_100m" }; -PNAME(clk_i2c_p) = { "gpll_200m", "gpll_100m", "xin24m", "cpll_100m" }; -PNAME(gpll200_gpll150_gpll100_p) = { "gpll_200m", "gpll_150m", "gpll_100m" }; -PNAME(gpll300_gpll200_gpll100_p) = { "gpll_300m", "gpll_200m", "gpll_100m" }; -PNAME(clk_nandc_p) = { "gpll_200m", "gpll_150m", "cpll_100m", "xin24m" }; -PNAME(sclk_sfc_p) = { "xin24m", "cpll_50m", "gpll_75m", "gpll_100m", - "cpll_125m", "gpll_150m" }; -PNAME(gpll200_gpll150_cpll125_p) = { "gpll_200m", "gpll_150m", "cpll_125m" }; -PNAME(cclk_emmc_p) = { "xin24m", "gpll_200m", "gpll_150m", "cpll_100m", - "cpll_50m", "clk_osc0_div_375k" }; -PNAME(aclk_pipe_p) = { "gpll_400m", "gpll_300m", "gpll_200m", "xin24m" }; -PNAME(gpll200_cpll125_p) = { "gpll_200m", "cpll_125m" }; -PNAME(gpll300_gpll200_gpll100_xin24m_p) = { "gpll_300m", "gpll_200m", - "gpll_100m", "xin24m" }; -PNAME(clk_sdmmc_p) = { "xin24m", "gpll_400m", "gpll_300m", "cpll_100m", - "cpll_50m", "clk_osc0_div_750k" }; -PNAME(cpll125_cpll50_cpll25_xin24m_p) = { "cpll_125m", "cpll_50m", "cpll_25m", +PLIST(clk_gpu_pre_mux_p) = { "clk_gpu_src", "gpu_pvtpll_out" }; +PLIST(clk_npu_pre_ndft_p) = { "clk_npu_src", "clk_npu_np5"}; +PLIST(clk_npu_p) = { "clk_npu_pre_ndft", "npu_pvtpll_out" }; +PLIST(dpll_gpll_cpll_p) = { "dpll", "gpll", "cpll" }; +PLIST(clk_ddr1x_p) = { "clk_ddrphy1x_src", "dpll" }; +PLIST(gpll200_gpll150_gpll100_xin24m_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(gpll100_gpll75_gpll50_p) = { "clk_gpll_div_100m", "clk_gpll_div_75m", "clk_cpll_div_50m" }; +PLIST(i2s0_mclkout_tx_p) = { "clk_i2s0_8ch_tx", "xin_osc0_half" }; +PLIST(i2s0_mclkout_rx_p) = { "clk_i2s0_8ch_rx", "xin_osc0_half" }; +PLIST(i2s1_mclkout_tx_p) = { "clk_i2s1_8ch_tx", "xin_osc0_half" }; +PLIST(i2s1_mclkout_rx_p) = { "clk_i2s1_8ch_rx", "xin_osc0_half" }; +PLIST(i2s2_mclkout_p) = { "clk_i2s2_2ch", "xin_osc0_half" }; +PLIST(i2s3_mclkout_tx_p) = { "clk_i2s3_2ch_tx", "xin_osc0_half" }; +PLIST(i2s3_mclkout_rx_p) = { "clk_i2s3_2ch_rx", "xin_osc0_half" }; +PLIST(mclk_pdm_p) = { "clk_gpll_div_300m", "clk_cpll_div_250m", "clk_gpll_div_200m", "clk_gpll_div_100m" }; +PLIST(clk_i2c_p) = { "clk_gpll_div_200m", "clk_gpll_div_100m", "xin24m", "clk_cpll_div_100m" }; +PLIST(gpll200_gpll150_gpll100_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_gpll_div_100m" }; +PLIST(gpll300_gpll200_gpll100_p) = { "clk_gpll_div_300m", "clk_gpll_div_200m", "clk_gpll_div_100m" }; +PLIST(clk_nandc_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_100m", "xin24m" }; +PLIST(sclk_sfc_p) = { "xin24m", "clk_cpll_div_50m", "clk_gpll_div_75m", "clk_gpll_div_100m", + "clk_cpll_div_125m", "clk_gpll_div_150m" }; +PLIST(gpll200_gpll150_cpll125_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_125m" }; +PLIST(cclk_emmc_p) = { "xin24m", "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_100m", + "clk_cpll_div_50m", "clk_osc0_div_375k" }; +PLIST(aclk_pipe_p) = { "clk_gpll_div_400m", "clk_gpll_div_300m", "clk_gpll_div_200m", "xin24m" }; +PLIST(gpll200_cpll125_p) = { "clk_gpll_div_200m", "clk_cpll_div_125m" }; +PLIST(gpll300_gpll200_gpll100_xin24m_p) = { "clk_gpll_div_300m", "clk_gpll_div_200m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(clk_sdmmc_p) = { "xin24m", "clk_gpll_div_400m", "clk_gpll_div_300m", "clk_cpll_div_100m", + "clk_cpll_div_50m", "clk_osc0_div_750k" }; +PLIST(cpll125_cpll50_cpll25_xin24m_p) = { "clk_cpll_div_125m", "clk_cpll_div_50m", "clk_cpll_div_25m", "xin24m" }; -PNAME(clk_gmac_ptp_p) = { "cpll_62p5", "gpll_100m", "cpll_50m", "xin24m" }; -PNAME(cpll333_gpll300_gpll200_p) = { "cpll_333m", "gpll_300m", "gpll_200m" }; -PNAME(cpll_gpll_hpll_p) = { "cpll", "gpll", "hpll" }; -PNAME(gpll_usb480m_xin24m_p) = { "gpll", "usb480m", "xin24m", "xin24m" }; -PNAME(gpll300_cpll250_gpll100_xin24m_p) = { "gpll_300m", "cpll_250m", - "gpll_100m", "xin24m" }; -PNAME(cpll_gpll_hpll_vpll_p) = { "cpll", "gpll", "hpll", "vpll" }; -PNAME(hpll_vpll_gpll_cpll_p) = { "hpll", "vpll", "gpll", "cpll" }; -PNAME(gpll400_cpll333_gpll200_p) = { "gpll_400m", "cpll_333m", "gpll_200m" }; -PNAME(gpll100_gpll75_cpll50_xin24m_p) = { "gpll_100m", "gpll_75m", "cpll_50m", +PLIST(clk_gmac_ptp_p) = { "clk_cpll_div_62P5m", "clk_gpll_div_100m", "clk_cpll_div_50m", "xin24m" }; +PLIST(cpll333_gpll300_gpll200_p) = { "clk_cpll_div_333m", "clk_gpll_div_300m", "clk_gpll_div_200m" }; +PLIST(cpll_gpll_hpll_p) = { "cpll", "gpll", "hpll" }; +PLIST(gpll_usb480m_xin24m_p) = { "gpll", "usb480m", "xin24m", "xin24m" }; +PLIST(gpll300_cpll250_gpll100_xin24m_p) = { "clk_gpll_div_300m", "clk_cpll_div_250m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(cpll_gpll_hpll_vpll_p) = { "cpll", "gpll", "hpll", "vpll" }; +PLIST(hpll_vpll_gpll_cpll_p) = { "hpll", "vpll", "gpll", "cpll" }; +PLIST(gpll400_cpll333_gpll200_p) = { "clk_gpll_div_400m", "clk_cpll_div_333m", "clk_gpll_div_200m" }; +PLIST(gpll100_gpll75_cpll50_xin24m_p) = { "clk_gpll_div_100m", "clk_gpll_div_75m", "clk_cpll_div_50m", "xin24m" }; -PNAME(xin24m_gpll100_cpll100_p) = { "xin24m", "gpll_100m", "cpll_100m" }; -PNAME(gpll_cpll_usb480m_p) = { "gpll", "cpll", "usb480m" }; -PNAME(gpll100_xin24m_cpll100_p) = { "gpll_100m", "xin24m", "cpll_100m" }; -PNAME(gpll200_xin24m_cpll100_p) = { "gpll_200m", "xin24m", "cpll_100m" }; -PNAME(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; -PNAME(cpll500_gpll400_gpll300_xin24m_p) = { "cpll_500m", "gpll_400m", - "gpll_300m", "xin24m" }; -PNAME(gpll400_gpll300_gpll200_xin24m_p) = { "gpll_400m", "gpll_300m", - "gpll_200m", "xin24m" }; -PNAME(xin24m_cpll100_p) = { "xin24m", "cpll_100m" }; -PNAME(mux_gmac0_p) = { "clk_mac0_2top", "gmac0_clkin" }; -PNAME(mux_gmac0_rgmii_speed_p) = { "clk_gmac0", "clk_gmac0", +PLIST(xin24m_gpll100_cpll100_p) = { "xin24m", "clk_gpll_div_100m", "clk_cpll_div_100m" }; +PLIST(gpll_cpll_usb480m_p) = { "gpll", "cpll", "usb480m" }; +PLIST(gpll100_xin24m_cpll100_p) = { "clk_gpll_div_100m", "xin24m", "clk_cpll_div_100m" }; +PLIST(gpll200_xin24m_cpll100_p) = { "clk_gpll_div_200m", "xin24m", "clk_cpll_div_100m" }; +PLIST(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; +PLIST(cpll500_gpll400_gpll300_xin24m_p) = { "clk_cpll_div_500m", "clk_gpll_div_400m", + "clk_gpll_div_300m", "xin24m" }; +PLIST(gpll400_gpll300_gpll200_xin24m_p) = { "clk_gpll_div_400m", "clk_gpll_div_300m", + "clk_gpll_div_200m", "xin24m" }; +PLIST(xin24m_cpll100_p) = { "xin24m", "clk_cpll_div_100m" }; +PLIST(mux_gmac0_p) = { "clk_mac0_2top", "gmac0_clkin" }; +PLIST(mux_gmac0_rgmii_speed_p) = { "clk_gmac0", "clk_gmac0", "clk_gmac0_tx_div50", "clk_gmac0_tx_div5" }; -PNAME(mux_gmac0_rmii_speed_p) = { "clk_gmac0_rx_div20", "clk_gmac0_rx_div2" }; -PNAME(mux_gmac0_rx_tx_p) = { "clk_gmac0_rgmii_speed", "clk_gmac0_rmii_speed", +PLIST(mux_gmac0_rmii_speed_p) = { "clk_gmac0_rx_div20", "clk_gmac0_rx_div2" }; +PLIST(mux_gmac0_rx_tx_p) = { "clk_gmac0_rgmii_speed", "clk_gmac0_rmii_speed", "clk_gmac0_xpcs_mii" }; -PNAME(mux_gmac1_p) = { "clk_mac1_2top", "gmac1_clkin" }; -PNAME(mux_gmac1_rgmii_speed_p) = { "clk_gmac1", "clk_gmac1", +PLIST(mux_gmac1_p) = { "clk_mac1_2top", "gmac1_clkin" }; +PLIST(mux_gmac1_rgmii_speed_p) = { "clk_gmac1", "clk_gmac1", "clk_gmac1_tx_div50", "clk_gmac1_tx_div5" }; -PNAME(mux_gmac1_rmii_speed_p) = { "clk_gmac1_rx_div20", "clk_gmac1_rx_div2" }; -PNAME(mux_gmac1_rx_tx_p) = { "clk_gmac1_rgmii_speed", "clk_gmac1_rmii_speed", +PLIST(mux_gmac1_rmii_speed_p) = { "clk_gmac1_rx_div20", "clk_gmac1_rx_div2" }; +PLIST(mux_gmac1_rx_tx_p) = { "clk_gmac1_rgmii_speed", "clk_gmac1_rmii_speed", "clk_gmac1_xpcs_mii" }; -PNAME(clk_mac_2top_p) = { "cpll_125m", "cpll_50m", "cpll_25m", "ppll" }; -PNAME(aclk_rkvdec_pre_p) = { "gpll", "cpll" }; -PNAME(clk_rkvdec_core_p) = { "gpll", "cpll", "npll", "vpll" }; +PLIST(clk_mac_2top_p) = { "clk_cpll_div_125m", "clk_cpll_div_50m", "clk_cpll_div_25m", "ppll" }; +PLIST(aclk_rkvdec_pre_p) = { "gpll", "cpll" }; +PLIST(clk_rkvdec_core_p) = { "gpll", "cpll", "npll", "vpll" }; /* CLOCKS */ static struct rk_clk rk3568_clks[] = { @@ -436,7 +276,7 @@ static struct rk_clk rk3568_clks[] = { LINK("xin24m"), LINK("clk_rtc_32k"), LINK("usb480m_phy"), - LINK("mpll"), // SOS SCRU + LINK("mpll"), /* It lives in SCRU */ LINK("i2s0_mclkin"), LINK("i2s1_mclkin"), LINK("i2s2_mclkin"), @@ -456,563 +296,1100 @@ static struct rk_clk rk3568_clks[] = { RK_PLL(PLL_CPLL, "cpll", mux_pll_p, 3, 4), RK_PLL(PLL_NPLL, "npll", mux_pll_p, 4, 10), RK_PLL(PLL_VPLL, "vpll", mux_pll_p, 5, 12), - RK_ARMDIV(ARMCLK, "armclk", mux_armclk_p, rk3568_armclk_rates, 0, 0, 5, + ARMDIV(ARMCLK, "armclk", mux_armclk_p, rk3568_armclk_rates, 0, 0, 5, 6, 1, 0, 1), - RK_FACTOR(0, "clk_osc0_div_375k", "clk_osc0_div_750k", 1, 2), - RK_FACTOR(0, "xin_osc0_half", "xin24m", 1, 2), - RK_MUX(USB480M, "usb480m", mux_usb480m_p, -16, 14, 2, 0), + FFACT(0, "clk_osc0_div_375k", "clk_osc0_div_750k", 1, 2), + FFACT(0, "xin_osc0_half", "xin24m", 1, 2), + MUX(USB480M, "usb480m", mux_usb480m_p, 0, -16, 14, 2), /* Clocks */ - RK_COMPNOMUX(0, "gpll_400m", "gpll", 75, 0, 5, 35, 0, 0), - RK_COMPNOMUX(0, "gpll_300m", "gpll", 75, 8, 5, 35, 1, 0), - RK_COMPNOMUX(0, "gpll_200m", "gpll", 76, 0, 5, 35, 2, 0), - RK_COMPNOMUX(0, "gpll_150m", "gpll", 76, 8, 5, 35, 3, 0), - RK_COMPNOMUX(0, "gpll_100m", "gpll", 77, 0, 5, 35, 4, 0), - RK_COMPNOMUX(0, "gpll_75m", "gpll", 77, 8, 5, 35, 5, 0), - RK_COMPNOMUX(0, "gpll_20m", "gpll", 78, 0, 6, 35, 6, 0), - RK_COMPNOMUX(CPLL_500M, "cpll_500m", "cpll", 78, 8, 5, 35, 7, 0), - RK_COMPNOMUX(CPLL_333M, "cpll_333m", "cpll", 79, 0, 5, 35, 8, 0), - RK_COMPNOMUX(CPLL_250M, "cpll_250m", "cpll", 79, 8, 5, 35, 9, 0), - RK_COMPNOMUX(CPLL_125M, "cpll_125m", "cpll", 80, 0, 5, 35, 10, 0), - RK_COMPNOMUX(CPLL_100M, "cpll_100m", "cpll", 82, 0, 5, 35, 11, 0), - RK_COMPNOMUX(CPLL_62P5M, "cpll_62p5", "cpll", 80, 8, 5, 35, 12, 0), - RK_COMPNOMUX(CPLL_50M, "cpll_50m", "cpll", 81, 0, 5, 35, 13, 0), - RK_COMPNOMUX(CPLL_25M, "cpll_25m", "cpll", 81, 8, 6, 35, 14, 0), - RK_COMPNOMUX(0, "clk_osc0_div_750k", "xin24m", 82, 8, 6, 35, 15, 0), - RK_COMPOSITE(0, "sclk_core_src", apll_gpll_npll_p, 2, 8, 2, 0, 4, 0, - 5, 0), - RK_COMPNODIV(0, "sclk_core", sclk_core_pre_p, 2, 15, 1, 0, 7, 0), - RK_COMPNOMUX(0, "atclk_core", "armclk", 3, 0, 5, 0, 8, 0), - RK_COMPNOMUX(0, "gicclk_core", "armclk", 3, 8, 5, 0, 9, 0), - RK_COMPNOMUX(0, "pclk_core_pre", "armclk", 4, 0, 5, 0, 10, 0), - RK_COMPNOMUX(0, "periphclk_core_pre", "armclk", 4, 8, 5, 0, 11, 0), - RK_COMPNOMUX(0, "tsclk_core", "periphclk_core_pre", 5, 0, 4, 0, 14, 0), - RK_COMPNOMUX(0, "cntclk_core", "periphclk_core_pre", 5, 4, 4, 0, 15, 0), - RK_COMPNOMUX(0, "aclk_core", "sclk_core", 5, 8, 5, 1, 0, 0), - RK_COMPNODIV(ACLK_CORE_NIU2BUS, "aclk_core_niu2bus", - gpll150_gpll100_gpll75_xin24m_p, 5, 14, 2, 1, 2, 0), - RK_COMPOSITE(CLK_GPU_SRC, "clk_gpu_src", mpll_gpll_cpll_npll_p, 6, 6, 2, - 0, 4, 2, 0, 0), - RK_MUX(CLK_GPU_PRE_MUX, "clk_gpu_pre_mux", clk_gpu_pre_mux_p, 6, 11, - 1, 0), - RK_COMPDIV(ACLK_GPU_PRE, "aclk_gpu_pre", "clk_gpu_pre_mux", 6, 8, 2, 0), - RK_COMPDIV(PCLK_GPU_PRE, "pclk_gpu_pre", "clk_gpu_pre_mux", 6, 12, 4,0), - RK_COMPOSITE(CLK_NPU_SRC, "clk_npu_src", npll_gpll_p, 7, 6, 1, 0, 4, 3, - 0, 0), - RK_MUX(CLK_NPU_PRE_NDFT, "clk_npu_pre_ndft", clk_npu_pre_ndft_p, 7, 8, - 1, 0), - RK_MUX(CLK_NPU, "clk_npu", clk_npu_p, 7, 15, 1, 0), - RK_COMPNOMUX(HCLK_NPU_PRE, "hclk_npu_pre", "clk_npu", 8, 0, 4, 3, 2, 0), - RK_COMPNOMUX(PCLK_NPU_PRE, "pclk_npu_pre", "clk_npu", 8, 4, 4, 3, 3, 0), - RK_COMPOSITE(CLK_DDRPHY1X_SRC, "clk_ddrphy1x_src", dpll_gpll_cpll_p, 9, - 6, 2, 0, 5, 4, 0, 0), - RK_MUX(CLK_DDR1X, "clk_ddr1x", clk_ddr1x_p, 9, 15, 1, - RK_CLK_COMPOSITE_GRF), - RK_COMPNOMUX(CLK_MSCH, "clk_msch", "clk_ddr1x", 10, 0, 2, 4, 2, 0), - RK_COMPNODIV(ACLK_GIC_AUDIO, "aclk_gic_audio", - gpll200_gpll150_gpll100_xin24m_p, 10, 8, 2, 5, 0, 0), - RK_COMPNODIV(HCLK_GIC_AUDIO, "hclk_gic_audio", - gpll150_gpll100_gpll75_xin24m_p, 10, 10, 2, 5, 1, 0), - RK_COMPNODIV(DCLK_SDMMC_BUFFER, "dclk_sdmmc_buffer", - gpll100_gpll75_gpll50_p, 10, 12, 2, 5, 9, 0), - RK_COMPOSITE(CLK_I2S0_8CH_TX_SRC, "clk_i2s0_8ch_tx_src", - gpll_cpll_npll_p, 11, 8, 2, 0, 7, 6, 0, 0), - RK_MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, 11, 10, - 2, 0), - RK_FRACTION(CLK_I2S0_8CH_TX_FRAC, "clk_i2s0_8ch_tx_frac", - "clk_i2s0_8ch_tx_src", 12, 6, 1, 0), - RK_COMPNODIV(I2S0_MCLKOUT_TX, "i2s0_mclkout_tx", i2s0_mclkout_tx_p, 11, - 15, 1, 6, 3, 0), - RK_COMPOSITE(CLK_I2S0_8CH_RX_SRC, "clk_i2s0_8ch_rx_src", - gpll_cpll_npll_p, 13, 8, 2, 0, 7, 6, 4, 0), - RK_MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, 13, 10, - 2, 0), - RK_FRACTION(CLK_I2S0_8CH_RX_FRAC, "clk_i2s0_8ch_rx_frac", - "clk_i2s0_8ch_rx_src", 14, 6, 5, 0), - RK_COMPNODIV(I2S0_MCLKOUT_RX, "i2s0_mclkout_rx", i2s0_mclkout_rx_p, 13, - 15, 1, 6, 7, 0), - RK_COMPOSITE(CLK_I2S1_8CH_TX_SRC, "clk_i2s1_8ch_tx_src", - gpll_cpll_npll_p, 15, 8, 2, 0, 7, 6, 8, 0), - RK_MUX(CLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", clk_i2s1_8ch_tx_p, 15, 10, - 2, 0), - RK_FRACTION(CLK_I2S1_8CH_TX_FRAC, "clk_i2s1_8ch_tx_frac", - "clk_i2s1_8ch_tx_src", 16, 6, 9, 0), - RK_COMPNODIV(I2S1_MCLKOUT_TX, "i2s1_mclkout_tx", i2s1_mclkout_tx_p, 15, - 15, 1, 6, 11, 0), - RK_COMPOSITE(CLK_I2S1_8CH_RX_SRC, "clk_i2s1_8ch_rx_src", - gpll_cpll_npll_p, 17, 8, 2, 0, 7, 6, 12, 0), - RK_MUX(CLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", clk_i2s1_8ch_rx_p, 17, 10, - 2, 0), - RK_FRACTION(CLK_I2S1_8CH_RX_FRAC, "clk_i2s1_8ch_rx_frac", - "clk_i2s1_8ch_rx_src", 18, 6, 13, 0), - RK_COMPNODIV(I2S1_MCLKOUT_RX, "i2s1_mclkout_rx", i2s1_mclkout_rx_p, 17, - 15, 1, 6, 15, 0), - RK_COMPOSITE(CLK_I2S2_2CH_SRC, "clk_i2s2_2ch_src", gpll_cpll_npll_p, 19, - 8, 2, 0, 7, 7, 0, 0), - RK_MUX(CLK_I2S2_2CH, "clk_i2s2_2ch", clk_i2s2_2ch_p, 19, 10, 2, 0), - RK_FRACTION(CLK_I2S2_2CH_FRAC, "clk_i2s2_2ch_frac", "clk_i2s2_2ch_src", - 20, 7, 1, 0), - RK_COMPNODIV(I2S2_MCLKOUT, "i2s2_mclkout", i2s2_mclkout_p, 19, 15, 1, 7, - 3, 0), - RK_COMPOSITE(CLK_I2S3_2CH_TX_SRC, "clk_i2s3_2ch_tx_src", - gpll_cpll_npll_p, 21, 8, 2, 0, 7, 7, 4, 0), - RK_MUX(CLK_I2S3_2CH_TX, "clk_i2s3_2ch_tx", clk_i2s3_2ch_tx_p, 21, 10, - 2, 0), - RK_FRACTION(CLK_I2S3_2CH_TX_FRAC, "clk_i2s3_2ch_tx_frac", - "clk_i2s3_2ch_tx_src", 22, 7, 5, 0), - RK_COMPNODIV(I2S3_MCLKOUT_TX, "i2s3_mclkout_tx", i2s3_mclkout_tx_p, 21, - 15, 1, 7, 7, 0), - RK_COMPOSITE(CLK_I2S3_2CH_RX_SRC, "clk_i2s3_2ch_rx_src", - gpll_cpll_npll_p, 83, 8, 2, 0, 7, 7, 8, 0), - RK_MUX(CLK_I2S3_2CH_RX, "clk_i2s3_2ch_rx", clk_i2s3_2ch_rx_p, 83, 10, - 2, 0), - RK_FRACTION(CLK_I2S3_2CH_RX_FRAC, "clk_i2s3_2ch_rx_frac", - "clk_i2s3_2ch_rx_src", 84, 7, 9, 0), - RK_COMPNODIV(I2S3_MCLKOUT_RX, "i2s3_mclkout_rx", i2s3_mclkout_rx_p, 83, - 15, 1, 7, 11, 0), - RK_COMPNODIV(MCLK_PDM, "mclk_pdm", mclk_pdm_p, 23, 8, 2, 5, 15, 0), - RK_COMPOSITE(MCLK_SPDIF_8CH_SRC, "mclk_spdif_8ch_src", cpll_gpll_p, 23, - 14, 1, 0, 7, 7, 14, 0), - RK_MUX(MCLK_SPDIF_8CH, "mclk_spdif_8ch", mclk_spdif_8ch_p, 23, 15, 1,0), - RK_FRACTION(MCLK_SPDIF_8CH_FRAC, "mclk_spdif_8ch_frac", - "mclk_spdif_8ch_src", 24, 7, 15, 0), - RK_COMPOSITE(SCLK_AUDPWM_SRC, "sclk_audpwm_src", gpll_cpll_p, 25, 14, 1, - 0, 6, 8, 1, 0), - RK_MUX(SCLK_AUDPWM, "sclk_audpwm", sclk_audpwm_p, 25, 15, 1, 0), - RK_FRACTION(SCLK_AUDPWM_FRAC, "sclk_audpwm_frac", "sclk_audpwm_src", 26, - 8, 2, 0), - RK_COMPNODIV(CLK_ACDCDIG_I2C, "clk_acdcdig_i2c", clk_i2c_p, 23, 10, 2, - 8, 4, 0), - RK_COMPNODIV(ACLK_SECURE_FLASH, "aclk_secure_flash", - gpll200_gpll150_gpll100_xin24m_p, 27, 0, 2, 8, 7, 0), - RK_COMPNODIV(HCLK_SECURE_FLASH, "hclk_secure_flash", - gpll150_gpll100_gpll75_xin24m_p, 27, 2, 2, 8, 8, 0), - RK_COMPNODIV(CLK_CRYPTO_NS_CORE, "clk_crypto_ns_core", - gpll200_gpll150_gpll100_p, 27, 4, 2, 8, 13, 0), - RK_COMPNODIV(CLK_CRYPTO_NS_PKA, "clk_crypto_ns_pka", - gpll300_gpll200_gpll100_p, 27, 6, 2, 8, 14, 0), - RK_COMPNODIV(NCLK_NANDC, "nclk_nandc", clk_nandc_p, 28, 0, 2, 9, 1, 0), - RK_COMPNODIV(SCLK_SFC, "sclk_sfc", sclk_sfc_p, 28, 4, 3, 9, 4, 0), - RK_COMPNODIV(BCLK_EMMC, "bclk_emmc", gpll200_gpll150_cpll125_p, 28, 8, - 2, 9, 7, 0), - RK_COMPNODIV(CCLK_EMMC, "cclk_emmc", cclk_emmc_p, 28, 12, 3, 9, 8, 0), - RK_COMPNODIV(ACLK_PIPE, "aclk_pipe", aclk_pipe_p, 29, 0, 2, 10, 0, 0), - RK_COMPNOMUX(PCLK_PIPE, "pclk_pipe", "aclk_pipe", 29, 4, 4, 10, 1, 0), - RK_COMPNODIV(CLK_USB3OTG0_SUSPEND, "clk_usb3otg0_suspend", xin24m_32k_p, - 29, 8, 1, 10, 10, 0), - RK_COMPNODIV(CLK_USB3OTG1_SUSPEND, "clk_usb3otg1_suspend", xin24m_32k_p, - 29, 9, 1, 10, 14, 0), - RK_COMPNODIV(CLK_XPCS_EEE, "clk_xpcs_eee", gpll200_cpll125_p, 29, 13, 1, - 10, 4, 0), - RK_COMPNODIV(ACLK_PHP, "aclk_php", gpll300_gpll200_gpll100_xin24m_p, 30, - 0, 2, 14, 8, 0), - RK_COMPNODIV(HCLK_PHP, "hclk_php", gpll150_gpll100_gpll75_xin24m_p, 30, - 2, 2, 14, 9, 0), - RK_COMPNOMUX(PCLK_PHP, "pclk_php", "aclk_php", 30, 4, 4, 14, 10, 0), - RK_COMPNODIV(CLK_SDMMC0, "clk_sdmmc0", clk_sdmmc_p, 30, 8, 3, 15, 1, 0), - RK_COMPNODIV(CLK_SDMMC1, "clk_sdmmc1", clk_sdmmc_p, 30, 12, 3, 15, 3,0), - RK_COMPNODIV(CLK_MAC0_2TOP, "clk_mac0_2top", clk_mac_2top_p, 31, 8, 2, - 15, 7, 0), - RK_COMPNODIV(CLK_MAC0_OUT, "clk_mac0_out", - cpll125_cpll50_cpll25_xin24m_p, 31, 14, 2, 15, 8, 0), - RK_COMPNODIV(CLK_GMAC0_PTP_REF, "clk_gmac0_ptp_ref", clk_gmac_ptp_p, 31, - 12, 2, 15, 4, 0), - RK_MUX(SCLK_GMAC0, "clk_gmac0", mux_gmac0_p, 31, 2, 1, 0), - RK_FACTOR(0, "clk_gmac0_tx_div5", "clk_gmac0", 1, 5), - RK_FACTOR(0, "clk_gmac0_tx_div50", "clk_gmac0", 1, 50), - RK_FACTOR(0, "clk_gmac0_rx_div2", "clk_gmac0", 1, 2), - RK_FACTOR(0, "clk_gmac0_rx_div20", "clk_gmac0", 1, 20), - RK_MUX(SCLK_GMAC0_RGMII_SPEED, "clk_gmac0_rgmii_speed", - mux_gmac0_rgmii_speed_p, 31, 4, 2, 0), - RK_MUX(SCLK_GMAC0_RMII_SPEED, "clk_gmac0_rmii_speed", - mux_gmac0_rmii_speed_p, 31, 3, 1, 0), - RK_MUX(SCLK_GMAC0_RX_TX, "clk_gmac0_rx_tx", mux_gmac0_rx_tx_p, 31, 0, - 2, 0), - RK_COMPNODIV(ACLK_USB, "aclk_usb", gpll300_gpll200_gpll100_xin24m_p, 32, - 0, 2, 16, 0, 0), - RK_COMPNODIV(HCLK_USB, "hclk_usb", gpll150_gpll100_gpll75_xin24m_p, 32, - 2, 2, 16, 1, 0), - RK_COMPNOMUX(PCLK_USB, "pclk_usb", "aclk_usb", 32, 4, 4, 16, 2, 0), - RK_COMPNODIV(CLK_SDMMC2, "clk_sdmmc2", clk_sdmmc_p, 32, 8, 3, 17, 1, 0), - RK_COMPNODIV(CLK_MAC1_2TOP, "clk_mac1_2top", clk_mac_2top_p, 33, 8, 2, - 17, 5, 0), - RK_COMPNODIV(CLK_MAC1_OUT, "clk_mac1_out", - cpll125_cpll50_cpll25_xin24m_p, 33, 14, 2, 17, 6, 0), - RK_COMPNODIV(CLK_GMAC1_PTP_REF, "clk_gmac1_ptp_ref", clk_gmac_ptp_p, 33, - 12, 2, 17, 2, 0), - RK_MUX(SCLK_GMAC1, "clk_gmac1", mux_gmac1_p, 33, 2, 1, 0), - RK_FACTOR(0, "clk_gmac1_tx_div5", "clk_gmac1", 1, 5), - RK_FACTOR(0, "clk_gmac1_tx_div50", "clk_gmac1", 1, 50), - RK_FACTOR(0, "clk_gmac1_rx_div2", "clk_gmac1", 1, 2), - RK_FACTOR(0, "clk_gmac1_rx_div20", "clk_gmac1", 1, 20), - RK_MUX(SCLK_GMAC1_RGMII_SPEED, "clk_gmac1_rgmii_speed", - mux_gmac1_rgmii_speed_p, 33, 4, 2, 0), - RK_MUX(SCLK_GMAC1_RMII_SPEED, "clk_gmac1_rmii_speed", - mux_gmac1_rmii_speed_p, 33, 3, 1, 0), - RK_MUX(SCLK_GMAC1_RX_TX, "clk_gmac1_rx_tx", mux_gmac1_rx_tx_p, 33, 0, - 2, 0), - RK_COMPNODIV(ACLK_PERIMID, "aclk_perimid", - gpll300_gpll200_gpll100_xin24m_p, 10, 4, 2, 14, 0, 0), - RK_COMPNODIV(HCLK_PERIMID, "hclk_perimid", - gpll150_gpll100_gpll75_xin24m_p, 10, 6, 2, 14, 1, 0), - RK_COMPNODIV(ACLK_VI, "aclk_vi", gpll400_gpll300_gpll200_xin24m_p, 34, - 0, 2, 18, 0, 0), - RK_COMPNOMUX(HCLK_VI, "hclk_vi", "aclk_vi", 34, 4, 4, 18, 1, 0), - RK_COMPNOMUX(PCLK_VI, "pclk_vi", "aclk_vi", 34, 8, 4, 18, 2, 0), - RK_COMPNODIV(DCLK_VICAP, "dclk_vicap", cpll333_gpll300_gpll200_p, 34, - 14, 2, 18, 11, 0), - RK_COMPOSITE(CLK_ISP, "clk_isp", cpll_gpll_hpll_p, 35, 6, 2, 0, 5, 19, - 2, 0), - RK_COMPOSITE(CLK_CIF_OUT, "clk_cif_out", gpll_usb480m_xin24m_p, 35, 14, - 2, 8, 6, 19, 8, 0), - RK_COMPOSITE(CLK_CAM0_OUT, "clk_cam0_out", gpll_usb480m_xin24m_p, 36, 6, - 2, 0, 6, 19, 9, 0), - RK_COMPOSITE(CLK_CAM1_OUT, "clk_cam1_out", gpll_usb480m_xin24m_p, 36, - 14, 2, 8, 6, 19, 10, 0), - RK_COMPNODIV(ACLK_VO, "aclk_vo", gpll300_cpll250_gpll100_xin24m_p, 37, - 0, 2, 20, 0, 0), - RK_COMPNOMUX(HCLK_VO, "hclk_vo", "aclk_vo", 37, 8, 4, 20, 1, 0), - RK_COMPNOMUX(PCLK_VO, "pclk_vo", "aclk_vo", 37, 12, 4, 20, 2, 0), - RK_COMPOSITE(ACLK_VOP_PRE, "aclk_vop_pre", cpll_gpll_hpll_vpll_p, 38, 6, - 2, 0, 5, 20, 6, 0), - RK_COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, 39, 10, 2, - 0, 8, 20, 10, 0), - RK_COMPOSITE(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, 40, 10, 2, - 0, 8, 20, 11, 0), - RK_COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, 41, 10, 2, - 0, 8, 20, 12, 0), - RK_COMPNODIV(CLK_EDP_200M, "clk_edp_200m", gpll200_gpll150_cpll125_p, - 38, 8, 2, 21, 9, 0), - RK_COMPOSITE(ACLK_VPU_PRE, "aclk_vpu_pre", gpll_cpll_p, 42, 7, 1, 0, 5, - 22, 0, 0), - RK_COMPNOMUX(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 42, 8, 4, 22, - 1, 0), - RK_COMPNODIV(ACLK_RGA_PRE, "aclk_rga_pre", - gpll300_cpll250_gpll100_xin24m_p, 43, 0, 2, 23, 0, 0), - RK_COMPNOMUX(HCLK_RGA_PRE, "hclk_rga_pre", "aclk_rga_pre", 43, 8, 4, 23, - 1, 0), - RK_COMPNOMUX(PCLK_RGA_PRE, "pclk_rga_pre", "aclk_rga_pre", 43, 12, 4, - 22, 12, 0), - RK_COMPNODIV(CLK_RGA_CORE, "clk_rga_core", gpll300_gpll200_gpll100_p, - 43, 2, 2, 23, 6, 0), - RK_COMPNODIV(CLK_IEP_CORE, "clk_iep_core", gpll300_gpll200_gpll100_p, - 43, 4, 2, 23, 9, 0), - RK_COMPNODIV(DCLK_EBC, "dclk_ebc", gpll400_cpll333_gpll200_p, 43, 6, 2, - 23, 11, 0), - RK_COMPOSITE(ACLK_RKVENC_PRE, "aclk_rkvenc_pre", gpll_cpll_npll_p, 44, - 6, 2, 0, 5, 24, 0, 0), - RK_COMPNOMUX(HCLK_RKVENC_PRE, "hclk_rkvenc_pre", "aclk_rkvenc_pre", 44, - 8, 4, 24, 1, 0), - RK_COMPOSITE(CLK_RKVENC_CORE, "clk_rkvenc_core", gpll_cpll_npll_vpll_p, - 45, 14, 2, 0, 5, 24, 8, 0), - RK_COMPOSITE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", aclk_rkvdec_pre_p, 47, - 7, 1, 0, 5, 25, 0, 0), - RK_COMPNOMUX(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 47, - 8, 4, 25, 1, 0), - RK_COMPOSITE(CLK_RKVDEC_CA, "clk_rkvdec_ca", gpll_cpll_npll_vpll_p, 48, - 6, 2, 0, 5, 25, 6, 0), - RK_COMPOSITE(CLK_RKVDEC_CORE, "clk_rkvdec_core", clk_rkvdec_core_p, 49, - 14, 2, 8, 5, 25, 7, 0), - RK_COMPOSITE(CLK_RKVDEC_HEVC_CA, "clk_rkvdec_hevc_ca", - gpll_cpll_npll_vpll_p, 49, 6, 2, 0, 5, 25, 8, 0), - RK_COMPNODIV(ACLK_BUS, "aclk_bus", gpll200_gpll150_gpll100_xin24m_p, 50, - 0, 2, 26, 0, 0), - RK_COMPNODIV(PCLK_BUS, "pclk_bus", gpll100_gpll75_cpll50_xin24m_p, 50, - 4, 2, 26, 1, 0), - RK_COMPOSITE(CLK_TSADC_TSEN, "clk_tsadc_tsen", xin24m_gpll100_cpll100_p, - 51, 4, 2, 0, 3, 26, 5, 0), - RK_COMPNOMUX(CLK_TSADC, "clk_tsadc", "clk_tsadc_tsen", 51, 8, 7, 26, - 6, 0), - RK_COMPOSITE(CLK_UART1_SRC, "clk_uart1_src", gpll_cpll_usb480m_p, 52, 8, - 2, 0, 7, 27, 13, 0), - RK_FRACTION(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", 53, 27, - 14, 0), - RK_MUX(0, "sclk_uart1_mux", sclk_uart1_p, 52, 12, 2, 0), - RK_COMPOSITE(CLK_UART2_SRC, "clk_uart2_src", gpll_cpll_usb480m_p, 54, 8, - 2, 0, 7, 28, 1, 0), - RK_FRACTION(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", 55, 28, - 2, 0), - RK_MUX(0, "sclk_uart2_mux", sclk_uart2_p, 54, 12, 2, 0), - RK_COMPOSITE(CLK_UART3_SRC, "clk_uart3_src", gpll_cpll_usb480m_p, 56, 8, - 2, 0, 7, 28, 5, 0), - RK_FRACTION(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", 57, 28, - 6, 0), - RK_MUX(0, "sclk_uart3_mux", sclk_uart3_p, 56, 12, 2, 0), - RK_COMPOSITE(CLK_UART4_SRC, "clk_uart4_src", gpll_cpll_usb480m_p, 58, 8, - 2, 0, 7, 28, 9, 0), - RK_FRACTION(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", 59, 28, - 10, 0), - RK_MUX(0, "sclk_uart4_mux", sclk_uart4_p, 58, 12, 2, 0), - RK_COMPOSITE(CLK_UART5_SRC, "clk_uart5_src", gpll_cpll_usb480m_p, 60, 8, - 2, 0, 7, 28, 13, 0), - RK_FRACTION(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", 61, 28, - 14, 0), - RK_MUX(0, "sclk_uart5_mux", sclk_uart5_p, 60, 12, 2, 0), - RK_COMPOSITE(CLK_UART6_SRC, "clk_uart6_src", gpll_cpll_usb480m_p, 62, 8, - 2, 0, 7, 29, 1, 0), - RK_FRACTION(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", 63, 29, - 2, 0), - RK_MUX(0, "sclk_uart6_mux", sclk_uart6_p, 62, 12, 2, 0), - RK_COMPOSITE(CLK_UART7_SRC, "clk_uart7_src", gpll_cpll_usb480m_p, 64, 8, - 2, 0, 7, 29, 5, 0), - RK_FRACTION(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", 65, 29, - 6, 0), - RK_MUX(0, "sclk_uart7_mux", sclk_uart7_p, 64, 12, 2, 0), - RK_COMPOSITE(CLK_UART8_SRC, "clk_uart8_src", gpll_cpll_usb480m_p, 66, 8, - 2, 0, 7, 29, 9, 0), - RK_FRACTION(CLK_UART8_FRAC, "clk_uart8_frac", "clk_uart8_src", 67, 29, - 10, 0), - RK_MUX(0, "sclk_uart8_mux", sclk_uart8_p, 66, 12, 2, 0), - RK_COMPOSITE(CLK_UART9_SRC, "clk_uart9_src", gpll_cpll_usb480m_p, 68, 8, - 2, 0, 7, 29, 13, 0), - RK_FRACTION(CLK_UART9_FRAC, "clk_uart9_frac", "clk_uart9_src", 69, 29, - 14, 0), - RK_MUX(0, "sclk_uart9_mux", sclk_uart9_p, 68, 12, 2, 0), - RK_COMPOSITE(CLK_CAN0, "clk_can0", gpll_cpll_p, 70, 7, 1, 0, 5, 27, - 6, 0), - RK_COMPOSITE(CLK_CAN1, "clk_can1", gpll_cpll_p, 70, 15, 1, 8, 5, 27, - 8, 0), - RK_COMPOSITE(CLK_CAN2, "clk_can2", gpll_cpll_p, 71, 7, 1, 0, 5, 27, - 10, 0), - RK_COMPNODIV(CLK_I2C, "clk_i2c", clk_i2c_p, 71, 8, 2, 32, 10, 0), - RK_COMPNODIV(CLK_SPI0, "clk_spi0", gpll200_xin24m_cpll100_p, 72, 0, 1, - 30, 11, 0), - RK_COMPNODIV(CLK_SPI1, "clk_spi1", gpll200_xin24m_cpll100_p, 72, 2, 1, - 30, 13, 0), - RK_COMPNODIV(CLK_SPI2, "clk_spi2", gpll200_xin24m_cpll100_p, 72, 4, 1, - 30, 15, 0), - RK_COMPNODIV(CLK_SPI3, "clk_spi3", gpll200_xin24m_cpll100_p, 72, 6, 1, - 31, 1, 0), - RK_COMPNODIV(CLK_PWM1, "clk_pwm1", gpll100_xin24m_cpll100_p, 72, 8, 1, - 31, 11, 0), - RK_COMPNODIV(CLK_PWM2, "clk_pwm2", gpll100_xin24m_cpll100_p, 72, 10, 1, - 31, 14, 0), - RK_COMPNODIV(CLK_PWM3, "clk_pwm3", gpll100_xin24m_cpll100_p, 72, 12, 1, - 32, 1, 0), - RK_COMPNODIV(DBCLK_GPIO, "dbclk_gpio", xin24m_32k_p, 72, 14, 1, 32, - 11, 0), - RK_COMPNODIV(ACLK_TOP_HIGH, "aclk_top_high", - cpll500_gpll400_gpll300_xin24m_p, 73, 0, 2, 33, 0, 0), - RK_COMPNODIV(ACLK_TOP_LOW, "aclk_top_low", - gpll400_gpll300_gpll200_xin24m_p, 73, 4, 2, 33, 1, 0), - RK_COMPNODIV(HCLK_TOP, "hclk_top", gpll150_gpll100_gpll75_xin24m_p, 73, - 8, 2, 33, 2, 0), - RK_COMPNODIV(PCLK_TOP, "pclk_top", gpll100_gpll75_cpll50_xin24m_p, 73, - 12, 2, 33, 3, 0), - RK_COMPNODIV(CLK_OPTC_ARB, "clk_optc_arb", xin24m_cpll100_p, 73, 15, 1, - 33, 9, 0), + + /* CRU_CLKSEL_CON00 */ + /* 0:4 clk_core0_div DIV */ + /* 5 Reserved */ + /* 6 clk_core_i_sel MUX */ + /* 7 clk_core_ndft_sel MUX */ + /* 8:12 clk_core1_div DIV */ + /* 13:14 Reserved */ + /* 15 clk_core_ndft_mux_sel MUX */ + + /* CRU_CLKSEL_CON01 */ + /* 0:4 clk_core2_div DIV */ + /* 5:7 Reserved */ + /* 8:12 clk_core3_div DIV */ + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON02 */ + COMP(0, "sclk_core_src_c", apll_gpll_npll_p, 0, 2, 0, 4, 8, 2), + /* 4:7 Reserved */ + /* 10:14 Reserved */ + MUX(0, "sclk_core_pre_sel", sclk_core_pre_p, 0, 2, 15, 1), + + /* CRU_CLKSEL_CON03 */ + CDIV(0, "atclk_core_div", "armclk", 0, 3, 0, 5), + /* 5:7 Reserved */ + CDIV(0, "gicclk_core_div", "armclk", 0, 3, 8, 5), + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON04 */ + CDIV(0, "pclk_core_pre_div", "armclk", 0, 4, 0, 5), + /* 5:7 Reserved */ + CDIV(0, "periphclk_core_pre_div", "armclk", 0, 4, 8, 5), + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON05 */ + /* 0:7 Reserved */ + /* 8:12 aclk_core_ndft_div DIV */ + /* 13 Reserved */ + /* 14:15 aclk_core_biu2bus_sel MUX */ + + /* CRU_CLKSEL_CON06 */ + COMP(0, "clk_gpu_pre_c", mpll_gpll_cpll_npll_p, 0, 6, 0, 4, 6, 2), + /* 4:5 Reserved */ + CDIV(0, "aclk_gpu_pre_div", "clk_gpu_pre_c", 0, 6, 8, 2), + /* 10 Reserved */ + MUX(CLK_GPU_PRE_MUX, "clk_gpu_pre_mux_sel", clk_gpu_pre_mux_p, 0, 6, 11, 1), + CDIV(0, "pclk_gpu_pre_div", "clk_gpu_pre_c", 0, 6, 12, 4), + + /* CRU_CLKSEL_CON07 */ + COMP(0, "clk_npu_src_c", npll_gpll_p, 0, 7, 0, 4, 6, 1), + COMP(0, "clk_npu_np5_c", npll_gpll_p, 0, 7, 4, 2, 7, 1), + MUX(CLK_NPU_PRE_NDFT, "clk_npu_pre_ndft", clk_npu_pre_ndft_p, 0, 7, + 8, 1), + /* 9:14 Reserved */ + MUX(CLK_NPU, "clk_npu", clk_npu_p, 0, 7, 15, 1), + + /* CRU_CLKSEL_CON08 */ + CDIV(0, "hclk_npu_pre_div", "clk_npu", 0, 8, 0, 4), + CDIV(0, "pclk_npu_pre_div", "clk_npu", 0, 8, 4, 4), + /* 8:15 Reserved */ + + /* CRU_CLKSEL_CON09 */ + COMP(0, "clk_ddrphy1x_src_c", dpll_gpll_cpll_p, 0, 9, 0, 5, 6, 2), + /* 5 Reserved */ + /* 8:14 Reserved */ + MUX(CLK_DDR1X, "clk_ddr1x", clk_ddr1x_p, RK_CLK_COMPOSITE_GRF, 9, + 15, 1), + + /* CRU_CLKSEL_CON10 */ + CDIV(0, "clk_msch_div", "clk_ddr1x", 0, 10, 0, 2), + MUX(0, "aclk_perimid_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 10, 4, 2), + MUX(0, "hclk_perimid_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 10, 6, 2), + MUX(0, "aclk_gic_audio_sel", gpll200_gpll150_gpll100_xin24m_p, 0, 10, 8, 2), + MUX(0, "hclk_gic_audio_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 10, 10, 2), + MUX(0, "dclk_sdmmc_buffer_sel", gpll100_gpll75_gpll50_p, 0, 10, 12, 2), + /* 14:15 Reserved */ + + /* CRU_CLKSEL_CON11 */ + COMP(0, "clk_i2s0_8ch_tx_src_c", gpll_cpll_npll_p, 0, 11, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, 0, 11, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s0_mclkout_tx_sel", i2s0_mclkout_tx_p, 0, 11, 15, 1), + + /* CRU_CLKSEL_CON12 */ + FRACT(0, "clk_i2s0_8ch_tx_frac_div", "clk_i2s0_8ch_tx_src", 0, 12), + + /* CRU_CLKSEL_CON13 */ + COMP(0, "clk_i2s0_8ch_rx_src_c", gpll_cpll_npll_p, 0, 13, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, 0, 13, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s0_mclkout_rx_sel", i2s0_mclkout_rx_p, 0, 13, 15, 1), + + /* CRU_CLKSEL_CON14 */ + FRACT(0, "clk_i2s0_8ch_rx_frac_div", "clk_i2s0_8ch_rx_src", 0, 14), + + /* CRU_CLKSEL_CON15 */ + COMP(0, "clk_i2s1_8ch_tx_src_c", gpll_cpll_npll_p, 0, 15, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", clk_i2s1_8ch_tx_p, 0, 15, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s1_mclkout_tx_sel", i2s1_mclkout_tx_p, 0, 11, 15, 1), + + /* CRU_CLKSEL_CON16 */ + FRACT(0, "clk_i2s1_8ch_tx_frac_div", "clk_i2s1_8ch_tx_src", 0, 16), + + /* CRU_CLKSEL_CON17 */ + COMP(0, "clk_i2s1_8ch_rx_src_c", gpll_cpll_npll_p, 0, 17, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", clk_i2s1_8ch_rx_p, 0, 17, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s1_mclkout_rx_sel", i2s1_mclkout_rx_p, 0, 17, 15, 1), + + /* CRU_CLKSEL_CON18 */ + FRACT(0, "clk_i2s1_8ch_rx_frac_div", "clk_i2s1_8ch_rx_src", 0, 18), + + /* CRU_CLKSEL_CON19 */ + COMP(0, "clk_i2s2_2ch_src_c", gpll_cpll_npll_p, 0, 19, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S2_2CH, "clk_i2s2_2ch", clk_i2s2_2ch_p, 0, 19, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s2_mclkout_sel", i2s2_mclkout_p, 0, 19, 15, 1), + + /* CRU_CLKSEL_CON20 */ + FRACT(0, "clk_i2s2_2ch_frac_div", "clk_i2s2_2ch_src", 0, 20), + + /* CRU_CLKSEL_CON21 */ + COMP(0, "clk_i2s3_2ch_tx_src_c", gpll_cpll_npll_p, 0, 21, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S3_2CH_TX, "clk_i2s3_2ch_tx", clk_i2s3_2ch_tx_p, 0, 21, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s3_mclkout_tx_sel", i2s3_mclkout_tx_p, 0, 21, 15, 1), + + /* CRU_CLKSEL_CON22 */ + FRACT(0, "clk_i2s3_2ch_tx_frac_div", "clk_i2s3_2ch_tx_src", 0, 22), + + /* CRU_CLKSEL_CON23 */ + COMP(0, "mclk_spdif_8ch_src_c", cpll_gpll_p, 0, 23, 0, 7, 14, 1), + /* 7 Reserved */ + MUX(0, "mclk_pdm_sel", mclk_pdm_p, 0, 23, 8, 2), + MUX(0, "clk_acdcdig_i2c_sel", clk_i2c_p, 0, 23, 10, 2), + /* 12:13 Reserved */ + MUX(MCLK_SPDIF_8CH, "mclk_spdif_8ch", mclk_spdif_8ch_p, 0, 23, 15, + 1), + + /* CRU_CLKSEL_CON24 */ + FRACT(0, "mclk_spdif_8ch_frac_div", "mclk_spdif_8ch_src", 0, 24), + + /* CRU_CLKSEL_CON25 */ + COMP(0, "sclk_audpwm_src_c", gpll_cpll_p, 0, 25, 0, 5, 14, 1), + /* 6:13 Reserved */ + MUX(SCLK_AUDPWM, "sck_audpwm_sel", sclk_audpwm_p, 0, 25, 15, 1), + + /* CRU_CLKSEL_CON26 */ + FRACT(0, "sclk_audpwm_frac_frac", "sclk_audpwm_src", 0, 26), + + /* CRU_CLKSEL_CON27 */ + MUX(0, "aclk_secure_flash_sel", gpll200_gpll150_gpll100_xin24m_p, 0, 27, 0, 2), + MUX(0, "hclk_secure_flash_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 27, 2, 2), + MUX(0, "clk_crypto_ns_core_sel", gpll200_gpll150_gpll100_p, 0, 27, 4, 2), + MUX(0, "clk_crypto_ns_pka_sel", gpll300_gpll200_gpll100_p, 0, 27, 6, 2), + /* 8:15 Reserved */ + + /* CRU_CLKSEL_CON28 */ + MUX(0, "nclk_nandc_sel", clk_nandc_p, 0, 28, 0, 2), + /* 2:3 Reserved */ + MUX(0, "sclk_sfc_sel", sclk_sfc_p, 0, 28, 4, 3), + /* 7 Reserved */ + MUX(0, "bclk_emmc_sel", gpll200_gpll150_cpll125_p, 0, 28, 8, 2), + /* 10:11 Reserved */ + MUX(0, "cclk_emmc_sel", cclk_emmc_p, 0, 28, 12, 3), + /* 15 Reserved */ + + /* CRU_CLKSEL_CON29 */ + MUX(0, "aclk_pipe_sel", aclk_pipe_p, 0, 29, 0, 2), + /* 2:3 Reserved */ + CDIV(0, "pclk_pipe_div", "aclk_pipe", 0, 29, 4, 4), + MUX(0, "clk_usb3otg0_suspend_sel", xin24m_32k_p, 0, 29, 8, 1), + MUX(0, "clk_usb3otg1_suspend_sel", xin24m_32k_p, 0, 29, 9, 1), + /* 10:12 Reserved */ + MUX(0, "clk_xpcs_eee_sel", gpll200_cpll125_p, 0, 29, 13, 1), + /* 14:15 Reserved */ + + /* CRU_CLKSEL_CON30 */ + MUX(0, "aclk_php_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 30, 0, 2), + MUX(0, "hclk_php_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 30, 2, 2), + CDIV(0, "pclk_php_div", "aclk_php", 0, 30, 4, 4), + MUX(0, "clk_sdmmc0_sel", clk_sdmmc_p, 0, 30, 8, 3), + /* 11 Reserved */ + MUX(0, "clk_sdmmc1_sel", clk_sdmmc_p, 0, 30, 12, 3), + /* 15 Reserved */ + + /* CRU_CLKSEL_CON31 */ + MUX(SCLK_GMAC0_RX_TX, "clk_gmac0_rx_tx", mux_gmac0_rx_tx_p, 0, 31, *** 1110 LINES SKIPPED *** From nobody Thu Sep 21 16:00:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0V848nyz4tcgP; Thu, 21 Sep 2023 16:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V83dPWz4RTl; Thu, 21 Sep 2023 16:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mi+Ay5HrjXUmjm6tYr7U+aPFy7Nf8I2SnIBueABnHrA=; b=xvwpNBWDya9jRFoTCmgYJkIa+mNlUHii3QgLslwKaQnZwtmmTCCl9TO81hrL/FkMQXAiax ioPBgNL0D5X+HuiMiMztzjuzc/F7MQ1mX567px9VqETDohCWIyn7VAwC+HWZPPwIcgrfe2 nYf10FwUuxGBQV9l6LqjR/4pR69s/kO2/+HGBlUEDytFDNpntQHiUmjlz43k2NTL70c6p8 7pOLnucsmhFxq0yr1u/LbiM5LLCwfTEghGYpo3H+Me5oSwiya/fzeFxwq5bZjKWsK9Q8c4 8k7lxh5myxkfg3jOcjAruG4CI50TcW1usH7mRsKXREaNu2IIX8sREn6W+++EFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312016; a=rsa-sha256; cv=none; b=VYAzR9//u5PbP/Oazn1DZD9D2rZGzoLxUmflw8RubMpLumxoeZFbUYEtFfa3N4+mF+V55n /IzxOiD6FKttte3n+wZaF/tYFzCstGp51O6NuSFPBivAI2amJQFhU395BjFaRN1qnJkKwV 9Aw7C3E2+dfjfeRz0utT0O0qTh5uOOxIl9f0QzXhPw/lrJrtyak8Ik+aBpqnuF4o/vZrF9 UVexzhuqSXAkcp4Q9kDazof8lmaTcba/DB9dXxf1VQ1g/8ZusT/WBc+NvOJwQjzyH0d6Aa tl941fS69jQdG9n6ai9tlsPvwf6pD+clzEjKVuwbVOJKXxbDW2k6nKYVO5L5Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mi+Ay5HrjXUmjm6tYr7U+aPFy7Nf8I2SnIBueABnHrA=; b=hTkIeAKMc/Fjn9GVZK0FEfPKtrsSe83B+XaxoAF7t5WcygzAZ4pzpfZGJoJUxG4EVpfFMs jPfY/ScDIExY19sz4glW4VjX9LVoMtnLw6FXMcT42H5pCg3eRsragO+gZ8i90yPwX4b8iO 6JlgEO4nzV8YnY4Qkw3Y/75nCwNyyUTrcuMSPOTpoG0xgJNtA5yczEBY8IL2S5LQryvdH3 AkIVlOz/VG80zEd00UGZQXVLaPn7xzyINe8GKCnHF7O9e8MtN+4hpz5s43d3niKKx908Di mrLORtAuzMdPza0ep1E10NzpmCIXD+u2F1jP/4pOYEjDSNOOMBGfFAIDmoVduA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0V82kJ9zlKX; Thu, 21 Sep 2023 16:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Ghl049622; Thu, 21 Sep 2023 16:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0Gfg049610; Thu, 21 Sep 2023 16:00:16 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:16 GMT Message-Id: <202309211600.38LG0Gfg049610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7c6c426f2983 - main - arm64: rockchip: rk3328_cru: Use GATE macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c6c426f29831799d1eae1ca5d4036a219b52fca Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7c6c426f29831799d1eae1ca5d4036a219b52fca commit 7c6c426f29831799d1eae1ca5d4036a219b52fca Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:55:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:32 +0000 arm64: rockchip: rk3328_cru: Use GATE macro It make it easier to read the code and the register number --- sys/arm64/rockchip/clk/rk3328_cru.c | 389 ++++++++++++++++++------------------ 1 file changed, 195 insertions(+), 194 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index 1f48ce6c23a2..cde5bb3f55b6 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -46,6 +46,7 @@ #include #define CRU_CLKSEL_CON(x) (0x100 + (x) * 0x4) +#define CRU_CLKGATE_CON(x) (0x200 + (x) * 0x4) /* Registers */ #define RK3328_GRF_SOC_CON4 0x410 @@ -250,100 +251,100 @@ static struct rk_cru_gate rk3328_gates[] = { /* CRU_CLKGATE_CON0 */ - CRU_GATE(0, "core_apll_clk", "apll", 0x200, 0) - CRU_GATE(0, "core_dpll_clk", "dpll", 0x200, 1) - CRU_GATE(0, "core_gpll_clk", "gpll", 0x200, 2) + GATE(0, "core_apll_clk", "apll", 0, 0), + GATE(0, "core_dpll_clk", "dpll", 0, 1), + GATE(0, "core_gpll_clk", "gpll", 0, 2), /* Bit 3 bus_src_clk_en */ /* Bit 4 clk_ddrphy_src_en */ /* Bit 5 clk_ddrpd_src_en */ /* Bit 6 clk_ddrmon_en */ /* Bit 7-8 unused */ /* Bit 9 testclk_en */ - CRU_GATE(SCLK_WIFI, "sclk_wifi", "sclk_wifi_c", 0x200, 10) - CRU_GATE(SCLK_RTC32K, "clk_rtc32k", "clk_rtc32k_c", 0x200, 11) - CRU_GATE(0, "core_npll_clk", "npll", 0x200, 12) + GATE(SCLK_WIFI, "sclk_wifi", "sclk_wifi_c", 0, 10), + GATE(SCLK_RTC32K, "clk_rtc32k", "clk_rtc32k_c", 0, 11), + GATE(0, "core_npll_clk", "npll", 0, 12), /* Bit 13-15 unused */ /* CRU_CLKGATE_CON1 */ /* Bit 0 unused */ - CRU_GATE(0, "clk_i2s0_div", "clk_i2s0_div_c", 0x204, 1) - CRU_GATE(0, "clk_i2s0_frac", "clk_i2s0_frac_f", 0x204, 2) - CRU_GATE(SCLK_I2S0, "clk_i2s0", "clk_i2s0_mux", 0x204, 3) - CRU_GATE(0, "clk_i2s1_div", "clk_i2s1_div_c", 0x204, 4) - CRU_GATE(0, "clk_i2s1_frac", "clk_i2s1_frac_f", 0x204, 5) - CRU_GATE(SCLK_I2S1, "clk_i2s1", "clk_i2s1_mux", 0x204, 6) - CRU_GATE(0, "clk_i2s1_out", "clk_i2s1_mux", 0x204, 7) - CRU_GATE(0, "clk_i2s2_div", "clk_i2s2_div_c", 0x204, 8) - CRU_GATE(0, "clk_i2s2_frac", "clk_i2s2_frac_f", 0x204, 9) - CRU_GATE(SCLK_I2S2, "clk_i2s2", "clk_i2s2_mux", 0x204, 10) - CRU_GATE(0, "clk_i2s2_out", "clk_i2s2_mux", 0x204, 11) - CRU_GATE(0, "clk_spdif_div", "clk_spdif_div_c", 0x204, 12) - CRU_GATE(0, "clk_spdif_frac", "clk_spdif_frac_f", 0x204, 13) - CRU_GATE(0, "clk_uart0_div", "clk_uart0_div_c", 0x204, 14) - CRU_GATE(0, "clk_uart0_frac", "clk_uart0_frac_f", 0x204, 15) + GATE(0, "clk_i2s0_div", "clk_i2s0_div_c", 1, 1), + GATE(0, "clk_i2s0_frac", "clk_i2s0_frac_f", 1, 2), + GATE(SCLK_I2S0, "clk_i2s0", "clk_i2s0_mux", 1, 3), + GATE(0, "clk_i2s1_div", "clk_i2s1_div_c", 1, 4), + GATE(0, "clk_i2s1_frac", "clk_i2s1_frac_f", 1, 5), + GATE(SCLK_I2S1, "clk_i2s1", "clk_i2s1_mux", 1, 6), + GATE(0, "clk_i2s1_out", "clk_i2s1_mux", 1, 7), + GATE(0, "clk_i2s2_div", "clk_i2s2_div_c", 1, 8), + GATE(0, "clk_i2s2_frac", "clk_i2s2_frac_f", 1, 9), + GATE(SCLK_I2S2, "clk_i2s2", "clk_i2s2_mux", 1, 10), + GATE(0, "clk_i2s2_out", "clk_i2s2_mux", 1, 11), + GATE(0, "clk_spdif_div", "clk_spdif_div_c", 1, 12), + GATE(0, "clk_spdif_frac", "clk_spdif_frac_f", 1, 13), + GATE(0, "clk_uart0_div", "clk_uart0_div_c", 1, 14), + GATE(0, "clk_uart0_frac", "clk_uart0_frac_f", 1, 15), /* CRU_CLKGATE_CON2 */ - CRU_GATE(0, "clk_uart1_div", "clk_uart1_div_c", 0x208, 0) - CRU_GATE(0, "clk_uart1_frac", "clk_uart1_frac_f", 0x208, 1) - CRU_GATE(0, "clk_uart2_div", "clk_uart2_div_c", 0x208, 2) - CRU_GATE(0, "clk_uart2_frac", "clk_uart2_frac_f", 0x208, 3) - CRU_GATE(SCLK_CRYPTO, "clk_crypto", "clk_crypto_c", 0x208, 4) - CRU_GATE(SCLK_TSP, "clk_tsp", "clk_tsp_c", 0x208, 5) - CRU_GATE(SCLK_TSADC, "clk_tsadc_src", "clk_tsadc_c", 0x208, 6) - CRU_GATE(SCLK_SPI, "clk_spi", "clk_spi_c", 0x208, 7) - CRU_GATE(SCLK_PWM, "clk_pwm", "clk_pwm_c", 0x208, 8) - CRU_GATE(SCLK_I2C0, "clk_i2c0_src", "clk_i2c0_c", 0x208, 9) - CRU_GATE(SCLK_I2C1, "clk_i2c1_src", "clk_i2c1_c", 0x208, 10) - CRU_GATE(SCLK_I2C2, "clk_i2c2_src", "clk_i2c2_c", 0x208, 11) - CRU_GATE(SCLK_I2C3, "clk_i2c3_src", "clk_i2c3_c", 0x208, 12) - CRU_GATE(SCLK_EFUSE, "clk_efuse", "clk_efuse_c", 0x208, 13) - CRU_GATE(SCLK_SARADC, "clk_saradc", "clk_saradc_c", 0x208, 14) - CRU_GATE(SCLK_PDM, "clk_pdm", "clk_pdm_c", 0x208, 15) + GATE(0, "clk_uart1_div", "clk_uart1_div_c", 2, 0), + GATE(0, "clk_uart1_frac", "clk_uart1_frac_f", 2, 1), + GATE(0, "clk_uart2_div", "clk_uart2_div_c", 2, 2), + GATE(0, "clk_uart2_frac", "clk_uart2_frac_f", 2, 3), + GATE(SCLK_CRYPTO, "clk_crypto", "clk_crypto_c", 2, 4), + GATE(SCLK_TSP, "clk_tsp", "clk_tsp_c", 2, 5), + GATE(SCLK_TSADC, "clk_tsadc_src", "clk_tsadc_c", 2, 6), + GATE(SCLK_SPI, "clk_spi", "clk_spi_c", 2, 7), + GATE(SCLK_PWM, "clk_pwm", "clk_pwm_c", 2, 8), + GATE(SCLK_I2C0, "clk_i2c0_src", "clk_i2c0_c", 2, 9), + GATE(SCLK_I2C1, "clk_i2c1_src", "clk_i2c1_c", 2, 10), + GATE(SCLK_I2C2, "clk_i2c2_src", "clk_i2c2_c", 2, 11), + GATE(SCLK_I2C3, "clk_i2c3_src", "clk_i2c3_c", 2, 12), + GATE(SCLK_EFUSE, "clk_efuse", "clk_efuse_c", 2, 13), + GATE(SCLK_SARADC, "clk_saradc", "clk_saradc_c", 2, 14), + GATE(SCLK_PDM, "clk_pdm", "clk_pdm_c", 2, 15), /* CRU_CLKGATE_CON3 */ - CRU_GATE(SCLK_MAC2PHY_SRC, "clk_mac2phy_src", "clk_mac2phy_src_c", 0x20c, 0) - CRU_GATE(SCLK_MAC2IO_SRC, "clk_mac2io_src", "clk_mac2io_src_c", 0x20c, 1) - CRU_GATE(ACLK_GMAC, "aclk_gmac", "aclk_gmac_c", 0x20c, 2) + GATE(SCLK_MAC2PHY_SRC, "clk_mac2phy_src", "clk_mac2phy_src_c", 3, 0), + GATE(SCLK_MAC2IO_SRC, "clk_mac2io_src", "clk_mac2io_src_c", 3, 1), + GATE(ACLK_GMAC, "aclk_gmac", "aclk_gmac_c", 3, 2), /* Bit 3 gmac_gpll_src_en Unused ? */ /* Bit 4 gmac_vpll_src_en Unused ? */ - CRU_GATE(SCLK_MAC2IO_OUT, "clk_mac2io_out", "clk_mac2io_out_c", 0x20c, 5) + GATE(SCLK_MAC2IO_OUT, "clk_mac2io_out", "clk_mac2io_out_c", 3, 5), /* Bit 6-7 unused */ - CRU_GATE(SCLK_OTP, "clk_otp", "clk_otp_c", 0x20c, 8) + GATE(SCLK_OTP, "clk_otp", "clk_otp_c", 3, 8), /* Bit 9-15 unused */ /* CRU_CLKGATE_CON4 */ - CRU_GATE(0, "periph_gclk_src", "gpll", 0x210, 0) - CRU_GATE(0, "periph_cclk_src", "cpll", 0x210, 1) - CRU_GATE(0, "hdmiphy_peri", "hdmiphy", 0x210, 2) - CRU_GATE(SCLK_SDMMC, "clk_mmc0_src", "clk_sdmmc_c", 0x210, 3) - CRU_GATE(SCLK_SDIO, "clk_sdio_src", "clk_sdio_c", 0x210, 4) - CRU_GATE(SCLK_EMMC, "clk_emmc_src", "clk_emmc_c", 0x210, 5) - CRU_GATE(SCLK_REF_USB3OTG_SRC, "clk_ref_usb3otg_src", "clk_ref_usb3otg_src_c", 0x210, 6) - CRU_GATE(SCLK_USB3OTG_REF, "clk_usb3_otg0_ref", "xin24m", 0x210, 7) - CRU_GATE(SCLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", "clk_usb3otg_suspend_c", 0x210, 8) + GATE(0, "periph_gclk_src", "gpll", 4, 0), + GATE(0, "periph_cclk_src", "cpll", 4, 1), + GATE(0, "hdmiphy_peri", "hdmiphy", 4, 2), + GATE(SCLK_SDMMC, "clk_mmc0_src", "clk_sdmmc_c", 4, 3), + GATE(SCLK_SDIO, "clk_sdio_src", "clk_sdio_c", 4, 4), + GATE(SCLK_EMMC, "clk_emmc_src", "clk_emmc_c", 4, 5), + GATE(SCLK_REF_USB3OTG_SRC, "clk_ref_usb3otg_src", "clk_ref_usb3otg_src_c", 4, 6), + GATE(SCLK_USB3OTG_REF, "clk_usb3_otg0_ref", "xin24m", 4, 7), + GATE(SCLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", "clk_usb3otg_suspend_c", 4, 8), /* Bit 9 clk_usb3phy_ref_25m_en */ - CRU_GATE(SCLK_SDMMC_EXT, "clk_sdmmc_ext", "clk_sdmmc_ext_c", 0x210, 10) + GATE(SCLK_SDMMC_EXT, "clk_sdmmc_ext", "clk_sdmmc_ext_c", 4, 10), /* Bit 11-15 unused */ /* CRU_CLKGATE_CON5 */ - CRU_GATE(ACLK_RGA_PRE, "aclk_rga_pre", "aclk_rga_pre_c", 0x214, 0) - CRU_GATE(SCLK_RGA, "sclk_rga", "sclk_rga_c", 0x214, 0) - CRU_GATE(ACLK_VIO_PRE, "aclk_vio_pre", "aclk_vio_pre_c", 0x214, 2) - CRU_GATE(SCLK_CIF_OUT, "clk_cif_src", "clk_cif_src_c", 0x214, 3) - CRU_GATE(SCLK_HDMI_SFC, "clk_hdmi_sfc", "xin24m", 0x214, 4) - CRU_GATE(ACLK_VOP_PRE, "aclk_vop_pre", "aclk_vop_pre_c", 0x214, 5) - CRU_GATE(DCLK_LCDC_SRC, "vop_dclk_src", "vop_dclk_src_c", 0x214, 6) + GATE(ACLK_RGA_PRE, "aclk_rga_pre", "aclk_rga_pre_c", 5, 0), + GATE(SCLK_RGA, "sclk_rga", "sclk_rga_c", 5, 0), + GATE(ACLK_VIO_PRE, "aclk_vio_pre", "aclk_vio_pre_c", 5, 2), + GATE(SCLK_CIF_OUT, "clk_cif_src", "clk_cif_src_c", 5, 3), + GATE(SCLK_HDMI_SFC, "clk_hdmi_sfc", "xin24m", 5, 4), + GATE(ACLK_VOP_PRE, "aclk_vop_pre", "aclk_vop_pre_c", 5, 5), + GATE(DCLK_LCDC_SRC, "vop_dclk_src", "vop_dclk_src_c", 5, 6), /* Bit 7-15 unused */ /* CRU_CLKGATE_CON6 */ - CRU_GATE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", "aclk_rkvdec_c", 0x218, 0) - CRU_GATE(SCLK_VDEC_CABAC, "sclk_cabac", "sclk_cabac_c", 0x218, 1) - CRU_GATE(SCLK_VDEC_CORE, "sclk_vdec_core", "sclk_vdec_core_c", 0x218, 2) - CRU_GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_rkvenc_c", 0x218, 3) - CRU_GATE(SCLK_VENC_CORE, "sclk_venc", "sclk_venc_c", 0x218, 4) - CRU_GATE(ACLK_VPU_PRE, "aclk_vpu_pre", "aclk_vpu_pre_c", 0x218, 5) - CRU_GATE(0, "aclk_gpu_pre", "aclk_gpu_pre_c", 0x218, 6) - CRU_GATE(SCLK_VENC_DSP, "sclk_venc_dsp", "sclk_venc_dsp_c", 0x218, 7) + GATE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", "aclk_rkvdec_c", 6, 0), + GATE(SCLK_VDEC_CABAC, "sclk_cabac", "sclk_cabac_c", 6, 1), + GATE(SCLK_VDEC_CORE, "sclk_vdec_core", "sclk_vdec_core_c", 6, 2), + GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_rkvenc_c", 6, 3), + GATE(SCLK_VENC_CORE, "sclk_venc", "sclk_venc_c", 6, 4), + GATE(ACLK_VPU_PRE, "aclk_vpu_pre", "aclk_vpu_pre_c", 6, 5), + GATE(0, "aclk_gpu_pre", "aclk_gpu_pre_c", 6, 6), + GATE(SCLK_VENC_DSP, "sclk_venc_dsp", "sclk_venc_dsp_c", 6, 7), /* Bit 8-15 unused */ /* CRU_CLKGATE_CON7 */ @@ -355,42 +356,42 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 5-15 unused */ /* CRU_CLKGATE_CON8 */ - CRU_GATE(ACLK_BUS_PRE, "aclk_bus_pre", "aclk_bus_pre_c", 0x220, 0) - CRU_GATE(HCLK_BUS_PRE, "hclk_bus_pre", "hclk_bus_pre_c", 0x220, 1) - CRU_GATE(PCLK_BUS_PRE, "pclk_bus_pre", "pclk_bus_pre_c", 0x220, 2) - CRU_GATE(0, "pclk_bus", "pclk_bus_pre", 0x220, 3) - CRU_GATE(0, "pclk_phy", "pclk_bus_pre", 0x220, 4) - CRU_GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0x220, 5) - CRU_GATE(SCLK_TIMER1, "sclk_timer1", "xin24m", 0x220, 6) - CRU_GATE(SCLK_TIMER2, "sclk_timer2", "xin24m", 0x220, 7) - CRU_GATE(SCLK_TIMER3, "sclk_timer3", "xin24m", 0x220, 8) - CRU_GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 0x220, 9) - CRU_GATE(SCLK_TIMER5, "sclk_timer5", "xin24m", 0x220, 10) + GATE(ACLK_BUS_PRE, "aclk_bus_pre", "aclk_bus_pre_c", 8, 0), + GATE(HCLK_BUS_PRE, "hclk_bus_pre", "hclk_bus_pre_c", 8, 1), + GATE(PCLK_BUS_PRE, "pclk_bus_pre", "pclk_bus_pre_c", 8, 2), + GATE(0, "pclk_bus", "pclk_bus_pre", 8, 3), + GATE(0, "pclk_phy", "pclk_bus_pre", 8, 4), + GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 8, 5), + GATE(SCLK_TIMER1, "sclk_timer1", "xin24m", 8, 6), + GATE(SCLK_TIMER2, "sclk_timer2", "xin24m", 8, 7), + GATE(SCLK_TIMER3, "sclk_timer3", "xin24m", 8, 8), + GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 8, 9), + GATE(SCLK_TIMER5, "sclk_timer5", "xin24m", 8, 10), /* Bit 11-15 unused */ /* CRU_CLKGATE_CON9 */ - CRU_GATE(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 0x224, 0) - CRU_GATE(SCLK_MAC2PHY_RXTX, "clk_gmac2phy_rx", "clk_mac2phy", 0x224, 1) - CRU_GATE(SCLK_MAC2PHY_OUT, "clk_mac2phy_out", "clk_mac2phy_out_c", 0x224, 2) - CRU_GATE(SCLK_MAC2PHY_REF, "clk_gmac2phy_ref", "clk_mac2phy", 0x224, 3) - CRU_GATE(SCLK_MAC2IO_RX, "clk_gmac2io_rx", "clk_mac2io", 0x224, 4) - CRU_GATE(SCLK_MAC2IO_TX, "clk_gmac2io_tx", "clk_mac2io", 0x224, 5) - CRU_GATE(SCLK_MAC2IO_REFOUT, "clk_gmac2io_refout", "clk_mac2io", 0x224, 6) - CRU_GATE(SCLK_MAC2IO_REF, "clk_gmac2io_ref", "clk_mac2io", 0x224, 7) + GATE(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 9, 0), + GATE(SCLK_MAC2PHY_RXTX, "clk_gmac2phy_rx", "clk_mac2phy", 9, 1), + GATE(SCLK_MAC2PHY_OUT, "clk_mac2phy_out", "clk_mac2phy_out_c", 9, 2), + GATE(SCLK_MAC2PHY_REF, "clk_gmac2phy_ref", "clk_mac2phy", 9, 3), + GATE(SCLK_MAC2IO_RX, "clk_gmac2io_rx", "clk_mac2io", 9, 4), + GATE(SCLK_MAC2IO_TX, "clk_gmac2io_tx", "clk_mac2io", 9, 5), + GATE(SCLK_MAC2IO_REFOUT, "clk_gmac2io_refout", "clk_mac2io", 9, 6), + GATE(SCLK_MAC2IO_REF, "clk_gmac2io_ref", "clk_mac2io", 9, 7), /* Bit 8-15 unused */ /* CRU_CLKGATE_CON10 */ - CRU_GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 0x228, 0) - CRU_GATE(HCLK_PERI, "hclk_peri", "hclk_peri_c", 0x228, 1) - CRU_GATE(PCLK_PERI, "pclk_peri", "pclk_peri_c", 0x228, 2) + GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 10, 0), + GATE(HCLK_PERI, "hclk_peri", "hclk_peri_c", 10, 1), + GATE(PCLK_PERI, "pclk_peri", "pclk_peri_c", 10, 2), /* Bit 3-15 unused */ /* CRU_CLKGATE_CON11 */ - CRU_GATE(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 0x22C, 0) + GATE(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 11, 0), /* Bit 1-3 unused */ - CRU_GATE(HCLK_RKVENC, "hclk_rkvenc", "aclk_rkvenc", 0x22C, 4) + GATE(HCLK_RKVENC, "hclk_rkvenc", "aclk_rkvenc", 11, 4), /* Bit 5-7 unused */ - CRU_GATE(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 0x22C, 8) + GATE(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 11, 8), /* Bit 9-15 unused */ /* CRU_CLKGATE_CON12 */ @@ -402,64 +403,64 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 2-15 unused */ /* CRU_CLKGATE_CON14 */ - CRU_GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0x238, 0) - CRU_GATE(0, "aclk_gpu_niu", "aclk_gpu_pre", 0x238, 1) + GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 14, 0), + GATE(0, "aclk_gpu_niu", "aclk_gpu_pre", 14, 1), /* Bit 2-15 unused */ /* CRU_CLKGATE_CON15*/ /* Bit 0 aclk_intmem_en Unused */ /* Bit 1 aclk_dmac_bus_en Unused */ /* Bit 2 hclk_rom_en Unused */ - CRU_GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 0x23C, 3) - CRU_GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 0x23C, 4) - CRU_GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 0x23C, 5) - CRU_GATE(HCLK_SPDIF_8CH, "hclk_spdif_8ch", "hclk_bus_pre", 0x23C, 6) - CRU_GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 0x23C, 7) - CRU_GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 0x23C, 8) - CRU_GATE(0, "pclk_efuse", "pclk_bus", 0x23C, 9) - CRU_GATE(PCLK_I2C0, "pclk_i2c0", "pclk_bus", 0x23C, 10) - CRU_GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_pre", 0x23C, 11) - CRU_GATE(0, "aclk_bus_niu", "aclk_bus_pre", 0x23C, 12) - CRU_GATE(0, "hclk_bus_niu", "hclk_bus_pre", 0x23C, 13) - CRU_GATE(0, "pclk_bus_niu", "pclk_bus_pre", 0x23C, 14) - CRU_GATE(0, "pclk_phy_niu", "pclk_phy", 0x23C, 14) + GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 15, 3), + GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 15, 4), + GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 15, 5), + GATE(HCLK_SPDIF_8CH, "hclk_spdif_8ch", "hclk_bus_pre", 15, 6), + GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 15, 7), + GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 15, 8), + GATE(0, "pclk_efuse", "pclk_bus", 15, 9), + GATE(PCLK_I2C0, "pclk_i2c0", "pclk_bus", 15, 10), + GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_pre", 15, 11), + GATE(0, "aclk_bus_niu", "aclk_bus_pre", 15, 12), + GATE(0, "hclk_bus_niu", "hclk_bus_pre", 15, 13), + GATE(0, "pclk_bus_niu", "pclk_bus_pre", 15, 14), + GATE(0, "pclk_phy_niu", "pclk_phy", 15, 14), /* Bit 15 pclk_phy_niu_en */ /* CRU_CLKGATE_CON16 */ - CRU_GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 0x240, 0) - CRU_GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 0x240, 1) - CRU_GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 0x240, 2) - CRU_GATE(PCLK_TIMER, "pclk_timer0", "pclk_bus", 0x240, 3) - CRU_GATE(0, "pclk_stimer", "pclk_bus", 0x240, 4) - CRU_GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 0x240, 5) - CRU_GATE(PCLK_PWM, "pclk_pwm", "pclk_bus", 0x240, 6) - CRU_GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 0x240, 7) - CRU_GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 0x240, 8) - CRU_GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 0x240, 9) - CRU_GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_bus", 0x240, 10) - CRU_GATE(PCLK_UART0, "pclk_uart0", "pclk_bus", 0x240, 11) - CRU_GATE(PCLK_UART1, "pclk_uart1", "pclk_bus", 0x240, 12) - CRU_GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 0x240, 13) - CRU_GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0x240, 14) - CRU_GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 0x240, 15) + GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 16, 0), + GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 16, 1), + GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 16, 2), + GATE(PCLK_TIMER, "pclk_timer0", "pclk_bus", 16, 3), + GATE(0, "pclk_stimer", "pclk_bus", 16, 4), + GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 16, 5), + GATE(PCLK_PWM, "pclk_pwm", "pclk_bus", 16, 6), + GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 16, 7), + GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 16, 8), + GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 16, 9), + GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_bus", 16, 10), + GATE(PCLK_UART0, "pclk_uart0", "pclk_bus", 16, 11), + GATE(PCLK_UART1, "pclk_uart1", "pclk_bus", 16, 12), + GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 16, 13), + GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 16, 14), + GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 16, 15), /* CRU_CLKGATE_CON17 */ - CRU_GATE(PCLK_GRF, "pclk_grf", "pclk_bus", 0x244, 0) + GATE(PCLK_GRF, "pclk_grf", "pclk_bus", 17, 0), /* Bit 1 unused */ - CRU_GATE(PCLK_USB3_GRF, "pclk_usb3grf", "pclk_phy", 0x244, 2) - CRU_GATE(0, "pclk_ddrphy", "pclk_phy", 0x244, 3) - CRU_GATE(0, "pclk_cru", "pclk_bus", 0x244, 4) - CRU_GATE(PCLK_ACODECPHY, "pclk_acodecphy", "pclk_phy", 0x244, 5) - CRU_GATE(0, "pclk_sgrf", "pclk_bus", 0x244, 6) - CRU_GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_phy", 0x244, 7) - CRU_GATE(0, "pclk_vdacphy", "pclk_bus", 0x244, 8) + GATE(PCLK_USB3_GRF, "pclk_usb3grf", "pclk_phy", 17, 2), + GATE(0, "pclk_ddrphy", "pclk_phy", 17, 3), + GATE(0, "pclk_cru", "pclk_bus", 17, 4), + GATE(PCLK_ACODECPHY, "pclk_acodecphy", "pclk_phy", 17, 5), + GATE(0, "pclk_sgrf", "pclk_bus", 17, 6), + GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_phy", 17, 7), + GATE(0, "pclk_vdacphy", "pclk_bus", 17, 8), /* Bit 9 unused */ - CRU_GATE(0, "pclk_sim", "pclk_bus", 0x244, 10) - CRU_GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 0x244, 11) - CRU_GATE(ACLK_TSP, "aclk_tsp", "aclk_bus_pre", 0x244, 12) + GATE(0, "pclk_sim", "pclk_bus", 17, 10), + GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 17, 11), + GATE(ACLK_TSP, "aclk_tsp", "aclk_bus_pre", 17, 12), /* Bit 13 clk_hsadc_0_tsp_en Depend on a gpio clock ? */ - CRU_GATE(PCLK_USB2_GRF, "pclk_usb2grf", "pclk_phy", 0x244, 14) - CRU_GATE(PCLK_SARADC, "pclk_saradc", "pclk_bus", 0x244, 15) + GATE(PCLK_USB2_GRF, "pclk_usb2grf", "pclk_phy", 17, 14), + GATE(PCLK_SARADC, "pclk_saradc", "pclk_bus", 17, 15), /* CRU_CLKGATE_CON18 */ /* Bit 0 unused */ @@ -473,81 +474,81 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 8-15 unused */ /* CRU_CLKGATE_CON19 */ - CRU_GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0x24C, 0) - CRU_GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 0x24C, 1) - CRU_GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0x24C, 2) + GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 19, 0), + GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 19, 1), + GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 19, 2), /* Bit 3-5 unused */ - CRU_GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0x24C, 6) - CRU_GATE(HCLK_HOST0_ARB, "hclk_host0_arg", "hclk_peri", 0x24C, 7) - CRU_GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0x24C, 8) - CRU_GATE(HCLK_OTG_PMU, "hclk_otg_pmu", "hclk_peri", 0x24C, 9) + GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 19, 6), + GATE(HCLK_HOST0_ARB, "hclk_host0_arg", "hclk_peri", 19, 7), + GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 19, 8), + GATE(HCLK_OTG_PMU, "hclk_otg_pmu", "hclk_peri", 19, 9), /* Bit 10 unused */ - CRU_GATE(0, "aclk_peri_niu", "aclk_peri", 0x24C, 11) - CRU_GATE(0, "hclk_peri_niu", "hclk_peri", 0x24C, 12) - CRU_GATE(0, "pclk_peri_niu", "hclk_peri", 0x24C, 13) - CRU_GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0x24C, 14) - CRU_GATE(HCLK_SDMMC_EXT, "hclk_sdmmc_ext", "hclk_peri", 0x24C, 15) + GATE(0, "aclk_peri_niu", "aclk_peri", 19, 11), + GATE(0, "hclk_peri_niu", "hclk_peri", 19, 12), + GATE(0, "pclk_peri_niu", "hclk_peri", 19, 13), + GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 19, 14), + GATE(HCLK_SDMMC_EXT, "hclk_sdmmc_ext", "hclk_peri", 19, 15), /* CRU_CLKGATE_CON20 */ /* unused */ /* CRU_CLKGATE_CON21 */ /* Bit 0-1 unused */ - CRU_GATE(ACLK_VOP, "aclk_vop", "aclk_vop_pre", 0x254, 2) - CRU_GATE(HCLK_VOP, "hclk_vop", "hclk_vio_pre", 0x254, 3) - CRU_GATE(0, "aclk_vop_niu", "aclk_vop_pre", 0x254, 4) - CRU_GATE(0, "hclk_vop_niu", "hclk_vio_pre", 0x254, 5) - CRU_GATE(ACLK_IEP, "aclk_iep", "aclk_vio_pre", 0x254, 6) - CRU_GATE(HCLK_IEP, "hclk_iep", "hclk_vio_pre", 0x254, 7) - CRU_GATE(ACLK_CIF, "aclk_cif", "aclk_vio_pre", 0x254, 8) - CRU_GATE(HCLK_CIF, "hclk_cif", "hclk_vio_pre", 0x254, 9) - CRU_GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0x254, 10) - CRU_GATE(HCLK_RGA, "hclk_rga", "hclk_vio_pre", 0x254, 11) - CRU_GATE(0, "hclk_ahb1tom", "hclk_vio_pre", 0x254, 12) - CRU_GATE(0, "pclk_vio_h2p", "hclk_vio_pre", 0x254, 13) - CRU_GATE(0, "hclk_vio_h2p", "hclk_vio_pre", 0x254, 14) - CRU_GATE(ACLK_HDCP, "aclk_hdcp", "aclk_vio_pre", 0x254, 15) + GATE(ACLK_VOP, "aclk_vop", "aclk_vop_pre", 21, 2), + GATE(HCLK_VOP, "hclk_vop", "hclk_vio_pre", 21, 3), + GATE(0, "aclk_vop_niu", "aclk_vop_pre", 21, 4), + GATE(0, "hclk_vop_niu", "hclk_vio_pre", 21, 5), + GATE(ACLK_IEP, "aclk_iep", "aclk_vio_pre", 21, 6), + GATE(HCLK_IEP, "hclk_iep", "hclk_vio_pre", 21, 7), + GATE(ACLK_CIF, "aclk_cif", "aclk_vio_pre", 21, 8), + GATE(HCLK_CIF, "hclk_cif", "hclk_vio_pre", 21, 9), + GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 21, 10), + GATE(HCLK_RGA, "hclk_rga", "hclk_vio_pre", 21, 11), + GATE(0, "hclk_ahb1tom", "hclk_vio_pre", 21, 12), + GATE(0, "pclk_vio_h2p", "hclk_vio_pre", 21, 13), + GATE(0, "hclk_vio_h2p", "hclk_vio_pre", 21, 14), + GATE(ACLK_HDCP, "aclk_hdcp", "aclk_vio_pre", 21, 15), /* CRU_CLKGATE_CON22 */ - CRU_GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vio_pre", 0x258, 0) - CRU_GATE(0, "hclk_vio_niu", "hclk_vio_pre", 0x258, 1) - CRU_GATE(0, "aclk_vio_niu", "aclk_vio_pre", 0x258, 2) - CRU_GATE(0, "aclk_rga_niu", "aclk_rga_pre", 0x258, 3) - CRU_GATE(PCLK_HDMI, "pclk_hdmi", "hclk_vio_pre", 0x258, 4) - CRU_GATE(PCLK_HDCP, "pclk_hdcp", "hclk_vio_pre", 0x258, 5) + GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vio_pre", 22, 0), + GATE(0, "hclk_vio_niu", "hclk_vio_pre", 22, 1), + GATE(0, "aclk_vio_niu", "aclk_vio_pre", 22, 2), + GATE(0, "aclk_rga_niu", "aclk_rga_pre", 22, 3), + GATE(PCLK_HDMI, "pclk_hdmi", "hclk_vio_pre", 22, 4), + GATE(PCLK_HDCP, "pclk_hdcp", "hclk_vio_pre", 22, 5), /* Bit 6-15 unused */ /* CRU_CLKGATE_CON23 */ - CRU_GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_pre", 0x25C, 0) - CRU_GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", 0x25C, 1) - CRU_GATE(0, "aclk_vpu_niu", "aclk_vpu_pre", 0x25C, 2) - CRU_GATE(0, "hclk_vpu_niu", "hclk_vpu_pre", 0x25C, 3) + GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_pre", 23, 0), + GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", 23, 1), + GATE(0, "aclk_vpu_niu", "aclk_vpu_pre", 23, 2), + GATE(0, "hclk_vpu_niu", "hclk_vpu_pre", 23, 3), /* Bit 4-15 unused */ /* CRU_CLKGATE_CON24 */ - CRU_GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pre", 0x260, 0) - CRU_GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", 0x260, 1) - CRU_GATE(0, "aclk_rkvdec_niu", "aclk_rkvdec_pre", 0x260, 2) - CRU_GATE(0, "hclk_rkvdec_niu", "hclk_rkvdec_pre", 0x260, 3) + GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pre", 24, 0), + GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", 24, 1), + GATE(0, "aclk_rkvdec_niu", "aclk_rkvdec_pre", 24, 2), + GATE(0, "hclk_rkvdec_niu", "hclk_rkvdec_pre", 24, 3), /* Bit 4-15 unused */ /* CRU_CLKGATE_CON25 */ - CRU_GATE(0, "aclk_rkvenc_niu", "aclk_rkvenc", 0x264, 0) - CRU_GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 0x264, 1) - CRU_GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 0x264, 2) - CRU_GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 0x264, 3) - CRU_GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 0x264, 4) - CRU_GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 0x264, 5) - CRU_GATE(0, "aclk_axisram", "hclk_rkvenc", 0x264, 6) + GATE(0, "aclk_rkvenc_niu", "aclk_rkvenc", 25, 0), + GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 25, 1), + GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 25, 2), + GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 25, 3), + GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 25, 4), + GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 25, 5), + GATE(0, "aclk_axisram", "hclk_rkvenc", 25, 6), /* Bit 7-15 unused */ /* CRU_CLKGATE_CON26 */ - CRU_GATE(ACLK_MAC2PHY, "aclk_gmac2phy", "aclk_gmac", 0x268, 0) - CRU_GATE(PCLK_MAC2PHY, "pclk_gmac2phy", "pclk_gmac", 0x268, 1) - CRU_GATE(ACLK_MAC2IO, "aclk_gmac2io", "aclk_gmac", 0x268, 2) - CRU_GATE(PCLK_MAC2IO, "pclk_gmac2io", "pclk_gmac", 0x268, 3) - CRU_GATE(0, "aclk_gmac_niu", "aclk_gmac", 0x268, 4) - CRU_GATE(0, "pclk_gmac_niu", "pclk_gmac", 0x268, 5) + GATE(ACLK_MAC2PHY, "aclk_gmac2phy", "aclk_gmac", 26, 0), + GATE(PCLK_MAC2PHY, "pclk_gmac2phy", "pclk_gmac", 26, 1), + GATE(ACLK_MAC2IO, "aclk_gmac2io", "aclk_gmac", 26, 2), + GATE(PCLK_MAC2IO, "pclk_gmac2io", "pclk_gmac", 26, 3), + GATE(0, "aclk_gmac_niu", "aclk_gmac", 26, 4), + GATE(0, "pclk_gmac_niu", "pclk_gmac", 26, 5), /* Bit 6-15 unused */ /* CRU_CLKGATE_CON27 */ @@ -555,11 +556,11 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 1 clk4x_ddrphy_en */ /* CRU_CLKGATE_CON28 */ - CRU_GATE(HCLK_PDM, "hclk_pdm", "hclk_bus_pre", 0x270, 0) - CRU_GATE(PCLK_USB3PHY_OTG, "pclk_usb3phy_otg", "pclk_phy", 0x270, 1) - CRU_GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy", 0x270, 2) - CRU_GATE(0, "pclk_pmu", "pclk_bus", 0x270, 3) - CRU_GATE(0, "pclk_otp", "pclk_bus", 0x270, 4) + GATE(HCLK_PDM, "hclk_pdm", "hclk_bus_pre", 28, 0), + GATE(PCLK_USB3PHY_OTG, "pclk_usb3phy_otg", "pclk_phy", 28, 1), + GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy", 28, 2), + GATE(0, "pclk_pmu", "pclk_bus", 28, 3), + GATE(0, "pclk_otp", "pclk_bus", 28, 4) /* Bit 5-15 unused */ }; From nobody Thu Sep 21 16:00:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0V96zBGz4tcm7; Thu, 21 Sep 2023 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0V94CP6z4Rqd; Thu, 21 Sep 2023 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=98Nmz5lDUu7O2hh9G1B5Z+PeJkSE6fiEeTloM0DwZR4=; b=lhnq1lVlZKfJat9fz9UMUmYBJJXRfktbYMNUgABkjwb6dEo79hfvym7YQ08J8So5GWxugE IIEEJbxKY0yMMfmgwNqjvTvbmaiGQ/mqox5vlJyCIfB0jjYdpbyQTGSIA2XreEUwUSicHd LIlDLC+6CU1wKAB1wFSJsVKG3jDfxFePhh/pQNRxaIhJ1IQXmKh/UyQYt3KEkFzpbGmASu E6EWNRz2lMMBvu28xy1ArgKYCYRdypjdkT0KmFEX7ayTyOZtj830qhpNK6x8bmutVFPZiX QZlN3BycdS/2vWq/21w/W+NkvZdQlcnXoemsCFVz8k0gfOhFSa1tpi/40MhvNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312017; a=rsa-sha256; cv=none; b=UUNWGkakh6D4hwjp8yuj5KnaEmohUUKVrbr1PLlMcAeXeVQgI8BbxDfYhFvuL9JJj9XEzy ET+EK34DPFPdfyovyY3P8Z++kuODKVWLxZy2VYX+L3DW1QeXBJ+smBiWNfUUiPx6+0dEUu HAsf69cno68wezLwCNGbeOOuklIiJZq8S3JeaaEyIGtcWZgRQ7wylbU4aRmLcq4COG5l9B 3orikXbzbxaT0CeyC7ogql3M2FYNKXOh+mZMo1q2ww7h/VcRu2Lcx0K0SNrCJVG6j7Xtgj 9Zj31f3svttK8t9HNY8XOeqoIwWwb5FQ9dl/tfTYvXNvUSZxIEdGzXz/kRihgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=98Nmz5lDUu7O2hh9G1B5Z+PeJkSE6fiEeTloM0DwZR4=; b=o7OwUCCodh1C/KLVBKMFYnQva4U95UfuwPS66Gg8Jz97RbnFYcbmdP3E0lxX3o7XILdeh1 ZoMikC6TT2C047YpYevCpFjxUBYzUQg9TtcTMpWwqf8KQpkWg8d3ePp4zEEm7BfNtbooxR aerksV75Li1DpeoLzUzzyr6qjSxvQspO0+HkJ6Efhq4KsuWh+L7gr4UZp58H5rrIfjC858 wovE0A97MPSOwszpAxSnrTPH57FrvU2qxYdWl0/67PtDh9ZQ5wktcb64wlJ1vNrRhDYCTO syNYou2MRtcnsURTu/RISIPTDLYMfmGP0hANgX6cc67eP+yTRYpuSeASrvQ+Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0V93JZczlTM; Thu, 21 Sep 2023 16:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Hj4050211; Thu, 21 Sep 2023 16:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0HhR050203; Thu, 21 Sep 2023 16:00:17 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:17 GMT Message-Id: <202309211600.38LG0HhR050203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 3d2ccc352db5 - main - arm64: rockchip: rk3399_pmucru: Use GATE macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d2ccc352db54b9fb11c4c1373a577e3e9d25114 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3d2ccc352db54b9fb11c4c1373a577e3e9d25114 commit 3d2ccc352db54b9fb11c4c1373a577e3e9d25114 Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:58:48 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:32 +0000 arm64: rockchip: rk3399_pmucru: Use GATE macro It make it easier to read the code and the register number --- sys/arm64/rockchip/clk/rk3399_pmucru.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 64df47468efd..9af438254a02 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -46,6 +46,8 @@ #include +#define CRU_CLKGATE_CON(x) (0x100 + (x) * 0x4) + /* GATES */ #define PCLK_PMU 20 @@ -58,13 +60,13 @@ static struct rk_cru_gate rk3399_pmu_gates[] = { /* PMUCRU_CLKGATE_CON1 */ - CRU_GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 0x104, 0) - CRU_GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 0x104, 3) - CRU_GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 0x104, 4) - CRU_GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 0x104, 7) - CRU_GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 0x104, 8) - CRU_GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 0x104, 9) - CRU_GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 0x104, 10) + GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 1, 0), + GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 1, 3), + GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 1, 4), + GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 1, 7), + GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 1, 8), + GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 1, 9), + GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10) }; /* From nobody Thu Sep 21 16:00:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0VC01yjz4tcs0; Thu, 21 Sep 2023 16:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0VB5rKgz4Rt6; Thu, 21 Sep 2023 16:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZC/uRiKckdE/70yMZCiUS6Osbo2dRaavYwvsTX+Wf4=; b=imYUKlXXORFtjwNI7Kz8Yna53ddkh+FXlUPHjtceH5cGAGoyDhrU2p0dMOLeA5uiPDLfRR tFSkNOBF0qfAv4VUOGTdMvQl7M7uw7LZS7JUKuPrVxmKyHgELxaawH2ThN831LjPTKsDza 5FZxjYKbZ168VIMiSIcoWokVvD3RKfJmOTCdetzItOPr5DFuN+AI6p/Zgs2lMp5jq7NSTm G9t5BxoI94e0tozbsnPWQzoU2beHUpgBRjSfHbVSy7nkizgfL1M63dpJ96BKdeJe84OBaj nyQv3jwDGO8oLaDa4lxAR2ggNh5dUiwV4lJHqXKJuS6u9PBYltTsdY5Aefo5og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312018; a=rsa-sha256; cv=none; b=dVciMKc/Wkemh2JgWBjldwlLVCGYZReCWSd4UrROxvqH+Tkj1HC3AhPwYOzM2+s5qUYCr+ 2ajk5XKSdxq3yRA07ciJuj/XeXdwllAGpbdwgJOI8kCI64ZtBrPsBO/cBAwILfsXtkp879 LYQpN/ZVuHWbDcxVHXidJhHIGFmsapYatYEMH05LYJw+xKhMn2WPPfX3wTuAj/Y66Od5u7 K1aSGHJP4y8S/Ds3vHSsw/rIppf/85+nRtQQ0WFBUbrf6bwUc7jelsyGlYSkZUxzJGj9W7 hw3gBofvXuDA41h7vzg10LvCuLp7sS+aprZqiPIaLw62kgEWaS8v2FG/B+//uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oZC/uRiKckdE/70yMZCiUS6Osbo2dRaavYwvsTX+Wf4=; b=Y8z0z5lCHHYyD9PMcCcfZuhTLbZT5JSroepSlsiVL5zclBkgdghIBUmlaWtYcV9s3ABZEc /wI889UqFSnnEQGmAf+SkAEzR/dRuGUbtex9rxr24oJ4UdC2/nfX4fswW5xs4i5nKb2T2o xjL9avkp4svtglYpytX8phn5UUDYJSMpWjZssDU7odZCsykz9NDdGyB5URE6+uFCGcnWVV faZhLKg3K1Ak1Q7sBKp53qTxfCPCAXZ5qmfNFmoWnu/0Yz0/2Sgd84FkPtpuEMgM62qA2o B6+j7lMz9dCLoKoZTCliyvHW9uLKF6KMmhUTOkX/KsVvM7+jN11jFRDA1f6vNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0VB4XLSzlYH; Thu, 21 Sep 2023 16:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0IGX050724; Thu, 21 Sep 2023 16:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0I3c050721; Thu, 21 Sep 2023 16:00:18 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:18 GMT Message-Id: <202309211600.38LG0I3c050721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 5b7fe78032a0 - main - arm64: rockchip: Remove CRU_GATE macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b7fe78032a0d07995c1c1c005d82c3a1fe8a056 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7fe78032a0d07995c1c1c005d82c3a1fe8a056 commit 5b7fe78032a0d07995c1c1c005d82c3a1fe8a056 Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:59:26 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:32 +0000 arm64: rockchip: Remove CRU_GATE macro It's unused now --- sys/arm64/rockchip/clk/rk_cru.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index 55f230036199..5d45dc6ab859 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -216,15 +216,6 @@ struct rk_cru_gate { uint32_t shift; }; -#define CRU_GATE(idx, clkname, pname, o, s) \ - { \ - .id = idx, \ - .name = clkname, \ - .parent_name = pname, \ - .offset = o, \ - .shift = s, \ - }, - enum rk_clk_type { RK_CLK_UNDEFINED = 0, RK3066_CLK_PLL, From nobody Thu Sep 21 16:00:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0VD0X88z4tcgX; Thu, 21 Sep 2023 16:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0VC6V7Dz4Rg0; Thu, 21 Sep 2023 16:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj80QVjCnN6sN3hFl+UFFzPHP+PFWG3wi+cfGme2Kho=; b=JUX8MnmPp8UAs0Ob0MwaYWILifG7E7FhGqZMg6CS/UbGvF55lyiRs329f5AqoOYy6cACnB W82haEpP2nWDAvgO80uY7gOu/VYvyhKg++0lamh52CKdFjGunZKC7CnybKqBta704KBKFh hB2LkLjuvjTnxbtso9yjXoWfD/uvNeQqHDveFf5S/eDzSR5XjmD8CnR5hW9kqoEEX7SruM kmFRMquS+bxzDppciNZrL5j6k5EUJk87kNEadYaWCum4jmP/qAEZiHQYc8cWQJHH6ZcHXp svTsw/cM/cOsxYsNwGd7DrdpPVKHTI48o+iKbKs2sNOWwOts1sT/3iKdsQTLDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312020; a=rsa-sha256; cv=none; b=mbWBuKvbFalKtW/81cEIUZECXmEvjOVQQm09zotYrYNLUFbb6yxRvUwhfakSzaQUW2cLqY lsPFDN2eX1wEjVKQOsSzwXYkUuQeqapavW7xicR5KIjIPkVTIwnIxrttwRJT6ClQHQ4EJI X9nLduB3/DHrs0woWwNq9i4PC6YOHeSrJGCzJX9/lnhTlq5BnxjmgPg6v3z0Cp5A7Bhyfa jBhXZ69ZRh9FbWzXbuN0A8sHw2dr76NCYuo4xQGhf22ddLxBMWSC/g/qPE9jkSgCkT7lXc RFykZRGuUJzQmNRnMfJHtq1pGEo8oOl7F8UhiCN75lQ8VOU3cE7U94jwcvH2KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yj80QVjCnN6sN3hFl+UFFzPHP+PFWG3wi+cfGme2Kho=; b=G342vF5Z+Ps5T23klMy8BXM+8TtziSP54psjxL9IsMPKIqZxSbsDUTHmt2JhnG0FJOqrkM abCUjwNhe+iU93hHsVuVV8JRaTqvsje2egaWPzciBMbSZj/EMJuHCd5eDH9jOy6ZOeQwwr bCqaPnoOvxB9ALQRCmisFDI2OBqQlY5wETIs/QdyDG/k5iDxLiSqlMd0JNBhjPFxM33hBQ 4kIGe66k2MO/zLIoWPECAI4ytL0oOD3KmQtItngtGc0qV+sezJz8bG+yM0mmPu5JlaDRmy Nb0pQWFKTRYus9VyluXzXFZmyks9NjhgxijmdBspIVWkcassDdR90TGPVgGYeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0VC5YYjzlTN; Thu, 21 Sep 2023 16:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0JUg050776; Thu, 21 Sep 2023 16:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0JfQ050773; Thu, 21 Sep 2023 16:00:19 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:19 GMT Message-Id: <202309211600.38LG0JfQ050773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 829b06ad8f6f - main - arm64: rockchip: rk3399_pmucru: Finish exporting all clocks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 829b06ad8f6f3317777c2395a090a898fdcd550c Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=829b06ad8f6f3317777c2395a090a898fdcd550c commit 829b06ad8f6f3317777c2395a090a898fdcd550c Author: Emmanuel Vadot AuthorDate: 2023-09-21 14:49:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:33 +0000 arm64: rockchip: rk3399_pmucru: Finish exporting all clocks - All used clocks are now exported. - Use the macros from rk_cru.h so code is similar to other rk clock drivers. --- sys/arm64/rockchip/clk/rk3399_pmucru.c | 211 +++++++++++++++++---------------- 1 file changed, 110 insertions(+), 101 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 9af438254a02..276905ae4561 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -46,35 +46,96 @@ #include +#define CRU_CLKSEL_CON(x) (0x80 + (x) * 0x4) #define CRU_CLKGATE_CON(x) (0x100 + (x) * 0x4) -/* GATES */ - +#define PLL_PPLL 1 +#define SCLK_32K_SUSPEND_PMU 2 +#define SCLK_SPI3_PMU 3 +#define SCLK_TIMER12_PMU 4 +#define SCLK_TIMER13_PMU 5 +#define SCLK_UART4_PMU 6 +#define SCLK_PVTM_PMU 7 +#define SCLK_WIFI_PMU 8 +#define SCLK_I2C0_PMU 9 +#define SCLK_I2C4_PMU 10 +#define SCLK_I2C8_PMU 11 + +#define PCLK_PMU_SRC 19 #define PCLK_PMU 20 +#define PCLK_PMUGRF_PMU 21 +#define PCLK_INTMEM1_PMU 22 #define PCLK_GPIO0_PMU 23 #define PCLK_GPIO1_PMU 24 +#define PCLK_SGRF_PMU 25 +#define PCLK_NOC_PMU 26 #define PCLK_I2C0_PMU 27 #define PCLK_I2C4_PMU 28 #define PCLK_I2C8_PMU 29 #define PCLK_RKPWM_PMU 30 +#define PCLK_SPI3_PMU 31 +#define PCLK_TIMER_PMU 32 +#define PCLK_MAILBOX_PMU 33 +#define PCLK_UART4_PMU 34 +#define PCLK_WDT_M0_PMU 35 + +#define FCLK_CM0S_SRC_PMU 44 +#define FCLK_CM0S_PMU 45 +#define SCLK_CM0S_PMU 46 +#define HCLK_CM0S_PMU 47 +#define DCLK_CM0S_PMU 48 +#define PCLK_INTR_ARB_PMU 49 +#define HCLK_NOC_PMU 50 +/* GATES */ static struct rk_cru_gate rk3399_pmu_gates[] = { + /* PMUCRU_CLKGATE_CON0 */ + /* 0 Reserved */ + /* 1 fclk_cm0s_pmu_ppll_src_en */ + GATE(SCLK_SPI3_PMU, "clk_spi3_pmu", "clk_spi3_c", 0, 2), + GATE(SCLK_TIMER12_PMU, "clk_timer0_pmu", "clk_timer_sel", 0, 3), + GATE(SCLK_TIMER13_PMU, "clk_timer1_pmu", "clk_timer_sel", 0, 4), + GATE(SCLK_UART4_PMU, "clk_uart4_pmu", "clk_uart4_sel", 0, 5), + GATE(0, "clk_uart4_frac", "clk_uart4_frac_frac", 0, 6), + /* 7 clk_pvtm_pmu_en */ + GATE(SCLK_WIFI_PMU, "clk_wifi_pmu", "clk_wifi_sel", 0, 8), + GATE(SCLK_I2C0_PMU, "clk_i2c0_src", "clk_i2c0_div", 0, 9), + GATE(SCLK_I2C4_PMU, "clk_i2c4_src", "clk_i2c4_div", 0, 10), + GATE(SCLK_I2C8_PMU, "clk_i2c8_src", "clk_i2c8_div", 0, 11), + /* 12:15 Reserved */ + /* PMUCRU_CLKGATE_CON1 */ GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 1, 0), + /* 1 pclk_pmugrf_en */ + /* 2 pclk_intmem1_en */ GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 1, 3), GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 1, 4), + /* 5 pclk_sgrf_en */ + /* 6 pclk_noc_pmu_en */ GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 1, 7), GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 1, 8), GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 1, 9), - GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10) + GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10), + GATE(PCLK_SPI3_PMU, "pclk_spi3_pmu", "pclk_pmu_src", 1, 11), + GATE(PCLK_TIMER_PMU, "pclk_timer_pmu", "pclk_pmu_src", 1, 12), + GATE(PCLK_MAILBOX_PMU, "pclk_mailbox_pmu", "pclk_pmu_src", 1, 13), + /* 14 pclk_uartm0_en */ + /* 15 pclk_wdt_m0_pmu_en */ + + /* PMUCRU_CLKGATE_CON2 */ + /* 0 fclk_cm0s_en */ + /* 1 sclk_cm0s_en */ + /* 2 hclk_cm0s_en */ + /* 3 dclk_cm0s_en */ + /* 4 Reserved */ + /* 5 hclk_noc_pmu_en */ + /* 6:15 Reserved */ }; /* * PLLs */ -#define PLL_PPLL 1 - static struct rk_clk_pll_rate rk3399_pll_rates[] = { { .freq = 2208000000, @@ -695,124 +756,72 @@ static struct rk_clk_pll_rate rk3399_pll_rates[] = { {}, }; -static const char *pll_parents[] = {"xin24m"}; +PLIST(xin24m_p) = {"xin24m"}; +PLIST(xin24m_xin32k_p) = {"xin24m", "xin32k"}; +PLIST(xin24m_ppll_p) = {"xin24m", "ppll"}; +PLIST(uart4_p) = {"clk_uart4_c", "clk_uart4_frac", "xin24m"}; +PLIST(wifi_p) = {"clk_wifi_c", "clk_wifi_frac"}; static struct rk_clk_pll_def ppll = { .clkdef = { .id = PLL_PPLL, .name = "ppll", - .parent_names = pll_parents, - .parent_cnt = nitems(pll_parents), + .parent_names = xin24m_p, + .parent_cnt = nitems(xin24m_p), }, .base_offset = 0x00, .rates = rk3399_pll_rates, }; -static const char *pmu_parents[] = {"ppll"}; - -#define PCLK_PMU_SRC 19 - -static struct rk_clk_composite_def pclk_pmu_src = { - .clkdef = { - .id = PCLK_PMU_SRC, - .name = "pclk_pmu_src", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, - /* PMUCRU_CLKSEL_CON0 */ - .muxdiv_offset = 0x80, - - .div_shift = 0, - .div_width = 5, -}; - -#define SCLK_I2C0_PMU 9 -#define SCLK_I2C4_PMU 10 -#define SCLK_I2C8_PMU 11 +static struct rk_clk rk3399_pmu_clks[] = { + /* Linked clocks */ + LINK("xin32k"), -static struct rk_clk_composite_def i2c0 = { - .clkdef = { - .id = SCLK_I2C0_PMU, - .name = "clk_i2c0_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), + { + .type = RK3399_CLK_PLL, + .clk.pll = &ppll }, - /* PMUCRU_CLKSEL_CON2 */ - .muxdiv_offset = 0x88, - - .div_shift = 0, - .div_width = 7, - - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 9, - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + /* PMUCRU_CLKSEL_CON0 */ + CDIV(PCLK_PMU_SRC, "pclk_pmu_src", "ppll", 0, 0, 0, 5), + /* 5:7 Reserved */ + /* 8:12 cm0s_div */ + /* 13:14 Reserved */ + /* 15 cm0s_clk_pll_sel */ + + /* PMUCRU_CLKSEL_CON1 */ + COMP(0, "clk_spi3_c", xin24m_ppll_p, 0, 1, 0, 7, 7, 1), + COMP(0, "clk_wifi_c", xin24m_ppll_p, 0, 1, 8, 5, 13, 1), + MUX(0, "clk_wifi_sel", wifi_p, 0, 1, 14, 1), + MUX(0, "clk_timer_sel", xin24m_xin32k_p, 0, 1, 15, 1), -static struct rk_clk_composite_def i2c8 = { - .clkdef = { - .id = SCLK_I2C8_PMU, - .name = "clk_i2c8_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, /* PMUCRU_CLKSEL_CON2 */ - .muxdiv_offset = 0x88, - - .div_shift = 8, - .div_width = 7, - - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 11, - - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + CDIV(0, "clk_i2c0_div", "ppll", 0, 2, 0, 7), + /* 7 Reserved */ + CDIV(0, "clk_i2c8_div", "ppll", 0, 2, 8, 7), + /* 15 Reserved */ -static struct rk_clk_composite_def i2c4 = { - .clkdef = { - .id = SCLK_I2C4_PMU, - .name = "clk_i2c4_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, /* PMUCRU_CLKSEL_CON3 */ - .muxdiv_offset = 0x8c, + CDIV(0, "clk_i2c4_div", "ppll", 0, 3, 0, 7), + /* 7:15 Reserved */ - .div_shift = 0, - .div_width = 7, + /* PMUCRU_CLKSEL_CON4 */ + /* 0:9 clk_32k_suspend_div */ + /* 10:14 Reserved */ + /* 15 clk_32k_suspend_sel */ - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 10, + /* PMUCRU_CLKSEL_CON5 */ + COMP(0, "clk_uart4_c", xin24m_ppll_p, 0, 5, 0, 7, 10, 1), + /* 7 Reserved */ + MUX(0, "clk_uart4_sel", uart4_p, 0, 5, 8, 2), + /* 11:15 Reserved */ - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + /* PMUCRU_CLKFRAC_CON0 / PMUCRU_CLKSEL_CON6 */ + FRACT(0, "clk_uart4_frac_frac", "clk_uart4_sel", 0, 6), -static struct rk_clk rk3399_pmu_clks[] = { - { - .type = RK3399_CLK_PLL, - .clk.pll = &ppll - }, - - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &pclk_pmu_src - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c0 - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c4 - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c8 - }, + /* PMUCRU_CLKFRAC_CON1 / PMUCRU_CLKSEL_CON7 */ + FRACT(0, "clk_wifi_frac", "clk_wifi_c", 0, 7), }; static int From nobody Thu Sep 21 16:00:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0VF1WmMz4tcpm; Thu, 21 Sep 2023 16:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0VF0XY0z4RjZ; Thu, 21 Sep 2023 16:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkD0YbV44GliCxqGKA633wPZdjFVCaSh8lh9LIhZGuM=; b=mvmviwA2Ff5xr+ihSQigUQgGvNd+6CX96nHeiQJLVO2xxHeAXfvBtvIhAFVTJ1JxjN+c0N MeASS2/ginl0zpjFclpKnzl8V/2+as/cpQWF/cm7TIAvNQb12LaUrkKlP/L03q7It4vGXA CrS5EvQ9jBcB9kFXjHcr15xD9S/0Os22STNMHu6FZ7RL3a97W34bHHCBLIyMgebjTI8DYz OzCJjd98EXsRRvyo+I/EFgtGZx2Ds4aJE14q+3bUmgemf0lwus1K5mXIROkVoLjV1YOzsF Ygik4246D9TyHYw+yiz9kQ3txS5H15mbA73yQ+cCB5Ru9CG5eHtO7UCETUUn3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312021; a=rsa-sha256; cv=none; b=U1HU7A69GSVLkVVzT3f5ymunxvoXKu1KyWMwRu62cevF8BFXrx03B2AAz+QFzO2A8U+/Sg z8YKYy6pEsqicOPAUXZuNjHh6pnHfJkRoKtbDaE3Kst8vJAQKtyvU2mjUGh1oUghWhm1X6 OsF9VeSHMZNv6JnSUVuU2UUX2981mBvzpeO9M+PjACZvtpr+ByovaB1ybyGpeSFLRbuhuR ceThcRp3o4xnuqV+NxTvsqWb3q7rM2NylEZ8YHVW3WxL2hb6wyIWN6MBUCKzDdgsy8OZxw ERbVM9izLoa4cJBkLTVICvV/VroxIN1ltqNxRty0KnebGPvbK3udeZxoArF21Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WkD0YbV44GliCxqGKA633wPZdjFVCaSh8lh9LIhZGuM=; b=Sg3CSjMt88VnlVWnlSG6+GsfB7d51KORhnf8n39D9IkN6m5L4ktZgsaVGUcW016GWm2xJF ee14msrijK0lAvjqOMmeCT7jkpPGeHshpYeeDOgFxmElP318dGWf2jil9EzX7qK/7C8f1j rN0wH/kJa8gSr0S/dy+EFraXz6G/CvOQ5vsWFLmlFBWWcACW/mjJ8G+de+va6TCpaFcL0m lTrMjbzbPHWhtgC2oonW843ejJhhCk/ELsw59uEdW6jiZsn31xE9yPRaJ40KNqEUAm6SGF 8PpuToNSW/0q5vUo6O0Tx0vEzbcZBzSU79jQXcbPbfuCYLGXg9dTFfvZmH7a0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0VD6YdCzlVd; Thu, 21 Sep 2023 16:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Kl1050827; Thu, 21 Sep 2023 16:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0K6k050824; Thu, 21 Sep 2023 16:00:20 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:20 GMT Message-Id: <202309211600.38LG0K6k050824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: db34f02028f3 - main - arm64: rockchip: rk_clk_composite: Remove gate code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db34f02028f30bbf099bf1bce7ce66184f51b332 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=db34f02028f30bbf099bf1bce7ce66184f51b332 commit db34f02028f30bbf099bf1bce7ce66184f51b332 Author: Emmanuel Vadot AuthorDate: 2023-09-21 14:56:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:33 +0000 arm64: rockchip: rk_clk_composite: Remove gate code It was a bad idea to have composite clock directly managing gates. All clocks drivers have been rewrite to not use this functionality and directly export the gate. We can now remove this code. --- sys/arm64/rockchip/clk/rk_clk_composite.c | 31 ------------------------------- sys/arm64/rockchip/clk/rk_clk_composite.h | 8 ++------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/arm64/rockchip/clk/rk_clk_composite.c index a04b3aa2193c..a30dadbaf811 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.c +++ b/sys/arm64/rockchip/clk/rk_clk_composite.c @@ -48,9 +48,6 @@ struct rk_clk_composite_sc { uint32_t div_width; uint32_t div_mask; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; struct syscon *grf; @@ -145,30 +142,6 @@ rk_clk_composite_init(struct clknode *clk, device_t dev) return (0); } -static int -rk_clk_composite_set_gate(struct clknode *clk, bool enable) -{ - struct rk_clk_composite_sc *sc; - uint32_t val = 0; - - sc = clknode_get_softc(clk); - - if ((sc->flags & RK_CLK_COMPOSITE_HAVE_GATE) == 0) - return (0); - - dprintf("%sabling gate\n", enable ? "En" : "Dis"); - if (!enable) - val |= 1 << sc->gate_shift; - dprintf("sc->gate_shift: %x\n", sc->gate_shift); - val |= (1 << sc->gate_shift) << RK_CLK_COMPOSITE_MASK_SHIFT; - dprintf("Write: gate_offset=%x, val=%x\n", sc->gate_offset, val); - DEVICE_LOCK(clk); - WRITE4(clk, sc->gate_offset, val); - DEVICE_UNLOCK(clk); - - return (0); -} - static int rk_clk_composite_set_mux(struct clknode *clk, int index) { @@ -320,7 +293,6 @@ rk_clk_composite_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, static clknode_method_t rk_clk_composite_clknode_methods[] = { /* Device interface */ CLKNODEMETHOD(clknode_init, rk_clk_composite_init), - CLKNODEMETHOD(clknode_set_gate, rk_clk_composite_set_gate), CLKNODEMETHOD(clknode_set_mux, rk_clk_composite_set_mux), CLKNODEMETHOD(clknode_recalc_freq, rk_clk_composite_recalc), CLKNODEMETHOD(clknode_set_freq, rk_clk_composite_set_freq), @@ -355,9 +327,6 @@ rk_clk_composite_register(struct clkdom *clkdom, sc->div_width = clkdef->div_width; sc->div_mask = ((1 << clkdef->div_width) - 1) << sc->div_shift; - sc->gate_offset = clkdef->gate_offset; - sc->gate_shift = clkdef->gate_shift; - sc->flags = clkdef->flags; clknode_register(clkdom, clk); diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.h b/sys/arm64/rockchip/clk/rk_clk_composite.h index 79cd3777c84b..22a052da22c2 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.h +++ b/sys/arm64/rockchip/clk/rk_clk_composite.h @@ -41,17 +41,13 @@ struct rk_clk_composite_def { uint32_t div_shift; uint32_t div_width; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; }; #define RK_CLK_COMPOSITE_HAVE_MUX 0x0001 -#define RK_CLK_COMPOSITE_HAVE_GATE 0x0002 -#define RK_CLK_COMPOSITE_DIV_EXP 0x0004 /* Register 0, 1, 2, 2, ... */ +#define RK_CLK_COMPOSITE_DIV_EXP 0x0002 /* Register 0, 1, 2, 2, ... */ /* Divider 1, 2, 4, 8, ... */ -#define RK_CLK_COMPOSITE_GRF 0x0008 /* Use syscon registers instead of CRU's */ +#define RK_CLK_COMPOSITE_GRF 0x0004 /* Use syscon registers instead of CRU's */ int rk_clk_composite_register(struct clkdom *clkdom, struct rk_clk_composite_def *clkdef); From nobody Thu Sep 21 16:00:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs0VG3715z4tcpn; Thu, 21 Sep 2023 16:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs0VG1MRbz4S0q; Thu, 21 Sep 2023 16:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LzklMBbvPZirVFO57GEhII4aqHvUGS+uEXHq74FbTrc=; b=QN6WNY+63JoDuH4CbiIUKq0QgRqYWaBa67jDFD88jOh/Kxpb0WssxW9Bn0WBZFJr5mnH2g E2eLCAgD/Z7RkuEg89y9QmMmOLqMZqLDW6EYSHkqJbSRLUfNW6VtlFOutJa6NeOwyFbNCd N8XsoDiDDf1+mhTOL00pcOskzSyJP+Ic4OFkw5BDHaDT/O6ZT7iX2j571l3/fb5ITOSinc o0kLCkOvqdx78bFH1MTUsfR3rIJpW8Ljl3On/hbOFFWhoEufgm7855+Q1kn7/oDyUv7/m9 Ug4RYPDBmNEZOQdb76vWcRWxybMEtBSNrjiJrYxJomkOuPO0UQuj0z9CFKlIBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312022; a=rsa-sha256; cv=none; b=xPBl6cCYNJjU4fAth70OBkJGtw12GYlKukVjJPIFIRdrcwepC3AGKpp8fV3MAG1IzwdIC+ XWSeOaOHzLe+I7wqopyBRoJBHtORiO851F25Vt05UYpHKf9qpKP1Pnl1sXA8VjHcN1GYuQ P2GSigQxb23h0Dim55MdvzP7uVYMOtWwYHphde8gEOm5k90vL93Ec/jfdob1NoZVzjoF+e 4N/zpLKh8vrhaN3LqTysi7GcJdbaZqQD2l774dknRdCq8ioskz12FwQPMPiThGnQhEC8gF BYKYvCyt6il8nZ47+zi37njU/eN3/b2sG410Zbdwbt98qnHgC6BVh2HkRjyfxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LzklMBbvPZirVFO57GEhII4aqHvUGS+uEXHq74FbTrc=; b=vf21zIDUoUosKlnhFN6p70TeOy1E6mchW40RNz4tgWV4QrDBl7rrj8Rr0zbTSZYRl9t5Ea RZ7zmGr34fQZOdOwGlJSnrzn0/n/2mQVM3JC5XyYogUSO28GLnQ7K6A6gVzKx92GPjf5mz 47LJMFFZn4h5swwRSOFVv91be7XbYS4cc2W1eU9uH0ivs8LyWaPI59+MQOTSzpbVaaTJHZ y3XzTu8IRqxFjbSes/jF59UKOsyLLpWC233f3XLa4/Y5c07Wd2CMExJ1H3RGSr//kCSUCY GOH9MNGexJ7PNVZQE3CL6KRzU7qVmfQiy4SaaNZZWkZS79Lgl5EjnayG+RO0eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs0VG0Sd5zlYJ; Thu, 21 Sep 2023 16:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LG0Lpv050881; Thu, 21 Sep 2023 16:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0L8S050878; Thu, 21 Sep 2023 16:00:21 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:21 GMT Message-Id: <202309211600.38LG0L8S050878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 2303980cfcb1 - main - arm64: dtb: Add rk3566-quartz64-a.dts to the build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2303980cfcb1e709c17b108ce66a25a8e7eea337 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=2303980cfcb1e709c17b108ce66a25a8e7eea337 commit 2303980cfcb1e709c17b108ce66a25a8e7eea337 Author: Emmanuel Vadot AuthorDate: 2023-08-15 05:58:05 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:50:07 +0000 arm64: dtb: Add rk3566-quartz64-a.dts to the build We can boot on this board. --- sys/modules/dtb/rockchip/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 79ce7f2c7407..8f747738e6b1 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -16,7 +16,8 @@ DTS= \ rockchip/rk3328-rock-pi-e.dts \ rockchip/rk3328-rock64.dts \ rockchip/rk3399-firefly.dts \ - rockchip/rk3399-rockpro64.dts + rockchip/rk3399-rockpro64.dts \ + rockchip/rk3566-quartz64-a.dts DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ From nobody Thu Sep 21 16:45:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs1VD2nGHz4tglX for ; Thu, 21 Sep 2023 16:45:24 +0000 (UTC) (envelope-from pierre@freebsdfoundation.org) Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs1VD0rghz4Y5j for ; Thu, 21 Sep 2023 16:45:24 +0000 (UTC) (envelope-from pierre@freebsdfoundation.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31dd10c2b8bso1183519f8f.3 for ; Thu, 21 Sep 2023 09:45:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsdfoundation.org; s=gfnp-20170908; t=1695314722; x=1695919522; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:organization:from:cc :references:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=BP8GoDKF3KhUDIJfKENR7v1PcG8qwK9nfp1jyNDBDTE=; b=S6uJUdbT5ZW+I2LlbbbJLR/Mk5Ou3ExmZt5h7+a3M5OPvxveg+NmB3H1wQu6x/DYRP rlq3z6SAPxj20vYotSmGgtv8VvrRYgn95DBmgr4VdEQkR98K8f7ZW5gHqhs/pIe7svPM x4bQPzmfYwDXeyH1S0PXCEho/QrbsuSMg38PKrs7ZQNSSFeCWEk28CSERzrg5Gce3U9+ GLQeES9wlqVE1u1alIJZjpH0WUH0JJ7OhnlF7kWQtUFKKa8dcvPXk/7LtduSI/i/vc0k n4F8ATKVuohaqFaUtkMhFPCJ8Vl3sW6wneNcaAIg7j9QOj35BM4g9xtOnQXYammDNLNh D5uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695314722; x=1695919522; h=content-transfer-encoding:in-reply-to:organization:from:cc :references:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BP8GoDKF3KhUDIJfKENR7v1PcG8qwK9nfp1jyNDBDTE=; b=ua1ok2ma9l6y+8yBeIY5J0lw/gkOD+Go9nx7fP4LXi5GJlC69AsGv26JIXmo3CZlqn 6MPNmlm8SRe9puRMGCIXpu3/GtGovvRS1hEKfteoHA/MujQjxRG0Qq9HDM2aVKpZyQPX RFrd/0HV1q2zWC3KKJlwbd2MkwV13vzPnPNrg522VOl4PILESok81deCZajKOiVc2ol2 ZLlNP3cRzB2gY7v9+AhIW5AVIzQ364pqudlk1HQgzRtP9VQjSQFn6kGSZ2SE0RGcsqxD n2lFT+8xv7zPA7g9NIbIYc8o9cP1zFsnTCtVy6/xlEbEuPsBsMIFQuzSMGl5tDo1rYpw aIog== X-Gm-Message-State: AOJu0YzIUy2493uAam9AMtsPubOUyXnpyKgnE3puvkz2NSrTRjSNJ7Pt V0lWL2f9HoafagcuHyZc9FQYO+t1 X-Google-Smtp-Source: AGHT+IFUolv0KixFDudTMcCrwSXhq7mlzMv9iugDwzMZq5LdeJyVILahGUgWEe1BRHtHF5BsSBVFTA== X-Received: by 2002:a5d:4c85:0:b0:320:1d1:71c4 with SMTP id z5-20020a5d4c85000000b0032001d171c4mr5295091wrs.23.1695314722379; Thu, 21 Sep 2023 09:45:22 -0700 (PDT) Received: from [192.168.151.7] ([61.28.200.56]) by smtp.gmail.com with ESMTPSA id w10-20020adfde8a000000b0031fba0a746bsm2230493wrl.9.2023.09.21.09.45.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Sep 2023 09:45:21 -0700 (PDT) Message-ID: <610971ad-00b5-f905-369c-b373fa77ede5@freebsdfoundation.org> Date: Thu, 21 Sep 2023 18:45:21 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: git: 8f37b3a142f2 - main - libcrypto: fix the FIPS provider on amd64 Content-Language: en-US To: Ed Maste References: <202309211538.38LFcWEe008044@gitrepo.freebsd.org> Cc: dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, src-committers@FreeBSD.org From: Pierre Pronchery Organization: FreeBSD Foundation In-Reply-To: <202309211538.38LFcWEe008044@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Rs1VD0rghz4Y5j Hi there, On 9/21/23 17:38, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 > > commit 8f37b3a142f2f7197896cd283c44c7e4fb64aaf3 > Author: Pierre Pronchery > AuthorDate: 2023-09-04 17:57:35 +0000 > Commit: Ed Maste > CommitDate: 2023-09-21 15:38:02 +0000 > > libcrypto: fix the FIPS provider on amd64 > > This corrects the list of source files required for the FIPS provider. > > To test: > > ``` > INSTALL PASSED > enter AES-128-CBC encryption password: > Verifying - enter AES-128-CBC encryption password: > U2FsdGVkX1+MGm7LbZou29UWU+KAyBX/PxF5T1pO9VM= > ``` The complete test procedure, including the corresponding commands is: ``` # openssl fipsinstall -out /etc/ssl/fipsmodule.cnf \ -module /usr/lib/ossl-modules/fips.so [...] INSTALL PASSED # vi /etc/ssl/openssl.cnf [enable the FIPS module] # echo test | openssl aes-256-cbc -provider fips -a -pbkdf2 enter AES-256-CBC encryption password: Verifying - enter AES-256-CBC encryption password: U2FsdGVkX199k8PlM+6jTPK4AARYYVR3BXF+a1bCLCk= ``` HTH, -- Pierre > > Reviewed by: emaste > Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") > Sponsored by: The FreeBSD Foundation > Pull Request: https://github.com/freebsd/freebsd-src/pull/837 > Differential Revision: https://reviews.freebsd.org/D41720 > --- > secure/lib/libcrypto/modules/fips/Makefile | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile > index b674126bb6cf..8843cb9717c9 100644 > --- a/secure/lib/libcrypto/modules/fips/Makefile > +++ b/secure/lib/libcrypto/modules/fips/Makefile > @@ -32,25 +32,25 @@ SRCS+= mem_clr.c > .endif > > # crypto/aes > -SRCS+= aes_cbc.c aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c > +SRCS+= aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c > .if defined(ASM_aarch64) > -SRCS+= aes_core.c aesv8-armx.S vpaes-armv8.S > +SRCS+= aes_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S > ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto > .elif defined(ASM_amd64) > -SRCS+= aes_core.c aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S > -SRCS+= aesni-x86_64.S vpaes-x86_64.S > +SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S > +SRCS+= aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S > .elif defined(ASM_arm) > -SRCS+= aes-armv4.S aesv8-armx.S bsaes-armv7.S > +SRCS+= aes_cbc.c aes-armv4.S aesv8-armx.S bsaes-armv7.S > .elif defined(ASM_i386) > -SRCS+= aes_core.c aesni-x86.S vpaes-x86.S > +SRCS+= aes-586.S aesni-x86.S vpaes-x86.S > .elif defined(ASM_powerpc) > -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > .elif defined(ASM_powerpc64) > -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > .elif defined(ASM_powerpc64le) > -SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > +SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S > .else > -SRCS+= aes_core.c > +SRCS+= aes_cbc.c aes_core.c > .endif > > # crypto/bn > > -- Pierre Pronchery From nobody Thu Sep 21 16:49:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs1Zl4z5nz4thDb; Thu, 21 Sep 2023 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs1Zl4Tsjz4Ytq; Thu, 21 Sep 2023 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695314959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Js7D+cklZJpRZZsiln5M7/Y+nF5iNNChCaT4McqBts=; b=D00lGoYsNjbjx6LQzbE49lKjz2spZYaM+8VvSPilbHNnjQNfgDBeS1e3FJm/k4TZ/F4Cwc zXEhdGaVjkANTvTXbXr6WccrVTq92R2IOc5oLpcQr9CJhnHPvfCKoU5rCcmhqIE3BcixfU pPOXW5lvgve6o089SOePZJKjC7taG0J5AewsnsB7Mli3y+is6W7LwXfX3GlFMXnv3Zkt9p yRAsn2O1kO6TfYvrINKToW/dCVgvLwR41lqa9nnJ7yyii2MY9tHROE2GFMx+l4+HKUCMy4 nGm+8PSYNWV8xehj9VGHuPTdwDCSmveS2u0D1aVb1PwWj8uyv8UIE1YiCzOqWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695314959; a=rsa-sha256; cv=none; b=LlsMxvq5u+tWX6p7kROOF4PPYFiSaKRHTf8UIYVrFLcv7FEv7kqYj6HEI1IdJ5jQzYMalp W3ussOkwqtfOh20afaUg3ItlhHfmS0Px1y9JOIu+xbGxwnNYvLvrZdHSf//kPKGeD8uQSX 2qL2XZB7ER78Gsb5ftUxs41KARVW8gtr+gExxrPgnABQtPSfXZwUzS12OKTiQ7od11NASm dyi0ebJRGQj0d2aCsNChGx2SAS50RTx/14DdnK10s+F2du9R00Bewtg3JlZghAITTf2VDH vcmkF8fyGTZOUi05iaAhHjEnt9owFIgbHF6RQIVCMSnXbXjp9NkvTgkK7TUItQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695314959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8Js7D+cklZJpRZZsiln5M7/Y+nF5iNNChCaT4McqBts=; b=MyCSmEdq+5JIp15TpEyMsDb0LtwmnTRuZkCRiN8lwBRzS2QsXQQCm4efBb5yLc9DfWGPIJ RvXv8hKPoGGiaqGstt3OpLbT/NVv6JuyvJTkp7E06I9PyR29H4fM1Bt6j8oJyWRshf9/C3 f+z+TryV1Bb2WLmaXxjhtAlGSbMppFZ3bZY95r50RX7S3jqoYhzIPMvfqj+81ynMVETozE ZMaS7fJcp+Xi7LZ6UUjg/EL0/+dGVo8Z7lW2lmOBuZoZOFKasQ+6qdrYkg6qQey00jXAYm I01yTMqOojsYbkDuzWripk4Mu8WhnsZUufGDvgjDoRoF8Ff/EThr9e1iwfukZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs1Zl3Wn3zmdg; Thu, 21 Sep 2023 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LGnJKK024516; Thu, 21 Sep 2023 16:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LGnJ6Q024513; Thu, 21 Sep 2023 16:49:19 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:49:19 GMT Message-Id: <202309211649.38LGnJ6Q024513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d26c1a0f8bce - main - makefs: Handle missing link keyword in mtree spec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3 commit d26c1a0f8bceb6748436fe3fc57bac3ef8179dd3 Author: Stéphane Rochoy AuthorDate: 2023-09-21 07:14:20 +0000 Commit: Ed Maste CommitDate: 2023-09-21 16:49:11 +0000 makefs: Handle missing link keyword in mtree spec PR: 241178 Reviewed by: emaste MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/850 --- usr.sbin/makefs/mtree.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 45588e202542..3e62afbc1137 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -740,7 +740,10 @@ read_mtree_keywords(FILE *fp, fsnode *node) type = S_IFREG; } else if (node->type != 0) { type = node->type; - if (type == S_IFREG) { + if (type == S_IFLNK && node->symlink == NULL) { + mtree_error("%s: link type requires link keyword", node->name); + return (0); + } else if (type == S_IFREG) { /* the named path is the default contents */ node->contents = mtree_file_path(node); } From nobody Thu Sep 21 16:51:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs1d852wHz4thLP; Thu, 21 Sep 2023 16:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs1d84c8Gz4ZR6; Thu, 21 Sep 2023 16:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695315084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8Dn9xSndywZrazHNKwIj5YH07bQFp6Dkc/ZhLM1uNY=; b=SurRqkt87MVwHRvtBc9f9spx0ICMrUjd6OBuQJUQcE/UaZb8ltv7QEETMz2GgnPcO0liEA Vk5FzJXg3SizkF97ZsNc4WwScI6LcZVfov9pOEvW8mi2iM8sM6OaXTNffP0ajibDbzvXmh sanvP2VcTqojd1C/7RLcJDofMv+1dO8uKHksyrExBRmW4LTHIOu8KOAtTZ37ByBPMYJ9hF MyhXXiI9dgecwFg8xCyz5A9mnGxWg8vRmvzmy+u64JIhj/XxZLbhJTM/gfH8yDK8h8VAfD aR97QH9dSVXYzTJj9Zh69OPIybOP3wVGcnBFtOo/7qjiotPSAutzarDBft25hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695315084; a=rsa-sha256; cv=none; b=OGhEsILMv6LEUdzoA2Lw5OGaaM7ZIywoYXq90OJbV0vfiirzWcbG9JK90qzJLdDXLf/nhU IfCl/cQYA4fqW5FrKt11B85ee/dD8+SJ1Fy/k2hlAzQYYJNbYRziFJEhwgDkSf+R+/ZTn+ DhFGm4MV43531q2bkDtgEWCSCj5swFmuGvy1a77PHcZ/eRVbml6nZbLdAEc5Cwm7FMZ2cx xOHJl0axKP2XjPDAB/g6Lf9qxXkvHjDYSz57K7eD19sxL9Q0e67cTYz0vL+mYLmIQ3W3qC zyGzYcG2nc16vH7/1yvu3gYDxdQF5tAqlXXSGKOT29aroVG4PAP8PGtcn08V3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695315084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L8Dn9xSndywZrazHNKwIj5YH07bQFp6Dkc/ZhLM1uNY=; b=c/M2nCvNp/cZb5MjOJi02VPISUX3GnxEuqX9WbCPwJOhMcexqMwTNVLFGYefAv465Lrpjt 1sCVcrmVTUWBKbhGem+QuPHotyBQ4CQLL+hy+J+QYh/OCSNSb3H4P3eeWJG/RH2hgEtSVN R1NV4/wwDXTIYGxKFV6xEDNgn9Rr68Vxl3J2w5/FysUNzxdhXs4AGZHa9nOH+cN9ExzMMQ orGyRNDqyrHywpO4L7HlrGs876OkV5dLWuLJB2UcaLJ0FHrHysME+Qa4KDQ8fA2C4vEZrK WAavOC++QCgFIH/9rIR4eNAycIqCWd4HykQwn6L0bBzMxSYzZfnDjWtA4t/i5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs1d83gVxzmf4; Thu, 21 Sep 2023 16:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LGpOSc036343; Thu, 21 Sep 2023 16:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LGpOKm036340; Thu, 21 Sep 2023 16:51:24 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:51:24 GMT Message-Id: <202309211651.38LGpOKm036340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 67864268da53 - main - devfs: add integrity asserts for cdevp_list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67864268da53b792836f13be10299de8cd62997e Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=67864268da53b792836f13be10299de8cd62997e commit 67864268da53b792836f13be10299de8cd62997e Author: Jason A. Harmening AuthorDate: 2023-09-19 13:44:34 +0000 Commit: Jason A. Harmening CommitDate: 2023-09-21 16:51:12 +0000 devfs: add integrity asserts for cdevp_list It's possible for misuse of cdev KPIs or for bugs in devfs itself to result in e.g. a cdev object's container being freed while still on the global list used to populate each devfs mount; see PR 273418 for a recent example. Since a node may be marked inactive well before it is reaped from the list, add a new flag solely to track list membership, and employ it in some basic list integrity assertions to catch bad actors. Discussed with: kib, mjg MFC after: 1 week --- sys/fs/devfs/devfs_devs.c | 12 +++++++++++- sys/fs/devfs/devfs_int.h | 1 + sys/fs/devfs/devfs_vnops.c | 4 ++++ sys/kern/kern_conf.c | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index c6efd0d421b1..db879efe803a 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -175,6 +175,9 @@ devfs_free(struct cdev *cdev) struct cdev_priv *cdp; cdp = cdev2priv(cdev); + KASSERT((cdp->cdp_flags & (CDP_ACTIVE | CDP_ON_ACTIVE_LIST)) == 0, + ("%s: cdp %p (%s) still on active list", + __func__, cdp, cdev->si_name)); if (cdev->si_cred != NULL) crfree(cdev->si_cred); devfs_free_cdp_inode(cdp->cdp_inode); @@ -516,6 +519,9 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup) dev_lock(); TAILQ_FOREACH(cdp, &cdevp_list, cdp_list) { KASSERT(cdp->cdp_dirents != NULL, ("NULL cdp_dirents")); + KASSERT((cdp->cdp_flags & CDP_ON_ACTIVE_LIST) != 0, + ("%s: cdp %p (%s) should not be on active list", + __func__, cdp, cdp->cdp_c.si_name)); /* * If we are unmounting, or the device has been destroyed, @@ -547,6 +553,7 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup) if (!(cdp->cdp_flags & CDP_ACTIVE)) { if (cdp->cdp_inuse > 0) continue; + cdp->cdp_flags &= ~CDP_ON_ACTIVE_LIST; TAILQ_REMOVE(&cdevp_list, cdp, cdp_list); dev_unlock(); dev_rel(&cdp->cdp_c); @@ -698,7 +705,10 @@ devfs_create(struct cdev *dev) dev_lock_assert_locked(); cdp = cdev2priv(dev); - cdp->cdp_flags |= CDP_ACTIVE; + KASSERT((cdp->cdp_flags & CDP_ON_ACTIVE_LIST) == 0, + ("%s: cdp %p (%s) already on active list", + __func__, cdp, dev->si_name)); + cdp->cdp_flags |= (CDP_ACTIVE | CDP_ON_ACTIVE_LIST); cdp->cdp_inode = alloc_unrl(devfs_inos); dev_refl(dev); TAILQ_INSERT_TAIL(&cdevp_list, cdp, cdp_list); diff --git a/sys/fs/devfs/devfs_int.h b/sys/fs/devfs/devfs_int.h index 32c6fb414250..916297425b53 100644 --- a/sys/fs/devfs/devfs_int.h +++ b/sys/fs/devfs/devfs_int.h @@ -55,6 +55,7 @@ struct cdev_priv { #define CDP_ACTIVE (1 << 0) #define CDP_SCHED_DTR (1 << 1) #define CDP_UNREF_DTR (1 << 2) +#define CDP_ON_ACTIVE_LIST (1 << 3) u_int cdp_inuse; u_int cdp_maxdirent; diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 2f700f9dad25..1df7d13be919 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1664,6 +1664,10 @@ devfs_revoke(struct vop_revoke_args *ap) dev_lock(); cdp->cdp_inuse--; if (!(cdp->cdp_flags & CDP_ACTIVE) && cdp->cdp_inuse == 0) { + KASSERT((cdp->cdp_flags & CDP_ON_ACTIVE_LIST) != 0, + ("%s: cdp %p (%s) not on active list", + __func__, cdp, dev->si_name)); + cdp->cdp_flags &= ~CDP_ON_ACTIVE_LIST; TAILQ_REMOVE(&cdevp_list, cdp, cdp_list); dev_unlock(); dev_rel(&cdp->cdp_c); diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index d6063696c85b..a7c22b7d118a 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -119,6 +119,8 @@ dev_free_devlocked(struct cdev *cdev) cdp = cdev2priv(cdev); KASSERT((cdp->cdp_flags & CDP_UNREF_DTR) == 0, ("destroy_dev() was not called after delist_dev(%p)", cdev)); + KASSERT((cdp->cdp_flags & CDP_ON_ACTIVE_LIST) == 0, + ("%s: cdp %p (%s) on active list", __func__, cdp, cdev->si_name)); TAILQ_INSERT_HEAD(&cdevp_free_list, cdp, cdp_list); } From nobody Thu Sep 21 17:19:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2FY4vXWz4tjyF; Thu, 21 Sep 2023 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2FY4Q1lz4dq4; Thu, 21 Sep 2023 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquiqDlbwn7W8TgrRCZ5xzhIk/NPzTuGFNfsi0ynldo=; b=BMWwAQHxeidPf0gHl15QD2ILNGNbA94cG0PRWd1fNbFuoe0uIWmqtsgKjvkdUPGRHFXLCr 13RqHYEyJs6rdg/PFgWbW5qPfiNPOJZask/nOpOqNPeMyk4MvTYYeoGDzLmG1E6zjh4RSI wtToRt0vYQfIpN0h+HBaFyn1DOYKSlw0OcYVzwonE6WLgcB+mlElutpGnmRxZB/PAvxCBr XcArZunin1VnubH9FzVsaC5ns0hz/U/hRbOvMglmG8Kfh1k0nGHpWsZ/7bNEpk+1f79C29 Vx5FlUdGoS/ttzGBZPCwLxFMFvUUfUIaFYHbAEdv9cdAnLveu+X9ptBVjndEcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316769; a=rsa-sha256; cv=none; b=D45GiPwH7wPnIam/8uX8nNatTDRWC611P2gazppEmt9Xi0l9+K8ccHdQXVQai/UwhLtTGC c9oZQYnJKBz3tCTORhyYOr7Y89HZYYal/uGxsDb8ER206kD2FiXKyuFpwUxafK//AqFZ8t mx4Xdp+Ck4sZcLvrnx/JmrCFp75iCus2gaAY+QVVhhYD4GdEH2S2Xsu/e1/ZYWN2rT6mvo OTBbuuVsAerpArYL1iYcvzCLGfu+uy4NRqlsL0qwsf+A9/BG0OveNYaToT9OmdBYEOvZqI ohDDMLSfShUofJ+OtBMU0MYHYJDMHMVfcm/ImXMSY1BHMRY9+JcDxBE3xEeFaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquiqDlbwn7W8TgrRCZ5xzhIk/NPzTuGFNfsi0ynldo=; b=S9uaEGpE4upmYWQxuxe4GM5j8LhFpSc5GYDqWGNU8kZ2wTV8uTdEZV/K/meCCTj0fzN5aD f544wKk+44coxEJ8okI0qQf0ANU2vkpLcE2G7prhaujUyMUvL+gbRA9rhAxobcxFI209o+ b9r/jAifzyroyJj9rlKro5wZMHVpduV72/ZD4HTep+miBfPb2Ah1kwTG1jndvgbTptUqkp c7EqNcvtZwFxJqgZA1kAd7MTbRN9Fgwj55ggcV6hTsQrGrSZXQxFOsGGIKGfuEKW+cFyeG QJgbCyjBm1jw2XMmYGQh5kdhRYMBcYucsE2DieyxH7070OQ5DR51Yss8UlFFMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2FY3WZzzn3b; Thu, 21 Sep 2023 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJTZs076125; Thu, 21 Sep 2023 17:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJT1m076122; Thu, 21 Sep 2023 17:19:29 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:29 GMT Message-Id: <202309211719.38LHJT1m076122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b75d1ce6c106 - main - iwlwifi: temporary disable build for updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b75d1ce6c10652fc4bfbf509deeae0e05c3d1356 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b75d1ce6c10652fc4bfbf509deeae0e05c3d1356 commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:04:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:04:29 +0000 iwlwifi: temporary disable build for updates Disconnect iwlwifi from the build for a few commits which, due to incompatible LinuxKPI 802.11 changes would break the build for a revision. It will be re-enabled "instantly". Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index d2c5cc44705a..1b4b1119c0f6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -560,7 +560,7 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve -_iwlwifi= iwlwifi +#_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif From nobody Thu Sep 21 17:19:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2FZ5dQRz4tk4j; Thu, 21 Sep 2023 17:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2FZ54sCz4dhg; Thu, 21 Sep 2023 17:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeZGNBfv73bFpNZiKLatgbzI9ZWBcnabx/EcVOgLt10=; b=u7cG1kINSX8lUTj7j3lpAhA7kJXDzE3UDbD73Km3RwYsj9t7pHnFfymVb6P+Ku/2vTh4Ow mvnjCsncFoRTGO6ihTpfeIr0127W8Q0+QESPIqJqF03ejJbFPbKzIzQTGGosszvy88Jn1O Cc4iAaIbjxG9uNxSX8ZF4w6ijBJjk95dM3bes95XEFGINFTXPEGHput/GYZpicqJnHIpn5 hJMqDRF8+QQVTN9Ej5gDHPsJjCIFee9eMdVH/o+4xLIB/i8wa1UKuqNxUJKnNJnpOTMriI X6CK9Ho7tX7L4TsNFK3CmXEnwHT7npL5dxqTrmmDIHnAiC1jX7FZpYBcQ0GOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316770; a=rsa-sha256; cv=none; b=fQPEE57u1/aRQGgVH+NEc2WGTAB29K4zvp5WbU0in4ewjS7BSW5JH+77mwRldz4f4RHLgG hY7A6FK6XLjuDKFs2bHyM077C7oeF9o+R64Xj5NzEdTNKyg86VAgfPUEA8vA/ouDOJy/Qq sP8dqbrP4fchl4LT+DThIlMu+oqWiqq1fwR08dyb1gNW/7hjcDAGHpxc0yamdmPoQSwoo/ D+KUrUM/FOmyeud3PkyszPZ3d1fWQ1IVfGVNDRHn+Q5G4dt5e8vcCwLqyoa0gO5TSsZHSe i9/btE1wM5YQmXVaa/Jy3Ll6vP1Q22FWs7+jfkKzNLMYf1IyZQaaTLgEkIKCjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QeZGNBfv73bFpNZiKLatgbzI9ZWBcnabx/EcVOgLt10=; b=R+nLXl1beJ/BSrMubTxuuTBzwzQIzzbC9tRb9AGKAk7duPEz5HGVuZZ5gngckwApj5bB4D cDvlk4s4ql/Z6FO2ofukbeFCpE1iz0xEZyd03DKcyR1ckEtCjzjZ01cFJ6zDtRHYwZqfKg ZtgWUG1l5TbK6yre0oyHtiInA8tf9N6Lgc5m6c2pWtEqtnePgQAVO50bRccOwx0GT83xpn cYWYaL5QUQdZvnuqesDs0jap6oQPcUZovTQUG7wu8XirFPisc3bnTRmpSL2rlQUFLSfSkp FCmFXyBZG67ry7bx2pIAPYfn27EBHeofC6WgaOe+xNE0a7uSw3/SYUjLXGFW9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2FZ457rznTH; Thu, 21 Sep 2023 17:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJU8S076176; Thu, 21 Sep 2023 17:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJUKF076174; Thu, 21 Sep 2023 17:19:30 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:30 GMT Message-Id: <202309211719.38LHJUKF076174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3e1f5cc9a81a - main - LinuxKPI: 802.11: prepare for iwlwifi driver updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 commit 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:31:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:07:41 +0000 LinuxKPI: 802.11: prepare for iwlwifi driver updates Unconditionally enable the changes for newer drivers, as needed by iwlwifi (and others). Sposnored by: The FreeBSD Foundation MFC after: 3 days X-Note: breaks build until iwlwifi update (next hash) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index bc7f22f5aa15..20371812198a 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -703,12 +703,6 @@ struct ieee80211_sta { struct ieee80211_link_sta deflink; struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ -#ifndef __FOR_LATER_DRV_UPDATE - uint16_t max_rc_amsdu_len; - uint16_t max_amsdu_len; - uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; -#endif - /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; @@ -1421,7 +1415,6 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool -#ifdef __FOR_LATER_DRV_UPDATE ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) { struct ieee80211_mgmt *mgmt; @@ -1429,10 +1422,6 @@ ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) mgmt = (struct ieee80211_mgmt *)skb->data; fc = mgmt->frame_control; -#else -ieee80211_is_bufferable_mmpdu(__le16 fc) -{ -#endif /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ /* XXX we do not care about IBSS yet. */ @@ -2219,10 +2208,7 @@ ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int _i, -#endif - uint8_t *ms, uint8_t *up) + u_int _i, uint8_t *ms, uint8_t *up) { TODO(); } From nobody Thu Sep 21 17:19:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fc18pHz4tk0b; Thu, 21 Sep 2023 17:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fc0mrqz4f1x; Thu, 21 Sep 2023 17:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6IHRqUQXjOdo0V3aCAGWggBIAcc6kKYOH4zc1Tka6qc=; b=xryufEdM8BWyAE797CdOAV1w+RLWrqA7HKwRGXgpxx80BPdCtOQYWNeCrSVbDD1nlGLQOL UKDZVXiJYX53JC+LOyCmnzGdsmAvQeevM0AFwZHt669RP3TbYJSOinyFRIqCcnrAg99cDm dOiO+yNf37iTQ8pb4tJoh7z/vLa7SCMcP7VV2SixaJztnN8CRFJxca4Q4dBr9d7qLaPvsZ TPimr3mpuCkCAsEWTG24TXD8ds05L523FqyYuDi/+X8IdePpC/+6nPfosIhWCTn5wDY+fD /JwVIs6ieOx0f31eAfPzBtg+rY1hOEZlixvniDCJ76PlU9uH7iwkXIbYsN212Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316772; a=rsa-sha256; cv=none; b=aGWq/XTxLOX/IcLzYQxAA/iyXeAUJf6xy7hyFvhClDPXjIU2dLiafh1msydRjUMeMd7GPQ LhYFlGBSDbqSRNE20ii2M81lq+QtXQFoZESHcKXMf0rKN2qVzzybWK8eDcQTLXqcJAAPMS +kJQjuB0yWVNFF+qHTJyzHHSeqmvKCjjYFm9f54SXYxtT0BwRwcxPOgdWS4h97hdtBJqB1 X0XPbrDzVQuyUB2IYa4Ocybvpp2JPxxffj9Eu92GcgyzJYElp9ZTn6E1DhwZxIxyZVdW6r Ftzq2MrokBpIsFqBKYelEP1dNUIuf80pY3cV1SuUs3sbT7HGnC3E5HWauSx0VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6IHRqUQXjOdo0V3aCAGWggBIAcc6kKYOH4zc1Tka6qc=; b=A3rURJPM5A9/FoubPHrQcBj1FztaDeDP5FHyj4UDRHCrVziZ+xQFVX4mPjSvjzHOZfj/n+ nS2J7sBc8Gp6SN7C0YzFNG23EiXe1N4A+yhxUOVdCRuBL53IT0BQ/m1DgFev/ZolJwYQJQ vFcEKPmCxsq9GIKuV88ki0EUsgUMSG/j5BmbssUu1dZLl57ZovUQpyPxq3c2EJgyQ1z5j3 MVRWkMKBzHcsOw9VB7mC92gvpw7yL8rf88scca7DmjlUxo/+foDN7IRspEW8Yryl7h5XtZ riS6lIKbfRc4jTA3CElszV7qWihPMlb5u2Np1bHS+cai+/eNskyY9OdLtPtm1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fb6vLWznWH; Thu, 21 Sep 2023 17:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJVS9076223; Thu, 21 Sep 2023 17:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJVBg076218; Thu, 21 Sep 2023 17:19:31 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:31 GMT Message-Id: <202309211719.38LHJVBg076218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9af1bba44e1c - main - iwlwifi: update driver from upstream List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9af1bba44e1ce9b0296ae56760b564d67ab7a1cf Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9af1bba44e1ce9b0296ae56760b564d67ab7a1cf commit 9af1bba44e1ce9b0296ae56760b564d67ab7a1cf Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:56:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:07:50 +0000 iwlwifi: update driver from upstream This is a combined versions of updates of the iwlwifi driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1). (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5). (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3). Sponsored by: The FreeBSD Foundation MFC after: 20 days --- sys/contrib/dev/iwlwifi/cfg/22000.c | 617 +----- sys/contrib/dev/iwlwifi/cfg/7000.c | 22 +- sys/contrib/dev/iwlwifi/cfg/8000.c | 10 +- sys/contrib/dev/iwlwifi/cfg/9000.c | 10 +- sys/contrib/dev/iwlwifi/cfg/ax210.c | 301 +++ sys/contrib/dev/iwlwifi/cfg/bz.c | 183 ++ sys/contrib/dev/iwlwifi/cfg/sc.c | 166 ++ sys/contrib/dev/iwlwifi/fw/acpi.c | 172 +- sys/contrib/dev/iwlwifi/fw/acpi.h | 41 +- sys/contrib/dev/iwlwifi/fw/api/binding.h | 14 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 47 +- sys/contrib/dev/iwlwifi/fw/api/config.h | 15 +- sys/contrib/dev/iwlwifi/fw/api/context.h | 13 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 98 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 287 ++- sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 100 +- sys/contrib/dev/iwlwifi/fw/api/filter.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/location.h | 16 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 465 ++++- sys/contrib/dev/iwlwifi/fw/api/mac.h | 30 +- sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 46 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 20 +- sys/contrib/dev/iwlwifi/fw/api/phy-ctxt.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/phy.h | 10 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/rx.h | 215 ++- sys/contrib/dev/iwlwifi/fw/api/scan.h | 66 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/tdls.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/time-event.h | 7 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 23 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 129 +- sys/contrib/dev/iwlwifi/fw/dbg.h | 18 +- sys/contrib/dev/iwlwifi/fw/debugfs.c | 39 +- sys/contrib/dev/iwlwifi/fw/dump.c | 87 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 19 +- sys/contrib/dev/iwlwifi/fw/file.h | 23 +- sys/contrib/dev/iwlwifi/fw/img.h | 5 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 233 ++- sys/contrib/dev/iwlwifi/fw/pnvm.h | 27 +- sys/contrib/dev/iwlwifi/fw/rs.c | 6 +- sys/contrib/dev/iwlwifi/fw/runtime.h | 11 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 331 ++-- sys/contrib/dev/iwlwifi/fw/uefi.h | 58 +- sys/contrib/dev/iwlwifi/iwl-config.h | 55 +- sys/contrib/dev/iwlwifi/iwl-context-info-gen3.h | 53 +- sys/contrib/dev/iwlwifi/iwl-context-info.h | 5 +- sys/contrib/dev/iwlwifi/iwl-csr.h | 5 + sys/contrib/dev/iwlwifi/iwl-dbg-tlv.c | 99 +- sys/contrib/dev/iwlwifi/iwl-debug.c | 3 +- sys/contrib/dev/iwlwifi/iwl-drv.c | 105 +- sys/contrib/dev/iwlwifi/iwl-drv.h | 6 +- sys/contrib/dev/iwlwifi/iwl-eeprom-parse.h | 8 +- sys/contrib/dev/iwlwifi/iwl-fh.h | 4 +- sys/contrib/dev/iwlwifi/iwl-io.c | 4 +- sys/contrib/dev/iwlwifi/iwl-modparams.h | 1 + sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 393 +++- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 4 +- sys/contrib/dev/iwlwifi/iwl-prph.h | 20 +- sys/contrib/dev/iwlwifi/iwl-trans.c | 6 +- sys/contrib/dev/iwlwifi/iwl-trans.h | 138 +- sys/contrib/dev/iwlwifi/mei/iwl-mei.h | 23 +- sys/contrib/dev/iwlwifi/mvm/binding.c | 23 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 112 +- sys/contrib/dev/iwlwifi/mvm/constants.h | 6 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 1148 ++++++++---- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 31 +- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 468 ++++- sys/contrib/dev/iwlwifi/mvm/ftm-initiator.c | 98 +- sys/contrib/dev/iwlwifi/mvm/ftm-responder.c | 44 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 383 ++-- sys/contrib/dev/iwlwifi/mvm/link.c | 285 +++ sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 686 ++++--- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 2288 +++++++++++++++-------- sys/contrib/dev/iwlwifi/mvm/mld-key.c | 376 ++++ sys/contrib/dev/iwlwifi/mvm/mld-mac.c | 321 ++++ sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 1215 ++++++++++++ sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 1181 ++++++++++++ sys/contrib/dev/iwlwifi/mvm/mvm.h | 669 ++++++- sys/contrib/dev/iwlwifi/mvm/nvm.c | 73 +- sys/contrib/dev/iwlwifi/mvm/offloading.c | 10 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 131 +- sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 73 +- sys/contrib/dev/iwlwifi/mvm/power.c | 104 +- sys/contrib/dev/iwlwifi/mvm/ptp.c | 326 ++++ sys/contrib/dev/iwlwifi/mvm/quota.c | 15 +- sys/contrib/dev/iwlwifi/mvm/rfi.c | 16 +- sys/contrib/dev/iwlwifi/mvm/rs-fw.c | 366 +++- sys/contrib/dev/iwlwifi/mvm/rs.c | 6 +- sys/contrib/dev/iwlwifi/mvm/rs.h | 14 +- sys/contrib/dev/iwlwifi/mvm/rx.c | 94 +- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 1204 ++++++++---- sys/contrib/dev/iwlwifi/mvm/scan.c | 313 +++- sys/contrib/dev/iwlwifi/mvm/sf.c | 66 +- sys/contrib/dev/iwlwifi/mvm/sta.c | 844 +++++---- sys/contrib/dev/iwlwifi/mvm/sta.h | 154 +- sys/contrib/dev/iwlwifi/mvm/tdls.c | 12 +- sys/contrib/dev/iwlwifi/mvm/time-event.c | 33 +- sys/contrib/dev/iwlwifi/mvm/time-sync.c | 173 ++ sys/contrib/dev/iwlwifi/mvm/time-sync.h | 30 + sys/contrib/dev/iwlwifi/mvm/tt.c | 79 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 342 ++-- sys/contrib/dev/iwlwifi/mvm/utils.c | 115 +- sys/contrib/dev/iwlwifi/pcie/ctxt-info-gen3.c | 278 ++- sys/contrib/dev/iwlwifi/pcie/ctxt-info.c | 8 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 711 +++---- sys/contrib/dev/iwlwifi/pcie/internal.h | 13 +- sys/contrib/dev/iwlwifi/pcie/rx.c | 52 +- sys/contrib/dev/iwlwifi/pcie/trans-gen2.c | 89 +- sys/contrib/dev/iwlwifi/pcie/trans.c | 225 ++- sys/contrib/dev/iwlwifi/pcie/tx.c | 7 +- sys/contrib/dev/iwlwifi/queue/tx.c | 32 +- sys/contrib/dev/iwlwifi/queue/tx.h | 8 +- sys/modules/iwlwifi/Makefile | 4 + 116 files changed, 15387 insertions(+), 4969 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/cfg/22000.c b/sys/contrib/dev/iwlwifi/cfg/22000.c index 192ecc480f90..d594694206b3 100644 --- a/sys/contrib/dev/iwlwifi/cfg/22000.c +++ b/sys/contrib/dev/iwlwifi/cfg/22000.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include #include @@ -10,10 +10,10 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_22000_UCODE_API_MAX 73 +#define IWL_22000_UCODE_API_MAX 77 /* Lowest firmware API version supported */ -#define IWL_22000_UCODE_API_MIN 39 +#define IWL_22000_UCODE_API_MIN 50 /* NVM versions */ #define IWL_22000_NVM_VERSION 0x0a1d @@ -26,111 +26,26 @@ #define IWL_22000_SMEM_OFFSET 0x400000 #define IWL_22000_SMEM_LEN 0xD0000 -#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-" -#define IWL_QNJ_B_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-" -#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-" -#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-" -#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0-" -#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0-" -#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0-" -#define IWL_QNJ_B_JF_B_FW_PRE "iwlwifi-QuQnj-b0-jf-b0-" -#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0-" -#define IWL_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0-" -#define IWL_SO_A_HR_B_FW_PRE "iwlwifi-so-a0-hr-b0-" -#define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0-" -#define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0-" -#define IWL_SO_A_GF4_A_FW_PRE "iwlwifi-so-a0-gf4-a0-" -#define IWL_SO_A_MR_A_FW_PRE "iwlwifi-so-a0-mr-a0-" -#define IWL_SNJ_A_GF4_A_FW_PRE "iwlwifi-SoSnj-a0-gf4-a0-" -#define IWL_SNJ_A_GF_A_FW_PRE "iwlwifi-SoSnj-a0-gf-a0-" -#define IWL_SNJ_A_HR_B_FW_PRE "iwlwifi-SoSnj-a0-hr-b0-" -#define IWL_SNJ_A_JF_B_FW_PRE "iwlwifi-SoSnj-a0-jf-b0-" -#define IWL_MA_A_HR_B_FW_PRE "iwlwifi-ma-a0-hr-b0-" -#define IWL_MA_A_GF_A_FW_PRE "iwlwifi-ma-a0-gf-a0-" -#define IWL_MA_A_GF4_A_FW_PRE "iwlwifi-ma-a0-gf4-a0-" -#define IWL_MA_A_MR_A_FW_PRE "iwlwifi-ma-a0-mr-a0-" -#define IWL_MA_A_FM_A_FW_PRE "iwlwifi-ma-a0-fm-a0-" -#define IWL_SNJ_A_MR_A_FW_PRE "iwlwifi-SoSnj-a0-mr-a0-" -#define IWL_BZ_A_HR_B_FW_PRE "iwlwifi-bz-a0-hr-b0-" -#define IWL_BZ_A_GF_A_FW_PRE "iwlwifi-bz-a0-gf-a0-" -#define IWL_BZ_A_GF4_A_FW_PRE "iwlwifi-bz-a0-gf4-a0-" -#define IWL_BZ_A_MR_A_FW_PRE "iwlwifi-bz-a0-mr-a0-" -#define IWL_BZ_A_FM_A_FW_PRE "iwlwifi-bz-a0-fm-a0-" -#define IWL_GL_A_FM_A_FW_PRE "iwlwifi-gl-a0-fm-a0-" -#define IWL_BZ_Z_GF_A_FW_PRE "iwlwifi-bz-z0-gf-a0-" -#define IWL_BNJ_A_FM_A_FW_PRE "iwlwifi-BzBnj-a0-fm-a0-" -#define IWL_BNJ_A_FM4_A_FW_PRE "iwlwifi-BzBnj-a0-fm4-a0-" -#define IWL_BNJ_A_GF_A_FW_PRE "iwlwifi-BzBnj-a0-gf-a0-" -#define IWL_BNJ_A_GF4_A_FW_PRE "iwlwifi-BzBnj-a0-gf4-a0-" -#define IWL_BNJ_A_HR_B_FW_PRE "iwlwifi-BzBnj-a0-hr-b0-" - +#define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0" +#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0" +#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0" +#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0" +#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0" +#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0" +#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0" #define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \ - IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_QNJ_B_HR_B_MODULE_FIRMWARE(api) \ - IWL_QNJ_B_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_B_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QUZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode" + IWL_QUZ_A_JF_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QU_C_HR_B_MODULE_FIRMWARE(api) \ - IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_QU_B_JF_B_MODULE_FIRMWARE(api) \ - IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE(api) \ - IWL_QNJ_B_JF_B_FW_PRE __stringify(api) ".ucode" + IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode" #define IWL_CC_A_MODULE_FIRMWARE(api) \ - IWL_CC_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_SO_A_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_SO_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SO_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_SO_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_TY_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_TY_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_JF_B_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_JF_B_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(api) \ - IWL_MA_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \ - IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_BZ_A_HR_B_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BZ_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_FM4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_GF_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_GF_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode" -#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \ - IWL_BNJ_A_HR_B_FW_PRE __stringify(api) ".ucode" + IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode" static const struct iwl_base_params iwl_22000_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, @@ -144,19 +59,7 @@ static const struct iwl_base_params iwl_22000_base_params = { .pcie_l1_allowed = true, }; -static const struct iwl_base_params iwl_ax210_base_params = { - .eeprom_size = OTP_LOW_IMAGE_SIZE_32K, - .num_of_queues = 512, - .max_tfd_queue_size = 65536, - .shadow_ram_support = true, - .led_compensation = 57, - .wd_timeout = IWL_LONG_WD_TIMEOUT, - .max_event_log_size = 512, - .shadow_reg_enable = true, - .pcie_l1_allowed = true, -}; - -static const struct iwl_ht_params iwl_22000_ht_params = { +const struct iwl_ht_params iwl_22000_ht_params = { .stbc = true, .ldpc = true, .ht40_bands = BIT(NL80211_BAND_2GHZ) | BIT(NL80211_BAND_5GHZ) | @@ -164,7 +67,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { }; #define IWL_DEVICE_22000_COMMON \ - .ucode_api_max = IWL_22000_UCODE_API_MAX, \ .ucode_api_min = IWL_22000_UCODE_API_MIN, \ .led_mode = IWL_LED_RF_STATE, \ .nvm_hw_section_num = 10, \ @@ -182,7 +84,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { .mac_addr_from_csr = 0x380, \ .ht_params = &iwl_22000_ht_params, \ .nvm_ver = IWL_22000_NVM_VERSION, \ - .trans.use_tfh = true, \ .trans.rf_id = true, \ .trans.gen2 = true, \ .nvm_type = IWL_NVM_EXT, \ @@ -203,6 +104,7 @@ static const struct iwl_ht_params iwl_22000_ht_params = { #define IWL_DEVICE_22500 \ IWL_DEVICE_22000_COMMON, \ + .ucode_api_max = IWL_22000_UCODE_API_MAX, \ .trans.device_family = IWL_DEVICE_FAMILY_22000, \ .trans.base_params = &iwl_22000_base_params, \ .gp2_reg_addr = 0xa02c68, \ @@ -217,108 +119,8 @@ static const struct iwl_ht_params iwl_22000_ht_params = { }, \ } -#define IWL_DEVICE_AX210 \ - IWL_DEVICE_22000_COMMON, \ - .trans.umac_prph_offset = 0x300000, \ - .trans.device_family = IWL_DEVICE_FAMILY_AX210, \ - .trans.base_params = &iwl_ax210_base_params, \ - .min_txq_size = 128, \ - .gp2_reg_addr = 0xd02c68, \ - .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_HE, \ - .mon_dram_regs = { \ - .write_ptr = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = DBGC_DBGBUF_WRAP_AROUND, \ - .mask = 0xffffffff, \ - }, \ - .cur_frag = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK, \ - }, \ - } - -#define IWL_DEVICE_BZ_COMMON \ - .ucode_api_max = IWL_22000_UCODE_API_MAX, \ - .ucode_api_min = IWL_22000_UCODE_API_MIN, \ - .led_mode = IWL_LED_RF_STATE, \ - .nvm_hw_section_num = 10, \ - .non_shared_ant = ANT_B, \ - .dccm_offset = IWL_22000_DCCM_OFFSET, \ - .dccm_len = IWL_22000_DCCM_LEN, \ - .dccm2_offset = IWL_22000_DCCM2_OFFSET, \ - .dccm2_len = IWL_22000_DCCM2_LEN, \ - .smem_offset = IWL_22000_SMEM_OFFSET, \ - .smem_len = IWL_22000_SMEM_LEN, \ - .features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM, \ - .apmg_not_supported = true, \ - .trans.mq_rx_supported = true, \ - .vht_mu_mimo_supported = true, \ - .mac_addr_from_csr = 0x30, \ - .ht_params = &iwl_22000_ht_params, \ - .nvm_ver = IWL_22000_NVM_VERSION, \ - .trans.use_tfh = true, \ - .trans.rf_id = true, \ - .trans.gen2 = true, \ - .nvm_type = IWL_NVM_EXT, \ - .dbgc_supported = true, \ - .min_umac_error_event_table = 0x400000, \ - .d3_debug_data_base_addr = 0x401000, \ - .d3_debug_data_length = 60 * 1024, \ - .mon_smem_regs = { \ - .write_ptr = { \ - .addr = LDBG_M2S_BUF_WPTR, \ - .mask = LDBG_M2S_BUF_WPTR_VAL_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = LDBG_M2S_BUF_WRAP_CNT, \ - .mask = LDBG_M2S_BUF_WRAP_CNT_VAL_MSK, \ - }, \ - } - -#define IWL_DEVICE_BZ \ - IWL_DEVICE_BZ_COMMON, \ - .trans.umac_prph_offset = 0x300000, \ - .trans.device_family = IWL_DEVICE_FAMILY_BZ, \ - .trans.base_params = &iwl_ax210_base_params, \ - .min_txq_size = 128, \ - .gp2_reg_addr = 0xd02c68, \ - .min_ba_txq_size = IWL_DEFAULT_QUEUE_SIZE_EHT, \ - .mon_dram_regs = { \ - .write_ptr = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_OFFSET_MSK, \ - }, \ - .cycle_cnt = { \ - .addr = DBGC_DBGBUF_WRAP_AROUND, \ - .mask = 0xffffffff, \ - }, \ - .cur_frag = { \ - .addr = DBGC_CUR_DBGBUF_STATUS, \ - .mask = DBGC_CUR_DBGBUF_STATUS_IDX_MSK, \ - }, \ - }, \ - .mon_dbgi_regs = { \ - .write_ptr = { \ - .addr = DBGI_SRAM_FIFO_POINTERS, \ - .mask = DBGI_SRAM_FIFO_POINTERS_WR_PTR_MSK, \ - }, \ - } - -const struct iwl_cfg_trans_params iwl_qnj_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_22000, - .base_params = &iwl_22000_base_params, -}; - const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -330,7 +132,6 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -342,7 +143,6 @@ const struct iwl_cfg_trans_params iwl_qu_medium_latency_trans_cfg = { const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .device_family = IWL_DEVICE_FAMILY_22000, @@ -353,59 +153,6 @@ const struct iwl_cfg_trans_params iwl_qu_long_latency_trans_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -const struct iwl_cfg_trans_params iwl_snj_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, -}; - -const struct iwl_cfg_trans_params iwl_so_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - /* TODO: the following values need to be checked */ - .xtal_latency = 500, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US, -}; - -const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - .low_latency_xtal = true, - .xtal_latency = 12000, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, -}; - -const struct iwl_cfg_trans_params iwl_so_long_latency_imr_trans_cfg = { - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .umac_prph_offset = 0x300000, - .integrated = true, - .low_latency_xtal = true, - .xtal_latency = 12000, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, - .imr_enabled = true, -}; - /* * If the device doesn't support HE, no need to have that many buffers. * 22000 devices can split multiple frames into a single RB, so fewer are @@ -415,7 +162,6 @@ const struct iwl_cfg_trans_params iwl_so_long_latency_imr_trans_cfg = { */ #define IWL_NUM_RBDS_NON_HE 512 #define IWL_NUM_RBDS_22000_HE 2048 -#define IWL_NUM_RBDS_AX210_HE 4096 /* * All JF radio modules are part of the 9000 series, but the MAC part @@ -446,63 +192,20 @@ const struct iwl_cfg iwl9560_quz_a0_jf_b0_cfg = { .num_rbds = IWL_NUM_RBDS_NON_HE, }; -const struct iwl_cfg iwl9560_qnj_b0_jf_b0_cfg = { - .fw_name_pre = IWL_QNJ_B_JF_B_FW_PRE, - IWL_DEVICE_22500, - /* - * This device doesn't support receiving BlockAck with a large bitmap - * so we need to restrict the size of transmitted aggregation to the - * HT size; mac80211 would otherwise pick the HE max (256) by default. - */ - .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .num_rbds = IWL_NUM_RBDS_NON_HE, -}; - const struct iwl_cfg_trans_params iwl_ax200_trans_cfg = { .device_family = IWL_DEVICE_FAMILY_22000, .base_params = &iwl_22000_base_params, .mq_rx_supported = true, - .use_tfh = true, .rf_id = true, .gen2 = true, .bisr_workaround = 1, }; -const struct iwl_cfg_trans_params iwl_ma_trans_cfg = { - .device_family = IWL_DEVICE_FAMILY_AX210, - .base_params = &iwl_ax210_base_params, - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .integrated = true, - .umac_prph_offset = 0x300000 -}; - -const struct iwl_cfg_trans_params iwl_bz_trans_cfg = { - .device_family = IWL_DEVICE_FAMILY_BZ, - .base_params = &iwl_ax210_base_params, - .mq_rx_supported = true, - .use_tfh = true, - .rf_id = true, - .gen2 = true, - .integrated = true, - .umac_prph_offset = 0x300000, - .xtal_latency = 12000, - .low_latency_xtal = true, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, -}; - const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101"; const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz"; const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz"; const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203"; const char iwl_ax204_name[] = "Intel(R) Wi-Fi 6 AX204 160MHz"; -const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz"; -const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz"; -const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz"; -const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz"; -const char iwl_bz_name[] = "Intel(R) TBD Bz device"; const char iwl_ax200_killer_1650w_name[] = "Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)"; @@ -512,18 +215,6 @@ const char iwl_ax201_killer_1650s_name[] = "Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)"; const char iwl_ax201_killer_1650i_name[] = "Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)"; -const char iwl_ax210_killer_1675w_name[] = - "Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)"; -const char iwl_ax210_killer_1675x_name[] = - "Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)"; -const char iwl_ax211_killer_1675s_name[] = - "Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211NGW)"; -const char iwl_ax211_killer_1675i_name[] = - "Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW)"; -const char iwl_ax411_killer_1690s_name[] = - "Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W)"; -const char iwl_ax411_killer_1690i_name[] = - "Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW)"; const struct iwl_cfg iwl_qu_b0_hr1_b0 = { .fw_name_pre = IWL_QU_B_HR_B_FW_PRE, @@ -717,168 +408,6 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwl_qnj_b0_hr_b0_cfg = { - .fw_name_pre = IWL_QNJ_B_HR_B_FW_PRE, - IWL_DEVICE_22500, - /* - * This device doesn't support receiving BlockAck with a large bitmap - * so we need to restrict the size of transmitted aggregation to the - * HT size; mac80211 would otherwise pick the HE max (256) by default. - */ - .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, - .num_rbds = IWL_NUM_RBDS_22000_HE, -}; - -const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0 = { - .name = "Intel(R) Wireless-AC 9560 160MHz", - .fw_name_pre = IWL_SO_A_JF_B_FW_PRE, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_NON_HE, -}; - -const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SO_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SO_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, - .trans.xtal_latency = 12000, - .trans.low_latency_xtal = true, -}; - -const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = { - .name = "Intel(R) Wi-Fi 6 AX210 160MHz", - .fw_name_pre = IWL_TY_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SO_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SO_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, - .trans.xtal_latency = 12000, - .trans.low_latency_xtal = true, -}; - -const struct iwl_cfg iwlax411_2ax_cfg_sosnj_gf4_a0 = { - .name = iwl_ax411_name, - .fw_name_pre = IWL_SNJ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwlax211_cfg_snj_gf_a0 = { - .name = iwl_ax211_name, - .fw_name_pre = IWL_SNJ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_hr_b0 = { - .fw_name_pre = IWL_SNJ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_jf_b0 = { - .fw_name_pre = IWL_SNJ_A_JF_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_hr_b0 = { - .fw_name_pre = IWL_MA_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_gf_a0 = { - .fw_name_pre = IWL_MA_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0 = { - .fw_name_pre = IWL_MA_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = { - .fw_name_pre = IWL_MA_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_ms_a0 = { - .fw_name_pre = IWL_MA_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = { - .fw_name_pre = IWL_SO_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = { - .fw_name_pre = IWL_MA_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = { - .fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_snj_a0_ms_a0 = { - .fw_name_pre = IWL_SNJ_A_MR_A_FW_PRE, - .uhb_supported = false, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_so_a0_hr_a0 = { - .fw_name_pre = IWL_SO_A_HR_B_FW_PRE, - IWL_DEVICE_AX210, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { .fw_name_pre = IWL_QUZ_A_HR_B_FW_PRE, IWL_DEVICE_22500, @@ -891,119 +420,9 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { .num_rbds = IWL_NUM_RBDS_22000_HE, }; -const struct iwl_cfg iwl_cfg_bz_a0_hr_b0 = { - .fw_name_pre = IWL_BZ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_gf_a0 = { - .fw_name_pre = IWL_BZ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = { - .fw_name_pre = IWL_BZ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = { - .fw_name_pre = IWL_BZ_A_MR_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_a0_fm_a0 = { - .fw_name_pre = IWL_BZ_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = { - .fw_name_pre = IWL_GL_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = { - .fw_name_pre = IWL_BZ_Z_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0 = { - .fw_name_pre = IWL_BNJ_A_FM_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0 = { - .fw_name_pre = IWL_BNJ_A_FM4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0 = { - .fw_name_pre = IWL_BNJ_A_GF_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0 = { - .fw_name_pre = IWL_BNJ_A_GF4_A_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; - -const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0 = { - .fw_name_pre = IWL_BNJ_A_HR_B_FW_PRE, - .uhb_supported = true, - IWL_DEVICE_BZ, - .num_rbds = IWL_NUM_RBDS_AX210_HE, -}; MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_QNJ_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SO_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_TY_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_HR_B_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_MA_A_FM_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); -MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); diff --git a/sys/contrib/dev/iwlwifi/cfg/7000.c b/sys/contrib/dev/iwlwifi/cfg/7000.c index b24dc5523a52..4e2afdedf4c6 100644 --- a/sys/contrib/dev/iwlwifi/cfg/7000.c +++ b/sys/contrib/dev/iwlwifi/cfg/7000.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2020 Intel Corporation + * Copyright (C) 2012-2014, 2018-2020, 2023 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 Intel Deutschland GmbH */ @@ -34,20 +34,20 @@ #define IWL3160_DCCM_LEN 0x10000 #define IWL7265_DCCM_LEN 0x17A00 -#define IWL7260_FW_PRE "iwlwifi-7260-" -#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE __stringify(api) ".ucode" +#define IWL7260_FW_PRE "iwlwifi-7260" +#define IWL7260_MODULE_FIRMWARE(api) IWL7260_FW_PRE "-" __stringify(api) ".ucode" -#define IWL3160_FW_PRE "iwlwifi-3160-" -#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode" +#define IWL3160_FW_PRE "iwlwifi-3160" +#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE "-" __stringify(api) ".ucode" -#define IWL3168_FW_PRE "iwlwifi-3168-" -#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE __stringify(api) ".ucode" +#define IWL3168_FW_PRE "iwlwifi-3168" +#define IWL3168_MODULE_FIRMWARE(api) IWL3168_FW_PRE "-" __stringify(api) ".ucode" -#define IWL7265_FW_PRE "iwlwifi-7265-" -#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode" +#define IWL7265_FW_PRE "iwlwifi-7265" +#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE "-" __stringify(api) ".ucode" -#define IWL7265D_FW_PRE "iwlwifi-7265D-" -#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode" +#define IWL7265D_FW_PRE "iwlwifi-7265D" +#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE "-" __stringify(api) ".ucode" static const struct iwl_base_params iwl7000_base_params = { .eeprom_size = OTP_LOW_IMAGE_SIZE_16K, diff --git a/sys/contrib/dev/iwlwifi/cfg/8000.c b/sys/contrib/dev/iwlwifi/cfg/8000.c index a6454287d506..d09cf8d7dc01 100644 --- a/sys/contrib/dev/iwlwifi/cfg/8000.c +++ b/sys/contrib/dev/iwlwifi/cfg/8000.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2014, 2018-2020 Intel Corporation + * Copyright (C) 2014, 2018-2020, 2023 Intel Corporation * Copyright (C) 2014-2015 Intel Mobile Communications GmbH * Copyright (C) 2016 Intel Deutschland GmbH */ @@ -27,13 +27,13 @@ #define IWL8260_SMEM_OFFSET 0x400000 #define IWL8260_SMEM_LEN 0x68000 -#define IWL8000_FW_PRE "iwlwifi-8000C-" +#define IWL8000_FW_PRE "iwlwifi-8000C" #define IWL8000_MODULE_FIRMWARE(api) \ - IWL8000_FW_PRE __stringify(api) ".ucode" + IWL8000_FW_PRE "-" __stringify(api) ".ucode" -#define IWL8265_FW_PRE "iwlwifi-8265-" +#define IWL8265_FW_PRE "iwlwifi-8265" #define IWL8265_MODULE_FIRMWARE(api) \ - IWL8265_FW_PRE __stringify(api) ".ucode" + IWL8265_FW_PRE "-" __stringify(api) ".ucode" #define DEFAULT_NVM_FILE_FAMILY_8000C "nvmData-8000C" diff --git a/sys/contrib/dev/iwlwifi/cfg/9000.c b/sys/contrib/dev/iwlwifi/cfg/9000.c index 7a7ca06d46c1..0130d9a9b78b 100644 --- a/sys/contrib/dev/iwlwifi/cfg/9000.c +++ b/sys/contrib/dev/iwlwifi/cfg/9000.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2021, 2023 Intel Corporation */ #include #include *** 31084 LINES SKIPPED *** From nobody Thu Sep 21 17:19:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Ff16Qzz4tjvc; Thu, 21 Sep 2023 17:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fd6K99z4dvX; Thu, 21 Sep 2023 17:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dol20WG+ZQE86G2lNp9iuJVdLNRncbpnKeQfSYd41EQ=; b=KXGO93DxP1ELlvKs001k7CapjmGBvPBe123tadiVm+2ziOj5pc4kOGgs6TbeTfgkuC8Lov A/LVfpXMdGXYpJNAl/j6Cwo52v5ZCNz0dLKXGi3l+04ycfOIjvJPOIcuUVpI9vptaIjQMI WAbg59nKyH8WnqvhXGVF/5D3nEo59BUFYN8gvQn+S+1Ze22NhSFNFjSZuOO5ANoo84Qp3e t2G1+49+UJ6Iy1TR9+XfcOlSOlUIL65KYPOkKVB4hpZasM/A2Idt42TbWLfxITAJZgmC8g 5PWP6JP4LOEmZ475MlU7yZHjW8Gj6uQw44on9xVc2zOi7gNSOeo/XQIjU5x72Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316773; a=rsa-sha256; cv=none; b=IDr4GTdkvc3D9BPQrRoQmODwLnCBb3qrG63BSSwbWycztF3vEM292xJj3tWx8iWLW8FOgK puIWX/iXGJ7qwwlrWVPAM2tgE3dTD/z8wXPjM3r6eaTciHl3xgNtC73pgoT32vG30/DeME 30t5v5DV2llebk18ZXLNMFY5kLKeUkk/wdJwVFl6IpUMSqGES4QEd/iwVyuN7ouqOwSRXU 1n0fxDvHSrMnZgqQLYxVvgpYE0bwBN5JN/gFmzNeLFLnzxpzMNpT9Y7H/nYKFU/zHH5ShC QLPoaVzhXYycAfLPcssu8nzLgT3z6uOKKpLUjZeCLBOa1X5A0RKCMiI6nkl6+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dol20WG+ZQE86G2lNp9iuJVdLNRncbpnKeQfSYd41EQ=; b=peaWwzBCbk3EvcnhoGngLd7cCCSuRiJFR72kAE3MppRkDplpUz+3kq+jBwKNSabTgMh4y3 4BRE92VRPcsJ673ELALXxwBITah9owrYapMQmLqz5byiIqh5ommxrJF/N1tFWO6Q5uX2Oy jOXqak+kRgN2y+Vqrq3XNuk7aTwsvu37z4f0Ix1SBp92hmd5lCix5UXlXsFBlhle8DPOgl p1nQJrc1oa6kl3CDuejpk8/xh7gIM/SrBbgeJS6219AFsItI9AOFgtp/nT/+8/2CF6PMty ZtN5k0CmEXI10pF6dvAGY+L+2bQvLG1so5onYc35janFYJUr6vFq0Oz2llBTJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fd5Q6LznWJ; Thu, 21 Sep 2023 17:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJXwJ076283; Thu, 21 Sep 2023 17:19:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJX2V076280; Thu, 21 Sep 2023 17:19:33 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:33 GMT Message-Id: <202309211719.38LHJX2V076280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 027768a21217 - main - iwlwifi firmware: update up-to -83 / updated -77 for others List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027768a21217499dd85aba8608715a5bf66a7857 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=027768a21217499dd85aba8608715a5bf66a7857 commit 027768a21217499dd85aba8608715a5bf66a7857 Author: Bjoern A. Zeeb AuthorDate: 2023-06-11 00:45:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:00 +0000 iwlwifi firmware: update up-to -83 / updated -77 for others Firmware was obtained from linux-firmware at dfa11466cf000120d1551146fd5bf78c44941eda. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- .../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode | Bin 1518788 -> 1518772 bytes .../iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode | Bin 1489548 -> 1489652 bytes ...hr-b0-73.ucode => iwlwifi-Qu-b0-hr-b0-77.ucode} | Bin 1369840 -> 1404704 bytes ...jf-b0-73.ucode => iwlwifi-Qu-b0-jf-b0-77.ucode} | Bin 1290220 -> 1322436 bytes ...hr-b0-73.ucode => iwlwifi-Qu-c0-hr-b0-77.ucode} | Bin 1369976 -> 1404720 bytes ...jf-b0-73.ucode => iwlwifi-Qu-c0-jf-b0-77.ucode} | Bin 1290100 -> 1322452 bytes ...r-b0-73.ucode => iwlwifi-QuZ-a0-hr-b0-77.ucode} | Bin 1369856 -> 1404840 bytes ...f-b0-73.ucode => iwlwifi-QuZ-a0-jf-b0-77.ucode} | Bin 1290084 -> 1321956 bytes ...lwifi-cc-a0-73.ucode => iwlwifi-cc-a0-77.ucode} | Bin 1333296 -> 1366144 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode | Bin 1563692 -> 0 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode | Bin 0 -> 1739988 bytes sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm | Bin 41808 -> 55580 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode | Bin 1587800 -> 0 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode | Bin 0 -> 1703968 bytes .../dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm | Bin 28064 -> 28064 bytes ...hr-b0-73.ucode => iwlwifi-so-a0-hr-b0-81.ucode} | Bin 1465208 -> 1539288 bytes ...jf-b0-73.ucode => iwlwifi-so-a0-jf-b0-77.ucode} | Bin 1409336 -> 1446036 bytes .../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode | Bin 1502900 -> 0 bytes .../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode | Bin 0 -> 1683076 bytes sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm | Bin 41588 -> 55484 bytes .../iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 2 +- sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 2 +- .../iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 2 +- 35 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode index f9ea46dc928c..9af424f1ce06 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode index fec9d0aba254..4c2b25e585cb 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode index 26abb3a850a4..de6cd8b98985 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode index 072064dde7b1..ad87490d470b 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode similarity index 51% rename from sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode index 16e42ff8889f..37e1c7af3f16 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode index 4e88eb24ba76..bd0b2b249894 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode index c3a23c81643c..256997390af6 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode similarity index 52% rename from sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode index e1ecc31408e2..7c2a06a2dd2e 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode similarity index 51% rename from sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode index 9f7df7693322..d138e34af24d 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode deleted file mode 100644 index 196a3bda21b7..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode new file mode 100644 index 000000000000..dbb15f487716 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm index b649de0118ef..9dad35a1f5f5 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode deleted file mode 100644 index c1595fd0baa8..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode new file mode 100644 index 000000000000..1bc07d83ac07 Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm index 8658ebaa8fa8..86b9a7c63776 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode similarity index 50% rename from sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode index 2da5b4cdcae9..fc8558c6cc90 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode similarity index 54% rename from sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode rename to sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode index 4704c56f8456..3649a1c89238 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-73.ucode and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode deleted file mode 100644 index 1a6592408f1d..000000000000 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-73.ucode and /dev/null differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode new file mode 100644 index 000000000000..3fdd6d5a0d9a Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode differ diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm index 70882a9127db..68b8668df93d 100644 Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm differ diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile index bc41b21969dd..e781e790a048 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-b0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile index 125d3e969e51..ac8b13cd1777 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-b0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile index c254768fcb68..15389b3c3e2f 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-c0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile index af8ad15e7576..bd9cd5077021 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= Qu-c0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile index d89f4c878d7b..d15ee3643679 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= QuZ-a0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile index e92608872e07..ac0f398a10d6 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= QuZ-a0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile index 0cb3830c4d57..645e3c94684a 100644 --- a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= cc-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile index 98e1efddd7f3..4106eedfa339 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile index 6a4085119166..56b5cbde6c26 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile index 44cd873e0b8e..f89756193b89 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf4-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile index 5a63a147c156..a13ba593b628 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= so-a0-gf4-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile index b95aba38ed80..ae908c41376a 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 81 NAME= so-a0-hr-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile index 0211cf81d4e3..372a04314cf7 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 77 NAME= so-a0-jf-b0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile index 62c98afb76ba..3bb0931b5248 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= ty-a0-gf-a0 .include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile index f61111576131..1dcb41414755 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile @@ -1,5 +1,5 @@ -FWVERSION= 73 +FWVERSION= 83 NAME= ty-a0-gf-a0 EXT= pnvm _NAME= iwlwifi-${NAME}.${EXT} From nobody Thu Sep 21 17:19:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fg0XLqz4tk7B; Thu, 21 Sep 2023 17:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Ff74f4z4f53; Thu, 21 Sep 2023 17:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7HhCPUg8tR43BVEFyxk6ZZ/R2SZ/pJMWY8e9k09YxKM=; b=hOmaU1EgttN8dVrolSncVSQt9JzrpDLSvcioKQa9he4TZ6qIEOiOXR1nd1MJnqju8Jep4R 9StH7vx5eEoGwGrZDGgIQphARW2tbgB7pOkStDZWtKiU5t4IA0IQnEqAd179pZ2dsNVKH0 05mR7pY5f92urOwMaOMdm2Lm9K5pWf+1mGgcYqWr2ANoDmF1AGFzU2/DgeEf9sgWnPV11/ v5VjwYtUTngupb4WNyGLUMFEWXTnrof3uuCluJiW4CFuD+wAhu0zUFZdTOi5lWQmtrEB2A 2Wa90EY7k+kb9cMxdiursNAeQjfIPMSDodk58O9FyfKJlafuk5paLr1r8E3wCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316775; a=rsa-sha256; cv=none; b=UOKbtSP8UMlOPI1d10OApMGcdrsc3IX2r98gtOfFoMlN2IDT6N03DD00+O6/F+Zhi0P6Or EnrMJO7WNWVAZVZnWTdLw7xLplo6SuGJ1oryvemQVo7pK+doodiHjtPwE8pzCizmF3qUG3 xjPlqhJWFh8cGW8A0hQQI2ifVPgqxU9BtFdovv7pq9yM3fveoYFIfxr+KSt1PeTCiU6VD1 GJDSbzOz+nkjzx8gdYZBAF54JFE6we2TtGWY1msMLFZiB/hQq6Gk8E7rJeqT9EJZ/Yna8G yIhRNKjZotLexBrlHpL/C5g7J4uKOc6OtXJF5lesrgsw342Fzul7M5s0xxD1XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7HhCPUg8tR43BVEFyxk6ZZ/R2SZ/pJMWY8e9k09YxKM=; b=uR1c8umZdoJaJ1dtnmaEf8wyQPaLD9+Vet6sBBfwjrFG1DJOC3jPXX9iwCA6h0GTOuAFXQ FbkUVx1kzjdX0M+dYXcm6wYeJqSKWi7Vn+D6NGuc0gKmQpuE4Jp7k6cz/ImEBVBKXMMgDH E52rxiM29fY8sigC+ir8ewden0zixPv0Y4glMo34jPESwi5JFANUjbtJce3huMnJrQkW9X ohFteHIu6QcVj9263f35VKUnocHEFJlB4KcUgelGz4aVVhQwIoXfBbxJMxPrfyRiWVxZcy zmPszs5dud8eUrDGyYUunMLGZVxGtoCbAgpkHoTucHCyZ2Oswn0cWIGp0JNXng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Ff67VPzn3c; Thu, 21 Sep 2023 17:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJYQ0076344; Thu, 21 Sep 2023 17:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJYaw076342; Thu, 21 Sep 2023 17:19:34 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:34 GMT Message-Id: <202309211719.38LHJYaw076342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6854154638a2 - main - LinuxKPI: 802.11: pass non-0/NULL arguments to MO functions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6854154638a2c04ab59da43aedbe2c0ee8ef71a5 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6854154638a2c04ab59da43aedbe2c0ee8ef71a5 commit 6854154638a2c04ab59da43aedbe2c0ee8ef71a5 Author: Bjoern A. Zeeb AuthorDate: 2023-09-16 13:10:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:16 +0000 LinuxKPI: 802.11: pass non-0/NULL arguments to MO functions In [1] we updated the KPI for various mac80211 ops functions to deal with MLD code. Newer iwlwifi driver and firmware supports these functions so we need to pass non-dummy (0, NULL) arguments to them. Start extending the internel MO functions by these arguments and pass down values from LinuxKPI 802.11 code. It is assumed that further work will be needed to have all the right fields available to at least work in the lgeacy way of a single link. Sponsored by: The FreeBSD Foundation Improves: 549198b1ab95 (update mac80211 KPI) [1] MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 ++++++----- sys/compat/linuxkpi/common/src/linux_80211.h | 6 +++--- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 21 ++++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index cb919bfd3f5b..668cb2bc04d8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -990,7 +990,8 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } /* Assign vif chanctx. */ if (error == 0) - error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, conf); + error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, + &vif->bss_conf, conf); if (error == EOPNOTSUPP) error = 0; if (error != 0) { @@ -1171,7 +1172,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -1446,7 +1447,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -1908,7 +1909,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf = vif->chanctx_conf; /* Remove vif context. */ - lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->chanctx_conf); + lkpi_80211_mo_unassign_vif_chanctx(hw, vif, &vif->bss_conf, &vif->chanctx_conf); /* NB: vif->chanctx_conf is NULL now. */ /* Remove chan ctx. */ @@ -2199,7 +2200,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) txqp.cw_max = wmep->wmep_logcwmax; txqp.txop = wmep->wmep_txopLimit; txqp.aifs = wmep->wmep_aifsn; - error = lkpi_80211_mo_conf_tx(hw, vif, ac, &txqp); + error = lkpi_80211_mo_conf_tx(hw, vif, /* link_id */0, ac, &txqp); if (error != 0) ic_printf(ic, "%s: conf_tx ac %u failed %d\n", __func__, ac, error); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 42b4192bac63..22a5f5a6377c 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -276,9 +276,9 @@ int lkpi_80211_mo_sta_state(struct ieee80211_hw *, struct ieee80211_vif *, struct lkpi_sta *, enum ieee80211_sta_state); int lkpi_80211_mo_config(struct ieee80211_hw *, uint32_t); int lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *, struct ieee80211_vif *, - struct ieee80211_chanctx_conf *); + struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf *); void lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *, struct ieee80211_vif *, - struct ieee80211_chanctx_conf **); + struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf **); int lkpi_80211_mo_add_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *); void lkpi_80211_mo_change_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, uint32_t); @@ -287,7 +287,7 @@ void lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *, void lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, uint64_t); int lkpi_80211_mo_conf_tx(struct ieee80211_hw *, struct ieee80211_vif *, - uint16_t, const struct ieee80211_tx_queue_params *); + uint32_t, uint16_t, const struct ieee80211_tx_queue_params *); void lkpi_80211_mo_flush(struct ieee80211_hw *, struct ieee80211_vif *, uint32_t, bool); void lkpi_80211_mo_mgd_prepare_tx(struct ieee80211_hw *, struct ieee80211_vif *, diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index c386c096add7..8444c3b3f245 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -444,7 +444,7 @@ out: int lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_chanctx_conf *chanctx_conf) + struct ieee80211_bss_conf *conf, struct ieee80211_chanctx_conf *chanctx_conf) { struct lkpi_hw *lhw; int error; @@ -455,8 +455,9 @@ lkpi_80211_mo_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif * goto out; } - LKPI_80211_TRACE_MO("hw %p vif %p chanctx_conf %p", hw, vif, chanctx_conf); - error = lhw->ops->assign_vif_chanctx(hw, vif, NULL, chanctx_conf); + LKPI_80211_TRACE_MO("hw %p vif %p bss_conf %p chanctx_conf %p", + hw, vif, conf, chanctx_conf); + error = lhw->ops->assign_vif_chanctx(hw, vif, conf, chanctx_conf); if (error == 0) vif->chanctx_conf = chanctx_conf; @@ -466,7 +467,7 @@ out: void lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_chanctx_conf **chanctx_conf) + struct ieee80211_bss_conf *conf, struct ieee80211_chanctx_conf **chanctx_conf) { struct lkpi_hw *lhw; @@ -477,8 +478,9 @@ lkpi_80211_mo_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif if (*chanctx_conf == NULL) return; - LKPI_80211_TRACE_MO("hw %p vif %p chanctx_conf %p", hw, vif, *chanctx_conf); - lhw->ops->unassign_vif_chanctx(hw, vif, NULL, *chanctx_conf); + LKPI_80211_TRACE_MO("hw %p vif %p bss_conf %p chanctx_conf %p", + hw, vif, conf, *chanctx_conf); + lhw->ops->unassign_vif_chanctx(hw, vif, conf, *chanctx_conf); *chanctx_conf = NULL; } @@ -548,7 +550,7 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi int lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - uint16_t ac, const struct ieee80211_tx_queue_params *txqp) + uint32_t link_id, uint16_t ac, const struct ieee80211_tx_queue_params *txqp) { struct lkpi_hw *lhw; int error; @@ -559,8 +561,9 @@ lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, goto out; } - LKPI_80211_TRACE_MO("hw %p vif %p ac %u txpq %p", hw, vif, ac, txqp); - error = lhw->ops->conf_tx(hw, vif, 0, ac, txqp); + LKPI_80211_TRACE_MO("hw %p vif %p link_id %u ac %u txpq %p", + hw, vif, link_id, ac, txqp); + error = lhw->ops->conf_tx(hw, vif, link_id, ac, txqp); out: return (error); From nobody Thu Sep 21 17:19:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fh26yJz4tk7F; Thu, 21 Sep 2023 17:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fh17tlz4fDX; Thu, 21 Sep 2023 17:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+BVsB8+neRwqFG/trhRI+e1eA7e3UR3uXjZOKFTw0EQ=; b=mgTZsS5rtfviXX8AiwMznpP0MoEgyTHUTY0bx2KEWnEVaIHfMnJ6Gv+4tfPZZi9yOkKu5A l/xBby1XLtVAD4uDY1Na/bghWhYOM65guRtfWOcSiDiYUciPlJSPAuQKM1WpbT5Z0nT/mh MQL6ebkbjZFpIAnpbIYdhDPwcEbAYRcI6e5B8M7diogKqC20NpqHPD2uE82llR3IcyBuaS zq1/gnrxLMJEOg4yQ2gVHATb201GxEYcWHNgQXSmCEuMEgPkpiCTfHbw0FK5KCL6HqSYnT dYwLm6ZW1ZdzilWTSbSuWpN6oOcZzqiDFJge0Ip7Dz23oyiJq3bjvh6O31ajbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316776; a=rsa-sha256; cv=none; b=gUfdH5QvhBniv2ieFn48XQPNXMUeLT1ckeavdGeib1WKinmV7AaHlmZzkTtIF0tVfsvOzn x32rh8cdAPFdGMzuVXM5rNJenlT/sw6k63cEqRqsxnEJts+BCPOTmyqEgVjRwr4ujd9FxO jmEOX4OD3W3AINFkXgdvakYL0o/GXJZSbHwhICjZ9iDyIsNk4FgJagyXnjW+js6Q1HMlqY D7KcDKaQPn6i8DwddOHfboJeMaENcg8vUl0ZX5tfP34N/8/KOgaQvk/FpGOWD1wnjuZezU 95MWXfKYe+Ma1sS9BX6sLXqJHLsBQ15hDqmnncGdS5jcOMaPaDpqIsyy45FFag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+BVsB8+neRwqFG/trhRI+e1eA7e3UR3uXjZOKFTw0EQ=; b=efnXJP4f0bzokD9mYTl6FrrN42tpfSwjrnC9e5PGLAjJjFHMEcgBmBADgKHZgic9XaRQsE 9ykIRt7NKrwNQlvKDlp5DjO7LnqtlyqqUq7vO9JSH7Hh2VEFH8oq/DEleyfYsBf5EUdMtv 0XPlCj5i2K/a7iUMtUZrmR8SiGujqdVNDcl7haiX7NrlMJKf55bFHJKnll5T237S2lwi5i HhvjNX2zvSCt3vvHHSzFg8lTp0Hq7vnhPee4RsuC0HbJJ47FrFR6Yf/IQMYmtrRmwVuE4u a9tZV6IX+XbiPFe+MtYeI30m3qNLysCnFSpJfXYEQA9QpvNsUqevToYTamSYAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fh0D2dznWK; Thu, 21 Sep 2023 17:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJZof076398; Thu, 21 Sep 2023 17:19:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJZHW076395; Thu, 21 Sep 2023 17:19:35 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:35 GMT Message-Id: <202309211719.38LHJZHW076395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 727f88f2617a - main - LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 727f88f2617acaff4ada0f3dda6ca23c6679310d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=727f88f2617acaff4ada0f3dda6ca23c6679310d commit 727f88f2617acaff4ada0f3dda6ca23c6679310d Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:58:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:23 +0000 LinuxKPI: 802.11: mac80211 ops: distinguish between {bss,link}_info_changed With MLO and multi-link setups if avail we want to call link_info_changed whereas for legacy drivers we still need to call bss_info_changed. While we currently do not (yet) support multi-link configurations we still need to drive the correct commands to satisfy firmware requirements. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 8444c3b3f245..b3b53d23f62e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -540,14 +540,17 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi struct lkpi_hw *lhw; lhw = HW_TO_LHW(hw); - if (lhw->ops->bss_info_changed == NULL) + if (lhw->ops->link_info_changed == NULL && + lhw->ops->bss_info_changed == NULL) return; LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)changed); - lhw->ops->bss_info_changed(hw, vif, conf, changed); + if (lhw->ops->link_info_changed != NULL) + lhw->ops->link_info_changed(hw, vif, conf, changed); + else + lhw->ops->bss_info_changed(hw, vif, conf, changed); } - int lkpi_80211_mo_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, uint32_t link_id, uint16_t ac, const struct ieee80211_tx_queue_params *txqp) From nobody Thu Sep 21 17:19:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fj2kbkz4tk3P; Thu, 21 Sep 2023 17:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fj1ztlz4f94; Thu, 21 Sep 2023 17:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4SAH8M4kVJcCjhTRQXU+nd/qmAbtYibCybMQPNp2rx0=; b=tUQWQXqTWu8pT81Xt96jvPp5cM4ogPkUym4ONAcG1XWZXbU1tvqCAxYaj3tFcDk0WMsLRp Znw2XzB2Ib/RLIaDjyMpS2Jv/qBU0sQW14CFKU/d54Ow3faCGtghEChaiclvJRIK45i5RY 4mzYQ/4OjyQwCc6gTVSI6+0nwFYts04O3heuBueYCTsn0YKXbDDA6IvYlb3TOa+z9UGgX8 1xt26NHOXV08ISCzbhRW8FmKdNPAJFaKMFMXawClMM6GZ0bz0qQkCqPx1BcQBoi4wpWaff UHtWjDlDUPHPb+ocNmFCCM2zbkCmKVzS/pfMy8GJLUBQZ9gYW8vlki1msCYp8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316777; a=rsa-sha256; cv=none; b=UZBOTRnVUq29IW0Mu7RUtwvQb3Re4B1eO3B4zBGL/giKVvmGUqxuIJeStai9gNo/4z+EAh NVhTX/8cnyECwqTY8oR5OrfqbTh5JRXlJEDmrc9dcdoAztqMqpCMLfIin8+UZBa4G9gX6B zm/tIY3A/QNHGnkerUkTFmL9d389PliqYDqwnm6JMMPgnv+2AVFATocruviy8N7DuDU1Ig 9cAhpeW8vA9+oj8nGingbHNevrRMRHSvl9/24UpCkSrsLw47Hy3tSExv5NZ53gjdR4hHuU ISx6HZ1zg50I6ndNb61026VFsxhvrZAHFyIUvMlebbcMe3nLNS/xJnZfRFT55A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4SAH8M4kVJcCjhTRQXU+nd/qmAbtYibCybMQPNp2rx0=; b=ygYQNz2CZ7mjyeyAm5N22sq5FcJiUI7LTCovf8LhsAHAE7nZIfoJv8DT/x20PIbOZJaz2k AUF8R37qN22wCZv9pKGQy2o961ou1PKpZgwA0AlNI0x6aUr7rrV+PIvHblT9nufUWORjn3 lsAYfT1oB6+e5H4xKFDD7Mh++aXFIVwtCPGtvejSPsUykwejS1h1CuIautnoShzd39P34v B88THbYVceoh036D35nakbIMqBCUc1QFwfJTvQZTS1Rzu+r1218N/p7gaCAt1Zqeuz6GMx jSOEs9+pHPU/TIFHX62ooc0N9CufnqVMSeJQ44W8u2FhJ7kEw7u/CkCx0hxozA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fj154gznHL; Thu, 21 Sep 2023 17:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJbP1076454; Thu, 21 Sep 2023 17:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJbeg076451; Thu, 21 Sep 2023 17:19:37 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:37 GMT Message-Id: <202309211719.38LHJbeg076451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 616e13301bcf - main - LinuxKPI: 802.11: adjust code to new structure layout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 616e13301bcf274b007f84ef99ea857a55bef46d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=616e13301bcf274b007f84ef99ea857a55bef46d commit 616e13301bcf274b007f84ef99ea857a55bef46d Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:19:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:38 +0000 LinuxKPI: 802.11: adjust code to new structure layout With past commits new structures were added. Now switch over some bss_conf fields into vif->cfg where they got moved to and remove the old fields. This allows drivers to find the expected values in the now expected places and work better. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 9 ++--- sys/compat/linuxkpi/common/src/linux_80211.c | 44 +++++++++++------------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 20371812198a..7e6fb1bce16e 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -280,19 +280,13 @@ struct ieee80211_bss_conf { bool eht_su_beamformer; bool eht_mu_beamformer; - size_t ssid_len; - uint8_t ssid[IEEE80211_NWID_LEN]; - uint16_t aid; uint16_t ht_operation_mode; int arp_addr_cnt; uint16_t eht_puncturing; uint8_t dtim_period; uint8_t sync_dtim_count; - bool assoc; - bool idle; bool qos; - bool ps; bool twt_broadcast; bool use_cts_prot; bool use_short_preamble; @@ -991,6 +985,8 @@ struct ieee80211_ops { void (*config_iface_filter)(struct ieee80211_hw *, struct ieee80211_vif *, unsigned int, unsigned int); void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); + int (*set_rts_threshold)(struct ieee80211_hw *, u32); void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *, const struct ieee80211_event *); int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *); @@ -1038,7 +1034,6 @@ struct ieee80211_ops { int (*set_hw_timestamp)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_set_hw_timestamp *); - void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); void (*vif_cfg_changed)(struct ieee80211_hw *, struct ieee80211_vif *, u64); int (*change_vif_links)(struct ieee80211_hw *, struct ieee80211_vif *, u16, u16, struct ieee80211_bss_conf *[IEEE80211_MLD_MAX_NUM_LINKS]); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 668cb2bc04d8..1fc9f9bcba15 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -743,7 +743,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, "dtim_period %u sync_dtim_count %u sync_tsf %ju " "sync_device_ts %u bss_changed %#08x\n", __func__, __LINE__, _f, _l, - vif->bss_conf.assoc, vif->bss_conf.aid, + vif->cfg.assoc, vif->cfg.aid, vif->bss_conf.beacon_int, vif->bss_conf.dtim_period, vif->bss_conf.sync_dtim_count, (uintmax_t)vif->bss_conf.sync_tsf, @@ -774,7 +774,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, "dtim_period %u sync_dtim_count %u sync_tsf %ju " "sync_device_ts %u bss_changed %#08x\n", __func__, __LINE__, _f, _l, - vif->bss_conf.assoc, vif->bss_conf.aid, + vif->cfg.assoc, vif->cfg.aid, vif->bss_conf.beacon_int, vif->bss_conf.dtim_period, vif->bss_conf.sync_dtim_count, (uintmax_t)vif->bss_conf.sync_tsf, @@ -845,7 +845,7 @@ lkpi_disassoc(struct ieee80211_sta *sta, struct ieee80211_vif *vif, struct lkpi_hw *lhw) { sta->aid = 0; - if (vif->bss_conf.assoc) { + if (vif->cfg.assoc) { struct ieee80211_hw *hw; enum ieee80211_bss_changed changed; @@ -853,8 +853,8 @@ lkpi_disassoc(struct ieee80211_sta *sta, struct ieee80211_vif *vif, lkpi_update_mcast_filter(lhw->ic, true); changed = 0; - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.assoc = false; + vif->cfg.aid = 0; changed |= BSS_CHANGED_ASSOC; /* * This will remove the sta from firmware for iwlwifi. @@ -1008,12 +1008,12 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed |= BSS_CHANGED_BSSID; vif->bss_conf.txpower = ni->ni_txpower; bss_changed |= BSS_CHANGED_TXPOWER; - vif->bss_conf.idle = false; + vif->cfg.idle = false; bss_changed |= BSS_CHANGED_IDLE; /* Should almost assert it is this. */ - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.assoc = false; + vif->cfg.aid = 0; bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); @@ -1432,8 +1432,8 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i bss_changed = 0; vif->bss_conf.qos = 0; bss_changed |= BSS_CHANGED_QOS; - vif->bss_conf.ssid_len = 0; - memset(vif->bss_conf.ssid, '\0', sizeof(vif->bss_conf.ssid)); + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -1548,14 +1548,14 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int #ifdef LKPI_80211_WME bss_changed |= lkpi_wme_update(lhw, vap, true); #endif - if (!vif->bss_conf.assoc || vif->bss_conf.aid != IEEE80211_NODE_AID(ni)) { - vif->bss_conf.assoc = true; - vif->bss_conf.aid = IEEE80211_NODE_AID(ni); + if (!vif->cfg.assoc || vif->cfg.aid != IEEE80211_NODE_AID(ni)) { + vif->cfg.assoc = true; + vif->cfg.aid = IEEE80211_NODE_AID(ni); bss_changed |= BSS_CHANGED_ASSOC; } /* We set SSID but this is not BSSID! */ - vif->bss_conf.ssid_len = ni->ni_esslen; - memcpy(vif->bss_conf.ssid, ni->ni_essid, ni->ni_esslen); + vif->cfg.ssid_len = ni->ni_esslen; + memcpy(vif->cfg.ssid, ni->ni_essid, ni->ni_esslen); if ((vap->iv_flags & IEEE80211_F_SHPREAMBLE) != vif->bss_conf.use_short_preamble) { vif->bss_conf.use_short_preamble ^= 1; @@ -1894,8 +1894,8 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; vif->bss_conf.qos = 0; bss_changed |= BSS_CHANGED_QOS; - vif->bss_conf.ssid_len = 0; - memset(vif->bss_conf.ssid, '\0', sizeof(vif->bss_conf.ssid)); + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); bss_changed |= BSS_CHANGED_BSSID; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -2275,16 +2275,16 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], #if 1 vif->chanctx_conf = NULL; vif->bss_conf.vif = vif; - vif->bss_conf.idle = true; - vif->bss_conf.ps = false; vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ vif->bss_conf.qos = false; vif->bss_conf.use_cts_prot = false; /* vap->iv_protmode */ vif->bss_conf.ht_operation_mode = IEEE80211_HT_OP_MODE_PROTECTION_NONE; - vif->bss_conf.assoc = false; - vif->bss_conf.aid = 0; + vif->cfg.aid = 0; + vif->cfg.assoc = false; + vif->cfg.idle = true; + vif->cfg.ps = false; /* * We need to initialize it to something as the bss_info_changed call * will try to copy from it in iwlwifi and NULL is a panic. @@ -4694,7 +4694,7 @@ linuxkpi_ieee80211_pspoll_get(struct ieee80211_hw *hw, psp = skb_put_zero(skb, sizeof(*psp)); psp->i_fc[0] = IEEE80211_FC0_VERSION_0; psp->i_fc[0] |= IEEE80211_FC0_SUBTYPE_PS_POLL | IEEE80211_FC0_TYPE_CTL; - v = htole16(vif->bss_conf.aid | 1<<15 | 1<<16); + v = htole16(vif->cfg.aid | 1<<15 | 1<<16); memcpy(&psp->i_aid, &v, sizeof(v)); IEEE80211_ADDR_COPY(psp->i_bssid, vap->iv_bss->ni_macaddr); IEEE80211_ADDR_COPY(psp->i_ta, vif->addr); From nobody Thu Sep 21 17:19:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fk5w4xz4tk50; Thu, 21 Sep 2023 17:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fk4P1sz4fCN; Thu, 21 Sep 2023 17:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Tq6/X3RYVYgKs4VWSVx4PF5lF59wqye80hqKHQNY5Q=; b=C6VWHHm3jKL8Kb5hQ8Iy85qGOwH4x1M75khOwwYiYirtdoZHQUn0iqrUW5aLQJkyhEqiTa 7IxdaEWux9ni2kJZvYL/koaNvi1/NPPljto4PRH5Fyhx7OQEModIFVjjPPYlXXwdXWz8z2 eF6G0KA4JMKSe+9pGb1t33VMJwn8J2rPxw8Sfme0dy/pOseD46OAXAqaPpO2C/QN/3Mj/G wGu6PZFpzH8RmAf8+lKxk34BcOXkputkHI55XAwJNuiSVuRifeXYxMMy1ogIxpTZmon845 haTJKKs7zuLQThotCoOd0xWQ6K613YvLIlcCnA7XUARn+0nB+CqvYQXyBKJSsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316778; a=rsa-sha256; cv=none; b=EH5wiw78vzOoZpkmnLkj/iU97RMXoL/7I5oZsnVel7GCNHzd3YfeaC3dRtiCTe1GAgoEQb kZZDmWQPdUa+VeCe+OglKiOvhLAy5ySiK961NODVwSGcF8kkVnkZwEMGJqPCukf6J0j41f 4jlRfT3WN9GA6A0Z5v41H9SNNOCrn0FztTAN5QUCWgUDDYLcqC/hJ1P+DkQ7VkkeiucXqf nV+JPY6tE3mbNVgmQGTCGfGQU6pr3Qsg2fSkGSMes5IIpQshwLS1TNXoQZzGKxqmLPR/kO WSJGilPDFYhNbW5DjfEBBGBDO270aYaBYXOFO6xowF3/jYK/kYEhrF5bQezjrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Tq6/X3RYVYgKs4VWSVx4PF5lF59wqye80hqKHQNY5Q=; b=AEmJVAewemXqE5rNahlo9iIBAv7ZeOL0awQohV6EOqw04gbm2UfRhu4l8OkujpCru3eF7f eSmchz3raQZjzIjx2oMTKP/LlKtvbvYDaYo4/adMAV0USCSam9b7CZ/duoTEjyxFxWS+sA 6YflhGWc+uhQqvh9lWLMUhKWjdbxRUzFgN3feDwgFLKbbOvbvB/sUE35gX12DwKpL71f4A pQBbM+npoha3qiLC1J6rqvUU+5pqYANqNSB4K5X1PD8hyZygqSchPembixhXytUNvLhQm+ pBtAe2GXnJmmUwzqqDktkclet0ByYuCFg9Vrezq2HwLAsG6mRDPBmpZ5th2m6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fk24wFzn3d; Thu, 21 Sep 2023 17:19:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJcSK076512; Thu, 21 Sep 2023 17:19:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJcPs076509; Thu, 21 Sep 2023 17:19:38 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:38 GMT Message-Id: <202309211719.38LHJcPs076509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8d58a0578635 - main - LinuxKPI: 802.11: change ic_parent() to not call mo_stop()/mo_start() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d58a0578635dc7dd1025ab08b0479f2b383e1a4 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8d58a0578635dc7dd1025ab08b0479f2b383e1a4 commit 8d58a0578635dc7dd1025ab08b0479f2b383e1a4 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:25:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:48 +0000 LinuxKPI: 802.11: change ic_parent() to not call mo_stop()/mo_start() Driven by net80211 we may call mac80211 ops stop() and start() mostly when toggling a first VAP. While this is FreeBSD behaviour the firmware based LinuxKPI drivers seem to possibly clear state in the case of stop() triggering further errors down the line. We call mo_start() when starting the VAP and mo_stop() when destroying it now only. In the future (e.g., in multi-VAP setups) we may need to re-address some of this so keep the code under #ifdef. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1fc9f9bcba15..b97e1c196867 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2460,24 +2460,32 @@ static void lkpi_ic_parent(struct ieee80211com *ic) { struct lkpi_hw *lhw; +#ifdef HW_START_STOP struct ieee80211_hw *hw; int error; +#endif bool start_all; IMPROVE(); lhw = ic->ic_softc; +#ifdef HW_START_STOP hw = LHW_TO_HW(lhw); +#endif start_all = false; /* IEEE80211_UNLOCK(ic); */ LKPI_80211_LHW_LOCK(lhw); if (ic->ic_nrunning > 0) { +#ifdef HW_START_STOP error = lkpi_80211_mo_start(hw); if (error == 0) +#endif start_all = true; } else { +#ifdef HW_START_STOP lkpi_80211_mo_stop(hw); +#endif } LKPI_80211_LHW_UNLOCK(lhw); /* IEEE80211_LOCK(ic); */ From nobody Thu Sep 21 17:19:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fl53wKz4tk7M; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fl3z1Rz4fWB; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqg2CJO4th/va77EIW5nCVXKoBS9/gDnMWd4YmCqOO8=; b=GhXcNr7WDogkEwIbRCuNC+Fb652Jwqt1E1aTdvWrs3pu2+V5klfRO4sJ4kPudD1LfGvUOB wXpWwAF+VUXRr0Pyv7d5EIY8xhPzfo2s74sOwaSie5x9sR0Zvxs7Sc4fGMJNL/4stpeoQG PEL7Arpp3haVR7ULswVqyAr2vF7kWdbLn9/a5pctNHfUscIMzyjxYxywFNbnk7Mx49hc7I aXWL3QHalHEoqUQJohwyur+6THrsVNb9akMsC+FWKSMTLNdZCb52lN2piMAkO/K+eIZHtJ RUTzuLUHH71bsbGrdtyD4XeNs8xJ1rpWcZFdX6heKL443vsyCq9ZXIJztBBYMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316779; a=rsa-sha256; cv=none; b=Xu+chR20VyhEndxuFWbpFImQb+hD7hCOIPpamVZWrlmWZX/C1xMYubDJdnLspdoxXfAWdm /quf3knHqSEacHTk7XUz1+f870RLNTw6wwywF4gJPAEPuebRJaOd++ibRkvF0OSTpjHrEg dnnFY63yCy16p0PEvWxShouu1DkMmrMRCEPJgazLUX6bs4eHkngA7+RhLmgerRFIjqJns4 zlsRxh0khygTNbjAQK9NxnyvQ3TZzAAP7S9wtOXaOmy1s738lO//nOohu5ytev/HaVAlw9 /9ZM3jWsvKYj9V/KFlabTFm+UAscDnsWV9zU9gG9mpQ05B570+7hSTmjYk6Ipg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqg2CJO4th/va77EIW5nCVXKoBS9/gDnMWd4YmCqOO8=; b=PUpzCEepPOgjfFzSrXVvdnoxn9X5qrmfDfAyQEVctQeekBkNqfoasmlGss+Tg+erCsK1EA qxHjUlnMtLkgV39SkUM+wfbiXnVhLKNWBcY3zT4HG4u6oFH1otjLblsbXpXrzCD+4uKQur UdUVXk0A4BsCnsf7phsM7iBFOOxEy1NGHaSL2VazqJMVGCJS7xAKuaKL+5huhr473je5vi 280OzE+QagfA4zewIEcZD8xge5bVYboeSQ9Vulwb4iOD1avLbrT2csVeXsl5oVSR/F5EYs 0OKcNwSeuuPQKMzkIqWfKEDlkUa3eNNcenjiSd988DHDzSueHeijFObRAOoJ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fl34F9znWL; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJdG7076560; Thu, 21 Sep 2023 17:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJdv3076557; Thu, 21 Sep 2023 17:19:39 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:39 GMT Message-Id: <202309211719.38LHJdv3076557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a6042e17c899 - main - LinuxKPI: 802.11: inialize tx queue params List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6042e17c8999c4965bd4d762c4564b322f1ae7b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a6042e17c8999c4965bd4d762c4564b322f1ae7b commit a6042e17c8999c4965bd4d762c4564b322f1ae7b Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:36:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:55 +0000 LinuxKPI: 802.11: inialize tx queue params When adding a VAP (vif) initialize its tx queue parameters calling mo_conf_tx(). I could not spot net80211 providing some of the values needed before having a node so currrently we use hard-coded values with a comment with a reference on how to properly calculate the values in the future (e.g., in case of 11b or other cases). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index b97e1c196867..ffad61ba934a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2244,9 +2244,11 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], struct lkpi_vif *lvif; struct ieee80211vap *vap; struct ieee80211_vif *vif; + struct ieee80211_tx_queue_params txqp; enum ieee80211_bss_changed changed; size_t len; int error, i; + uint16_t ac; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* 1 so far. Add once this works. */ return (NULL); @@ -2345,7 +2347,24 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], changed = 0; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); - /* conf_tx setup; default WME? */ + /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ + IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); + LKPI_80211_LHW_LOCK(lhw); + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { + + bzero(&txqp, sizeof(txqp)); + txqp.cw_min = 15; + txqp.cw_max = 1023; + txqp.txop = 0; + txqp.aifs = 2; + error = lkpi_80211_mo_conf_tx(hw, vif, /* link_id */0, ac, &txqp); + if (error != 0) + ic_printf(ic, "%s: conf_tx ac %u failed %d\n", + __func__, ac, error); + } + LKPI_80211_LHW_UNLOCK(lhw); + changed = BSS_CHANGED_QOS; + lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); /* Force MC init. */ lkpi_update_mcast_filter(ic, true); From nobody Thu Sep 21 17:19:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fm6LlYz4tk0s; Thu, 21 Sep 2023 17:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fm5JGDz4fPD; Thu, 21 Sep 2023 17:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abrxRczz8TPFhAak+YYSUfOeflXSVmG7rz+UUaAZtPM=; b=L//D6d7KvrhWrNDSQBy9mJRAaz6DBAjNVceYkLyJzvAs1dDCmyv53c4l87iRPoyMPXzDrJ VPkscPb/qN+9y7j2tNPBFcfztqvON6pSZShnRbQM+YDJYmrG5DpLYa1yUV+tCmOvO+TpTn yFDBfe7jBE1zLudxrh6VMy7cPAIoE+BNJyYa70tv8pPxVRWEtORChl826TfnOt9wdpo0uJ UVpu8tEAqKPwTrKac6+zzGRxbbKRNHaoiT9pCI+lFG2p4D8sWMGktN58Zy46Is052GfAuG JIg5ovtl4bXK/rTFEkTrqm/dPt6MYux9gaQoxbKdVQBDL9LQbrpVJdlJQl6MPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316780; a=rsa-sha256; cv=none; b=CSNx4AIdnLPeaXgacEKrgC4WbUgzveq9djLj1bIP+nGLPip/GM+rWXYOBcYeXU6xsLweYl ZmQ1LpaGAqpySApN1y5RWLqDQXFfQa2QPRG7USvS7MU/xdkO3smsIhW1yEfBvJ6XnFb8Eq fJUyzVjAPXOiQXR6jI6ek960FfJBVgj44nth8wa7EKutauFXxwXZ6ac8+iAENqYjBeMOOc jawIbt+Ggk0EyKFUJJBY9B5Sez9RbCc+bMCaKCB+HZItD6W/VfNOu6RhDDHJ5GRLlUAdh4 RUsNwpqskQS32dFcVx31GYdBn+3xgu8avXDx5D+qtVCFjMOJZuSZjZ3ppnAtig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abrxRczz8TPFhAak+YYSUfOeflXSVmG7rz+UUaAZtPM=; b=V2550JJnQudc09rJd+xhlaW6XtUJSE+1pGHGT4fqzb/U+yBYfBrdNY3EAYOKKdoH3/ItBd 9h1ALh3FDpiSSuv9+0FI6Dc0oKol9f6VHVsYVH7T7YNHGqVyfcbS877Ch6vAlASZmXi7tG iyh22MT3o3ywnJL+j1trSFuiISK7ZVEwLzOAJXYVoUthcgdoMW0AC9IjovKUrAPJOj36aK xGsXd4v+QD4AkV88UjwbOHDa/vi5z2t/ZlQMBwtOuUr99pWm4IYgo+Qnrd1eeo9e1R0f2q 9DjRhr4XNoViV8eIk/JugHn3mv/ApxhjpoiQsXk/FbvN3Xr4gxFBomXAulgoFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fm3scpznHM; Thu, 21 Sep 2023 17:19:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJe8m076628; Thu, 21 Sep 2023 17:19:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJeUB076625; Thu, 21 Sep 2023 17:19:40 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:40 GMT Message-Id: <202309211719.38LHJeUB076625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6ffb7bd469b2 - main - LinuxKPI: 802.11: setup a default link[0] and adjust related needs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ffb7bd469b26f2ff6cc62cedca6ffe884076196 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6ffb7bd469b26f2ff6cc62cedca6ffe884076196 commit 6ffb7bd469b26f2ff6cc62cedca6ffe884076196 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:49:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:09:01 +0000 LinuxKPI: 802.11: setup a default link[0] and adjust related needs Setup more link_conf/deflink fields for vif/sta as are needed to allow us to work with the KPI bits in a non-MLO configuration. In lkpi_sta_scan_to_auth() set the bss_conf values before calling into the driver for chanctx setup/updates as certain values (e.g., beacon_int) need to be set before; we still call the MO function for the updates after to keep the expected workflow. Deal with the (to be dealt with otherwise later) net80211 ni swaps and update the addresses on the deflink as well as otherwise firmware will hit asserts or things will not work (e.g. indicating the peer is us). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 63 ++++++++++++++++++---------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ffad61ba934a..09a315de9fd6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -107,9 +107,6 @@ SYSCTL_INT(_compat_linuxkpi_80211, OID_AUTO, debug, CTLFLAG_RWTUN, #define PREP_TX_INFO_DURATION 0 /* Let the driver do its thing. */ #endif -/* c.f. ieee80211_ioctl.c */ -static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; - /* This is DSAP | SSAP | CTRL | ProtoID/OrgCode{3}. */ const uint8_t rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; @@ -269,9 +266,17 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], sta->deflink.supp_rates[band] |= BIT(i); } } + sta->deflink.smps_mode = IEEE80211_SMPS_OFF; IMPROVE("ht, vht, he, ... bandwidth, smps_mode, .."); /* bandwidth = IEEE80211_STA_RX_... */ + /* Link configuration. */ + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); + sta->link[0] = &sta->deflink; + for (i = 1; i < nitems(sta->link); i++) { + IMPROVE("more links; only link[0] = deflink currently."); + } + /* Deferred TX path. */ mtx_init(&lsta->txq_mtx, "lsta_txq", NULL, MTX_DEF); TASK_INIT(&lsta->txq_task, 0, lkpi_80211_txq_task, lsta); @@ -969,6 +974,23 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int conf->min_def.center_freq2 = 0; IMPROVE("currently 20_NOHT only"); + /* Set bss info (bss_info_changed). */ + bss_changed = 0; + vif->bss_conf.bssid = ni->ni_bssid; + bss_changed |= BSS_CHANGED_BSSID; + vif->bss_conf.txpower = ni->ni_txpower; + bss_changed |= BSS_CHANGED_TXPOWER; + vif->cfg.idle = false; + bss_changed |= BSS_CHANGED_IDLE; + + /* vif->bss_conf.basic_rates ? Where exactly? */ + + /* Should almost assert it is this. */ + vif->cfg.assoc = false; + vif->cfg.aid = 0; + + bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); + error = 0; if (vif->chanctx_conf != NULL) { changed = IEEE80211_CHANCTX_CHANGE_MIN_WIDTH; @@ -988,6 +1010,9 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } else { goto out; } + + vif->bss_conf.chanctx_conf = conf; + /* Assign vif chanctx. */ if (error == 0) error = lkpi_80211_mo_assign_vif_chanctx(hw, vif, @@ -1002,21 +1027,6 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int } IMPROVE("update radiotap chan fields too"); - /* Set bss info (bss_info_changed). */ - bss_changed = 0; - vif->bss_conf.bssid = ni->ni_bssid; - bss_changed |= BSS_CHANGED_BSSID; - vif->bss_conf.txpower = ni->ni_txpower; - bss_changed |= BSS_CHANGED_TXPOWER; - vif->cfg.idle = false; - bss_changed |= BSS_CHANGED_IDLE; - - /* Should almost assert it is this. */ - vif->cfg.assoc = false; - vif->cfg.aid = 0; - - bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - /* RATES */ IMPROVE("bss info: not all needs to come now and rates are missing"); lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); @@ -2131,12 +2141,14 @@ lkpi_iv_update_bss(struct ieee80211vap *vap, struct ieee80211_node *ni) lsta->ni = ni; sta = LSTA_TO_STA(lsta); IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); } lsta = obss->ni_drv_data; if (lsta != NULL) { lsta->ni = obss; sta = LSTA_TO_STA(lsta); IEEE80211_ADDR_COPY(sta->addr, lsta->ni->ni_macaddr); + IEEE80211_ADDR_COPY(sta->deflink.addr, sta->addr); } out: @@ -2277,6 +2289,9 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], #if 1 vif->chanctx_conf = NULL; vif->bss_conf.vif = vif; + /* vap->iv_myaddr is not set until net80211::vap_setup or vap_attach. */ + IEEE80211_ADDR_COPY(vif->bss_conf.addr, mac); + vif->bss_conf.link_id = 0; /* Non-MLO operation. */ vif->bss_conf.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; vif->bss_conf.use_short_preamble = false; /* vap->iv_flags IEEE80211_F_SHPREAMBLE */ vif->bss_conf.use_short_slot = false; /* vap->iv_flags IEEE80211_F_SHSLOT */ @@ -2287,15 +2302,13 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->cfg.assoc = false; vif->cfg.idle = true; vif->cfg.ps = false; + IMPROVE("Check other fields and then figure out whats is left elsewhere of them"); /* * We need to initialize it to something as the bss_info_changed call * will try to copy from it in iwlwifi and NULL is a panic. * We will set the proper one in scan_to_auth() before being assoc. - * NB: the logic there with using an array as bssid_override and checking - * for non-NULL later is flawed but in their workflow does not seem to - * matter. */ - vif->bss_conf.bssid = zerobssid; + vif->bss_conf.bssid = ieee80211broadcastaddr; #endif #if 0 vif->bss_conf.dtim_period = 0; /* IEEE80211_DTIM_DEFAULT ; must stay 0. */ @@ -2306,6 +2319,12 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], vif->bss_conf.beacon_int = 16; #endif + /* Link Config */ + vif->link_conf[0] = &vif->bss_conf; + for (i = 0; i < nitems(vif->link_conf); i++) { + IMPROVE("more than 1 link one day"); + } + /* Setup queue defaults; driver may override in (*add_interface). */ for (i = 0; i < IEEE80211_NUM_ACS; i++) { if (ieee80211_hw_check(hw, QUEUE_CONTROL)) From nobody Thu Sep 21 17:19:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fn6kFPz4tk3f; Thu, 21 Sep 2023 17:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fn61Y1z4fPS; Thu, 21 Sep 2023 17:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESY7pWj0yxoC1ke0xf20grA2xW2NFVFbTFYh2k4zi68=; b=xE7MHJELZtTSzsNkywHaeXqhTzXU0QamqZXqI1C4uNagd5Ty7Kd3Dx/5oCqiAPFg2ohUMJ e37sRZoWVIHETjnUv2KhrrNQ9dtflgLwhKFEOSb7BAxImz/YWJS/GhEBu+fdUaTdJIsjkL hSaxw2UmDvSLTinScsaoQBaF+H8IfavO+P/mLZ5kS7UgStumfZuCejDiKtYV7MJl02ZzGW L3tpxmZQ18IFX+wSquzITL+eZc8p8Ohi0MiKKN+gda9FJAN/bfoeZKB/NEOvqSjy0QEX0U Iz4a+6s+5DwxF3m+nBen6TSgJ1xyrc7XdxZYC3xSG4Lf4NecteWRSqzmu1MAIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316781; a=rsa-sha256; cv=none; b=C+3oAWeijHsG/A1nc5g0pSjtumK+fdBu9E0KqShxAJKQ/3gCsWMAPfFkVnfeW4qHsW965Z SYd97KGk52L/E1ACvsFcjStqiyt/HULGJdqI0QX1GSELc6I+f38CnapPC5DfzFqvI4Yz9n RzSpaSPgKsy7PzcFjYgtC4A538udgFzCPL8DB9pMY2APk2Lp5KxhPKD0LawlG8j/im5mQC A8xUMpi5yG6ZjHreUFAyAaPeas0u7qiYoIqT9GOpb9/YQUCSIPPMyag7qaAkzDlnp+vs8G /N1c7L8lNYE9xnwjgNCMBpJ2Apbyx3Mckv7PNNjHMo7rofm4Uf2F0/IIdKqBLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ESY7pWj0yxoC1ke0xf20grA2xW2NFVFbTFYh2k4zi68=; b=OUGh/RG/HEQPxzzsUpYMG7Rr24QWDz47foJWg/FCd7VP2Mad1uD0lTEeGkwbwyaHUg/2Va GdV+JWk2wMHeqw/1fY6o0NZLNsXAbdtoinSviZ/dfaiSt7yyZzNqNM0YRll6MMyzq9QhIl 7Goja8RCYWhj8dnFqZTyMxwYtMNBK7QmHd91C05L9FMlZllTtjmHXsvg64ps5o5ZltMxCP GNYwLOpQyz+BZTqRLofbE9hnSkKGnNpSBstdlVbfkghC+DdVsWcF5pvN0lDeb0pUSeLpHd zaUMwQotZYQcn7ceFPb4d7TjjvHlSy9rwbUW14Yk49c1Cc0pv0GPiZWJ4CmClA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fn4pmlznHN; Thu, 21 Sep 2023 17:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJfDO076676; Thu, 21 Sep 2023 17:19:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJf72076673; Thu, 21 Sep 2023 17:19:41 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:41 GMT Message-Id: <202309211719.38LHJf72076673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: af6aaa90057d - main - iwlwifi: re-attach to build after updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af6aaa90057d75644c41527acc903082104e4114 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=af6aaa90057d75644c41527acc903082104e4114 commit af6aaa90057d75644c41527acc903082104e4114 Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 17:12:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:12:01 +0000 iwlwifi: re-attach to build after updates While the build-breaking changes were only in the window of the two commits, 3e1f5cc9a81a..9af1bba44e1c, further updates restored some functionality as well. Now that we are done, add iwlwifi back to the build. This reverts commit b75d1ce6c10652fc4bfbf509deeae0e05c3d1356. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 1b4b1119c0f6..d2c5cc44705a 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -560,7 +560,7 @@ _mlx5ib= mlx5ib ${MACHINE_CPUARCH} == "i386" _ena= ena _gve= gve -#_iwlwifi= iwlwifi +_iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw .endif From nobody Thu Sep 21 17:38:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2gL1FMTz4tlBk; Thu, 21 Sep 2023 17:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2gL0kbHz3Fpd; Thu, 21 Sep 2023 17:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695317902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6bbZ9CYnpxcYV9LSjlGhUxF8NuwL2j8SxsoUqQudUL0=; b=xGLhGaXJ1MRZgonnn3bBXtNnwTZENZ0Sc8G9XXG1j4ccYpSUdkzTHM1EnAAEBXFUcUgs6b a63xG24Gj2UrII+lM429lXZFeHBiZzoC0YMDtOwswbBiz+VZ7Zm45f7v1cbFPHVEEi1Ary 6/TlIIKNB1QgjwKiQhS2x67tchwrXvPQEozL/LF0ioxuEiTtMdj1VQwoL998CQNhiv2mLL ZOC36FH8A3r46Cfa30+Y2a3QaX9t0+eBLVlzV+MW4nV33WUHbKTzzZbJxHhmzXV9A7Uvgl F/cTRPatJvYdBBrELI3WmIa4YBL3MgxvnqgYekvqLhs/BabjcIzbuXBgQifw3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695317902; a=rsa-sha256; cv=none; b=BedRGFXSa0N6CQ1nozWvAnsq9iaQzRXPkCqji4XsdiXTKNbQkCqOhNzUEF2tlGVUv/aWam jdO/Y4ptViq5tLxPTwNTYl20+BW+I9Mn6LK9D0oNJDYN+BVz+ig8pv1OqnFvSv+rYcmHeq vuzpykrss/OsuTZdb8fE17uQjJMGEixjHJuZHTBPFCmlaR5M1Em9AjVDHFCIuWs5WVTEZz 5wH/XPBUlYnqkkSw5tjYB4ESKlPr5iXeEmLOXW7qjFfzwHdrCxn3cGSDN4n3d/3b7uGCmg yGfWsXWjsJL7iSMF6UWt4/INfuNAASgu+fDWI2EwMp4dseDUw/2b5uEhcAB9nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695317902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6bbZ9CYnpxcYV9LSjlGhUxF8NuwL2j8SxsoUqQudUL0=; b=tpGUjoqlmCZlnyA3OlZTjOE+YS8lrQ7ZVrE1ykbk5i923MJW10povfq4mPUYVcPd4xK+x1 GU++ix8U52cwIWyPea+jx/jIqjQwU2oq44cXq9Acodldb6vH4E8svdoqgiH0u/MG14Kiu8 mDO1B+H66/rA5cn2kDbRnKac7q+mCmb1sN8b1cpZ7uDOBC16t2hIrfKN4wG71SCx2jEUyA 2x7ko9TaOsv74f3LPnP35HvmFGR/u98xxFiTetXlaoq/Now17j4BYrxF4DrkRhWs7uHnRN b/Ybhxh7lvLPBDTa9WNz/UYxs76NKHJbC06J05uAqHVuV3jgrgahP344pLU5hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2gK6vc7znXn; Thu, 21 Sep 2023 17:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHcL0Q009278; Thu, 21 Sep 2023 17:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHcLYA009275; Thu, 21 Sep 2023 17:38:21 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:38:21 GMT Message-Id: <202309211738.38LHcLYA009275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3f382eb23b9f - main - net80211: introduce two extra ieee80211_notify_scan_done() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f382eb23b9fee75d05276a44feb5351d956238e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f382eb23b9fee75d05276a44feb5351d956238e commit 3f382eb23b9fee75d05276a44feb5351d956238e Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 11:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:37:55 +0000 net80211: introduce two extra ieee80211_notify_scan_done() We have multiple problems with scanning currently, one being that an initial scan restarts itself and we are unable to start another scan. wpa_supplicant in that case never shows scan results. Starting wpa_cli you may see: <3>CTRL-EVENT-SCAN-FAILED ret=-1 retry=1 messages. Add two extra calls to ieee80211_notify_scan_done() at the end of scans (before possible restarts). That will get wpa_supplicant to get scan results and possibly start associating to a BSSID and get us out of scan. This is kind-of a bandaid but on short notice may help to improve the situation for some. Based on analysis by: enweiwu Submitted by: enweiwu (initial version) Sponsored by: The FreeBSD Foundation MFC after: 3 days Tested by: cy, (others I cannot find email/PR for anymore) Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D38661 --- sys/net80211/ieee80211_scan_sw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index 0aaa80a6c48d..62f6bf24d42a 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -388,9 +388,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, * scan_start method to populate it. */ ss->ss_next = 0; - if (ss->ss_last != 0) + if (ss->ss_last != 0) { + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); - else { + } else { ss->ss_ops->scan_start(ss, vap); #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(vap)) @@ -857,6 +858,7 @@ scan_end(struct ieee80211_scan_state *ss, int scandone) else vap->iv_stats.is_scan_passive++; + ieee80211_notify_scan_done(vap); ss->ss_ops->scan_restart(ss, vap); /* XXX? */ ieee80211_runtask(ic, &ss_priv->ss_scan_start); IEEE80211_UNLOCK(ic); From nobody Thu Sep 21 19:59:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs5pH0KNrz4tvkR; Thu, 21 Sep 2023 19:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs5pG6yy0z3VL5; Thu, 21 Sep 2023 19:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695326375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJ2HI1O8aDZKjsfB27bTm/dYnHF7GqxLKpmx/8O9MyA=; b=YOTw9P7awe0IwrRGOeOp+OUpYdX15KyhBOkY0SGQ6m7TPnZBXhnuslBaPsaHZMyWOAoxb2 j1oAkefHSOXS3U85741nEkGlxDy+dR6ql9zuAc6MjZJwqmoUR0epb20YZqPZJlW/hdjJrk RFypqMu6XEPt7La0VmzXyTVRc2CCnuaTZLHgPFxsncwImJdgV4fIHU/Ox/oF5eZ/7YVQ5w spglVwEtc+sGWhhI2VCyFs2hEAmenY/xuQ/l7244DwJlNniwOwMOPx0HVxX4NJkQEy+b/U 4mReOLRARvYKmlSB0H8Ics6eAiTPe2l38BcrWyNx3XVZywj+M2laBdlJlB2eBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695326375; a=rsa-sha256; cv=none; b=rK+BH2Q3Kyk0dv9OcXFy3A4I7Y6yKVY6xZJsg8DNAUVJTyC/S516iNqKN7tDYz0s8HPGLS jPB0V2qKF+WTms/QL3+ViWU26VrQ8FytdDot6eTHoQpyIcI2rtugXFv/RNPzsd4RYZhHNc 5UfL2bPgPXzLG7ReCpghYCzjCL8MmPTi7q2SUlCNG85WMP/tdkvZj2FNNMdEHmSsyJWmsJ 9c6Z1FJXus0NqcmsOy+zTYPna97/54WmVuDzC3Gy2ECc5C5puurkfEjwEHfxs4aMUjlkXA g/AV6DM/Pj4TxXXbUZyunkLDRyVuzutMM4HPNuZb9QFyiL/DHae8IgpkJMb/LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695326375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJ2HI1O8aDZKjsfB27bTm/dYnHF7GqxLKpmx/8O9MyA=; b=oMzJYahO4aO3Uq7ud3qFjroVLTGn/CzP+f+IFojap5aCAwbOVmJ1sLqhSaCF//d3rOv4VU pRQSVCPGk1VSrdKXhHTVpa3yuh4zD89oFs8StoprirAPbs4C8JESnqk6Ff9wkzeQj5g73w N29KvPAvcZrU3oBFFjY8ZUOXfJdKHcexRZLkjj2uZDvqqPBjnHO6vqVK5G1EjWP9tWTPSv xeH9Y3tipCncIieDhAgeVCO2rocZBYu/8olARcj/4I4tgMCZu1GUJ0cR1pg8YrmW9qq83n oo059GsByP/BykQmJdU59yyZZ6sx0lm0Y1vned1CBMa49eIDs15KMn5B6wkoxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs5pG5trfzsMd; Thu, 21 Sep 2023 19:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LJxY8d041374; Thu, 21 Sep 2023 19:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LJxYcr041371; Thu, 21 Sep 2023 19:59:34 GMT (envelope-from git) Date: Thu, 21 Sep 2023 19:59:34 GMT Message-Id: <202309211959.38LJxYcr041371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: da51e0f58638 - main - Add .mailmap to normalize some author data List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da51e0f586389de0063650343e264ae58116e3c0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=da51e0f586389de0063650343e264ae58116e3c0 commit da51e0f586389de0063650343e264ae58116e3c0 Author: Ed Maste AuthorDate: 2023-09-21 18:50:38 +0000 Commit: Ed Maste CommitDate: 2023-09-21 19:58:56 +0000 Add .mailmap to normalize some author data Some of these entries are due to commits with author email copied from Phabricator's mangled userid and some are just from changes to email addresses over time. Reviewed by: Mina Galić Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41931 --- .mailmap | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000000..3760aeece44f --- /dev/null +++ b/.mailmap @@ -0,0 +1,8 @@ + + +Mina Galić +Mina Galić +Mina Galić +Mina Galić +Mina Galić + From nobody Thu Sep 21 21:31:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs7rm4rgFz4v2J2; Thu, 21 Sep 2023 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs7rm4KL5z3dBs; Thu, 21 Sep 2023 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695331912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJtRxfbi0yFWdvLVUyw5xFhxGeb2+1AGmp9dUNBlxWU=; b=WsRy5SqNtEEVAlMCfxZccezAmexfo13ZFt40PhRgOJHsHCWQ6COjYQXT7ZkpoT29D98DpO K5tImBAOTuk9d1yYfd/vrg7TZPcLRwKa0iKlTUBzKPmbn2jTqv3oSFMQz4vsGLK1ImEpvO BnSjoWKQiZp+bhdyG/S7A7v4mq6VWLHulDd06qvoWmfl1nA2RPRE7FkLYkdsioL1ZzvPN6 SoGMbq6hO8XUi3Zhz3Mhqn9dO6gfKJ8PSueBOtSZNufkSYG4NB2BExPyf9ttViAhM9BZwT TAcC3JNRpWx3U4jvLfyuHX+ZntMFhZk4dHnXDWfYdQxdqzQZwjpQx6qXkHD9tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695331912; a=rsa-sha256; cv=none; b=wIukGUsPodKhG0HtKvJPxYidvodCXcgSu9iIZ2dchb3Zk4zoPdeS4/ZheCb2XkSKlXOukU XdmrF7LSlVzbfRtARRF0OoqScFLBfGks0Yj5obeGUVCuO6b4+h5jvn9xi46VMlPMvP5DpC RcTXo7OsdwsBBHoB0EN6fFmuueZ0dWUjSzZBmAlP7JJ+T4Vdx6EC3fKV5VWxJbUdGgmC42 8YTcMRHmslI9UM7f/nHFsLQobya7yTXPGiEEsiRFM5mYx+0dK7DOYdoALGMwvcURPk1IGE gG0ngYZGvbgeZP3liDgmWGlDxFyaF28m/j4YUYSm71fcRwGYZQjzNi2seCj4sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695331912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VJtRxfbi0yFWdvLVUyw5xFhxGeb2+1AGmp9dUNBlxWU=; b=dwgb6mjP8Z9Gthu6/bJIYbETElstf8LdY3VfdNpTMrOusZBIrw7K2DinU1IxsohroAIFpB 2c6HuKpPa+UvFXIEwj3T55OfwzLqXNq1SRA1FCa7mY56bjOkA5v988ns8h4LyFp5qj1brQ aymNq3sMo9KiNKFvCaXfY9HNWHNSWDASfSMCFh9rpuM1mqr9X7Hb1T+22zL981Pm2BlII3 5V4iZvL43mXaxH7iZ3W8G3vCjlTAUCgJSI7ZfqWjK3KRuvcmt1y24fdCm8kK8d6WzE6n/7 DCkD6UorH0JqW24xne2JDwjmCrOUi36ccudGngTmhmUGIYvmjMSKMbNdRI2j+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs7rm3NlbzvPP; Thu, 21 Sep 2023 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LLVqhg004817; Thu, 21 Sep 2023 21:31:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LLVqUM004814; Thu, 21 Sep 2023 21:31:52 GMT (envelope-from git) Date: Thu, 21 Sep 2023 21:31:52 GMT Message-Id: <202309212131.38LLVqUM004814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 7431b9928946 - main - .mailmap: normalize Mina's name in correct email case as well List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7431b9928946eaab57819c939bcc273823b984b7 Auto-Submitted: auto-generated The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=7431b9928946eaab57819c939bcc273823b984b7 commit 7431b9928946eaab57819c939bcc273823b984b7 Author: Yuri Pankov AuthorDate: 2023-09-21 21:26:45 +0000 Commit: Yuri Pankov CommitDate: 2023-09-21 21:26:45 +0000 .mailmap: normalize Mina's name in correct email case as well Reported by: Mina Galić Discussed with: emaste (irc) --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 3760aeece44f..273abae90fc5 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,7 @@ Mina Galić +Mina Galić Mina Galić Mina Galić Mina Galić From nobody Thu Sep 21 21:54:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs8MB5mFSz4v3DP; Thu, 21 Sep 2023 21:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs8MB5D6Tz3fN0; Thu, 21 Sep 2023 21:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695333286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8aMRfzSxqv/t4Y106gE8sazmzzseVhMDCmo0oTTEhc=; b=qoizc13uEtYKZvFmV59uUYS72jqDp/iX/RkgolMlmj74GrIXvTm7jE8KSDpcFKexk+4Ktk qIwY9vmKwrWIaqGgy7aYpwNMM8BzRtZ+xulc7zFJ9KnTKMClCjjJIiZuY6y5k1nnlVy6ni VoI9W+HtGYXVoL8ikEFu2hvn0gXsHTjVJNMCwziN04VRVuOhwnUFyImY1v8Z1wHbpzMm4/ LjUq3wnszxHX6Az4YlxjWSmSnklHr07s2gaUAxiDCuAISFOV+7IJFCgboWgh3mmlMEHsok mhn5ObduS/O3UO6QIq0UZM0L73iXvZCLN/sJHSXag+mJDnke0XAOuOTbM5Sl9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695333286; a=rsa-sha256; cv=none; b=tBQLd0wTgzI2C38WyRH4H2NKbY2bc+r3Z2itbD5c4zQ6VzYgMQAEIbfR/fh0JT37tlduPU GzceCRdqCyYZgvC9u+uBVYbtmttK7INtKgkZ7GrZs4DZb+ib+5yiJxwI1BPSRYdbekAFyO Z4ZCggG3pA4bWygsIfZCNNLEc4nxeE55j9vwpUQTOJOrURmageLAOlsquYtB9UFjfx4uFM 6uw8bmnzvQ7qJiKfNeU6Oz27tiFtcnGIRY+3KBulg19wBDXkcfoqs74GhfoxHAJ13swjnh dkOSOikFHzSuPAGmvDMjKab57/pQMsUTVsLjhL39LBZFCORVH5tVEICFP6AtXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695333286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8aMRfzSxqv/t4Y106gE8sazmzzseVhMDCmo0oTTEhc=; b=k2f1eDwhZaBxKTO8c1NwRMDHgyY9wp562+NOFerHdYPal4aMf1h9YjooooV0sbCVpqo5+W be8JiOtJYtKODnC8pjSvErq32KRpV0uBXFBZ4ywLXc8SIFZi/y2xaYcN4A5BhzaPm8TWSq QpSLuCDnydymJrAz/5lVtrc1SBrb4eWsp/aVjeTJ1wOmPSILyvvxo3asRM5qvRb9VhG2BA wwpo/kIIWh5hvRZ6GlAq7YGhFAiVJgovEaOWGqJ3PV4+UkPhldm0cS7+qr/k+LN1+MRGu/ N0QVjw+jSa8uGaKaD++q2pebh7iS0sIrPp3EdRofQHRrxbA8PjPigNXzEwrTpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs8MB4GVFzvr8; Thu, 21 Sep 2023 21:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LLskC9039847; Thu, 21 Sep 2023 21:54:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LLskEv039844; Thu, 21 Sep 2023 21:54:46 GMT (envelope-from git) Date: Thu, 21 Sep 2023 21:54:46 GMT Message-Id: <202309212154.38LLskEv039844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 242f31484276 - main - iwlwifi: Update iwlwifi.4 and iwlwififw.4 device list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 242f314842767c36eaaacca9f433c80d34def39c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=242f314842767c36eaaacca9f433c80d34def39c commit 242f314842767c36eaaacca9f433c80d34def39c Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 21:47:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 21:53:56 +0000 iwlwifi: Update iwlwifi.4 and iwlwififw.4 device list Update the man pages for iwlwifi.4 and iwlwififw.4 to list the current state of devices supported and which firmware they need. The list is automatically generated based on a sysctl added to the iwlwifi driver (so this is the driver's view). The reader should not be surprised by the larger number of any/any/any/any entries for PCI vendor and devices in the firmware table for which other matching logic happens. The reader should also not be confused about "TBD" (to be done) entries for chipsets which the driver already supports but have no (public) product yet. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- share/man/man4/iwlwifi.4 | 6 +- share/man/man4/iwlwififw.4 | 1002 +++++++++++++++++++------------------------- 2 files changed, 445 insertions(+), 563 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index b67f1d440bde..1cf61c0008b5 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021 The FreeBSD Foundation +.\" Copyright (c) 2021-2023 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2022 +.Dd September 21, 2023 .Dt IWLWIFI 4 .Os .Sh NAME @@ -178,6 +178,8 @@ Intel(R) Wi-Fi 6E AX231 160MHz Intel(R) TBD Bz device .It Intel(R) Wi-Fi 6 AX204 160MHz +.It +Intel(R) TBD Sc device .\" --------------------------------------------------------------------- .El .Pp diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index 82ee376aaa72..a377f6b51f78 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021 The FreeBSD Foundation +.\" Copyright (c) 2021-2023 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 3, 2022 +.Dd September 21, 2023 .Dt iwlwififw 4 .Os .Sh NAME @@ -52,1414 +52,1294 @@ driver. .% --------------------------------------------------------------------- .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c60 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c60 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4c70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4060 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4060 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x406a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x406a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4160 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4160 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4062 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4062 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4162 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4162 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4270 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4270 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4272 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4272 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4260 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4260 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x426a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x426a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4262 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4262 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4470 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4470 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4472 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4472 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4460 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4460 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x446a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x446a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4462 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4462 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4870 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4870 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x486e Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x486e Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6e Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6e Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6c Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4a6c Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4570 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4570 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4560 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4560 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4370 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4370 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4360 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4360 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x5770 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x5770 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4020 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4020 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x402a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x402a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0x4220 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0x4220 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0x4420 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0x4420 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc070 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc070 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc072 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc072 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc170 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc170 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc060 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc060 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc06a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc06a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc160 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc160 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc062 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc062 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc162 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc162 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc770 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc770 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc760 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc760 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc270 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc270 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc70 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc70 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc60 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xcc60 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc272 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc272 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc260 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc260 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc26a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc26a Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc262 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc262 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc470 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc470 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc472 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc472 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc460 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc460 Ta iwlwifi-7260 .It "" .It Intel(R) Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc462 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc462 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc570 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc570 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc560 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc560 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc370 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc370 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc360 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc360 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc020 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc020 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc02a Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc02a Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b2 Ta any Ta 0xc220 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b2 Ta any Ta 0xc220 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless N 7260 -.It 0x8086 Ta 0x08b1 Ta any Ta 0xc420 Ta iwlwifi-7260- +.It 0x8086 Ta 0x08b1 Ta any Ta 0xc420 Ta iwlwifi-7260 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0072 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0072 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0172 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0172 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0060 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0060 Ta iwlwifi-3160 .It "" .It Intel(R) Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0062 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0062 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0270 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0270 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0272 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0272 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0470 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0470 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x0472 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x0472 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x0370 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x0370 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8072 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8072 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8172 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8172 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8060 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8060 Ta iwlwifi-3160 .It "" .It Intel(R) Wireless N 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8062 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8062 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8270 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8270 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8370 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8370 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b4 Ta any Ta 0x8272 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b4 Ta any Ta 0x8272 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8470 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8470 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x8570 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x8570 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x1070 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x1070 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3160 -.It 0x8086 Ta 0x08b3 Ta any Ta 0x1170 Ta iwlwifi-3160- +.It 0x8086 Ta 0x08b3 Ta any Ta 0x1170 Ta iwlwifi-3160 .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4010 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4010 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4012 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4012 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4212 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4212 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4410 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4410 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4510 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4510 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x4110 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x4110 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4310 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4310 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3166 Ta any Ta 0x4210 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3166 Ta any Ta 0x4210 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x8010 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x8010 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3165 -.It 0x8086 Ta 0x3165 Ta any Ta 0x8110 Ta iwlwifi-7265D- +.It 0x8086 Ta 0x3165 Ta any Ta 0x8110 Ta iwlwifi-7265D .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2010 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2010 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2110 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2110 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2050 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2050 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 0x2150 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 0x2150 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 3168 -.It 0x8086 Ta 0x24fb Ta any Ta 000000 Ta iwlwifi-3168- +.It 0x8086 Ta 0x24fb Ta any Ta 000000 Ta iwlwifi-3168 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5110 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5110 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5100 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5100 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5310 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5310 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5302 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5302 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5210 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5210 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5c10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5c10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5012 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5012 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5412 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5412 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5410 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5410 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5510 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5510 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5400 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5400 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x1010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x1010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5000 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5000 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x500a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x500a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5200 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5200 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5002 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5002 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5102 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5102 Ta iwlwifi-7265 .It "" .It Intel(R) Wireless N 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5202 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5202 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9010 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9010 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9012 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9012 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x900a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x900a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9110 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9110 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9112 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9112 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9210 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9210 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9200 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9200 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9510 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9510 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x9310 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x9310 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9410 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9410 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5020 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5020 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x502a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x502a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless N 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5420 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5420 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5090 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5090 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5190 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5190 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5590 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5590 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5290 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5290 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5490 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5490 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x5f10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x5f10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x5212 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x5212 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095b Ta any Ta 0x520a Ta iwlwifi-7265- +.It 0x8086 Ta 0x095b Ta any Ta 0x520a Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9000 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9000 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9400 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9400 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 7265 -.It 0x8086 Ta 0x095a Ta any Ta 0x9e10 Ta iwlwifi-7265- +.It 0x8086 Ta 0x095a Ta any Ta 0x9e10 Ta iwlwifi-7265 .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x10b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x10b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x01f0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x01f0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0012 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0012 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1012 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1012 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0250 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0250 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x1150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x1150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x0030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x0030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x1030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x1030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xc050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xc050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xd0b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xd0b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0xb0b0 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0xb0b0 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9110 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9110 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x8030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x8030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0x9030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0x9030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0xc030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0xc030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f4 Ta any Ta 0xd030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f4 Ta any Ta 0xd030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9130 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9130 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9132 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9132 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x8150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x8150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9050 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9050 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x9150 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x9150 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless N 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0004 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0004 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless N 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0044 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0044 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 4165 -.It 0x8086 Ta 0x24f5 Ta any Ta 0x0010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f5 Ta any Ta 0x0010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 4165 -.It 0x8086 Ta 0x24f6 Ta any Ta 0x0030 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f6 Ta any Ta 0x0030 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0810 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0810 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0910 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0910 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0850 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0850 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0950 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0950 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x0930 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x0930 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24f3 Ta any Ta 000000 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24f3 Ta any Ta 000000 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8260 -.It 0x8086 Ta 0x24f3 Ta any Ta 0x4010 Ta iwlwifi-8000C- +.It 0x8086 Ta 0x24f3 Ta any Ta 0x4010 Ta iwlwifi-8000C .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x10d0 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x10d0 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0050 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0050 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0150 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0150 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x9010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x9010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8050 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8050 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8010 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8010 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0810 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0810 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x9110 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x9110 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x8130 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x8130 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0910 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0910 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0930 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0930 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0950 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0950 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0850 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0850 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1014 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1014 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x3e02 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x3e02 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x3e01 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x3e01 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x1012 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x1012 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8275 -.It 0x8086 Ta 0x24fd Ta any Ta 0x0012 Ta iwlwifi-8265- +.It 0x8086 Ta 0x24fd Ta any Ta 0x0012 Ta iwlwifi-8265 .It "" .It Intel(R) Dual Band Wireless AC 8265 *** 946 LINES SKIPPED *** From nobody Thu Sep 21 22:09:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs8h34V2Sz4v3hq; Thu, 21 Sep 2023 22:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs8h33hH4z3gJD; Thu, 21 Sep 2023 22:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695334163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJ2MmL6jr7fPRLV5hnKa+iO07UiUmMtNLyYItiejbRY=; b=VuW/hIT41OW+VmGDj95G8kV+CGo26TdJ8JB+VsrSIesVy2lgVI+OIwnVqtj7ysVdDLZtK+ v6K+liw3yqBX4H+u5Azxui07OX0ETeXWNkyRYSuvAO/OKH61akfJ7Qpd/FemRE/y/NPyFe eah7onYMMeP4q9ryYgbw4uz3Bp51Y5d1A597SBcZrir6/pxOToQOujwxKGHyN7XcSNJ//w +CuoSEZerGdA7HwObAqML94PNMRlnFh4Mph3F/B0D8WVw8iWi0aq0HZHl3tUDtVqDORacM nF8QUEaOG69FA0/eFcZBAa1HVFxqOBbri8PcEOwBZSxRyL4U/5DXOC39p8/Z8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695334163; a=rsa-sha256; cv=none; b=aybdthJbQzwaQ4OeFSIaiprAc457+MLv/9LvZn44h/+QNYjI/AUX+6K61yNeFCgtgr+8+B WGy3qENG8xKOwlWBqXtxMyhzLtHjwvZ3xv1dX4/6ckev8u7ci9Nqb8J9m4sWto7H0/bm2y mUZidljVwL+MdV/5Y8NutpKpPjLH1BCkLf4OYlvH+/oHrH7tVSINLqoH1tzuhPv2cpUuG5 lR4Cgl4zdgx32162VuVAv6EknN13aDcuVIGTFe9Wk8HGObjhAiOXBzFQQnE6Mj0LyEBGZx GGSeW70+FjKbO9k0vRXZa0w+sUybpzWZDecz4VZY8MC64/m5SSGl+0kaoHg1Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695334163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJ2MmL6jr7fPRLV5hnKa+iO07UiUmMtNLyYItiejbRY=; b=wO4ACejE+HHQ2CzeUP2LIKMz70BwEqQp488KAL4SXCQuSXhApTNx8XsZQgoeMoRDf5WRpt U86AvPDXWJvsdCZVBRxtGnbVJMF6nRxFKzbBr7GB0+A1QxGrIRQZe34klE200GozyZGRHr CPAImZfYIHnVwAW265UDz1rxVJClCoC0SKxCsbEW5KJuCsy12FFe20wC9k0mmYU7KsPrGs O15PfCo2CIjIE1Nzyl4dzT+jduHadzQUBoXY3xBm8hz+A7k/jl4WeeHlgf2YraJz0iq6mX bDfhHBzTgW9JSvtU4IZpCJ04SIPEFUtJrkg5BsdpctlPlGWIJUeXL2lw2LjXxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs8h32TxczvpD; Thu, 21 Sep 2023 22:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LM9Nxe058136; Thu, 21 Sep 2023 22:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LM9NMK058133; Thu, 21 Sep 2023 22:09:23 GMT (envelope-from git) Date: Thu, 21 Sep 2023 22:09:23 GMT Message-Id: <202309212209.38LM9NMK058133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0a22677bce28 - main - iwlwifi: local namespace change for sysctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a22677bce28bc9ad39f219b726b5791852d84ba Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a22677bce28bc9ad39f219b726b5791852d84ba commit 0a22677bce28bc9ad39f219b726b5791852d84ba Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 22:05:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 22:09:00 +0000 iwlwifi: local namespace change for sysctl In order for the FreeBSD-specific sysctl (which gives us a full list of PCI device IDs/names/and firmware prefixes) to be in the proper namespace add a LINUXKPI_PARAM_PREFIX definition to the file as well. The sysctl can now be used as: sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/pcie/drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/drv.c b/sys/contrib/dev/iwlwifi/pcie/drv.c index 3bde223e3f9c..0aab7a1fdc8e 100644 --- a/sys/contrib/dev/iwlwifi/pcie/drv.c +++ b/sys/contrib/dev/iwlwifi/pcie/drv.c @@ -4,6 +4,9 @@ * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX iwlwifi_ +#endif #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include From nobody Thu Sep 21 23:30:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsBV866Jlz4v8yq; Thu, 21 Sep 2023 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsBV85hc2z4N27; Thu, 21 Sep 2023 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695339056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2pZH2ABHu/HCEcGoMKjkHDP4A4El7NSdnXo5rcBY5Y=; b=FbSnfyj0qbQeneHupO8GAwARwQQN91AeYmrjfaJn+dcSyJ0pkkVpOgksa+c99CJLyAvTfL gwQl8AzQTIFsDFdsbee5q07P5ekZHjinhcTK7k+ocPtQ4myto4m9+uPWRNcs1VB9Cygogt k80z0gPgQV1bV0H40brXt/a3KvLe0n6I6zX3DO9YqD4C1ktnWweuloearviWlB7t3hxCm8 wJbLVOEgYfRgXH3oLQEHaKYjcQviD8LFM84O7rLhNnU7T8r/WBHKkTaa7eQDIhae6snKOG 3NFgkRSyEL4AH81pb5CJeErMZIjnZKydJ5iAQQH6mN/vNNOD9f26iUK18zr9/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695339056; a=rsa-sha256; cv=none; b=A6mvWda12b2S6PYeY7of3YtvhLUCu5ckTjMp5VoqmLGHkOXhjofAJdoJCSNzPonJE/rev0 Jmi2RFe4Ns5IgZrtkyCfGWZuCwGhMhvpjhCu+BeZK0hP1TGbx5Eh8h4PudRNWxTlKSmWah Z41E0ZsU2Abdw9AjDgU32xgKK4YpoBJ4D/08gQ8tMi9/Kyo+E8pB63X5T8DvCwtNwyrrTo xrsj/+zbh2+d72TLFbjfrB4MKCZoSxNzGy5rLjiMDo7UebrCRn6og1k+bqUyZi9CYi/5Fx qbVPRtHu1u9BSFT8osPhcFp+CEAM5jtfxo7UmmFbxICz4jR6pge6srs9yfWgaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695339056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2pZH2ABHu/HCEcGoMKjkHDP4A4El7NSdnXo5rcBY5Y=; b=Vq4Gdj/NfdHv3DUoIGOqczpcv35RBKiCIKojfgeZfNPw4zxWprKizR3HL78+eTfFEXADba HSSm9zmt55SEmKiQjKrBDnjNUKevS59FQYAuEPmIC1kaH2b+u/to92gmgts8ub+57tEri7 OABb8tQfS4jLPqCoYahiIK+i5VSrZwY29g5ADo7FXkCPlDyVP/jqScGDH4f8kxnF9Wo4+j z9fpGrzRE+236gjdrro4B4DGPESFv5KRnF/OBDvW7/nDiJIBpDpg+z6Bh1wJCyMJwKl50e +gzq9ytaW2ipAP+1zx8H9SupaGhNdgKd4YM2THZG/r/heYsgZ7jXXExCxupD1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsBV84lZhzyFW; Thu, 21 Sep 2023 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LNUus0003364; Thu, 21 Sep 2023 23:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LNUuAI003361; Thu, 21 Sep 2023 23:30:56 GMT (envelope-from git) Date: Thu, 21 Sep 2023 23:30:56 GMT Message-Id: <202309212330.38LNUuAI003361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ba793728a840 - main - rc.subr: don't require service to be enabled for `status` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba793728a840041e93e38bcbff4a7233dc63b722 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ba793728a840041e93e38bcbff4a7233dc63b722 commit ba793728a840041e93e38bcbff4a7233dc63b722 Author: Daniel Tameling AuthorDate: 2023-07-01 08:43:40 +0000 Commit: Ed Maste CommitDate: 2023-09-21 23:28:40 +0000 rc.subr: don't require service to be enabled for `status` For a service that sets an rcvar, there is a check whether it has been enabled before the actual command is executed. If the check fails, one gets a message to enable it and the returned exit status is 0. However, this is usually undesirable for the status command, which is a) supposed to check whether the service is running anyway and b) returns a non-zero exit code if that is not the case. Thus, skip the check for the status command. PR: 272282 Reviewed by: emaste MFC after: 3 days --- libexec/rc/rc.subr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 17ca904ff1e7..332718dc6f2c 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1041,13 +1041,14 @@ run_rc_command() continue fi # if ${rcvar} is set, $1 is not "rcvar", "describe", - # "enable" or "delete", and ${rc_pid} is not set, run: + # "enable", "delete" or "status", and ${rc_pid} is + # not set, run: # checkyesno ${rcvar} # and return if that failed # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a "$rc_arg" != "stop" \ -a "$rc_arg" != "delete" -a "$rc_arg" != "enable" \ - -a "$rc_arg" != "describe" ] || + -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then if [ -n "${rc_quiet}" ]; then From nobody Thu Sep 21 23:38:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsBfr5t4Nz4v98G; Thu, 21 Sep 2023 23:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsBfr5DfVz4NnG; Thu, 21 Sep 2023 23:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695339508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3iqvRISLp55MSlk9MkCNSo0TIeVHT/yGXMpwXQ20KUs=; b=SybsNFVOqiBdw0HkX5cafVpM5C5BDiUDf9C0H7mrwChbYvZF3NrEoKB0AtEa9SQukOUuNw p+D7jUqIU8SVMhDllT7GzmIku6b6sKUHqwdXA7bhLxTg7pKl/0IGXRiXnex5QUyrCkQOnW U0bv7AvbUoxfPfkWqKaqeQL1ckA55r0xGzfWBFB01S4guEFvX8Lv9G3ngTM3/y1u7fu1pC hmEUQKfXOCKdmuvm8Yl4Tfwv9eoqxwpvDxgKafsAIS3iFFUoX0LKsFbMuVIZcC/wftyS+f mFcDDFylICLZa9Gqxblt4QT0UsDd39c0z1sW/R8pw5/weHi2ikug1JonnJSxNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695339508; a=rsa-sha256; cv=none; b=rxlf0YIM3hPuwYVVxwpiimAHhxkneQJq9sLMASO05INA3/MJihQBYNqB/jBP8YnTM0I/IS 5KO5WGRIZpsCBDvZgsKK8H3kEKjRnPusFnqTeUlAorzN3kEiucVzxFESoOwYJqTb1ZqDNp V+XlX8GpvqL4cpU3fpR8zSTLeaJTZNJfwcGeUxfZboKeUV71RLHmB4MVlvpRZ0DPiSAFnK iumBFQxaEVjnKDmtcy1mngL61BNg7YUSNeLRY5LrC25Cwpcoq/ZDZlgu9UTO+KhemikYyM cv5iVkoLt/fJtOWWEKX4ZWzdvRzP9pBeEHaHso4tmoDPRagiBEIm+DV8egCBJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695339508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3iqvRISLp55MSlk9MkCNSo0TIeVHT/yGXMpwXQ20KUs=; b=YQF9keQT4PsnlklwWPCVF/i+DPOXQ5D9W6UIX3Yqr1lQ1fjuZ9Xn/p59kLdvRZQI9eyjbu bVoFDi/yKM6I/HuoTd8Jeh8pptVPIJyEFTckU+jUwRIUvhdP6iENzwgfwoLvhdbBsRXybN CnjDVlw+2IKtwnaKwrmOyXF5N6j1U5EFCFFWNdtASngZc9ZHYiH69HLCf8Xbcb4I+PWpbC bOmfiAPF9RsCVLoD4n2md9I8dW4PWF96iCHYmcuOQ4kf8V3vvFEGL+6t43oe3QE5N+SQu9 6Zdtu20WtnAsiOXwRR/Q9DFtvWaGg8TzOvSnozCk28n5ScpayWgKqhcpnBFRxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsBfr4BZzzyG2; Thu, 21 Sep 2023 23:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LNcSU3007514; Thu, 21 Sep 2023 23:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LNcSEw007511; Thu, 21 Sep 2023 23:38:28 GMT (envelope-from git) Date: Thu, 21 Sep 2023 23:38:28 GMT Message-Id: <202309212338.38LNcSEw007511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 7a0e9e3f8f3a - main - zfs: update share/zfs/compatibility.d to match current ZFS code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 commit 7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 Author: Martin Matuska AuthorDate: 2023-09-21 23:34:47 +0000 Commit: Martin Matuska CommitDate: 2023-09-21 23:37:38 +0000 zfs: update share/zfs/compatibility.d to match current ZFS code MFC after: 3 days --- cddl/share/zfs/compatibility.d/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index e60bd172dcce..13d88fef184d 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -22,6 +22,7 @@ FILES= \ openzfs-2.0-linux \ openzfs-2.1-freebsd \ openzfs-2.1-linux \ + openzfs-2.2 \ zol-0.6.1 \ zol-0.6.4 \ zol-0.6.5 \ @@ -42,12 +43,17 @@ LINKS= \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.0 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.1 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.2 \ + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.3 \ + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.4 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \ ${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \ ${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \ ${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \ ${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \ - ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 + ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 \ + ${FILESDIR}/openzfs-2.1-linux ${FILESDIR}/ubuntu-22.04 \ + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \ + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd LINKMODE= ${NOBINMODE} From nobody Fri Sep 22 00:50:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsDFy74V5z4vF6s for ; Fri, 22 Sep 2023 00:50:30 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsDFx05FXz4VWP for ; Fri, 22 Sep 2023 00:50:28 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=F6ybQSZl; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695343826; bh=5mLeiE6ABk42wVYJRdILvhWPZGvMnmgQSg5ZAlY6jdg=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=F6ybQSZlpnj9VE6dPHrwgkznfDF7jX3v07ZEUxq5frUz42VcScMKptHuEwab3rpBx5jTNi7hVJ51wRudH2USCADWHu3Vko+oJf0M0ThU3aF949InFCLj+bPvXduLzNC+/Jo7O2PU7wlG5i1yBNEgvpN2e+kIQoDRcQ+potl5lU1c6BvcTdYaS1V3kO7WrBYWpcCjRzVd8FdzBxGy/EAoyMgumIFAcoo8GAzhVG5VBz7ilh0jEo+p76wmG3tfKAG/zQVwnaF2J+J2vTMuY7F1PQE2smb2aLymUAXvY3Bryyivx7VM3arAeYvx9HRXK3oAOtkoD1GeoTdaMvvgXm/H4A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695343826; bh=h+H0kST8FTaALc51OblKfsRrkuzKWnPAdfVGJDSyzF2=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=su9UuCeX2dovFOo0igGETWn4FBMfyyKwf3d2qXZCTP5FsMYhzI+Ddkx7u64ORUBOGo0n5wgI0122AaAju8gK3RtRTBCEFi58EQHSUT9/jL606cL4JxdDZ5X3DjVbUtYBrmLsQhM/CjG5W5kLBUcS+ugGPiyiWf7aNvhRYwicskQUj1NNf5AGp4jpr+xxzUnhVAWmFh8oBA/KaCCVF4HGBcUZ7LpIoDCy0re91+3j+rVNLtr6k744WmYp52aQu4Yl/WN8WGTYIXoRe28RBYiTa+CrCQeoc2NQgfWNuh0qmTByt7N6AYXyp5AgvtiA4sSf0ekb/yb3sWL14zZ6igxxlA== X-YMail-OSG: PwifiE4VM1lvgZAfbpQE3MleuNPywylECE1c1pXe74obV6J1dwGEwkphKaJ4dQ0 vn_zZeLMRp9OYJfE09IMhiwADsCJp1Yqt2q0WgJ7A7eIEwmyqVmCFR1OqNhU6LE8emBrcFwoZMj_ kaG81B6DuhjbBHPFj9d7m9act5w7sg9kdjcFCIWby58GfH3ZIljhaiWiELUCFEqTJlf1g3KICfxK mW7IZBKMU5M3fTkbqmbqav440KUyAdWbQ7VNT0vF7IqPq3qAaop8HI9wd5Imaz9CwOcPDfGs_uxD 1Y.k7V6MerVSA_laKp4WDGfNY4Gg6de5ssrQNmXmt.Zya58JfAjgteHxWqueWsPg8ovgTvuUb0kG xYHA0Xoy40MUY6iMhFpvzx8xFYjZ416wfEOQ69mQWqKWlTZ6cy4oYF_fnQqqsCzenMf_fykW6LUo QGSFJ170thj7hlHftBlDMrnBqHoaffRfUDN.rhdfAcVRy.lgC2.90j1UoT9E4NQ03O5QF4U0pEz4 5FtIFXPlaOaUZA0elo_UPEdHVv84vVfmGXwxWFCn4KGqUH09QMJYTLrfpD7M1j4Vm_GzqgjvNEt1 QT_ZjYP5.rbuEYvCderE7pc8Hbvjc6oYI5Jfj3y9b0kAXumNlTJIpOukyQptquWND74Ei65QIN5J IMaiNYknJ5PPvkktwD03ETo6SxDjVwKdX4MP9o7VwXNUO.8pYN3BPqmzO3_DgHQnYGk7jhYLROee 5aSrb2ZxTrPwUP21Jw7x2OJZNsU6eGrXqRfdMOt_3.AIp2CAalLDPWITiQR96EMB9H8aenyvVOUa 58xVH33.JGnpwQTN9G4QIMXO.wRvzb1p0FrRWY3.XurHsmJXUuxkqIitf3acatMA0mcitNehy32q JKEX5VNLXQnuKGOsLfdrx4cgARt5ZJSVg0_hxqkZyixBBwIzb2VapnhTYXA1lNhzdJ39UDlTrJ8e 7PJkq61DzBIVi9CSFRRfVPQKszG7SCl45Ul1rn0yxs0LyBc4Rhdy1arhmdfz1122TZQsAum3g__1 k9jTYwPBgmp3MlK1acNl8F5YHJTJ.1cfUlMcJbxx0Z5d3NVD9z9a1CR29C4tPTUmN6JaB9Byy8AY i1Fs9UlF3gIXzZAfo3F0WfX.WVVHD9qVQA3UWls1OJtre7auPycJAwMFSMMHFxjZIGCWKtVcMYCc eYQaO7IM2HtuSMTv_3ML57DVZcXCP1o1iKiu7C5yet4gd9mDkwqNrKK2Qj14lnCFOfQc.o0onL5f ul3l2wpHyb2bpSH32gnEMSsNEa_Ham9xJRdWxNtHug0.8bZAiI0SF3UQsKT_EUd_6ktzw30z4Aze 3kKXTY1QHWXPJ8iZYjN2HhDtieHICPFQxovr_bNGWaIVZvquRwwAPGC4HIzgosEr_RrqZflaOJ9Z MKuw5Ion6hRPXIrfthOK9Y8Akwv8f2XTnehA2w.kZOYx8tjstDHgpQikrT5PfnTMeLpxh9MxyKF8 2EbyEe.46efx5jASSlRnAXng65_ysFkn5oup3roEb4G9imSyXbYF5YLKt_TMo3xEZkNRvP.V_kgs WlSgUpy2an8RCO6at0Xsa9U8RGxUmyKwRcHDkSE1HLCguNPH6UEbCWKgL1.UNIOsWE.js9O7j6ds UFBB35HmXmwVT9hiUpYEhobcKKeFLqsh9rhcvtWSoSN3Mv5Df_P8ZANKbVbEdjFxYQd7NVVbz8q9 O2oxICDyj.iLrOcnn47b4B84lDcjudUqON26AUpCMNWkyxMFoDuFvF7cbhln1Yo9SzOPojQEMjch 3fWskpY7krV3naYvGtP1W09bgN4Lpnip2baj.WxntRehSXAjFz3ymphjjxlb54oK.gQYVBkX0ILY aq0yYW.qQcbVwiZ57hJgjQrlDHoteZZHwDa2y3qWiDSL2g.Ko7s44BNdCRPFCS16rENETXJJLHl5 xMM_M2so39.cQHPARy0SWTZygQ6IBwmeZ4wVxT8PJ28fffIZeqs0DagEPS32xfQBp5ZTZ5rm42Hl YjhWkZ.nWznP3LN4i3DXYK.mvotd6pNugMMmZLU3bBLXIVEKqoLFdhtpCEbTJK4yl5z3GJmiunhc 8hOeESa9SpadLFkuCKo3TS5bdYIGuODPuwhZWn_AKfSybSPXhvxmeBj0A7nc5AnZnTu96v0K7rKn NzDTtLcxRrAfYqFWyP1fzKdThPRGtKbhM_ZeHABxdIykiDJ17Gg8.D_5vT3pjMqMfQyxWQyv1JwF Mptxlwko5oodppKWtykjEjonB2ECPnX_I.jeS9BPrD_oBCSC8eA9paYQDEdJNyLSqUwrwOePoQ2x 4ZQ-- X-Sonic-MF: X-Sonic-ID: 319e93f3-bdbf-40b9-bbd1-4c7caf0da0d6 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Fri, 22 Sep 2023 00:50:26 +0000 Received: by hermes--production-gq1-77657878bb-67x6k (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID e1161ec4ab89b08b1f1c8509ef7ad260; Fri, 22 Sep 2023 00:50:26 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: RE: git: 7a0e9e3f8f3a - main - zfs: update share/zfs/compatibility.d to match current ZFS code Message-Id: <06C9888C-D477-4160-A67F-83D5604A2106@yahoo.com> Date: Thu, 21 Sep 2023 17:50:15 -0700 To: Martin Matuska , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.700.6) References: <06C9888C-D477-4160-A67F-83D5604A2106.ref@yahoo.com> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.70 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_SHORT(-0.20)[-0.197]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.147:from]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RsDFx05FXz4VWP Martin Matuska wrote on Date: Thu, 21 Sep 2023 23:38:28 UTC : > The branch main has been updated by mm: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7a0e9e3f8f3a9379df793284f719f1a7= ee5734c2 >=20 > commit 7a0e9e3f8f3a9379df793284f719f1a7ee5734c2 > Author: Martin Matuska > AuthorDate: 2023-09-21 23:34:47 +0000 > Commit: Martin Matuska > CommitDate: 2023-09-21 23:37:38 +0000 >=20 > zfs: update share/zfs/compatibility.d to match current ZFS code > =20 > MFC after: 3 days > --- > cddl/share/zfs/compatibility.d/Makefile | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) >=20 > diff --git a/cddl/share/zfs/compatibility.d/Makefile = b/cddl/share/zfs/compatibility.d/Makefile > index e60bd172dcce..13d88fef184d 100644 > --- a/cddl/share/zfs/compatibility.d/Makefile > +++ b/cddl/share/zfs/compatibility.d/Makefile > @@ -22,6 +22,7 @@ FILES=3D \ > openzfs-2.0-linux \ > openzfs-2.1-freebsd \ > openzfs-2.1-linux \ > + openzfs-2.2 \ > zol-0.6.1 \ > zol-0.6.4 \ > zol-0.6.5 \ > @@ -42,12 +43,17 @@ LINKS=3D \ > ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.0 \ > ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.1 \ > ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.2 \ > + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.3 \ > + ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.4 \ > ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \ > ${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \ > ${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \ > ${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \ > ${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \ > - ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 > + ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 \ > + ${FILESDIR}/openzfs-2.1-linux ${FILESDIR}/ubuntu-22.04 \ > + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \ > + ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd > =20 > LINKMODE=3D ${NOBINMODE} openzfs-2.2 lists: redacted_datasets redaction_bookmarks edonr draid that are in the modern for_read_obj list from zhack : com.delphix:redacted_datasets =3D 0 com.delphix:redaction_bookmarks =3D 0 org.openzfs:draid =3D 0 org.illumos:edonr =3D 0 but stand/libsa/zfs/zfsimpl.c 's features_for_read list does not have matching entries. I do not know if this is a problem vs. not. Without comments about it or the handling for them for features_for_read , it looks odd. The features_for_read list does include 5+2 "READ-ONLY COMPATIBILE yes" items for some reason (5 for_write_obj list items + 2 others): "com.datto:resilver_defer", // READ-ONLY COMPATIBLE yes "com.delphix:obsolete_counts", // READ-ONLY COMPATIBLE yes "com.delphix:spacemap_histogram", // READ-ONLY COMPATIBLE yes "com.delphix:spacemap_v2", // READ-ONLY COMPATIBLE yes "com.delphix:zpool_checkpoint", // READ-ONLY COMPATIBLE yes and (no for_*_obj list matches in zhack output): "com.intel:allocation_classes", // READ-ONLY COMPATIBLE yes "org.zfsonlinux:allocation_classes", // READ-ONLY COMPATIBLE yes I assume that these 7 are not harmful beyond being misleading about what should be expected to be in the features_for_read list. (The comment notation is my addition for explicitness in this note.) =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Sep 22 01:47:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsFXH0xr0z4vHxM; Fri, 22 Sep 2023 01:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsFXH0KJ9z4brV; Fri, 22 Sep 2023 01:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695347279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pD5uSY5tw4ddPGJnYdnuUbJo8YWi2VsoNYfJCZzeU10=; b=fk9+kLnNLLaip+JpcJSWR+vZuBDzUqnGqEMXmntWOIjJxdWoEPqzMhDgZ00Yp+n6JUqTOv LJgeL3+69HCeTCM5sr4CjgGNaym1uE97gqgrRTiq8OUDutxtOPI/DKfOuNMCnZsWtMslzx NEIp/SSTLCuuj+G2YDOmuPw9NZn15SabOe5R/Z9NHGGVH/GNyV/MKQFJGy1DX7g19SRo96 aD1BpFphEuMZK3RwCp0wHxi4DgPEtyWf4C+k8uHMwBN8CNbU3aIui9oHNHqsXWxJCCzr5X fQwsjrnqLVjM+7fG9QEekFAuGHuJ7rPyXD3fBv3d9B0ncIE5pYY3oNHCyMJy6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695347279; a=rsa-sha256; cv=none; b=a6XDweVWYnH8YtkTOqbCm2faLhTh/U4WA+ksKOzC+rvSgAPVUdGmFESgpbzIz95WhJRWJY xEm06zmTQI0L9IvF1dbKg7VOjxYIbeWG5k1UQ6dAW2EiTyDWVOq+qh1IaivBrJQCqPJzaa BjnAStEbspdRBPHhsmfybtHJBX8nlGGWYKvs/L0bxkjYvk3fEbnvhTXJAPhSs/YxuulGDg nM+PIOliC0sU0rQ0Q3J1s9E/f7oZRHdnCDM2PNFdvhJzWP9/T/KCt4Z9uvCNQ22aL/BkUL /ldUR7zFPB1LRK1Q99BaR7Z3/BdOLRoANvFKkxDDMaJActqIKUM4iHUwmfwieg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695347279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pD5uSY5tw4ddPGJnYdnuUbJo8YWi2VsoNYfJCZzeU10=; b=RRWQHWdE4qqkVy/QVoFZki9B+XQIijlrdGastfVcd2HqMBRi6IWikJnlzmr1s63j52CL6O 1bYqsxgxTE9f2C1MiAsLwtfiJww2GewnRLf6XFbQ4bvUCcdJoo8eQoZWmamp6guFzkwz2v oFr51VIcwGrmgrEMkVK1ldJQceeAKNgLqleKTBR4YgTs5ZJuu8Pl5jZhdVLvWJQ+ddaaBm b177piScn/plRnXk4cOh+APsLqTfSutMyfmVnbiv/sC/0anta32aMSoo2l6g6HGwzNcxa1 ghBl0XNJ87iuTbncvNjuoyueysK4uTJSBboqsAJaW0lvP7LXaWg8HoFjU8ItUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsFXG6Ns8z12S0; Fri, 22 Sep 2023 01:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M1lwck022134; Fri, 22 Sep 2023 01:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M1lwKO022130; Fri, 22 Sep 2023 01:47:58 GMT (envelope-from git) Date: Fri, 22 Sep 2023 01:47:58 GMT Message-Id: <202309220147.38M1lwKO022130@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 633094c27f0a - main - libprocstat: use elf_getphdrnum rather than deprecated elf_getphnum List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 633094c27f0ac1b1001d5bd24a883240b4bce1dc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=633094c27f0ac1b1001d5bd24a883240b4bce1dc commit 633094c27f0ac1b1001d5bd24a883240b4bce1dc Author: John Hein AuthorDate: 2023-09-21 23:43:05 +0000 Commit: Ed Maste CommitDate: 2023-09-22 01:47:26 +0000 libprocstat: use elf_getphdrnum rather than deprecated elf_getphnum PR: 273966 Reviewed by: emaste --- lib/libprocstat/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libprocstat/core.c b/lib/libprocstat/core.c index dea078c848eb..cf3435a10c79 100644 --- a/lib/libprocstat/core.c +++ b/lib/libprocstat/core.c @@ -119,7 +119,7 @@ procstat_core_open(const char *filename) warnx("%s is not a CORE file", filename); goto fail; } - if (elf_getphnum(e, &nph) == 0) { + if (elf_getphdrnum(e, &nph) == -1) { warnx("program headers not found"); goto fail; } From nobody Fri Sep 22 06:11:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsMNM6nPFz4vbLD; Fri, 22 Sep 2023 06:11:31 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsMNM2KL2z4Jym; Fri, 22 Sep 2023 06:11:31 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="H/Gm5cTn"; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::42c as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-690ce3c55f1so1398837b3a.0; Thu, 21 Sep 2023 23:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695363090; x=1695967890; darn=freebsd.org; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+86saEjcSO1KqYfBIS0VZcKS1gE6tAnIqkjjYmAQdKs=; b=H/Gm5cTn+oQOyj8QmLa/C3erFAnp2tAJF2AqW5gvfuHGMBiu7SFqu4e6vyLFxKjUNN lksjdrV32e2OXZrKX2XCPZJoE8p3W128EuA83R2g/09RkB+6g7cAqzVVqyjqShFQNWbR 0tVaIlvk+qjD8ECDaJzR8jPUxImlsYJX/GHwrxL1z6NZkwaDVbox7K3VC6e33/zMPKRt OXtgQJWTKe8DzZTGv3FNok0JR8VgC9bQ36HUExiV06PA4xuZjY/x0zIW4V7fo1NB/vwE fyztG8V+022GL0r6Lm/WEXMvECGzU8lLgixjxo9E5grse1CT8OV2MWGbw9ntDaWSKmYQ ICIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695363090; x=1695967890; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+86saEjcSO1KqYfBIS0VZcKS1gE6tAnIqkjjYmAQdKs=; b=N/GtLSkVTlycnHYZZDkCSRL0J65+VqGeZnqk0SKrJ0HaAGwZNL8gYth9ApEDHf5Zby fKqxqeDZxltMgZIAjAzPE+EZuGitaYf77tz6hajW4dcPdZ3lqizLu4xT0CImQjN/PjrR BFbNZdGJoTQcgC2fPOytPt1dCdu44QLWSc9kAOMPPyXSTpmFYQ6mw+bJPLDgtfNlORjk s+dStRpDWgLdbF5KM4+hcIduettCU9kyv9lOC7bPtbg3QY19g6xksgfHG1+q9ghL3p9Z B/BNgdDRWE5GshSGveLEEGcr1VnWbqbxZZcMGO5wVEsM/SijRi9QoprKT7zosbyWRCaV 9RZQ== X-Gm-Message-State: AOJu0Yy+SlPDSoeFDeT+bKuceSCtVjEcM8cQ+alclse2x4VgAoSvODQ2 R1MJovjB4+GuWQM/syXrLHc= X-Google-Smtp-Source: AGHT+IFVfFdu7SzIlpdHyhhwrikXNwjbUld5YBA8gd4x310lxOLZ5cqnFs/Bodlmldi6nUsFFlh/Qg== X-Received: by 2002:a05:6a21:4881:b0:154:90ba:70e with SMTP id av1-20020a056a21488100b0015490ba070emr6406940pzc.48.1695363089728; Thu, 21 Sep 2023 23:11:29 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id u7-20020a170902b28700b001b9ecee459csm2580796plr.34.2023.09.21.23.11.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2023 23:11:28 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_183ED756-264A-44A9-BEF3-F1BE47BA6609"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: ea82362219ee - main - tests: Skip all tests that require mdconfig when /dev/mdctl missing From: Enji Cooper In-Reply-To: <86wmx5scmd.fsf@ltc.des.no> Date: Thu, 21 Sep 2023 23:11:26 -0700 Cc: Warner Losh , Warner Losh , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Message-Id: References: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> <861qfdtsqh.fsf@ltc.des.no> <86wmx5scmd.fsf@ltc.des.no> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.56 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.964]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::42c:from]; MID_RHS_MATCH_FROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; HAS_ATTACHMENT(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCPT_COUNT_FIVE(0.00)[6]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RsMNM2KL2z4Jym --Apple-Mail=_183ED756-264A-44A9-BEF3-F1BE47BA6609 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Sep 4, 2023, at 5:11 PM, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > Warner Losh writes: >> I've not been good about sleuthing out these meta-data variables. = Where's the list of >> them kept? >=20 > atf-test-case(4) >=20 >> Also, is there a canonical way to say "I expect this result, except = if >> I'm in a jail, then I expect that result"? >=20 > I don't think so, but it wouldn't be difficult to add a > "require.unjailed" knob, or a configuration variable which indicates > whether or not the job is jailed. Doing that requires plumbing the option through kyua as well. It = involves a bit more work=E2=80=A6 Cheers, -Enji --Apple-Mail=_183ED756-264A-44A9-BEF3-F1BE47BA6609 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmUNMA4ACgkQ5JFNMZeD GN51eA/8CyffyIgDfroWbjaX7xsQOUsXgA0fNz68Us00l+ootKzoqWdo1eVCR41f OO9deyUSbLMPFLoriTfjZOBTCN51HsgQHAX7NrC8zY+EeByJHn51gmKIXO32YEKi We5sdBbAeKpPRi2IWvQUxribJR4DG/WPHQq9AD0IFeFYl1PnnLwFaGCYKQOi3NWc OAgbne7zPPlCmyWeMNoKeqQx2OTg2b0BEJvXoe+KaROA76KSeraLrrfNDYjB2Bdy jhLohuPb4RKp1h1qRsObMRkx6fp+w+eT5m5xdvL6F5sKAMDT5MDtq77zbr5W7fds tMw+aT4NMPAPHUvEIHtATQ8uvQzojIMO6cfJHhOrUCaqF+TLiWACp3GR3oEx3QCN t9WP3bTpRHtkCvkgmHSVic3AyFdt0tuFeQTM0Q2Rnla0wxp4+UHK09tvxzFLPzVN 3/ORHJUIkrW+soIgmhRLIgPtGiEiFY4MNKolPtV7nl/mztfBsKheQV2HP2YMPs4r qb1MHsuD2SwUtvBMMcnb8q1N/s8Avi6DsOtvj1RwBDZ23HpkMxtPh5HAUB5uQnws odOItP1JAMsW2yxUTMoWQBudAQTcITInZHmPvy2ujcybOgaxs70wft1YTtQleNf8 vcltndDA7s+pgGPAA0VDYgGBYhVO4uYawbx5xGJ5RT8OarL3q3E= =827d -----END PGP SIGNATURE----- --Apple-Mail=_183ED756-264A-44A9-BEF3-F1BE47BA6609-- From nobody Fri Sep 22 07:56:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsPjd4yXlz4tT11; Fri, 22 Sep 2023 07:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsPjd4J30z4WY6; Fri, 22 Sep 2023 07:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695369397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxKMHA5DuFdT5YMSsSOyXxHXkgg8F35APILgZ0b89Y4=; b=SLUljwN7h1LHF0dqAV/MepEpsw1ORUgPhS+rvdDLiKc9dNJRZP8/LqDr+UlhmNkIuNcmSP XDNUPFWFW/Y8l+fIiLhG/eVkinELEATPLAq/0dhsM/loN+Nq1hPcFWEwCzN1hoUl95byvX Xw+G7xwjArkbRzpD2R1nOQd40RJmdE+zTiVGyG2RCGbGtiDySQLwe/57/u29sfmwkQqyMt ol3mFWtknayKt3mK6EJXiIRpDtoedEdsmPLSIOeHAE6X0JVAK3+ISxZ6JKacKilQdraGBc wMeI9aUjJA59Lh/grxQpEiRsY8jGS4yIZA7AlR8tAr+KKUOLX+uWiBPfoBg/iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695369397; a=rsa-sha256; cv=none; b=qXZr+dJL63hUMXK6TXAXWKEMMWxrgqSE6ZVu0EZrZTvVxgrv+3N2TW8JKgtDcX0mZ3EPEf WLAsMHZm5zbOhq5Ti6k8p+eDTXIBhvKlWgINjKL5SG8EQAs/iiWZfYjl69X9rtclN/3h6s DUnKUQi0lJNsyGqCeETtBVs+6cDMFEh6wPGU+adJK+03L7JjUEO9xYYv3YZbVpPVS52nvT eEp0atWM8xjwL1sqOHvkTEd9/l2WlBjhb5Z0T1Gj9UR5a3cmY7gpBGF3bgZHUb009pMoev 4SXGyFit8lyoeiXuVarqbRZ5+ZEbDY2bQOBVXMzVawLC5Bv23jL13CAeF3uPXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695369397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxKMHA5DuFdT5YMSsSOyXxHXkgg8F35APILgZ0b89Y4=; b=kLp2q4IVicMuba9SKRAb2Vr/XJIEO/vx50IeJS32TDfq9b80oUDDfz8ug0x6yO7cSw9eg4 1YGmzyMpJofpa0s8fV+m4xnqvIHtnIuqgUEow+NwoJOjaUxdXFVaXO1mkydGxpgQdtHibm gzef3WUsXWFl1za4woZvdwgz82hHm0DntaiuDJsufuIqz0BXn8aUGSHW4GdMG3RIWIytpm K26eddDCsC5OEyaUB5Z/hjkRRh8TqAjMCiHlT9YV/hm3N9sBjx4QLbaEp8Fygk9ZABtO0r Uu0aQilFSMJvkKJ4xcbvKL0tukZ5gJcWMUBRtiwOOAArG3l3CG0qfPAAETx8Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsPjd3LFvz1CsX; Fri, 22 Sep 2023 07:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M7ubWl048890; Fri, 22 Sep 2023 07:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M7ubGl048887; Fri, 22 Sep 2023 07:56:37 GMT (envelope-from git) Date: Fri, 22 Sep 2023 07:56:37 GMT Message-Id: <202309220756.38M7ubGl048887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b653faaa19c4 - main - Remove mention of defunct mailing list from acl / mac man pages. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b653faaa19c47a4a7e488e5ead738b7ae44ffe8b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b653faaa19c47a4a7e488e5ead738b7ae44ffe8b commit b653faaa19c47a4a7e488e5ead738b7ae44ffe8b Author: Dag-Erling Smørgrav AuthorDate: 2023-09-22 07:42:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-22 07:43:19 +0000 Remove mention of defunct mailing list from acl / mac man pages. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41923 --- lib/libc/posix1e/acl.3 | 7 +------ lib/libc/posix1e/acl_get.3 | 12 ++---------- lib/libc/posix1e/mac_free.3 | 8 +------- lib/libc/posix1e/mac_get.3 | 8 +------- lib/libc/posix1e/mac_prepare.3 | 8 +------- lib/libc/posix1e/mac_text.3 | 8 +------- 6 files changed, 7 insertions(+), 44 deletions(-) diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3 index c74b92028c6d..4c5f232a2e6a 100644 --- a/lib/libc/posix1e/acl.3 +++ b/lib/libc/posix1e/acl.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 8, 2023 +.Dd September 21, 2023 .Dt ACL 3 .Os .Sh NAME @@ -286,11 +286,6 @@ POSIX.2c describes a set of userland utilities for manipulating these labels. .Pp POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion of the draft continues on the cross-platform POSIX.1e -implementation mailing list. -To join this list, see the -.Fx -POSIX.1e implementation page for more information. .Sh HISTORY POSIX.1e support was introduced in .Fx 4.0 ; diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3 index 1908f0d0d97b..91a3626ada72 100644 --- a/lib/libc/posix1e/acl_get.3 +++ b/lib/libc/posix1e/acl_get.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 25, 2009 +.Dd September 21, 2023 .Dt ACL_GET 3 .Os .Sh NAME @@ -151,16 +151,8 @@ The file system does not support ACL retrieval. .Xr posix1e 3 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion -of the draft continues on the cross-platform POSIX.1e implementation -mailing list. -To join this list, see the -.Fx -POSIX.1e implementation -page for more information. .Sh HISTORY POSIX.1e support was introduced in -.Fx 4.0 , -and development continues. +.Fx 4.0 . .Sh AUTHORS .An Robert N M Watson diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3 index 987bd9966564..4ed68b70f3a3 100644 --- a/lib/libc/posix1e/mac_free.3 +++ b/lib/libc/posix1e/mac_free.3 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 21, 2001 +.Dd September 21, 2023 .Dt MAC_FREE 3 .Os .Sh NAME @@ -67,12 +67,6 @@ function. .Xr mac 9 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion of the draft -continues on the cross-platform POSIX.1e implementation mailing list. -To join this list, see the -.Fx -POSIX.1e implementation page -for more information. .Sh HISTORY Support for Mandatory Access Control was introduced in .Fx 5.0 diff --git a/lib/libc/posix1e/mac_get.3 b/lib/libc/posix1e/mac_get.3 index 45045977fb32..171f7cd91aaf 100644 --- a/lib/libc/posix1e/mac_get.3 +++ b/lib/libc/posix1e/mac_get.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 21, 2001 +.Dd September 21, 2023 .Dt MAC_GET 3 .Os .Sh NAME @@ -136,12 +136,6 @@ is not a directory. .Xr mac 9 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion of the draft -continues on the cross-platform POSIX.1e implementation mailing list. -To join this list, see the -.Fx -POSIX.1e implementation page -for more information. .Sh HISTORY Support for Mandatory Access Control was introduced in .Fx 5.0 diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3 index 58493e988a0b..50dfa1c28d2d 100644 --- a/lib/libc/posix1e/mac_prepare.3 +++ b/lib/libc/posix1e/mac_prepare.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 22, 2003 +.Dd September 21, 2023 .Dt MAC_PREPARE 3 .Os .Sh NAME @@ -108,12 +108,6 @@ respectively. .Xr maclabel 7 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion of the draft -continues on the cross-platform POSIX.1e implementation mailing list. -To join this list, see the -.Fx -POSIX.1e implementation page -for more information. .Sh HISTORY Support for Mandatory Access Control was introduced in .Fx 5.0 diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3 index 88131f0bf611..29c1aacca485 100644 --- a/lib/libc/posix1e/mac_text.3 +++ b/lib/libc/posix1e/mac_text.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 21, 2001 +.Dd September 21, 2023 .Dt MAC_TEXT 3 .Os .Sh NAME @@ -101,12 +101,6 @@ to allocate internal storage. .Xr maclabel 7 .Sh STANDARDS POSIX.1e is described in IEEE POSIX.1e draft 17. -Discussion of the draft -continues on the cross-platform POSIX.1e implementation mailing list. -To join this list, see the -.Fx -POSIX.1e implementation page -for more information. .Sh HISTORY Support for Mandatory Access Control was introduced in .Fx 5.0 From nobody Fri Sep 22 07:56:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsPjf5kwJz4tT5R; Fri, 22 Sep 2023 07:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsPjf5HlVz4WmT; Fri, 22 Sep 2023 07:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695369398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYyqSK4MGb6wKfDl8kWaY/GWnbpRiW9DGGVcPZIT1V8=; b=VYK4P2ih7AcEQ1+Sjj5IG//yT7ErjjOKlCWCSIFLt5EZTg/fteOQFp7XUQG2hJZMXzVviQ OCxdMwsg7+qJQWcE8Vwuy/OdP1zWq34gT37hT+6E3bAcWF7JcZn+WFm8o6RgIzKkccU33I pGT+bZPfqo9i/yy6znRjmkMo19VRIFFe1H6CTDnFguH+76lHj7vpjU0c6aFPX5JcqeZ30z u5DHb6ysGYSZk/EztmBO6Ns36N4TvnJM8/XGybo+5qPbgCgbyEJcL3PhjY3DOtvk8zlqrp HO3sdceuaPalbo0e9Ls3hM72Tcli9aafFeSO7pPYL1mI+TTS5fAh17BcNFt4lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695369398; a=rsa-sha256; cv=none; b=YauV2oO5bHSHJNnBf+Tmv9ijJHczlispBGuEhTXRhrINan/S0gzpBB+0L2K+P0FQNH7ZG7 ICKPjuYZGu9lGbdn1rPZ4WtkWSXYZ1tLhlOKub3Ko0LDFoskiT2GqsZ6S/5Z2zc2Br9FdM XtFuVagr6JTzZPWRqV2v1DgG3NaI+o5q1mWDkP+KaNa/D9S7x1mf/UmZffYYIu+6SFBj68 ocqNsARYX+WnvrTX65cdBpjr6dCIMFHNCAzeBR44qx9kq2zxAy9OgzOaOAq+p5KfYR8svX GWcHP6pZ5cK3hbx7AIlcj/QkYL6OisW3Wnd0OjDkeEp0V071GmaeSo8qHHTDKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695369398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RYyqSK4MGb6wKfDl8kWaY/GWnbpRiW9DGGVcPZIT1V8=; b=mgJVfgSlX8wdWl5cSH8d4Jy41fLcfkOWBBxePiJoxpgaB3LWNbeZwVdjBLQ5C69nHwMija cDIdchFqG+i+JN5YmNu1xYDEqaCE36lCT9O5tnktLOVhvl7DQmQoQCAVUr2OMBBzd++zX/ xQFktmZLUxNctP7P4tN5ZlS9B6x/xbK3zHjFdKro8MTFxpJZREEwj92SJ6KdFVPY9DNCWN TuEK8ZerVkQnE47sobMWsvw05gq68nKoC4fh8UHSWqd9wvklkgWb2UcUPJSDTMUashnZVN 0wx4sYJMyejQ5XcEIZ6kuNkCZzct1gHdXMzZ8H+akH9RrVZHOYv4AsPkCBH8Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsPjf4Jytz1Byw; Fri, 22 Sep 2023 07:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M7ucgB048938; Fri, 22 Sep 2023 07:56:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M7ucvr048935; Fri, 22 Sep 2023 07:56:38 GMT (envelope-from git) Date: Fri, 22 Sep 2023 07:56:38 GMT Message-Id: <202309220756.38M7ucvr048935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c34fce8a0399 - main - Fix typos in acl_get_entry(3) manual page. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c34fce8a039935e06ed84db1395d7d2c551e5a7c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c34fce8a039935e06ed84db1395d7d2c551e5a7c commit c34fce8a039935e06ed84db1395d7d2c551e5a7c Author: Dag-Erling Smørgrav AuthorDate: 2023-09-22 07:43:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-22 07:43:19 +0000 Fix typos in acl_get_entry(3) manual page. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41924 --- lib/libc/posix1e/acl_get_entry.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3 index 1c6126334fa3..94a95b5412b7 100644 --- a/lib/libc/posix1e/acl_get_entry.3 +++ b/lib/libc/posix1e/acl_get_entry.3 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 13, 2001 +.Dd September 21, 2023 .Dt ACL_GET_ENTRY 3 .Os .Sh NAME @@ -42,7 +42,7 @@ The function is a POSIX.1e call that retrieves a descriptor for an ACL entry specified by the argument -.Fa entry_d +.Fa entry_id within the ACL indicated by the argument .Fa acl . .Pp @@ -100,7 +100,7 @@ will be set to indicate the error. .Sh ERRORS The .Fn acl_get_entry -fails if: +function fails if: .Bl -tag -width Er .It Bq Er EINVAL Argument From nobody Fri Sep 22 08:19:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsQCz5xH7z4tVj6; Fri, 22 Sep 2023 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsQCz5QWcz4dF6; Fri, 22 Sep 2023 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695370767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIbZaHueCzinhfQLHseQZc/8l9zNnQKNsEiJ+YjK008=; b=K9NJKVkDZIT5LGVgBOV5sYFA/gkwPFsiPSM7bRBxVYw8qkmHay0TG5TtDqRx3Mm45pIykn 5J8clKxO6oiZEIstxjf4mjpLuV6eaQM/QjRV2UAUOtXd4ptYorJS3vtPIEo6eR6b58MYwt 9Ip0AW3Moq+alf5Pe8fXCpOMDihXMmm4g+QbKyGcY99sza+Zz787A2LviJoFRqFRIcT5Ux HN0y5w9+hpOwW91GDiGGbje3AcEerul3l+lZFDdhTa4gsEhLJHwpGdePY77zUZmpqAA0qk c4D7mPmseRBOfMlpIaoFrKHqC4+xaQqmyCu+Pq8nh5LG5bCfb/KEMtDH8m243A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695370767; a=rsa-sha256; cv=none; b=Z6xpF+wMncV4qKP/eG4gT+b2at9N/ADPjqXbz/8HoSjGTHi6T0wwObdXGldh5529blN6zT 0TmGKypv1HKXOJn7dMMRYLVwMRX5OKAhEr6QbnF7EndWPX5H93W6nub/JebVtcAxu/QSp+ 5k2UEKxofD8gaX2YJnnzPB8daN71apUiXxcn8NwD1duhT1kC6/T/SmQGz1Wli9g/SBlSlM usat63u3cyi7ABSsEd1wHM2FD9Ebsd9ytrexrw1MyAKA105csKTAAULisTFd1QR2IMIIiU pYu7wnr76vx0Q3keCeaVnaa0wnQjrHoJhOuNbOkd3ni9WcBovN0r+tlrVOOCeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695370767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iIbZaHueCzinhfQLHseQZc/8l9zNnQKNsEiJ+YjK008=; b=rEUY5aoGumX86dVCQ77/gHVrCiM9xZLE7qhxY9t7bin79VEiuGqwlnxU3Mpf2hN4L5HKlo t1e3XfK23aQzB2jSPIH2VUwjI8UJggcZkU7S+bVnSKvYJCggaa1/UXWVXAG8vwOZ0K0kfX XM7onpbDHY2CJfv+DbRRh5ZsQsxxnIzfsIn/hizKJAaJ55xP5ckJr2BQOoP9yFKMTXxMCj lyg7aT6vTELj0Zc+YjvRXTKqyyjWGPQV3Ma4LDM08tKJbIkwttQR7M0lqUoMAyTEV3CK4S Slg1bVG4Pxtp2Pma00e3tIcyMwY6t5BvCv0RMcl0LypjX2b1qA3dff/Eff7Jxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsQCz4Rjqz6x; Fri, 22 Sep 2023 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M8JRxw083724; Fri, 22 Sep 2023 08:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M8JRwI083721; Fri, 22 Sep 2023 08:19:27 GMT (envelope-from git) Date: Fri, 22 Sep 2023 08:19:27 GMT Message-Id: <202309220819.38M8JRwI083721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 95a4709b2cca - main - Create namespace for the symbols added during 15-CURRENT cycle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95a4709b2cca726c6b76c6743ba2d665c1730666 Auto-Submitted: auto-generated The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=95a4709b2cca726c6b76c6743ba2d665c1730666 commit 95a4709b2cca726c6b76c6743ba2d665c1730666 Author: Yuri Pankov AuthorDate: 2023-09-22 07:57:35 +0000 Commit: Yuri Pankov CommitDate: 2023-09-22 08:16:29 +0000 Create namespace for the symbols added during 15-CURRENT cycle Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41935 --- lib/libc/Versions.def | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def index a605378654a4..184e107d225a 100644 --- a/lib/libc/Versions.def +++ b/lib/libc/Versions.def @@ -38,6 +38,10 @@ FBSD_1.6 { FBSD_1.7 { } FBSD_1.6; +# This version was first added to 15.0-current. +FBSD_1.8 { +} FBSD_1.7; + # This is our private namespace. Any global interfaces that are # strictly for use only by other FreeBSD applications and libraries # are listed here. We use a separate namespace so we can write @@ -45,4 +49,4 @@ FBSD_1.7 { # # Please do NOT increment the version of this namespace. FBSDprivate_1.0 { -} FBSD_1.7; +} FBSD_1.8; From nobody Fri Sep 22 09:42:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsS4H5Fdnz4tblX; Fri, 22 Sep 2023 09:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsS4H4kTPz4mB1; Fri, 22 Sep 2023 09:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695375775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv3AD+VPpmob6QlNUTctoSLeSRuO+vvXtKFNnNjKgqU=; b=gia5rAzN1E90tA1/2nwMilCfYUst/rzu9gyTLJNzObbBSJTJtdS4MLNo3YFQo/Qvm2qlGF N80Xme8KhZxhJNOngHe2GZ5rAWtxS631GpcVcwZXoO0g4c/5bPhjDhpnaHeKBU4cPLoi3d LrZIeuuC9XQgFrwgWMnmcptXAcXS6cSKjpbXHYt/FAWVzwAVxlXhX/MNfUCLBbMlTR//H8 8BqJ4H3SVKo5OLaT5mqLA+cFzgl+NUgE8arjXMqZWh73f1SaiLFrPbIOsfUaVnY6OEW+aB EMx4jGcWaSmQNc8RSzOY7xZQJW7ckRDeSENXl2VTLJmDQNUJJO+M1dDS95M6/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695375775; a=rsa-sha256; cv=none; b=rHSvEx1LSYPmbQWbA34r2gDl/f8haEY1dTQWZ6IHMfLp9INPX2BAP0yafEP+1D18rzgEpd f70qUK/cNfEC8IbYT0Muj3O+WIpUU/PR3+AEPGKNqLZZir+GEKGSzuiafb1yR+7LcwhMea lqHgFVj6P1g4pdJx+I3PBJMwofOEftAYKfgEoSdRh/49kuxEoT0cdXPfP7UvOnKYkbbQav 0nINwJRd23py8Aq9tS6Rr8JqvmrteyMinv8KXoIY6dv0n31kHFE+ngt3uh4Y34Ly13BGGS /7mPso9PSBU7hNMueZHVlWjTLWIfvUf91gNEG8mhWfjvbTdFJvYauPTDQ9Pecw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695375775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kv3AD+VPpmob6QlNUTctoSLeSRuO+vvXtKFNnNjKgqU=; b=WyKUX6gUtKMFBMOSTo/n6R/0CTm7m+PFP+SF08IehZGilp2/XssL+SsbqTgNlxoLrj+2h9 QPyYrxF8Kr2J2dPWj7YWWX0MdCKaPFmLexiIO0ZTysa1rHQGkjtezID47jqVK1akefKU2g gXV7oxeVrFtIrxCevvbR+AvHSCAKlFmNTpDX6M2vsoOfZg5n0zQGycSkmMoUvUtqH7S4Vw x3nIGKV83l2dcmtQtoE01zd9EaYM/ZDas4oD0AX+iGZvGwUc8dB3QAtWpQa7EMn0m9pnTE huXpWiyTl1RkRh5hLHDdWFnDOxtn+1iaW2F0gwwfuvgF5QbdhxzjKQX8o4u47Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsS4H3pmNz1wd; Fri, 22 Sep 2023 09:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38M9gt3l031443; Fri, 22 Sep 2023 09:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38M9gtdJ031440; Fri, 22 Sep 2023 09:42:55 GMT (envelope-from git) Date: Fri, 22 Sep 2023 09:42:55 GMT Message-Id: <202309220942.38M9gtdJ031440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 36468371ce95 - main - pkgbase: Fix ucl for libcompiler_rt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36468371ce9565bf8989ad8e561e041bfe9cb80f Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=36468371ce9565bf8989ad8e561e041bfe9cb80f commit 36468371ce9565bf8989ad8e561e041bfe9cb80f Author: Mikaël Urankar AuthorDate: 2023-09-22 09:41:09 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-22 09:42:21 +0000 pkgbase: Fix ucl for libcompiler_rt It's only a -dev package now so add it to the list of -dev package that don't have non-dev package. PR: 273859 --- release/packages/generate-ucl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index fa13e8e334d2..9e9680559428 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -50,11 +50,11 @@ main() { # -dev packages that have no corresponding non-dev package # as a dependency. - libcompat-dev|liby-dev) + libcompat-dev|libcompiler_rt-dev|liby-dev) outname=${outname%%-dev} _descr="Development Files" ;; - libcompat-lib32_dev|liby-lib32_dev) + libcompat-lib32_dev|libcompiler_rt-lib32_dev|liby-lib32_dev) outname=${outname%%-lib32_dev} _descr="32-bit Libraries, Development Files" ;; From nobody Fri Sep 22 10:09:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsSgL10X7z4tdTx; Fri, 22 Sep 2023 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsSgL0NBmz4ndk; Fri, 22 Sep 2023 10:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695377390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wGvr/PzitNlHqmJwetOADQ1hmMgvVe5cvQlsZXUd5Q=; b=JVO0fmo9OApS2SZNGSgOhirVjD0Sik/aCF/cw8pRTc1NkDRVnrj/MLCLflr99CwOjrxOtr gPaTQCxfnMP4CqzaJLy8beQH9fbh1aAG7c1LPouoYjJNEurHP2YlrLWa/K6PmVN0UwvKfu X1ulFWkxWIsebdVOxXfEpRSgcDDC6j0QLfeYyFTeY55XpZgb/kxlO3IBtQ1+qkKQeIF8Uh vRIShaei/bEBpEQOgK4xVTo0A4rzFxWhwUPeSKTckivakOWrdkfO/C7mvlwsIcafFarPHJ vLnnlhllOgkwkai2vrExuQ82q/zj85OdQEvNfHtMMix33OxVox/urt2K+cqu8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695377390; a=rsa-sha256; cv=none; b=YPq1GktGz+8XizrKKNzWjKjS+4tkJcqljc+6RskOpm3DKZsVVRV0NDRyrxWj2NmORYX17k 0w4mHkE1hfFkt7r/Kn2TADai0HduZwYGfw77gSGgcsMS0JL+WXd7wsDFlJnGd9+hewnHb1 b1k6fBjyNA0/a1Nomh65hyWkK+8jKUqiWtXrLuQG+aTsFyx1wYew7BQmCUf3X8YFARoTng d2wtmatvIhuRhH/2RnZlTw+EEiv6qxINgm8FDgcn42sRRlgrIScdXayG3WmIwEfOafWLtM arDh/GpyVyk7CRsEc1Mm7P5IQtnujhNy4U6WaadUAifY4+6ItS5C3KhkPu5FLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695377390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2wGvr/PzitNlHqmJwetOADQ1hmMgvVe5cvQlsZXUd5Q=; b=kWyq2whVgRRG7rrNIfIx2khHxHcBNJFgEViUWVckFMgTdf/y+eLaR7xe5pel7fIRIvU3qO 7ucpJQgikNOMSbDzRjDkTRvwCKV/zza+WoH5ci53a1FdeWYIK5rlmkgNwWqINuUM8aaRkG rdoRhWPJMCwMx9WeXj8QNYVmZ8FIofwOTKnYE/LbP4f+rXTrtjCo8bMA0nUbSSv0Ew8TQf oiQUR3GSBg4Y3FQKGWe6LazC36a22xyjQXJegfwid8WVEvttLwUTgJs557X6vJhtnT40gO iNyZJ7WtJDTj3auCt/b1EEKlKdot8CcOOeuVL/rY8JtRJO0KuNi2G8Mx6mfGpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsSgK6WH6z30j; Fri, 22 Sep 2023 10:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MA9nAN066512; Fri, 22 Sep 2023 10:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MA9nAO066509; Fri, 22 Sep 2023 10:09:49 GMT (envelope-from git) Date: Fri, 22 Sep 2023 10:09:49 GMT Message-Id: <202309221009.38MA9nAO066509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c531c1d1462c - main - pf: Convert PF_DEFAULT_TO_DROP into a vnet loader tunable 'net.pf.default_to_drop' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c531c1d1462c45f7ce5de4f9913226801f3073bd Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c531c1d1462c45f7ce5de4f9913226801f3073bd commit c531c1d1462c45f7ce5de4f9913226801f3073bd Author: Zhenlei Huang AuthorDate: 2023-09-22 10:05:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-22 10:05:02 +0000 pf: Convert PF_DEFAULT_TO_DROP into a vnet loader tunable 'net.pf.default_to_drop' 7f7ef494f11d introduced a compile time option PF_DEFAULT_TO_DROP to make the pf(4) default rule to drop. While this change exposes a vnet loader tunable 'net.pf.default_to_drop' so that users can change the default rule without re-compiling the pf(4) module. This change is similiar to that for IPFW [1]. 1. 5f17ebf94db5 Convert IPFW_DEFAULT_TO_ACCEPT into a loader tunable 'net.inet.ip.fw.default_to_accept' Reviewed by: #network, kp MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D39866 --- share/man/man4/pf.4 | 4 ++++ sys/netpfil/pf/pf_ioctl.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 0f7bde1031cb..5309db10d807 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -87,6 +87,10 @@ Default value is 131072. Size of hash table that store source nodes. Should be power of 2. Default value is 32768. +.It Va net.pf.default_to_drop +This value overrides +.Cd "options PF_DEFAULT_TO_DROP" +from kernel configuration file. .El .Pp Read only diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 8dbc8986e7d3..db8f481a1567 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -199,6 +199,16 @@ SYSCTL_BOOL(_net_pf, OID_AUTO, filter_local, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(pf_filter_local), false, "Enable filtering for packets delivered to local network stack"); +#ifdef PF_DEFAULT_TO_DROP +VNET_DEFINE_STATIC(bool, default_to_drop) = true; +#else +VNET_DEFINE_STATIC(bool, default_to_drop); +#endif +#define V_default_to_drop VNET(default_to_drop) +SYSCTL_BOOL(_net_pf, OID_AUTO, default_to_drop, CTLFLAG_RDTUN | CTLFLAG_VNET, + &VNET_NAME(default_to_drop), false, + "Make the default rule drop all packets."); + static void pf_init_tagset(struct pf_tagset *, unsigned int *, unsigned int); static void pf_cleanup_tagset(struct pf_tagset *); @@ -335,11 +345,7 @@ pfattach_vnet(void) /* default rule should never be garbage collected */ V_pf_default_rule.entries.tqe_prev = &V_pf_default_rule.entries.tqe_next; -#ifdef PF_DEFAULT_TO_DROP - V_pf_default_rule.action = PF_DROP; -#else - V_pf_default_rule.action = PF_PASS; -#endif + V_pf_default_rule.action = V_default_to_drop ? PF_DROP : PF_PASS; V_pf_default_rule.nr = -1; V_pf_default_rule.rtableid = -1; From nobody Fri Sep 22 10:20:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsSvq301gz4tf74; Fri, 22 Sep 2023 10:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsSvq2M6Zz4pQC; Fri, 22 Sep 2023 10:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695378039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvW83slKIzPt/npmbiyfHb8npehnE3NkJuUjcfgcPDk=; b=ux0oTZCFbvz8u00GfZK6+WPp5kmjFJOE7CYTEXOXnLRpRIFpHVa8uS+JGB7By+t0Zn1eAZ /sIHr2Wrcd8k7MgXE0eHzWlmByLdoP5/lfMQa+gugmcoJQlqmarAfJFlBv1KXkTgSpznSY EFBL35tZGXYh7m7ew9wDJaqo+ItjN22v5fn1PbgRRQaOuW5e3s/ebhe2OmNCT1h509ei3Q 5ukddR8PEFMZWXEABZ7STnmyYi2JXuSBwHDTAka1h1p8fJofgsm3u6zHjJBpLAU6D84NsM fH1fTGAm6EmEI/rwrKJvoCG9e4nA8lDgvg5yrVN8JuGnPeVQ120xyH1gk3vw6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695378039; a=rsa-sha256; cv=none; b=kJiDBJ3kMRzbcPa4m82hv24PPWr9IRUX9F8fAMi9A99OAuXsegVJXnG8ViIL6pL/tgZS23 /bfRh7HovTZ9frld0HyQV96aDiN4eUwm8mPaYHEgT9tEIDBreHoc2IZ23yYXSBpeaw6fqW tO2PUeH7zLbjaHRLIc1jeJfTjO9iEBLjUW47DUNag3mGbW5IxQCrK50/jD1cc2k8UGOmUW wKpWEH05eA52KTiexqFOskEwIRYBHMXk112IhW7Tj//JrPl8le3mjXn6B5geYl2HyayeID LlnvBD5CQhyWB8KYTgwx4wl0vvKxl5ZnpxDf+ui1iIbcXZcDBzVW5R8GTayA7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695378039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kvW83slKIzPt/npmbiyfHb8npehnE3NkJuUjcfgcPDk=; b=kuVy4mY8zBWhtISGujji2BDhul4x60S6NQU13pzDLqTXdabab1S7V96DuefEs4NJ8E7ZEw ieeHB4M5eBG3bEwDLHyoD3yIhThbQy/1Eun3wY+KYy+i5xvWiE4j6uEp/AJrPVb9NWXARY 0L5cAkM3tR8DPnKIcrOiVgGNeTi2XLnbCJX4A/jwn3SzBrHNkzMynHt7w4Ck7YmheBwkvF GONiVypXQjHjGzj6qLJRgJQNxQ0UGyMAWTyvxtCbzm/hjhGvCoffLaqc0Ibf5t6Vu7sYfm P+TVqnTcfNdAQIpxh6grzZwgXgeBtMvqCgXfjLP3YquQwbR6v8nBV6z86cfzVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsSvq1PWFz3Kt; Fri, 22 Sep 2023 10:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MAKd65092327; Fri, 22 Sep 2023 10:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MAKdiA092324; Fri, 22 Sep 2023 10:20:39 GMT (envelope-from git) Date: Fri, 22 Sep 2023 10:20:39 GMT Message-Id: <202309221020.38MAKdiA092324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 366ef17bb6ce - main - UPDATING: add entry for the new loader tunnable net.pf.default_to_drop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 366ef17bb6ce008f79a283ff5dc5e87ab13dbdb3 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=366ef17bb6ce008f79a283ff5dc5e87ab13dbdb3 commit 366ef17bb6ce008f79a283ff5dc5e87ab13dbdb3 Author: Zhenlei Huang AuthorDate: 2023-09-22 10:19:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-22 10:19:33 +0000 UPDATING: add entry for the new loader tunnable net.pf.default_to_drop --- UPDATING | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPDATING b/UPDATING index e2f50b13b154..38362cb86b73 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230922: + A new loader tunable net.pf.default_to_drop allows pf(4)’s default + behaviour to be changed from pass to drop. Previously this required + recompiling the kernel with the option PF_DEFAULT_TO_DROP. + 20230914: Enable splitting out pkgbase manpages into separate packages by default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf. From nobody Fri Sep 22 14:46:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsZpg14g0z4tyYC; Fri, 22 Sep 2023 14:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsZpf4W77z3XYZ; Fri, 22 Sep 2023 14:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695393994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDG2BU0FxuUgAp5gTF3hafZ0rc2ULb3CWWssOgwkfmQ=; b=aK0e96IgzllTVGVpfiMmiKo7+HUCYDM7sIb23yX1Z/Or6U6chdstI/iqx8A5AJdolur8t3 eQR32NuxBPVJpMj1hSf3J1C5eRIH/BDbKLbOOZkFs/pxGBY4Lgp1nawyly7qBB3n4JJXDM zTY9aTl0R4kkJEeZBl2psUloPvnJTL96wL9EqPXHEqMJdruFxlAav3lvCfnjchMMm7mKpn VjRh42HiiMH2KPMaLNPdgIl4qy6VCYzaPl4EyBsK/efov3PKQWNE+ZPYWCqUGOqRglCupE dRXtbNFp6hHdXGRD2fEW5vepkpvLMh1mI+jVSDqkWpTJ1OYZArhwyBrvCvrCfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695393994; a=rsa-sha256; cv=none; b=g4r1UNE/jX8/7S1mUQwjlb/AVPJ/uyLhnaC17ECYIDarS3y+erM5bHo8xU3xf7zgaHdKF/ n70a4xtj8jcQ0A3jBhHARHJLCb5uLDqzG9qtEJE+69BIJTUxLtkmbvB3crOidH05VYCNXb ppHkm5UA9GeM3DBit6uInQArhWLa7YK4y1tfX+XLWJbc43SbmDa8z9raszQpykfLm7ozvq DkwrpZwv9Ko7xRLdEegDgjO80GvU3DlVVEjqwkAWvDq9x5hG/G+O5gFZtzVqxS8bgtbbYb plkeZF1rxuJkIg0pvgsmB/ttLy4GLamChhyfc8Dbjk69wxI4yVF+/MgDhXV9Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695393994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kDG2BU0FxuUgAp5gTF3hafZ0rc2ULb3CWWssOgwkfmQ=; b=PwxYpCisjOaCSIY5H2ReZicx4xrdqmU16deLImZHoAdu7cbClggxkF2WDKgxETtGgFHTtB zOlbExmiORzkjo4X0v8L+zz+I5m+6I+SUFXHPBhWWoqfuNnQ5eALyHn1WI9wFx9RcNeFYG GkNP8XadMQxvdK3O9lPHeEyjYOsKsdru5h6bECUzfGy0gnzbvOQa14U6Pm7SITBYdwsF0/ JVOyQzHjJHSxyx/NEF1ziHd/LMnEpV5mW/890KJ8MZjmLXDMi2lUoI84LcPhOBSAoE6AWi C653/JbjkrIFqULZiAQdp9L8Qm4PqTjYXvkDsMAApKCfwnVbKaCi8DZTR9L4Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsZpf3V9vzB9v; Fri, 22 Sep 2023 14:46:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MEkYUB029891; Fri, 22 Sep 2023 14:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MEkYA6029888; Fri, 22 Sep 2023 14:46:34 GMT (envelope-from git) Date: Fri, 22 Sep 2023 14:46:34 GMT Message-Id: <202309221446.38MEkYA6029888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4bdf7f695184 - main - netlink: add unregister call in cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bdf7f695184fb4312462ad475f3302c9da40f13 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4bdf7f695184fb4312462ad475f3302c9da40f13 commit 4bdf7f695184fb4312462ad475f3302c9da40f13 Author: Lin Ma AuthorDate: 2023-06-19 09:32:59 +0000 Commit: Ed Maste CommitDate: 2023-09-22 14:44:03 +0000 netlink: add unregister call in cleanup For protocols that use netlink (generic and route for now), the unint handler seems to have forgotten to call unregister, which will cause the assertion the next time the module is loaded. This patch adds unregister call to netlink_unregister_proto() for those handlers to avoid bad things happen. Reviewed-by: melifaro Fixes: 7e5bf68495cc ("netlink: add netlink support") Pull-request: https://github.com/freebsd/freebsd-src/pull/781 Signed-off-by: Lin Ma --- sys/netlink/netlink_generic.c | 1 + sys/netlink/netlink_route.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 54fc702d8ac6..b28b206a7ace 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -296,6 +296,7 @@ SYSINIT(genl_load_all, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_load_all, NULL) static void genl_unload(void *u __unused) { + netlink_unregister_proto(NETLINK_GENERIC); EVENTHANDLER_DEREGISTER(genl_family_event, family_event_tag); genl_unregister_family(CTRL_FAMILY_NAME); NET_EPOCH_WAIT(); diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c index 6da074926405..6b293f7ef19c 100644 --- a/sys/netlink/netlink_route.c +++ b/sys/netlink/netlink_route.c @@ -134,6 +134,7 @@ static void rtnl_unload(void *u __unused) { netlink_callback_p = nlbridge_orig_p; + netlink_unregister_proto(NETLINK_ROUTE); rtnl_ifaces_destroy(); rtnl_neighs_destroy(); From nobody Fri Sep 22 15:26:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsbhQ5BYHz4v22r; Fri, 22 Sep 2023 15:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsbhQ4d2Pz4DT4; Fri, 22 Sep 2023 15:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695396374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoXKPuMJGB0XL2AwLSgo700HahSgeeXvLwQT+hyFBJ0=; b=GTBIKmI7TmTcIl/cpu0S+wsFozyzIb4Ck6oTN8lcW1lAK1MdoAZoAvJamekB3OhfRkVFWa u1mF2e40KWE+V1i3Of2jNlPwNQx+fhZEIkpybKVtRVstX6mgDMKatowNcE3UTSZFo2aiBu uHdefRaRkdyZzj7sSfpU5HWd6G9VpxvuvJIRprp3n7z0Aw0EEv9jJRi5ckKczzacl1oHyU PD0n/Kw9Zajl02hn3wLxd2tciTN3RQ/HujXfyBHAWvQTF6qqcxzXwSWqWICMjuyAzGx6Gy UHQ+tQX7Zeh2/IsZeXMhSgONilvN9fAoI7kkskVihZGHUzMSWaDjJgC45WZSvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695396374; a=rsa-sha256; cv=none; b=PJj3DANyDDHflF7YaG2ve2jFkri4a/8frtWsoekKYArd9q5vSkDnOYoKUpeKFiPfPeVV+4 nvrhV1c8v/SiUW7pB3ko9sg9H2I8T35+27CACfChQDQRJTt2KK1syuJA7W96mHHnvNVliH ISYYerUhef2Pk2VZE2jjyRzVjMcNGrVUAwy6Au5BKRunlfpY5aMCtVe8IKzW1wNIx5S5oe 6V3NwtQL0EvHEKZONxI+aKGvF7/3HDT/oRtEAX+0Ro2v82JZ/EO6MunX36tqdYYS8iN61k VCKVy399+iT54L3NltUo2pJMSi/vJ1mpw1LOckl1lZiox03WVSDWNX6EAxb2wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695396374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uoXKPuMJGB0XL2AwLSgo700HahSgeeXvLwQT+hyFBJ0=; b=fpFsJZcTS2ipgdr1RRhx9HxG6GSOfI9q/DnMs0OMX/ltQF1N6NYpc8kO9mYhtRQ/usK17s ggQgscyBn1ceA8w5Zl6HEYS0s1vrim9pfIxq3WqaqQgmuUs1NH1d5S54DKluxJefcikY0i c+N5CIoc97oWq26WJBGd6lKwSMxy7gwz0qkoipbf/dxj09JadU9i16yoKkNZWxdq6xHfdX btLu0aC3CLTIsDvuPYk6y2g4Otk7jS8QW2pr8oT60+qx/xSLjuK3NiitJoLhdIl9S7koMl oSbj5VaDBhzLwW5FKvQ3/34a3e8qDLzBbK9DNVM+7N/PTk9wIB3loAvo0N8iHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsbhQ3ThLzCJG; Fri, 22 Sep 2023 15:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MFQETt097504; Fri, 22 Sep 2023 15:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MFQEZY097501; Fri, 22 Sep 2023 15:26:14 GMT (envelope-from git) Date: Fri, 22 Sep 2023 15:26:14 GMT Message-Id: <202309221526.38MFQEZY097501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6f4ce7e89ba4 - main - lastcomm: improve timestamp display List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f4ce7e89ba4fa52566704533920352aa65c7f9b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6f4ce7e89ba4fa52566704533920352aa65c7f9b commit 6f4ce7e89ba4fa52566704533920352aa65c7f9b Author: Michael Paepcke AuthorDate: 2023-07-27 08:28:50 +0000 Commit: Ed Maste CommitDate: 2023-09-22 14:59:45 +0000 lastcomm: improve timestamp display Adjust the lastcomm command to output timestamps with a precision of seconds. Reported by: Dr. Andreas Longwitz Reviewed by: emaste Relnotes: Yes Sponsored by: DSS Gmbh Pull Request: https://github.com/freebsd/freebsd-src/pull/802 --- usr.bin/lastcomm/lastcomm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index bcd84b2ed37a..b97755e7bb03 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -191,7 +191,7 @@ main(int argc, char *argv[]) localtime(&ab.ac_btime)); (void)printf(" %s", buf); } else - (void)printf(" %.16s", ctime(&ab.ac_btime)); + (void)printf(" %.19s", ctime(&ab.ac_btime)); } /* exit time (starting time + elapsed time )*/ @@ -203,7 +203,7 @@ main(int argc, char *argv[]) localtime(&t)); (void)printf(" %s", buf); } else - (void)printf(" %.16s", ctime(&t)); + (void)printf(" %.19s", ctime(&t)); } printf("\n"); } From nobody Fri Sep 22 16:51:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsdZz3CKXz4v6xY; Fri, 22 Sep 2023 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsdZz2S92z4MTN; Fri, 22 Sep 2023 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695401499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypKoZTg7Wz8KXIMNp3hvuZ98OqqSw00b9f/zeVMB84Y=; b=sxEhdzmwYBfkzTFu+AxhHC9LvlbRmhFmbGJnWBtJ7g2P4MFvnhVsmhrTU6jZ1FXX2SoUqY ZAAIibhb8cw4Mv6q2GGGzWF3M76bGdh4UVr2zSE37stb6/LebxcGNkzqCNK9Y2GT8DO4q1 DLqKRgvPdpy56M3ZMBohPahP0k/DAB5l/oArDDyh8TYFrK0OIpt1y8p5S0ulAVEL5/LyYh wd+ERyh++OLkz6r+4YT0a1zNZld3q6Qp/G46s45fg3PAsBiwmGGPsEVhzPg5QCkBTpHV2I SVXiP0aw33YVjTZ362kYdXtMI/5dCjSunR4/MPz0CIE5VkQDlZvmc4KQcN5VeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695401499; a=rsa-sha256; cv=none; b=Ai8dKn/ckKg/8JAGKdBe3e47ciqLKdH0r3SkmjxTGqgHpXl5o/7ajx/qquLNONuKSKPqS9 3D+0Wnm58oucB/y6JmuxXtkBk00qPXK26oR98ZHNCU3sWLPXO2ZGH45z08Qo27QhL4y/xb s2UFvhaX/wjMoURkebUuNkDhIA7HRZdgrQOh6fU/MEHDs/E0rPitJ++6gU9Bfu9IkFpta4 XnFoZYfvGSwO8rCWgqzhMWraUoKB+XjKMml9s/eJrvcM4TjWNkLcYlTTyl67xdyttGDurn Ng+qcUYo6qeicDd0YCzLYhAHjJlQ3MsMZxYNk28HKmHteTHY0pG8uVX5VUlp2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695401499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ypKoZTg7Wz8KXIMNp3hvuZ98OqqSw00b9f/zeVMB84Y=; b=SHM8OTwtLSioaghnOK+1AyQaO+TOevqt+U4jCYJnJmCYg137lZpfUzV3v3LzJU1TnyO2Ix byQoY0NKUwiVwGZPudJ8zwz5L8Dd3vLShEPbFLr+V6dikHr/H9oLuYZtCfKtbgj7SF1Ev0 RW34GCt0a0nNZTG2lQxzIcwlHX7vxaXQ5cgfQSdK5ujdqDgZWkK3xxxHtIz6hDF99bgW6V 4aiQ2ZnL9z1ilgMhVpSd+3zGmA86FhVTDAW0Hzh1n7hHIgNVoDIgSYaRmI+oB/aj3CS+A1 0sIv9CUcqhyEP7SQGORQTSsYGI0waHb1DlaoSPCvNF/j0T3Z8/7OPao9/rYFrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsdZz1XB1zTx9; Fri, 22 Sep 2023 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MGpdAk043946; Fri, 22 Sep 2023 16:51:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MGpdEw043944; Fri, 22 Sep 2023 16:51:39 GMT (envelope-from git) Date: Fri, 22 Sep 2023 16:51:39 GMT Message-Id: <202309221651.38MGpdEw043944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 66946511380b - main - iicbus: pmic: rk8xx: Fix logic in clock-output-names detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66946511380bf088c96a7517ba9b018c943655c6 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=66946511380bf088c96a7517ba9b018c943655c6 commit 66946511380bf088c96a7517ba9b018c943655c6 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:47:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-22 16:51:33 +0000 iicbus: pmic: rk8xx: Fix logic in clock-output-names detection Pointy hat to: manu (probably) --- sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c index a51937da0060..a2ea1e5bb4ba 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c @@ -112,7 +112,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 0; - clkidef.name = (nclks = 2) ? clknames[0] : "clk32kout1"; + clkidef.name = (nclks == 2) ? clknames[0] : "clk32kout1"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_0, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); @@ -124,7 +124,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 1; - clkidef.name = (nclks = 2) ? clknames[1] : "clk32kout2"; + clkidef.name = (nclks == 2) ? clknames[1] : "clk32kout2"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_1, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); From nobody Fri Sep 22 16:51:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsdb04VPCz4v7Fs; Fri, 22 Sep 2023 16:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsdb04166z4Mj2; Fri, 22 Sep 2023 16:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695401500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LqfbkjR8wn8Z8LVQDICeM5WECmSmCZkIxNcRhimjh8U=; b=KBcmnDaqQbXXVN7Qv2qG/HjTEIsjS9s9T6sttBGw0FVwGa5f3iLaHbWkQEwB2mouOf5sW/ xNungrgK53oa7GzQAHv/u2cqcegPwyDLREykrt/13cGeLpUBFhYgl/2dGgl94M9hkseBsj YpaMpQp/5yQyg8IVWu1w46SOxZqhr4AsmXNyA/2FGaZpCGyyGTlMzrRNKHvs+Fd6eARZJD 1goWv44kBUAwT06c8JI5sadeNsGZSWr8dzmQXgoLdzhMcg97Idn2N8T7CSVtCs7K3O1MpE ThQYCy3V4EEWdapKjbWgBr6LWFMWwNcwurYKpBdQg8dACbWNTvzgvCr2BrwXwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695401500; a=rsa-sha256; cv=none; b=LCfm6QQZ8z/5gzsbwo3nrU+l/m3yq0588+i3Mhl1Ue/vU3j1V612LuQKBfMnomHG6X+hwG mysMiNui3UM1dtqoU2T2NcvW3iPP/CO7/FnETUrzznnJifQxkND7GmiL7ND2+mhjt1gZEQ KCqr/ryYppFXoVm5FMb6LOcAjOKrLvfoAkIwPAcKZIvux8Q+Ft92fJOxY7mS1SjuOViE2j 3HLYFpGpoBl3l/v0w1HejJy2Fknc9imJxb18g/hHaOL05yPBO8t9bqlYtpIdmo0SeYSvKt EFGuK6RH4BArKzxnTLjnDpvRZLPcV7VfikkdeUh9aI3pzTL0ebsGHNa+rwRVfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695401500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LqfbkjR8wn8Z8LVQDICeM5WECmSmCZkIxNcRhimjh8U=; b=tgSJqKYcDnyxsuNIGhcbohqVO3n7ur6Ob6FNMCqyij63p4IEbLejDGaCFCOM26mf6mRJLT bDqoR9YoziVnA7onpQw/dT6jAVZGFxCnggqpQJIgCjzxeXEum6PDrKZnNJWSPV7nmvAFAu WTFFS8m5K5BcBbnAkKYWp2MuGsrF7BI505c87cGeIfOZwWIi8vPh+fFlsY4jBqHA4kfJYN ug2FUI1T58HFCLrc3jNZA3skwgrB/S0UWZWWDbYWnTfthuqyFSISUJdiyvIyzgpri5ZtYq EJpceU5fB/bdzo/h4C3B39SsK3M2HVCDjd+kfOthY56dqxnP7EQmiVganEgfPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsdb02X9JzVZd; Fri, 22 Sep 2023 16:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MGpeaY043994; Fri, 22 Sep 2023 16:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MGpeAT043991; Fri, 22 Sep 2023 16:51:40 GMT (envelope-from git) Date: Fri, 22 Sep 2023 16:51:40 GMT Message-Id: <202309221651.38MGpeAT043991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f9e26e785339 - main - arm64: dtb: Add rk3568-nanopi-r5s.dts to the build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9e26e7853399e7b80ea033fa7fd72e8afe6d061 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f9e26e7853399e7b80ea033fa7fd72e8afe6d061 commit f9e26e7853399e7b80ea033fa7fd72e8afe6d061 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:50:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-22 16:51:33 +0000 arm64: dtb: Add rk3568-nanopi-r5s.dts to the build We can boot on this board. --- sys/modules/dtb/rockchip/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 8f747738e6b1..f8796ebb17af 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -17,7 +17,8 @@ DTS= \ rockchip/rk3328-rock64.dts \ rockchip/rk3399-firefly.dts \ rockchip/rk3399-rockpro64.dts \ - rockchip/rk3566-quartz64-a.dts + rockchip/rk3566-quartz64-a.dts \ + rockchip/rk3568-nanopi-r5s.dts DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ From nobody Fri Sep 22 17:16:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsf820G3Nz4v8gF; Fri, 22 Sep 2023 17:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsf816mxmz4Qd0; Fri, 22 Sep 2023 17:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zbbLvYGca2bud9+rfDhMsUqhPkwzJVcV8tWXXRdFf0=; b=V4gKvqGzO8liq0R2p2N1UYXw3R0khZEZIqdzbGpnEnmnMhGkM9iH9ZtzajjDpE+zhIQFxb VXUnxFyu5GpIULUt8E5iJ2y1Rk7JDAfDXZ6Lu42BkzrDEV11IEK01xeXu/bJ6+CKuGVoBy zHX23v6bRh6DsQhz5CN+UDBOfZn45NWYpshBr4oyociLBjNctAbdW9NpiANLRc21Y2XW3l e8xqcKbVGJ5ouLHDbtMvtDQsgGOiuQGkCRhifJCw3paChX8keJQ0eJSX6rPEoEyeBGSn+N 4EKqatIx11Nr5m12hEn6wFXXlYWtqG7+naZkkOceJOmTNBqXkV/wC4Ocbk9t7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403010; a=rsa-sha256; cv=none; b=fjQl3v/n1CLiJhRn0gMh8EhGVSSG2l6hFBkhLZOvM1kvwBVfYNqcXSmPwU1IAGlgUm3kRn x632am9odRHo5Oo0BpOEC3tbIPCzK+nxYy1CQEXfVGnzP9zPPFurk3wnvbvhGB8r1v1Thn udR1+zw56ceIe543nccqYN2z90hvQJNtlCdtpzyuFSDjOstlKxglCjRzbPv9Mi27BAsJAh dXttJcFtJPVU2ktGxcPtsjB72iKrskR8aTHQRX44AIyQmF63W/kUWf4NWYvdno8D5SQI4a si9faDc1oymFmERAOzxF1Aam58CAJSUOc9Lqt5Skd2888EJTsuszC4Vtvgv4Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4zbbLvYGca2bud9+rfDhMsUqhPkwzJVcV8tWXXRdFf0=; b=oZliRPe5u1xAacmIrezIpg4l0lMfjFCln0BIb6HGMr/HncSTlAPD3lgoRt/GHwmwIsLmn+ 5UjNhNwwwHm2MR70m5yeAAzW6yhDMQZi8Oafxj3l/6F0+1YLvNj051AfDsTflbVdc4rIiI SsQXcLSQoKjHC1dcD7YqHaoErYFNKhUATVzvXHxCYaLAaq9XppoLg0NNwA/srYho3vNMTY sCh4jRMaJGzANpFWhNIflhCWRLklkFLnsEA+fkdxyQLfdr/jHIUu+rWGOoucZkJe6CSRi0 RK53xTcj0ybtspyI7OuklFMRQlS5JPBByk/j8NaJUboONQmYS0XVruinQ+qyAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsf815bBpzVsh; Fri, 22 Sep 2023 17:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHGniK081050; Fri, 22 Sep 2023 17:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHGnEb081047; Fri, 22 Sep 2023 17:16:49 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:16:49 GMT Message-Id: <202309221716.38MHGnEb081047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c97a82d4a4a0 - main - libcrypto: Copy the arm64 header when building asm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c97a82d4a4a0288ed2a456f4ce41d57483724f17 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c97a82d4a4a0288ed2a456f4ce41d57483724f17 commit c97a82d4a4a0288ed2a456f4ce41d57483724f17 Author: Andrew Turner AuthorDate: 2023-09-22 11:34:08 +0000 Commit: Andrew Turner CommitDate: 2023-09-22 17:15:13 +0000 libcrypto: Copy the arm64 header when building asm It may be needed when it's updated so is best to keep in sync with the assembly files. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41938 --- secure/lib/libcrypto/Makefile.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index d3243e5b20b8..644965c1ac1c 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -46,6 +46,7 @@ ASM= ${SRCS:R:S/$/.S/} sha256-armv8.S all: ${ASM} rm -f ${ASM:R:S/$/.s/} + ${CP} ${LCRYPTO_SRC}/crypto/arm_arch.h arm_arch.h CLEANFILES= ${ASM} .SUFFIXES: .pl From nobody Fri Sep 22 17:16:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsf830cwRz4v8WG; Fri, 22 Sep 2023 17:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsf8309yhz4Qtq; Fri, 22 Sep 2023 17:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sf5mpVTzBnTXZt1vpeBlJtOERoRqEtjHm9nkLZ60UM=; b=EgceCHpM3uUPd/xFxT9awPfTGoZsrI2AMK5RQBMr7qStO6PjBgjsFB9GjKI2Q7hqYJp/y0 +sVqUxPqRh0c/ysZZzXRRgn3tQoXoeJECVnAzpokgysDhw7RzAqFgdsLEP+5ZHDGmoG8XW bmBYgRcuJ6EH9lDxZSaggbBBll/97wxbykskwH/h8kQt5vxD5inT/itNKeJZHh3Zw4gKgT o4Ifv5J9IliOnTIWxdQCMTV4T8z1Wo+lb8RtGfRy9VqfUT0c8DKPCnYijWGlvrMwrEmVc7 qxwXn5/bSERv/z8xTCAJYt4uKVm17tJYSkWWMZhiFGuBanzqghf95VUgzSdUlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403011; a=rsa-sha256; cv=none; b=tHQf6JGv4suoaWY/EeoGdolchieUHd14YU7lNG7Ib2VCkUMIg2ZWz62L3HdW0Yff7yCTKV 9j7fwT8DOzCoeL9MZN00pjT8kWVJFs4uc54rbSCLERyPwN456ISo/Rd7i0pDRbb/CLFa3+ vfRaLs7GEKpHvLqj6NApczF0rD5e8zZNfTkk86TDGkfhgGWpJXHZT6fcoY+tl5Putseexg HAp6icFey0RSVNcLenkc/H5YvUt3s6uTvRDP/xmyeu8qFGWF/1T6xP6jHvXtc3fmiEw/eV VLKcRt6jDptOZ1zVY4Wuin37GPDk75smzEKVAwmIit03OwexuRNRl/qzABKGPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9sf5mpVTzBnTXZt1vpeBlJtOERoRqEtjHm9nkLZ60UM=; b=C/SmrhTE7Wb4BSFVZTxt6KOh3pn9SyRT/uYFRDkZCHUugXQls/HJOWjYOeyfyTs1YWhBXd RfVbb12I/cCFF7wVhAw34HVRIZ/pKEG4Dkp7CcNM4/VG+VK5ZaOTx7j6DuYihuWky+BlxR rKaNcmebICcpfao772fISNHH8FTtAqbiFZj6tkMEkJDs5cbcxMLO9RAgxKNMopn+6Zpymm cHm9H9ExpL4FmrgIsZ9oEFmV0rasiggdVlLWqFmqwgAuwDF8G1GY2mEPOuoG4CnfW+UihA 0zcBChkucgHdef1/2q6ly7H71lSlk1AfgUauyM09Mf5UPhh+3RmYlZUXIGCbQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsf8261q8zWP9; Fri, 22 Sep 2023 17:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHGoHj081101; Fri, 22 Sep 2023 17:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHGoRt081098; Fri, 22 Sep 2023 17:16:50 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:16:50 GMT Message-Id: <202309221716.38MHGoRt081098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2f198d313b48 - main - ossl: Update arm_arch.h from OpenSSL 1.1.1 to 3.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f198d313b4894c1fc3649aa1e5ccfba2b6a2ef5 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2f198d313b4894c1fc3649aa1e5ccfba2b6a2ef5 commit 2f198d313b4894c1fc3649aa1e5ccfba2b6a2ef5 Author: Andrew Turner AuthorDate: 2023-09-22 15:11:27 +0000 Commit: Andrew Turner CommitDate: 2023-09-22 17:15:14 +0000 ossl: Update arm_arch.h from OpenSSL 1.1.1 to 3.0 Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41939 --- sys/crypto/openssl/aarch64/arm_arch.h | 49 +++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/aarch64/arm_arch.h index 8b7105571d78..45d7e1556475 100644 --- a/sys/crypto/openssl/aarch64/arm_arch.h +++ b/sys/crypto/openssl/aarch64/arm_arch.h @@ -1,7 +1,7 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html @@ -71,6 +71,8 @@ # ifndef __ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; +extern unsigned int OPENSSL_arm_midr; +extern unsigned int OPENSSL_armv8_rsa_neonized; # endif # define ARMV7_NEON (1<<0) @@ -80,5 +82,48 @@ extern unsigned int OPENSSL_armcap_P; # define ARMV8_SHA256 (1<<4) # define ARMV8_PMULL (1<<5) # define ARMV8_SHA512 (1<<6) +# define ARMV8_CPUID (1<<7) +/* + * MIDR_EL1 system register + * + * 63___ _ ___32_31___ _ ___24_23_____20_19_____16_15__ _ __4_3_______0 + * | | | | | | | + * |RES0 | Implementer | Variant | Arch | PartNum |Revision| + * |____ _ _____|_____ _ _____|_________|_______ _|____ _ ___|________| + * + */ + +# define ARM_CPU_IMP_ARM 0x41 + +# define ARM_CPU_PART_CORTEX_A72 0xD08 +# define ARM_CPU_PART_N1 0xD0C + +# define MIDR_PARTNUM_SHIFT 4 +# define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT) +# define MIDR_PARTNUM(midr) \ + (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT) + +# define MIDR_IMPLEMENTER_SHIFT 24 +# define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT) +# define MIDR_IMPLEMENTER(midr) \ + (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT) + +# define MIDR_ARCHITECTURE_SHIFT 16 +# define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT) +# define MIDR_ARCHITECTURE(midr) \ + (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT) + +# define MIDR_CPU_MODEL_MASK \ + (MIDR_IMPLEMENTER_MASK | \ + MIDR_PARTNUM_MASK | \ + MIDR_ARCHITECTURE_MASK) + +# define MIDR_CPU_MODEL(imp, partnum) \ + (((imp) << MIDR_IMPLEMENTER_SHIFT) | \ + (0xfU << MIDR_ARCHITECTURE_SHIFT) | \ + ((partnum) << MIDR_PARTNUM_SHIFT)) + +# define MIDR_IS_CPU_MODEL(midr, imp, partnum) \ + (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum)) #endif From nobody Fri Sep 22 17:16:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsf841cjkz4v8gH; Fri, 22 Sep 2023 17:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsf8415mRz4QkR; Fri, 22 Sep 2023 17:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyLvJhSpMMyATdD71tAHfmZOHPZ5Xeh846grLIwGzhw=; b=NVReoJm3eIpv4qj5Z04OjoN4yyr14kERwFg1UfzY0HoappaC0FI46BR6u2HDhbQ/tNrMQ2 J4Jpc57WRqKB5e1JbzPLn/JdsPilRJf630ZTCuAZ6YpvwK8mD3JpUoxSrSkdu3ReqGTgiF qc4VcfTsWBLPeGG59h4u/mesbwFtOk7NkTCo5omsXstfgrVMlp/2KpHvzioKcH6mXZIHjE yv1M+SQNr+awY0g3+uuCqf+6NtcW6Qq3OMpokkgeLtho2E37zM2fXgyBHud2eeKw4qrJ+Y 9hv9VIAL76UQyVurIFWp9/s6b17l4JdW+2sg8MOdMwSS4uI3vhIGXxMkaRpscg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403012; a=rsa-sha256; cv=none; b=MhJ1SSA3oZEKb9oo78bOU39Rr7vbhDsK5/EIcixIsc7N7j5OaUErMz4zv4H5hVxAJDsoU4 b2LlXDleXJkzhOWjD4l1tpY+PQBmUtz5UhfNwOcE7pfckjAZYj6TKIapSJ7aynMJKpdWjE 8tMyHjh5gnBUkHsIr7LGXzeYhnlWG31YdimxXObwc84dusBEJjSIbKdjV8+5WalEnJPSuq 4jaHmn9HjMNR2E9rcTtPuF7mWf1QA57Vc48zYb45+/GXIJaZjynWqNboTMkM9m2OaYg/hP ZkDRK5oHX+1j4xBJZGJNKQvELxZvxGetEIKCxaCAEKqQQA5nYSYjTThDYFwOvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyLvJhSpMMyATdD71tAHfmZOHPZ5Xeh846grLIwGzhw=; b=XtJBMOgz5YwXyzdcSzWuf6mco9E75Xi/H14TusBl3IXR1KsLexFYdfibXYRnt0XWW0fBc/ 96dj61MIBof7TFiI1v/XXR2cxYAjS5mwCifQC5rrQaLsneUOIhwDxuy28eZo6x9UkeGz6d EsxSjbor9z39/vVCHJTSJAvA/w8nQFNj7Sfo0WmuZ53TRyRSg+IY0RcS1aDsN/o4CtCSsp PcKXEieaR9MmlSCvR8szfH/5DjAc7ur6YlpzYV5Ss7ROD2YA3lh1nEMElaw9CAvPh+tIfm aXxi218tMBXjnYyDSha2b2mF/6f0QqWmhcNh2QfcHgfWGSP4Ik+/rOEdBrANHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsf8370JLzVsj; Fri, 22 Sep 2023 17:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHGpLN081137; Fri, 22 Sep 2023 17:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHGpMU081134; Fri, 22 Sep 2023 17:16:51 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:16:51 GMT Message-Id: <202309221716.38MHGpMU081134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d61f9bfb0e5c - main - arm64: Export HWCAP_CPUID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d61f9bfb0e5c119c97a559f187b1e9c73077307b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d61f9bfb0e5c119c97a559f187b1e9c73077307b commit d61f9bfb0e5c119c97a559f187b1e9c73077307b Author: Andrew Turner AuthorDate: 2023-09-22 16:20:17 +0000 Commit: Andrew Turner CommitDate: 2023-09-22 17:15:14 +0000 arm64: Export HWCAP_CPUID We have export the CPUID registers since 2018 but never set the HWCAP_CPUID flag to tell userspace it could use them. Fix this by setting it. Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index e84ac338497b..5d23e1495dea 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2203,6 +2203,8 @@ identify_cpu_sysinit(void *dummy __unused) /* Find the values to export to userspace as AT_HWCAP and AT_HWCAP2 */ parse_cpu_features(); + /* We export the CPUID registers */ + elf_hwcap |= HWCAP_CPUID; #ifdef COMPAT_FREEBSD32 /* Set the default caps and any that need to check multiple fields */ From nobody Fri Sep 22 17:16:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsf852NKQz4v8kQ; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsf851wT7z4R3H; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JX6HVdbvQ1US4d81TZlQsL08RcuOOEmfbmKZH1Or3Mg=; b=GZ+oC/wU3MUcczbIcNrdRtx3NGjzyrCCM65M1eHT6jfYUQFs2I86HjV4D330ubI04kbHeq dKycSRavYD34C3QudBUHdgoPIDZMu96t1Hi3A2QStEQTiNG1liZ+qTmTXWOwCe8Q3ryAnm M5/tGUq4y35fcM4i4hPBO88P4BseudxGiovldejaueaoBxDNk2Lg4y5PUWKRYwRen49bn5 blWiUsfBvlpdV8ZNhcUBbKrqT1mFMf1ppaW+m2p55yB6GbxAaTafYBjRWo3ie/nSHoSreh uuoEv8Y7eNI5QbIoHtizcn8q8GyustzeNoionTPaWA4o3i9f7VCqhZTBaKqBiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403013; a=rsa-sha256; cv=none; b=V+dg1LM23J9YNeBrY9YkjNNmJ/bRBA8vXzSgTSqpVRxUTHF6Xt7YfAA0epgOWbiKiI9894 fvTxRH+AD4VGJ+EcpHdIknBKr2PjiY8Rl0h/V0zDmkj0b+d0THHUoX/dev6dK6PLUo1PJX ykNwmTu7CQxJ8mfY2E+/JtgmluLYhpainyXxcn/YzpHCWDKOCx63ceBgcYYs0LKCaYD8ih rhyGSnOIE5NNKuYduDV4kmltV++59dwDakVRMoIAp1bX+kkjndq0rMytcV5mo+vVQurJdl iVVDwgDAuy58j62MnLbs8LyttIqzcUAZr4lbRL3/cO12nJOrNr0Nk2vF2es2DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JX6HVdbvQ1US4d81TZlQsL08RcuOOEmfbmKZH1Or3Mg=; b=Jt1ZZmwYMcS5Ng5V3KA1gwit6jrSjgFH1IPY/jJLjozV3eqLykGhGk87x37z2p3/lOH+RZ am+1zjRHfo8OgY+iWtvLC5hIHlRSmd5K6r2r4L8LwwiZrkQ/hCGBDqnb5Pi9Y15JH5HPN5 g8isksR403vIYh0LXvNik9hWbEH1D27l1f8JQj7cIGHu/pzcQT8bAYxeJwY3DOGThQ+ndG RUkURvCxEHX3/J4m9RTXHidXsYDrhG2VDNm45H/3fDyFJSpX2DAN78uJys8Lsnmrw3smSx M77vfaUkX37gJp45F8mgMzpOVdZUS15TlAMrrm+OazSC7AQ8YKht0Y5MDFSK/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsf850sc5zVsk; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHGrCo081177; Fri, 22 Sep 2023 17:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHGrUj081174; Fri, 22 Sep 2023 17:16:53 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:16:53 GMT Message-Id: <202309221716.38MHGrUj081174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 450f731b7f23 - main - Add BTI exceptions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450f731b7f2351d475b43bbc6234eea28adfd2b0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=450f731b7f2351d475b43bbc6234eea28adfd2b0 commit 450f731b7f2351d475b43bbc6234eea28adfd2b0 Author: Andrew Turner AuthorDate: 2023-04-05 12:28:46 +0000 Commit: Andrew Turner CommitDate: 2023-09-22 17:15:14 +0000 Add BTI exceptions We could hit these when executing code marked as using BTI but jumps to a non-branch target instruction. Sponsored by: Arm Ltd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39450 --- sys/arm64/arm64/locore.S | 2 +- sys/arm64/arm64/trap.c | 10 ++++++++++ sys/arm64/include/armreg.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 0ceb01eda5c0..bc2a84c404ab 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -864,7 +864,7 @@ sctlr_set: .quad (SCTLR_LSMAOE | SCTLR_nTLSMD | SCTLR_UCI | SCTLR_SPAN | \ SCTLR_nTWE | SCTLR_nTWI | SCTLR_UCT | SCTLR_DZE | \ SCTLR_I | SCTLR_SED | SCTLR_SA0 | SCTLR_SA | SCTLR_C | \ - SCTLR_M | SCTLR_CP15BEN) + SCTLR_M | SCTLR_CP15BEN | SCTLR_BT1 | SCTLR_BT0) sctlr_clear: /* Bits to clear */ .quad (SCTLR_EE | SCTLR_E0E | SCTLR_IESB | SCTLR_WXN | SCTLR_UMA | \ diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index d1a48a2fd9f4..c3221e9faf9f 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -559,6 +559,11 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) panic("Undefined instruction: %08x", *(uint32_t *)frame->tf_elr); break; + case EXCP_BTI: + print_registers(frame); + print_gp_register("far", far); + panic("Branch Target exception"); + break; default: print_registers(frame); print_gp_register("far", far); @@ -699,6 +704,11 @@ do_el0_sync(struct thread *td, struct trapframe *frame) (void *)frame->tf_elr, exception); userret(td, frame); break; + case EXCP_BTI: + call_trapsignal(td, SIGILL, ILL_ILLOPC, (void *)frame->tf_elr, + exception); + userret(td, frame); + break; default: call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)frame->tf_elr, exception); diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 8251a687a5d1..953c9af220b9 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -408,6 +408,7 @@ #define EXCP_UNKNOWN 0x00 /* Unkwn exception */ #define EXCP_TRAP_WFI_WFE 0x01 /* Trapped WFI or WFE */ #define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */ +#define EXCP_BTI 0x0d /* Branch Target Exception */ #define EXCP_ILL_STATE 0x0e /* Illegal execution state */ #define EXCP_SVC32 0x11 /* SVC trap for AArch32 */ #define EXCP_SVC64 0x15 /* SVC trap for AArch64 */ From nobody Fri Sep 22 17:54:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsfzZ3JNCz4vC5P; Fri, 22 Sep 2023 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsfzZ2nN9z4YZj; Fri, 22 Sep 2023 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695405274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzP+ikz1nLgTcI0IGahiQBZa7vVpNiy3qRmDO8OP2gA=; b=QFdF1rt4ls3zSk+Z6FkE59fetGx4P2v3QTZkUB04y2Nw7wOWEtDX97dPmMcOmyGEOk1oKe YDewZQo7VoufMttm26t1/Nmo21KXBry4S13EuyZdYUT+kjyg4QvD5SWHC2SySZDo4tvSsh EwyB/QeM3l52/zMKponf0klWWZMiZHl3XjL9XhsJCnA3cUXvJCrZEVADg2xpcjyNTD5elN 2KX82TXArmGS2qyA0KR8rpu0OMzKuZK1my/qmVHcuHfSWSvUwrDn6hBWEuckRpst6btz4w ayTC3PALOmtGYZB5mVEjMMtFBgSdMCmgkgxDPg11d+KjdeJVFD4P6PQpARsl9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695405274; a=rsa-sha256; cv=none; b=G8b0idl4YL/YKoLpJsKGwxqyR2VkgjXYcvRljV4ROIzrDE+a6o99qKk4Sd4d/56chMCDLG nw4OrwuqrjfrTf644WjA1UDI5DXZuww81M7VtgARtln/NavTRVAoBSI+kjTyBoQMN/5FGd XdD55v/KQ/Zf+KNHink4mXclEgToRXIZt4HgJh/oI335xKyNSl9siLIeCurYbeDjvg0Nnt 2gAs/Zlwa4SdpT/OftqSByMZj3dMN8bxAtA1UYn9xt+6QmpH4jsZxebE+jkwpmiOOqgW0Y ceXWXE45CdrzGI61HfdgqmG2rqlT2AZSHAclFXIo2IJibaEdSIuR8Ub7Z+Qzvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695405274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DzP+ikz1nLgTcI0IGahiQBZa7vVpNiy3qRmDO8OP2gA=; b=gIMZagEVy3vjS//EfFRUi9JDof2ZGJFZsVBd+aYyPUMwD3WziPT/+3k0DQ7IPqjZneVN3y 3X1KnCWIMA64BJp5PDJ6oBUcnMzU7+dPUy+8Lt5BYGAt0vcHACcMs17lvEUjNFp34g/+ga WJpHSrF7tF6YGK3/Tam8yteMPF3Av7crSc0SEVRur5pdttmYFuiuCNdDzDDzWVpd3Kkn2A Lx2fRdIOJ+yOAkm9KUjMpkWI/j7i/mDFAbS2oHjsXUgSS6HIUyrBcagEyfmA0Qi7zl2ZMi bgn2bSILDjr95rJpKxPvgS4I1faFEvB5LSQfUB1+q10cPBe2+1JSYNmxOBzOQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsfzZ1rdPzX1g; Fri, 22 Sep 2023 17:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHsYUP047035; Fri, 22 Sep 2023 17:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHsY3M047032; Fri, 22 Sep 2023 17:54:34 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:54:34 GMT Message-Id: <202309221754.38MHsY3M047032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f079ef5b6a3c - main - lastcomm: update amd64 tests for additional timestamp resolution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f079ef5b6a3c6d8800724286675199f79b553ccb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f079ef5b6a3c6d8800724286675199f79b553ccb commit f079ef5b6a3c6d8800724286675199f79b553ccb Author: Ed Maste AuthorDate: 2023-09-22 17:51:34 +0000 Commit: Ed Maste CommitDate: 2023-09-22 17:54:24 +0000 lastcomm: update amd64 tests for additional timestamp resolution Fixes: 6f4ce7e89ba4 ("lastcomm: improve timestamp display") Sponsored by: The FreeBSD Foundation --- usr.bin/lastcomm/tests/v1-amd64.out | 56 ++++++++++++++++++------------------- usr.bin/lastcomm/tests/v2-amd64.out | 56 ++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/usr.bin/lastcomm/tests/v1-amd64.out b/usr.bin/lastcomm/tests/v1-amd64.out index bacbd57cdecf..a71556d771ca 100644 --- a/usr.bin/lastcomm/tests/v1-amd64.out +++ b/usr.bin/lastcomm/tests/v1-amd64.out @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44 -ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 11:44 -diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44 -dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 11:44 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 11:44 -find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 11:44 -egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 11:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 11:44 -awk - root 0.172 secs 0.172 us 0.000 sy 0.188 es Wed May 16 11:44 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44:38 +ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:38 +time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 11:44:38 +diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 11:44:38 +time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44:37 +dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 11:44:37 +time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 11:44:34 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 11:44:34 +time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 11:44:33 +find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 11:44:33 +time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 11:44:29 +egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 11:44:29 +time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 11:44:29 +awk - root 0.172 secs 0.172 us 0.000 sy 0.188 es Wed May 16 11:44:29 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44:29 diff --git a/usr.bin/lastcomm/tests/v2-amd64.out b/usr.bin/lastcomm/tests/v2-amd64.out index 3942b04ad3c7..4fcf219eef7d 100644 --- a/usr.bin/lastcomm/tests/v2-amd64.out +++ b/usr.bin/lastcomm/tests/v2-amd64.out @@ -1,28 +1,28 @@ -core -FDX root 0.002 secs 0.000 us 0.002 sy 0.009 es Thu May 17 05:57 -core -DX root 0.005 secs 0.000 us 0.005 sy 0.010 es Thu May 17 05:57 -cc - root 0.005 secs 0.000 us 0.005 sy 0.652 es Thu May 17 05:57 -ld - root 0.014 secs 0.005 us 0.009 sy 0.150 es Thu May 17 05:57 -as - root 0.005 secs 0.000 us 0.005 sy 0.078 es Thu May 17 05:57 -cc1 - root 0.024 secs 0.008 us 0.016 sy 0.347 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57 -1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 -ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57 -1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 -ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.013 es Thu May 17 05:57 -123456789012345 - root 0.002 secs 0.000 us 0.002 sy 0.010 es Thu May 17 05:57 -ln - root 0.003 secs 0.000 us 0.003 sy 0.003 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.246 es Thu May 17 05:57 -diff - root 0.223 secs 0.164 us 0.060 sy 0.243 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.079 es Thu May 17 05:57 -dd - root 0.076 secs 0.000 us 0.076 sy 0.076 es Thu May 17 05:57 -time - root 0.004 secs 0.000 us 0.004 sy 3.006 es Thu May 17 05:57 -sleep - root 0.002 secs 0.000 us 0.002 sy 3.002 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 9.945 es Thu May 17 05:57 -find - root 0.822 secs 0.055 us 0.767 sy 9.942 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 3.313 es Thu May 17 05:57 -egrep - root 3.247 secs 3.247 us 0.000 sy 3.310 es Thu May 17 05:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.185 es Thu May 17 05:57 -awk - root 0.163 secs 0.156 us 0.007 sy 0.164 es Thu May 17 05:57 -accton - root 0.002 secs 0.000 us 0.002 sy 0.019 es Thu May 17 05:57 +core -FDX root 0.002 secs 0.000 us 0.002 sy 0.009 es Thu May 17 05:57:17 +core -DX root 0.005 secs 0.000 us 0.005 sy 0.010 es Thu May 17 05:57:17 +cc - root 0.005 secs 0.000 us 0.005 sy 0.652 es Thu May 17 05:57:16 +ld - root 0.014 secs 0.005 us 0.009 sy 0.150 es Thu May 17 05:57:17 +as - root 0.005 secs 0.000 us 0.005 sy 0.078 es Thu May 17 05:57:17 +cc1 - root 0.024 secs 0.008 us 0.016 sy 0.347 es Thu May 17 05:57:17 +time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57:16 +1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57:16 +ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57:16 +time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57:16 +1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57:16 +ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57:16 +time - root 0.003 secs 0.000 us 0.003 sy 0.013 es Thu May 17 05:57:16 +123456789012345 - root 0.002 secs 0.000 us 0.002 sy 0.010 es Thu May 17 05:57:16 +ln - root 0.003 secs 0.000 us 0.003 sy 0.003 es Thu May 17 05:57:16 +time - root 0.003 secs 0.000 us 0.003 sy 0.246 es Thu May 17 05:57:16 +diff - root 0.223 secs 0.164 us 0.060 sy 0.243 es Thu May 17 05:57:16 +time - root 0.003 secs 0.000 us 0.003 sy 0.079 es Thu May 17 05:57:16 +dd - root 0.076 secs 0.000 us 0.076 sy 0.076 es Thu May 17 05:57:16 +time - root 0.004 secs 0.000 us 0.004 sy 3.006 es Thu May 17 05:57:13 +sleep - root 0.002 secs 0.000 us 0.002 sy 3.002 es Thu May 17 05:57:13 +time - root 0.003 secs 0.000 us 0.003 sy 9.945 es Thu May 17 05:57:03 +find - root 0.822 secs 0.055 us 0.767 sy 9.942 es Thu May 17 05:57:03 +time - root 0.003 secs 0.000 us 0.003 sy 3.313 es Thu May 17 05:57:00 +egrep - root 3.247 secs 3.247 us 0.000 sy 3.310 es Thu May 17 05:57:00 +time - root 0.003 secs 0.000 us 0.003 sy 0.185 es Thu May 17 05:57:00 +awk - root 0.163 secs 0.156 us 0.007 sy 0.164 es Thu May 17 05:57:00 +accton - root 0.002 secs 0.000 us 0.002 sy 0.019 es Thu May 17 05:57:00 From nobody Fri Sep 22 18:47:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsh9617d4z4vFjx; Fri, 22 Sep 2023 18:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsh960cvDz4dcX; Fri, 22 Sep 2023 18:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695408474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UuXVe3Aq40YU0VyP2PZv2opxfwK5zY4gbM1fNEw+DUw=; b=lYFRWiKQovKlINI+SQvE0j9hsZs9H79bO1zVeuBxtH30REyc9t/H6xU1jnDVkYNrjBBr1g cQFKiIUnAEVdFkVU/0v0oiPESlScKvL+nDnXwdVkDdMXH7E2fJbd43kSy3wXgONwddz/yR uPe+ZHxQBwZcz0kaGpMFyTwRBKGtQK35CbHmQD9ZRwGbhUe7suxSdoLcqjiXqvfSB2eavl oEWz+jm/sj05Oh7d9Y8FbQlPSauJ6iJOHntXzqReQppgjarc8+g5ruFYlGk0pBlAwq2j8w HbiW4Jp/pa9ur0aU0TQAWp2j4lMc/xiPlwV5eqxZ2Dl6t78J4GB+ytfkyviNwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695408474; a=rsa-sha256; cv=none; b=Hi2CkDHIUP2nGWkCd4ihtfuaqbrM72lc6SO+zOWuqWtI8U7a9I7NnKa5ptqM9Aywx2B4hU HucgXkD2fJ/+TPLwlCMh+Q2UQ6WFDYwv/zbaT4u/g2DpMVXrs6tMmLPk/OfmmYuCEN7ujy 9ucRAUxNmY+B4h5pBE/HyQlMlYsb4Hiu4A2Dl51kjy/ZiTMwZSqd6tsb9xsDYPa1NqBeI7 Y4loZBNHGNnPyXmBozv96vhOvNV3DyVW3XUdOOG3L6A9FuUU5jmQwl3sIkrnL92o/JO6uw 0hk1LGWeX5Zir6szsbCdmw7qvFSpU+EkiCBazXKbjI3TGmUV1TUiYER+sMDDrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695408474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UuXVe3Aq40YU0VyP2PZv2opxfwK5zY4gbM1fNEw+DUw=; b=R6GjO0Kashp8AIVN0ZCP0khw1BsOw1mBtiGXJDFvO56/bVwusvlbfr8q+wtB36l3JMVSr5 ztA5bn2UhHyJSKKTQZwp3gHuw1kug71ar9BpqHQfytk/mRdiH6iuu+xTA6E2kdbibnKxuR X/QuZLTDfwAd74G3GbJQUIyWD5pZU0DEX9imj0rO2w0gqkxaP6gwYcpJG2NCFSqRI2ymMh CLvAYeI39YHjlhcovMMWX+nAnLoot7BGiTEizGj63WAEf2CdJGQOF02RUDX1uoyzz7dTku Kd0GdpMmLQPbBNYD3vT/UNgyatw8dYgJ/0+v3UMvzBmHGdTuFbeS3CdaqNlH0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsh956nCfzYYx; Fri, 22 Sep 2023 18:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MIlrv9031136; Fri, 22 Sep 2023 18:47:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MIlrZZ031134; Fri, 22 Sep 2023 18:47:53 GMT (envelope-from git) Date: Fri, 22 Sep 2023 18:47:53 GMT Message-Id: <202309221847.38MIlrZZ031134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 407e2d7cf1b6 - main - lastcomm: update i386 tests for additional timestamp resolution List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 407e2d7cf1b6762c9768eaff60500b8d007cd81c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=407e2d7cf1b6762c9768eaff60500b8d007cd81c commit 407e2d7cf1b6762c9768eaff60500b8d007cd81c Author: Ed Maste AuthorDate: 2023-09-22 18:46:52 +0000 Commit: Ed Maste CommitDate: 2023-09-22 18:47:03 +0000 lastcomm: update i386 tests for additional timestamp resolution Fixes: 6f4ce7e89ba4 ("lastcomm: improve timestamp display") Sponsored by: The FreeBSD Foundation --- usr.bin/lastcomm/tests/v1-i386.out | 56 +++++++++++++++++++------------------- usr.bin/lastcomm/tests/v2-i386.out | 56 +++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/usr.bin/lastcomm/tests/v1-i386.out b/usr.bin/lastcomm/tests/v1-i386.out index 91a7d166eee9..e30c5c7cfc2c 100644 --- a/usr.bin/lastcomm/tests/v1-i386.out +++ b/usr.bin/lastcomm/tests/v1-i386.out @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 -cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34 -ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34 -as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34 -cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34 -diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 -dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34 -find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34 -time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33 -egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33 -time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33 -awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34:08 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34:08 +cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34:07 +ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34:08 +as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34:08 +cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34:07 +diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34:07 +dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34:07 +time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34:04 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34:04 +time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34:00 +find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34:00 +time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33:55 +egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33:55 +time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33:55 +awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33:55 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33:55 diff --git a/usr.bin/lastcomm/tests/v2-i386.out b/usr.bin/lastcomm/tests/v2-i386.out index e09fd71b811d..7200c1f9dfe8 100644 --- a/usr.bin/lastcomm/tests/v2-i386.out +++ b/usr.bin/lastcomm/tests/v2-i386.out @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.005 es Fri May 18 12:13 -core -DX root 0.002 secs 0.000 us 0.002 sy 0.005 es Fri May 18 12:13 -cc - root 0.002 secs 0.000 us 0.002 sy 0.048 es Fri May 18 12:13 -ld - root 0.028 secs 0.019 us 0.009 sy 0.028 es Fri May 18 12:13 -as - root 0.002 secs 0.002 us 0.000 sy 0.002 es Fri May 18 12:13 -cc1 - root 0.016 secs 0.016 us 0.000 sy 0.016 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 0.002 es Fri May 18 12:13 -1234567890123456 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -time - root 0.001 secs 0.001 us 0.000 sy 0.002 es Fri May 18 12:13 -1234567890123456 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 0.002 es Fri May 18 12:13 -123456789012345 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 0.425 es Fri May 18 12:13 -diff - root 0.423 secs 0.392 us 0.031 sy 0.424 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 0.028 es Fri May 18 12:13 -dd - root 0.025 secs 0.000 us 0.025 sy 0.026 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 3.002 es Fri May 18 12:13 -sleep - root 0.001 secs 0.000 us 0.001 sy 3.001 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 0.250 es Fri May 18 12:13 -find - root 0.248 secs 0.078 us 0.171 sy 0.249 es Fri May 18 12:13 -time - root 0.001 secs 0.000 us 0.001 sy 6.724 es Fri May 18 12:12 -egrep - root 6.680 secs 6.680 us 0.000 sy 6.722 es Fri May 18 12:12 -time - root 0.001 secs 0.000 us 0.001 sy 0.450 es Fri May 18 12:12 -awk - root 0.448 secs 0.448 us 0.000 sy 0.449 es Fri May 18 12:12 -accton - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:12 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.005 es Fri May 18 12:13:04 +core -DX root 0.002 secs 0.000 us 0.002 sy 0.005 es Fri May 18 12:13:04 +cc - root 0.002 secs 0.000 us 0.002 sy 0.048 es Fri May 18 12:13:03 +ld - root 0.028 secs 0.019 us 0.009 sy 0.028 es Fri May 18 12:13:04 +as - root 0.002 secs 0.002 us 0.000 sy 0.002 es Fri May 18 12:13:04 +cc1 - root 0.016 secs 0.016 us 0.000 sy 0.016 es Fri May 18 12:13:03 +time - root 0.001 secs 0.000 us 0.001 sy 0.002 es Fri May 18 12:13:03 +1234567890123456 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +time - root 0.001 secs 0.001 us 0.000 sy 0.002 es Fri May 18 12:13:03 +1234567890123456 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +time - root 0.001 secs 0.000 us 0.001 sy 0.002 es Fri May 18 12:13:03 +123456789012345 - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +ln - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:13:03 +time - root 0.001 secs 0.000 us 0.001 sy 0.425 es Fri May 18 12:13:03 +diff - root 0.423 secs 0.392 us 0.031 sy 0.424 es Fri May 18 12:13:03 +time - root 0.001 secs 0.000 us 0.001 sy 0.028 es Fri May 18 12:13:03 +dd - root 0.025 secs 0.000 us 0.025 sy 0.026 es Fri May 18 12:13:03 +time - root 0.001 secs 0.000 us 0.001 sy 3.002 es Fri May 18 12:13:00 +sleep - root 0.001 secs 0.000 us 0.001 sy 3.001 es Fri May 18 12:13:00 +time - root 0.001 secs 0.000 us 0.001 sy 0.250 es Fri May 18 12:13:00 +find - root 0.248 secs 0.078 us 0.171 sy 0.249 es Fri May 18 12:13:00 +time - root 0.001 secs 0.000 us 0.001 sy 6.724 es Fri May 18 12:12:53 +egrep - root 6.680 secs 6.680 us 0.000 sy 6.722 es Fri May 18 12:12:53 +time - root 0.001 secs 0.000 us 0.001 sy 0.450 es Fri May 18 12:12:53 +awk - root 0.448 secs 0.448 us 0.000 sy 0.449 es Fri May 18 12:12:53 +accton - root 0.001 secs 0.000 us 0.001 sy 0.001 es Fri May 18 12:12:53 From nobody Fri Sep 22 20:59:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsl4v5WPHz4vPMX; Fri, 22 Sep 2023 20:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsl4v52KXz3Knw; Fri, 22 Sep 2023 20:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695416367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MYL7R1Ico7AWa+D1FgzAp89Kwey4qNeGGFbfho9kcA8=; b=nXfMhVS9qEyYLvxqgDpfG2VEqRJnezGKS8NOlIhPeAtDQVsq8DdMaM3jhQFG6i15dZvlHJ 2oKqaQmO9DUfzV09MfmSxTO95ykORn1xdiGnHlebxLFERi9sbLg1+YMawwftJeOa5AOJcq uJweEycI7i82xHjestuqt70nZ8b1e64OkApmhgnGyaQB04UI2N1oeeDqBZjeN9v91VK1lJ XHUcJXhrD2yPpR4LVIX4XGg3N0MVdfrYL0j4jSoNdePZwHF1FxCYY9bY9mS+sFQ54SF9fX mIEcfPb+AUYcnAb9ea2s0w9OzpGrel1V+PGW8FpKOt/DRadLQJfK9gn58J3b6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695416367; a=rsa-sha256; cv=none; b=kkZFLYPq63MuIjEwdoj4cgrfY/Ty1TBn66hidknQKdNoHoY0oyW8n6EvkuF9O8WQqtPB1G qMXXIJkFbjgL4AQqpTlnvS1PoYBwv4oWlzAYJIXB5yKTUqKCD5efWRcFO8Dt4Qr7i6K8FE LD4C2yaDj6Bfei6hZC5mNbNQ5UGXzNxHp3Rf6MoTMIjg7VHe3H6Y4Q9ZQh3mHNfghy65gd I81G1tdMVlFYdLBuLCvrPwCSg/Kmp9GQlVFkI3P58C1lO3v1siYFO9PPalSVbhMrXTvQkS uk+IGTO7SLjfn96irTJwrPKxBRp8HD2IujOxTVk+JhNon/uUpz9Kc0sgAxTTSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695416367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MYL7R1Ico7AWa+D1FgzAp89Kwey4qNeGGFbfho9kcA8=; b=ouWIyon7gquyWDpvkw2Bd3I2CymCZ1Tw1X8Ses1mx/g/A1+ia+9qwtjPCN5YKH1cvb5oGe SER4cWtxg3gljcFqkZm/LmTc9xFLgbm8apPC6URJFhi/n3YNSLFxLefgo3nxhY7fE1B1on gntMOi5DSG++6lb/Q1aAJeIFkr2sn1Q1tHPN3mdBKrJRPgepgy1VeU7+XelNshyl8VELHT qiJRiveO51/05c5gQH3MY6UBsqzZLXBJhM/CEkysVpAWlurMAsTfm5TwSeE07qJlKAAO8O 91rr1FM2T6iJvi15LeCyUuVRSV5QKNYF1qoGE4y0qWI0+t6o0ns5RVjqAcc+Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsl4v3rsvzcRT; Fri, 22 Sep 2023 20:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MKxRCD047266; Fri, 22 Sep 2023 20:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MKxRdk047263; Fri, 22 Sep 2023 20:59:27 GMT (envelope-from git) Date: Fri, 22 Sep 2023 20:59:27 GMT Message-Id: <202309222059.38MKxRdk047263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 02cbc029dac9 - main - vfs: fix reference counting/locking on LK_UPGRADE error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02cbc029dac936b4ddbc38cef969c4b30c9a7d1f Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=02cbc029dac936b4ddbc38cef969c4b30c9a7d1f commit 02cbc029dac936b4ddbc38cef969c4b30c9a7d1f Author: Olivier Certner AuthorDate: 2023-09-22 20:57:20 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 20:57:37 +0000 vfs: fix reference counting/locking on LK_UPGRADE error Factoring out this code unfortunately introduced reference and lock leaks in case of failure in the lock upgrade path under VV_CROSSLOCK. In terms of practical use, this impacts unionfs (and nullfs in a corner case). Fixes: 80bd5ef07025 ("vfs: factor out mount point traversal to a dedicated routine") MFC after: 3 days MFC to: stable/14 releng/14.0 Sponsored by: The FreeBSD Foundation Reviewed by: mjg [mjg: massaged the commit message a little bit] Differential Revision: https://reviews.freebsd.org/D41731 --- sys/kern/vfs_lookup.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 151253ffa0f5..d75351c34314 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -905,8 +905,15 @@ vfs_lookup_cross_mount(struct nameidata *ndp) crosslkflags |= LK_EXCLUSIVE | LK_CANRECURSE; } else if ((crosslkflags & LK_EXCLUSIVE) != 0) { error = vn_lock(dp, LK_UPGRADE); - if (error != 0) + if (error != 0) { + MPASS(error == ENOENT); + vrele(dp); + if (dp != ndp->ni_dvp) + vput(ndp->ni_dvp); + else + vrele(ndp->ni_dvp); break; + } if (dp->v_mountedhere != mp) { continue; } From nobody Fri Sep 22 21:26:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rslhf0sBwz4vRRf; Fri, 22 Sep 2023 21:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rslhf0KLTz3MwK; Fri, 22 Sep 2023 21:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695418018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0Yt0YWeEfibjmcjLoZR2cPf02REcdVrL50N6o98p6Q=; b=AbOTVebfGvxTQiFYCjz5Cnl415GKWeWy2VRLekLRlFPdkWN3wtSOWkCc03l480HPC+AAhl dfuYDibY6Z8iFSccuUnQ+eNlAHjOHcb0XNlF10W6OKCHdfBW42sdMG5DJxLtarM7u6KD38 TYhnNHu8DYBV+b4Wv9smbEzDuiV4h1o14utSjddgSG40ak3c/SOIkNWTKBny91oBSsPXq9 yuxSLinXyBKgkx4dykYrks5SvkR9ngoXbtn7xRsd3qCmeF4rLR7HMoQHlWjbE0jjjk9e6a LnrCYekwUcp++NmiV1j5n/gm7s9XpnDqi7ADiGBpAxh325QNJLYXS1kgTkQzWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695418018; a=rsa-sha256; cv=none; b=sgcJvW0A68Ecb24Q2kay30cYN88QKz0sdXaECWfHeZDGK/8CdyhmnvIzIEpZQWm25M+TKn jHv3jcsneTLHdENV3J8mjI55pXzpDIRzM6oWq0+82vcijdJjs7YLVS3+yu3q2cjpoS+IaU KUnEJ+xWxDh419BUR56EpoiVsM9pbELzU0CKIVx67R+sD3d1hBaaqpyZ946bCitdCmwlFG pAX3TExZ0rbhH9atyTdJKk3iOcDPzwLu7yg0sw11U/ykNZqzqj32VqLmKXngEjFZuPWxb2 89mpkm7Cu6KMQiTRm7KrbF9JayvwvbHYl2nYnT2TKervkQsaF+crBn9HTFhaUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695418018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0Yt0YWeEfibjmcjLoZR2cPf02REcdVrL50N6o98p6Q=; b=sGNIag2ApCEodXPS/ioLglqYDoC8EC5KRV9JIL9ggC/mRl3I+9flswZQCe+AKzm+BPdd05 aLXx6Z+fNKN3DQOfbScjc8Ms/fqDy2qRDhjk0YL22hlOQKC6lgSB2Rq52wU3zNqQWnGVXe YGfXEpzJzEiV12lyuX2FrUj6vGbe32QYcWnnsjWcFQwwy7ywynMZzTApxLFPnxwXfIdqQz CdInwjx13yZLEXKWYSwxdpexxkOsoeyX6t1lkRFyJn3lW3CopFCgj4xuwIFp5vJHGBET7H G7bHm8VypvO4hW7DbncGMFGMHR56q+hGHfQ1BJCb/u89aGdif3xpp1h98ZHwiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rslhd6QbVzd4f; Fri, 22 Sep 2023 21:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MLQvMa097188; Fri, 22 Sep 2023 21:26:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MLQvxO097185; Fri, 22 Sep 2023 21:26:57 GMT (envelope-from git) Date: Fri, 22 Sep 2023 21:26:57 GMT Message-Id: <202309222126.38MLQvxO097185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 02ef039c284b - main - vfs cache: Drop known argument of internal cache_recalc_neg_min() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ef039c284b8a7b1ea40f5f9a851a3cb6af5b31 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=02ef039c284b8a7b1ea40f5f9a851a3cb6af5b31 commit 02ef039c284b8a7b1ea40f5f9a851a3cb6af5b31 Author: Olivier Certner AuthorDate: 2023-09-22 21:25:41 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 21:25:50 +0000 vfs cache: Drop known argument of internal cache_recalc_neg_min() 'ncnegminpct' is to be passed always, so just drop the unneeded parameter. Sponsored by: The FreeBSD Foundation Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D41763 --- sys/kern/vfs_cache.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 0f4d7526ebb5..fdfa4fde2c07 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -990,10 +990,10 @@ SYSCTL_PROC(_vfs_cache, OID_AUTO, nchstats, CTLTYPE_OPAQUE | CTLFLAG_RD | "VFS cache effectiveness statistics"); static void -cache_recalc_neg_min(u_int val) +cache_recalc_neg_min(void) { - neg_min = (ncsize * val) / 100; + neg_min = (ncsize * ncnegminpct) / 100; } static int @@ -1012,7 +1012,7 @@ sysctl_negminpct(SYSCTL_HANDLER_ARGS) if (val < 0 || val > 99) return (EINVAL); ncnegminpct = val; - cache_recalc_neg_min(val); + cache_recalc_neg_min(); return (0); } @@ -2652,7 +2652,7 @@ nchinit(void *dummy __unused) VFS_SMR_ZONE_SET(cache_zone_large_ts); ncsize = desiredvnodes * ncsizefactor; - cache_recalc_neg_min(ncnegminpct); + cache_recalc_neg_min(); nchashtbl = nchinittbl(desiredvnodes * 2, &nchash); ncbuckethash = cache_roundup_2(mp_ncpus * mp_ncpus) - 1; if (ncbuckethash < 7) /* arbitrarily chosen to avoid having one lock */ @@ -2796,7 +2796,7 @@ cache_changesize(u_long newmaxvnodes) } } ncsize = newncsize; - cache_recalc_neg_min(ncnegminpct); + cache_recalc_neg_min(); cache_changesize_set_new(new_nchashtbl, new_nchash); cache_unlock_all_buckets(); cache_unlock_all_vnodes(); From nobody Fri Sep 22 21:33:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rslqx0kz3z4vRrc; Fri, 22 Sep 2023 21:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rslqw6gkvz3NFN; Fri, 22 Sep 2023 21:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695418396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d5jKjX2uCYF+1ckakEOY3gJyexwVaOW3t46dLaZ/FE0=; b=uRFpasmAot+f7Ky7uOw18Kuw0G2p50j2c3DgTFyNRKj/T9aalspCpDuHtY5YC3b/IKWeq2 yicdW2rmSxo5joJntCBuMguKtCKgZ6KMNKcyxUlRiHNLKH3bfnLicV0ARPD6lcYHJH8Ab7 w2ws1WMR5kNfVG3a3kf+RYC3/Lrfst6COuiUQPSeYJRh1jH/tub6FHJCcrbVajpuUIN6Le +RUcuyHL+MwtsYw1+ZVxV5wcOB6fgb0UbU794ruK2gLTkH9+nZ0LlRG3/4u3nbaSSlFNzs Ud8aulUkzLKAHs5KVV5qSL3jGUt3PFzl2SQ52B1xFbtK4OyTJdMYg5jD+MrVWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695418396; a=rsa-sha256; cv=none; b=DdADDaQohpGggP35nnBA7hmpuoy9/xBsfvqvCqfa0d71FxPgHyRTiF0ZUX1si/1XOqCtG+ NK9EHBciZ2uRmMaDTCJdnZP+ZdPdREtZoHKtx3G8lGL3/iZ0lMhoB3gBR8aPO0H8egTNDh TlxRIL6zVIhBZ/9aHsT1uXpjJabf+QVWQNohbCvC5tqs6F2owdm1qNPpS7xt8KNBM77ruA XbF9SDLbh4iucq+AuixzBeK/aWiwGYzH9FCyfwnQH+7PMlCm7oY7d1AKwwSaWDryZSOJn6 2Z4FVVydXY+l271t9QMWmtQ+SZp24zjczzbjrBuIcyviuCyot0MSy0CC2ouLQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695418396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d5jKjX2uCYF+1ckakEOY3gJyexwVaOW3t46dLaZ/FE0=; b=HIW6G4hetBaA7ZaVu/8DIPchWmgxfUZYmAIjQL+PFyeRP5qKjj77eFEquB14gyfh8cpxBh IrRpnPOAxDdBkgvoXA4zCeLatCU7sQjJPRmCmFUcYt6EviIfyRpoY6aLzeNGIRmAC0z7g2 pZRoEAtQS+8Ri68L2WZvJhPEcXGW8RpZeFyAzXn9dPWxpNT5VgYEeqVu7NgT6zWrDP+g9e UZL7Gf6hUrdnVKuw9WFlmXNyf7917OW7Pl0+cXvxvgBzfMxDVFwr2sp5at2IZ5GserOD0k Lq2c4IyMbCbKMmszomTxxpJWkHF+dkJHShka5L6zo24Z9I1bicic0hbrF/CChw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rslqw5lSyzdYM; Fri, 22 Sep 2023 21:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MLXG2f013455; Fri, 22 Sep 2023 21:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MLXGTO013452; Fri, 22 Sep 2023 21:33:16 GMT (envelope-from git) Date: Fri, 22 Sep 2023 21:33:16 GMT Message-Id: <202309222133.38MLXGTO013452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 33fdf1afaea9 - main - vfs cache: mark vfs.cache.param.size as read-only List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33fdf1afaea931eaa5dd14e6c097d7ffafe2fb1a Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=33fdf1afaea931eaa5dd14e6c097d7ffafe2fb1a commit 33fdf1afaea931eaa5dd14e6c097d7ffafe2fb1a Author: Mateusz Guzik AuthorDate: 2023-09-22 21:32:23 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 21:32:23 +0000 vfs cache: mark vfs.cache.param.size as read-only It was not meant to be writable and writes don't work correctly as they fail to resize the hash. --- sys/kern/vfs_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index fdfa4fde2c07..1edd8fad0e89 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -405,7 +405,7 @@ static SYSCTL_NODE(_vfs_cache, OID_AUTO, param, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "Name cache parameters"); static u_int __read_mostly ncsize; /* the size as computed on creation or resizing */ -SYSCTL_UINT(_vfs_cache_param, OID_AUTO, size, CTLFLAG_RW, &ncsize, 0, +SYSCTL_UINT(_vfs_cache_param, OID_AUTO, size, CTLFLAG_RD, &ncsize, 0, "Total namecache capacity"); u_int ncsizefactor = 2; From nobody Sat Sep 23 00:12:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsqMV3wYNz4thKs; Sat, 23 Sep 2023 00:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsqMV3Wdpz3FKk; Sat, 23 Sep 2023 00:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695427942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woq/OFwS4tKirLJB0VgaBh1rUAzBVjZoqQXIJFIakMY=; b=KmJDGlzC6RKBVh8wDvSddgG1QeI8DpSvsYHUCnbC0kNOgfCQIS5CDX3bG5BlGxdA4uMljS yXvVekcSaTIhhH+ewoiQ5FGBScWS0Z9MgrTlAwS0IyRrvb55uL/vIhD5C1UtJd5gNRo6VT 2KtC3oHAmd/4kh9tIhVZW0FL9xiJrQr6cMaQ2IMyZocmtEUnRol7NAtT54jC+n/iy+8/+N jIYiz91NFkOVD2xQCpU/UZ6jB0ZooqgfaEW9+Swtg98mgDpt0y4SK3ehqXbIMx9BtO27ut vmZBPuw+Si+NcnI3RKB9nrZ+iSHsSQBwlmfMGD3RQTplxNHmVEDO5bkuM1FN1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695427942; a=rsa-sha256; cv=none; b=iuqM9zBduftanR66S+UZRVHrhua2eEfG2+xh43G3caOG0yGQ1UbfQ/RXLDD3WwWcqK+yCw rUm6S9cp5vRRTd6qmddHENXu5i1ztsu0nkmdbsgUdmU4rp9iiODaQLKgE109kR+kxob0IQ n4gAlsOrkc/wrLyFPO+vmQowo8dh1h1qRYPp2K092g9uHe+axgRqYlG53sfklqQf6p75xn qv3VDJIZkHvs8rohBTARp40lOb98QJTtkEV5W+1IdyKayUxYX7F8zOvuMRrBE/rmX8r2w8 XL6u25Yi73Ap+nkJ2Ff1n4aNCzhnADkiLIv7CM9oeGr1S7quzjvmGt8SF4nxpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695427942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=woq/OFwS4tKirLJB0VgaBh1rUAzBVjZoqQXIJFIakMY=; b=qCIzqEPQY5oP1g0lBbfyftf0afCR5UmofwdtSrglVrzGtvlKi1h4b1I7TPCqbiyh55v3wM ZiCaY0dw/fCn+kW+3iA19fWXcHrqyJXSY3OrjAAZGKfhcRAoPl7EJgqhKoT0Mxz5GwbBoQ 7HjoXD4YRkF4g2QnWQUXXTxEgGYW7HU32QLMdkWLZfWkiOKOJgoU+nH+dP4rwgefvBD1fr zpuKzsCcuqpO+k8/VbS31GEbUZo18RI2YVw9iBKGC1QuIA8GGpcCHYf4lZ3OCgcSYDVIpO xZaVAGIyTS7S9cP0O69gaZhmY5JQu+Z/ARV2HW810oczx5FfpuQAWSFtlLBFzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsqMV2ZZCzjHL; Sat, 23 Sep 2023 00:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38N0CMsI092314; Sat, 23 Sep 2023 00:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38N0CMfo092311; Sat, 23 Sep 2023 00:12:22 GMT (envelope-from git) Date: Sat, 23 Sep 2023 00:12:22 GMT Message-Id: <202309230012.38N0CMfo092311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: bb124a0f611a - main - vfs cache: retire dothits and dotdothits counters List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb124a0f611a1288c8496e3b33494f23ba929ca1 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bb124a0f611a1288c8496e3b33494f23ba929ca1 commit bb124a0f611a1288c8496e3b33494f23ba929ca1 Author: Mateusz Guzik AuthorDate: 2023-09-23 00:08:49 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-23 00:08:49 +0000 vfs cache: retire dothits and dotdothits counters They demonstrate nothing, and in case of dotdot they are not even hits. This is just a count of lookups with "..", which are not worth mentioniong. --- sys/kern/vfs_cache.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 1edd8fad0e89..12b9f2d74641 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -530,8 +530,6 @@ STATNODE_ULONG(neg, numneg, "Number of negative cache entries"); STATNODE_ULONG(count, numcache, "Number of cache entries"); STATNODE_COUNTER(heldvnodes, numcachehv, "Number of namecache entries with vnodes held"); STATNODE_COUNTER(drops, numdrops, "Number of dropped entries due to reaching the limit"); -STATNODE_COUNTER(dothits, dothits, "Number of '.' hits"); -STATNODE_COUNTER(dotdothits, dotdothits, "Number of '..' hits"); STATNODE_COUNTER(miss, nummiss, "Number of cache misses"); STATNODE_COUNTER(misszap, nummisszap, "Number of cache misses we do not want to cache"); STATNODE_COUNTER(poszaps, numposzaps, @@ -1782,7 +1780,6 @@ cache_lookup_dot(struct vnode *dvp, struct vnode **vpp, struct componentname *cn int ltype; *vpp = dvp; - counter_u64_add(dothits, 1); SDT_PROBE3(vfs, namecache, lookup, hit, dvp, ".", *vpp); if (tsp != NULL) timespecclear(tsp); @@ -1827,7 +1824,6 @@ cache_lookup_dotdot(struct vnode *dvp, struct vnode **vpp, struct componentname return (0); } - counter_u64_add(dotdothits, 1); retry: dvlp = VP2VNODELOCK(dvp); mtx_lock(dvlp); @@ -5131,7 +5127,6 @@ cache_fplookup_dot(struct cache_fpl *fpl) fpl->tvp = fpl->dvp; fpl->tvp_seqc = fpl->dvp_seqc; - counter_u64_add(dothits, 1); SDT_PROBE3(vfs, namecache, lookup, hit, fpl->dvp, ".", fpl->dvp); error = 0; @@ -5220,7 +5215,6 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) return (cache_fpl_aborted(fpl)); } - counter_u64_add(dotdothits, 1); return (0); } From nobody Sat Sep 23 06:28:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RszjN1prxz4v7TQ; Sat, 23 Sep 2023 06:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RszjN19DPz4Hm4; Sat, 23 Sep 2023 06:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695450504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ItnTaFUjfRK1HkSBl9i/psjmwk5t1K6QwqHHhBfZJM=; b=peByTxCMUafvFsatd7HwBcZhaH9g4EMMAFI0yJuy75u+qp1GV5ZYWnT+AbqtmYB62DnZgR Nkq2x/sbQAHoItvcDJi/aUVQzwbHtQBNTo0D2y2U93pq/pvu15Mud/3j4fEWpta7bZAp5O 7w8Rmz9+dch1ntM9W9oKYO6e7X361slHkoov2bo9ihio/NFP1F1WBHQAPvFfoZ0kupWig8 YuE3qDneuLSh1U9xJB1AgIVpl++s9klKSq2Lahc1TlGTyBEfofkewj9bvm6TfINYjmMRDh OPvSmSVm+FRxHbd2Mdd34mvm1VIHVYTLFd/OiFBDuJHLjUqGGhKJu8A2MU2cXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695450504; a=rsa-sha256; cv=none; b=miGthH1iYWzEXGJBtiX0Iz24EROM0mpHvaJpduul2algWQa15PrfXeSC/1utPoUt3bKaEW 2FykOi+RobZ2PBGGKCFmqbVBWckObaKxccG6hqjTtSPO0mGrNl4V4ZPN8Ru8+iw02o88p4 exSUIZErAn92ArPA5d9K9dQ7bkNjvny3yyh5n9o8orbdbLDgG4kbMrkYEojU9fpa2bQJc1 2EzxWvPU1NzfA8t54/PJirXXtJhEdimVivCqBt+kean8UVWntrJWewWYEJs9AE+7ER4GBg OxXJaPbvYX5dmWy+Q2K9ITovQ6Z4Z/ZxjUVbKieyNt0LyBHuSK0SfbA3AdzQjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695450504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ItnTaFUjfRK1HkSBl9i/psjmwk5t1K6QwqHHhBfZJM=; b=m8TE7juA4rZVzu+Z/AUPYljDv8Awr8Cy0t/5sGJXjVMExvDaUAZensqYbOUj4NepahZ6PO Ok9W+vSKQ1UxhE/C24NKGqwDcZTKyfqQK+mDuHDxe/4YhnT0g6K6yyqhFA0q/Y8h8EPgdH TnzKNreZFBi4yps2VYRghS8K9DwaPNH+4k1WWoKgEZKCN50m5BAOU/2e+qN+pcDOwWNMyW vz2EZis+ReNvAYKG8N90IoGcP5zJhXWFH3EV+47Pp4xlxN43idYlsoYG0LwiOFrbZunbcN jQG3VJTyLDCzQqjJtKp70PVNQxL+YQamyJ2m57UkE0+DbBxc4ui69MD16eluag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RszjN0C1Dzt5B; Sat, 23 Sep 2023 06:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38N6SNCg008193; Sat, 23 Sep 2023 06:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38N6SNw8008190; Sat, 23 Sep 2023 06:28:23 GMT (envelope-from git) Date: Sat, 23 Sep 2023 06:28:23 GMT Message-Id: <202309230628.38N6SNw8008190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: f9df60975087 - main - Add support for host32 for DIRDEPS_BUILD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9df609750876be2c054dfac953316f513ccffce Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f9df609750876be2c054dfac953316f513ccffce commit f9df609750876be2c054dfac953316f513ccffce Author: Simon J. Gerraty AuthorDate: 2023-09-23 06:27:37 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-23 06:27:37 +0000 Add support for host32 for DIRDEPS_BUILD Allow building 32bit libs for host. Move CFLAGS additions from local.sys.dirdeps.mk (which is too early and impacts CFLAGS defaults) to local.sys.mk Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41946 --- share/mk/host-target.mk | 44 ++++++++++++++++++++++++++++----------- share/mk/local.dirdeps.mk | 6 ++++++ share/mk/local.init.mk | 6 +++--- share/mk/local.sys.dirdeps.env.mk | 15 +++++++++++-- share/mk/local.sys.dirdeps.mk | 10 ++------- share/mk/local.sys.machine.mk | 3 ++- share/mk/local.sys.mk | 7 +++++++ share/mk/src.init.linux.mk | 3 +++ share/mk/src.opts.mk | 2 +- tools/build/Makefile | 2 ++ 10 files changed, 71 insertions(+), 27 deletions(-) diff --git a/share/mk/host-target.mk b/share/mk/host-target.mk index f528db9c6d24..d8abea17fdac 100644 --- a/share/mk/host-target.mk +++ b/share/mk/host-target.mk @@ -1,32 +1,40 @@ # RCSid: -# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $ +# $Id: host-target.mk,v 1.19 2023/09/21 06:44:53 sjg Exp $ # Host platform information; may be overridden +.if !target(__${.PARSEFILE}__) +__${.PARSEFILE}__: .NOTMAIN + .if !defined(_HOST_OSNAME) -_HOST_OSNAME != uname -s +# use .MAKE.OS if available +_HOST_OSNAME := ${.MAKE.OS:U${uname -s:L:sh}} .export _HOST_OSNAME .endif .if !defined(_HOST_OSREL) _HOST_OSREL != uname -r .export _HOST_OSREL .endif -.if !defined(_HOST_MACHINE) -_HOST_MACHINE != uname -m -.export _HOST_MACHINE -.endif .if !defined(_HOST_ARCH) -# for NetBSD prefer $MACHINE (amd64 rather than x86_64) -.if ${_HOST_OSNAME:NNetBSD} == "" -_HOST_ARCH := ${_HOST_MACHINE} -.else _HOST_ARCH != uname -p 2> /dev/null || uname -m # uname -p may produce garbage on linux .if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == "" -_HOST_ARCH := ${_HOST_MACHINE} -.endif +_HOST_ARCH = ${_HOST_MACHINE} +.elif ${_HOST_OSNAME:NDarwin} == "" && ${_HOST_ARCH:Narm:Ni386} == "" +# _HOST_MACHINE is more explicit/useful +_HOST_ARCH = ${_HOST_MACHINE} .endif .export _HOST_ARCH .endif +.if !defined(_HOST_MACHINE) +_HOST_MACHINE != uname -m +# just in case +_HOST_ARCH := ${_HOST_ARCH} +# uname -m may produce garbage on darwin ppc +.if ${_HOST_MACHINE:[\#]} > 1 +_HOST_MACHINE := ${_HOST_ARCH} +.endif +.export _HOST_MACHINE +.endif .if !defined(HOST_MACHINE) HOST_MACHINE := ${_HOST_MACHINE} .export HOST_MACHINE @@ -37,8 +45,20 @@ HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARC HOST_OS := ${_HOST_OSNAME} host_os := ${_HOST_OSNAME:tl} HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH} +# sometimes we want HOST_TARGET32 +MACHINE32.amd64 = i386 +MACHINE32.x86_64 = i386 +.if !defined(_HOST_ARCH32) +_HOST_ARCH32 := ${MACHINE32.${_HOST_ARCH}:U${_HOST_ARCH:S,64$,,}} +.export _HOST_ARCH32 +.endif +HOST_TARGET32 := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH32} + +.export HOST_TARGET HOST_TARGET32 # tr is insanely non-portable, accommodate the lowest common denominator TR ?= tr toLower = ${TR} 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' toUpper = ${TR} 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + +.endif diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 7b4a1fdf426d..99782b856d41 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -22,7 +22,9 @@ DIRDEPS_FILTER.host = \ Ninclude* \ Nlib/csu* \ Nlib/libc \ + Nlib/libcompiler_rt \ Nlib/[mn]* \ + Nlib/lib[t]* \ Ngnu/lib/lib[a-r]* \ Nsecure/lib* \ Nusr.bin/xinstall* \ @@ -50,6 +52,8 @@ N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToS DIRDEPS_FILTER.host+= ${N_host_libs} .endif +DIRDEPS_FILTER.host32 = ${DIRDEPS_FILTER.host} + DIRDEPS_FILTER+= \ Nbin/cat.host \ ${DIRDEPS_FILTER.xtras:U} @@ -107,6 +111,7 @@ DIRDEPS += \ cddl/usr.bin/ctfmerge.host .endif +.if ${DEP_MACHINE:Nhost*} != "" # Add in proper libgcc (gnu or LLVM) if not building libcc and libc is needed. # Add both gcc_s and gcc_eh as dependencies as the decision to build # -static or not is not known here. @@ -115,6 +120,7 @@ DIRDEPS+= \ lib/libgcc_eh \ lib/libgcc_s .endif +.endif # Bootstrap support. Give hints to DIRDEPS if there is no Makefile.depend* # generated yet. This can be based on things such as SRC files and LIBADD. diff --git a/share/mk/local.init.mk b/share/mk/local.init.mk index d9477fd22827..758a3604d73a 100644 --- a/share/mk/local.init.mk +++ b/share/mk/local.init.mk @@ -13,7 +13,7 @@ __${_this}__: # XXX: This should be combined with external compiler support in Makefile.inc1 # and local.meta.sys.mk (CROSS_TARGET_FLAGS) -.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT) && ${MACHINE} != "host" +.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT) && ${MACHINE:Nhost*} != "" CFLAGS_LAST+= --sysroot=${SYSROOT} CXXFLAGS_LAST+= --sysroot=${SYSROOT} LDADD+= --sysroot=${SYSROOT} @@ -29,8 +29,8 @@ CFLAGS+= -isystem${ISYSTEM} LDADD+= -L${STAGE_LIBDIR} .endif -.if ${MACHINE} == "host" -.if ${.MAKE.DEPENDFILE:E} != "host" +.if ${MACHINE:Nhost*} == "" +.if ${.MAKE.DEPENDFILE:E:Nhost*} != "" UPDATE_DEPENDFILE?= no .endif HOST_CFLAGS+= -DHOSTPROG diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk index bbac39935ad8..fdcb25b67e31 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -24,17 +24,28 @@ BOOT_MACHINE_DIR.$m ?= stand/$m .endfor HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} +HOST_OBJTOP32 ?= ${OBJROOT}${HOST_TARGET32} +.if ${.MAKE.LEVEL} == 0 .if ${REQUESTED_MACHINE:U${MACHINE}} == "host" MACHINE= host .if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} # not what we want TARGET_MACHINE= host .endif +.elif ${REQUESTED_MACHINE:U${MACHINE}} == "host32" +MACHINE= host32 .endif -.if ${MACHINE} == "host" -OBJTOP := ${HOST_OBJTOP} +.endif + +.if ${MACHINE:Nhost*} == "" MACHINE_ARCH= ${MACHINE_ARCH_${MACHINE}} +.if ${MACHINE} == "host32" +.MAKE.DEPENDFILE_PREFERENCE= \ + ${.CURDIR}/${.MAKE.DEPENDFILE_PREFIX}.host32 \ + ${.CURDIR}/${.MAKE.DEPENDFILE_PREFIX}.host \ + ${.CURDIR}/${.MAKE.DEPENDFILE_PREFIX} +.endif .endif diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk index ce4843482179..357b6e2aa5ff 100644 --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -43,7 +43,7 @@ LDFLAGS_LAST+= -L${STAGE_LIBDIR} .-include "local.toolchain.mk" -.if ${.MAKE.LEVEL} > 0 && ${MACHINE} == "host" && ${.MAKE.DEPENDFILE:E} != "host" +.if ${.MAKE.LEVEL} > 0 && ${MACHINE:Nhost*} == "" && ${.MAKE.DEPENDFILE:E} != "${MACHINE}" # we can use this but should not update it. UPDATE_DEPENDFILE?= NO .endif @@ -115,16 +115,10 @@ ${var}= ${HOST_${var}} .endfor .endif -.if ${MACHINE:Nhost:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE} -# cross-building .if !defined(FREEBSD_REVISION) FREEBSD_REVISION!= sed -n '/^REVISION=/{s,.*=,,;s,",,g;p; }' ${SRCTOP}/sys/conf/newvers.sh .export FREEBSD_REVISION .endif -CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} -CFLAGS+= ${CROSS_TARGET_FLAGS} -ACFLAGS+= ${CROSS_TARGET_FLAGS} -.endif # we set these here, rather than local.gendirdeps.mk # so we can ensure any DEP_* values that might be used in @@ -150,7 +144,7 @@ $V?= ${${V:S,DEP_,,}} .endfor .endif -.if ${MACHINE} == "host" && ${.MAKE.OS} != "FreeBSD" +.if ${MACHINE:Nhost*} == "" && ${.MAKE.OS} != "FreeBSD" # some makefiles expect this BOOTSTRAPPING= 0 .endif diff --git a/share/mk/local.sys.machine.mk b/share/mk/local.sys.machine.mk index fc801a7cd11c..5e40dfe805f9 100644 --- a/share/mk/local.sys.machine.mk +++ b/share/mk/local.sys.machine.mk @@ -1,10 +1,11 @@ .-include -PSEUDO_MACHINE_LIST?= common host +PSEUDO_MACHINE_LIST?= common host host32 TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv MACHINE_ARCH_host?= ${_HOST_ARCH} +MACHINE_ARCH_host32?= ${_HOST_ARCH32} MACHINE_ARCH_LIST_arm?= armv7 ${EXTRA_ARCHES_arm} MACHINE_ARCH_LIST_arm64?= aarch64 diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 59b1a7c14a7c..eb21380f051c 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -95,4 +95,11 @@ META_COOKIE_RM?= META_COOKIE_TOUCH?= META_DEPS+= ${META_NOPHONY} +.if ${MACHINE:Nhost*:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE} +# cross-building +CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} +CFLAGS+= ${CROSS_TARGET_FLAGS} +ACFLAGS+= ${CROSS_TARGET_FLAGS} +.endif + .endif diff --git a/share/mk/src.init.linux.mk b/share/mk/src.init.linux.mk index 1e351e1b41f6..536f32853d3c 100644 --- a/share/mk/src.init.linux.mk +++ b/share/mk/src.init.linux.mk @@ -1,5 +1,6 @@ # We want to build some host tools (eg makefs, mkimg) for Linux # This only gets included during DIRDEPS_BUILD when MACHINE is "host" +# or "host32" CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/linux @@ -13,3 +14,5 @@ LIBADD+= egacy m # Bring in the full GNU namespace CFLAGS+= -D_GNU_SOURCE +# for sane staging behavior +LN= ln -L diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index d7112cf57178..c234a9829fca 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -368,7 +368,7 @@ BROKEN_OPTIONS+= OFED .endif # MK_host_egacy is set by local.sys.mk so is valid here -.if ${MACHINE} == "host" && ${MK_host_egacy} == "yes" +.if ${MACHINE:Nhost*} == "" && ${MK_host_egacy} == "yes" # we cannot expect tests to work BROKEN_OPTIONS+= TESTS .endif diff --git a/tools/build/Makefile b/tools/build/Makefile index 8ad104f904ea..a19d2bf64bc6 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -126,6 +126,8 @@ CHACHA20INCS+= ${SRCTOP}/sys/crypto/chacha20/_chacha.h \ .if ${MACHINE} == "host" _host_arch= ${_HOST_ARCH} +.elif ${MACHINE} == "host32" +_host_arch= ${_HOST_ARCH32} .else _host_arch=${MACHINE} .endif From nobody Sat Sep 23 09:24:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rt3cP6F6Hz4vL1M; Sat, 23 Sep 2023 09:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rt3cP54lCz4WtX; Sat, 23 Sep 2023 09:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695461061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SAbkKhPatnu1iKrZl6Ej4yMgvE6jvMqJskApkBINWPk=; b=s+heItJ32Qk1SysrzWLgiErQujP0d/x5IGaT/isjIfHqbJIOlWEmzfngkmkL3p8yUQ1NCs zw5TL0j3bSYjzmihhxWGWLvhcdIVJVlqmbdN9wJHZHOwlPxM5Rx62Qxk2P10wEasBrmTBV CuqLVloGWes9iElHlTcMbnmE5sWTaUL4CIPFxGjUdIi2zo1g+snBoOxKHwqkTJ2tkdFyaQ TcLLb1KXdoR4k1tMl++ld8eD3p1bJoAoLFn39y9o/6UBAgvaOFWMO471WAXvbyRvj7eh+A jhe/ve9SfzTxPZQcq7jdPEWVcKQA/jKyvaUG8bpyzGWM2hHKOxR5eQFebl2UaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695461061; a=rsa-sha256; cv=none; b=UvtLzEHCQ/TJtC1l05UlEzygL8svX2ms0yekYFBv3W1dRSl7fkBSY4vgJx5HNSU8TLi5ZW 7WojE0fhhcGkJ6s9P3NjT5uolDQ/XJnCiHerXkeWFXCyyfZPck6IKRA5zdiIZQ/AfpLpPe sF6ROHYQ71jT0Rxd46Us2WlbiPcqvm6droO05Q2JhafxfLd+z9X4ypssVPcR1NQPC/zHqQ IkFxsjRzBwZXFH8WJqxIfI5g/sjPmPDbLUVCFm8DteYoG5h9ztu5pd5n926xJQDfQRULEm IhZqfUGDnp2rPGb9cc948308+D6AZP7TZxNr+oL2VmHUf2bg40sKt52sb0uxmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695461061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SAbkKhPatnu1iKrZl6Ej4yMgvE6jvMqJskApkBINWPk=; b=Jq3XoJm5RQpbeTZdINLxbxzDOPrT/58yh17+DctU5Y+WPuz9EQD2WsnNhaRw3CU5mQSx31 kInJ6ruAv3qxDOYFbhIsEdxgGr8dMTWKbIp93vdYnC1g7YDyySvnlD3d3ed7Th61QyTvk5 dL4oZdX9CqglHOE/Poedq8pBY9jyrAwo0gERICWkzuxuVDg7eGpYGb5WmQoNkqzrCn1X6v VBJfwoDclXqjxYwD/Ij7N8gCBZHNjuVf++fO++UGHQHrJrdI9j0ZNvz3C9gtsLWRMNEwxD SM4+0SnhydE9EspUDA9aYwUXtldKPxsSPdBe6qxZqrO9zX9OqpZJy7rsEdyUHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rt3cP45tbzykf; Sat, 23 Sep 2023 09:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38N9OLZr005586; Sat, 23 Sep 2023 09:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38N9OLGA005583; Sat, 23 Sep 2023 09:24:21 GMT (envelope-from git) Date: Sat, 23 Sep 2023 09:24:21 GMT Message-Id: <202309230924.38N9OLGA005583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marko Zec Subject: git: 03ef737c544d - main - ng_eiface: switch VNETs when injecting mbufs into netgraph List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03ef737c544d3dd90a0000c18382db99ccf2ee9a Auto-Submitted: auto-generated The branch main has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=03ef737c544d3dd90a0000c18382db99ccf2ee9a commit 03ef737c544d3dd90a0000c18382db99ccf2ee9a Author: Marko Zec AuthorDate: 2023-09-23 08:56:56 +0000 Commit: Marko Zec CommitDate: 2023-09-23 08:56:56 +0000 ng_eiface: switch VNETs when injecting mbufs into netgraph A ng_eiface instance may be on lease to a different vnet while remaining tied to its parent vnet. In such circumstances, before injecting mbufs into netgraph, curvnet must be set to that of the ng_eiface's netgraph node. Mark the vnet transition as QUIET, since otherwise it would be recorded as a curvnet recursion when ng_eiface's ifnet resides in the same (parent) vnet as its netgraph node. PR: 274028 Reported by: Dancho Penev MFC after: 1 week --- sys/netgraph/ng_eiface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index 40b1a1128de8..a35650f15edd 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -257,7 +257,9 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2) * freed. */ NG_OUTBOUND_THREAD_REF(); + CURVNET_SET_QUIET(priv->node->nd_vnet); NG_SEND_DATA_ONLY(error, priv->ether, m); + CURVNET_RESTORE(); NG_OUTBOUND_THREAD_UNREF(); /* Update stats */ From nobody Sat Sep 23 16:23:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtDwV0TNRz4ttRj; Sat, 23 Sep 2023 16:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtDwT734kz4Qnl; Sat, 23 Sep 2023 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEzYtgEpf/6yFRs6Gb/NK7yq24/DLYMaVcBc8gMInOU=; b=BT4ehdTQup5dn3DEF0irbdnnFwgXsEAQ1vJ4ATa7Wd5BhtW1sRw/sDyH8lRUkJcLinwJCG Fs2fvcMpXmc6XdvkuyitQF1+VUFKO4cCdWTad3lpX8FI24j7x/kX4pIcfGU7P6lNVFM7UP E98dYrLT6h+C1uvbMjlxe+4/aSiPJWloQovFSuniZ9SC8gjcZWmzhDaBd5Q78EApSaFhD3 mnHx+PVH9FrLRZUjayyOltp8phyiOhKOHNZTud6uxi2n5RcTye2ecT4QPb8FKE7Ai5f3G6 YyZyE4xRwc9ywxVvW+Y7sqzFjW7lF/4ys5tpc/CCEFqPQ8d7xQNhKf6RNxa0OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695486234; a=rsa-sha256; cv=none; b=KQRqh7bBlQ6pbWw7PlVm/MndpH7AxIpN433JH3xM06KRXqGeeR4fH/8w7yIYeJ62z6vCc+ hgL3xhqU5e/qqUqppN18TmVKj2oUGObVlMTRrDV0bQoa/oBv1PLtrmiAOEUNUzazO+xsRd gK0k6rkEL6DLUbbtRyJfpqsW2S7NOblSYrXnjoleKnv4d6W8ZqXqCWiRjh2snFchwlN4fz VI5KOe1ZUYvz2IzvcVLDKw5OziBxb13auCZOnzp6ihvd2RsGU6IUjhPLFchtA4w+BYZM9z CXl8CatHED5z1DnrnqjvpVTGDoOBZbqBKW7KiafDVNii6LiUTRYWTJCqV47nRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sEzYtgEpf/6yFRs6Gb/NK7yq24/DLYMaVcBc8gMInOU=; b=ZKjXEXY4dKUxaeosuLTk+N/4yMyj6cnyuxSJAyGzQx7g0fP0oa/nBqJ5Vj3/Jzkmt2R+mF /lFb/x9IQMt0lTb1NJa8jnnR3JG9PuUIcircEOhX+cDd7M0loT1g9UNKDepLqTdTCEAVMo SnGqjCSHws5NSQHH+rz4Iu3MY6tGp9mlkIe/tDGc6P0syEBc+V+QD+0rkgh+f4R3iPx0zO YGEoUNW4bVtfJmawhHpr3U4GouDj+fIIH6JJkPQf7ieOWIu6OfHVH2+JIEgxPzZc8RdwEB PyX7e/2HgS+fWRg8gpNQKQJ7k+hV4fP97eO3gtMbKDsRRwfA1mTcqmGVCDs/Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtDwT65wjz19mk; Sat, 23 Sep 2023 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NGNrAP003929; Sat, 23 Sep 2023 16:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NGNrmQ003926; Sat, 23 Sep 2023 16:23:53 GMT (envelope-from git) Date: Sat, 23 Sep 2023 16:23:53 GMT Message-Id: <202309231623.38NGNrmQ003926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f80babf906b7 - main - kern_sysctl: Make name2oid() non-destructive to the name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f80babf906b7be51b2a031ef26525893c7bf4e31 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f80babf906b7be51b2a031ef26525893c7bf4e31 commit f80babf906b7be51b2a031ef26525893c7bf4e31 Author: Alexander Motin AuthorDate: 2023-09-23 16:13:46 +0000 Commit: Alexander Motin CommitDate: 2023-09-23 16:13:46 +0000 kern_sysctl: Make name2oid() non-destructive to the name It is not the first time I see it panicking while trying to modify const memory. Lets make it safer and easier to use. While there, mark few functions using it also const. MFC after: 10 days --- sys/kern/kern_sysctl.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 780eb6099b07..a4bfe8e21aed 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -127,7 +127,7 @@ static int sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del, int recurse); static int sysctl_old_kernel(struct sysctl_req *, const void *, size_t); static int sysctl_new_kernel(struct sysctl_req *, void *, size_t); -static int name2oid(char *, int *, int *, struct sysctl_oid **); +static int name2oid(const char *, int *, int *, struct sysctl_oid **); static struct sysctl_oid * sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) @@ -143,6 +143,21 @@ sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) return (NULL); } +static struct sysctl_oid * +sysctl_find_oidnamelen(const char *name, size_t len, + struct sysctl_oid_list *list) +{ + struct sysctl_oid *oidp; + + SYSCTL_ASSERT_LOCKED(); + SYSCTL_FOREACH(oidp, list) { + if (strncmp(oidp->oid_name, name, len) == 0 && + oidp->oid_name[len] == '\0') + return (oidp); + } + return (NULL); +} + /* * Initialization of the MIB tree. * @@ -978,7 +993,7 @@ SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, NULL); #ifdef VIMAGE static void -sysctl_setenv_vnet(void *arg __unused, char *name) +sysctl_setenv_vnet(void *arg __unused, const char *name) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME]; @@ -1001,7 +1016,7 @@ out: } static void -sysctl_unsetenv_vnet(void *arg __unused, char *name) +sysctl_unsetenv_vnet(void *arg __unused, const char *name) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME]; @@ -1419,21 +1434,26 @@ static SYSCTL_NODE(_sysctl, CTL_SYSCTL_NEXTNOSKIP, nextnoskip, CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_CAPRD, sysctl_sysctl_next, ""); static int -name2oid(char *name, int *oid, int *len, struct sysctl_oid **oidpp) +name2oid(const char *name, int *oid, int *len, struct sysctl_oid **oidpp) { struct sysctl_oid *oidp; struct sysctl_oid_list *lsp = &sysctl__children; + const char *n; SYSCTL_ASSERT_LOCKED(); for (*len = 0; *len < CTL_MAXNAME;) { - oidp = sysctl_find_oidname(strsep(&name, "."), lsp); + n = strchrnul(name, '.'); + oidp = sysctl_find_oidnamelen(name, n - name, lsp); if (oidp == NULL) return (ENOENT); *oid++ = oidp->oid_number; (*len)++; - if (name == NULL || *name == '\0') { + name = n; + if (*name == '.') + name++; + if (*name == '\0') { if (oidpp) *oidpp = oidp; return (0); @@ -2999,7 +3019,7 @@ db_show_sysctl_all(int *oid, size_t len, int flags) * Show a sysctl by its user facing string */ static int -db_sysctlbyname(char *name, int flags) +db_sysctlbyname(const char *name, int flags) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME]; From nobody Sat Sep 23 16:26:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtF053ypYz4ttK5; Sat, 23 Sep 2023 16:27:01 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtF053Q55z4S3r; Sat, 23 Sep 2023 16:27:01 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EGfq+URLOXZNoAVV5/CUfHf1PKQcntNEWgLMSWFLJ4s=; b=VY7q+yYbk67HG64cbdjaDFf9duyr639YdbKvq8eWCqFh5QCLd7R504M5Ttem1wXi36ayj6 HnYp1y8EYcOOVgaGZ4lDy3UntgEZtmpif0gjZ3Yym3RdvKu8fUyFmo2zTBF5rbt+1L2t1R M14d7Gz2gPYaqxj50fPW99LeUAy3VBSYRSrDnXieJ2nvTzzfm16nT9PNCx1amfqk8TloKv Xqm1drvJ+SClEf5aGAKQgmmXfY9dixamRqYsZtZce4wHMj1SvDvJloeeamojUTBwuKnBtA IgOxS/AdS4yBOnB3HHDyNIx2r8m15jgBRA14szRquaa3IEo8uUMolSS9PkYwGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695486421; a=rsa-sha256; cv=none; b=tyc5ttHp4sXcTreROps/qqNg9KgOTWxc8o54oZySQJ8CkUhEgrgDdeMz9zrV5938bIbDss c3Rr+6BqhnfiHVP1P24vwGbIhXq/67N1uyY8IP1jlb9TUHxpTwDClr31AeMJlx7SBwVoYc 5jqYnL+P3wNRaFvCpWzeh3sIwQKCuOWwP1A7LmujYEYUol38x6fE6U+/MEozKa/DNYyuSf JG3YGk8OuS913AfW8wTX5mmpPM1pibbOtOA+IGrJv2c7WrFzDlRZkLPuAgQeWjkcnV6y/D G94w3IJKUpFb2SHacKbm4En56L70zboh1NJI6B+L6FwqchZU9qV48PXK8OTr4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EGfq+URLOXZNoAVV5/CUfHf1PKQcntNEWgLMSWFLJ4s=; b=qp7f/PP8irpP9yT4rUsoMA0Msmj+TdLhFj/hE3RyyrKaqMPYJm/jcVAy8DxVy6pPobWbAB hy0e234JbyBTqSCdGz7e2Jnp9rlmgY9sScrsIR1kJMi9NxowaODGoNtGKyOWgDj6b7mZUE 2s8KU2iHS17QDxUZQflEBZxd2nc2qRMyglKl3a5paWoc3kdsGrLpghPDo5j9Z5xYjj+v/0 TvRKLErqO6kEP4U8TwCUn0sqP+3hL3bNres0U/c761VHLY95FNNQ+rX1WMkg22QWOcg7CL BSGooP6GsITLRJGPdnW1GLkqeU06hEM+uNfejilmI9jh6Z6v334+CvRHU56HSA== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RtF036kf8z1MpW; Sat, 23 Sep 2023 16:26:59 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: f80babf906b7 - main - kern_sysctl: Make name2oid() non-destructive to the name From: Zhenlei Huang In-Reply-To: <202309231623.38NGNrmQ003926@gitrepo.freebsd.org> Date: Sun, 24 Sep 2023 00:26:52 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202309231623.38NGNrmQ003926@gitrepo.freebsd.org> To: Alexander Motin X-Mailer: Apple Mail (2.3696.120.41.1.4) Good job ! > On Sep 24, 2023, at 12:23 AM, Alexander Motin wrote: >=20 > The branch main has been updated by mav: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Df80babf906b7be51b2a031ef26525893= c7bf4e31 >=20 > commit f80babf906b7be51b2a031ef26525893c7bf4e31 > Author: Alexander Motin > AuthorDate: 2023-09-23 16:13:46 +0000 > Commit: Alexander Motin > CommitDate: 2023-09-23 16:13:46 +0000 >=20 > kern_sysctl: Make name2oid() non-destructive to the name >=20 > It is not the first time I see it panicking while trying to modify > const memory. Lets make it safer and easier to use. While there, > mark few functions using it also const. >=20 > MFC after: 10 days > --- > sys/kern/kern_sysctl.c | 34 +++++++++++++++++++++++++++------- > 1 file changed, 27 insertions(+), 7 deletions(-) >=20 > diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c > index 780eb6099b07..a4bfe8e21aed 100644 > --- a/sys/kern/kern_sysctl.c > +++ b/sys/kern/kern_sysctl.c > @@ -127,7 +127,7 @@ static int sysctl_remove_oid_locked(struct = sysctl_oid *oidp, int del, > int recurse); > static int sysctl_old_kernel(struct sysctl_req *, const void *, = size_t); > static int sysctl_new_kernel(struct sysctl_req *, void *, size_t); > -static int name2oid(char *, int *, int *, struct sysctl_oid **); > +static int name2oid(const char *, int *, int *, struct sysctl_oid = **); >=20 > static struct sysctl_oid * > sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) > @@ -143,6 +143,21 @@ sysctl_find_oidname(const char *name, struct = sysctl_oid_list *list) > return (NULL); > } >=20 > +static struct sysctl_oid * > +sysctl_find_oidnamelen(const char *name, size_t len, > + struct sysctl_oid_list *list) > +{ > + struct sysctl_oid *oidp; > + > + SYSCTL_ASSERT_LOCKED(); > + SYSCTL_FOREACH(oidp, list) { > + if (strncmp(oidp->oid_name, name, len) =3D=3D 0 && > + oidp->oid_name[len] =3D=3D '\0') > + return (oidp); > + } > + return (NULL); > +} > + > /* > * Initialization of the MIB tree. > * > @@ -978,7 +993,7 @@ SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, = sysctl_register_all, NULL); >=20 > #ifdef VIMAGE > static void > -sysctl_setenv_vnet(void *arg __unused, char *name) > +sysctl_setenv_vnet(void *arg __unused, const char *name) > { > struct sysctl_oid *oidp; > int oid[CTL_MAXNAME]; > @@ -1001,7 +1016,7 @@ out: > } >=20 > static void > -sysctl_unsetenv_vnet(void *arg __unused, char *name) > +sysctl_unsetenv_vnet(void *arg __unused, const char *name) > { > struct sysctl_oid *oidp; > int oid[CTL_MAXNAME]; > @@ -1419,21 +1434,26 @@ static SYSCTL_NODE(_sysctl, = CTL_SYSCTL_NEXTNOSKIP, nextnoskip, CTLFLAG_RD | > CTLFLAG_MPSAFE | CTLFLAG_CAPRD, sysctl_sysctl_next, ""); >=20 > static int > -name2oid(char *name, int *oid, int *len, struct sysctl_oid **oidpp) > +name2oid(const char *name, int *oid, int *len, struct sysctl_oid = **oidpp) > { > struct sysctl_oid *oidp; > struct sysctl_oid_list *lsp =3D &sysctl__children; > + const char *n; >=20 > SYSCTL_ASSERT_LOCKED(); >=20 > for (*len =3D 0; *len < CTL_MAXNAME;) { > - oidp =3D sysctl_find_oidname(strsep(&name, "."), lsp); > + n =3D strchrnul(name, '.'); > + oidp =3D sysctl_find_oidnamelen(name, n - name, lsp); > if (oidp =3D=3D NULL) > return (ENOENT); > *oid++ =3D oidp->oid_number; > (*len)++; >=20 > - if (name =3D=3D NULL || *name =3D=3D '\0') { > + name =3D n; > + if (*name =3D=3D '.') > + name++; > + if (*name =3D=3D '\0') { > if (oidpp) > *oidpp =3D oidp; > return (0); > @@ -2999,7 +3019,7 @@ db_show_sysctl_all(int *oid, size_t len, int = flags) > * Show a sysctl by its user facing string > */ > static int > -db_sysctlbyname(char *name, int flags) > +db_sysctlbyname(const char *name, int flags) > { > struct sysctl_oid *oidp; > int oid[CTL_MAXNAME]; From nobody Sat Sep 23 16:32:34 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtF6j3kG6z4tvXN; Sat, 23 Sep 2023 16:32:45 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtF6j3X15z4Wls; Sat, 23 Sep 2023 16:32:45 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QbQ9eMqelFXPPfqKQjRHK6Bz8v6VNxeZIBDtRp69Kt4=; b=lJ9K3ZibKrZhyW6jFfbtqyBHyKDWatxLrxobasFk9TKWMYJRztAP8trauNExhQsC43fbMX S8hd1pYVfH3Dj9Wn7xzUhDPh4Rtbd2GOzyfcXue1N+D1T7sY4rdopvYaSoFq8tUC4szYl2 tyXBg/F/+MA52nSXv9FH3aO3zgJsr8828MmkzRd1yckOOuAR52ndd10rUzKBHp4FmLL7vE rsyz5ihCNEpcxPWbhe4pqfRqEASL3PuOcshBMI6XvsVoy9XLhHfv8yXpwauzvmccewGMEJ BFn/tE+UILdPO6KCR5XVYO+JPII6OqUN9Xr742atXIgRX+xnXbCbYJdicvPe5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695486765; a=rsa-sha256; cv=none; b=lwMg2PBzbcwSpEE1ulDnMYd1jt/WC4OFr/6wo80M7VFuH8nB/pSWq1XDdh6jN7ozz26WuO mU03PjLf19pAJVK/cFnVFdb2zjNmj3iMxrCE7W/JmvUCzkqw6d0DPm/wFx3aOVXuKAnwXp ryPkIglC1xBPbgTCDPmDoZ5MIdZ+9uqliJazXgARGsdz5gCgilIAPr2MLJsXQ5rYSLhAZf ZoyQBNw7Og6dHLTaNJDyBaH4c969vZIb3nRe06/KVXuCQuKzVix3teAnBq+QxyAuy19SGD Apicr+hzpvXi0j9UFC0fPB07mh7i1ey5pHkJwpGq/gaKuOkbC/slSl7vpbyXJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QbQ9eMqelFXPPfqKQjRHK6Bz8v6VNxeZIBDtRp69Kt4=; b=xp48gb9vxVfsY11Wn2b3hfiRcs7Yz1N3mTfJj+KNK31ihrKl7dMZSIQgFZatuAaoBBL5G7 nTb27mSNLEAskzbsceIOXfCt9a2Jq1EmZ036lS+n9HyWgce6+3NUUsZMU2fkhF3xhyDoFA Q2qYSoOR0A6lHQHNBeZgXbj0uGyCEHam1I2VWA2Cul13YfekA7o52zjcA/HG9Fuh0vSFHv 1XEM1IG5F7d7iXIPTDycgIa7KWihbnLXj/Z2BFm0AdnOOarS1eFANz4L36/sRaBQRhh2V/ X+xYNWrT0noZNejBOhB6PHlWeYoOGRP8Sk0yjRC3JBZbfMrYHF8Wpwc0wuAceQ== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RtF6g2JQcz1NHZ; Sat, 23 Sep 2023 16:32:42 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_E160494E-9351-4B11-92D7-7DC5AA6B3BB3" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: cf7974fd9e55 - main - sysctl: Update 'master' copy of vnet SYSCTLs on kernel environment variables change Date: Sun, 24 Sep 2023 00:32:34 +0800 In-Reply-To: <15442125-499F-44FD-924A-472CE0709001@FreeBSD.org> Cc: src-committers@freebsd.org, dev-commits-src-main@freebsd.org, dev-commits-src-all@freebsd.org To: Peter Holm References: <202309210413.38L4D42w076513@gitrepo.freebsd.org> <649B777A-CA29-42B7-AF92-DE8AF664D5CB@FreeBSD.org> <800CB4EC-7AAF-4825-8146-47FBA94FEFAE@FreeBSD.org> <15442125-499F-44FD-924A-472CE0709001@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_E160494E-9351-4B11-92D7-7DC5AA6B3BB3 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Sep 22, 2023, at 12:59 AM, Zhenlei Huang wrote: >=20 >=20 >=20 >> On Sep 22, 2023, at 12:39 AM, Peter Holm > wrote: >>=20 >> On Thu, Sep 21, 2023 at 11:35:49PM +0800, Zhenlei Huang wrote: >>>=20 >>>=20 >>>> On Sep 21, 2023, at 11:23 PM, Peter Holm > wrote: >>>>=20 >>>> On Thu, Sep 21, 2023 at 10:45:20PM +0800, Zhenlei Huang wrote: >>>>>=20 >>>>>=20 >>>>>> On Sep 21, 2023, at 5:55 PM, Peter Holm > wrote: >>>>>>=20 >>>>>> On Thu, Sep 21, 2023 at 04:05:19PM +0800, Zhenlei Huang wrote: >>>>>>>=20 >>>>>>>=20 >>>>>>>> On Sep 21, 2023, at 2:07 PM, Peter Holm > wrote: >>>>>>>>=20 >>>>>>>> On Thu, Sep 21, 2023 at 04:13:04AM +0000, Zhenlei Huang wrote: >>>>>>>>> The branch main has been updated by zlei: >>>>>>>>>=20 >>>>>>>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcf7974fd9e554552989237c3d6bc736d= 672ac7c6 = >>>>>>>>>=20 >>>>>>>>> commit cf7974fd9e554552989237c3d6bc736d672ac7c6 >>>>>>>>> Author: Zhenlei Huang > >>>>>>>>> AuthorDate: 2023-09-21 04:11:28 +0000 >>>>>>>>> Commit: Zhenlei Huang > >>>>>>>>> CommitDate: 2023-09-21 04:11:28 +0000 >>>>>>>>>=20 >>>>>>>>> sysctl: Update 'master' copy of vnet SYSCTLs on kernel = environment variables change >>>>>>>>>=20 >>>>>>>>> Complete phase three of 3da1cf1e88f8. >>>>>>>>>=20 >>>>>>>>> With commit 110113bc086f, vnet sysctl variables can be loader = tunable >>>>>>>>> but the feature is limited. When the kernel modules have been = initialized, >>>>>>>>> any changes (e.g. via kenv) to kernel environment variable = will not affect >>>>>>>>> subsequently created VNETs. >>>>>>>>>=20 >>>>>>>>> This change relexes the limitation by listening on kernel = environment >>>>>>>>> variable's set / unset events, and then update the 'master' = copy of vnet >>>>>>>>> SYSCTL or restore it to its initial value. >>>>>>>>>=20 >>>>>>>>> With this change, TUNABLE_XXX_FETCH can be greately eliminated = for vnet >>>>>>>>> loader tunables. >>>>>>>>>=20 >>>>>>>>> Reviewed by: glebius >>>>>>>>> Fixes: 110113bc086f sysctl(9): Enable vnet sysctl variables = to be loader tunable >>>>>>>>> MFC after: 2 weeks >>>>>>>>> Differential Revision: https://reviews.freebsd.org/D41825 = >>>>>>>>=20 >>>>>>>> This commit seems to cause: >>>>>>>>=20 >>>>>>>> b> bt >>>>>>>> Tracing pid 0 tid 100000 td 0xffffffff8196ba00 >>>>>>>> kdb_enter() at kdb_enter+0x32/frame 0xffffffff821658e0 >>>>>>>> vpanic() at vpanic+0x163/frame 0xffffffff82165a10 >>>>>>>> panic() at panic+0x43/frame 0xffffffff82165a70 >>>>>>>> vm_fault() at vm_fault+0x18c9/frame 0xffffffff82165ba0 >>>>>>>> vm_fault_trap() at vm_fault_trap+0x6f/frame 0xffffffff82165be0 >>>>>>>> trap_pfault() at trap_pfault+0x24a/frame 0xffffffff82165c50 >>>>>>>> calltrap() at calltrap+0x8/frame 0xffffffff82165c50 >>>>>>>> --- trap 0xc, rip =3D 0xffffffff80c6f39b, rsp =3D = 0xffffffff82165d20, rbp =3D 0xffffffff82165d20 --- >>>>>>>> strsep() at strsep+0x3b/frame 0xffffffff82165d20 >>>>>>>> name2oid() at name2oid+0x66/frame 0xffffffff82165d70 >>>>>>>> sysctl_setenv_vnet() at sysctl_setenv_vnet+0x38/frame = 0xffffffff82165e00 >>>>>>>> kern_setenv() at kern_setenv+0x324/frame 0xffffffff82165e40 >>>>>>>> nfs_setup_diskless() at nfs_setup_diskless+0x4b2/frame = 0xffffffff82165f90 >>>>>>>=20 >>>>>>> Is that a NFS diskless workstation ? >>>>>>>=20 >>>>>>=20 >>>>>> Yes, sort of. It's a host in the netperf cluster, which uses = pxeboot & >>>>>> NFS. >>>>>>=20 >>>>>> - Peter >>>>>>=20 >>>>>>> I have tested that yet. I'll look at that tonight (UTC+8) . >>>>>>>=20 >>>>>>=20 >>>>>> Let me know when you have a patch, so I can test it (if you = like). >>>>>=20 >>>>> I believe I've found the root cause. >>>>>=20 >>>>> strsep(char **stringp, const char *delim) have side effect, it = will modify (* stringp) . >>>>> If stringp is pointed to some const value, such as = "boot.netif.name" in 'sys/nfs/nfs_diskless.c', then >>>>> the kernel will panic. >>>>>=20 >>>>> I'm preparing the patch, I'll reply when it is done. >>>>>=20 >>>>=20 >>>> This is great news! >>>=20 >>> Can you please try the attached patch ? =20 >>>=20 >>=20 >> Yes, the patch works for me: >=20 > Excellent ! >=20 > I'm going to send the patch to Phabricator. Alexander Motin has just committed f80babf906b7 (kern_sysctl: Make = name2oid() non-destructive to the name), that should fix this issue perfectly ;) >=20 >>=20 >> root@mercat1:~ # uname -a >> FreeBSD mercat1.netperf.freebsd.org = 15.0-CURRENT FreeBSD 15.0-CURRENT = #0 main-n265437-cf7974fd9e5545-dirty: Thu Sep 21 18:26:45 CEST 2023 = pho@mercat1.netperf.freebsd.org = :/usr/src/sys/amd64/compile/PHO = amd64 >> root@mercat1:~ # cd /usr/src; git status | grep kern_sysctl.c >> modified: sys/kern/kern_sysctl.c >> root@mercat1:/usr/src #=20 >>=20 >> - Peter --Apple-Mail=_E160494E-9351-4B11-92D7-7DC5AA6B3BB3 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Sep 22, 2023, at 12:59 AM, Zhenlei Huang <zlei@FreeBSD.org> = wrote:



On= Sep 22, 2023, at 12:39 AM, Peter Holm <pho@FreeBSD.org> = wrote:

On Thu, Sep 21, 2023 at = 11:35:49PM +0800, Zhenlei Huang wrote:


On Sep 21, 2023, at 11:23 PM, Peter Holm <pho@freebsd.org> = wrote:

On Thu, Sep 21, 2023 at 10:45:20PM = +0800, Zhenlei Huang wrote:


On Sep 21, 2023, at 5:55 PM, Peter Holm <pho@freebsd.org> = wrote:

On Thu, Sep 21, 2023 at 04:05:19PM = +0800, Zhenlei Huang wrote:


On Sep 21, 2023, at 2:07 PM, Peter Holm <pho@FreeBSD.org> = wrote:

On Thu, Sep 21, 2023 at 04:13:04AM = +0000, Zhenlei Huang wrote:
The branch main has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Dcf7974fd9e55455298923= 7c3d6bc736d672ac7c6

commit = cf7974fd9e554552989237c3d6bc736d672ac7c6
Author: =     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-09-21 04:11:28 +0000
Commit: =     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-09-21 04:11:28 +0000

sysctl: Update 'master' copy of vnet SYSCTLs on kernel = environment variables change

Complete phase = three of 3da1cf1e88f8.

With commit = 110113bc086f, vnet sysctl variables can be loader tunable
but the feature is limited. When the kernel modules have been = initialized,
any changes (e.g. via kenv) to kernel = environment variable will not affect
subsequently created = VNETs.

This change relexes the limitation = by listening on kernel environment
variable's set / unset = events, and then update the 'master' copy of vnet
SYSCTL = or restore it to its initial value.

With = this change, TUNABLE_XXX_FETCH can be greately eliminated for vnet
loader tunables.

Reviewed by: =    glebius
Fixes:  110113bc086f = sysctl(9): Enable vnet sysctl variables to be loader tunable
MFC after:      2 weeks
Differential Revision:  https://reviews.freebsd.org/D41825

This commit seems to cause:

b> bt
Tracing pid 0 tid = 100000 td 0xffffffff8196ba00
kdb_enter() at = kdb_enter+0x32/frame 0xffffffff821658e0
vpanic() at = vpanic+0x163/frame 0xffffffff82165a10
panic() at = panic+0x43/frame 0xffffffff82165a70
vm_fault() at = vm_fault+0x18c9/frame 0xffffffff82165ba0
vm_fault_trap() = at vm_fault_trap+0x6f/frame 0xffffffff82165be0
trap_pfault()= at trap_pfault+0x24a/frame 0xffffffff82165c50
calltrap() = at calltrap+0x8/frame 0xffffffff82165c50
--- trap 0xc, rip = =3D 0xffffffff80c6f39b, rsp =3D 0xffffffff82165d20, rbp =3D = 0xffffffff82165d20 ---
strsep() at strsep+0x3b/frame = 0xffffffff82165d20
name2oid() at name2oid+0x66/frame = 0xffffffff82165d70
sysctl_setenv_vnet() at = sysctl_setenv_vnet+0x38/frame 0xffffffff82165e00
kern_setenv() at kern_setenv+0x324/frame = 0xffffffff82165e40
nfs_setup_diskless() at = nfs_setup_diskless+0x4b2/frame 0xffffffff82165f90

Is that a NFS diskless = workstation ?


Yes, sort of. It's a host in the netperf cluster, which uses = pxeboot &
NFS.

- Peter

I have = tested that yet. I'll look at that tonight (UTC+8) .


Let me know when you have a = patch, so I can test it (if you like).

I believe I've found the root cause.

strsep(char **stringp, const char *delim) have side effect, = it will modify (* stringp) .
If stringp is pointed to some = const value, such as "boot.netif.name" in 'sys/nfs/nfs_diskless.c', = then
the kernel will panic.

I'm= preparing the patch, I'll reply when it is done.


This is great news!

Can you please try the attached = patch ?  


Yes, the patch works for = me:

Excellent !

I'm = going to send the patch = to Phabricator.

Alexander Motin has just committed f80babf906b7 = (kern_sysctl: Make name2oid() non-destructive to the = name),
that should fix this issue perfectly ;)



root@mercat1:~ # uname -a
FreeBSD mercat1.netperf.freebsd.org 15.0-CURRENT FreeBSD = 15.0-CURRENT #0 main-n265437-cf7974fd9e5545-dirty: Thu Sep 21 18:26:45 = CEST 2023 pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO amd64
root@mercat1:~ # cd = /usr/src; git status | grep kern_sysctl.c
       modified: =   sys/kern/kern_sysctl.c
root@mercat1:/usr/src = # 

- = Peter


= --Apple-Mail=_E160494E-9351-4B11-92D7-7DC5AA6B3BB3-- From nobody Sat Sep 23 18:28:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtHhF24cjz4v3Xc; Sat, 23 Sep 2023 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtHhF1ZXXz4pD4; Sat, 23 Sep 2023 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695493709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kz5R3b98IUitzVDIuD3KI4ZjHAiKdscSkhx8kn3+uQ=; b=qH9/TIQYRJB1s8MvxqEIJMP124RyuDTbH5Y4a19n50Uom/qcCK+iYiBtV3Tyg/qyszvz9i 91eXrdAMxcGjFD10NJFyVN0ARoaGUfFqr+owTLm9HMXbTibdOnVGr0iUVNvGw4Noy1NU5I mPYog2A6rppNYgtdTObD2OI/HSyKA4g7Jgxz6P10pu01xuVsAIlSE5cw9gsQqHimSkTpqw eBgvMshE85lrobz4Zpe+GCCIePnRM8IhMX6jFqYhI5jb6Kt25aHbxkyc8YjvTcXGtvnpVw d8rHWpGuwCqZ5Q7mzvbCr5YvFPoYKdF5KbbjIr1uSlp7nEYBWzB0RKE0d60yLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695493709; a=rsa-sha256; cv=none; b=BuBeKDGl4EhfsYOauKU4OspPsWPF3HsDL1AzFIsBT0R/njhhQ/zYryVgtxmPQFockkydvT HeNds5/pRGllNKhz6sL8tXMg2aA554FuXin+3BhggQlTOt6e+68tgupnZaS9jRt96IbCN3 6x3Pc19cml4E9LHPXeXQ0knKlNbqHvmAyDPd4X0pEnsDatq/NrBM9XMmHw+cn1IQl7o7b2 yWRRHPatUN2sbg2TBXdn4wgrJ1EI7OQbSp9V8mfMGi2wSvnjhin8dcK45SCKJ20B2h1brD 4woRHfnZb0xrIvx6EKeKa9siIvYTYZJ6yq/x3ymzprVdEWWlFMD4OXA4Ea+9rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695493709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6kz5R3b98IUitzVDIuD3KI4ZjHAiKdscSkhx8kn3+uQ=; b=hno/GY5TRDILPm3ix/bWOqfP2iiZmkQVUzdxLu4g80/qlyfwAyy9tBNGa0KcalsJARZasG ZmgDJMl5zNoqVWxtMVXnCjFuxFMC67e8LBfbthAX8iEhOkp7zTI6hP4FHmhWtcfYBDaVQ4 GlbakLHDrTloBxZ0FRZcGwsUOqINdTgp7MPRBWGqFobSiUUw+T9sLARKrEu6sEG64XTzOW Kz+RLd+oA14wKWkucAE0AQrfrdb/sw/e9qkks+I9CBCtPfnWcclt6+JuhoG7aRxQiQcXbR qP1rEm4ei4gJ1Ba7kvbPxVs2v8YSyH8GZBpxQe4nPFHBlwtl8tThe3kgwU6j1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtHhF0KvNzVc; Sat, 23 Sep 2023 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NISSwW005232; Sat, 23 Sep 2023 18:28:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NISShU005229; Sat, 23 Sep 2023 18:28:28 GMT (envelope-from git) Date: Sat, 23 Sep 2023 18:28:28 GMT Message-Id: <202309231828.38NISShU005229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: a675eaec5aef - main - sh: implement PS1 \D to print current time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a675eaec5aef0089b6838aca8fd432fea0bd883b Auto-Submitted: auto-generated The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=a675eaec5aef0089b6838aca8fd432fea0bd883b commit a675eaec5aef0089b6838aca8fd432fea0bd883b Author: Piotr Pawel Stefaniak AuthorDate: 2023-01-01 19:38:35 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-09-23 18:26:45 +0000 sh: implement PS1 \D to print current time \D{format} yields the result of calling strftime(3) with the provided format and the current time. When PS4 can use this, it will enable us to easily generate timestamps when tracing script execution. Differential Revision: https://reviews.freebsd.org/D35840 --- bin/sh/parser.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ bin/sh/sh.1 | 10 ++++++++++ 2 files changed, 54 insertions(+) diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 121c367c601c..8e959b46596b 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -43,6 +43,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #include #include #include +#include #include "shell.h" #include "parser.h" @@ -2100,6 +2101,49 @@ getprompt(void *unused __unused) } break; + /* + * Print the current time as per provided strftime format. + */ + case 'D': { + char tfmt[128] = "%X"; /* \D{} means %X. */ + struct tm *now; + + if (fmt[1] != '{') { + /* + * "\D" but not "\D{", so treat the '\' + * literally and rewind fmt to treat 'D' + * literally next iteration. + */ + ps[i] = '\\'; + fmt--; + break; + } + fmt += 2; /* Consume "D{". */ + if (fmt[0] != '}') { + char *end; + + end = memccpy(tfmt, fmt, '}', sizeof(tfmt)); + if (end == NULL) { + /* + * Format too long or no '}', so + * ignore "\D{" altogether. + * The loop will do i++, but nothing + * was written to ps, so do i-- here. + * Rewind fmt for similar reason. + */ + i--; + fmt--; + break; + } + *--end = '\0'; /* Ignore the copy of '}'. */ + fmt += end - tfmt; + } + now = localtime(&(time_t){time(NULL)}); + i += strftime(&ps[i], PROMPTLEN - i - 1, tfmt, now); + i--; /* The loop will do i++. */ + break; + } + /* * Hostname. * diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index fb3afc7d3d4d..adbc32827046 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -1427,6 +1427,16 @@ unless you are the superuser, in which case it defaults to may include any of the following formatting sequences, which are replaced by the given information: .Bl -tag -width indent +.It Li \eD{format} +The current time in +.Xr strftime 3 +.Ar format . +The braces are required. +Empty +.Ar format +is equivalent to +\&%X, +national representation of the time. .It Li \eH This system's fully-qualified hostname (FQDN). .It Li \eh From nobody Sat Sep 23 22:03:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtNSs18cMz4vJk3; Sat, 23 Sep 2023 22:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtNSs0Y3yz3YHl; Sat, 23 Sep 2023 22:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNiQk6c+NPUxkDkmn8tgTRjf9XcCrIou4DRcpf2q72o=; b=mkwSP+0zSIgR2I2zqEimjP9TQ/a0dzNTuBVV/dxZoSM7OZEiM+Bskwn8iiS01bIO561SDe fp20+XFVP0Xi96KcCMaxhNMex3UrVcEhqsG19s3TeVz4nsobRIRPaYWOHj+R9WAA2jgwXv HdPXEilX62mV7lMjnSqt8RBqVTOvFFrcDQJ6EJNifI9v3PhxtcB7v5sFtQfsuZf4E13ZDu 8MiamWVn68n3tMUC9DwZDHWyZ2CpR8ddzpDfSvYTPH9kbJszQiwwl/60f3xjAuwCXZW5qa kPJ7OLlUy6Sccw09wYy+z5dgULYyalKn4UNwY/EJbqGbnH/ajiSvQg0vIjxkUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695506637; a=rsa-sha256; cv=none; b=ijNtF/YvrsWgpkRhS6VkyRWO8TvNrhfGRUVVXtKXukTn1fy3gzJIZ4aL0XTAZXB0LDU4ei /5KltKIatdrI06sIifyXnA+HTWlJW25nsr2aVqs/4JFzxW/6ZsExzzxX112vS4sjkOtdec EuL8V/6EfrA/GAdWv5/128bwFcJBYUqChr7ZwPltXNBQYIr2oqtvMaaE4axSTv6p+buAZG oCx/vO8FTPmy5Gs3xObnQW9ZQnAhDa4VfhG9IUH1rUd/QRjDcH5YUsVDqNJzRhkOA8Tvni kaAnhxUw1IpH3Lni5/mN4vcct7F5cnfvCo4zA2rIVnC4zLD0qg7ie8UGfrlcew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNiQk6c+NPUxkDkmn8tgTRjf9XcCrIou4DRcpf2q72o=; b=pRqNH5ar6Ks0a5G6QleuYhQUtRiddM/1FlwoT1pPgK0ih9jWJOt0sV8pzoBbdibiwanEhm QMSfoK74RiOY7yxR2qBUQOppz05643BENvnDuPRoK6SCmlWmiRjpZN4xRCN9mlz4zLpwVK P6GIg1G+G9g2HfgEQ2tIgjkMqlseKWqZB+8ydTwASwayDZGTmXvGjBNHIuSGy4ULTn402N IrfjYBDxY8bvQOBPrHh22ZQ/IfFlGVQXNqUpl5WhxnUVXXXLWDbqu/8NDQ1f8/sadprISk sIb0mYG+zeVEhFyX13KUeNMhcj4+CLWt8S5/JwMaZ3CUkH27IZD6xpF33WFj9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtNSr6gyhz5RH; Sat, 23 Sep 2023 22:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NM3ug2069848; Sat, 23 Sep 2023 22:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NM3uY9069845; Sat, 23 Sep 2023 22:03:56 GMT (envelope-from git) Date: Sat, 23 Sep 2023 22:03:56 GMT Message-Id: <202309232203.38NM3uY9069845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 701468baa415 - main - ifconfig/ifvlan.c: Whitespace fix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 701468baa415c7d563d1ad28d3133d0a976908e6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=701468baa415c7d563d1ad28d3133d0a976908e6 commit 701468baa415c7d563d1ad28d3133d0a976908e6 Author: John Baldwin AuthorDate: 2023-09-23 20:27:49 +0000 Commit: John Baldwin CommitDate: 2023-09-23 22:03:25 +0000 ifconfig/ifvlan.c: Whitespace fix --- sbin/ifconfig/ifvlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index 7fb63b8142f4..90854885b561 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -4,7 +4,7 @@ * Copyright (c) 1999 Bill Paul * Copyright (c) 2012 ADARA Networks, Inc. * All rights reserved. - * + * * Portions of this software were developed by Robert N. M. Watson under * contract to ADARA Networks, Inc. * From nobody Sat Sep 23 22:03:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtNSt23lfz4vK8J; Sat, 23 Sep 2023 22:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtNSt1W4qz3YL9; Sat, 23 Sep 2023 22:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaNY66O+2hjYBCh4z2Pj8cTDQuIYBc2pZFjPRu4oHH0=; b=jUA3ytRnmlEq0y+xINIRSz2aAqiQbajYA2WloPVmI1atRz0g1wTf4TVE7wsjU/wjIw5K20 sDq4QY9yzmwrLFP1nP4oT7jK1toOpMlBgtoSjT8xlsQMC8UNAR/oAaywqWDVlQHy0lCQKz tISdMX3mQ/TOcqFk9QWqft3fxnH2a45Zgi5WwTdanNZxQwvYP15f+OO+6lYL20aYQWLFNw JnrFh6kmNlkCxQOVvI+iFCPGQR7GMtOq818Of3AkHjIISCbTWm9m+4zfg3oA9nAeVr3UKF xKphQxN6ByjYEHgSK9HGDoaX/WOJDSay3nzzh+Yk1UhaNNZp48Fu+9F6ELCeqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695506638; a=rsa-sha256; cv=none; b=lsybBUqcYTdhWkhhO3nE0/t2CC03UoN6g855mSvYtoTwSt6hqQZSp+tMRK9ifeKWrs8Dox MLE369WbJ8rcfqjEcfveTPDpf0dDL4B5NI4AG6FAC2LcX7s4RE8Uw3Uwbx/8PtDPfGWSgs mr05X+dUSJZ5QlYHCxGChcrHZnBv+Uqk90xU1SbTIUXPXi0Avtk6xHS5t5HCCcMgBcZK48 V/QxVzFha2ZQKo2lx1hPzjhpnGlwfoUdRbUMu47Cl7+Q6sgNAymGvq/aJiLkJwae0RbKJ/ 4dxEF1VJ8jLo9er3fEg7Duv/2ccEiK7G45eNQNrGCzLxj/nFZaCVF8v0ZPOAug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695506638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaNY66O+2hjYBCh4z2Pj8cTDQuIYBc2pZFjPRu4oHH0=; b=L99tcGLj41wHFmEHS7opvI+S5wbCpkT5V8ZuOSqXjc2uUF6ff/H5moud+7LGzKwNePHpc7 X45ugGhkI2J02pAwefc2Mq+2ZbWliv7uxAQ2jWXLl8FEe0+xJb1qlYDgwd3ygNEy7YKH+4 pj+A5ZuPQiKEi7mcCJU0TPngu7l36DRW4kNev1ZJwdpyzqmCSEN1BQDxaZhyYXOqMSsdqi uW9Hffz2/6VHlQS2kYId61zBLuMXpLXdLFobO6lm20louM2wUZVX5wJ7rtUsfZit4eF7eU Hgn1+C9Wg/fTDdrJanw+5ncMkP1tzlLuagtxD60BDy9gJnNqz9krwadZ+FmR+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtNSt0WpBz5RJ; Sat, 23 Sep 2023 22:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NM3vpX069896; Sat, 23 Sep 2023 22:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NM3vtQ069893; Sat, 23 Sep 2023 22:03:57 GMT (envelope-from git) Date: Sat, 23 Sep 2023 22:03:57 GMT Message-Id: <202309232203.38NM3vtQ069893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f2f73fa7bd4b - main - factor: Remove an empty #ifdef __FBSDID clause List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2f73fa7bd4b24c22ced0ff4566e03115dc9cb5f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f2f73fa7bd4b24c22ced0ff4566e03115dc9cb5f commit f2f73fa7bd4b24c22ced0ff4566e03115dc9cb5f Author: John Baldwin AuthorDate: 2023-09-23 21:49:11 +0000 Commit: John Baldwin CommitDate: 2023-09-23 22:03:25 +0000 factor: Remove an empty #ifdef __FBSDID clause --- usr.bin/factor/factor.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index cc25b9dd2bf5..53a369f10506 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -42,8 +42,6 @@ __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); #ifdef __RCSID __RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); #endif -#ifdef __FBSDID -#endif #endif /* not lint */ /* From nobody Sat Sep 23 22:29:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtP2Z2rGKz4vLKc for ; Sat, 23 Sep 2023 22:29:42 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtP2X6YHlz3cl6 for ; Sat, 23 Sep 2023 22:29:40 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=jxMBwqxS; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695508178; bh=iRiKpX9KUXiA0Fj1+1j2bpQq5x/sqqepXTnab8cS71A=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=jxMBwqxSjNdK3MYAfKT/gOWYbSoGuAT4UaH/Kci9KTPZO0YJ92H8Bcy9oimL14L202D60XL2fbHHbPUvpeg9QGfpw7NsTOknVYp4aRa23Z2iIQ73MUm81wwLRJpLaWkeujSDZuNoSeNeSzunN+7EEiWwZpGmeMxkKr87WI3R4C8jxzIK59u4mvmHE2FxItCmh+2Zfl0yHZCalbG1+anSKx0wK33aAmKcisjjuCA62CCp3SRPwsipIhNf3bbOQHnVMiNDlbpYKfj++MnaCEV6f/UZVEdmDy0Sky2iTlJSp35GTSr5YOTw76YvfUJOhtxTS60ST3FWlTzVA/F6ybF1aA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695508178; bh=2hOL2shUl8ieqSHZAQQqTWtnbG0lTDcvr38UtA6fiM/=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=GqCGisCl1C3PWBFrMPdcswkQE6uh9hP+BcnaMjFdHuetcn7xRJ/l4vRUHmlT3L/Aq+1AswITpgIZJ9PFVPo8g0y9Ik4xdL9jOCvgHJ+BIW930E43RJY6PUb1HEutAdiZW1YCV11XKeSQtYavuF5M6iCkHP3ugsgc0GCPYonmry0llCJMbgC5+sD4+puRyTdA0PgD249TfbTENrXgz3SSzfWAqlwMxpmY2sWz11H+2IqMt2BH97mRnAGFD2vd9gVY4WT8zmrkfCfxmYf9ojyHZWx/mq0HjIKeDps3kRvfIr3phZ/dstkSxk8fwdBR7oAORJjIyR3PGOK9rhYu390H1Q== X-YMail-OSG: cLiE_ZoVM1memueZ_XfoySETJ6G7jWamJFj44f1BzV.YWkriENoLOqQYK5nA6KQ E5OAoYDTAl2nvKEORjmnC_63Ct5q5rYHNxGtHsURR5Fh96mggaJcrNRY30DCC_1gTODk4yS_eHdG fY5bMyGlR__o8vEhNxRAsJXFZdDAiPMDdctGtjGk3LXuP5UwFM8YW1AllU3dwgyVYCGNuubJgiVL JMQqJUgaENGBcRgUVCVwZO30gV27EDXrRfKzyj0v4nuWnONe6WKPNB6Yz7de.gtCaFicUkWWkRjC anhKSc4FtT5CF4BXuvBQgEJtWBTVcFqfJG7LliQNHvC.v_t2XtOif1iLs3Y7S.6oVRydhtKa.71g jLKEFfNLq3NIIKkQjxdvBlb7g1tKr2xt2sbkGYmlJrwrH3ILwRWaLfYbel_wAuUX5JVodh_M5f6N oVXe_qm.3QTe0lAX53W1R2x7NJtjPOh639LUYUy1GNAEf.De8OcCqoDdAzt2HYsWz9nJK6lNonDm wZoeSb8vKlyZ1Ml.ZAnMZpaDJBCn8ZLwlWWL0hWxe4JnOoOz.VSgK6dUojWdHi4k9G_NbbXga7sC QDiAW6hXCQW1Gq1ARDHFnjqaXkipv6l1OeFfIxCzAIX89WvR2Z_AWzIY9FAny6GCFi9ctHD0q0ti UJBkoO4XAMl.gzGIvpIONxSyL4mpzSzQGAtJdnZdWTZ9pwav_QLWGTbzYAwtO1D8NRo7KsMqUidS EwuVaEhiaB.qyFGCIvuezzyoaH0O.PdaJWw5MRd67V_QQNA3q24I_BCfGas_c_Nc8Th_ubIHaWEB cKob7wgdorwdz2cPYug8SGvf1a.J3eeH.UJiXgglJPOZCIqBxWG3jpQXcxWiiRamSte57EZGZBeM 092kLX5nK25N0Xwc_bSf4fFrBZeT1lrp1nRP2k0GHs3q7Q8eo9Do93ygquTx0YBkMWc7_4_BkcES 9CiEsljdLFHWMshH0Nie6wyEys9QW6_Fgli2Wr9lsDaZgzFRmrM07Hb9Ofg_cz7p1svT8V_ECdCA 9nKUMqdfJdyPhDtByTUKrqW6V4Mh7leuJOGqKQ74BzF.cj_kRf5wYK1jdpJ.88JkJOn9Ym0dh_9y 6BlA_O1P1qzElz1VcbeGX8Wm_tNF7uXZ5qCMyyeQGi2eygahJUkaCmsjak5dsjXvTBtW6QDjKZxw C2NLFgrNO7D7cjZJNCLSYvM.3FNJtBSGeqbO2h8x2gOXNiI33obRDbg6TEuzfQ00EoW13xEczLsf cUPvAWlXo8iCfrE0bgcyJijbsCuF3noOe75FK3oTojjjLNZf_q99fgREi3XeFMlzslqrp5hBH4Sv cEDsDDXgPVElitV9BvkrrOds_zUIQpD7LEUDrFRxFGok9sr2mNJzSfhnM17rv_nDCCRn8JOcIPjA 7lLsWVoBy58bDFLl0_eOQ9opDclRliTzcheXGbuNOzDrqU6qoWm0hjhyHT1qcQCKLfE2BBBoSgX2 qKZQPc5E2GeT8zMMXx1DMqXkHC38p0PfhsRvafROOm4xXAE0saeoaAm0GZjpvR1pV1du.TLP.xws fmtRG.Jirx1HMR0GTSwEowcWOkUSaibJitgSUXbTM1z_LizZ4TDAz_48gHZjj3aXudhz.o7mvow4 mFAH40zFwffsmPWHbxOYfGLxnNshsVuH49RxeUecNd9pd6uF.KCDzoAYxpIPjZpymVvI0UMTz3Nb MHYcwEGGgSplL3_huqbaf0QX1SzHsDcIbqgzmh8TxCUfb4wQIccsxSKH1QHrVH3ITBnk5UAAIBBS CO5Yn54JS9NHc.ev7.cCR23mB7nDJc7QrRwlkbqtFfLkE29r7gcxr2_eOKxiVa7wkpdevmWCjgiP 32LMw4t_835T5dU5V_UOv53u4StpUfMF9OkzJHnf8gEQf9TKHidsTzPPI_pnlPNhAy2Rgk4kU8ZS Kv2pDLGRtODVML6GqTTOKG3178c0NgfitbuMWe8H_7wQkJcLQIJlqrbaTG0l3H3WkUc_4tBV3JYT dej2v3I3q8sMZMTGnSyvaKwk8aDYjTNY3MRjFlVK72qVwyq8AE3IcryfeBgmG74dDp_7_XCrbEwE 6HZb0KL9mriw9MWRhuDdd_ZCpnFsz2oJDvjhCEyA1qTHFvgh.4DGnZM96Wd7a54ySJE6OZkAbjzk UkPdhw7OKQwytkiClhzNzHqrdPZ7grHhmlNW5KaST.Ew7XmOqBS0GnYbAeT1VahcNsdt7uk1b.2r uKVV1qlT4p6BK4Vj4F5o_M4nhtGesbhdcBQZV5RgDLDU37kpsI9J9rhWv6JIabvVzbb8e_vh1.7C 08Bey12NicQ-- X-Sonic-MF: X-Sonic-ID: b42a8d71-6cc0-4a48-ba5c-9923c85ce767 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sat, 23 Sep 2023 22:29:38 +0000 Received: by hermes--production-gq1-77657878bb-d5lfb (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 6ef6cadd340faa99c8880977596c77da; Sat, 23 Sep 2023 22:29:37 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: f9df60975087 - main - Add support for host32 for DIRDEPS_BUILD From: Mark Millard In-Reply-To: <79F167D9-DF7A-4714-92EE-3B9FBB7BF912@yahoo.com> Date: Sat, 23 Sep 2023 15:29:26 -0700 Cc: Mike Karels Content-Transfer-Encoding: quoted-printable Message-Id: <152E8129-B996-4941-9DE3-DD7CEE5BAE97@yahoo.com> References: <79F167D9-DF7A-4714-92EE-3B9FBB7BF912@yahoo.com> To: "sjg@freebsd.org" , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3731.700.6) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.147:from]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RtP2X6YHlz3cl6 [A resend, this time sending to the list as well, as I originally intended.] Simon J. Gerraty wrote on Date: Sat, 23 Sep 2023 06:28:23 UTC : >=20 > The branch main has been updated by sjg: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Df9df609750876be2c054dfac953316f5= 13ccffce >=20 > commit f9df609750876be2c054dfac953316f513ccffce > Author: Simon J. Gerraty > AuthorDate: 2023-09-23 06:27:37 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-09-23 06:27:37 +0000 >=20 > Add support for host32 for DIRDEPS_BUILD >=20 > Allow building 32bit libs for host. >=20 > Move CFLAGS additions from local.sys.dirdeps.mk (which is too early > and impacts CFLAGS defaults) to local.sys.mk >=20 > Reviewed by: stevek > Sponsored by: Juniper Networks, Inc. > Differential Revision: https://reviews.freebsd.org/D41946 . . . Looks like this broke lib32 builds via it ending up using the default: -target armv7-unknown-freebsd instead of the correct: -target armv7-unknown-freebsd15.0-gnueabihf I've suggested in the past that the default for FreeBSD's -m32 for aarch64 should be made to be (stated for 15 now): -target armv7-unknown-freebsd15.0-gnueabihf but that has not happened and the build environment must deal with provding the proper target explicitly. For reference, https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/26609/console shows: 03:50:51 --- fixunsdfsivfp.o --- 03:50:51 = /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S= :26:2: error: instruction requires: fp registers 03:50:51 vmov d7, r0, r1 03:50:51 ^ 03:50:51 = /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S= :27:2: error: instruction requires: double precision VFP VFP2 03:50:51 vcvt.u32.f64 s15, d7 03:50:51 ^ 03:50:51 = /usr/src/contrib/llvm-project/compiler-rt/lib/builtins/arm/fixunsdfsivfp.S= :28:2: error: instruction requires: fp registers 03:50:51 vmov r0, s15 03:50:51 ^ 03:50:51 *** [fixunsdfsivfp.o] Error code 1 and its https://ci.freebsd.org/job/FreeBSD-main-aarch64-build/26609 shows: Changes =E2=80=A2 Add support for host32 for DIRDEPS_BUILD (details / cgit) =E2=80=A2 ng_eiface: switch VNETs when injecting mbufs into netgraph = (details / cgit) =3D=3D=3D Mark Millard marklmi at yahoo.com =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Sep 23 22:58:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtPgv58hNz4vNLS; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtPgv4d9Gz3g0x; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695509915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGwFD8TShnH750iSp134PTV5QYT6tbLDW2BE2GCT91Y=; b=yCL+H86EVVtwBagCOcp/L3FKJ1ViZZFewihVKl8SRaJ2SZcYNdN+kgbWa++s8mRpCcyw3X E/4ov1A28kB903+p96wzt8oOPNRF9eUWDF+idyFr98RrFanrHk+/ZUfql36JOzh/tt2s8W Edq9CixQ4/ci0UtCai8hNY3CCnhIRNr4OB2f+PFI1YdDGv1DIjP9Or7fHBZ7jpVY3Fth/y zkVyq+qIWERYwClnwx6SrEcwTChrN1M8m7Rkc8Tlbh/SEj7WCJVIwr5kNpq6LPZ64oUogd 2NLCM5UWycsqrGUk7Ux0H9ua+dCA1ExN921Vz8etRSB0jH7mNy7WLz0B3yGsIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695509915; a=rsa-sha256; cv=none; b=k2zIJFGYYE8JX07OoRRGELbX0PMeUTt4POSkps69DA8ZNoiJyXIud3y5Xzkc/Ib25FyxaZ bTOyEFNOTQNTLwqiFlHyqMnxxf3M27uGu8xJjWZm1tPsQEh5yihFEZZGSJ/rFq0+N8boDl 2kwuIann1rzBjcpZikj130w7txXm5ZUCS/G1ZEKMlPlnSDl7jafLXJzX2EkGuae6ZOl/nU v72qBV22ugrsqGP7jIz/JjEDbcX4QAS9I9Y9L3cpfym/qblcXv+jmag87nTZc/RS5KZ4Vi RmOUZPM0mpOxhwQOZpUSIu7nhdUO0FrJ2B0jQhggRRxNARTq0hg1JaDdWZVBsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695509915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGwFD8TShnH750iSp134PTV5QYT6tbLDW2BE2GCT91Y=; b=fW4drysWEJSMp9CyZjOYEd+neU+c4KsXUlCH60kvCMAA/ht8ulZcqEEead+mnJjWbJ24AZ KZ8oxRBp9+cBy0e/w1N2gQXjw9ww6hGEdhoGkZET9XeLhcZSxOHhqN28oGNlCfeS6VysTV gnhOdHC5GrSlfyIypSis2aZeUUYxBmM1w+P1c5+IpfbmagPoQSf69G6LNp1wKnzT64o22l LxwwxE4UGaoTyj4zrHrZv0Waxejh3yeOL8ZzUdGYbnlw45OSpW9tHq+rkUUgZTllqVbgKm ywRALu7WWmWa1R464M8tHpZuXh2TDSomiM92heH4ic2KMAcNIct8vM5QfankAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtPgv3ZQmz7ZY; Sat, 23 Sep 2023 22:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NMwZS2052629; Sat, 23 Sep 2023 22:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NMwZlh052626; Sat, 23 Sep 2023 22:58:35 GMT (envelope-from git) Date: Sat, 23 Sep 2023 22:58:35 GMT Message-Id: <202309232258.38NMwZlh052626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: f174619c38c3 - main - Guard CROSS_TARGET_FLAGS from buildworld List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f174619c38c309e172344f5d21b324d47819f5fd Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f174619c38c309e172344f5d21b324d47819f5fd commit f174619c38c309e172344f5d21b324d47819f5fd Author: Simon J. Gerraty AuthorDate: 2023-09-23 22:58:13 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-23 22:58:13 +0000 Guard CROSS_TARGET_FLAGS from buildworld Until a better arrangment is worked out, guard the setting of CROSS_TARGET_FLAGS in local.sys.mk with check for DIRDEPS_BUILD. Using a separate flag for CROSS_TARGET that can be reset by bsd.compat.mk is probably the right thing. --- share/mk/local.sys.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index eb21380f051c..d5d3ff75a3c4 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -95,11 +95,13 @@ META_COOKIE_RM?= META_COOKIE_TOUCH?= META_DEPS+= ${META_NOPHONY} +.if ${MK_DIRDEPS_BUILD} == "yes" .if ${MACHINE:Nhost*:Ncommon} != "" && ${MACHINE} != ${HOST_MACHINE} # cross-building CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} CFLAGS+= ${CROSS_TARGET_FLAGS} ACFLAGS+= ${CROSS_TARGET_FLAGS} .endif +.endif .endif