Skip to content

Commit

Permalink
Merge pull request #1 from garywangcn/bpi-r2-on-lede-v1
Browse files Browse the repository at this point in the history 
Bpi r2 on lede v1
  • Loading branch information
@moore-bros
moore-bros committed Oct 23, 2017
2 parents dabf2b3 + 700175b commit 0ed9599
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 9 deletions.
18 changes: 9 additions & 9 deletions target/linux/mediatek/base-files/etc/config/mtkhnat
View file
@@ -1,60 +1,60 @@
config global global
option enable 0
option enable 1
option upstream 1000000
option downstream 1000000

config queue
option id 0
option minrate 10
option maxrate 50
option maxrate 200
option weight 7
option resv 32

config queue
option id 1
option minrate 30
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 2
option minrate 30
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 3
option minrate 30
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 4
option minrate 25
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 5
option minrate 25
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 6
option minrate 25
option maxrate 100
option maxrate 200
option weight 7
option resv 32

config queue
option id 7
option minrate 25
option maxrate 100
option maxrate 200
option weight 7
option resv 32
2 changes: 2 additions & 0 deletions target/linux/mediatek/config-4.9
View file
Expand Up @@ -65,6 +65,7 @@ CONFIG_CLKSRC_OF=y
CONFIG_CLKSRC_PROBE=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,jffs2"
CONFIG_CMDLINE_FROM_BOOTLOADER=y
CONFIG_CMDLINE_EXTEND=y
CONFIG_COMMON_CLK=y
CONFIG_COMMON_CLK_MEDIATEK=y
Expand Down Expand Up @@ -352,6 +353,7 @@ CONFIG_NET_DSA=y
CONFIG_NET_DSA_MT7530=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NET_MEDIATEK_HNAT=m
CONFIG_NET_MEDIATEK_HW_QOS=y
CONFIG_NET_MEDIATEK_SOC=y
CONFIG_NET_PTP_CLASSIFY=y
Expand Down
4 changes: 4 additions & 0 deletions target/linux/mediatek/files/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View file
Expand Up @@ -441,3 +441,7 @@
vusb33-supply = <&mt6323_vusb_reg>;
status = "okay";
};

&hnat {
status = "okay";
};
118 changes: 118 additions & 0 deletions target/linux/mediatek/patches-4.9/0072-net-mediatek-hnat-bananapi-r2-support-patch
View file
@@ -0,0 +1,118 @@
--- a/arch/arm/boot/dts/mt7623.dtsi 2017-09-25 20:32:14.620036453 +0800
+++ b/arch/arm/boot/dts/mt7623.dtsi 2017-09-25 20:34:15.310590521 +0800
@@ -892,6 +892,15 @@
reg = <0>;
};

+ hnat: hnat@1b000000 {
+ compatible = "mediatek,mt7623-hnat";
+ reg = <0 0x1b100000 0 0x3000>;
+ mtketh-wan = "wan";
+ resets = <&ethsys 0>;
+ reset-names = "mtketh";
+ };
+
+
crypto: crypto@1b240000 {
compatible = "mediatek,eip97-crypto";
reg = <0 0x1b240000 0 0x20000>;

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2017-09-25 20:32:15.180030541 +0800
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2017-09-29 09:37:24.824652957 +0800
@@ -2057,8 +2057,8 @@
/* Enable RX checksum */
val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN;

- if (!i)
- val |= BIT(24);
+ /* Enable special tag */
+ val |= BIT(24);

/* setup the mac dma */
mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
--- a/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c 2017-09-25 20:32:15.184030498 +0800
+++ b/drivers/net/ethernet/mediatek/mtk_hnat/hnat.c 2017-09-29 09:38:50.806170843 +0800
@@ -164,7 +164,9 @@
BITS_GDM2_ALL_FRC_P_DISCARD);

if (ppe_busy_wait()) {
+#if 0
reset_control_reset(host->rstc);
+#endif
msleep(2000);
return;
}
@@ -215,7 +217,9 @@
writel(0, host->ppe_base + PPE_TB_BASE);

