From: Miquel Raynal <miquel.raynal@bootlin.com> To: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Eric Dumazet <edumazet@google.com>, netdev@vger.kernel.org Cc: Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, devicetree@vger.kernel.org, Robert Marko <robert.marko@sartura.hr>, Luka Perkov <luka.perkov@sartura.hr>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Michael Walle <michael@walle.cc>, Marcin Wojtas <mw@semihalf.com>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, Vadym Kochan <vadym.kochan@plvision.eu>, Miquel Raynal <miquel.raynal@bootlin.com> Subject: [PATCH net-next v2 6/7] net: marvell: prestera: Avoid unnecessary DT lookups Date: Thu, 24 Nov 2022 12:15:55 +0100 [thread overview] Message-ID: <20221124111556.264647-7-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20221124111556.264647-1-miquel.raynal@bootlin.com> This driver fist makes an expensive DT lookup to retrieve its DT node (this is a PCI driver) in order to later search for the base-mac-provider property. This property has no reality upstream and this code should not have been accepted like this in the first place. Instead, there is a proper nvmem interface that should be used. Let's avoid these extra lookups and rely on the nvmem internal logic. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- .../net/ethernet/marvell/prestera/prestera_main.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c index 24f9d6024745..d4b48f674a88 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c @@ -862,17 +862,10 @@ static void prestera_event_handlers_unregister(struct prestera_switch *sw) static int prestera_switch_set_base_mac_addr(struct prestera_switch *sw) { - struct device_node *base_mac_np; - int ret = 0; - - if (sw->np) { - base_mac_np = of_parse_phandle(sw->np, "base-mac-provider", 0); - if (base_mac_np) { - ret = of_get_mac_address(base_mac_np, sw->base_mac); - of_node_put(base_mac_np); - } - } + int ret; + if (sw->np) + ret = of_get_mac_address(sw->np, sw->base_mac); if (!is_valid_ether_addr(sw->base_mac) || ret) { eth_random_addr(sw->base_mac); dev_info(prestera_dev(sw), "using random base mac address\n"); @@ -1376,7 +1369,7 @@ static int prestera_switch_init(struct prestera_switch *sw) { int err; - sw->np = of_find_compatible_node(NULL, NULL, "marvell,prestera"); + sw->np = sw->dev->dev->of_node; err = prestera_hw_switch_init(sw); if (err) { -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com> To: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Eric Dumazet <edumazet@google.com>, netdev@vger.kernel.org Cc: Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, devicetree@vger.kernel.org, Robert Marko <robert.marko@sartura.hr>, Luka Perkov <luka.perkov@sartura.hr>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Michael Walle <michael@walle.cc>, Marcin Wojtas <mw@semihalf.com>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, Vadym Kochan <vadym.kochan@plvision.eu>, Miquel Raynal <miquel.raynal@bootlin.com> Subject: [PATCH net-next v2 6/7] net: marvell: prestera: Avoid unnecessary DT lookups Date: Thu, 24 Nov 2022 12:15:55 +0100 [thread overview] Message-ID: <20221124111556.264647-7-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20221124111556.264647-1-miquel.raynal@bootlin.com> This driver fist makes an expensive DT lookup to retrieve its DT node (this is a PCI driver) in order to later search for the base-mac-provider property. This property has no reality upstream and this code should not have been accepted like this in the first place. Instead, there is a proper nvmem interface that should be used. Let's avoid these extra lookups and rely on the nvmem internal logic. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- .../net/ethernet/marvell/prestera/prestera_main.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c index 24f9d6024745..d4b48f674a88 100644 --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c @@ -862,17 +862,10 @@ static void prestera_event_handlers_unregister(struct prestera_switch *sw) static int prestera_switch_set_base_mac_addr(struct prestera_switch *sw) { - struct device_node *base_mac_np; - int ret = 0; - - if (sw->np) { - base_mac_np = of_parse_phandle(sw->np, "base-mac-provider", 0); - if (base_mac_np) { - ret = of_get_mac_address(base_mac_np, sw->base_mac); - of_node_put(base_mac_np); - } - } + int ret; + if (sw->np) + ret = of_get_mac_address(sw->np, sw->base_mac); if (!is_valid_ether_addr(sw->base_mac) || ret) { eth_random_addr(sw->base_mac); dev_info(prestera_dev(sw), "using random base mac address\n"); @@ -1376,7 +1369,7 @@ static int prestera_switch_init(struct prestera_switch *sw) { int err; - sw->np = of_find_compatible_node(NULL, NULL, "marvell,prestera"); + sw->np = sw->dev->dev->of_node; err = prestera_hw_switch_init(sw); if (err) { -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-11-24 11:16 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-24 11:15 [PATCH net-next v2 0/7] Marvell nvmem mac addresses support Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-24 11:15 ` [PATCH net-next v2 1/7] Revert "dt-bindings: marvell,prestera: Add description for device-tree bindings" Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-27 21:15 ` Krzysztof Kozlowski 2022-11-27 21:15 ` Krzysztof Kozlowski 2022-11-24 11:15 ` [PATCH net-next v2 2/7] dt-bindings: net: marvell,dfx-server: Convert to yaml Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-27 21:19 ` Krzysztof Kozlowski 2022-11-27 21:19 ` Krzysztof Kozlowski 2022-11-24 11:15 ` [PATCH net-next v2 3/7] dt-bindings: net: marvell,prestera: " Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-24 11:15 ` [PATCH net-next v2 4/7] dt-bindings: net: marvell,prestera: Describe PCI devices of the prestera family Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-24 11:15 ` [PATCH net-next v2 5/7] of: net: export of_get_mac_address_nvmem() Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal [this message] 2022-11-24 11:15 ` [PATCH net-next v2 6/7] net: marvell: prestera: Avoid unnecessary DT lookups Miquel Raynal 2022-11-24 11:15 ` [PATCH net-next v2 7/7] net: mvpp2: Consider NVMEM cells as possible MAC address source Miquel Raynal 2022-11-24 11:15 ` Miquel Raynal 2022-11-29 10:10 ` [PATCH net-next v2 0/7] Marvell nvmem mac addresses support patchwork-bot+netdevbpf 2022-11-29 10:10 ` patchwork-bot+netdevbpf
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221124111556.264647-7-miquel.raynal@bootlin.com \ --to=miquel.raynal@bootlin.com \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=edumazet@google.com \ --cc=krzk+dt@kernel.org \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luka.perkov@sartura.hr \ --cc=michael@walle.cc \ --cc=mw@semihalf.com \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=robert.marko@sartura.hr \ --cc=robh+dt@kernel.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=vadym.kochan@plvision.eu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.