Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1152700yba; Tue, 2 Apr 2019 03:27:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwt/qmeHnBUa1xX3FyLcIfH0VPq7M02W+8NTAs5AD1SpeW4rqh5A+eO6KEP+sqKzUGotoLX X-Received: by 2002:a17:902:523:: with SMTP id 32mr67867398plf.249.1554200877754; Tue, 02 Apr 2019 03:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554200877; cv=none; d=google.com; s=arc-20160816; b=CpKzqusgCNxFV208m/BkF1RQHw/NARL7hXLevmgNd3U0aS1yDTXxdoeLLXlJoAJ4tz fxVdmm5xFEmJZUJcVN47JtNbXhbLJJ6rsH0sMk9aLF3GwCJjDWvfwBHRoXv1HivfLVCa MoejcssyNVJBpS972RjSWTqofVMqWiHc1kTHUfeYrXU7XH6/pmvsttc8ecC+k4J905e3 He32K5ZN1Xn2alTibV9E3ISxQnnX9WNg8bhRx5g4rUkiLv1i1zeIB8Ag9oNRXi4svrqR vwDiy74vgXsmUrA3AoAU9q0g98is+ZGuKqVXnerlub4WSKlSs4UAnBlPAPyElb98Y3Gg fWQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=oZVnBb9F8M23G0fBOCsT3v+mbLC89R0u6GvQYlqjZkI=; b=l3B679iDeeEOHm5O+ae9jNaLv5CKaj7O3ldADgIFo+08f7229vIXbtkMRNzjXyllNX ovtl793MIWaU1Z5FIAxECiD2NsvhDZPNJuI42kYGjZ1cbicZ0DtaPWI5AqP1Hj56gpDt kdVhccIWlzIAHq02/1KLQ65TK8G6IKbc2XlDnSztBSgJ+kYMieQy1jMV6n8PSkYp/tB0 NfK94wo9awLiCNnibYHR90cwDWvlJ0WWru3nH0nitHsR4Ypm8WHjilSzlSwPB1gq72Qd aB5aoy7wsCHYb5MArJoxdx/3XnE4Ud9fwDRs6xdbvqbUBAnkuZPcIvva4oA4ybj73+bD huEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=kmQnCQqC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n23si10677923plp.182.2019.04.02.03.27.42; Tue, 02 Apr 2019 03:27:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=kmQnCQqC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729978AbfDBJJE (ORCPT + 99 others); Tue, 2 Apr 2019 05:09:04 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:19094 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729880AbfDBJIm (ORCPT ); Tue, 2 Apr 2019 05:08:42 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44YNfv2kdjz9v0Zp; Tue, 2 Apr 2019 11:08:39 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=kmQnCQqC; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id Es3JDTTXk7Tb; Tue, 2 Apr 2019 11:08:39 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44YNfv1V4Dz9v0ZY; Tue, 2 Apr 2019 11:08:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1554196119; bh=oZVnBb9F8M23G0fBOCsT3v+mbLC89R0u6GvQYlqjZkI=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=kmQnCQqCkHLooK1iqlUtUstm8Tx8DoDTfvdeILyiJNxqsikIcFPBRx0sSdJzlOTdj C/Ta62VrdZ0wfpz9UebtivwVCgiRT590VX61HKxcYRwGVBBs5LCmsl40MoPBRbwII7 B1OIXtrClaF2CD0E9CivyRAAdpqYm2sBYoBChZyY= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 497A48B8C4; Tue, 2 Apr 2019 11:08:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id aJtUAZGGgSan; Tue, 2 Apr 2019 11:08:40 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 143EA8B8C3; Tue, 2 Apr 2019 11:08:40 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id ECCA7661D9; Tue, 2 Apr 2019 09:08:39 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 5/9] powerpc: convert to generic builtin command line To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , danielwa@cisco.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arch@vger.kernel.org Date: Tue, 2 Apr 2019 09:08:39 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This updates the powerpc code to use the new cmdline building function. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/prom_init.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d4889ba04ddd..08f3db25b2f1 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -155,7 +156,7 @@ static struct prom_t __prombss prom; static unsigned long __prombss prom_entry; static char __prombss of_stdout_device[256]; -static char __prombss prom_scratch[256]; +static char __prombss prom_scratch[COMMAND_LINE_SIZE]; static unsigned long __prombss dt_header_start; static unsigned long __prombss dt_struct_start, dt_struct_end; @@ -627,18 +628,14 @@ static unsigned long prom_memparse(const char *ptr, const char **retptr) static void __init early_cmdline_parse(void) { const char *opt; + int l = 0; - char *p; - int l __maybe_unused = 0; - - prom_cmd_line[0] = 0; - p = prom_cmd_line; if ((long)prom.chosen > 0) - l = prom_getprop(prom.chosen, "bootargs", p, COMMAND_LINE_SIZE-1); -#ifdef CONFIG_CMDLINE - if (l <= 0 || p[0] == '\0' || IS_ENABLED(CONFIG_CMDLINE_EXTEND)) /* dbl check */ - strlcat(prom_cmd_line, CONFIG_CMDLINE, sizeof(prom_cmd_line)); -#endif /* CONFIG_CMDLINE */ + l = prom_getprop(prom.chosen, "bootargs", prom_scratch, + COMMAND_LINE_SIZE - 1); + + cmdline_build(prom_cmd_line, l > 0 ? prom_scratch : NULL, sizeof(prom_scratch)); + prom_printf("command line: %s\n", prom_cmd_line); #ifdef CONFIG_PPC64 -- 2.13.3