diff options
author | Yutang Jiang <yutang.jiang@nxp.com> | 2016-12-24 01:11:32 +0800 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2017-01-03 15:19:15 +0100 |
commit | 1866368a8ab8cacf73aa47f67138040d5620439d (patch) | |
tree | 2b0dd1ba578016957856f59bf4b2edc54d6a46c5 /target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch | |
parent | c6d3a62919a7f993be625391d8593c84423aa021 (diff) | |
download | upstream-1866368a8ab8cacf73aa47f67138040d5620439d.tar.gz upstream-1866368a8ab8cacf73aa47f67138040d5620439d.tar.bz2 upstream-1866368a8ab8cacf73aa47f67138040d5620439d.zip |
layerscape: add ls1088ardb device support
LS1088A is an ARMv8 implementation combining eight ARM A53 processor
cores. The LS1088ARDB is an evaluatoin platform that supports the
LS1088A family SoCs.
Features summary:
- Eight 64-bit ARM v8 Cortex-A53 CPUs
- Data path acceleration architecture 2.0 (DPAA2)
- Ethernet interfaces
- QUADSPI flash, 3 PCIe, 2 USB, 1 SD, 2 DUARTs etc
Signed-off-by: Yutang Jiang <yutang.jiang@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch')
-rw-r--r-- | target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch b/target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch new file mode 100644 index 0000000000..b148c76068 --- /dev/null +++ b/target/linux/layerscape/patches-4.4/7185-staging-fsl-mc-fix-asymmetry-in-destroy-of-mc_io.patch @@ -0,0 +1,62 @@ +From 4e55a4c296d3a93c95320cdac0b8e72f3cfefb98 Mon Sep 17 00:00:00 2001 +From: Bharat Bhushan <Bharat.Bhushan@nxp.com> +Date: Wed, 22 Jun 2016 16:40:48 -0500 +Subject: [PATCH 185/226] staging: fsl-mc: fix asymmetry in destroy of mc_io + +An mc_io represents a mapped MC portal. Previously, an mc_io was +created for the root dprc in fsl_mc_bus_probe() and for child dprcs +in dprc_probe(). But the free of that data structure happened in the +general bus remove callback. This asymmetry resulted in some bugs due +to unwanted destroys of mc_io object in some scenarios (e.g. vfio). + +Fix this bug by making things symmetric-- mc_io created in +fsl_mc_bus_probe() is freed in fsl_mc_bus_remove(). The mc_io created +in dprc_probe() is freed in dprc_remove(). + +Signed-off-by: Bharat Bhushan <Bharat.Bhushan@nxp.com> +[Stuart: added check for root dprc and reworded commit message] +Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/staging/fsl-mc/bus/dprc-driver.c | 5 +++++ + drivers/staging/fsl-mc/bus/mc-bus.c | 8 ++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) + +--- a/drivers/staging/fsl-mc/bus/dprc-driver.c ++++ b/drivers/staging/fsl-mc/bus/dprc-driver.c +@@ -801,6 +801,11 @@ static int dprc_remove(struct fsl_mc_dev + dev_set_msi_domain(&mc_dev->dev, NULL); + } + ++ if (!fsl_mc_is_root_dprc(&mc_dev->dev)) { ++ fsl_destroy_mc_io(mc_dev->mc_io); ++ mc_dev->mc_io = NULL; ++ } ++ + dev_info(&mc_dev->dev, "DPRC device unbound from driver"); + return 0; + } +--- a/drivers/staging/fsl-mc/bus/mc-bus.c ++++ b/drivers/staging/fsl-mc/bus/mc-bus.c +@@ -579,10 +579,6 @@ void fsl_mc_device_remove(struct fsl_mc_ + + if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) { + mc_bus = to_fsl_mc_bus(mc_dev); +- if (mc_dev->mc_io) { +- fsl_destroy_mc_io(mc_dev->mc_io); +- mc_dev->mc_io = NULL; +- } + + if (fsl_mc_is_root_dprc(&mc_dev->dev)) { + if (atomic_read(&root_dprc_count) > 0) +@@ -810,6 +806,10 @@ static int fsl_mc_bus_remove(struct plat + return -EINVAL; + + fsl_mc_device_remove(mc->root_mc_bus_dev); ++ ++ fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io); ++ mc->root_mc_bus_dev->mc_io = NULL; ++ + dev_info(&pdev->dev, "Root MC bus device removed"); + return 0; + } |