mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 04:04:43 +01:00
Driver core fixes for 7.0-rc2
- Do not register imx_clk_scu_driver in imx8qxp_clk_probe(); besides fixing two other issues, this avoids a deadlock in combination with commitdc23806a7c("driver core: enforce device_lock for driver_match_device()"). - Move secondary node lookup from device_get_next_child_node() to fwnode_get_next_child_node(); this avoids issues when users switch from the device API to the fwnode API. - Export io_define_{read,write}!() to avoid unused import warnings when CONFIG_PCI=n. -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQS2q/xV6QjXAdC7k+1FlHeO1qrKLgUCaaNQggAKCRBFlHeO1qrK Lo3AAP91+UfLXYTXh2qhAndszSSJi1Xjq2Ik4cIf4UT3Ed2FrQD/QQuppy8k6zFx tCZGWbmolra9Vnf/oz1OpCaU87JF/Qc= =ct45 -----END PGP SIGNATURE----- Merge tag 'driver-core-7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core Pull driver core fixes from Danilo Krummrich: - Do not register imx_clk_scu_driver in imx8qxp_clk_probe(); besides fixing two other issues, this avoids a deadlock in combination with commitdc23806a7c("driver core: enforce device_lock for driver_match_device()") - Move secondary node lookup from device_get_next_child_node() to fwnode_get_next_child_node(); this avoids issues when users switch from the device API to the fwnode API - Export io_define_{read,write}!() to avoid unused import warnings when CONFIG_PCI=n * tag 'driver-core-7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core: clk: scu/imx8qxp: do not register driver in probe() rust: io: macro_export io_define_read!() and io_define_write!() device property: Allow secondary lookup in fwnode_get_next_child_node()
This commit is contained in:
Linus Torvalds
commit
63a43faf6a
6 changed files with 150 additions and 70 deletions
|
|
@ -797,7 +797,18 @@ struct fwnode_handle *
|
|||
fwnode_get_next_child_node(const struct fwnode_handle *fwnode,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
return fwnode_call_ptr_op(fwnode, get_next_child_node, child);
|
||||
struct fwnode_handle *next;
|
||||
|
||||
if (IS_ERR_OR_NULL(fwnode))
|
||||
return NULL;
|
||||
|
||||
/* Try to find a child in primary fwnode */
|
||||
next = fwnode_call_ptr_op(fwnode, get_next_child_node, child);
|
||||
if (next)
|
||||
return next;
|
||||
|
||||
/* When no more children in primary, continue with secondary */
|
||||
return fwnode_call_ptr_op(fwnode->secondary, get_next_child_node, child);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(fwnode_get_next_child_node);
|
||||
|
||||
|
|
@ -841,19 +852,7 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_available_child_node);
|
|||
struct fwnode_handle *device_get_next_child_node(const struct device *dev,
|
||||
struct fwnode_handle *child)
|
||||
{
|
||||
const struct fwnode_handle *fwnode = dev_fwnode(dev);
|
||||
struct fwnode_handle *next;
|
||||
|
||||
if (IS_ERR_OR_NULL(fwnode))
|
||||
return NULL;
|
||||
|
||||
/* Try to find a child in primary fwnode */
|
||||
next = fwnode_get_next_child_node(fwnode, child);
|
||||
if (next)
|
||||
return next;
|
||||
|
||||
/* When no more children in primary, continue with secondary */
|
||||
return fwnode_get_next_child_node(fwnode->secondary, child);
|
||||
return fwnode_get_next_child_node(dev_fwnode(dev), child);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(device_get_next_child_node);
|
||||
|
||||
|
|
|
|||
|
|
@ -346,7 +346,29 @@ static struct platform_driver imx8qxp_clk_driver = {
|
|||
},
|
||||
.probe = imx8qxp_clk_probe,
|
||||
};
|
||||
module_platform_driver(imx8qxp_clk_driver);
|
||||
|
||||
static int __init imx8qxp_clk_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = platform_driver_register(&imx8qxp_clk_driver);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = imx_clk_scu_module_init();
|
||||
if (ret)
|
||||
platform_driver_unregister(&imx8qxp_clk_driver);
|
||||
|
||||
return ret;
|
||||
}
|
||||
module_init(imx8qxp_clk_init);
|
||||
|
||||
static void __exit imx8qxp_clk_exit(void)
|
||||
{
|
||||
imx_clk_scu_module_exit();
|
||||
platform_driver_unregister(&imx8qxp_clk_driver);
|
||||
}
|
||||
module_exit(imx8qxp_clk_exit);
|
||||
|
||||
MODULE_AUTHOR("Aisheng Dong <aisheng.dong@nxp.com>");
|
||||
MODULE_DESCRIPTION("NXP i.MX8QXP clock driver");
|
||||
|
|
|
|||
|
|
@ -191,6 +191,16 @@ static bool imx_scu_clk_is_valid(u32 rsrc_id)
|
|||
return p != NULL;
|
||||
}
|
||||
|
||||
int __init imx_clk_scu_module_init(void)
|
||||
{
|
||||
return platform_driver_register(&imx_clk_scu_driver);
|
||||
}
|
||||
|
||||
void __exit imx_clk_scu_module_exit(void)
|
||||
{
|
||||
return platform_driver_unregister(&imx_clk_scu_driver);
|
||||
}
|
||||
|
||||
int imx_clk_scu_init(struct device_node *np,
|
||||
const struct imx_clk_scu_rsrc_table *data)
|
||||
{
|
||||
|
|
@ -215,7 +225,7 @@ int imx_clk_scu_init(struct device_node *np,
|
|||
rsrc_table = data;
|
||||
}
|
||||
|
||||
return platform_driver_register(&imx_clk_scu_driver);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ extern const struct imx_clk_scu_rsrc_table imx_clk_scu_rsrc_imx8dxl;
|
|||
extern const struct imx_clk_scu_rsrc_table imx_clk_scu_rsrc_imx8qxp;
|
||||
extern const struct imx_clk_scu_rsrc_table imx_clk_scu_rsrc_imx8qm;
|
||||
|
||||
int __init imx_clk_scu_module_init(void);
|
||||
void __exit imx_clk_scu_module_exit(void);
|
||||
int imx_clk_scu_init(struct device_node *np,
|
||||
const struct imx_clk_scu_rsrc_table *data);
|
||||
struct clk_hw *imx_scu_of_clk_src_get(struct of_phandle_args *clkspec,
|
||||
|
|
|
|||
|
|
@ -139,9 +139,9 @@ pub struct Mmio<const SIZE: usize = 0>(MmioRaw<SIZE>);
|
|||
|
||||
/// Internal helper macros used to invoke C MMIO read functions.
|
||||
///
|
||||
/// This macro is intended to be used by higher-level MMIO access macros (define_read) and provides
|
||||
/// a unified expansion for infallible vs. fallible read semantics. It emits a direct call into the
|
||||
/// corresponding C helper and performs the required cast to the Rust return type.
|
||||
/// This macro is intended to be used by higher-level MMIO access macros (io_define_read) and
|
||||
/// provides a unified expansion for infallible vs. fallible read semantics. It emits a direct call
|
||||
/// into the corresponding C helper and performs the required cast to the Rust return type.
|
||||
///
|
||||
/// # Parameters
|
||||
///
|
||||
|
|
@ -166,9 +166,9 @@ macro_rules! call_mmio_read {
|
|||
|
||||
/// Internal helper macros used to invoke C MMIO write functions.
|
||||
///
|
||||
/// This macro is intended to be used by higher-level MMIO access macros (define_write) and provides
|
||||
/// a unified expansion for infallible vs. fallible write semantics. It emits a direct call into the
|
||||
/// corresponding C helper and performs the required cast to the Rust return type.
|
||||
/// This macro is intended to be used by higher-level MMIO access macros (io_define_write) and
|
||||
/// provides a unified expansion for infallible vs. fallible write semantics. It emits a direct call
|
||||
/// into the corresponding C helper and performs the required cast to the Rust return type.
|
||||
///
|
||||
/// # Parameters
|
||||
///
|
||||
|
|
@ -193,7 +193,30 @@ macro_rules! call_mmio_write {
|
|||
}};
|
||||
}
|
||||
|
||||
macro_rules! define_read {
|
||||
/// Generates an accessor method for reading from an I/O backend.
|
||||
///
|
||||
/// This macro reduces boilerplate by automatically generating either compile-time bounds-checked
|
||||
/// (infallible) or runtime bounds-checked (fallible) read methods. It abstracts the address
|
||||
/// calculation and bounds checking, and delegates the actual I/O read operation to a specified
|
||||
/// helper macro, making it generic over different I/O backends.
|
||||
///
|
||||
/// # Parameters
|
||||
///
|
||||
/// * `infallible` / `fallible` - Determines the bounds-checking strategy. `infallible` relies on
|
||||
/// `IoKnownSize` for compile-time checks and returns the value directly. `fallible` performs
|
||||
/// runtime checks against `maxsize()` and returns a `Result<T>`.
|
||||
/// * `$(#[$attr:meta])*` - Optional attributes to apply to the generated method (e.g.,
|
||||
/// `#[cfg(CONFIG_64BIT)]` or inline directives).
|
||||
/// * `$vis:vis` - The visibility of the generated method (e.g., `pub`).
|
||||
/// * `$name:ident` / `$try_name:ident` - The name of the generated method (e.g., `read32`,
|
||||
/// `try_read8`).
|
||||
/// * `$call_macro:ident` - The backend-specific helper macro used to emit the actual I/O call
|
||||
/// (e.g., `call_mmio_read`).
|
||||
/// * `$c_fn:ident` - The backend-specific C function or identifier to be passed into the
|
||||
/// `$call_macro`.
|
||||
/// * `$type_name:ty` - The Rust type of the value being read (e.g., `u8`, `u32`).
|
||||
#[macro_export]
|
||||
macro_rules! io_define_read {
|
||||
(infallible, $(#[$attr:meta])* $vis:vis $name:ident, $call_macro:ident($c_fn:ident) ->
|
||||
$type_name:ty) => {
|
||||
/// Read IO data from a given offset known at compile time.
|
||||
|
|
@ -226,9 +249,33 @@ macro_rules! define_read {
|
|||
}
|
||||
};
|
||||
}
|
||||
pub(crate) use define_read;
|
||||
pub use io_define_read;
|
||||
|
||||
macro_rules! define_write {
|
||||
/// Generates an accessor method for writing to an I/O backend.
|
||||
///
|
||||
/// This macro reduces boilerplate by automatically generating either compile-time bounds-checked
|
||||
/// (infallible) or runtime bounds-checked (fallible) write methods. It abstracts the address
|
||||
/// calculation and bounds checking, and delegates the actual I/O write operation to a specified
|
||||
/// helper macro, making it generic over different I/O backends.
|
||||
///
|
||||
/// # Parameters
|
||||
///
|
||||
/// * `infallible` / `fallible` - Determines the bounds-checking strategy. `infallible` relies on
|
||||
/// `IoKnownSize` for compile-time checks and returns `()`. `fallible` performs runtime checks
|
||||
/// against `maxsize()` and returns a `Result`.
|
||||
/// * `$(#[$attr:meta])*` - Optional attributes to apply to the generated method (e.g.,
|
||||
/// `#[cfg(CONFIG_64BIT)]` or inline directives).
|
||||
/// * `$vis:vis` - The visibility of the generated method (e.g., `pub`).
|
||||
/// * `$name:ident` / `$try_name:ident` - The name of the generated method (e.g., `write32`,
|
||||
/// `try_write8`).
|
||||
/// * `$call_macro:ident` - The backend-specific helper macro used to emit the actual I/O call
|
||||
/// (e.g., `call_mmio_write`).
|
||||
/// * `$c_fn:ident` - The backend-specific C function or identifier to be passed into the
|
||||
/// `$call_macro`.
|
||||
/// * `$type_name:ty` - The Rust type of the value being written (e.g., `u8`, `u32`). Note the use
|
||||
/// of `<-` before the type to denote a write operation.
|
||||
#[macro_export]
|
||||
macro_rules! io_define_write {
|
||||
(infallible, $(#[$attr:meta])* $vis:vis $name:ident, $call_macro:ident($c_fn:ident) <-
|
||||
$type_name:ty) => {
|
||||
/// Write IO data from a given offset known at compile time.
|
||||
|
|
@ -259,7 +306,7 @@ macro_rules! define_write {
|
|||
}
|
||||
};
|
||||
}
|
||||
pub(crate) use define_write;
|
||||
pub use io_define_write;
|
||||
|
||||
/// Checks whether an access of type `U` at the given `offset`
|
||||
/// is valid within this region.
|
||||
|
|
@ -509,40 +556,40 @@ impl<const SIZE: usize> Io for Mmio<SIZE> {
|
|||
self.0.maxsize()
|
||||
}
|
||||
|
||||
define_read!(fallible, try_read8, call_mmio_read(readb) -> u8);
|
||||
define_read!(fallible, try_read16, call_mmio_read(readw) -> u16);
|
||||
define_read!(fallible, try_read32, call_mmio_read(readl) -> u32);
|
||||
define_read!(
|
||||
io_define_read!(fallible, try_read8, call_mmio_read(readb) -> u8);
|
||||
io_define_read!(fallible, try_read16, call_mmio_read(readw) -> u16);
|
||||
io_define_read!(fallible, try_read32, call_mmio_read(readl) -> u32);
|
||||
io_define_read!(
|
||||
fallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
try_read64,
|
||||
call_mmio_read(readq) -> u64
|
||||
);
|
||||
|
||||
define_write!(fallible, try_write8, call_mmio_write(writeb) <- u8);
|
||||
define_write!(fallible, try_write16, call_mmio_write(writew) <- u16);
|
||||
define_write!(fallible, try_write32, call_mmio_write(writel) <- u32);
|
||||
define_write!(
|
||||
io_define_write!(fallible, try_write8, call_mmio_write(writeb) <- u8);
|
||||
io_define_write!(fallible, try_write16, call_mmio_write(writew) <- u16);
|
||||
io_define_write!(fallible, try_write32, call_mmio_write(writel) <- u32);
|
||||
io_define_write!(
|
||||
fallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
try_write64,
|
||||
call_mmio_write(writeq) <- u64
|
||||
);
|
||||
|
||||
define_read!(infallible, read8, call_mmio_read(readb) -> u8);
|
||||
define_read!(infallible, read16, call_mmio_read(readw) -> u16);
|
||||
define_read!(infallible, read32, call_mmio_read(readl) -> u32);
|
||||
define_read!(
|
||||
io_define_read!(infallible, read8, call_mmio_read(readb) -> u8);
|
||||
io_define_read!(infallible, read16, call_mmio_read(readw) -> u16);
|
||||
io_define_read!(infallible, read32, call_mmio_read(readl) -> u32);
|
||||
io_define_read!(
|
||||
infallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
read64,
|
||||
call_mmio_read(readq) -> u64
|
||||
);
|
||||
|
||||
define_write!(infallible, write8, call_mmio_write(writeb) <- u8);
|
||||
define_write!(infallible, write16, call_mmio_write(writew) <- u16);
|
||||
define_write!(infallible, write32, call_mmio_write(writel) <- u32);
|
||||
define_write!(
|
||||
io_define_write!(infallible, write8, call_mmio_write(writeb) <- u8);
|
||||
io_define_write!(infallible, write16, call_mmio_write(writew) <- u16);
|
||||
io_define_write!(infallible, write32, call_mmio_write(writel) <- u32);
|
||||
io_define_write!(
|
||||
infallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
write64,
|
||||
|
|
@ -566,40 +613,40 @@ impl<const SIZE: usize> Mmio<SIZE> {
|
|||
unsafe { &*core::ptr::from_ref(raw).cast() }
|
||||
}
|
||||
|
||||
define_read!(infallible, pub read8_relaxed, call_mmio_read(readb_relaxed) -> u8);
|
||||
define_read!(infallible, pub read16_relaxed, call_mmio_read(readw_relaxed) -> u16);
|
||||
define_read!(infallible, pub read32_relaxed, call_mmio_read(readl_relaxed) -> u32);
|
||||
define_read!(
|
||||
io_define_read!(infallible, pub read8_relaxed, call_mmio_read(readb_relaxed) -> u8);
|
||||
io_define_read!(infallible, pub read16_relaxed, call_mmio_read(readw_relaxed) -> u16);
|
||||
io_define_read!(infallible, pub read32_relaxed, call_mmio_read(readl_relaxed) -> u32);
|
||||
io_define_read!(
|
||||
infallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
pub read64_relaxed,
|
||||
call_mmio_read(readq_relaxed) -> u64
|
||||
);
|
||||
|
||||
define_read!(fallible, pub try_read8_relaxed, call_mmio_read(readb_relaxed) -> u8);
|
||||
define_read!(fallible, pub try_read16_relaxed, call_mmio_read(readw_relaxed) -> u16);
|
||||
define_read!(fallible, pub try_read32_relaxed, call_mmio_read(readl_relaxed) -> u32);
|
||||
define_read!(
|
||||
io_define_read!(fallible, pub try_read8_relaxed, call_mmio_read(readb_relaxed) -> u8);
|
||||
io_define_read!(fallible, pub try_read16_relaxed, call_mmio_read(readw_relaxed) -> u16);
|
||||
io_define_read!(fallible, pub try_read32_relaxed, call_mmio_read(readl_relaxed) -> u32);
|
||||
io_define_read!(
|
||||
fallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
pub try_read64_relaxed,
|
||||
call_mmio_read(readq_relaxed) -> u64
|
||||
);
|
||||
|
||||
define_write!(infallible, pub write8_relaxed, call_mmio_write(writeb_relaxed) <- u8);
|
||||
define_write!(infallible, pub write16_relaxed, call_mmio_write(writew_relaxed) <- u16);
|
||||
define_write!(infallible, pub write32_relaxed, call_mmio_write(writel_relaxed) <- u32);
|
||||
define_write!(
|
||||
io_define_write!(infallible, pub write8_relaxed, call_mmio_write(writeb_relaxed) <- u8);
|
||||
io_define_write!(infallible, pub write16_relaxed, call_mmio_write(writew_relaxed) <- u16);
|
||||
io_define_write!(infallible, pub write32_relaxed, call_mmio_write(writel_relaxed) <- u32);
|
||||
io_define_write!(
|
||||
infallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
pub write64_relaxed,
|
||||
call_mmio_write(writeq_relaxed) <- u64
|
||||
);
|
||||
|
||||
define_write!(fallible, pub try_write8_relaxed, call_mmio_write(writeb_relaxed) <- u8);
|
||||
define_write!(fallible, pub try_write16_relaxed, call_mmio_write(writew_relaxed) <- u16);
|
||||
define_write!(fallible, pub try_write32_relaxed, call_mmio_write(writel_relaxed) <- u32);
|
||||
define_write!(
|
||||
io_define_write!(fallible, pub try_write8_relaxed, call_mmio_write(writeb_relaxed) <- u8);
|
||||
io_define_write!(fallible, pub try_write16_relaxed, call_mmio_write(writew_relaxed) <- u16);
|
||||
io_define_write!(fallible, pub try_write32_relaxed, call_mmio_write(writel_relaxed) <- u32);
|
||||
io_define_write!(
|
||||
fallible,
|
||||
#[cfg(CONFIG_64BIT)]
|
||||
pub try_write64_relaxed,
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ use crate::{
|
|||
device,
|
||||
devres::Devres,
|
||||
io::{
|
||||
define_read,
|
||||
define_write,
|
||||
io_define_read,
|
||||
io_define_write,
|
||||
Io,
|
||||
IoCapable,
|
||||
IoKnownSize,
|
||||
|
|
@ -88,7 +88,7 @@ pub struct ConfigSpace<'a, S: ConfigSpaceKind = Extended> {
|
|||
/// Internal helper macros used to invoke C PCI configuration space read functions.
|
||||
///
|
||||
/// This macro is intended to be used by higher-level PCI configuration space access macros
|
||||
/// (define_read) and provides a unified expansion for infallible vs. fallible read semantics. It
|
||||
/// (io_define_read) and provides a unified expansion for infallible vs. fallible read semantics. It
|
||||
/// emits a direct call into the corresponding C helper and performs the required cast to the Rust
|
||||
/// return type.
|
||||
///
|
||||
|
|
@ -117,9 +117,9 @@ macro_rules! call_config_read {
|
|||
/// Internal helper macros used to invoke C PCI configuration space write functions.
|
||||
///
|
||||
/// This macro is intended to be used by higher-level PCI configuration space access macros
|
||||
/// (define_write) and provides a unified expansion for infallible vs. fallible read semantics. It
|
||||
/// emits a direct call into the corresponding C helper and performs the required cast to the Rust
|
||||
/// return type.
|
||||
/// (io_define_write) and provides a unified expansion for infallible vs. fallible read semantics.
|
||||
/// It emits a direct call into the corresponding C helper and performs the required cast to the
|
||||
/// Rust return type.
|
||||
///
|
||||
/// # Parameters
|
||||
///
|
||||
|
|
@ -163,13 +163,13 @@ impl<'a, S: ConfigSpaceKind> Io for ConfigSpace<'a, S> {
|
|||
// PCI configuration space does not support fallible operations.
|
||||
// The default implementations from the Io trait are not used.
|
||||
|
||||
define_read!(infallible, read8, call_config_read(pci_read_config_byte) -> u8);
|
||||
define_read!(infallible, read16, call_config_read(pci_read_config_word) -> u16);
|
||||
define_read!(infallible, read32, call_config_read(pci_read_config_dword) -> u32);
|
||||
io_define_read!(infallible, read8, call_config_read(pci_read_config_byte) -> u8);
|
||||
io_define_read!(infallible, read16, call_config_read(pci_read_config_word) -> u16);
|
||||
io_define_read!(infallible, read32, call_config_read(pci_read_config_dword) -> u32);
|
||||
|
||||
define_write!(infallible, write8, call_config_write(pci_write_config_byte) <- u8);
|
||||
define_write!(infallible, write16, call_config_write(pci_write_config_word) <- u16);
|
||||
define_write!(infallible, write32, call_config_write(pci_write_config_dword) <- u32);
|
||||
io_define_write!(infallible, write8, call_config_write(pci_write_config_byte) <- u8);
|
||||
io_define_write!(infallible, write16, call_config_write(pci_write_config_word) <- u16);
|
||||
io_define_write!(infallible, write32, call_config_write(pci_write_config_dword) <- u32);
|
||||
}
|
||||
|
||||
impl<'a, S: ConfigSpaceKind> IoKnownSize for ConfigSpace<'a, S> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue