From patchwork Tue Oct 31 23:35:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 10035775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 72252602B5 for ; Tue, 31 Oct 2017 23:36:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6783528AD2 for ; Tue, 31 Oct 2017 23:36:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BC2D28ADE; Tue, 31 Oct 2017 23:36:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D174028AD2 for ; Tue, 31 Oct 2017 23:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:Message-ID: In-Reply-To:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SCmiKIbmLEqi9ZRTPfF+txA1UQi2tTAi16zEe5mHuAU=; b=POLLN165Y7CGAm CSY5++Y3N/vu7ouRgJ1sAQ1WHOzMyw+1JSWam8kviqVhIfZ2NrPKZ6vIxfHQfYrhv8RMIFNhwIKis oSAyCe8R4JjWtwl16QbWOmZ/cEcZuu60XdsZJlqSRAI4U9Dj0a0GaHWrwepAd9HJtCL53rczeXpt2 ZwiHK00elnVRPMmyulUjU+RvRIFUMK+VZQnIO2MfsMAz9iwc0b/HYECCv3DdZy5JKFJVRitcvCBgk 2zk87Qe9BmYlUmZhSXSRJPsXrI4/5QUFP8SJiYbH4hzoF0ymClTxQ/85m2VFht2HyRHVkvDyyozmy 6x0BVT3tz49TN474yEmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e9g52-0004Lh-CU; Tue, 31 Oct 2017 23:36:24 +0000 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9g4x-0004JH-OH for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2017 23:36:22 +0000 Received: by mail-qt0-x242.google.com with SMTP id 31so792727qtz.9 for ; Tue, 31 Oct 2017 16:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=LAnddNj9085dcI/kN3l/MtqYM8Yqoam71k7uTfCglqY=; b=MqRS1vO4ey57t9APBao1Ia68puKaugrMHW9aV/lWwiNTyedJHx3NoWeYG6tkajblJd dUBAdpjeP8NzVCVxzX9OCbwKj8BzUyCQFeuIdILdbj1yecv6MXdggMY0QS2EWOP4O0RN vX/q1HsjeT10RJS7nYjQOHwtTyJSVyv1b8OEQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=LAnddNj9085dcI/kN3l/MtqYM8Yqoam71k7uTfCglqY=; b=WX6rQTA3GbsSkaazrCnXqbGL1DiIkWVFzyIJ1lWVzwJSmcTeq2abzCqrilj4M+XI0L hhE/at3Ive1+30BeimBSu3bAjkY9HEVo8XwYUQKq1KPzVJJ6wKf2y7y7j6hzx1w80N1R qlOCM/UOzbzMC2N1N8d2QKD2r+GiSvutnJ1Y/YOr/rtRJ92BP1o1U8aAIz5PX03SseCs yZfUd3fYQxfi3x6s/4oxHrfKH48i+CYmkayBVdZ2N5UpNYifCxP1td67qHCDUABKio4N 4FheZYUK7auOz4e4vJN26uQuPq2ImjtfLk+7NmCMjDT2fPIuuJkyC/Z0Xe+/U4BSkpoX riXw== X-Gm-Message-State: AMCzsaX5QafiqXlSxpTlE4jjoSD2cK0cnzTfb2hMElQvjqrq3ox0v6pM JlzyyaU8hWzwnwO6oFX7b6zzjQ== X-Google-Smtp-Source: ABhQp+TkU5YRxLL6bFiM5NZhm96WE/urKpkmCfayurlAnHUMc2jDrwxrIwm/QpKV7uDAxB0274a3zw== X-Received: by 10.200.49.38 with SMTP id g35mr5418357qtb.32.1509492958235; Tue, 31 Oct 2017 16:35:58 -0700 (PDT) Received: from xanadu.home (modemcable045.234-175-137.mc.videotron.ca. [137.175.234.45]) by smtp.gmail.com with ESMTPSA id a127sm1684849qkc.60.2017.10.31.16.35.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Oct 2017 16:35:57 -0700 (PDT) Date: Tue, 31 Oct 2017 19:35:56 -0400 (EDT) From: Nicolas Pitre To: Russell King - ARM Linux Subject: Re: [PATCH 3/3] ARM: early_printk: use printascii() rather than printch() In-Reply-To: <20171031215018.GL9463@n2100.armlinux.org.uk> Message-ID: References: <80bc8c16-321a-43ea-6cbb-257dbeee485b@arm.com> <20171031171629.GI9463@n2100.armlinux.org.uk> <20171031175344.GJ9463@n2100.armlinux.org.uk> <20171031182024.GK9463@n2100.armlinux.org.uk> <20171031215018.GL9463@n2100.armlinux.org.uk> User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171031_163619_876162_5EFA175B X-CRM114-Status: GOOD ( 14.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Brandt , Robin Murphy , "linux-arm-kernel@lists.infradead.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 31 Oct 2017, Russell King - ARM Linux wrote: > On Tue, Oct 31, 2017 at 03:28:11PM -0400, Nicolas Pitre wrote: > > Good! Queued as patch #8717. > > I was going to say that there's another implementation of the > same in arch/arm/boot/compressed/head.S, and if we fix one we > should apply the same fix to the other. Let's make a separate patch for that one. Something like: Please review as this is untested. Nicolas diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 8a756870c2..28a48ad3dd 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -1296,19 +1296,24 @@ phex: adr r3, phexbuf @ puts corrupts {r0, r1, r2, r3} puts: loadsp r3, r1 -1: ldrb r2, [r0], #1 - teq r2, #0 +1: teq r0, #0 + ldrneb r2, [r0], #1 + teqne r2, #0 moveq pc, lr -2: writeb r2, r3 +2: teq r2, #'\n' + bne 4f + mov r2, #'\r' + writeb r2, r3 mov r1, #0x00020000 3: subs r1, r1, #1 bne 3b - teq r2, #'\n' - moveq r2, #'\r' - beq 2b - teq r0, #0 - bne 1b - mov pc, lr + mov r2, #'\n' +4: writeb r2, r3 + mov r1, #0x00020000 +5: subs r1, r1, #1 + bne 5b + b 1b + @ putc corrupts {r0, r1, r2, r3} putc: mov r2, r0