git: f39c377274bd - stable/14 - rtw89: enable ACPI support on FreeBSD

The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=f39c377274bd02fa0f8e7c4d1a05d3d617de895a

commit f39c377274bd02fa0f8e7c4d1a05d3d617de895a
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-06-15 10:44:55 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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}