From nobody Sun Feb 18 21:11:04 2024 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 4TdJHX6Tzrz5Bm68; Sun, 18 Feb 2024 21:11:04 +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 4TdJHX5sQmz42Dq; Sun, 18 Feb 2024 21:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290664; 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=yQrOJ9nQpt8PsBYsGO7magPTIjF5O7xvL9wPMDO/TnU=; b=BMUFmx/cDGKdTCcjwtOhoMUfExetCAoWTeChK5zsXtII7HhlbI0clbCWYXg3UjO8PJL9EC Gt/LnXgIMoABUOtYrxj0hcdLAo6suthXtIYGo3byRtsjtjk8PAdNy1BmzMzLtzBn+Qvj9Q pK01B/EvyVipTOpekDVQcnsD0gMg3QNfBwU3/lnMi2j0mxzsM8mWu8lesN5CKX2gAeyKj4 Qs67wh3K8s4pLY0b6ASLJH5q0P5t75FxL28veLZlYdMvOSR2kVV7ZDYkv7OZiPgUBRimjJ aS+/AtJMpm+DPcGbPp692wH3RMRewSuxeINFjWNOuYrv8cPvpq40CUJ1YaTPMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290664; 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=yQrOJ9nQpt8PsBYsGO7magPTIjF5O7xvL9wPMDO/TnU=; b=YC8/bT7e3e+6KrUL8AHa4pSIGRgTuNT3KUjKDei4lj62cmIjgZofZLeivLh8odSf+YQjrV MnDDETWJUPW2tFyTsL4WTA8HNH/Bhabr1c25Yz+mWff3snwGBYoB9ubx6JlkdczqJkALqL y+SAhKNpT1B0B06lVKEMPCOA5MdgBEtX89AMbOgCRZXyHdGp/b2njNqa34lyKVLLeiAHXZ 0UaiF7YxZzGJRT4MQFhix/VBCQtV9WjmCH1Z/kHgs3ifseYkZWzd1sU4xjrMQ5NEctYPWX 2Kekqubly3MFvlaUZEotAwIeGRlrC+SUz3Bf5+1V1EuVO6E5s4nN/esLz2J5SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290664; a=rsa-sha256; cv=none; b=dqWaPM709+T4d9X73rDXHNA0X1q4Zd3nPXT+2AkXjdRtIUd/YR4OypQBoKbELlNK44kNWG BhlNLX7jl/84Y3h6WbTSoWy/hxAYL82kJ4YT5jisToo4kagAwN6ntVjduvW6RH/ehHZZpl 3m6F/Umg7CBeP5QX4pnc5npFHAquHOogXuZIVWM2Kc2S2elNwtnCFJfRCTRBDkrCqB0T/k 6+uRZBOOIcHo4/o/UpjhclG3hLllNr/HFdQY7EdbETT/59/stNRhGcMQXcoaa77Wp6yZph k1mosEFJxWcWCXM7vXKUe+zgGnptXXCtcSW8bBVWzGiRaMEVVfmy17jcCusf6w== 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 4TdJHX4xXrz16Rv; Sun, 18 Feb 2024 21:11:04 +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 41ILB4H1012901; Sun, 18 Feb 2024 21:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILB4wf012898; Sun, 18 Feb 2024 21:11:04 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:04 GMT Message-Id: <202402182111.41ILB4wf012898@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: 7e72ea8cd1c7 - stable/14 - ath10k/rtw89: make compile again after LinuxKPI changes 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 7e72ea8cd1c7b9a080ce030d2827b222d165e564 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7e72ea8cd1c7b9a080ce030d2827b222d165e564 commit 7e72ea8cd1c7b9a080ce030d2827b222d165e564 Author: Bjoern A. Zeeb AuthorDate: 2024-01-08 15:29:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 16:41:46 +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 (cherry picked from commit c8e7f78a3d28ff6e6223ed136ada8e1e2f34965e) --- 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"