mt76x02: move TXD/RXD/MCU definitions in mt76x02_dma.h

Introduce mt76x02_dma.h header file to contain mt76x02 dma
related definitions

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/dma.h b/drivers/net/wireless/mediatek/mt76/dma.h
index aa2faf19bf05743653a0147faf635ddd898f0a94..357cc356342d214b96c024a482069e413c341db6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.h
+++ b/drivers/net/wireless/mediatek/mt76/dma.h
@@ -25,34 +25,6 @@
 #define MT_DMA_CTL_LAST_SEC0           BIT(30)
 #define MT_DMA_CTL_DMA_DONE            BIT(31)
 
-#define MT_TXD_INFO_LEN                        GENMASK(15, 0)
-#define MT_TXD_INFO_NEXT_VLD           BIT(16)
-#define MT_TXD_INFO_TX_BURST           BIT(17)
-#define MT_TXD_INFO_80211              BIT(19)
-#define MT_TXD_INFO_TSO                        BIT(20)
-#define MT_TXD_INFO_CSO                        BIT(21)
-#define MT_TXD_INFO_WIV                        BIT(24)
-#define MT_TXD_INFO_QSEL               GENMASK(26, 25)
-#define MT_TXD_INFO_DPORT              GENMASK(29, 27)
-#define MT_TXD_INFO_TYPE               GENMASK(31, 30)
-
-#define MT_RX_FCE_INFO_LEN             GENMASK(13, 0)
-#define MT_RX_FCE_INFO_SELF_GEN                BIT(15)
-#define MT_RX_FCE_INFO_CMD_SEQ         GENMASK(19, 16)
-#define MT_RX_FCE_INFO_EVT_TYPE                GENMASK(23, 20)
-#define MT_RX_FCE_INFO_PCIE_INTR       BIT(24)
-#define MT_RX_FCE_INFO_QSEL            GENMASK(26, 25)
-#define MT_RX_FCE_INFO_D_PORT          GENMASK(29, 27)
-#define MT_RX_FCE_INFO_TYPE            GENMASK(31, 30)
-
-/* MCU request message header  */
-#define MT_MCU_MSG_LEN                 GENMASK(15, 0)
-#define MT_MCU_MSG_CMD_SEQ             GENMASK(19, 16)
-#define MT_MCU_MSG_CMD_TYPE            GENMASK(26, 20)
-#define MT_MCU_MSG_PORT                        GENMASK(29, 27)
-#define MT_MCU_MSG_TYPE                        GENMASK(31, 30)
-#define MT_MCU_MSG_TYPE_CMD            BIT(30)
-
 #define MT_DMA_HDR_LEN                 4
 #define MT_RX_INFO_LEN                 4
 #define MT_FCE_INFO_LEN                        4
@@ -65,16 +37,6 @@ struct mt76_desc {
        __le32 info;
 } __packed __aligned(4);
 
