nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

net: nvethernet: Use conftest for Linux v6.6

Browse Source 
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
(cherry picked from commit cd4dce2c20)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3028310
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2023-12-01 14:04:18 +00:00
committed by mobile promotions
parent b02f2cd5ee
commit 7997b6e8b0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -50,9 +50,6 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME
# Deprecate PCIED Error reporting pci_enable_pcie_error_reporting # Deprecate PCIED Error reporting pci_enable_pcie_error_reporting
subdir-ccflags-y += -DNV_DROP_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 # FB Deferred IO helpers name alignment
subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME

8
drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
View File

@@ -4,6 +4,8 @@
#ifndef ETHER_LINUX_H #ifndef ETHER_LINUX_H
#define ETHER_LINUX_H #define ETHER_LINUX_H
#include <nvidia/conftest.h>
#include <linux/platform/tegra/ptp-notifier.h> #include <linux/platform/tegra/ptp-notifier.h>
#include <linux/ptp_clock_kernel.h> #include <linux/ptp_clock_kernel.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
@@ -37,11 +39,11 @@
#include <soc/tegra/virt/hv-ivc.h> #include <soc/tegra/virt/hv-ivc.h>
#include <soc/tegra/fuse.h> #include <soc/tegra/fuse.h>
#if IS_ENABLED(CONFIG_PAGE_POOL) #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/types.h>
#include <net/page_pool/helpers.h> #include <net/page_pool/helpers.h>
#else
#include <net/page_pool.h>
#endif #endif
#define ETHER_PAGE_POOL #define ETHER_PAGE_POOL
#endif #endif

3
scripts/conftest/Makefile
View File

@@ -159,7 +159,8 @@ NV_HEADER_PRESENCE_TESTS = \
generated/autoconf.h \ generated/autoconf.h \
linux/kconfig.h \ linux/kconfig.h \
linux/iosys-map.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 # Filename to store the define for the header in $(1); this is only consumed by
# the rule below that concatenates all of these together. # the rule below that concatenates all of these together.