mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
99 lines
3.0 KiB
Diff
99 lines
3.0 KiB
Diff
From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Fri, 7 Jul 2017 17:26:01 +0200
|
|
Subject: bcm53xx: bgmac: use srab switch driver
|
|
|
|
use the srab switch driver on these SoCs.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 +
|
|
drivers/net/ethernet/broadcom/bgmac.c | 24 ++++++++++++++++++++++++
|
|
drivers/net/ethernet/broadcom/bgmac.h | 4 ++++
|
|
3 files changed, 29 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
|
|
@@ -280,6 +280,7 @@ static int bgmac_probe(struct bcma_devic
|
|
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
|
|
bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
|
|
+ bgmac->feature_flags |= BGMAC_FEAT_SRAB;
|
|
break;
|
|
default:
|
|
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
|
@@ -12,6 +12,7 @@
|
|
#include <linux/bcma/bcma.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/interrupt.h>
|
|
+#include <linux/platform_data/b53.h>
|
|
#include <linux/bcm47xx_nvram.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/phy_fixed.h>
|
|
@@ -1408,6 +1409,17 @@ static const struct ethtool_ops bgmac_et
|
|
.set_link_ksettings = phy_ethtool_set_link_ksettings,
|
|
};
|
|
|
|
+static struct b53_platform_data bgmac_b53_pdata = {
|
|
+};
|
|
+
|
|
+static struct platform_device bgmac_b53_dev = {
|
|
+ .name = "b53-srab-switch",
|
|
+ .id = -1,
|
|
+ .dev = {
|
|
+ .platform_data = &bgmac_b53_pdata,
|
|
+ },
|
|
+};
|
|
+
|
|
/**************************************************
|
|
* MII
|
|
**************************************************/
|
|
@@ -1546,6 +1558,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
|
|
|
|
bgmac->in_init = false;
|
|
|
|
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
|
+ bgmac_b53_pdata.regs = ioremap(0x18007000, 0x1000);
|
|
+
|
|
+ err = platform_device_register(&bgmac_b53_dev);
|
|
+ if (!err)
|
|
+ bgmac->b53_device = &bgmac_b53_dev;
|
|
+ }
|
|
+
|
|
err = register_netdev(bgmac->net_dev);
|
|
if (err) {
|
|
dev_err(bgmac->dev, "Cannot register net device\n");
|
|
@@ -1568,6 +1588,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
|
|
|
|
void bgmac_enet_remove(struct bgmac *bgmac)
|
|
{
|
|
+ if (bgmac->b53_device)
|
|
+ platform_device_unregister(&bgmac_b53_dev);
|
|
+ bgmac->b53_device = NULL;
|
|
+
|
|
unregister_netdev(bgmac->net_dev);
|
|
phy_disconnect(bgmac->net_dev->phydev);
|
|
netif_napi_del(&bgmac->napi);
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.h
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.h
|
|
@@ -390,6 +390,7 @@
|
|
#define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
|
|
#define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
|
|
#define BGMAC_FEAT_IDM_MASK BIT(20)
|
|
+#define BGMAC_FEAT_SRAB BIT(21)
|
|
|
|
struct bgmac_slot_info {
|
|
union {
|
|
@@ -497,6 +498,9 @@ struct bgmac {
|
|
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
|
|
u32 set);
|
|
int (*phy_connect)(struct bgmac *bgmac);
|
|
+
|
|
+ /* platform device for associated switch */
|
|
+ struct platform_device *b53_device;
|
|
};
|
|
|
|
struct bgmac *bgmac_alloc(struct device *dev);
|