mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
c2a96b7f18
Here is the big set of driver core changes for 6.11-rc1. Lots of stuff in here, with not a huge diffstat, but apis are evolving which required lots of files to be touched. Highlights of the changes in here are: - platform remove callback api final fixups (Uwe took many releases to get here, finally!) - Rust bindings for basic firmware apis and initial driver-core interactions. It's not all that useful for a "write a whole driver in rust" type of thing, but the firmware bindings do help out the phy rust drivers, and the driver core bindings give a solid base on which others can start their work. There is still a long way to go here before we have a multitude of rust drivers being added, but it's a great first step. - driver core const api changes. This reached across all bus types, and there are some fix-ups for some not-common bus types that linux-next and 0-day testing shook out. This work is being done to help make the rust bindings more safe, as well as the C code, moving toward the end-goal of allowing us to put driver structures into read-only memory. We aren't there yet, but are getting closer. - minor devres cleanups and fixes found by code inspection - arch_topology minor changes - other minor driver core cleanups All of these have been in linux-next for a very long time with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCZqH+aQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ymoOQCfVBdLcBjEDAGh3L8qHRGMPy4rV2EAoL/r+zKm cJEYtJpGtWX6aAtugm9E =ZyJV -----END PGP SIGNATURE----- Merge tag 'driver-core-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core updates from Greg KH: "Here is the big set of driver core changes for 6.11-rc1. Lots of stuff in here, with not a huge diffstat, but apis are evolving which required lots of files to be touched. Highlights of the changes in here are: - platform remove callback api final fixups (Uwe took many releases to get here, finally!) - Rust bindings for basic firmware apis and initial driver-core interactions. It's not all that useful for a "write a whole driver in rust" type of thing, but the firmware bindings do help out the phy rust drivers, and the driver core bindings give a solid base on which others can start their work. There is still a long way to go here before we have a multitude of rust drivers being added, but it's a great first step. - driver core const api changes. This reached across all bus types, and there are some fix-ups for some not-common bus types that linux-next and 0-day testing shook out. This work is being done to help make the rust bindings more safe, as well as the C code, moving toward the end-goal of allowing us to put driver structures into read-only memory. We aren't there yet, but are getting closer. - minor devres cleanups and fixes found by code inspection - arch_topology minor changes - other minor driver core cleanups All of these have been in linux-next for a very long time with no reported problems" * tag 'driver-core-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (55 commits) ARM: sa1100: make match function take a const pointer sysfs/cpu: Make crash_hotplug attribute world-readable dio: Have dio_bus_match() callback take a const * zorro: make match function take a const pointer driver core: module: make module_[add|remove]_driver take a const * driver core: make driver_find_device() take a const * driver core: make driver_[create|remove]_file take a const * firmware_loader: fix soundness issue in `request_internal` firmware_loader: annotate doctests as `no_run` devres: Correct code style for functions that return a pointer type devres: Initialize an uninitialized struct member devres: Fix memory leakage caused by driver API devm_free_percpu() devres: Fix devm_krealloc() wasting memory driver core: platform: Switch to use kmemdup_array() driver core: have match() callback in struct bus_type take a const * MAINTAINERS: add Rust device abstractions to DRIVER CORE device: rust: improve safety comments MAINTAINERS: add Danilo as FIRMWARE LOADER maintainer MAINTAINERS: add Rust FW abstractions to FIRMWARE LOADER firmware: rust: improve safety comments ...
285 lines
6.2 KiB
C
285 lines
6.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Serial base bus layer for controllers
|
|
*
|
|
* Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
|
|
* Author: Tony Lindgren <tony@atomide.com>
|
|
*
|
|
* The serial core bus manages the serial core controller instances.
|
|
*/
|
|
|
|
#include <linux/cleanup.h>
|
|
#include <linux/container_of.h>
|
|
#include <linux/device.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/module.h>
|
|
#include <linux/serial_core.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
#include "serial_base.h"
|
|
|
|
static bool serial_base_initialized;
|
|
|
|
static const struct device_type serial_ctrl_type = {
|
|
.name = "ctrl",
|
|
};
|
|
|
|
static const struct device_type serial_port_type = {
|
|
.name = "port",
|
|
};
|
|
|
|
static int serial_base_match(struct device *dev, const struct device_driver *drv)
|
|
{
|
|
if (dev->type == &serial_ctrl_type &&
|
|
str_has_prefix(drv->name, serial_ctrl_type.name))
|
|
return 1;
|
|
|
|
if (dev->type == &serial_port_type &&
|
|
str_has_prefix(drv->name, serial_port_type.name))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct bus_type serial_base_bus_type = {
|
|
.name = "serial-base",
|
|
.match = serial_base_match,
|
|
};
|
|
|
|
int serial_base_driver_register(struct device_driver *driver)
|
|
{
|
|
driver->bus = &serial_base_bus_type;
|
|
|
|
return driver_register(driver);
|
|
}
|
|
|
|
void serial_base_driver_unregister(struct device_driver *driver)
|
|
{
|
|
driver_unregister(driver);
|
|
}
|
|
|
|
static int serial_base_device_init(struct uart_port *port,
|
|
struct device *dev,
|
|
struct device *parent_dev,
|
|
const struct device_type *type,
|
|
void (*release)(struct device *dev),
|
|
unsigned int ctrl_id,
|
|
unsigned int port_id)
|
|
{
|
|
device_initialize(dev);
|
|
dev->type = type;
|
|
dev->parent = parent_dev;
|
|
dev->bus = &serial_base_bus_type;
|
|
dev->release = release;
|
|
|
|
if (!serial_base_initialized) {
|
|
dev_dbg(port->dev, "uart_add_one_port() called before arch_initcall()?\n");
|
|
return -EPROBE_DEFER;
|
|
}
|
|
|
|
if (type == &serial_ctrl_type)
|
|
return dev_set_name(dev, "%s:%d", dev_name(port->dev), ctrl_id);
|
|
|
|
if (type == &serial_port_type)
|
|
return dev_set_name(dev, "%s:%d.%d", dev_name(port->dev),
|
|
ctrl_id, port_id);
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void serial_base_ctrl_release(struct device *dev)
|
|
{
|
|
struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev);
|
|
|
|
kfree(ctrl_dev);
|
|
}
|
|
|
|
void serial_base_ctrl_device_remove(struct serial_ctrl_device *ctrl_dev)
|
|
{
|
|
if (!ctrl_dev)
|
|
return;
|
|
|
|
device_del(&ctrl_dev->dev);
|
|
put_device(&ctrl_dev->dev);
|
|
}
|
|
|
|
struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port,
|
|
struct device *parent)
|
|
{
|
|
struct serial_ctrl_device *ctrl_dev;
|
|
int err;
|
|
|
|
ctrl_dev = kzalloc(sizeof(*ctrl_dev), GFP_KERNEL);
|
|
if (!ctrl_dev)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
ida_init(&ctrl_dev->port_ida);
|
|
|
|
err = serial_base_device_init(port, &ctrl_dev->dev,
|
|
parent, &serial_ctrl_type,
|
|
serial_base_ctrl_release,
|
|
port->ctrl_id, 0);
|
|
if (err)
|
|
goto err_put_device;
|
|
|
|
err = device_add(&ctrl_dev->dev);
|
|
if (err)
|
|
goto err_put_device;
|
|
|
|
return ctrl_dev;
|
|
|
|
err_put_device:
|
|
put_device(&ctrl_dev->dev);
|
|
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
static void serial_base_port_release(struct device *dev)
|
|
{
|
|
struct serial_port_device *port_dev = to_serial_base_port_device(dev);
|
|
|
|
kfree(port_dev);
|
|
}
|
|
|
|
struct serial_port_device *serial_base_port_add(struct uart_port *port,
|
|
struct serial_ctrl_device *ctrl_dev)
|
|
{
|
|
struct serial_port_device *port_dev;
|
|
int min = 0, max = -1; /* Use -1 for max to apply IDA defaults */
|
|
int err;
|
|
|
|
port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL);
|
|
if (!port_dev)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
/* Device driver specified port_id vs automatic assignment? */
|
|
if (port->port_id) {
|
|
min = port->port_id;
|
|
max = port->port_id;
|
|
}
|
|
|
|
err = ida_alloc_range(&ctrl_dev->port_ida, min, max, GFP_KERNEL);
|
|
if (err < 0) {
|
|
kfree(port_dev);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
port->port_id = err;
|
|
|
|
err = serial_base_device_init(port, &port_dev->dev,
|
|
&ctrl_dev->dev, &serial_port_type,
|
|
serial_base_port_release,
|
|
port->ctrl_id, port->port_id);
|
|
if (err)
|
|
goto err_put_device;
|
|
|
|
port_dev->port = port;
|
|
|
|
err = device_add(&port_dev->dev);
|
|
if (err)
|
|
goto err_put_device;
|
|
|
|
return port_dev;
|
|
|
|
err_put_device:
|
|
put_device(&port_dev->dev);
|
|
ida_free(&ctrl_dev->port_ida, port->port_id);
|
|
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
void serial_base_port_device_remove(struct serial_port_device *port_dev)
|
|
{
|
|
struct serial_ctrl_device *ctrl_dev;
|
|
struct device *parent;
|
|
|
|
if (!port_dev)
|
|
return;
|
|
|
|
parent = port_dev->dev.parent;
|
|
ctrl_dev = to_serial_base_ctrl_device(parent);
|
|
|
|
device_del(&port_dev->dev);
|
|
ida_free(&ctrl_dev->port_ida, port_dev->port->port_id);
|
|
put_device(&port_dev->dev);
|
|
}
|
|
|
|
#ifdef CONFIG_SERIAL_CORE_CONSOLE
|
|
|
|
/**
|
|
* serial_base_match_and_update_preferred_console - Match and update a preferred console
|
|
* @drv: Serial port device driver
|
|
* @port: Serial port instance
|
|
*
|
|
* Tries to match and update the preferred console for a serial port for
|
|
* the kernel command line option console=DEVNAME:0.0.
|
|
*
|
|
* Cannot be called early for ISA ports, depends on struct device.
|
|
*
|
|
* Return: 0 on success, negative error code on failure.
|
|
*/
|
|
int serial_base_match_and_update_preferred_console(struct uart_driver *drv,
|
|
struct uart_port *port)
|
|
{
|
|
const char *port_match __free(kfree) = NULL;
|
|
int ret;
|
|
|
|
port_match = kasprintf(GFP_KERNEL, "%s:%d.%d", dev_name(port->dev),
|
|
port->ctrl_id, port->port_id);
|
|
if (!port_match)
|
|
return -ENOMEM;
|
|
|
|
ret = match_devname_and_update_preferred_console(port_match,
|
|
drv->dev_name,
|
|
port->line);
|
|
if (ret == -ENOENT)
|
|
return 0;
|
|
|
|
return ret;
|
|
}
|
|
|
|
#endif
|
|
|
|
static int serial_base_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ret = bus_register(&serial_base_bus_type);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ret = serial_base_ctrl_init();
|
|
if (ret)
|
|
goto err_bus_unregister;
|
|
|
|
ret = serial_base_port_init();
|
|
if (ret)
|
|
goto err_ctrl_exit;
|
|
|
|
serial_base_initialized = true;
|
|
|
|
return 0;
|
|
|
|
err_ctrl_exit:
|
|
serial_base_ctrl_exit();
|
|
|
|
err_bus_unregister:
|
|
bus_unregister(&serial_base_bus_type);
|
|
|
|
return ret;
|
|
}
|
|
arch_initcall(serial_base_init);
|
|
|
|
static void serial_base_exit(void)
|
|
{
|
|
serial_base_port_exit();
|
|
serial_base_ctrl_exit();
|
|
bus_unregister(&serial_base_bus_type);
|
|
}
|
|
module_exit(serial_base_exit);
|
|
|
|
MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
|
|
MODULE_DESCRIPTION("Serial core bus");
|
|
MODULE_LICENSE("GPL");
|