diff mbox series

kernel: drop "mac-address-increment-byte" DT property support

Message ID 20231115080447.28292-1-zajec5@gmail.com
State Accepted
Delegated to: Rafał Miłecki
Headers show
Series kernel: drop "mac-address-increment-byte" DT property support | expand

Commit Message

Rafał Miłecki Nov. 15, 2023, 8:04 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

This downstream DT property is not used by any DTS file anymore.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 ...net-add-mac-address-increment-support.patch | 18 ++++--------------
 ...683-of_net-add-mac-address-to-of-tree.patch |  2 +-
 ...et-do-mac-address-increment-only-once.patch |  9 ++++-----
 ...net-add-mac-address-increment-support.patch | 18 ++++--------------
 ...683-of_net-add-mac-address-to-of-tree.patch |  2 +-
 ...et-do-mac-address-increment-only-once.patch |  9 ++++-----
 6 files changed, 18 insertions(+), 40 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/generic/pending-5.15/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.15/682-of_net-add-mac-address-increment-support.patch
index f6ae9f31f1..73eabf4f37 100644
--- a/target/linux/generic/pending-5.15/682-of_net-add-mac-address-increment-support.patch
+++ b/target/linux/generic/pending-5.15/682-of_net-add-mac-address-increment-support.patch
@@ -20,14 +20,12 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 
 --- a/net/core/of_net.c
 +++ b/net/core/of_net.c
