From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4536C433EF for ; Wed, 2 Mar 2022 12:39:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BAF983C96; Wed, 2 Mar 2022 13:38:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="h6CBhZED"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DFD8B83C93; Wed, 2 Mar 2022 13:38:55 +0100 (CET) Received: from mail.nic.cz (mail.nic.cz [217.31.204.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A19EE83CA0 for ; Wed, 2 Mar 2022 13:38:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from dellmb (unknown [IPv6:2001:1488:fffe:6:8747:7254:5571:3010]) by mail.nic.cz (Postfix) with ESMTPSA id 330541409E2; Wed, 2 Mar 2022 13:38:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1646224729; bh=cWys7xQXA+mwYSk62hTEU7Kwo6SxFgi8qE4JM7l3yFA=; h=Date:From:To; b=h6CBhZED76lNl/gDY1AWI1574fsz1HLkrnEtFjkK8QkOhAFKJDslyrpyVFiu2Xwrr vks4Y1UJREap1Hu7mKtGjQtHTTE18LC0d+Glo7EXlOKo4uJ14Ha9dh+pHxJhbDAErf qAKVAU8Ug6Wu5Ka4+CFaGCEMxSCJr3EOq9/Sy8bk= Date: Wed, 2 Mar 2022 13:38:48 +0100 From: Marek =?UTF-8?B?QmVow7pu?= To: Pali =?UTF-8?B?Um9ow6Fy?= Cc: Stefan Roese , u-boot@lists.denx.de Subject: Re: [PATCH u-boot-marvell 6/8] arm: mvebu: turris_omnia: Extract code for disabling sata/pcie Message-ID: <20220302133848.68999106@dellmb> In-Reply-To: <20220302114758.21787-7-pali@kernel.org> References: <20220302114758.21787-1-pali@kernel.org> <20220302114758.21787-7-pali@kernel.org> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On Wed, 2 Mar 2022 12:47:56 +0100 Pali Roh=C3=A1r wrote: > Move code for disabling sata and pcie DT nodes to own functions, so this > code can be called from other places in follow up patches. >=20 > Signed-off-by: Pali Roh=C3=A1r > --- > board/CZ.NIC/turris_omnia/turris_omnia.c | 96 +++++++++++++----------- > 1 file changed, 52 insertions(+), 44 deletions(-) >=20 > diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turr= is_omnia/turris_omnia.c > index 6a057ea7dd70..57b797db4a8e 100644 > --- a/board/CZ.NIC/turris_omnia/turris_omnia.c > +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c > @@ -518,11 +518,54 @@ void spl_board_init(void) > =20 > #if IS_ENABLED(CONFIG_OF_BOARD_FIXUP) || IS_ENABLED(CONFIG_OF_BOARD_SETU= P) > =20 > -static void fixup_serdes_0_nodes(void *blob) > +static void disable_sata_node(void *blob) > { > - bool mode_sata; > int node; > =20 > + fdt_for_each_node_by_compatible(node, blob, -1, "marvell,armada-380-ahc= i") { > + if (!fdtdec_get_is_enabled(blob, node)) > + continue; > + > + if (fdt_status_disabled(blob, node) < 0) > + printf("Cannot disable SATA DT node!\n"); > + else > + debug("Disabled SATA DT node\n"); > + > + break; > + } > +} > + > +static void disable_pcie_node(void *blob, int port) > +{ > + int node; > + > + fdt_for_each_node_by_compatible(node, blob, -1, "marvell,armada-370-pci= e") { > + int port_node; > + > + if (!fdtdec_get_is_enabled(blob, node)) > + continue; > + > + fdt_for_each_subnode (port_node, blob, node) { > + if (!fdtdec_get_is_enabled(blob, port_node)) > + continue; > + > + if (fdtdec_get_int(blob, port_node, "marvell,pcie-port", -1) !=3D por= t) > + continue; > + > + if (fdt_status_disabled(blob, port_node) < 0) > + printf("Cannot disable PCIe port %d DT node!\n", port); > + else > + debug("Disabled PCIe port %d DT node\n", port); > + > + return; > + } > + } > +} > + > +static void fixup_msata_port_nodes(void *blob) > +{ > + bool mode_sata; > + > /* > * Determine if SerDes 0 is configured to SATA mode. > * We do this instead of calling omnia_detect_sata() to avoid another > @@ -541,47 +584,12 @@ static void fixup_serdes_0_nodes(void *blob) > return; > } > =20 > - /* If mSATA card is not present, disable SATA DT node */ > if (!mode_sata) { > - fdt_for_each_node_by_compatible(node, blob, -1, > - "marvell,armada-380-ahci") { > - if (!fdtdec_get_is_enabled(blob, node)) > - continue; > - > - if (fdt_status_disabled(blob, node) < 0) > - printf("Cannot disable SATA DT node!\n"); > - else > - debug("Disabled SATA DT node\n"); > - > - break; > - } > - > - return; > - } > - > - /* Otherwise disable PCIe port 0 DT node (MiniPCIe / mSATA port) */ > - fdt_for_each_node_by_compatible(node, blob, -1, > - "marvell,armada-370-pcie") { > - int port; > - > - if (!fdtdec_get_is_enabled(blob, node)) > - continue; > - > - fdt_for_each_subnode (port, blob, node) { > - if (!fdtdec_get_is_enabled(blob, port)) > - continue; > - > - if (fdtdec_get_int(blob, port, "marvell,pcie-port", > - -1) !=3D 0) > - continue; > - > - if (fdt_status_disabled(blob, port) < 0) > - printf("Cannot disable PCIe port 0 DT node!\n"); > - else > - debug("Disabled PCIe port 0 DT node\n"); > - > - return; > - } > + /* If mSATA card is not present, disable SATA DT node */ > + disable_sata_node(blob); > + } else { > + /* Otherwise disable PCIe port 0 DT node (MiniPCIe / mSATA port) */ > + disable_pcie_node(blob, 0); > } If I am looking at this correctly, there is only one statement both in if and in else clause. Can we drop the {} parentheses? Marek