aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-03-21 01:16:48 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-03-21 13:11:56 +0000
commit786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch)
tree926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch
parent9470160c350d15f765c33d6c1db15d6c4709a64c (diff)
downloadupstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2
upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all kernel configuration as well as patches for Linux 5.4. There were no targets still actively using Linux 5.4. Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch196
1 files changed, 0 insertions, 196 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch b/target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch
deleted file mode 100644
index b750c72664..0000000000
--- a/target/linux/layerscape/patches-5.4/701-net-0135-bus-fsl-mc-Propagate-driver_override-for-a-child-DPR.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From ab5ad879bf30318213a717ab50944b5590bc09c1 Mon Sep 17 00:00:00 2001
-From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
-Date: Fri, 13 Apr 2018 11:52:44 +0300
-Subject: [PATCH] bus: fsl-mc: Propagate driver_override for a child DPRC's
- children
-
-When a child DPRC is bound to the vfio_fsl_mc driver via
-driver_override, its own children should not be bound to corresponding
-host kernel drivers, but instead should be bound to the vfio_fsl_mc
-driver as well.
-
-Currently, when a child container is scanned by the vfio_fsl_mc
-driver, child devices found are automatically bound to corresponding
-host kernel drivers (e.g., DPMCP and DPBP objects are bound to the
-fsl_mc_allocator driver, DPNI objects are bound to the ldpaa_eth
-driver, etc), Then, the user has to manually unbind these child
-devices from their drivers, set the driver_override sysfs attribute
-to vfio_fsl_mc driver, for each of them and rebind them.
-
-Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
-Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
-Signed-off-by: Bharat Bhushan <Bharat.Bhushan@nxp.com>
-Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
----
- drivers/bus/fsl-mc/dprc-driver.c | 16 +++++++++++-----
- drivers/bus/fsl-mc/fsl-mc-bus.c | 19 +++++++++++++++++--
- drivers/bus/fsl-mc/fsl-mc-private.h | 2 ++
- include/linux/fsl/mc.h | 2 ++
- 4 files changed, 32 insertions(+), 7 deletions(-)
-
---- a/drivers/bus/fsl-mc/dprc-driver.c
-+++ b/drivers/bus/fsl-mc/dprc-driver.c
-@@ -156,6 +156,8 @@ static void check_plugged_state_change(s
- * dprc_add_new_devices - Adds devices to the logical bus for a DPRC
- *
- * @mc_bus_dev: pointer to the fsl-mc device that represents a DPRC object
-+ * @driver_override: driver override to apply to new objects found in the
-+ * DPRC, or NULL, if none.
- * @obj_desc_array: array of device descriptors for child devices currently
- * present in the physical DPRC.
- * @num_child_objects_in_mc: number of entries in obj_desc_array
-@@ -165,6 +167,7 @@ static void check_plugged_state_change(s
- * in the physical DPRC.
- */
- static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev,
-+ const char *driver_override,
- struct fsl_mc_obj_desc *obj_desc_array,
- int num_child_objects_in_mc)
- {
-@@ -189,7 +192,7 @@ static void dprc_add_new_devices(struct
- }
-
- error = fsl_mc_device_add(obj_desc, NULL, &mc_bus_dev->dev,
-- &child_dev);
-+ driver_override, &child_dev);
- if (error < 0)
- continue;
- }
-@@ -199,6 +202,8 @@ static void dprc_add_new_devices(struct
- * dprc_scan_objects - Discover objects in a DPRC
- *
- * @mc_bus_dev: pointer to the fsl-mc device that represents a DPRC object
-+ * @driver_override: driver override to apply to new objects found in the
-+ * DPRC, or NULL, if none.
- * @total_irq_count: If argument is provided the function populates the
- * total number of IRQs created by objects in the DPRC.
- *
-@@ -215,6 +220,7 @@ static void dprc_add_new_devices(struct
- * of the device drivers for the non-allocatable devices.
- */
- int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
-+ const char *driver_override,
- unsigned int *total_irq_count)
- {
- int num_child_objects;
-@@ -315,7 +321,7 @@ int dprc_scan_objects(struct fsl_mc_devi
- dprc_remove_devices(mc_bus_dev, child_obj_desc_array,
- num_child_objects);
-
-- dprc_add_new_devices(mc_bus_dev, child_obj_desc_array,
-+ dprc_add_new_devices(mc_bus_dev, driver_override, child_obj_desc_array,
- num_child_objects);
-
- if (child_obj_desc_array)
-@@ -344,7 +350,7 @@ static int dprc_scan_container(struct fs
- * Discover objects in the DPRC:
- */
- mutex_lock(&mc_bus->scan_mutex);
-- error = dprc_scan_objects(mc_bus_dev, NULL);
-+ error = dprc_scan_objects(mc_bus_dev, NULL, NULL);
- mutex_unlock(&mc_bus->scan_mutex);
- if (error < 0) {
- fsl_mc_cleanup_all_resource_pools(mc_bus_dev);
-@@ -373,7 +379,7 @@ static ssize_t rescan_store(struct devic
-
- if (val) {
- mutex_lock(&root_mc_bus->scan_mutex);
-- dprc_scan_objects(root_mc_dev, NULL);
-+ dprc_scan_objects(root_mc_dev, NULL, NULL);
- mutex_unlock(&root_mc_bus->scan_mutex);
- }
-
-@@ -442,7 +448,7 @@ static irqreturn_t dprc_irq0_handler_thr
- DPRC_IRQ_EVENT_OBJ_CREATED)) {
- unsigned int irq_count;
-
-- error = dprc_scan_objects(mc_dev, &irq_count);
-+ error = dprc_scan_objects(mc_dev, NULL, &irq_count);
- if (error < 0) {
- /*
- * If the error is -ENXIO, we ignore it, as it indicates
---- a/drivers/bus/fsl-mc/fsl-mc-bus.c
-+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
-@@ -165,7 +165,7 @@ static int scan_fsl_mc_bus(struct device
- root_mc_dev = to_fsl_mc_device(dev);
- root_mc_bus = to_fsl_mc_bus(root_mc_dev);
- mutex_lock(&root_mc_bus->scan_mutex);
-- dprc_scan_objects(root_mc_dev, NULL);
-+ dprc_scan_objects(root_mc_dev, NULL, NULL);
- mutex_unlock(&root_mc_bus->scan_mutex);
-
- exit:
-@@ -597,6 +597,7 @@ static void fsl_mc_device_release(struct
- int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
- struct fsl_mc_io *mc_io,
- struct device *parent_dev,
-+ const char *driver_override,
- struct fsl_mc_device **new_mc_dev)
- {
- int error;
-@@ -629,6 +630,19 @@ int fsl_mc_device_add(struct fsl_mc_obj_
-
- mc_dev->obj_desc = *obj_desc;
- mc_dev->mc_io = mc_io;
-+
-+ if (driver_override) {
-+ /*
-+ * We trust driver_override, so we don't need to use
-+ * kstrndup() here
-+ */
-+ mc_dev->driver_override = kstrdup(driver_override, GFP_KERNEL);
-+ if (!mc_dev->driver_override) {
-+ error = -ENOMEM;
-+ goto error_cleanup_dev;
-+ }
-+ }
-+
- device_initialize(&mc_dev->dev);
- mc_dev->dev.parent = parent_dev;
- mc_dev->dev.bus = &fsl_mc_bus_type;
-@@ -924,7 +938,8 @@ static int fsl_mc_bus_probe(struct platf
- obj_desc.irq_count = 1;
- obj_desc.region_count = 0;
-
-- error = fsl_mc_device_add(&obj_desc, mc_io, &pdev->dev, &mc_bus_dev);
-+ error = fsl_mc_device_add(&obj_desc, mc_io, &pdev->dev, NULL,
-+ &mc_bus_dev);
- if (error < 0)
- goto error_cleanup_mc_io;
-
---- a/drivers/bus/fsl-mc/fsl-mc-private.h
-+++ b/drivers/bus/fsl-mc/fsl-mc-private.h
-@@ -558,6 +558,7 @@ struct fsl_mc_bus {
- int __must_check fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
- struct fsl_mc_io *mc_io,
- struct device *parent_dev,
-+ const char *driver_override,
- struct fsl_mc_device **new_mc_dev);
-
- void fsl_mc_device_remove(struct fsl_mc_device *mc_dev);
-@@ -567,6 +568,7 @@ int __init dprc_driver_init(void);
- void dprc_driver_exit(void);
-
- int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
-+ const char *driver_override,
- unsigned int *total_irq_count);
- int __init fsl_mc_allocator_driver_init(void);
-
---- a/include/linux/fsl/mc.h
-+++ b/include/linux/fsl/mc.h
-@@ -162,6 +162,7 @@ struct fsl_mc_obj_desc {
- * @regions: pointer to array of MMIO region entries
- * @irqs: pointer to array of pointers to interrupts allocated to this device
- * @resource: generic resource associated with this MC object device, if any.
-+ * @driver_override: Driver name to force a match
- *
- * Generic device object for MC object devices that are "attached" to a
- * MC bus.
-@@ -195,6 +196,7 @@ struct fsl_mc_device {
- struct fsl_mc_device_irq **irqs;
- struct fsl_mc_resource *resource;
- struct device_link *consumer_link;
-+ const char *driver_override;
- };
-
- #define to_fsl_mc_device(_dev) \