if (ppe_busy_wait()) {
+#if 0
reset_control_reset(host->rstc);
+#endif
msleep(2000);
return;
}
@@ -263,11 +267,11 @@
err = hnat_init_debugfs(host);
if (err)
return err;
-
+#if 0
host->rstc = devm_reset_control_get(&pdev->dev, NULL);
if (IS_ERR(host->rstc))
return PTR_ERR(host->rstc);
-
+#endif
err = hnat_start();
if (err)
goto err_out;
--- a/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c 2017-09-25 20:32:15.184030498 +0800
+++ b/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c 2017-09-29 09:45:40.016349226 +0800
@@ -28,6 +28,7 @@
{
struct foe_entry entry = { 0 };
int lan = IS_LAN(dev);
+ int wan = IS_WAN(dev);
struct ethhdr *eth;
struct iphdr *iph;
struct tcphdr *tcph;
@@ -66,7 +67,15 @@
if (lan) {
entry.ipv4_hnapt.etype = htons(ETH_P_8021Q);
entry.bfib1.vlan_layer = 1;
- entry.ipv4_hnapt.vlan1 = BIT(dev->name[3] - '0');
+
+ /* lan0-port1, lan1-port2, lan2-port3, lan3-port4 */
+ entry.ipv4_hnapt.vlan1 = BIT((dev->name[3] - '0')+1);
+ } else if (wan) {
+ entry.ipv4_hnapt.etype = htons(ETH_P_8021Q);
+ entry.bfib1.vlan_layer = 1;
+
+ /* wan port 0 */
+ entry.ipv4_hnapt.vlan1 = BIT(0);
}

if (dev->priv_flags & IFF_802_1Q_VLAN) {
@@ -74,10 +83,7 @@

entry.ipv4_hnapt.etype = htons(ETH_P_8021Q);
entry.bfib1.vlan_layer = 1;
- if (lan)
- entry.ipv4_hnapt.vlan2 = vlan->vlan_id;
- else
- entry.ipv4_hnapt.vlan1 = vlan->vlan_id;
+ entry.ipv4_hnapt.vlan2 = vlan->vlan_id;
}

entry.ipv4_hnapt.dmac_hi = swab32(*((u32*) eth->h_dest));
@@ -151,8 +157,10 @@
enum ip_conntrack_info ctinfo;
const struct nf_conn_help *help;

+#if 0
if ((skb->mark & 0x7) < 4)
return 0;
+#endif

ct = nf_ct_get(skb, &ctinfo);
if (!ct)
38 changes: 38 additions & 0 deletions target/linux/mediatek/patches-4.9/0073-mtk-pcie-bug-fix.patch
View file
@@ -0,0 +1,38 @@
--- a/drivers/pci/host/pcie-mediatek.c 2017-10-11 00:35:13.547335402 +0800
+++ b/drivers/pci/host/pcie-mediatek.c 2017-10-11 00:36:07.635327373 +0800
@@ -335,10 +335,23 @@
{
struct mtk_pcie *pcie = bus->sysdata;
struct mtk_pcie_port *port;
+ struct pci_dev *dev;
+ struct pci_bus *pbus;

- list_for_each_entry(port, &pcie->ports, list)
- if (port->slot == PCI_SLOT(devfn))
+ list_for_each_entry(port, &pcie->ports, list) {
+ if (bus->number == 0 && port->slot == PCI_SLOT(devfn)) {
return port;
+ } else if (bus->number != 0) {
+ pbus = bus;
+ do {
+ dev = pbus->self;
+ if (port->slot == PCI_SLOT(dev->devfn))
+ return port;
+
+ pbus = dev->bus;
+ } while (dev->bus->number != 0);
+ }
+ }

return NULL;
}
@@ -665,6 +678,9 @@
{
struct mtk_pcie *pcie = bus->sysdata;

+ if (!mtk_pcie_find_port(bus, devfn))
+ return 0;
+
writel(PCIE_CONF_ADDR(where, PCI_FUNC(devfn), PCI_SLOT(devfn),
bus->number), pcie->base + PCIE_CFG_ADDR);

0 comments on commit 0ed9599

Please sign in to comment.