From nobody Fri Jul 4 05:23:23 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 4bYMVM5G81z60m8d; Fri, 04 Jul 2025 05:23:23 +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 4bYMVM3ymYz44WF; Fri, 04 Jul 2025 05:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751606603; 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=erfyjCVNern5+BeY7Ek23q7/TtUqkjHAyEFO8n++DWo=; b=lJtR1eAR9EfmCZiXcJBpTGdqYY3ytBh115d/KIL+XENllIJ0F3j59JXYM4cvTbRqSg050F HvSUvPDJS8zkrDm0zaMlPgcBvDX+NAx7haxDaE33uzxT62I7BBmRxR6h9DCyulXzvoMYyw 240tPRKc4LhTKZbLP80KxWGgqOriiu1Z/3FwW74BO/JGl7B3BOu4E8ZpKnLeOFk1g0WRuU FLpuKHHxYjbfQ+aLMzOHvh58ueoysyUwFHdhZ27ormi94unegEvoWtuBrtQtUrHWlSCMQv EAg1m+jpY4QjyWy5jiSX1kWFqsDOycpslJLqYyIwsAzGCe3QZuDfkIWbj3dgVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751606603; 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=erfyjCVNern5+BeY7Ek23q7/TtUqkjHAyEFO8n++DWo=; b=epid3nIaS06wXatc4UOlP0Rot6+hGRAtD5/51ulzm+1gsyLiIYnOxEXZqkX5aigXEmozNI 8aKHOl7D62o97ubwon/ECjOYkyZSZj764IRjX6mciK12LXJijaGqztytgKo9NkrixD8Dyx 5dwYBcI1qPkPhOGf8Vum2g/HwkgIZmuLngQ4+6QGDubw1QgXjE54/jwBf2BxyFDJDY2bn/ 6TBDhKfuRXWZSLpjpGc/K8EgMG9Vye8EANzviIBpVQfjLMjUyBkj/ND64xvWwhjVOE7qv1 wAFwoF/IbPUo93mGRiNT4eFo292LyypUPGH+xSrrBChBdLBumkOe7UsrjulO3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751606603; a=rsa-sha256; cv=none; b=bpzAKxRvqGUrdPQlcjx7QNUrMyowsBXBPL9zk7fi9DowBFSDIuqgnLbdB2WBWNyw1Nziyu om3ZTXGkCzXV5jF+Vpqb0jFtO53zGtQX4+fnz47Wmb13epIwUs4khzuTBCa5IXV0/CiB3o l9kiIVXO3YQEi0O7LV/SCKAmp497ZejTybdmMKO0ZNibXwcfoCkb+TfuOYVayCmUK/yNpO PjyIcabVzOX5ei8lHinZhhTbk/FtKIbFt6NeVJMBspPn9cmr7Wt6nAyNxyP1sHi8xnYuHF 8t4VNhUzt6ONICsIIHWQnP6gP5rlxy2qMbblAgzLHgQN/c3BEw2DKRRXL85TzQ== 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 4bYMVM3HmkzdMc; Fri, 04 Jul 2025 05:23:23 +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 5645NNpd005829; Fri, 4 Jul 2025 05:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5645NNUC005826; Fri, 4 Jul 2025 05:23:23 GMT (envelope-from git) Date: Fri, 4 Jul 2025 05:23:23 GMT Message-Id: <202507040523.5645NNUC005826@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: 8c97c46418f9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8c97c46418f9767a9984df259116da08d9659076 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8c97c46418f9767a9984df259116da08d9659076 commit 8c97c46418f9767a9984df259116da08d9659076 Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:44:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-04 05:22:22 +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 MFC after; 3 days --- 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 73945591826c..09580f288c62 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -39,6 +39,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}