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

drivers: Fix build for Linux v6.12

Browse Source 
In Linux v6.12 the definition 'no_llseek' was finally removed. Since
Linux v6.0 it had been redefined as NULL. Add a test to conftest to
determine if 'no_llseek' is present and if not then it is no longer
necessary to populate this and we can leave as NULL.

Bug 4876974

Change-Id: I051fdb285b32260b5913dad89cabe0be04253f67
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3222106
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2024-10-01 15:20:08 +01:00
parent cc49f73763
commit 5a54d4161a
11 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/tegra/camera/fusa-capture/capture-isp-channel.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2017-2023 NVIDIA Corporation. All rights reserved.
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/**
* @file drivers/media/platform/tegra/camera/fusa-capture/capture-isp-channel.c
@@ -477,7 +477,9 @@ static long isp_channel_ioctl(
static const struct file_operations isp_channel_fops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = isp_channel_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = isp_channel_ioctl,

2
drivers/media/platform/tegra/camera/fusa-capture/capture-vi-channel.c
View File

@@ -638,7 +638,9 @@ static long vi_channel_ioctl(
static const struct file_operations vi_channel_fops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = vi_channel_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = vi_channel_ioctl,

2
drivers/misc/nvsciipc/nvsciipc.c
View File

@@ -687,7 +687,9 @@ static const struct file_operations nvsciipc_fops = {
.open = nvsciipc_dev_open,
.release = nvsciipc_dev_release,
.unlocked_ioctl = nvsciipc_dev_ioctl,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.read = nvsciipc_dbg_read,
};

6
drivers/platform/tegra/rtcpu/camchar.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (c) 2022-2023, 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.
#include <nvidia/conftest.h>
@@ -226,7 +226,9 @@ static const struct file_operations tegra_camchar_fops = {
.release = tegra_camchar_release,
.unlocked_ioctl = tegra_camchar_ioctl,
.compat_ioctl = tegra_camchar_ioctl,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
};
static int __init tegra_camchar_init(struct tegra_ivc_driver *drv)

6
drivers/video/tegra/host/nvcsi/nvcsi-t194.c
View File

@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/
// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <nvidia/conftest.h>
@@ -112,7 +110,9 @@ static int t194_nvcsi_release(struct inode *inode, struct file *file)
const struct file_operations tegra194_nvcsi_ctrl_ops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = t194_nvcsi_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = t194_nvcsi_ioctl,

7
drivers/video/tegra/host/nvcsi/nvcsi.c
View File

@@ -1,8 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2014-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-FileCopyrightText: Copyright (c) 2014-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/*
* NVCSI driver
*/
#include <nvidia/conftest.h>
#include <linux/device.h>
#include <linux/export.h>
#include <linux/module.h>
@@ -129,7 +132,9 @@ static int nvcsi_release(struct inode *inode, struct file *file)
const struct file_operations tegra_nvcsi_ctrl_ops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = nvcsi_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = nvcsi_ioctl,

7
drivers/video/tegra/host/nvdla/nvdla_ioctl.c
View File

@@ -1,10 +1,11 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/*
* Copyright (c) 2016-2023, NVIDIA Corporation. All rights reserved.
*
* NVDLA IOCTL for T194
*/
#include <nvidia/conftest.h>
#include <linux/arm64-barrier.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
@@ -1329,7 +1330,9 @@ static int nvdla_release(struct inode *inode, struct file *file)
const struct file_operations tegra_nvdla_ctrl_ops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = nvdla_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = nvdla_ioctl,

8
drivers/video/tegra/host/pva/pva_ioctl.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2024, NVIDIA CORPORATION. All rights reserved.
*/
// SPDX-FileCopyrightText: Copyright (c) 2016-2024, NVIDIA CORPORATION. All rights reserved.
#include <nvidia/conftest.h>
#include <linux/err.h>
#include <linux/jiffies.h>
@@ -1133,7 +1133,9 @@ static ssize_t pva_read_vpu_print_buffer(struct file *file,
const struct file_operations tegra_pva_ctrl_ops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.unlocked_ioctl = pva_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = pva_ioctl,

2
drivers/virt/tegra/tegra_hv_pm_ctl.c
View File

@@ -391,7 +391,9 @@ static int tegra_hv_pm_ctl_release(struct inode *inode, struct file *filp)
static const struct file_operations tegra_hv_pm_ctl_fops = {
.owner = THIS_MODULE,
#if defined(NV_NO_LLSEEK_PRESENT)
.llseek = no_llseek,
#endif
.read = tegra_hv_pm_ctl_read,
.write = tegra_hv_pm_ctl_write,
.poll = tegra_hv_pm_ctl_poll,

1
scripts/conftest/Makefile
View File

@@ -147,6 +147,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += module_import_ns_macro
NV_CONFTEST_FUNCTION_COMPILE_TESTS += msi_get_virq
NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_set_tso_max_size
NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight
NV_CONFTEST_FUNCTION_COMPILE_TESTS += no_llseek
NV_CONFTEST_FUNCTION_COMPILE_TESTS += of_get_named_gpio_flags
NV_CONFTEST_FUNCTION_COMPILE_TESTS += gpio_chip_struct_has_of_node_present
NV_CONFTEST_FUNCTION_COMPILE_TESTS += gpio_device_find

19
scripts/conftest/conftest.sh
View File

@@ -7525,6 +7525,25 @@ compile_test() {
compile_check_conftest "$CODE" "NV_MODULE_IMPORT_NS_PRESENT" "" "types"
;;
no_llseek)
#
# Determine if the function no_llseek() is present.
#
# Commit cb787f4ac0c2 ("[tree-wide] finally take no_llseek out")
# removed the definition for no_llseek() in Linux v6.12-rc1. Note
# that commit 868941b14441 ("fs: remove no_llseek") in Linux v6.0
# had previously redefined no_llseek as NULL in preparation for
# its removal.
#
CODE="
#include <linux/fs.h>
void conftest_no_llseek(void) {
no_llseek();
}"
compile_check_conftest "$CODE" "NV_NO_LLSEEK_PRESENT" "" "functions"
;;
of_property_for_each_u32_removed_internal_args)
#
# Determine if the internal arguments for the macro