layerscape: add patches-5.4
[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 701-net-0161-staging-fsl-dpaa2-mac-Request-atomic-context-MC-port.patch
diff --git a/target/linux/layerscape/patches-5.4/701-net-0161-staging-fsl-dpaa2-mac-Request-atomic-context-MC-port.patch b/target/linux/layerscape/patches-5.4/701-net-0161-staging-fsl-dpaa2-mac-Request-atomic-context-MC-port.patch
new file mode 100644 (file)
index 0000000..95d0fb6
--- /dev/null
@@ -0,0 +1,28 @@
+From 001bad547937cdd667adee45b5c7ebe78a1de1d0 Mon Sep 17 00:00:00 2001
+From: Ioana Radulescu <ruxandra.radulescu@nxp.com>
+Date: Fri, 22 Sep 2017 12:20:02 +0300
+Subject: [PATCH] staging: fsl-dpaa2/mac: Request atomic context MC portals
+
+The MAC driver may need to issue MC commands while in atomic
+context (e.g. dpaa2_mac_get_stats can be called from a critical
+section), so we need to use MC portals that don't sleep while
+waiting for a command response to arrive.
+
+Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
+---
+ drivers/staging/fsl-dpaa2/mac/mac.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/fsl-dpaa2/mac/mac.c
++++ b/drivers/staging/fsl-dpaa2/mac/mac.c
+@@ -490,7 +490,9 @@ static int dpaa2_mac_probe(struct fsl_mc
+       dev_set_drvdata(dev, priv);
+-      err = fsl_mc_portal_allocate(mc_dev, 0, &mc_dev->mc_io);
++      /* We may need to issue MC commands while in atomic context */
++      err = fsl_mc_portal_allocate(mc_dev, FSL_MC_IO_ATOMIC_CONTEXT_PORTAL,
++                                   &mc_dev->mc_io);
+       if (err || !mc_dev->mc_io) {
+               dev_err(dev, "fsl_mc_portal_allocate error: %d\n", err);
+               err = -ENODEV;