From nobody Sun Oct 09 21:53:44 2022 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 4Mlwm90gfVz4ddB2; Sun, 9 Oct 2022 21:53: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 4Mlwm86sPWz3rwd; Sun, 9 Oct 2022 21:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665352425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1GElwXdycu03G7XzpCjoz/rrtUMrlJLaHBX362yo+L0=; b=U4ipsAEqbnQN0StBXqS4HGsybH7ec9R7cECSqb/sCaHUh+opplHFq6rGiBAObdNqc+bcn3 0aEcxTvfUIsARm7bspx0TQ4+iQ+CFNb18U5jHNwQTUFcRcM0LO++zctM0pmTbFHLdMMIBW D7pdhfjWDJxpE3NHTA3pz9NXvEctIaePhd5y23umG/EL4Hdb4DF7/UTIXbWgqTaiqegTVA zgOyi1zbEQtbYKyNEmZp1r47PRwVxDXtkYhEhikZywJk+uPw5kmQFgkS1AQ3I3IDEiqovW wpIBpn3RzYOWu3zY2MClWJrPkzKSJEaeV4uPKQSOAjuLRXx8JV/r0taWTsHSkA== 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 4Mlwm85nN8zQN8; Sun, 9 Oct 2022 21:53:44 +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 299LriCQ024249; Sun, 9 Oct 2022 21:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299LriCA024248; Sun, 9 Oct 2022 21:53:44 GMT (envelope-from git) Date: Sun, 9 Oct 2022 21:53:44 GMT Message-Id: <202210092153.299LriCA024248@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: 99e6980fcf5e - main - device_get_property: add a HANDLE case 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: 99e6980fcf5e12654c3e89b97b774de807d740a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665352425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1GElwXdycu03G7XzpCjoz/rrtUMrlJLaHBX362yo+L0=; b=yJBIpq2tmd/0POcV1aNiO3NwyWQA2eloyduaPBgNbHU+xax8Fs+GU2putNI3Ry4dA4aH3X VyveHL+kfk9n/Lo5JSAwa4OktXFyVj8n1IpXZUZ2qv0ogOEp0pDQnPe7M/tusFnVX4RRU2 YM0AFpdSO66J2VEL/1ikhyzF2ofCQbh9gbj1ICqlji43evWWWjGCd9IxOMYp55DeExU8N8 S+stwWnVY5gqwi5qOqG9RTryuXuRYssp302h4LLn1sUdxeAC1GJbBEgIZ/Q9zw3C+H3hiB 3bX5doS4yUCLkjXAlKnyQBMetZQvK8IPCDarSiNABzPAlluKtMWWTPheRqrFhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665352425; a=rsa-sha256; cv=none; b=AylPTPQMHyQCNce5P9UW9bNtnGVZNeaGFUOUJmpdHYDbUCeimkJcruuD29bTpYuP70HCAS FIRYFeRR85baZ4aITPR8QPRJzjgFfxamFCBXjPaXGbGRo6KaFvi9x7CK+4NoSPNyaSo6rs fWqIcetnz4EMq9jx/Z2vKrbIx+vfvzauZtszQzDzhdFVO1B/XOQ+P+m6xvRBxtlGTJ8U4C IseyzsPW3wJ7gALZqb4BPh8n7h1v6vffiUH8LSjXNT+WNLZURCeHHPaVv5tl+RxyO5Ksco Riy2pwNPL/xdTouxTbve91MsKkWm39F0EAKgSkQDYzGzNYxfaFY8zdaw7vRUXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=99e6980fcf5e12654c3e89b97b774de807d740a4 commit 99e6980fcf5e12654c3e89b97b774de807d740a4 Author: Bjoern A. Zeeb AuthorDate: 2022-09-29 12:41:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-09 21:51:25 +0000 device_get_property: add a HANDLE case This will resolve a reference and return the appropriate handle, a node on the simplebus or an ACPI_HANDLE for ACPI. For now we do not try to further abstract the return type. MFC after: 2 weeks Reviewed by: mw Differential Revision: https://reviews.freebsd.org/D36793 --- share/man/man9/device_get_property.9 | 5 +++- sys/dev/acpica/acpi.c | 47 ++++++++++++++++++++++++++++++++++++ sys/dev/fdt/simplebus.c | 19 +++++++++++++-- sys/kern/subr_bus.c | 1 + sys/sys/bus.h | 1 + 5 files changed, 70 insertions(+), 3 deletions(-) diff --git a/share/man/man9/device_get_property.9 b/share/man/man9/device_get_property.9 index d925f5f224db..93c01f199477 100644 --- a/share/man/man9/device_get_property.9 +++ b/share/man/man9/device_get_property.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 18, 2022 +.Dd September 29, 2022 .Dt DEVICE_GET_PROPERTY 9 .Os .Sh NAME @@ -54,6 +54,9 @@ Currently the following types are supported: The underlying property is a string of bytes. .It Dv DEVICE_PROP_ANY Wildcard property type. +.It Dv DEVICE_PROP_HANDLE +Following a reference the underlying property is a handle of the +respective bus. .It Dv DEVICE_PROP_UINT32 The underlying property is an array of unsigned 32 bit integers. The diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 941e2bd75aeb..a9d49a3c7f74 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1923,6 +1923,35 @@ acpi_find_dsd(struct acpi_device *ad) return (AE_NOT_FOUND); } +static ssize_t +acpi_bus_get_prop_handle(const ACPI_OBJECT *hobj, void *propvalue, size_t size) +{ + ACPI_OBJECT *pobj; + ACPI_HANDLE h; + + if (hobj->Type != ACPI_TYPE_PACKAGE) + goto err; + if (hobj->Package.Count != 1) + goto err; + + pobj = &hobj->Package.Elements[0]; + if (pobj == NULL) + goto err; + if (pobj->Type != ACPI_TYPE_LOCAL_REFERENCE) + goto err; + + h = acpi_GetReference(NULL, pobj); + if (h == NULL) + goto err; + + if (propvalue != NULL && size >= sizeof(ACPI_HANDLE)) + *(ACPI_HANDLE *)propvalue = h; + return (sizeof(ACPI_HANDLE)); + +err: + return (-1); +} + static ssize_t acpi_bus_get_prop(device_t bus, device_t child, const char *propname, void *propvalue, size_t size, device_property_type_t type) @@ -1941,6 +1970,8 @@ acpi_bus_get_prop(device_t bus, device_t child, const char *propname, case DEVICE_PROP_UINT32: case DEVICE_PROP_UINT64: break; + case DEVICE_PROP_HANDLE: + return (acpi_bus_get_prop_handle(obj, propvalue, size)); default: return (-1); } @@ -1972,6 +2003,22 @@ acpi_bus_get_prop(device_t bus, device_t child, const char *propname, MIN(size, obj->Buffer.Length)); return (obj->Buffer.Length); + case ACPI_TYPE_PACKAGE: + if (propvalue != NULL && size >= sizeof(ACPI_OBJECT *)) { + *((ACPI_OBJECT **) propvalue) = + __DECONST(ACPI_OBJECT *, obj); + } + return (sizeof(ACPI_OBJECT *)); + + case ACPI_TYPE_LOCAL_REFERENCE: + if (propvalue != NULL && size >= sizeof(ACPI_HANDLE)) { + ACPI_HANDLE h; + + h = acpi_GetReference(NULL, + __DECONST(ACPI_OBJECT *, obj)); + memcpy(propvalue, h, sizeof(ACPI_HANDLE)); + } + return (sizeof(ACPI_HANDLE)); default: return (0); } diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c index ed472f87b57d..0b1277983da0 100644 --- a/sys/dev/fdt/simplebus.c +++ b/sys/dev/fdt/simplebus.c @@ -357,7 +357,7 @@ static ssize_t simplebus_get_property(device_t bus, device_t child, const char *propname, void *propvalue, size_t size, device_property_type_t type) { - phandle_t node = ofw_bus_get_node(child); + phandle_t node, xref; ssize_t ret, i; uint32_t *buffer; uint64_t val; @@ -367,11 +367,13 @@ simplebus_get_property(device_t bus, device_t child, const char *propname, case DEVICE_PROP_BUFFER: case DEVICE_PROP_UINT32: case DEVICE_PROP_UINT64: + case DEVICE_PROP_HANDLE: break; default: return (-1); } + node = ofw_bus_get_node(child); if (propvalue == NULL || size == 0) return (OF_getproplen(node, propname)); @@ -402,7 +404,20 @@ simplebus_get_property(device_t bus, device_t child, const char *propname, ((uint64_t *)buffer)[i / 2] = val; } return (ret); - } + } + + if (type == DEVICE_PROP_HANDLE) { + if (size < sizeof(node)) + return (-1); + ret = OF_getencprop(node, propname, &xref, sizeof(xref)); + if (ret <= 0) + return (ret); + + node = OF_node_from_xref(xref); + if (propvalue != NULL) + *(uint32_t *)propvalue = node; + return (ret); + } return (OF_getprop(node, propname, propvalue, size)); } diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 041e77259313..2365d83ef91e 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -2226,6 +2226,7 @@ device_get_property(device_t dev, const char *prop, void *val, size_t sz, switch (type) { case DEVICE_PROP_ANY: case DEVICE_PROP_BUFFER: + case DEVICE_PROP_HANDLE: /* Size checks done in implementation. */ break; case DEVICE_PROP_UINT32: if (sz % 4 != 0) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 26d100aba222..5dead4dd382e 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -72,6 +72,7 @@ typedef enum device_property_type { DEVICE_PROP_BUFFER = 1, DEVICE_PROP_UINT32 = 2, DEVICE_PROP_UINT64 = 3, + DEVICE_PROP_HANDLE = 4, } device_property_type_t; /**