From nobody Thu Oct 20 20:24:20 2022 X-Original-To: dev-commits-ports-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 4MtfFw6YB2z4gV1C; Thu, 20 Oct 2022 20:24: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 4MtfFw608Jz3NBd; Thu, 20 Oct 2022 20:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQt9qDq0Kb9dM3RjDiUKNABfrSqaz+/s9B+cekRxFGI=; b=gyJvznUmqNsex4yRNM+TDzlTVARUh2MsOxlN8wChO5RTQ/jh1J/6aYk4zw2R08ZBuMYOGB vmfCZgJdUEVyeSZ3EHgggbHh+oxZ8++we8o7xBQlszMmuQHQnK/J4epy0JPVre/xugYySS x6a4ey0HiLaqfZfRoLMp9Kz7lI2BCNM4xcXlPy+8e0DpXHSXTzYD6IggRB+bbQ/esV7vNg tioUHaLgXFurP7SrJmUxxBPo/CUDfl4rB3ZbVJWAlrSA8Qll+WCAAjQYgfqQzGP/QPLstZ mVRxzBBj7UxkbT+wYECeEupWkjit9uSR4OafpsCfhPsoILX9YLRWyUTwiEGMCg== 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 4MtfFw56Gtz101T; Thu, 20 Oct 2022 20:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29KKOK4g089478; Thu, 20 Oct 2022 20:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KKOKnr089477; Thu, 20 Oct 2022 20:24:20 GMT (envelope-from git) Date: Thu, 20 Oct 2022 20:24:20 GMT Message-Id: <202210202024.29KKOKnr089477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 292218a91c01 - main - net/isboot-kmod: Update for changes to pmap_unmapdev() KPI in main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 292218a91c013cfe2fdc266d2e174463834754a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQt9qDq0Kb9dM3RjDiUKNABfrSqaz+/s9B+cekRxFGI=; b=VJg/5ZtzD/KvTyvlWt4wU5HghluqauK0TiTH1xWOouomrXC4FOCnG+9VCZVKedU3qqum5h lSzoD49lRfFu04dRSxqM0rlBTWTB5oSikb0vD4YcbM4x15F7sd0QjE9v6DRiyQl4xjuz3S Ce3uL8W1m7jk6hGr+GvP40ljT+NvopCfJEWpyc0cGUdWPf4IBilJq4WGpW9GKogyWAeLpz 6HePXzaqP0NhXkDH80gbQIWVE3Zzic/8XxFQaEj2soqJw5FdVmjShzJCfA/KF6DYMAg1Ou GDgjY63wPU3z0uMTuP2Fqb/nEQ3s0ZiTUHyWt0TM08U4/go5jdNqTQjv0ZQ9cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666297460; a=rsa-sha256; cv=none; b=bTeK3cwfFqMu+jJaHER0MDgkpd9a+IbRyUcgLh3Y+QD9WF4mk0SzcvpC6R+B2obPbsoKiK Adqw1lSlFaUfL+RRX3+SlJDwYzeZpdSW5tv44YVhjZ+c9lLdi7I4lN64ZxevN9PDBxXGGg aoxPIf0vemrwHW4BsM2amwj6lVOCfTlCwYyMmGzsQlse0VMI8nxOazZn53Glen2x6WcabO ey6w3VTMbUecDJ/asvZyqOV/2tYmMzovb5DSSqZd6PJS4nVatzNj8ytRy2Si42Lqw8KjBI u2NHYP7x+vtGsBgveyyXylpI0akbtnAvY82bG99RTSRA3k6hPHTucUMudwKS7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=292218a91c013cfe2fdc266d2e174463834754a4 commit 292218a91c013cfe2fdc266d2e174463834754a4 Author: John Baldwin AuthorDate: 2022-10-20 20:23:58 +0000 Commit: John Baldwin CommitDate: 2022-10-20 20:23:58 +0000 net/isboot-kmod: Update for changes to pmap_unmapdev() KPI in main. Reviewed by: tcberner Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D36670 --- net/isboot-kmod/files/patch-ibft.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/isboot-kmod/files/patch-ibft.c b/net/isboot-kmod/files/patch-ibft.c index 0c68479849a8..0694466c7560 100644 --- a/net/isboot-kmod/files/patch-ibft.c +++ b/net/isboot-kmod/files/patch-ibft.c @@ -1,4 +1,4 @@ ---- ibft.c.orig 2022-05-11 20:18:36 UTC +--- ibft.c.orig 2021-05-18 18:37:58 UTC +++ ibft.c @@ -146,13 +146,12 @@ ibft_print_address(uint8_t *addr) void @@ -72,3 +72,15 @@ length = le16toh(t1h->length); index = t1h->index; flags = t1h->flags; +@@ -556,7 +549,11 @@ ibft_init(void) + if (ibft_verbose) { + printf("iBFT error\n"); + } ++#if __FreeBSD_version >= 1400070 ++ pmap_unmapdev(vaddr, ++#else + pmap_unmapdev((vm_offset_t)vaddr, ++#endif + (vm_size_t)IBFT_HIGH_ADDR); + return (error); + }