From nobody Mon Jan 8 15:38:54 2024 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 4T7ysB5hyyz566Hs; Mon, 8 Jan 2024 15:38:54 +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 4T7ysB2V0Lz4PPh; Mon, 8 Jan 2024 15:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704728334; 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=oPC2y8t9B3QCh9K2T5BzXyvT2On9xHG2Qfp3mLi5v6Y=; b=DgYs6ir/T4o858IKDlqtPWzg8CS9epiaHXBj78kGxX5ngdtq1olf8sotdUdbLH2y78IDMH zyzv0QBs7BMfoySs4trOqXp6dIQSqi6uFkU0f9+4fSqlseKHdJ/lRBCj4nw1xj27slOy41 PIPm2Bs+hxIJnWZRvIS3GO3eJB6hVMt3cbubr5/YF2doZvbpbBf8xQoyBRIlVSbvRYn3Zi OyvT7QO4LCCD+oSw1rKaia1C1my4x2dJ0FyC9Xh82mylT6q/47hy6PUewFaZY5XjOWncvd 6fmnU/Xt8eKY1zoMWzQoSB/niDQOSktcDT1d+69gb2Irys8+/k5B6InNln/KzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704728334; 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=oPC2y8t9B3QCh9K2T5BzXyvT2On9xHG2Qfp3mLi5v6Y=; b=ZlDs5cbPGBNcwBlh6t6ak8ZN4XY6PbYhazc1BstsLcXyivVe3I0wNqT7qamLISKLTDBwf9 LMBdizyvZy0/TDFRcf8LJ1gvMci4uyUIRdl98gjdC+1yHUePEegzrLjoUIx73tSFepXc1X sg4xaOTDHFi/V25c3fLb/bOZwmd9TO2PzmOFA86xeY772+w872k14CyWDEiFuQgYbXtInf Kdqs/P7fTRxWmV1mrHQKxSWOF+gCwTZBIEQC1Z9FTSrqh7E7TOzMaXNSAO5MVUyOmMJ9+9 gxc2j5f8QRHJVhpmYiZkfH9vDqa3pr9TTqIwwCF/Tt//4hL9kFlpvook9+jfPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704728334; a=rsa-sha256; cv=none; b=M7TJCybX8ygvyhzKNBtC06Z3zGk0DJBCL8tH4MhWm3iWB3/fTtjVcnWvbWAs/VxOVc/lsy EI83alcXJCWU+0bNp/3kHHnnifBm/7w3XPm3EG0lRYEQlLRdkiRxWV4ldP3JhaGJ++2V0X nKogGqFK7Dv5Nn0O0zQ59K2Q8cAaJd96Y1Gd65thMSO3JXhz5KbhzupNiVwxvlNxmNt9Ee lY03+4JTENx3BLi3b0M7iB0rnPYR5ANsMu3YXQyvfOk1nkZ/1RsjTA/mnPTbQB5hGKkCLF KWST8c1+9HdTpUFxZXVda3E3AILUpZfQ0ILv1pG0UJ6zGq7KRknXjKVC6b74XQ== 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 4T7ysB1bKHz1Bvr; Mon, 8 Jan 2024 15:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 408Fcslq018553; Mon, 8 Jan 2024 15:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408FcsnK018550; Mon, 8 Jan 2024 15:38:54 GMT (envelope-from git) Date: Mon, 8 Jan 2024 15:38:54 GMT Message-Id: <202401081538.408FcsnK018550@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: c8e7f78a3d28 - main - ath10k/rtw89: make compile again after LinuxKPI changes 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: c8e7f78a3d28ff6e6223ed136ada8e1e2f34965e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c8e7f78a3d28ff6e6223ed136ada8e1e2f34965e commit c8e7f78a3d28ff6e6223ed136ada8e1e2f34965e Author: Bjoern A. Zeeb AuthorDate: 2024-01-08 15:29:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-01-08 15:38:22 +0000 ath10k/rtw89: make compile again after LinuxKPI changes Both drivers are not yet attached to the build so this change is for people currently trying them out. In 96ab16ebab6319dce9b3041961b0ab6e20a4fecc the sys/rman.h include was removed. In various wireless drivers we prefer to directly use bus_dma functions rather than io* LinuxKPI once. In order to cast the pointer we need sys/rman.h back for our native 'struct resource' in their pci.c implementations. Long-term we should consider providing some lkpi_-FreeBSD-specific wrapper functions to avoid this problem. MFC after: 3 days --- sys/contrib/dev/athk/ath10k/pci.c | 1 + sys/contrib/dev/rtw89/pci.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index 2b0b594b5466..23ff786fe45c 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -15,6 +15,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #include "core.h" diff --git a/sys/contrib/dev/rtw89/pci.c b/sys/contrib/dev/rtw89/pci.c index 9220f5b40d29..5639a52c2ddc 100644 --- a/sys/contrib/dev/rtw89/pci.c +++ b/sys/contrib/dev/rtw89/pci.c @@ -7,6 +7,9 @@ #endif #include +#if defined(__FreeBSD__) +#include +#endif #include "mac.h" #include "pci.h"