From 034dd340b08be1f2f0477ad16131d609f9dbd53c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 30 Aug 2026 09:22:00 -0700 Subject: Merge tag 'trace-v7.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace Pull tracing fixes from Steven Rostedt: - Fix error output of boot instance creation failure Currently if a boot instance creation fails, instead of printing out the name of the instance that failed, it prints "(null)". That is because it prints "cur_str" that had already been processed by strsep(). Print the saved name instead. While at it, print the error code of the failure. - Fix use-after-free for same named historgrams Histograms can be named so that they can be used in multiple events. But if the named histogram has a variable attached, the second event that uses the named histogram which duplicates it and needs to free the original after duplication leaves the old variable in place and still visible. If another histogram uses than variable, it will use the stale one which will try to reference the freed duplicate histogram and crash the kernel. Free the duplicate variables along with the duplicated histogram data. - Check return value of kthread_run() in event self test The events self tests uses a kthread for testing but does not check if it succeeded in creating a kthread. If the kthread creation were to fail, the code will still try to call kthread_stop() on the error returned. - Fix race between reading trace_pipe and updating subbuffer size If a user is reading the trace_pipe file at the same time they update the ring buffer sub-buffer size, can cause the trace_pipe read to read stale data. Add trace_access_lock() around updating the ring buffer sub-buffer size. - Fix eventfs_inode on failure path in creation of the events directory In the creation of the "events" directory, if after allocating the eventfs_inode a failure is detected, it calls cleanup_ei() which calls free_ei(). The free_ei() will test if eventfs_inode being freed has no children. It is a bug if it does. But on the failure case of the creation of the "events" directory, the children lists have not yet been initialized and the free will trigger a warning because list_empty() on an uninitialized list returns false. Move the initialization into init_ei() where it makes more sense and makes sure that a created eventfs_inode has its lists initialized upon creation. - Check return value of kthread_run() in ftrace direct sample code The sample code that shows how to use the ftrace direct calls does not test the return of kthread_run() to see if it succeeds. Return a failure if the kthread_run() doesn't succeed. - Clear user events state on fork in case of alloc failure On fork, the child gets a pointer to the parent's user events state. It makes a copy of it then updates the child's pointer to it. But if the allocation fails, the duplication function leaves the child with a pointer to its parent's descriptor. When the child cleans up its data, it will free the parent's descriptor while the parent is still using it. In the duplication function, set the child's user_event_mm to NULL before testing if the allocation succeeded, and when it exits it will not free the parent's descriptor. - Fix retry exhaustion in simple ring buffer reader swap simple_ring_buffer_swap_reader_page() starts with retry set to 8 and post-decrements it only after a failed link replacement. On the final attempt, a successful replacement leaves retry at zero, while a failed replacement leaves it at -1. But the check for success expects the retry value to be non-zero and exits with an error on zero. This is the opposite result. Fix it. - Fail nicely when the remote swap_reader_page() returns an error Currently, if the swap_reader_page() of a remote buffer fails, it triggers a WARN_ON_ONCE() and continues normally. Instead, have it exit with an error and a pr_warn() print instead of a full WARNING. * tag 'trace-v7.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: ring-buffer: Stop remote reader update when page swap fails tracing: Fix retry exhaustion in simple ring buffer reader swap tracing/user_events: Clear copied tracing state before fork duplication samples/ftrace: Fix kthread_stop() on ERR_PTR in ftrace-direct-multi-modify samples/ftrace: Fix kthread_stop() on ERR_PTR in ftrace-direct-modify eventfs: Initialize ei->children and ei->list in init_ei() tracing: Fix use-after-free in trace_pipe read on sub-buffer order change tracing: Fix crash passing ERR_PTR to kthread_stop() tracing: Fix use-after-free with same-name named triggers tracing: Fix logged instance name on creation failure --- drivers/gpu/host1x/mipi.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 drivers/gpu/host1x/mipi.c (limited to 'drivers/gpu/host1x/mipi.c') diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c new file mode 100644 index 000000000..988681423 --- /dev/null +++ b/drivers/gpu/host1x/mipi.c @@ -0,0 +1,195 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2013 NVIDIA Corporation + * Copyright (C) 2025 Svyatoslav Ryhel + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* only need to support one provider */ +static struct { + struct device_node *np; + const struct tegra_mipi_ops *ops; +} provider; + +/** + * tegra_mipi_enable - Enable the Tegra MIPI calibration device. + * @device: Handle to the Tegra MIPI calibration device. + * + * This calls the enable sequence for the Tegra MIPI calibration device. + * + * Returns 0 on success or a negative error code on failure. + */ +int tegra_mipi_enable(struct tegra_mipi_device *device) +{ + if (device->ops->enable) + return device->ops->enable(device); + + return 0; +} +EXPORT_SYMBOL(tegra_mipi_enable); + +/** + * tegra_mipi_disable - Disable the Tegra MIPI calibration device. + * @device: Handle to the Tegra MIPI calibration device. + * + * This calls the disable sequence for the Tegra MIPI calibration device. + * + * Returns 0 on success or a negative error code on failure. + */ +int tegra_mipi_disable(struct tegra_mipi_device *device) +{ + if (device->ops->disable) + return device->ops->disable(device); + + return 0; +} +EXPORT_SYMBOL(tegra_mipi_disable); + +/** + * tegra_mipi_start_calibration - Start the Tegra MIPI calibration sequence. + * @device: Handle to the Tegra MIPI calibration device. + * + * This initiates the calibration of CSI/DSI interfaces via the Tegra MIPI + * calibration device. + * + * Returns 0 on success or a negative error code on failure. + */ +int tegra_mipi_start_calibration(struct tegra_mipi_device *device) +{ + if (device->ops->start_calibration) + return device->ops->start_calibration(device); + + return 0; +} +EXPORT_SYMBOL(tegra_mipi_start_calibration); + +/** + * tegra_mipi_finish_calibration - Finish the Tegra MIPI calibration sequence. + * @device: Handle to the Tegra MIPI calibration device. + * + * This completes the calibration of CSI/DSI interfaces via the Tegra MIPI + * calibration device. + * + * Returns 0 on success or a negative error code on failure. + */ +int tegra_mipi_finish_calibration(struct tegra_mipi_device *device) +{ + if (device->ops->finish_calibration) + return device->ops->finish_calibration(device); + + return 0; +} +EXPORT_SYMBOL(tegra_mipi_finish_calibration); + +/** + * tegra_mipi_request - Request a Tegra MIPI calibration device. + * @device: Handle of the device requesting the MIPI calibration function. + * @np: Device node pointer of the device requesting the MIPI calibration + * function. + * + * This function requests a reference to a Tegra MIPI calibration device. + * + * Returns a pointer to the Tegra MIPI calibration device on success, + * or an ERR_PTR-encoded error code on failure. + */ +struct tegra_mipi_device *tegra_mipi_request(struct device *device, + struct device_node *np) +{ + struct tegra_mipi_device *mipidev; + struct of_phandle_args args; + int err; + + err = of_parse_phandle_with_args(np, "nvidia,mipi-calibrate", + "#nvidia,mipi-calibrate-cells", 0, + &args); + if (err < 0) + return ERR_PTR(err); + + if (provider.np != args.np) { + err = -ENODEV; + goto out; + } + + mipidev = kzalloc_obj(*mipidev); + if (!mipidev) { + err = -ENOMEM; + goto out; + } + + mipidev->pdev = of_find_device_by_node(args.np); + if (!mipidev->pdev) { + err = -ENODEV; + goto free; + } + + of_node_put(args.np); + + mipidev->ops = provider.ops; + mipidev->pads = args.args[0]; + + return mipidev; + +free: + kfree(mipidev); +out: + of_node_put(args.np); + return ERR_PTR(err); +} +EXPORT_SYMBOL(tegra_mipi_request); + +/** + * tegra_mipi_free - Free a Tegra MIPI calibration device. + * @mipidev: Handle to the Tegra MIPI calibration device. + * + * This function releases a reference to a Tegra MIPI calibration device + * previously requested by tegra_mipi_request(). + */ +void tegra_mipi_free(struct tegra_mipi_device *mipidev) +{ + platform_device_put(mipidev->pdev); + kfree(mipidev); +} +EXPORT_SYMBOL(tegra_mipi_free); + +static void tegra_mipi_remove_provider(void *data) +{ + provider.np = NULL; + provider.ops = NULL; +} + +/** + * devm_tegra_mipi_add_provider - Managed registration of a Tegra MIPI + * calibration function provider. + * @device: Handle to the device providing the MIPI calibration function. + * @np: Device node pointer of the device providing the MIPI calibration + * function. + * @ops: Operations supported by the MIPI calibration device. + * + * This registers a device that provides MIPI calibration functions. + * For Tegra20 and Tegra30, this is the CSI block, while Tegra114 and + * newer SoC generations have a dedicated hardware block for these + * functions. + * + * Returns 0 on success or a negative error code on failure. + */ +int devm_tegra_mipi_add_provider(struct device *device, struct device_node *np, + const struct tegra_mipi_ops *ops) +{ + if (provider.np) + return -EBUSY; + + provider.np = np; + provider.ops = ops; + + return devm_add_action_or_reset(device, tegra_mipi_remove_provider, NULL); +} +EXPORT_SYMBOL(devm_tegra_mipi_add_provider); -- cgit v1.3.1