mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
438e593f22
Removed because they are upstream:
generic/backport-5.15/741-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=d06977b9a4109f8738bb276125eb6a0b772bc433
Removed because they are upstream:
generic/backport-5.15/741-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e719b52d0c56989b0f3475a03a6d64f182c85b56
Manual adapted the following patches:
generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
generic/pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch
generic/hack-5.15/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 84d0b0b925)
156 lines
4.7 KiB
Diff
156 lines
4.7 KiB
Diff
From 37c9c0d8d0b2e24f8c9af72ecd4edd31537284d3 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:39 +0100
|
|
Subject: [PATCH 11/16] net: dsa: mt7530: introduce mt7530_probe_common helper
|
|
function
|
|
|
|
Move commonly used parts from mt7530_probe into new mt7530_probe_common
|
|
helper function which will be used by both, mt7530_probe and the
|
|
to-be-introduced mt7988_probe.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 98 ++++++++++++++++++++++------------------
|
|
1 file changed, 54 insertions(+), 44 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3394,44 +3394,21 @@ static const struct of_device_id mt7530_
|
|
MODULE_DEVICE_TABLE(of, mt7530_of_match);
|
|
|
|
static int
|
|
-mt7530_probe(struct mdio_device *mdiodev)
|
|
+mt7530_probe_common(struct mt7530_priv *priv)
|
|
{
|
|
- static struct regmap_config *regmap_config;
|
|
- struct mt7530_priv *priv;
|
|
- struct device_node *dn;
|
|
- int ret;
|
|
+ struct device *dev = priv->dev;
|
|
|
|
- dn = mdiodev->dev.of_node;
|
|
-
|
|
- priv = devm_kzalloc(&mdiodev->dev, sizeof(*priv), GFP_KERNEL);
|
|
- if (!priv)
|
|
- return -ENOMEM;
|
|
-
|
|
- priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL);
|
|
+ priv->ds = devm_kzalloc(dev, sizeof(*priv->ds), GFP_KERNEL);
|
|
if (!priv->ds)
|
|
return -ENOMEM;
|
|
|
|
- priv->ds->dev = &mdiodev->dev;
|
|
+ priv->ds->dev = dev;
|
|
priv->ds->num_ports = MT7530_NUM_PORTS;
|
|
|
|
- /* Use medatek,mcm property to distinguish hardware type that would
|
|
- * casues a little bit differences on power-on sequence.
|
|
- */
|
|
- priv->mcm = of_property_read_bool(dn, "mediatek,mcm");
|
|
- if (priv->mcm) {
|
|
- dev_info(&mdiodev->dev, "MT7530 adapts as multi-chip module\n");
|
|
-
|
|
- priv->rstc = devm_reset_control_get(&mdiodev->dev, "mcm");
|
|
- if (IS_ERR(priv->rstc)) {
|
|
- dev_err(&mdiodev->dev, "Couldn't get our reset line\n");
|
|
- return PTR_ERR(priv->rstc);
|
|
- }
|
|
- }
|
|
-
|
|
/* Get the hardware identifier from the devicetree node.
|
|
* We will need it for some of the clock and regulator setup.
|
|
*/
|
|
- priv->info = of_device_get_match_data(&mdiodev->dev);
|
|
+ priv->info = of_device_get_match_data(dev);
|
|
if (!priv->info)
|
|
return -EINVAL;
|
|
|
|
@@ -3445,23 +3422,53 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
return -EINVAL;
|
|
|
|
priv->id = priv->info->id;
|
|
+ priv->dev = dev;
|
|
+ priv->ds->priv = priv;
|
|
+ priv->ds->ops = &mt7530_switch_ops;
|
|
+ mutex_init(&priv->reg_mutex);
|
|
+ dev_set_drvdata(dev, priv);
|
|
|
|
- if (priv->id == ID_MT7530) {
|
|
- priv->core_pwr = devm_regulator_get(&mdiodev->dev, "core");
|
|
- if (IS_ERR(priv->core_pwr))
|
|
- return PTR_ERR(priv->core_pwr);
|
|
+ return 0;
|
|
+}
|
|
|
|
- priv->io_pwr = devm_regulator_get(&mdiodev->dev, "io");
|
|
- if (IS_ERR(priv->io_pwr))
|
|
- return PTR_ERR(priv->io_pwr);
|
|
- }
|
|
+static int
|
|
+mt7530_probe(struct mdio_device *mdiodev)
|
|
+{
|
|
+ static struct regmap_config *regmap_config;
|
|
+ struct mt7530_priv *priv;
|
|
+ struct device_node *dn;
|
|
+ int ret;
|
|
+
|
|
+ dn = mdiodev->dev.of_node;
|
|
+
|
|
+ priv = devm_kzalloc(&mdiodev->dev, sizeof(*priv), GFP_KERNEL);
|
|
+ if (!priv)
|
|
+ return -ENOMEM;
|
|
|
|
- /* Not MCM that indicates switch works as the remote standalone
|
|
+ priv->bus = mdiodev->bus;
|
|
+ priv->dev = &mdiodev->dev;
|
|
+
|
|
+ ret = mt7530_probe_common(priv);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* Use medatek,mcm property to distinguish hardware type that would
|
|
+ * cause a little bit differences on power-on sequence.
|
|
+ * Not MCM that indicates switch works as the remote standalone
|
|
* integrated circuit so the GPIO pin would be used to complete
|
|
* the reset, otherwise memory-mapped register accessing used
|
|
* through syscon provides in the case of MCM.
|
|
*/
|
|
- if (!priv->mcm) {
|
|
+ priv->mcm = of_property_read_bool(dn, "mediatek,mcm");
|
|
+ if (priv->mcm) {
|
|
+ dev_info(&mdiodev->dev, "MT7530 adapts as multi-chip module\n");
|
|
+
|
|
+ priv->rstc = devm_reset_control_get(&mdiodev->dev, "mcm");
|
|
+ if (IS_ERR(priv->rstc)) {
|
|
+ dev_err(&mdiodev->dev, "Couldn't get our reset line\n");
|
|
+ return PTR_ERR(priv->rstc);
|
|
+ }
|
|
+ } else {
|
|
priv->reset = devm_gpiod_get_optional(&mdiodev->dev, "reset",
|
|
GPIOD_OUT_LOW);
|
|
if (IS_ERR(priv->reset)) {
|
|
@@ -3470,12 +3477,15 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
}
|
|
}
|
|
|
|
- priv->bus = mdiodev->bus;
|
|
- priv->dev = &mdiodev->dev;
|
|
- priv->ds->priv = priv;
|
|
- priv->ds->ops = &mt7530_switch_ops;
|
|
- mutex_init(&priv->reg_mutex);
|
|
- dev_set_drvdata(&mdiodev->dev, priv);
|
|
+ if (priv->id == ID_MT7530) {
|
|
+ priv->core_pwr = devm_regulator_get(&mdiodev->dev, "core");
|
|
+ if (IS_ERR(priv->core_pwr))
|
|
+ return PTR_ERR(priv->core_pwr);
|
|
+
|
|
+ priv->io_pwr = devm_regulator_get(&mdiodev->dev, "io");
|
|
+ if (IS_ERR(priv->io_pwr))
|
|
+ return PTR_ERR(priv->io_pwr);
|
|
+ }
|
|
|
|
regmap_config = devm_kzalloc(&mdiodev->dev, sizeof(*regmap_config),
|
|
GFP_KERNEL);
|