From patchwork Sat Jan 7 12:05:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1722701 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=yZSR0r0Y; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Z0aCXbum; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NpzVw6Jwvz23dq for ; Sat, 7 Jan 2023 23:08:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=4oETjToWnZfu4vvQ6d9yQVIJvhTkHpBOtIgcPxrl8OY=; b=yZSR0r0YR8iH/J QOuo4Tsx1Wze7HymyU2xj3O3z5+dKtStZgXbJmQt/cKI2y5flMSt8Qj2+phvTuZCeo1j9J2HU6Lt7 EbrVS9L1biG3NyCk6kIJVqk2+3a6YEDkFbPaDMtyP1ekusTvYVXeGgT/6LfSoru90cezSejBjM+NL Sq5RQkw6PmH8UVuUxkPkjLonPtLD2Zi87Oa3BEGxuflr4aR/EM7JLxp3grUB5Re4rKJzWTXIr5ySd TKMCCEosQx6YfU62ADw9n0dgcoSeKBnLAq7XUj37C0LBdThqtHjR2kCmhIpFmcS2ksqdsSdXdN3B1 p7AQKLyupg3/8dx71UGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pE7xc-004gNK-Bt; Sat, 07 Jan 2023 12:06:04 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pE7xU-004gJL-Hz for openwrt-devel@lists.openwrt.org; Sat, 07 Jan 2023 12:06:01 +0000 Received: by mail-ej1-x62e.google.com with SMTP id gh17so9083953ejb.6 for ; Sat, 07 Jan 2023 04:05:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=z5U8z4YNs2HXxtc+7ahlb9ikTDSIZDGtBesTPjqkyo8=; b=Z0aCXbum7wh0IZRZNnjcZc74HW7ojI6SK888CzRu+SPA8HBx9iOxOLgU4lOO9QzasH 1jsvmyUP/XUk9wB/EIPrQe/2UDjHx6swMEqkAstV9O8JSDETdJZzD0/7ZzjyrTe8J7qf mK8eJR/a4KfmYYcLQK39KfNqBScDH9BA3ymKm2g90/Of3vwsUCezjxHhhfoaCvFMLXM7 bhTNwfJJUTyJB80KCh/RppYPPHADXSsQ7TwJ01RYDFAG/whdr0lu/ZMzeB/IP4QiRbOb ISuFplv00aAGDoj4gfuMkDkAfTB7PR4ndpF0P4Slw6EvwvWKqZ77uW1Ond81X7Amoo9B pjig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z5U8z4YNs2HXxtc+7ahlb9ikTDSIZDGtBesTPjqkyo8=; b=4WSq0fUyjmXNtvkN0H4s8GnSCsDG/avt/puPPwlRRnkMTIoWjkJHRM43Kl01Y/u5iO Pol5srkLDR4LcTWVRPv9leIFmXrof0v1gx3u0cG31hEPiNHnw/kvJKDXVZeWVh3ArjKE 0py5uoeMX5QCzg/Tc+nUM36RTsBAS19fneeWWXudKV1NAM42WM9kgoQ5clVoUgY9x3yy 7ADXZIFcnSLlYPzjrpRDHOTueEBvume6g5Xtng6NOVzbvcP9kJqWQClDJD19rdEuYoyf soRpQqlZNUpFrVVh1Hh8pArVxLc2Nv0wrasw7tWe0pk2eSNY/foP34MO/uQyRwxLKSZM roiw== X-Gm-Message-State: AFqh2ko4Ro/Df6Snm7Qt18yhUjFJoTRvFLO4NAFt9aMZZb21yT492HgF v8byRcPw91EVgCkE4340AwqnR+aHVQA= X-Google-Smtp-Source: AMrXdXuivBAcFPOoalRUB8Olud2vjlSK1/75++2Ss3V48P6lWoY6s8oz4xQu83F5eEr8mbmKzMkG/w== X-Received: by 2002:a17:907:8c0c:b0:7c0:ad62:a25f with SMTP id ta12-20020a1709078c0c00b007c0ad62a25fmr50879771ejc.51.1673093150456; Sat, 07 Jan 2023 04:05:50 -0800 (PST) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id p4-20020a17090653c400b0084ca4bd745esm1381793ejo.35.2023.01.07.04.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 04:05:49 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , David Bauer Subject: [PATCH RFC] Revert "generic: write back netdev MAC-address to device-tree" Date: Sat, 7 Jan 2023 13:05:42 +0100 Message-Id: <20230107120542.10714-1-zajec5@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230107_040556_627555_EAD78A6C X-CRM114-Status: GOOD ( 17.37 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_This_r?= =?unknown-8bit?q?everts_commit_cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac=2E?= =?unknown-8bit?q?_Adding_=22mac-address=22_property_to_the_device_tree_seems?= =?unknown-8bit?q?_to_be_done_to_allow?= =?unknown-8bit?q?_reading_it_using_procfs_=28/proc/device-tree/=29=2E_It_see?= =?unknown-8bit?q?ms_like_a_hack_without?= =?unknown-8bit?q?_a_proper_explanation_WHY_do_we_need_that=2E_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo2MmUgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki This reverts commit cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac. Adding "mac-address" property to the device tree seems to be done to allow reading it using procfs (/proc/device-tree/). It seems like a hack without a proper explanation WHY do we need that. Reading MAC address can be done other ways including fs based: cat /sys/class/net//address Cc: David Bauer Signed-off-by: Rafał Miłecki --- David, everyone, it seems this patch never ended up being sent upstream and it sits in our tree without actual explanation why do we need that. I was wondering if we can just drop it? --- ...83-of_net-add-mac-address-to-of-tree.patch | 54 ------------------ ...83-of_net-add-mac-address-to-of-tree.patch | 55 ------------------- 2 files changed, 109 deletions(-) delete mode 100644 target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch delete mode 100644 target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch deleted file mode 100644 index 501422551b..0000000000 --- a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: David Bauer -Subject: of/net: Add MAC address to of tree - -The label-mac logic relies on the mac-address property of a netdev -devices of-node. However, the mac address can also be stored as a -different property or read from e.g. an mtd device. - -Create this node when reading a mac-address from OF if it does not -already exist and copy the mac-address used for the device to this -property. This way, the MAC address can be accessed using procfs. - -Submitted-by: David Bauer ---- - drivers/of/of_net.c | 22 ++++++++++++++ - 1 files changed, 22 insertions(+) - ---- a/drivers/of/of_net.c -+++ b/drivers/of/of_net.c -@@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct - return 0; - } - -+static int of_add_mac_address(struct device_node *np, u8* addr) -+{ -+ struct property *prop; -+ -+ prop = kzalloc(sizeof(*prop), GFP_KERNEL); -+ if (!prop) -+ return -ENOMEM; -+ -+ prop->name = "mac-address"; -+ prop->length = ETH_ALEN; -+ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL); -+ if (!prop->value || of_update_property(np, prop)) -+ goto free; -+ -+ return 0; -+free: -+ kfree(prop->value); -+ kfree(prop); -+ return -ENOMEM; -+} -+ - /** - * Search the device tree for the best MAC address to use. 'mac-address' is - * checked first, because that is supposed to contain to "most recent" MAC -@@ -171,6 +192,7 @@ found: - addr[5] = (mac_val >> 0) & 0xff; - } - -+ of_add_mac_address(np, addr); - return ret; - } - EXPORT_SYMBOL(of_get_mac_address); 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 deleted file mode 100644 index f7ef06a14a..0000000000 --- a/target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8585756342caa6d27008d1ad0c18023e4211a40a Mon Sep 17 00:00:00 2001 -From: OpenWrt community -Date: Wed, 13 Jul 2022 12:22:48 +0200 -Subject: [PATCH] of/of_net: write back netdev MAC-address to device-tree - -The label-mac logic relies on the mac-address property of a netdev -devices of-node. However, the mac address can also be stored as a -different property or read from e.g. an mtd device. - -Create this node when reading a mac-address from OF if it does not -already exist and copy the mac-address used for the device to this -property. This way, the MAC address can be accessed using procfs. - ---- - net/core/of_net.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - ---- a/net/core/of_net.c -+++ b/net/core/of_net.c -@@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct - return 0; - } - -+static int of_add_mac_address(struct device_node *np, u8* addr) -+{ -+ struct property *prop; -+ -+ prop = kzalloc(sizeof(*prop), GFP_KERNEL); -+ if (!prop) -+ return -ENOMEM; -+ -+ prop->name = "mac-address"; -+ prop->length = ETH_ALEN; -+ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL); -+ if (!prop->value || of_update_property(np, prop)) -+ goto free; -+ -+ return 0; -+free: -+ kfree(prop->value); -+ kfree(prop); -+ return -ENOMEM; -+} -+ - /** - * of_get_mac_address() - * @np: Caller's Device Node -@@ -175,6 +196,7 @@ found: - addr[5] = (mac_val >> 0) & 0xff; - } - -+ of_add_mac_address(np, addr); - return ret; - } - EXPORT_SYMBOL(of_get_mac_address);