mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +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 ...
115 lines
2.8 KiB
C
115 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#define pr_fmt(fmt) "of_pmem: " fmt
|
|
|
|
#include <linux/of.h>
|
|
#include <linux/libnvdimm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
|
|
struct of_pmem_private {
|
|
struct nvdimm_bus_descriptor bus_desc;
|
|
struct nvdimm_bus *bus;
|
|
};
|
|
|
|
static int of_pmem_region_probe(struct platform_device *pdev)
|
|
{
|
|
struct of_pmem_private *priv;
|
|
struct device_node *np;
|
|
struct nvdimm_bus *bus;
|
|
bool is_volatile;
|
|
int i;
|
|
|
|
np = dev_of_node(&pdev->dev);
|
|
if (!np)
|
|
return -ENXIO;
|
|
|
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
priv->bus_desc.provider_name = devm_kstrdup(&pdev->dev, pdev->name,
|
|
GFP_KERNEL);
|
|
if (!priv->bus_desc.provider_name) {
|
|
kfree(priv);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
priv->bus_desc.module = THIS_MODULE;
|
|
priv->bus_desc.of_node = np;
|
|
|
|
priv->bus = bus = nvdimm_bus_register(&pdev->dev, &priv->bus_desc);
|
|
if (!bus) {
|
|
kfree(priv);
|
|
return -ENODEV;
|
|
}
|
|
platform_set_drvdata(pdev, priv);
|
|
|
|
is_volatile = !!of_find_property(np, "volatile", NULL);
|
|
dev_dbg(&pdev->dev, "Registering %s regions from %pOF\n",
|
|
is_volatile ? "volatile" : "non-volatile", np);
|
|
|
|
for (i = 0; i < pdev->num_resources; i++) {
|
|
struct nd_region_desc ndr_desc;
|
|
struct nd_region *region;
|
|
|
|
/*
|
|
* NB: libnvdimm copies the data from ndr_desc into it's own
|
|
* structures so passing a stack pointer is fine.
|
|
*/
|
|
memset(&ndr_desc, 0, sizeof(ndr_desc));
|
|
ndr_desc.numa_node = dev_to_node(&pdev->dev);
|
|
ndr_desc.target_node = ndr_desc.numa_node;
|
|
ndr_desc.res = &pdev->resource[i];
|
|
ndr_desc.of_node = np;
|
|
set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
|
|
|
|
if (is_volatile)
|
|
region = nvdimm_volatile_region_create(bus, &ndr_desc);
|
|
else {
|
|
set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc.flags);
|
|
region = nvdimm_pmem_region_create(bus, &ndr_desc);
|
|
}
|
|
|
|
if (!region)
|
|
dev_warn(&pdev->dev, "Unable to register region %pR from %pOF\n",
|
|
ndr_desc.res, np);
|
|
else
|
|
dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n",
|
|
ndr_desc.res, np);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void of_pmem_region_remove(struct platform_device *pdev)
|
|
{
|
|
struct of_pmem_private *priv = platform_get_drvdata(pdev);
|
|
|
|
nvdimm_bus_unregister(priv->bus);
|
|
kfree(priv);
|
|
}
|
|
|
|
static const struct of_device_id of_pmem_region_match[] = {
|
|
{ .compatible = "pmem-region" },
|
|
{ .compatible = "pmem-region-v2" },
|
|
{ },
|
|
};
|
|
|
|
static struct platform_driver of_pmem_region_driver = {
|
|
.probe = of_pmem_region_probe,
|
|
.remove_new = of_pmem_region_remove,
|
|
.driver = {
|
|
.name = "of_pmem",
|
|
.of_match_table = of_pmem_region_match,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(of_pmem_region_driver);
|
|
MODULE_DEVICE_TABLE(of, of_pmem_region_match);
|
|
MODULE_DESCRIPTION("NVDIMM Device Tree support");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("IBM Corporation");
|