From nobody Tue Mar 7 06:15: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 4PW4v90qNdz3wxq9; Tue, 7 Mar 2023 06:15: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 4PW4v90LtRz4GZT; Tue, 7 Mar 2023 06:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678169749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snD56cwlj2+zllrCT51hImkvM6rG7ll1m2Co+WyqmG8=; b=Q59kLcb5SIJsiZb0VQO3zAP+OFNC9i93apI0JzAwXohUpq4upJaJOcNdjTCpxC+M4WTdmn snKK+RRJQSds6jy7zKb+/Dtj9dl5O9Vev95wyyMW++FePgVOAVPW/M8A0iilXF5o1Md10n uMetsJBze64moaDtjB28ST+M2LP0douAiLvMmpM1a89Q1cWrN9V4Dk/QytzM14OTVcZPCe Bb/rvdeQMpnlpWEnloTWfANYVRwM5IqBNSemEY/T5o1RySZ76Az/Z42il/36KOusxyh6zo yF6in+BKGos9EaZjAf5OaKESh//n2Inp+qwnPY3moycOGdgbRuGcLhfvom4HrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678169749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snD56cwlj2+zllrCT51hImkvM6rG7ll1m2Co+WyqmG8=; b=T6n5MWHLv0sTO/cyVMLovMvZ/oUOXbQOkb1ZkTIV10kUZ5mOfVgj6q4kdzqSUTQ0mHOjF8 6zhuRxnJiIbn4TQJ9veEgXcwWG1oXrA3GL4IapeST2PZinQ1z6P9wP+feH78189URFGB4c FVtkKJwou02yf55QkoZ3cXFoMA5ZP/smN7q0rbO9PplBn6+KxqJjZcRLpqDVp5whbyqgPa VqBaRukwCZ6jLpKUUfPgxhlhuwZ94STJnSZH1fyh6DB22QNOo0wpZwQuYCsAjqPM/yghPS MTeLdAjIyejRFsyduXTV6kXq+hBSoQWuWNxMz1LTg1vcjePUHyxCYaFk2Ns/TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678169749; a=rsa-sha256; cv=none; b=FkyjtWmlKoBm+2vXkmkZ950kxyOg18sxDW4pJnNFqGcYEi02LpoHpEIIXZZmXZxDbsStkD zpaEIkCWeZCtId+VonbVPdrwwR7g/c7W7chTfYav5F/aJ/kFsYN1F59HmyffY4YhTR4Nhw fg/pBtacry1At1geQKfaYBdLAShtb4D37Mzgx10skydTbrKCbZIOvu3cLwKNqOG6mk1vX8 rKr+bUCZbgOCfJD3NZV16U/C37vqJWu2EiR2wwreplpCgHe+AgndqRYmydiFMa7/sGbMKe InxPU0aC5g+1WShwUkTdA+aBwqF+DOxKejG2NL6Mt9Z6vFCkB808Znr3edaYyQ== 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 4PW4v86YZszY6R; Tue, 7 Mar 2023 06:15:48 +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 3276Fmoo072816; Tue, 7 Mar 2023 06:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3276FmBL072815; Tue, 7 Mar 2023 06:15:48 GMT (envelope-from git) Date: Tue, 7 Mar 2023 06:15:48 GMT Message-Id: <202303070615.3276FmBL072815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d71a00e9f5db - main - arm64: ofw: respect the nonposted-mmio prop in OF_decode_addr() 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d71a00e9f5db2379d1f267a151b90f1c19dce24d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d71a00e9f5db2379d1f267a151b90f1c19dce24d commit d71a00e9f5db2379d1f267a151b90f1c19dce24d Author: Kyle Evans AuthorDate: 2023-03-07 06:15:32 +0000 Commit: Kyle Evans CommitDate: 2023-03-07 06:15:32 +0000 arm64: ofw: respect the nonposted-mmio prop in OF_decode_addr() This is the only mapping remaining which needs to respect nonposted-mmio to avoid breaking the boot on Apple silicon. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D38920 --- sys/arm64/arm64/ofw_machdep.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/ofw_machdep.c b/sys/arm64/arm64/ofw_machdep.c index 3941c1d35617..61aa4c1a1208 100644 --- a/sys/arm64/arm64/ofw_machdep.c +++ b/sys/arm64/arm64/ofw_machdep.c @@ -43,7 +43,8 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, { bus_addr_t addr; bus_size_t size; - int err; + phandle_t parent; + int err, flags; err = ofw_reg_to_paddr(dev, regno, &addr, &size, NULL); if (err != 0) @@ -54,5 +55,10 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag, if (sz != NULL) *sz = size; - return (bus_space_map(*tag, addr, size, 0, handle)); + flags = 0; + parent = OF_parent(dev); + if (parent > 0 && OF_hasprop(parent, "nonposted-mmio")) + flags |= BUS_SPACE_MAP_NONPOSTED; + + return (bus_space_map(*tag, addr, size, flags, handle)); }