From 97a8781a1bd08b13a8782af621c0956d0697f1d7 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 26 Jun 2024 15:15:13 +0100 Subject: [PATCH] block: virtual-storage: Disable for Linux v6.11 The Tegra virtual storage driver fails to build for Linux v6.11 because of the following issues: 1. The functions blk_queue_logical_block_size(), blk_queue_physical_block_size() and blk_queue_max_discard_sectors() have been removed. 2. The function blk_queue_write_cache() has too many arguments for Linux v6.11. 3. The flag QUEUE_FLAG_NONROT is not defined for Linux v6.11. Disable this driver for Linux v6.11 until this driver is fixed. Bug 4311184 Bug 4749580 Change-Id: I56f811d6ee29dd0025a5dc199ae84e3fc0f37b21 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3185049 Reviewed-by: Brad Griffis Reviewed-by: Laxman Dewangan GVS: buildbot_gerritrpt --- drivers/block/tegra_virt_storage/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/block/tegra_virt_storage/Makefile b/drivers/block/tegra_virt_storage/Makefile index 7cf17404..505c4e88 100644 --- a/drivers/block/tegra_virt_storage/Makefile +++ b/drivers/block/tegra_virt_storage/Makefile @@ -1,13 +1,19 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-only +# SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Makefile for Virtual Storage Driver # +LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) +LINUX_VERSION_6_11 := $(shell expr 6 \* 256 + 11) + +# Use dummy driver for Kernel versions greater than or equal to Linux v6.11 +ifeq ($(shell test $(LINUX_VERSION) -lt $(LINUX_VERSION_6_11); echo $$?),0) tegra_vblk-y += tegra_hv_vblk.o tegra_vblk-y += tegra_hv_ioctl.o tegra_vblk-y += tegra_hv_mmc.o tegra_vblk-y += tegra_hv_scsi.o tegra_vblk-y += tegra_hv_ufs.o obj-m += tegra_vblk.o +endif \ No newline at end of file