Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1630671pxb; Thu, 4 Mar 2021 16:58:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyJVWRgy+rgCpU8kHUL4qRuI8AAU3YLg2fSuPPbhQeF4ES3/izbUSto31gcEcsqDV+re++h X-Received: by 2002:a5d:9252:: with SMTP id e18mr6172932iol.146.1614905922664; Thu, 04 Mar 2021 16:58:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614905922; cv=none; d=google.com; s=arc-20160816; b=GX9asMBh4Gmipe4oHemS8f9f9xzilcNVZSxdTL7iogqCeqrqqAirjEcRUiS0tg/Udg NghhD+Q+xH/YupglfcZJzPZ90z7e9rEXiXX/veaA7D5fxQkghPzOIWcqeHQFy6l22XUI Bsi2lKMUoJjI/AZudF4lKradgw11gJLUKjVvl2QdSgONpxZ1MNHPR3Oekui+30WPTycx 0Yyr5jCniKawDx/l3CDldm8AanUJhXQgS6As72t7zZRaGG9u7bapiibhCgZWpYEOpk3P omAETnRDWUKNlm8QldmfTkVvZdqJhBOq44sPaAZ1N4cjZBOP9lE5zqEx8aM6RFW9VK8F C9zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=Z4IVbMNRMny8csEdAou7ZR1iqOVo3C4BWOZmA57Qd1E=; b=dJq7ayJYg/ejB6Ymv3Ab/+tXI1TywSHmxqV4bfGHDsEaL3Jmt/+LKZtyk1WlLbN1T0 2VEjWF2SPVhlj07CzVHBH/R3PXz0bLZrgErJCldENoQ5aEeyUYVfGAIFT1TQixWHSiY9 lUKk2IpnyuyL5QWKj4VSTB7T/9dahkZAC37jdos0y1wKawSchwW7yxgjBg9dIDAZSpuQ AePcX6QLLdMlpF3gmlkg1duw9l/uD35+kJeji5lHZDIEgP1ViPfCFmUWOvV+SKRUFT93 2RR/+MjtpxKU3jFYAac3TyKSK+tDuzlqOid1b+ZftY5TykmXbRVN0cXYRHBm0Cx82NT6 BV0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cisco.com header.s=iport header.b=aDpcGJfq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=cisco.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p8si790743ilc.145.2021.03.04.16.58.29; Thu, 04 Mar 2021 16:58:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cisco.com header.s=iport header.b=aDpcGJfq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=cisco.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231811AbhCDUt3 (ORCPT + 99 others); Thu, 4 Mar 2021 15:49:29 -0500 Received: from rcdn-iport-7.cisco.com ([173.37.86.78]:42469 "EHLO rcdn-iport-7.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238317AbhCDUtM (ORCPT ); Thu, 4 Mar 2021 15:49:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2263; q=dns/txt; s=iport; t=1614890952; x=1616100552; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=GjLbEy4mzc1GE+5Hnhb3oU35QJXDVH6Er8mIRNVDXJg=; b=aDpcGJfqeMyD/Yj6nCt6jiMPGT+r039JkrAUN/6LkvI/ay/NFguqJigF RlKVv1AlnReDfO5ZCYoxF62HFwjllXC7sXozOKUZ6/yx5MCrL0RNR4jfc +r76M6bkK6dCTP3GVYz3brS1v6H6j9O+cejs121EqeFxWndosfAoaJ6QT s=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0DHAABGRkFg/4wNJK1iHAEBAQEBAQc?= =?us-ascii?q?BARIBAQQEAQFAgT4EAQELAYIqgUwBOTGWHY96Fow7CwEBAQ0BATQEAQGETQK?= =?us-ascii?q?BegIlNwYOAgMBAQsBAQUBAQECAQYEcYVuhkUBBTo/EAsYLjwbBhOFeK4YdIE?= =?us-ascii?q?0iR+BRBQOgRYBjUImHIFJQoQrPoQVhh4EgkAHgQ57gS0Sk3sBii2be4MGgR+?= =?us-ascii?q?acjEQo0a2cgIEBgUCFoFqJIFXMxoIGxWDJFAZDY4qF45HIAMvOAIGCgEBAwm?= =?us-ascii?q?JT4JEAQE?= X-IronPort-AV: E=Sophos;i="5.81,223,1610409600"; d="scan'208";a="855671246" Received: from alln-core-7.cisco.com ([173.36.13.140]) by rcdn-iport-7.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 04 Mar 2021 20:48:31 +0000 Received: from zorba ([10.24.1.42]) by alln-core-7.cisco.com (8.15.2/8.15.2) with ESMTPS id 124KmTRL023920 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 4 Mar 2021 20:48:30 GMT Date: Thu, 4 Mar 2021 12:48:23 -0800 From: Daniel Walker To: Rob Herring Cc: Will Deacon , Christophe Leroy , Daniel Gimpelevich , Andrew Morton , X86 ML , "open list:MIPS" , linuxppc-dev , Frank Rowand , xe-linux-external@cisco.com, Ruslan Ruslichenko , devicetree@vger.kernel.org, "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 2/5] CMDLINE: drivers: of: ifdef out cmdline section Message-ID: <20210304204823.GI109100@zorba> References: <20210304044803.812204-2-danielwa@cisco.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Auto-Response-Suppress: DR, OOF, AutoReply X-Outbound-SMTP-Client: 10.24.1.42, [10.24.1.42] X-Outbound-Node: alln-core-7.cisco.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 04, 2021 at 08:32:37AM -0600, Rob Herring wrote: > On Wed, Mar 3, 2021 at 10:48 PM Daniel Walker wrote: > > > > It looks like there's some seepage of cmdline stuff into > > the generic device tree code. This conflicts with the > > generic cmdline implementation so I remove it in the case > > when that's enabled. > > > > Cc: xe-linux-external@cisco.com > > Signed-off-by: Ruslan Ruslichenko > > Signed-off-by: Daniel Walker > > --- > > drivers/of/fdt.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > > index feb0f2d67fc5..cfe4f8d3c9f5 100644 > > --- a/drivers/of/fdt.c > > +++ b/drivers/of/fdt.c > > @@ -25,6 +25,7 @@ > > #include > > #include > > #include > > +#include > > > > #include /* for COMMAND_LINE_SIZE */ > > #include > > @@ -1048,8 +1049,18 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, > > > > early_init_dt_check_for_initrd(node); > > > > +#ifdef CONFIG_GENERIC_CMDLINE > > What I like about Christophe's version is it removes the old DT > implementation. Who's going to convert the rest of the DT based > arches? That's arm, arm64, hexagon, microblaze, nios2, openrisc, > riscv, sh, and xtensa. Either separate the common code from the config > like Christophe's version or these all need converting. Though it's > fine to hash out patch 1 with a couple of arches first. I'm limited in what I can test, so I can't know for sure that I have something which works on those architectures. Even powerpc 64 is part of this series but I can't really test it at this time. Also Cisco's needs out strip the implementation of extend or override. I have un-tested conversions for arm32, arm64, c6x, microblaze, nios2, and openrisc. These could go into -next and we can see who complains. The implementation on these architectures isn't all uniform. > > /* Retrieve command line */ > > p = of_get_flat_dt_prop(node, "bootargs", &l); > > This needs to be outside the ifdef. Ok .. Daniel