-enum dma_msg_port {
-       WLAN_PORT,
-       CPU_RX_PORT,
-       CPU_TX_PORT,
-       HOST_PORT,
-       VIRTUAL_CPU_RX_PORT,
-       VIRTUAL_CPU_TX_PORT,
-       DISCARD,
-};
-
 enum mt76_qsel {
        MT_QSEL_MGMT,
        MT_QSEL_HCCA,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h b/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
new file mode 100644 (file)
index 0000000..32a323e
--- /dev/null
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef __MT76x02_DMA_H
+#define __MT76x02_DMA_H
+
+#include "dma.h"
+
+#define MT_TXD_INFO_LEN                        GENMASK(15, 0)
+#define MT_TXD_INFO_NEXT_VLD           BIT(16)
+#define MT_TXD_INFO_TX_BURST           BIT(17)
+#define MT_TXD_INFO_80211              BIT(19)
+#define MT_TXD_INFO_TSO                        BIT(20)
+#define MT_TXD_INFO_CSO                        BIT(21)
+#define MT_TXD_INFO_WIV                        BIT(24)
+#define MT_TXD_INFO_QSEL               GENMASK(26, 25)
+#define MT_TXD_INFO_DPORT              GENMASK(29, 27)
+#define MT_TXD_INFO_TYPE               GENMASK(31, 30)
+
+#define MT_RX_FCE_INFO_LEN             GENMASK(13, 0)
+#define MT_RX_FCE_INFO_SELF_GEN                BIT(15)
+#define MT_RX_FCE_INFO_CMD_SEQ         GENMASK(19, 16)
+#define MT_RX_FCE_INFO_EVT_TYPE                GENMASK(23, 20)
+#define MT_RX_FCE_INFO_PCIE_INTR       BIT(24)
+#define MT_RX_FCE_INFO_QSEL            GENMASK(26, 25)
+#define MT_RX_FCE_INFO_D_PORT          GENMASK(29, 27)
+#define MT_RX_FCE_INFO_TYPE            GENMASK(31, 30)
+
+/* MCU request message header  */
+#define MT_MCU_MSG_LEN                 GENMASK(15, 0)
+#define MT_MCU_MSG_CMD_SEQ             GENMASK(19, 16)
+#define MT_MCU_MSG_CMD_TYPE            GENMASK(26, 20)
+#define MT_MCU_MSG_PORT                        GENMASK(29, 27)
+#define MT_MCU_MSG_TYPE                        GENMASK(31, 30)
+#define MT_MCU_MSG_TYPE_CMD            BIT(30)
+
+enum dma_msg_port {
+       WLAN_PORT,
+       CPU_RX_PORT,
+       CPU_TX_PORT,
+       HOST_PORT,
+       VIRTUAL_CPU_RX_PORT,
+       VIRTUAL_CPU_TX_PORT,
+       DISCARD,
+};
+
+#endif /* __MT76x02_DMA_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
index 9ca9e3d414d3205c4e10a190ab3a8c92b6118ef0..235b1bc5a367805f425425e57736033ca1432418 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 
 int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
index cc63efa16634a4453f2f1caad4c5825d906f73c4..b39a4d7d71cc5455bc671ba4f0aa30b75fdcb03b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c
@@ -17,7 +17,7 @@
 #include <linux/firmware.h>
 
 #include "mt76.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 #include "mt76x02_mcu.h"
 #include "mt76x02_usb.h"
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index d3f35551413d1aed1feab1e74e08425e368ac1f9..52b175bd40e2e43a2b5e79aa11dccb47441ace29 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -16,7 +16,7 @@
  */
 
 #include "mt76.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 #include "mt76x02_regs.h"
 #include "mt76x02_mac.h"
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
index 4b60e8a5239ef6b85187c69916302c7075245c10..304869961f69a63aab37534cd120051ac99193c6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
@@ -15,7 +15,7 @@
  */
 
 #include "mt76x2.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 
 int
 mt76x2_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76_txq_id qid,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
index c90803334ef0da2779283fa93ec7141575a47297..9a174db5a23a248d98549fff33fd3428c8b07e63 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c
@@ -21,7 +21,7 @@
 #include "mt76x2.h"
 #include "mt76x2_mcu.h"
 #include "mt76x2_eeprom.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 
 static struct sk_buff *mt76x2_mcu_msg_alloc(const void *data, int len)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_tx.c b/drivers/net/wireless/mediatek/mt76/mt76x2_tx.c
index 41d66099183963d9a273b4b9681e7c4eaae2dfde..fcdf1879162e08f5572e0416b430e90adfe515a4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_tx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_tx.c
@@ -16,7 +16,7 @@
 
 #include "mt76x2.h"
 #include "mt76x02_util.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 
 struct beacon_bc_data {
        struct mt76x2_dev *dev;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2u.h b/drivers/net/wireless/mediatek/mt76/mt76x2u.h
index 5a11217c03eda09fde60d8377cc4e4dc0332cb77..83abbafc0c1a80399fb46bdab4abc369794b98ba 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2u.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2u.h
@@ -21,7 +21,7 @@
 
 #include "mt76x2.h"
 #include "mt76x2_mcu.h"
-#include "dma.h"
+#include "mt76x02_dma.h"
 
 #define MT7612U_EEPROM_SIZE            512