From cd4dce2c20f7b622162b69251d5cb981a2825bc8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Fri, 1 Dec 2023 14:04:18 +0000
Subject: [PATCH] net: nvethernet: Use conftest for Linux v6.6

In Linux v6.6, the header net/page_pool.h was split into two headers;
net/page_pool/helper.h and net/page_pool/types.h. Use the conftest
script to detect which of these headers are present and generate compile
time definitions for including the appropriate headers.

Bug 4346767

Change-Id: I389ce5b867a1efd867b8392bb21383784c1b4af6
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3026553
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 Makefile                                             | 3 ---
 drivers/net/ethernet/nvidia/nvethernet/ether_linux.h | 8 +++++---
 scripts/conftest/Makefile                            | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 101c20b5..c8f9108c 100644
--- a/Makefile
+++ b/Makefile
@@ -61,9 +61,6 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME
 # Deprecate PCIED Error reporting pci_enable_pcie_error_reporting
 subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING
 
-# Split types and declaration of net/page_pool.h
-subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER
-
 # FB Deferred IO helpers name alignment
 subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME
 
diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
index 6d024725..de79cf65 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
@@ -4,6 +4,8 @@
 #ifndef ETHER_LINUX_H
 #define ETHER_LINUX_H
 
+#include <nvidia/conftest.h>
+
 #include <linux/platform/tegra/ptp-notifier.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/pinctrl/consumer.h>
@@ -37,11 +39,11 @@
 #include <soc/tegra/virt/hv-ivc.h>
 #include <soc/tegra/fuse.h>
 #if IS_ENABLED(CONFIG_PAGE_POOL)
-#if defined(NV_SPLIT_PAGE_POOL_HEADER)
+#if defined(NV_NET_PAGE_POOL_H_PRESENT)
+#include <net/page_pool.h>
+#else
 #include <net/page_pool/types.h>
 #include <net/page_pool/helpers.h>
-#else
-#include <net/page_pool.h>
 #endif
 #define ETHER_PAGE_POOL
 #endif
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 2ca83282..ecebf193 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -159,7 +159,8 @@ NV_HEADER_PRESENCE_TESTS = \
   generated/autoconf.h \
   linux/kconfig.h \
   linux/iosys-map.h \
-  net/gso.h
+  net/gso.h \
+  net/page_pool.h
 
 # Filename to store the define for the header in $(1); this is only consumed by
 # the rule below that concatenates all of these together.