From nobody Mon Apr 24 11:52:08 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 4Q4k544NCSz46kP0; Mon, 24 Apr 2023 11:52:08 +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 4Q4k543vXwz3j8R; Mon, 24 Apr 2023 11:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsxS/FH81L8yTqGSZBTDHkIwzpG4cp3Vng/+0DdehtU=; b=lEb/ZuMNuxCa1nurefOa43zpv+YGL/b53unvHC26IvN97vo8tWIemjgKnopEYc8FPl9uDO qpdibugsxGsO/N+u7GDDc8eT88CIkzBb0emT9J46EtX1fjh8ZiCkNGLOZiWG8ksO0GlqM8 WK13oqRDgNyV5+sToN4xLggh9d7P/nhEavJt5ZoIBNcZVNPOXsGLGsg560WsGJWKroJcFS AC8PMYaj5oSgeUJnx0jKz0CWbKP1jtYkP0BLMFf0Jmml6PzJ7yfq5aumAyNalHTw7PXxVo 051kTtPmKFuvd069BwjfFNHbwYyXYbewjDjMeTwVTDX5aNhhbs/JSkTYIpIOxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XsxS/FH81L8yTqGSZBTDHkIwzpG4cp3Vng/+0DdehtU=; b=jN9As7DmdpsXcwuxUQv435IEjhCoyBnDRLrNx4FmnWTGtrzJvqUXjLxWYGLJwVyMffu9+y mKvdK6BXUg7Jx0/zbxQLbsTmPXPiNatAx3y6pdDChTwz/OMi99t+kHhlEvQqcZZ6godetz gqvjPf0pD6Jev7bphiAhLpGKBt4J7AZJOe4zDV+ORvd1WREsv5HDg8PCU2mi/3jV6w5/wu mAYD6t6CnTK1MEyT2y5g9K1cyp9UMnwuZJbvjM8M4cwqMwI98WzrXFSNcH0nQ7HPFjZMUG R/Q854061npPKxY8Ws1oUL9pz02h/GrlkNrkZPFNpyyQaGXS93jWQS/Go0hWJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682337128; a=rsa-sha256; cv=none; b=Lvi6o6FirdL1zLfhA/WFoRF/vwffXQfA9e59RG1M8AP31q+zXZTTPC/rM8uoMcR56O22z3 AKM8KmiKvPSv2UBlDjB18i17qSyI4zdxXYbQKjwFyo3Yk8MOqq9ZdIzeeysjWIJATYpdgl kH/z0NsUvOA56w/9AmpwSMk2UZb0m4bb0XjrugqkSCXYnPvnQ0kfEXwgdBS6j4mLjZOTUU szaaHH65/xDZTLz2N2PCVQBNIRoGAMP+eNCodKHktsWosCUkfL0gAP8j4kVDL3kDFTzWwm A/N9uBbkS1NxRFE6hpxQizW5kMdfn3MFnk2R+2EGjsL9lV7DBygJ86FCGghW4g== 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 4Q4k5430xyzPkP; Mon, 24 Apr 2023 11:52:08 +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 33OBq8kR003147; Mon, 24 Apr 2023 11:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OBq8ew003146; Mon, 24 Apr 2023 11:52:08 GMT (envelope-from git) Date: Mon, 24 Apr 2023 11:52:08 GMT Message-Id: <202304241152.33OBq8ew003146@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: 117beba8a80e - main - arm64: Clean up smmu fdt xref handling 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: 117beba8a80e8dc17ba22b43687586964175dda0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=117beba8a80e8dc17ba22b43687586964175dda0 commit 117beba8a80e8dc17ba22b43687586964175dda0 Author: Andrew Turner AuthorDate: 2023-04-24 11:47:31 +0000 Commit: Andrew Turner CommitDate: 2023-04-24 11:47:31 +0000 arm64: Clean up smmu fdt xref handling Use the xref from OF_xref_from_node for the smmu xref. We already have a valid xref ID, there is no need to convert this to a memory address. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39181 --- sys/arm64/iommu/smmu.c | 10 +--------- sys/arm64/iommu/smmu_fdt.c | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 35c529ef5de6..923b77e2d5b2 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1829,22 +1829,14 @@ static int smmu_pci_get_sid_fdt(device_t child, u_int *xref0, u_int *sid0) { struct pci_id_ofw_iommu pi; - uint64_t base, size; - phandle_t node; - u_int xref; int err; err = pci_get_id(child, PCI_ID_OFW_IOMMU, (uintptr_t *)&pi); if (err == 0) { - /* Our xref is memory base address. */ - node = OF_node_from_xref(pi.xref); - fdt_regsize(node, &base, &size); - xref = base; - if (sid0) *sid0 = pi.id; if (xref0) - *xref0 = xref; + *xref0 = pi.xref; } return (err); diff --git a/sys/arm64/iommu/smmu_fdt.c b/sys/arm64/iommu/smmu_fdt.c index b33f30e9166a..a68ceb3d1569 100644 --- a/sys/arm64/iommu/smmu_fdt.c +++ b/sys/arm64/iommu/smmu_fdt.c @@ -168,7 +168,7 @@ smmu_fdt_attach(device_t dev) LIST_INIT(&unit->domain_list); /* Use memory start address as an xref. */ - sc->xref = bus_get_resource_start(dev, SYS_RES_MEMORY, 0); + sc->xref = OF_xref_from_node(node); err = iommu_register(iommu); if (err) { @@ -176,7 +176,7 @@ smmu_fdt_attach(device_t dev) return (ENXIO); } - OF_device_register_xref(OF_xref_from_node(node), dev); + OF_device_register_xref(sc->xref, dev); return (0);