openwrt-mirror/openwrt
1
0 Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-10-12 19:57:41 +04:00
Code Issues Packages Projects Releases Wiki Activity

ramips: mt7530: compile swconfig code conditionally

Browse Source 
Wrap all swconfig-specific code in mt7530.c with #if IS_ENABLED(CONFIG_SWCONFIG),
including struct switch_dev, the vlan/port mapping tables and all
switch_dev_ops callbacks. Register access helpers (mt7530_r32/w32), the
PSC/HWTRAP definitions, and the small set of swconfig-only register
macros and MIB tables further up the file remain unconditional - the
latter two are unused-but-harmless when swconfig is disabled and are
left alone to keep the diff focused.

When swconfig is not compiled in, the driver performs only minimal
hardware init (disables MAC learning on all ports, applies the HWTRAP
fixup) and skips switch registration, mirroring the existing behaviour
of the "mediatek,no-swconfig" device tree property. This removes the
need for that property when building DSA-only images. The property is
still honoured whenever CONFIG_SWCONFIG is enabled (built-in or as a module).

A distinct log message is used for the compile-time case, to
distinguish it from the runtime "mediatek,no-swconfig" case in dmesg.
Also switch the existing runtime "swconfig disabled" message from
pr_info() to dev_info(), changing its dmesg prefix from "mt7620: " /
"mt7530: " to the device's own prefix.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/24574
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
This commit is contained in:
Mieczyslaw Nalewaj authored and Jonas Jelonek committed 2026-08-07 09:16:10 +02:00
1 parent 88fb272f3d
commit 224a967ba1
1 file changed
+25 -11
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
+25 -11
View File
@@ -160,6 +160,7 @@ enum {
MT7530_ATTR_ENABLE_VLAN,
};
#if IS_ENABLED(CONFIG_SWCONFIG)
struct mt7530_port_entry {
u16 pvid;
bool mirror_rx;
@@ -171,10 +172,12 @@ struct mt7530_vlan_entry {
u8 member;
u8 etags;
};
#endif /* CONFIG_SWCONFIG */
struct mt7530_priv {
void __iomem *base;
struct mii_bus *bus;
#if IS_ENABLED(CONFIG_SWCONFIG)
struct switch_dev swdev;
u8 mirror_dest_port;
@@ -182,8 +185,10 @@ struct mt7530_priv {
struct mt7530_vlan_entry vlan_entries[MT7530_NUM_VLANS];
struct mt7530_port_entry port_entries[MT7530_NUM_PORTS];
char arl_buf[MT7530_NUM_ARL_RECORDS * ARL_LINE_LENGTH + 1];
#endif /* CONFIG_SWCONFIG */
};
#if IS_ENABLED(CONFIG_SWCONFIG)
struct mt7530_mapping {
char *name;
u16 pvids[MT7530_NUM_PORTS];
@@ -285,6 +290,7 @@ mt7530_set_vlan_enable(struct switch_dev *dev,
return 0;
}
#endif /* CONFIG_SWCONFIG */
static u32
mt7530_r32(struct mt7530_priv *priv, u32 reg)
@@ -324,6 +330,7 @@ mt7530_w32(struct mt7530_priv *priv, u32 reg, u32 val)
iowrite32(val, priv->base + reg);
}
#if IS_ENABLED(CONFIG_SWCONFIG)
static void
mt7530_vtcr(struct mt7530_priv *priv, u32 cmd, u32 val)
{
@@ -1003,15 +1010,20 @@ static const struct switch_dev_ops mt7530_ops = {
.apply_config = mt7530_apply_config,
.reset_switch = mt7530_reset_switch,
};
#endif /* CONFIG_SWCONFIG */
int
mt7530_probe(struct device *dev, void __iomem *base, struct mii_bus *bus, int vlan)
{
struct switch_dev *swdev;
struct mt7530_priv *mt7530;
bool swconfig_active = false;
const char *name = bus ? "mt7530" : "mt7620";
int i;
#if IS_ENABLED(CONFIG_SWCONFIG)
struct switch_dev *swdev;
struct mt7530_mapping *map;
int ret;
int i;
#endif /* CONFIG_SWCONFIG */
mt7530 = devm_kzalloc(dev, sizeof(struct mt7530_priv), GFP_KERNEL);
if (!mt7530)
@@ -1019,16 +1031,12 @@ mt7530_probe(struct device *dev, void __iomem *base, struct mii_bus *bus, int vl
mt7530->base = base;
mt7530->bus = bus;
#if IS_ENABLED(CONFIG_SWCONFIG)
mt7530->global_vlan_enable = vlan;
swdev = &mt7530->swdev;
if (bus) {
swdev->alias = "mt7530";
swdev->name = "mt7530";
} else {
swdev->alias = "mt7620";
swdev->name = "mt7620";
}
swdev->alias = name;
swdev->name = name;
swdev->cpu_port = MT7530_CPU_PORT;
swdev->ports = MT7530_NUM_PORTS;
swdev->vlans = MT7530_NUM_VLANS;
@@ -1045,9 +1053,15 @@ mt7530_probe(struct device *dev, void __iomem *base, struct mii_bus *bus, int vl
if (map)
mt7530_apply_mapping(mt7530, map);
mt7530_apply_config(swdev);
swconfig_active = true;
} else {
pr_info("%s: swconfig disabled, MAC learning disabled on all ports\n", swdev->name);
dev_info(dev, "swconfig disabled, MAC learning disabled on all ports\n");
}
#else
dev_info(dev, "swconfig support not built in, MAC learning disabled on all ports\n");
#endif /* CONFIG_SWCONFIG */
if (!swconfig_active) {
for (i = 0; i < MT7530_NUM_PORTS; i++) {
mt7530_w32(mt7530, REG_ESW_PORT_PSC(i),
mt7530_r32(mt7530, REG_ESW_PORT_PSC(i)) | REG_ESW_PORT_PSC_SA_DIS);
@@ -1059,7 +1073,7 @@ mt7530_probe(struct device *dev, void __iomem *base, struct mii_bus *bus, int vl
dev_info(dev, "fixing up MHWTRAP register - bootloader probably played with it\n");
mt7530_w32(mt7530, REG_HWTRAP, 0x1117edf);
}
dev_info(dev, "loaded %s driver\n", swdev->name);
dev_info(dev, "loaded %s driver\n", name);
return 0;
}