-@@ -119,28 +119,63 @@ static int of_get_mac_addr_nvmem(struct
+@@ -119,10 +119,19 @@ static int of_get_mac_addr_nvmem(struct
   * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
   * but is all zeros.
   *
 + * DT can tell the system to increment the mac-address after is extracted by
 + * using:
-+ * - mac-address-increment-byte to decide what byte to increase
-+ *   (if not defined is increased the last byte)
 + * - mac-address-increment to decide how much to increase. The value WILL
 + *   overflow to other bytes if the increment is over 255 or the total
 + *   increment will exceed 255 of the current byte.
@@ -38,19 +36,11 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  */
  int of_get_mac_address(struct device_node *np, u8 *addr)
  {
-+	u32 inc_idx, mac_inc, mac_val;
++	u32 mac_inc, mac_val;
  	int ret;
  
-+	/* Check first if the increment byte is present and valid.
-+	 * If not set assume to increment the last byte if found.
-+	 */
-+	if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
-+		inc_idx = 5;
-+	if (inc_idx < 3 || inc_idx > 5)
-+		return -EINVAL;
-+
  	if (!np)
- 		return -ENODEV;
+@@ -130,17 +139,33 @@ int of_get_mac_address(struct device_nod
  
  	ret = of_get_mac_addr(np, "mac-address", addr);
  	if (!ret)
@@ -75,7 +65,7 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 +	if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) {
 +		/* Convert to a contiguous value */
 +		mac_val = (addr[3] << 16) + (addr[4] << 8) + addr[5];
-+		mac_val += mac_inc << 8 * (5-inc_idx);
++		mac_val += mac_inc;
 +
 +		/* Apply the incremented value handling overflow case */
 +		addr[3] = (mac_val >> 16) & 0xff;
diff --git a/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
index f7ef06a14a..29144ce8b4 100644
--- a/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
+++ b/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch
@@ -45,7 +45,7 @@  property. This way, the MAC address can be accessed using procfs.
  /**
   * of_get_mac_address()
   * @np:		Caller's Device Node
-@@ -175,6 +196,7 @@ found:
+@@ -165,6 +186,7 @@ found:
  		addr[5] = (mac_val >> 0) & 0xff;
  	}
  
diff --git a/target/linux/generic/pending-5.15/684-of_net-do-mac-address-increment-only-once.patch b/target/linux/generic/pending-5.15/684-of_net-do-mac-address-increment-only-once.patch
index 44d88e31a2..c37c451989 100644
--- a/target/linux/generic/pending-5.15/684-of_net-do-mac-address-increment-only-once.patch
+++ b/target/linux/generic/pending-5.15/684-of_net-do-mac-address-increment-only-once.patch
@@ -16,16 +16,15 @@  Signed-off-by: Will Moss <willormos@gmail.com>
 
 --- a/net/core/of_net.c
 +++ b/net/core/of_net.c
-@@ -194,6 +194,12 @@ found:
+@@ -184,6 +184,11 @@ found:
  		addr[3] = (mac_val >> 16) & 0xff;
  		addr[4] = (mac_val >> 8) & 0xff;
  		addr[5] = (mac_val >> 0) & 0xff;
 +
-+		/* Remove mac-address-increment and mac-address-increment-byte
-+		 * DT property to make sure MAC address would not get incremented
-+		 * more if this function is stared again. */
++		/* Remove mac-address-increment DT property to make sure MAC
++		 * address would not get incremented more if this function is
++		 * stared again. */
 +		of_remove_property(np, of_find_property(np, "mac-address-increment", NULL));
-+		of_remove_property(np, of_find_property(np, "mac-address-increment-byte", NULL));
  	}
  
  	of_add_mac_address(np, addr);
diff --git a/target/linux/generic/pending-6.1/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-6.1/682-of_net-add-mac-address-increment-support.patch
index f6ae9f31f1..73eabf4f37 100644
--- a/target/linux/generic/pending-6.1/682-of_net-add-mac-address-increment-support.patch
+++ b/target/linux/generic/pending-6.1/682-of_net-add-mac-address-increment-support.patch
@@ -20,14 +20,12 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 
 --- a/net/core/of_net.c
 +++ b/net/core/of_net.c
-@@ -119,28 +119,63 @@ static int of_get_mac_addr_nvmem(struct
+@@ -119,10 +119,19 @@ static int of_get_mac_addr_nvmem(struct
   * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
   * but is all zeros.
   *
 + * DT can tell the system to increment the mac-address after is extracted by
 + * using:
-+ * - mac-address-increment-byte to decide what byte to increase
-+ *   (if not defined is increased the last byte)
 + * - mac-address-increment to decide how much to increase. The value WILL
 + *   overflow to other bytes if the increment is over 255 or the total
 + *   increment will exceed 255 of the current byte.
@@ -38,19 +36,11 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  */
  int of_get_mac_address(struct device_node *np, u8 *addr)
  {
-+	u32 inc_idx, mac_inc, mac_val;
++	u32 mac_inc, mac_val;
  	int ret;
  
-+	/* Check first if the increment byte is present and valid.
-+	 * If not set assume to increment the last byte if found.
-+	 */
-+	if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
-+		inc_idx = 5;
-+	if (inc_idx < 3 || inc_idx > 5)
-+		return -EINVAL;
-+
  	if (!np)
- 		return -ENODEV;
+@@ -130,17 +139,33 @@ int of_get_mac_address(struct device_nod
  
  	ret = of_get_mac_addr(np, "mac-address", addr);
  	if (!ret)
@@ -75,7 +65,7 @@  Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 +	if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) {
 +		/* Convert to a contiguous value */
 +		mac_val = (addr[3] << 16) + (addr[4] << 8) + addr[5];
-+		mac_val += mac_inc << 8 * (5-inc_idx);
++		mac_val += mac_inc;
 +
 +		/* Apply the incremented value handling overflow case */
 +		addr[3] = (mac_val >> 16) & 0xff;
diff --git a/target/linux/generic/pending-6.1/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-6.1/683-of_net-add-mac-address-to-of-tree.patch
index f7ef06a14a..29144ce8b4 100644
--- a/target/linux/generic/pending-6.1/683-of_net-add-mac-address-to-of-tree.patch
+++ b/target/linux/generic/pending-6.1/683-of_net-add-mac-address-to-of-tree.patch
@@ -45,7 +45,7 @@  property. This way, the MAC address can be accessed using procfs.
  /**
   * of_get_mac_address()
   * @np:		Caller's Device Node
-@@ -175,6 +196,7 @@ found:
+@@ -165,6 +186,7 @@ found:
  		addr[5] = (mac_val >> 0) & 0xff;
  	}
  
diff --git a/target/linux/generic/pending-6.1/684-of_net-do-mac-address-increment-only-once.patch b/target/linux/generic/pending-6.1/684-of_net-do-mac-address-increment-only-once.patch
index 44d88e31a2..c37c451989 100644
--- a/target/linux/generic/pending-6.1/684-of_net-do-mac-address-increment-only-once.patch
+++ b/target/linux/generic/pending-6.1/684-of_net-do-mac-address-increment-only-once.patch
@@ -16,16 +16,15 @@  Signed-off-by: Will Moss <willormos@gmail.com>
 
 --- a/net/core/of_net.c
 +++ b/net/core/of_net.c
-@@ -194,6 +194,12 @@ found:
+@@ -184,6 +184,11 @@ found:
  		addr[3] = (mac_val >> 16) & 0xff;
  		addr[4] = (mac_val >> 8) & 0xff;
  		addr[5] = (mac_val >> 0) & 0xff;
 +
-+		/* Remove mac-address-increment and mac-address-increment-byte
-+		 * DT property to make sure MAC address would not get incremented
-+		 * more if this function is stared again. */
++		/* Remove mac-address-increment DT property to make sure MAC
++		 * address would not get incremented more if this function is
++		 * stared again. */
 +		of_remove_property(np, of_find_property(np, "mac-address-increment", NULL));
-+		of_remove_property(np, of_find_property(np, "mac-address-increment-byte", NULL));
  	}
  
  	of_add_mac_address(np, addr);