From patchwork Tue Aug 6 03:07:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Araneda X-Patchwork-Id: 11078159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EAE2C14E5 for ; Tue, 6 Aug 2019 03:08:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D768B286BE for ; Tue, 6 Aug 2019 03:08:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C70C428875; Tue, 6 Aug 2019 03:08:19 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 71837286BE for ; Tue, 6 Aug 2019 03:08:19 +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:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xvKK7RiE812Ns59ZD8om5cwkkTRQDNWnXI88vgOsRNQ=; b=HFO0bttoQuCkm3 JeFF26wUuONdtBU2/q0AdTq0my8YeMvRHGp+NPsBOxSYZ/k+G8/BzWJW4peZ++E45k6Gvu0n2Kw+/ 6FxxFgb2rEgu5NrIDWrRn9tHlEUW72iQk/I5pHk91TCwhLoX+6Sz4ETarCBeDsQUM6O6PToZ6WdhV uJU6S7zX6CQjEzglValmOgcHH/T4EEIe7zBdigpEz8+aNQh2qarkbX8JewqpFv4CB+Q2x7i3tpoB/ ujEqbR4qRdBO6eN6+rGiUf2Qo6htf/ZOGaV16LgrO7Y+YT6nmxO7H2dmk3XwXB/NNGFkireyDBHWa /G5sp1qnTZz1fY23F/ww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1huppi-0004El-US; Tue, 06 Aug 2019 03:08:19 +0000 Received: from mail-vk1-xa42.google.com ([2607:f8b0:4864:20::a42]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1huppZ-000457-R1 for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2019 03:08:11 +0000 Received: by mail-vk1-xa42.google.com with SMTP id y130so17107490vkc.0 for ; Mon, 05 Aug 2019 20:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+qUM9EyfPNq2M7gA+PSnVqo/pTJqSgIuBxaIciINGpo=; b=FPk5zpwQyjWszkhHLErDdhfgFxvQvRNJZz6lyLYMy3j0yAPZJ01R4a4qB3d/ifzsno FRM/Tqi9kSnf3oCMNFuWSFeh3wjqMjX0MzGHj85aCmYp4YxOjxrqPakpy90IMQjUP3VR vrqqmxHM3oP7+tXY06MPUIILvgLDXAZtmHL+W6rgGP3AeVRUXii91s/RkBXpUlOh1drO iA9oXI+0V1P7UKfAA41OZC6awsy1pk7nvVvWikrMbsuTh1vkbx26l98h/ievsCzPQhR8 cfGULkT+9/9CwJtlGBFux0Fd5Qr9Hg9+Fi1PfphhbKtezm/TTUBuU6LUrX62I4I5X0ae ZJZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+qUM9EyfPNq2M7gA+PSnVqo/pTJqSgIuBxaIciINGpo=; b=rQsWLrNiYUKy1BYcrcVPhvjlabU4y0fvJaNTM9E+hRUnTnAmzRsSJVLXo61LpwQxzu 8Ra6LsBFYleybFpvWq8BrIcKlmHSkZhX6/IwSrLv8UQqlx0+yv+K5JvQnldLQbv3UaoN hcG15KEzu1MjiOt5kMDNA7PEhEtjx/84nfhy4VSL2vppf3Tu7vIYaezzVZ8/0iLQIjZT fRKFkIDl97ouf+3CqfCE/4w3iAvK8mhoQTDBcNYIm9upJpGu6LkeVvgpSCEwyqy8/LEd t/2LTykEe1SlF+FFZmTWOpcyfi4+BenNG5nLWpQhke9WSTc2eV46jtobljnauA25Rh4V 4zuA== X-Gm-Message-State: APjAAAUzkDhyFIU7FvpFQjaynVx5HimEULt4wOxcUK8/5WoWOaF8WxIb bOliCtsaHR8/52lcU9bsXLM= X-Google-Smtp-Source: APXvYqzpZjOH4z8+B+VY6CHxesR3IrgEInsXZojfemjLqREXXsCAimavEtIWjbL/xdGCLL56YwkGEw== X-Received: by 2002:a1f:d1c3:: with SMTP id i186mr357136vkg.26.1565060888692; Mon, 05 Aug 2019 20:08:08 -0700 (PDT) Received: from asus-S451LA.lan ([190.22.46.249]) by smtp.gmail.com with ESMTPSA id v190sm22683156vkd.37.2019.08.05.20.08.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 20:08:08 -0700 (PDT) From: Luis Araneda To: linux@armlinux.org.uk, michal.simek@xilinx.com Subject: [PATCH 1/2] ARM: zynq: support smp in thumb mode Date: Mon, 5 Aug 2019 23:07:17 -0400 Message-Id: <20190806030718.29048-2-luaraneda@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190806030718.29048-1-luaraneda@gmail.com> References: <20190806030718.29048-1-luaraneda@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190805_200809_869706_79E46E74 X-CRM114-Status: GOOD ( 12.00 ) 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: Luis Araneda , linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, linux-kernel@vger.kernel.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 Add .arm directive to headsmp.S to ensure that the CPU starts in 32-bit ARM mode and the correct code size is copied on smp bring-up Additionally, start secondary CPUs on secondary_startup_arm to automatically switch from ARM to thumb on a thumb kernel Suggested-by: Michal Simek Signed-off-by: Luis Araneda --- arch/arm/mach-zynq/headsmp.S | 2 ++ arch/arm/mach-zynq/platsmp.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S index ab85003cf9ad..3449e0d1f990 100644 --- a/arch/arm/mach-zynq/headsmp.S +++ b/arch/arm/mach-zynq/headsmp.S @@ -7,6 +7,8 @@ #include #include + .arm + ENTRY(zynq_secondary_trampoline) ARM_BE8(setend be) @ ensure we are in BE8 mode ldr r0, zynq_secondary_trampoline_jump diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index a7cfe07156f4..38728badabd4 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -81,7 +81,7 @@ EXPORT_SYMBOL(zynq_cpun_start); static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle) { - return zynq_cpun_start(__pa_symbol(secondary_startup), cpu); + return zynq_cpun_start(__pa_symbol(secondary_startup_arm), cpu); } /* From patchwork Tue Aug 6 03:07:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Araneda X-Patchwork-Id: 11078161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 351831398 for ; Tue, 6 Aug 2019 03:08:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22AE7286BE for ; Tue, 6 Aug 2019 03:08:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15B1228875; Tue, 6 Aug 2019 03:08:31 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 BE5D9286BE for ; Tue, 6 Aug 2019 03:08:30 +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:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rD2S0UKHkikMbnCs6w8V6pke7kNH0mFuP3iXkm1fDHI=; b=ai11/Q5vL591lB b+ugbclhgRJaYN+YUwaZZtfHRrKtB59zjzZ0+XR/O3OKz+hLs9HRySeV1IHWiFSNm9Bdov2MDIySE tLJQkA50X/b07Lva8cwqFrSwf59ny+O6R4jLNzDF5SXLLwvuCMDLD1EdevTF9qGRGnJ+ZVtBYpTyq xpOV/46n5O8B06hCmSlQIRXg19aytQUrVU4RQF1+b5qpuzugiT/DMzaovIbJTBcj0a4bjrzLThsj8 MYUpurz/PT7Jgs0u6uSErPO7egNqcneUXHOWoClTDL3yLoqcCQmbyadHrE++PdWgrbhEqxy4fLvBr XXr1aJNNvKqfpmMCl1nw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1huppu-0004UD-Bm; Tue, 06 Aug 2019 03:08:30 +0000 Received: from mail-ua1-x941.google.com ([2607:f8b0:4864:20::941]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1huppb-000461-ML for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2019 03:08:12 +0000 Received: by mail-ua1-x941.google.com with SMTP id a97so33047924uaa.9 for ; Mon, 05 Aug 2019 20:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bs0lmDNxa1aAKQKN0MVTNnd8nYHoFzSTA2dziDK99ZE=; b=uvjciLg/2rMNF9ijkXRPobQpKgmfo/ydHMGgu4GxJKxFzJBwyrpN+RChv7QwZtutE8 m5utMFeOfsgoMxA4fQI4Fnr/Cl3KkzU3WWz5UOFWPtZ+UkUM3yib9prf5EOBprUE5Y8M ixjEoe47akhAGY8Smy6lnzseKdVIyykZS4daWDvbtGw8f8sR8Vl6jJLwFq3EgRA0Is0d g0Qp0u8cY2uoPlS+Nd22AG3WdJKVq9JZEfWDYnMpo9y2RquGYd8/Db16dc+7QOr2v0Ec JcU/CWRn38fT7dHWq3K24h/KCRHLKwbQtmMCNwAe6fj5TKgEJz8cI7/elvVnMwLRugqX KosQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bs0lmDNxa1aAKQKN0MVTNnd8nYHoFzSTA2dziDK99ZE=; b=R75ghRaTVjMm+BZxMJTmNPz5WWrB4sxCbdvKgr1e6a8bbwnHa0OF8RtmGR1gaKe3/V U9fIcp4VswBtt24C5zsVnnY9pKlUQiPeqwjbYP+kXdpJ12fbs6XTmRc1vDO2WqKoIAtW i7SCvzbRr/1wi8Rbm6Z0UkevqU2nSl6ftgT1MKrtghp8UeTAlnt6QJz+ox7JNZ3Y2B1a ynNPQuXgnBDC4oqi24Sd2tejen7r01+sSNHpqm/s/nitOzTEJd7ODW2rgXrZxTxnr2Cz WD1f2i13Ci8PlcWTiO7JDYZAeV46IfsirSVLlqAYw4euFAKRXXZt8ewrzjbe5yiZaafz ycfQ== X-Gm-Message-State: APjAAAV495y/Csnc0VYwioJU+2qQl17J/sD9QH4h9QnwC8mRj5KRt9af +mZ+5TDynHM/Vj6rtc0mG0A= X-Google-Smtp-Source: APXvYqz1jj9chZIr0Yf4E395LCJUYFXV1bMRm3+VXYW8Siypet9RS1vk/lBrCB7r6RHni4579BUOnA== X-Received: by 2002:ab0:a1:: with SMTP id 30mr779825uaj.29.1565060890557; Mon, 05 Aug 2019 20:08:10 -0700 (PDT) Received: from asus-S451LA.lan ([190.22.46.249]) by smtp.gmail.com with ESMTPSA id v190sm22683156vkd.37.2019.08.05.20.08.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 20:08:10 -0700 (PDT) From: Luis Araneda To: linux@armlinux.org.uk, michal.simek@xilinx.com Subject: [PATCH 2/2] ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up Date: Mon, 5 Aug 2019 23:07:18 -0400 Message-Id: <20190806030718.29048-3-luaraneda@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190806030718.29048-1-luaraneda@gmail.com> References: <20190806030718.29048-1-luaraneda@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190805_200811_748013_A7255B86 X-CRM114-Status: GOOD ( 13.38 ) 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: Luis Araneda , linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org, linux-kernel@vger.kernel.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 This fixes a kernel panic (read overflow) on memcpy when FORTIFY_SOURCE is enabled. The computed size of memcpy args are: - p_size (dst): 4294967295 = (size_t) -1 - q_size (src): 1 - size (len): 8 Additionally, the memory is marked as __iomem, so one of the memcpy_* functions should be used for read/write Signed-off-by: Luis Araneda --- arch/arm/mach-zynq/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 38728badabd4..a10085be9073 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -57,7 +57,7 @@ int zynq_cpun_start(u32 address, int cpu) * 0x4: Jump by mov instruction * 0x8: Jumping address */ - memcpy((__force void *)zero, &zynq_secondary_trampoline, + memcpy_toio(zero, &zynq_secondary_trampoline, trampoline_size); writel(address, zero + trampoline_size);