[openwrt/openwrt] generic: 6.12: manually rebuild backport patches
LEDE Commits
lede-commits at lists.infradead.org
Wed Apr 30 07:27:35 PDT 2025
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/07d1d3d8f808bc11bd7506641f499c996685ad2d
commit 07d1d3d8f808bc11bd7506641f499c996685ad2d
Author: Mieczyslaw Nalewaj <namiltd at yahoo.com>
AuthorDate: Fri Apr 25 16:31:08 2025 +0200
generic: 6.12: manually rebuild backport patches
Manually rebuild backport patches:
- 410-v6.13-01-block-add-support-for-defining-read-only-partitions.patch
- 839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
- 901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch
Signed-off-by: Mieczyslaw Nalewaj <namiltd at yahoo.com>
[ improve commit title ]
Link: https://github.com/openwrt/openwrt/pull/16547
Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
...k-add-support-for-defining-read-only-partitions.patch | 6 +++---
...t-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch | 8 ++++----
...901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch | 16 ++++++++--------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/target/linux/generic/backport-6.12/410-v6.13-01-block-add-support-for-defining-read-only-partitions.patch b/target/linux/generic/backport-6.12/410-v6.13-01-block-add-support-for-defining-read-only-partitions.patch
index fabf16a2e6..d40a483fd3 100644
--- a/target/linux/generic/backport-6.12/410-v6.13-01-block-add-support-for-defining-read-only-partitions.patch
+++ b/target/linux/generic/backport-6.12/410-v6.13-01-block-add-support-for-defining-read-only-partitions.patch
@@ -19,7 +19,7 @@ Signed-off-by: Jens Axboe <axboe at kernel.dk>
--- a/block/blk.h
+++ b/block/blk.h
-@@ -424,6 +424,7 @@ void blk_free_ext_minor(unsigned int min
+@@ -555,6 +555,7 @@ void blk_free_ext_minor(unsigned int min
#define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2
@@ -41,12 +41,12 @@ Signed-off-by: Jens Axboe <axboe at kernel.dk>
strscpy(info->volname, subpart->name, sizeof(info->volname));
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
-@@ -392,6 +392,9 @@ static struct block_device *add_partitio
+@@ -373,6 +373,9 @@ static struct block_device *add_partitio
goto out_del;
}
+ if (flags & ADDPART_FLAG_READONLY)
-+ bdev->bd_read_only = true;
++ bdev_set_flag(bdev, BD_READ_ONLY);
+
/* everything is up and running, commence */
err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
diff --git a/target/linux/generic/backport-6.12/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch b/target/linux/generic/backport-6.12/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
index c1655ce71e..aabaa33e2c 100644
--- a/target/linux/generic/backport-6.12/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
+++ b/target/linux/generic/backport-6.12/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
@@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
#include <linux/phy.h>
#include "aquantia.h"
-@@ -70,6 +71,11 @@
+@@ -71,6 +72,11 @@
#define MDIO_AN_TX_VEND_INT_MASK2 0xd401
#define MDIO_AN_TX_VEND_INT_MASK2_LINK BIT(0)
@@ -64,8 +64,8 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
#define MDIO_AN_RX_LP_STAT1 0xe820
#define MDIO_AN_RX_LP_STAT1_1000BASET_FULL BIT(15)
#define MDIO_AN_RX_LP_STAT1_1000BASET_HALF BIT(14)
-@@ -497,6 +503,29 @@ static int aqr107_wait_processor_intensi
- return 0;
+@@ -485,6 +491,29 @@ static void aqr107_chip_info(struct phy_
+ fw_major, fw_minor, build_id, prov_id);
}
+static int aqr107_config_mdi(struct phy_device *phydev)
@@ -94,7 +94,7 @@ Signed-off-by: Jakub Kicinski <kuba at kernel.org>
static int aqr107_config_init(struct phy_device *phydev)
{
struct aqr107_priv *priv = phydev->priv;
-@@ -535,6 +564,10 @@ static int aqr107_config_init(struct phy
+@@ -514,6 +543,10 @@ static int aqr107_config_init(struct phy
if (ret)
return ret;
diff --git a/target/linux/generic/backport-6.12/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch b/target/linux/generic/backport-6.12/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch
index 1674359d26..83c0bb9ebf 100644
--- a/target/linux/generic/backport-6.12/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch
+++ b/target/linux/generic/backport-6.12/901-v6.13-net-dsa-mv88e6xxx-Support-LED-control.patch
@@ -127,7 +127,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
#include <linux/netdevice.h>
#include <linux/gpio/consumer.h>
#include <linux/phylink.h>
-@@ -3265,14 +3266,43 @@ static int mv88e6xxx_setup_upstream_port
+@@ -3412,14 +3413,43 @@ static int mv88e6xxx_setup_upstream_port
static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
{
struct device_node *phy_handle = NULL;
@@ -173,7 +173,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,
SPEED_UNFORCED, DUPLEX_UNFORCED,
-@@ -4491,6 +4521,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -4653,6 +4683,7 @@ static const struct mv88e6xxx_ops mv88e6
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
.port_get_cmode = mv88e6352_port_get_cmode,
@@ -181,7 +181,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
.port_setup_message_port = mv88e6xxx_setup_message_port,
.stats_snapshot = mv88e6320_g1_stats_snapshot,
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
-@@ -4593,6 +4624,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -4755,6 +4786,7 @@ static const struct mv88e6xxx_ops mv88e6
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
.port_get_cmode = mv88e6352_port_get_cmode,
@@ -189,7 +189,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
.port_setup_message_port = mv88e6xxx_setup_message_port,
.stats_snapshot = mv88e6320_g1_stats_snapshot,
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
-@@ -4868,6 +4900,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -5030,6 +5062,7 @@ static const struct mv88e6xxx_ops mv88e6
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
.port_get_cmode = mv88e6352_port_get_cmode,
@@ -197,7 +197,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
.port_setup_message_port = mv88e6xxx_setup_message_port,
.stats_snapshot = mv88e6320_g1_stats_snapshot,
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
-@@ -5290,6 +5323,7 @@ static const struct mv88e6xxx_ops mv88e6
+@@ -5454,6 +5487,7 @@ static const struct mv88e6xxx_ops mv88e6
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
.port_get_cmode = mv88e6352_port_get_cmode,
@@ -237,7 +237,7 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
/* MacAuth Bypass control flag */
bool mab;
};
-@@ -563,6 +571,9 @@ struct mv88e6xxx_ops {
+@@ -574,6 +582,9 @@ struct mv88e6xxx_ops {
phy_interface_t mode);
int (*port_get_cmode)(struct mv88e6xxx_chip *chip, int port, u8 *cmode);
@@ -973,8 +973,8 @@ Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
+ dp = dsa_to_port(p->chip->ds, p->port);
+ if (!dp)
+ return NULL;
-+ if (dp->slave)
-+ return &dp->slave->dev;
++ if (dp->user)
++ return &dp->user->dev;
+ return NULL;
+}
+
More information about the lede-commits
mailing list