Skip to content

added hw-qos #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frank-w merged 2 commits into from
Jul 21, 2018
Merged

added hw-qos #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
966f5ef
added hw-qos
frank-w Jul 2, 2018
a76cafb
Merge branch '4.14-main' into 4.14-hwqos
frank-w Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions arch/arm/configs/mt7623n_evb_fwu_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,3 +613,9 @@ CONFIG_NFS_COMMON=y
#xfs
CONFIG_XFS_FS=m

#RTC/POWER
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_MT6397_RTC=y

CONFIG_NET_MEDIATEK_HW_QOS=m

7 changes: 7 additions & 0 deletions drivers/net/ethernet/mediatek/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,11 @@ config NET_MEDIATEK_HNAT
This driver supports the hardware NAT in the
MediaTek MT2701/MT7623 chipset family.

config NET_MEDIATEK_HW_QOS
tristate "MediaTek MT7623 hardware QoS support"
depends on NET_MEDIATEK_SOC
---help---
This driver supports the hardware QoS in the
MediaTek MT2701/MT7623 chipset family.

endif #NET_VENDOR_MEDIATEK
46 changes: 44 additions & 2 deletions drivers/net/ethernet/mediatek/mtk_eth_soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@
#include <linux/tcp.h>
#include <linux/interrupt.h>

#if defined(CONFIG_NET_MEDIATEK_HW_QOS)
struct mtk_ioctl_reg {
unsigned int off;
unsigned int val;
};

#define REG_HQOS_MAX 0x3FFF
#define RAETH_QDMA_REG_READ 0x89F8
#define RAETH_QDMA_REG_WRITE 0x89F9
#endif

#if defined(CONFIG_NET_MEDIATEK_HNAT) || defined(CONFIG_NET_MEDIATEK_HNAT_MODULE)
#include "mtk_hnat/nf_hnat_mtk.h"
#endif
Expand Down Expand Up @@ -696,7 +707,7 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
dma_addr_t mapped_addr;
unsigned int nr_frags;
int i, n_desc = 1;
u32 txd4 = 0, fport;
u32 txd3 = 0, txd4 = 0, fport;

itxd = ring->next_free;
if (itxd == ring->last_free)
Expand Down Expand Up @@ -725,6 +736,12 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
// if (skb_vlan_tag_present(skb))
// txd4 |= TX_DMA_INS_VLAN | skb_vlan_tag_get(skb);

#ifdef CONFIG_NET_MEDIATEK_HW_QOS
txd3 |= skb->mark & 0x7;
if (mac->id)
txd3 += 8;
#endif

mapped_addr = dma_map_single(eth->dev, skb->data,
skb_headlen(skb), DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(eth->dev, mapped_addr)))
Expand Down Expand Up @@ -768,7 +785,8 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
WRITE_ONCE(txd->txd1, mapped_addr);
WRITE_ONCE(txd->txd3, (TX_DMA_SWC |
TX_DMA_PLEN0(frag_map_size) |
last_frag * TX_DMA_LS0));
last_frag * TX_DMA_LS0 |
txd3));
WRITE_ONCE(txd->txd4, fport);

tx_buf = mtk_desc_to_tx_buf(ring, txd);
Expand Down Expand Up @@ -2115,7 +2133,31 @@ static void mtk_uninit(struct net_device *dev)

static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
#if defined(CONFIG_NET_MEDIATEK_HW_QOS)
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_eth *eth = mac->hw;
struct mtk_ioctl_reg reg;
#endif

switch (cmd) {
#if defined(CONFIG_NET_MEDIATEK_HW_QOS)
case RAETH_QDMA_REG_READ:
copy_from_user(&reg, ifr->ifr_data, sizeof(reg));
if (reg.off > REG_HQOS_MAX)
return -EINVAL;
reg.val = mtk_r32(eth, 0x1800 + reg.off);
// printk("read reg off:%x val:%x\n", reg.off, reg.val);
copy_to_user(ifr->ifr_data, &reg, sizeof(reg));
return 0;

case RAETH_QDMA_REG_WRITE:
copy_from_user(&reg, ifr->ifr_data, sizeof(reg));
if (reg.off > REG_HQOS_MAX)
return -EINVAL;
mtk_w32(eth, reg.val, 0x1800 + reg.off);
// printk("write reg off:%x val:%x\n", reg.off, reg.val);
return 0;
#endif
case SIOCGMIIPHY:
case SIOCGMIIREG:
case SIOCSMIIREG:
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mediatek/mtk_eth_soc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define MTK_QDMA_PAGE_SIZE 2048
#define MTK_MAX_RX_LENGTH 1536
#define MTK_TX_DMA_BUF_LEN 0x3fff
#define MTK_DMA_SIZE 256
#define MTK_DMA_SIZE 2048
#define MTK_NAPI_WEIGHT 64
#define MTK_MAC_COUNT 2
#define MTK_RX_ETH_HLEN (VLAN_ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)
Expand Down