From 316baa67765dbdd9a157fb7428034005351fc02c Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Wed, 15 May 2024 11:18:35 +0000 Subject: [PATCH] ethernet: Add dummy driver for r8168 r8168 driver build is disabled on K6.9 and later. This is causing the packaging failure where module is not available. Add dummy driver when real driver is not available to make packaging success. bug 4628651 Change-Id: I8ade511488fab856f63e84c1ee51986286b2fa2d Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3138401 GVS: buildbot_gerritrpt Reviewed-by: Revanth Kumar Uppala --- drivers/net/ethernet/realtek/Makefile | 2 -- drivers/net/ethernet/realtek/r8168/Makefile | 10 ++++++++++ .../net/ethernet/realtek/r8168/r8168_dummy.c | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/realtek/r8168/r8168_dummy.c diff --git a/drivers/net/ethernet/realtek/Makefile b/drivers/net/ethernet/realtek/Makefile index f3211809..a5c19b39 100644 --- a/drivers/net/ethernet/realtek/Makefile +++ b/drivers/net/ethernet/realtek/Makefile @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. -ifeq ($(shell expr \( $(VERSION) \) \* 10000 + \( $(PATCHLEVEL) \) \* 100 + \( $(SUBLEVEL) \) \<= 60804), 1) obj-m += r8168/ -endif diff --git a/drivers/net/ethernet/realtek/r8168/Makefile b/drivers/net/ethernet/realtek/r8168/Makefile index 6b27dbc7..8cb70f58 100644 --- a/drivers/net/ethernet/realtek/r8168/Makefile +++ b/drivers/net/ethernet/realtek/r8168/Makefile @@ -30,6 +30,15 @@ # US6,570,884, US6,115,776, and US6,327,625. ################################################################################ +LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) +LINUX_VERSION_6_9 := $(shell expr 6 \* 256 + 9) + +# Use dummy R8168 driver for K69 and later +ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_9); echo $$?),0) +obj-m := r8168.o +r8168-objs := r8168_dummy.o +else + CONFIG_SOC_LAN = n ENABLE_FIBER_SUPPORT = n ENABLE_REALWOW_SUPPORT = n @@ -193,3 +202,4 @@ install: #endif endif +endif diff --git a/drivers/net/ethernet/realtek/r8168/r8168_dummy.c b/drivers/net/ethernet/realtek/r8168/r8168_dummy.c new file mode 100644 index 00000000..6322d418 --- /dev/null +++ b/drivers/net/ethernet/realtek/r8168/r8168_dummy.c @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + */ + +#include + +/* Dummy implementation for module */ +static int __init r8168_dummy_dummy_init(void) +{ + return 0; +} +device_initcall(r8168_dummy_dummy_init); + +MODULE_AUTHOR("Laxman Dewangan "); +MODULE_DESCRIPTION("Dummy R8168 dummy driver"); +MODULE_LICENSE("GPL V2");