From nobody Tue Mar 14 11:09:36 2023 X-Original-To: dev-commits-src-all@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 4PbW4x3LKRz3y7s1; Tue, 14 Mar 2023 11:09: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 4PbW4x0kk2z3mnb; Tue, 14 Mar 2023 11:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678792177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmGKEzEz6Azb45XYccroKrIbm1JI/R1avaEuHpgKAVA=; b=fJa471KS0rso+1xlvp95n3b4nskG2du4n1l7Q4bGlzpeo5AyIgtg4pmzD28JcT3zILJGNW Ghb2ySk76/+n6H41IuYH3inMTWiy6/Nf9hC2KBOcDaSxMRh16yemdSSbemaqImt8rq1JHJ 1XGnlAI+PBBxfS2ZTrZBrs3aH+wGPjtm4KPbUnnL6/BHP5duGq1jYd1gNMNxXm8yd2azbP tO885+mG/49BiVhdkNxNfJjUvUfjnrXqDrTYTeuzNOzVkNe5JHrQpgfR4vg43YhEBUSc1V qLdasQO88GX7U4RQ0tmdYz9PORPnlIix/FT7A5QH2GjtvTp9sZnQknnKsR4IGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678792177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmGKEzEz6Azb45XYccroKrIbm1JI/R1avaEuHpgKAVA=; b=pei1oyVTBKDii0t/TuYddRYEmyR2w+DldNdrjRwm5BLBorebFuzqMYgbnPT+KDy1aV0tQq c21o6HjpOIjmnqzKhI70yyKDI2H/kJbJaDn1PddTKPMJ0erSjWujVmQDgeH3cjv3FkQpvR HMvmpPLbJbpRfDRtqx0ZzOMw5gRBvDdoglkyWqYoPC8vAYGzy6RqsdLdJd4qo/CA3KpH9Y UoDXyO5i6aaIsxRPl5mqvDNBX2ByL5//ZCyOxfh9J+xSbVIgYKCd2CFCCA+U26tP3LSZJW badDqKip0gliJe3q9O5BCOoqTJb8rmO8lQsYWs5HsK8JKg/1jP9+NWmqyOOMrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678792177; a=rsa-sha256; cv=none; b=jffiGnLQJxnt+LX9A9vIkQGpBuSvFnhrc3Wy1jXtt+cIWUiEOX9/G4XCM6mmR13yt6jtzQ F+xJj+hi+6zWChgFdrtSPhNSd7u0D4mRkhKe4zp1swXbALdXHuSXXCgXlhJBY70YX5Dwcd xf9kKgiBlEVo8mBA9vFHZdxRl9QzJUxBYIRS+jFcXzg6k7qvRbKRrG+sRvIjLmBnf2oMpa Zzo8C5BZPATdP1eLY+Pw6MsbKckgh4xny/hQfmJlYBLLOnep3IF5QUZG80DeGqbRprFKP/ i9yeJfLk68FwZisKWSa/FyTR1DcCUe45kxZRzszN9OSX+bkumhk9HNs1noItFg== 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 4PbW4w6vfPzY7T; Tue, 14 Mar 2023 11:09:36 +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 32EB9aJ4032746; Tue, 14 Mar 2023 11:09:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32EB9acC032745; Tue, 14 Mar 2023 11:09:36 GMT (envelope-from git) Date: Tue, 14 Mar 2023 11:09:36 GMT Message-Id: <202303141109.32EB9acC032745@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: ae60314c9467 - main - Fix the ofw parent check in arm64 nexus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ae60314c9467012abb23cf22249c6522d2ca1d91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ae60314c9467012abb23cf22249c6522d2ca1d91 commit ae60314c9467012abb23cf22249c6522d2ca1d91 Author: Andrew Turner AuthorDate: 2023-03-06 09:54:57 +0000 Commit: Andrew Turner CommitDate: 2023-03-14 10:37:00 +0000 Fix the ofw parent check in arm64 nexus OF_parent returns 0 for no parent. Fix the check in teh arm64 nexus_fdt_activate_resource. Sponsored by: Arm Ltd --- sys/arm64/arm64/nexus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index d07965433919..3d6519f5fedd 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -565,7 +565,7 @@ nexus_fdt_activate_resource(device_t bus, device_t child, int type, int rid, node = ofw_bus_get_node(child); if (node != -1) { parent = OF_parent(node); - if (parent != -1 && + if (parent != 0 && OF_hasprop(parent, "nonposted-mmio")) { flags |= BUS_SPACE_MAP_NONPOSTED; }