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 X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDCD9C4360C for ; Thu, 3 Oct 2019 00:05:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CB36215EA for ; Thu, 3 Oct 2019 00:05:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TIHHOqdK"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XCxoDAk5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CB36215EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID: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=8rsz7vcSyFEu+9/62FKDv4OqmpZLCHVFSkIHCBkjgMU=; b=TIHHOqdKlidv+j SUx+2zRcpi2oT+E1tAXQG0n9CWXCfbVIyatHsLVhQCIfOaabHLUwnlzyYMw8bIGi9QtsvfRoXQrNa ZB11b1y0Ukphd0AvcCrjXLPMPmbDcwjgsxDh/gy4tcO7g5YVfLj1HumVXqj5Gy7kkgpJCwY2T0YrJ aT0oiTWdHxo/LPW33FtzNH03js3XJ3njW6kENVOca7GbUTtI27cJE20cO/+sDOFsBmIK6cPz7aWZw 2Ph68QjKatobmuPgOEfSrFv5RZmLieUdQUSDNLyWumzgAKvKQTQ+NtnnIlzpHjlKd/Sa9QhEMREvO VwU/Cxr1kOYLme0nE4Gg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFocH-0007Jo-2Q; Thu, 03 Oct 2019 00:05:09 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iFocC-0006WM-ED for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2019 00:05:06 +0000 Received: by mail-pf1-x441.google.com with SMTP id x127so524453pfb.7 for ; Wed, 02 Oct 2019 17:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=eSERWv/dAeDYZPDPVmR4SV3khOIaqqcs+Bqlu8Q3nUM=; b=XCxoDAk5bkJ0qaDYm24OZRCwpIXFugB3PiG7CE1ieFg5zkMHAD78Ax/TdgawPzARFU Asstm9Mx73DxEvNLehqMpPFa84Pg/cSg9xJ876NW2VVNHxcPqdT9I2xX6hRovi7Aqsoa dwPLDnYfdPvvAoT/c+wu9A32Hp4nfNnnAqlm5y9N5SMgsY2Zv77cismDg5PdrDV1g06f tPSfQ3kxtjnIXFxumsR/tTkqdxz570jyI6/iDNmUY5IO2D8VFyl7TmnDAK8d4NO0O5kQ SLjk9BC3EwVbkIPhi1b0MnlEMrTzQZm6BnPEFBHfGTnLHWc+eb9FP1P2KG0Ydkxtu5AE UKjQ== 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:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=eSERWv/dAeDYZPDPVmR4SV3khOIaqqcs+Bqlu8Q3nUM=; b=YQxE50wslqUOZZ8L6NYgjNnCsWztjxANCIiDwRPPLhwps3ij267JQwTkX1zS7C8vA9 gu396QXSVZYiwUKZTqqcRQL6grNY1LDBryNXPcLZ/r3OmINqG16HfAFI4Y6MNQo8BXAH Kx2DbugPRT2aCUdXiiC8qcFWRxO/QjXPNWwtVAkjEBjOyogEEcUZPWIsgo06QttRrrBi cOSdNzZ4Aq4P6oIu4UWTFs9M3jXVc9Xzq1PZO7JEK+fFKm7frn3vWbECYCjiakYI2Z+E tCEutpUL1YU3eJeM+gWHlekeT2/JmV3SRbp3jKxqgzm3ezURvztkpR0jNfQchUC9bEH4 1JNg== X-Gm-Message-State: APjAAAXR16fWfKDNH5OVoRhIEinmuqVev6DUYH2UTqTqILba5NqSmaLF XlVelvpmcH7MePpE6LviqMA= X-Google-Smtp-Source: APXvYqwpVPqlXZYER/PW/zibmkEhfpORcZfQ8gp2Ub7xXCBl9cEqt6R89r7+jxiBp7Ap0cg0aq/Elg== X-Received: by 2002:a65:4145:: with SMTP id x5mr6396476pgp.321.1570061102585; Wed, 02 Oct 2019 17:05:02 -0700 (PDT) Received: from localhost ([106.51.243.182]) by smtp.gmail.com with ESMTPSA id b185sm589731pfg.14.2019.10.02.17.05.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Oct 2019 17:05:01 -0700 (PDT) Date: Thu, 3 Oct 2019 05:34:59 +0530 From: afzal mohammed To: Vladimir Murzin Subject: Re: Regression: Cortex-M w/ XIP not booting Message-ID: <20191003000459.GA5467@afzalpc> References: <20191002061637.GA7743@afzalpc> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.3 (2018-01-21) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191002_170504_549660_DB802ABE X-CRM114-Status: GOOD ( 14.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Coquelin , Russell King , linux-arm-kernel@lists.infradead.org, Alexandre Torgue Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Vladimir, On Wed, Oct 02, 2019 at 12:55:55PM +0100, Vladimir Murzin wrote: > Can you try diff bellow? I do not have XIP target, but non-XIP seems to > stay happy... Thanks, it fixes the issue. Regards afzal > > > diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S > index a7810be..4a39828 100644 > --- a/arch/arm/kernel/head-common.S > +++ b/arch/arm/kernel/head-common.S > @@ -68,7 +68,7 @@ ENDPROC(__vet_atags) > * The following fragment of code is executed with the MMU on in MMU mode, > * and uses absolute addresses; this is not position independent. > * > - * r0 = cp#15 control register > + * r0 = cp#15 control register (exc_ret for M-class) > * r1 = machine ID > * r2 = atags/dtb pointer > * r9 = processor ID > @@ -137,7 +137,8 @@ __mmap_switched_data: > #ifdef CONFIG_CPU_CP15 > .long cr_alignment @ r3 > #else > - .long 0 @ r3 > +M_CLASS(.long exc_ret) @ r3 > +AR_CLASS(.long 0) @ r3 > #endif > .size __mmap_switched_data, . - __mmap_switched_data > > diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S > index afa350f..0fc814b 100644 > --- a/arch/arm/kernel/head-nommu.S > +++ b/arch/arm/kernel/head-nommu.S > @@ -201,6 +201,8 @@ M_CLASS(streq r3, [r12, #PMSAv8_MAIR1]) > bic r0, r0, #V7M_SCB_CCR_IC > #endif > str r0, [r12, V7M_SCB_CCR] > + /* Pass exc_ret to __mmap_switched */ > + mov r0, r10 > #endif /* CONFIG_CPU_CP15 elif CONFIG_CPU_V7M */ > ret lr > ENDPROC(__after_proc_init) > diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S > index 1448f14..efebf41 100644 > --- a/arch/arm/mm/proc-v7m.S > +++ b/arch/arm/mm/proc-v7m.S > @@ -136,9 +136,8 @@ __v7m_setup_cont: > cpsie i > svc #0 > 1: cpsid i > - ldr r0, =exc_ret > - orr lr, lr, #EXC_RET_THREADMODE_PROCESSSTACK > - str lr, [r0] > + /* Calculate exc_ret */ > + orr r10, lr, #EXC_RET_THREADMODE_PROCESSSTACK > ldmia sp, {r0-r3, r12} > str r5, [r12, #11 * 4] @ restore the original SVC vector entry > mov lr, r6 @ restore LR > > Cheers > Vladimir _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel