staging: fsl-mc: cleanup: move dpbp and dpcon cmd headers
authorStuart Yoder <stuart.yoder@nxp.com>
Mon, 17 Oct 2016 18:42:18 +0000 (13:42 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Oct 2016 07:48:54 +0000 (09:48 +0200)
The dpbp and dpcon cmd header files should not be in the public
include directory but should be private to the bus driver.

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fsl-mc/bus/dpbp-cmd.h [new file with mode: 0644]
drivers/staging/fsl-mc/bus/dpbp.c
drivers/staging/fsl-mc/bus/dpcon-cmd.h [new file with mode: 0644]
drivers/staging/fsl-mc/bus/fsl-mc-allocator.c
drivers/staging/fsl-mc/include/dpbp-cmd.h [deleted file]
drivers/staging/fsl-mc/include/dpcon-cmd.h [deleted file]

diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h
new file mode 100644 (file)
index 0000000..2860411
--- /dev/null
@@ -0,0 +1,185 @@
+/* Copyright 2013-2016 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the above-listed copyright holders nor the
+ * names of any contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _FSL_DPBP_CMD_H
+#define _FSL_DPBP_CMD_H
+
+/* DPBP Version */
+#define DPBP_VER_MAJOR                         2
+#define DPBP_VER_MINOR                         2
+
+/* Command IDs */
+#define DPBP_CMDID_CLOSE                               0x800
+#define DPBP_CMDID_OPEN                                        0x804
+#define DPBP_CMDID_CREATE                              0x904
+#define DPBP_CMDID_DESTROY                             0x900
+
+#define DPBP_CMDID_ENABLE                              0x002
+#define DPBP_CMDID_DISABLE                             0x003
+#define DPBP_CMDID_GET_ATTR                            0x004
+#define DPBP_CMDID_RESET                               0x005
+#define DPBP_CMDID_IS_ENABLED                          0x006
+
+#define DPBP_CMDID_SET_IRQ                             0x010
+#define DPBP_CMDID_GET_IRQ                             0x011
+#define DPBP_CMDID_SET_IRQ_ENABLE                      0x012
+#define DPBP_CMDID_GET_IRQ_ENABLE                      0x013
+#define DPBP_CMDID_SET_IRQ_MASK                                0x014
+#define DPBP_CMDID_GET_IRQ_MASK                                0x015
+#define DPBP_CMDID_GET_IRQ_STATUS                      0x016
+#define DPBP_CMDID_CLEAR_IRQ_STATUS                    0x017
+
+#define DPBP_CMDID_SET_NOTIFICATIONS           0x01b0
+#define DPBP_CMDID_GET_NOTIFICATIONS           0x01b1
+
+struct dpbp_cmd_open {
+       __le32 dpbp_id;
+};
+
+#define DPBP_ENABLE                    0x1
+
+struct dpbp_rsp_is_enabled {
+       u8 enabled;
+};
+
+struct dpbp_cmd_set_irq {
+       /* cmd word 0 */
+       u8 irq_index;
+       u8 pad[3];
+       __le32 irq_val;
+       /* cmd word 1 */
+       __le64 irq_addr;
+       /* cmd word 2 */
+       __le32 irq_num;
+};
+
+struct dpbp_cmd_get_irq {
+       __le32 pad;
+       u8 irq_index;
+};
+
+struct dpbp_rsp_get_irq {
+       /* response word 0 */
+       __le32 irq_val;
+       __le32 pad;
+       /* response word 1 */
+       __le64 irq_addr;
+       /* response word 2 */
+       __le32 irq_num;
+       __le32 type;
+};
+
+struct dpbp_cmd_set_irq_enable {
+       u8 enable;
+       u8 pad[3];
+       u8 irq_index;
+};
+
+struct dpbp_cmd_get_irq_enable {
+       __le32 pad;
+       u8 irq_index;
+};
+
+struct dpbp_rsp_get_irq_enable {
+       u8 enabled;
+};
+
+struct dpbp_cmd_set_irq_mask {
+       __le32 mask;
+       u8 irq_index;
+};
+
+struct dpbp_cmd_get_irq_mask {
+       __le32 pad;
+       u8 irq_index;
+};
+
+struct dpbp_rsp_get_irq_mask {
+       __le32 mask;
+};
+
+struct dpbp_cmd_get_irq_status {
+       __le32 status;
+       u8 irq_index;
+};
+
+struct dpbp_rsp_get_irq_status {
+       __le32 status;
+};
+
+struct dpbp_cmd_clear_irq_status {
+       __le32 status;
+       u8 irq_index;
+};
+
+struct dpbp_rsp_get_attributes {
+       /* response word 0 */
+       __le16 pad;
+       __le16 bpid;
+       __le32 id;
+       /* response word 1 */
+       __le16 version_major;
+       __le16 version_minor;
+};
+
+struct dpbp_cmd_set_notifications {
+       /* cmd word 0 */
+       __le32 depletion_entry;
+       __le32 depletion_exit;
+       /* cmd word 1 */
+       __le32 surplus_entry;
+       __le32 surplus_exit;
+       /* cmd word 2 */
+       __le16 options;
+       __le16 pad[3];
+       /* cmd word 3 */
+       __le64 message_ctx;
+       /* cmd word 4 */
+       __le64 message_iova;
+};
+
+struct dpbp_rsp_get_notifications {
+       /* response word 0 */
+       __le32 depletion_entry;
+       __le32 depletion_exit;
+       /* response word 1 */
+       __le32 surplus_entry;
+       __le32 surplus_exit;
+       /* response word 2 */
+       __le16 options;
+       __le16 pad[3];
+       /* response word 3 */
+       __le64 message_ctx;
+       /* response word 4 */
+       __le64 message_iova;
+};
+
+#endif /* _FSL_DPBP_CMD_H */
index 5d4cd812a400ff724ca0d6a7fbb1094225c0ec69..b392745a4f833bd6ea0c5da083959cc93b11a9ce 100644 (file)
@@ -32,7 +32,8 @@
 #include "../include/mc-sys.h"
 #include "../include/mc-cmd.h"
 #include "../include/dpbp.h"
-#include "../include/dpbp-cmd.h"
+
+#include "dpbp-cmd.h"
 
 /**
  * dpbp_open() - Open a control session for the specified object.
diff --git a/drivers/staging/fsl-mc/bus/dpcon-cmd.h b/drivers/staging/fsl-mc/bus/dpcon-cmd.h
new file mode 100644 (file)
index 0000000..536b2ef
--- /dev/null
@@ -0,0 +1,62 @@
+/* Copyright 2013-2015 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the above-listed copyright holders nor the
+ * names of any contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _FSL_DPCON_CMD_H
+#define _FSL_DPCON_CMD_H
+
+/* DPCON Version */
+#define DPCON_VER_MAJOR                                2
+#define DPCON_VER_MINOR                                1
+
+/* Command IDs */
+#define DPCON_CMDID_CLOSE                              0x800
+#define DPCON_CMDID_OPEN                               0x808
+#define DPCON_CMDID_CREATE                             0x908
+#define DPCON_CMDID_DESTROY                            0x900
+
+#define DPCON_CMDID_ENABLE                             0x002
+#define DPCON_CMDID_DISABLE                            0x003
+#define DPCON_CMDID_GET_ATTR                           0x004
+#define DPCON_CMDID_RESET                              0x005
+#define DPCON_CMDID_IS_ENABLED                         0x006
+
+#define DPCON_CMDID_SET_IRQ                            0x010
+#define DPCON_CMDID_GET_IRQ                            0x011
+#define DPCON_CMDID_SET_IRQ_ENABLE                     0x012
+#define DPCON_CMDID_GET_IRQ_ENABLE                     0x013
+#define DPCON_CMDID_SET_IRQ_MASK                       0x014
+#define DPCON_CMDID_GET_IRQ_MASK                       0x015
+#define DPCON_CMDID_GET_IRQ_STATUS                     0x016
+#define DPCON_CMDID_CLEAR_IRQ_STATUS                   0x017
+
+#define DPCON_CMDID_SET_NOTIFICATION                   0x100
+
+#endif /* _FSL_DPCON_CMD_H */
index e93ab53bae6763bcf5bec35ddb75013e3950acd9..cf1014822906fbb22d3823ce4cb0a7517617a32a 100644 (file)
@@ -12,9 +12,9 @@
 #include <linux/msi.h>
 #include "../include/mc-bus.h"
 #include "../include/mc-sys.h"
-#include "../include/dpbp-cmd.h"
-#include "../include/dpcon-cmd.h"
 
+#include "dpbp-cmd.h"
+#include "dpcon-cmd.h"
 #include "fsl-mc-private.h"
 
 #define FSL_MC_IS_ALLOCATABLE(_obj_type) \
diff --git a/drivers/staging/fsl-mc/include/dpbp-cmd.h b/drivers/staging/fsl-mc/include/dpbp-cmd.h
deleted file mode 100644 (file)
index 2860411..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright 2013-2016 Freescale Semiconductor Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the above-listed copyright holders nor the
- * names of any contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _FSL_DPBP_CMD_H
-#define _FSL_DPBP_CMD_H
-
-/* DPBP Version */
-#define DPBP_VER_MAJOR                         2
-#define DPBP_VER_MINOR                         2
-
-/* Command IDs */
-#define DPBP_CMDID_CLOSE                               0x800
-#define DPBP_CMDID_OPEN                                        0x804
-#define DPBP_CMDID_CREATE                              0x904
-#define DPBP_CMDID_DESTROY                             0x900
-
-#define DPBP_CMDID_ENABLE                              0x002
-#define DPBP_CMDID_DISABLE                             0x003
-#define DPBP_CMDID_GET_ATTR                            0x004
-#define DPBP_CMDID_RESET                               0x005
-#define DPBP_CMDID_IS_ENABLED                          0x006
-
-#define DPBP_CMDID_SET_IRQ                             0x010
-#define DPBP_CMDID_GET_IRQ                             0x011
-#define DPBP_CMDID_SET_IRQ_ENABLE                      0x012
-#define DPBP_CMDID_GET_IRQ_ENABLE                      0x013
-#define DPBP_CMDID_SET_IRQ_MASK                                0x014
-#define DPBP_CMDID_GET_IRQ_MASK                                0x015
-#define DPBP_CMDID_GET_IRQ_STATUS                      0x016
-#define DPBP_CMDID_CLEAR_IRQ_STATUS                    0x017
-
-#define DPBP_CMDID_SET_NOTIFICATIONS           0x01b0
-#define DPBP_CMDID_GET_NOTIFICATIONS           0x01b1
-
-struct dpbp_cmd_open {
-       __le32 dpbp_id;
-};
-
-#define DPBP_ENABLE                    0x1
-
-struct dpbp_rsp_is_enabled {
-       u8 enabled;
-};
-
-struct dpbp_cmd_set_irq {
-       /* cmd word 0 */
-       u8 irq_index;
-       u8 pad[3];
-       __le32 irq_val;
-       /* cmd word 1 */
-       __le64 irq_addr;
-       /* cmd word 2 */
-       __le32 irq_num;
-};
-
-struct dpbp_cmd_get_irq {
-       __le32 pad;
-       u8 irq_index;
-};
-
-struct dpbp_rsp_get_irq {
-       /* response word 0 */
-       __le32 irq_val;
-       __le32 pad;
-       /* response word 1 */
-       __le64 irq_addr;
-       /* response word 2 */
-       __le32 irq_num;
-       __le32 type;
-};
-
-struct dpbp_cmd_set_irq_enable {
-       u8 enable;
-       u8 pad[3];
-       u8 irq_index;
-};
-
-struct dpbp_cmd_get_irq_enable {
-       __le32 pad;
-       u8 irq_index;
-};
-
-struct dpbp_rsp_get_irq_enable {
-       u8 enabled;
-};
-
-struct dpbp_cmd_set_irq_mask {
-       __le32 mask;
-       u8 irq_index;
-};
-
-struct dpbp_cmd_get_irq_mask {
-       __le32 pad;
-       u8 irq_index;
-};
-
-struct dpbp_rsp_get_irq_mask {
-       __le32 mask;
-};
-
-struct dpbp_cmd_get_irq_status {
-       __le32 status;
-       u8 irq_index;
-};
-
-struct dpbp_rsp_get_irq_status {
-       __le32 status;
-};
-
-struct dpbp_cmd_clear_irq_status {
-       __le32 status;
-       u8 irq_index;
-};
-
-struct dpbp_rsp_get_attributes {
-       /* response word 0 */
-       __le16 pad;
-       __le16 bpid;
-       __le32 id;
-       /* response word 1 */
-       __le16 version_major;
-       __le16 version_minor;
-};
-
-struct dpbp_cmd_set_notifications {
-       /* cmd word 0 */
-       __le32 depletion_entry;
-       __le32 depletion_exit;
-       /* cmd word 1 */
-       __le32 surplus_entry;
-       __le32 surplus_exit;
-       /* cmd word 2 */
-       __le16 options;
-       __le16 pad[3];
-       /* cmd word 3 */
-       __le64 message_ctx;
-       /* cmd word 4 */
-       __le64 message_iova;
-};
-
-struct dpbp_rsp_get_notifications {
-       /* response word 0 */
-       __le32 depletion_entry;
-       __le32 depletion_exit;
-       /* response word 1 */
-       __le32 surplus_entry;
-       __le32 surplus_exit;
-       /* response word 2 */
-       __le16 options;
-       __le16 pad[3];
-       /* response word 3 */
-       __le64 message_ctx;
-       /* response word 4 */
-       __le64 message_iova;
-};
-
-#endif /* _FSL_DPBP_CMD_H */
diff --git a/drivers/staging/fsl-mc/include/dpcon-cmd.h b/drivers/staging/fsl-mc/include/dpcon-cmd.h
deleted file mode 100644 (file)
index 536b2ef..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2013-2015 Freescale Semiconductor Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the above-listed copyright holders nor the
- * names of any contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef _FSL_DPCON_CMD_H
-#define _FSL_DPCON_CMD_H
-
-/* DPCON Version */
-#define DPCON_VER_MAJOR                                2
-#define DPCON_VER_MINOR                                1
-
-/* Command IDs */
-#define DPCON_CMDID_CLOSE                              0x800
-#define DPCON_CMDID_OPEN                               0x808
-#define DPCON_CMDID_CREATE                             0x908
-#define DPCON_CMDID_DESTROY                            0x900
-
-#define DPCON_CMDID_ENABLE                             0x002
-#define DPCON_CMDID_DISABLE                            0x003
-#define DPCON_CMDID_GET_ATTR                           0x004
-#define DPCON_CMDID_RESET                              0x005
-#define DPCON_CMDID_IS_ENABLED                         0x006
-
-#define DPCON_CMDID_SET_IRQ                            0x010
-#define DPCON_CMDID_GET_IRQ                            0x011
-#define DPCON_CMDID_SET_IRQ_ENABLE                     0x012
-#define DPCON_CMDID_GET_IRQ_ENABLE                     0x013
-#define DPCON_CMDID_SET_IRQ_MASK                       0x014
-#define DPCON_CMDID_GET_IRQ_MASK                       0x015
-#define DPCON_CMDID_GET_IRQ_STATUS                     0x016
-#define DPCON_CMDID_CLEAR_IRQ_STATUS                   0x017
-
-#define DPCON_CMDID_SET_NOTIFICATION                   0x100
-
-#endif /* _FSL_DPCON_CMD_H */