staging: fsl-mc: add dprc version check

The dprc driver supports dprc version 5.0 and above.
This patch adds the code to check the version.

Signed-off-by: Itai Katz <itai.katz@nxp.com>
(Stuart: resolved merge conflicts, split dpseci quirk into separate patch)
Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Acked-by: German Rivera <german.rivera@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h
index d0198f5d2c1f0f5c2597cfcc1a12e2a0b43c1ceb..9b854fa8e84d6f0665955cb53628a9a9e3a6b5ed 100644 (file)
--- a/drivers/staging/fsl-mc/bus/dprc-cmd.h
+++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h
@@ -40,9 +40,9 @@
 #ifndef _FSL_DPRC_CMD_H
 #define _FSL_DPRC_CMD_H
 
-/* DPRC Version */
-#define DPRC_VER_MAJOR                         5
-#define DPRC_VER_MINOR                         1
+/* Minimal supported DPRC Version */
+#define DPRC_MIN_VER_MAJOR                     5
+#define DPRC_MIN_VER_MINOR                     0
 
 /* Command IDs */
 #define DPRC_CMDID_CLOSE                       0x800

diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c
index 2d88c106b974bef94e53f2d9c6e2293b2dd34952..53c6e98b65e898608c12cd6d7251d83ca895a612 100644 (file)
--- a/drivers/staging/fsl-mc/bus/dprc-driver.c
+++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
@@ -693,6 +693,25 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
                goto error_cleanup_msi_domain;
        }
 
+       error = dprc_get_attributes(mc_dev->mc_io, 0, mc_dev->mc_handle,
+                                   &mc_bus->dprc_attr);
+       if (error < 0) {
+               dev_err(&mc_dev->dev, "dprc_get_attributes() failed: %d\n",
+                       error);
+               goto error_cleanup_open;
+       }
+
+       if (mc_bus->dprc_attr.version.major < DPRC_MIN_VER_MAJOR ||
+          (mc_bus->dprc_attr.version.major == DPRC_MIN_VER_MAJOR &&
+           mc_bus->dprc_attr.version.minor < DPRC_MIN_VER_MINOR)) {
+               dev_err(&mc_dev->dev,
+                       "ERROR: DPRC version %d.%d not supported\n",
+                       mc_bus->dprc_attr.version.major,
+                       mc_bus->dprc_attr.version.minor);
+               error = -ENOTSUPP;
+               goto error_cleanup_open;
+       }
+
        mutex_init(&mc_bus->scan_mutex);
 
        /*

diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c
index b4c3c5e27e00ef7a7cd9b59f37a366383bd0035d..405364307561aaa6f3d5bc676b75c9835234413b 100644 (file)
--- a/drivers/staging/fsl-mc/bus/mc-bus.c
+++ b/drivers/staging/fsl-mc/bus/mc-bus.c
@@ -745,6 +745,7 @@ static int fsl_mc_bus_probe(struct platform_device *pdev)
                goto error_cleanup_mc_io;
        }
 
+       memset(&obj_desc, 0, sizeof(struct dprc_obj_desc));
        error = get_dprc_version(mc_io, container_id,
                                 &obj_desc.ver_major, &obj_desc.ver_minor);
        if (error < 0)

diff --git a/drivers/staging/fsl-mc/include/mc-private.h b/drivers/staging/fsl-mc/include/mc-private.h
index ee5f1d2bf604ed054f716eebc8eef64c17ac5554..cab1ae90f09e60e28a8199e24a6e82129ae99a53 100644 (file)
--- a/drivers/staging/fsl-mc/include/mc-private.h
+++ b/drivers/staging/fsl-mc/include/mc-private.h
@@ -94,12 +94,14 @@ struct fsl_mc_resource_pool {
  * from the physical DPRC.
  * @irq_resources: Pointer to array of IRQ objects for the IRQ pool
  * @scan_mutex: Serializes bus scanning
+ * @dprc_attr: DPRC attributes
  */
 struct fsl_mc_bus {
        struct fsl_mc_device mc_dev;
        struct fsl_mc_resource_pool resource_pools[FSL_MC_NUM_POOL_TYPES];
        struct fsl_mc_device_irq *irq_resources;
        struct mutex scan_mutex;    /* serializes bus scanning */
+       struct dprc_attributes dprc_attr;
 };
 
 #define to_fsl_mc_bus(_mc_dev) \