From nobody Sun Jul 13 19:31:14 2025 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 4bgFtV3J1Lz61N7h; Sun, 13 Jul 2025 19:31:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtV1wG4z3kC7; Sun, 13 Jul 2025 19:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435074; 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=ov3zO46JvaYNJQSkjUuKdvEwV2r3WqHux4tgVVrQJUc=; b=vi7Qub0a2uezOn6+BLUGzFQwDD1YdN5UWW+IuD1vDpo48XKlouCKQ25w11Eg5WAelEc/P9 wzAx7TSYh+ZVaHRxnLLT3doGXljZKW2Jk3Lzfqm3WPqJwzrJnNpB9tN0YTrvciudON2wHr ZRtfUWGORhVvp5Fw6oO59w0Vkuv6oq7hW6fMOT6qCUvjot1lnfRYYmh/C8AqmHcwqp5vR8 Ft3H4K48arJmZUeX4niSmfMJPGW/cVYfiSluDpzWZJtX7ktvoGeYevAA2ZGu9cBar19esU QBEwGvB+URnsVLj/5leFl49Oy0PEje2DLIqNsNXl8xUvYeByxXQz4uYEUXYUGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435074; 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=ov3zO46JvaYNJQSkjUuKdvEwV2r3WqHux4tgVVrQJUc=; b=VFtJCs0jeeA7zt/G7jQ59H+PcZ8BvjajYaq6JBfGHCfS0iI5bk/kdcTu9gyiBqEf/1aqDq kI2YNiLEJi4+gUxUfZvDTP4cdc9kuuDIc1yBIgLS7dgrBA5GHR9wH9WGMJiBb4gdHQG+Rw pfNRwSdjPnVL4hoknRDduyVejy96mRbA4VV6u4swCEOxxT0je3oXEIWeekUbry/u+8TR22 aMYo76tQ1fxRzkl2yI9nc+as+M9DkHLMidDH2ausYII7+k+vmavS0hJxr8rCboNrqGdTb/ 7yRqB5GFZ3EeB7Fqxz6hItCws9tQpcbSJPFCWpYe1KBCpLWoMT7t6JodF2VAfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435074; a=rsa-sha256; cv=none; b=K6E/yZUghLhw0Ql53kF8wgZubWrE996sJSzIkg08dCDf/KF+QJ4qktDFAFFmuJjw1vt1wg 49dwuvb5XRkB8OY82tRDWF64UPPk4T47GRaMt0YSR8hnucSdRZepkyyWMmPfrC02kd6fTd YZIDA0aKWHn47A8YClEqheTIFuPylHPYr4hMGD6KH2iEXH3rSrMzBc22g7TCETKL1RA3RI zek+sivaBl0yijDbknPlqjr8xQq8L6V5/jtEbtsnmoRVkLZMRqqu5BJYyCK4g9lwXdDxQT 5wqz5Yfe0IrCKRWYv7UbHh2NagghnG8svK20CrpU+15mUI1RZSdQJsHdx2HL3w== 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 4bgFtV1W3kz6gq; Sun, 13 Jul 2025 19:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DJVEKY071615; Sun, 13 Jul 2025 19:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVEJH071600; Sun, 13 Jul 2025 19:31:14 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:14 GMT Message-Id: <202507131931.56DJVEJH071600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f39c377274bd - stable/14 - rtw89: enable ACPI support on FreeBSD 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f39c377274bd02fa0f8e7c4d1a05d3d617de895a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f39c377274bd02fa0f8e7c4d1a05d3d617de895a commit f39c377274bd02fa0f8e7c4d1a05d3d617de895a Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:44:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:26:25 +0000 rtw89: enable ACPI support on FreeBSD Now that LinuxKPI supports the lower case Linux ACPI spellings under LINUXKPI_WANT_LINUX_ACPI remove the #ifdef around the code and compile in ACPI support. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8c97c46418f9767a9984df259116da08d9659076) --- sys/contrib/dev/rtw89/acpi.c | 26 -------------------------- sys/modules/rtw89/Makefile | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/contrib/dev/rtw89/acpi.c b/sys/contrib/dev/rtw89/acpi.c index 02d4526c1538..f5dedb12c129 100644 --- a/sys/contrib/dev/rtw89/acpi.c +++ b/sys/contrib/dev/rtw89/acpi.c @@ -8,7 +8,6 @@ #include "acpi.h" #include "debug.h" -#if defined(__linux__) static const guid_t rtw89_guid = GUID_INIT(0xD2A8C3E8, 0x4B69, 0x4F00, 0x82, 0xBD, 0xFE, 0x86, 0x07, 0x80, 0x3A, 0xA7); @@ -149,14 +148,6 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, ACPI_FREE(obj); return ret; } -#elif defined(__FreeBSD__) -int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, - enum rtw89_acpi_dsm_func func, - struct rtw89_acpi_dsm_result *res) -{ - return -ENOENT; -} -#endif int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, struct rtw89_acpi_rtag_result *res) @@ -180,28 +171,15 @@ int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, if (ACPI_FAILURE(status)) return -EIO; -#if defined(__linux__) obj = buf.pointer; if (obj->type != ACPI_TYPE_BUFFER) { -#elif defined(__FreeBSD__) - obj = buf.Pointer; - if (obj->Type != ACPI_TYPE_BUFFER) { -#endif rtw89_debug(rtwdev, RTW89_DBG_ACPI, -#if defined(__linux__) "acpi: expect buffer but type: %d\n", obj->type); -#elif defined(__FreeBSD__) - "acpi: expect buffer but type: %d\n", obj->Type); -#endif ret = -EINVAL; goto out; } -#if defined(__linux__) buf_len = obj->buffer.length; -#elif defined(__FreeBSD__) - buf_len = obj->Buffer.Length; -#endif if (buf_len != sizeof(*res)) { rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", __func__, buf_len); @@ -209,11 +187,7 @@ int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, goto out; } -#if defined(__linux__) *res = *(struct rtw89_acpi_rtag_result *)obj->buffer.pointer; -#elif defined(__FreeBSD__) - *res = *(struct rtw89_acpi_rtag_result *)obj->Buffer.Pointer; -#endif rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "antenna_gain: ", res, sizeof(*res)); diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index bed007f9aa51..ae31b7dbd1b6 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -40,6 +40,7 @@ SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -DKBUILD_MODNAME='"rtw89"' +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI CFLAGS+= -I${DEVRTW89DIR} CFLAGS+= ${LINUXKPI_INCLUDES}