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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEF74C433FE for ; Tue, 21 Dec 2021 02:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234946AbhLUCDs (ORCPT ); Mon, 20 Dec 2021 21:03:48 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:35690 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235067AbhLUCCD (ORCPT ); Mon, 20 Dec 2021 21:02:03 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1F5D8B81100; Tue, 21 Dec 2021 02:02:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F3B4C36AE5; Tue, 21 Dec 2021 02:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1640052120; bh=X3x2q91yTEeIx4pyLPqn1GZlb6ij9kl0M5egD1UypEM=; h=From:To:Cc:Subject:Date:From; b=RSqJV/IafCsj5Urf2g68IowhUnd7ZNSOH9k7WbkMki4R579ylgBgjNFtKDaKMJ8P1 GNi1p5gykLN8zfTr9K5g9kfPCbMDb/10hEAHyfUAfqqF4qGjUYjkBhHGM3lD/82yzZ harJuQnC7OWzDGqPKtQf2N8SfF5/xXkYqrj+T3ivpTn5JkMNaEZBSJKgmaUiMaCsuH r8O3JuDyr+VDEvo+cVmg/3fFJm9H8+DN3cQaNlAVVlRgSolrPyFJXrTOs8qHS50xDO tkl/Q5Luwc0iK1TPbEuVe+wKXPOalaQaX1UcL6gjyTQxPm8XABuH4LHxB2NtCeRSqT DUC6vf4bSw+VQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Ivan T. Ivanov" , Heiko Stuebner , Sasha Levin , linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 1/4] ARM: rockchip: Use memcpy_toio instead of memcpy on smp bring-up Date: Mon, 20 Dec 2021 21:01:55 -0500 Message-Id: <20211221020158.117612-1-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Ivan T. Ivanov" [ Upstream commit 423e85e97aaf69e5198bbec6811e3825c8b5019a ] This fixes a potential kernel panic on memcpy when FORTIFY_SOURCE is enabled. Because memory is iomem use appropriate function for accessing it. Signed-off-by: Ivan T. Ivanov Link: https://lore.kernel.org/r/20211116084616.24811-1-iivanov@suse.de Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm/mach-rockchip/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 4d827a069d49c..203f5a72829e2 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -198,7 +198,7 @@ static int __init rockchip_smp_prepare_sram(struct device_node *node) rockchip_boot_fn = virt_to_phys(secondary_startup); /* copy the trampoline to sram, that runs during startup of the core */ - memcpy(sram_base_addr, &rockchip_secondary_trampoline, trampoline_sz); + memcpy_toio(sram_base_addr, &rockchip_secondary_trampoline, trampoline_sz); flush_cache_all(); outer_clean_range(0, trampoline_sz); -- 2.34.1