From patchwork Mon Jan 21 07:34:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pi-Hsun Shih X-Patchwork-Id: 10772685 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 735C213B4 for ; Mon, 21 Jan 2019 07:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F75D20415 for ; Mon, 21 Jan 2019 07:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5396229B89; Mon, 21 Jan 2019 07:34: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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0063E20415 for ; Mon, 21 Jan 2019 07:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726784AbfAUHeT (ORCPT ); Mon, 21 Jan 2019 02:34:19 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:42273 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728018AbfAUHeS (ORCPT ); Mon, 21 Jan 2019 02:34:18 -0500 Received: by mail-pl1-f196.google.com with SMTP id y1so9381783plp.9 for ; Sun, 20 Jan 2019 23:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+hmdyO+P7OhnxtWxgXzXr5h3FZef89nOTZIJP5d5FhI=; b=Ih3ouotVPm9Czxle1biBqpvAo/Snbb+l7E7QHDXERYBaKN8C29vG8ltB9Dg4s11e2g BEZyjFIxrUwVRje83XZnK7OWTAO/8glD3mYT/K2qPKnO6ng/ziRz37Gsk6VH5nBRrHMQ 1RY7TFUBIkW/qmEA/zwVcVYK+04HhZ01m13aQ= 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=+hmdyO+P7OhnxtWxgXzXr5h3FZef89nOTZIJP5d5FhI=; b=Rj3JPV6qO0nl7oC4FDymZb8bEkBSXe88hOPAWALBV1OimcjaC7wi3H6/hlTrQf5yCT 4sZYu4l/4rp1HUxrircMouCRRfWJl5b3aPAS8B9SYtlAgAGNPxCmQNqtKt6q/HT0Gk3y th6oaGPc/JvGLpuPYx7/OLjRHasf/ZJK7sUZjr+t1QfMIQ5NyVXwqN7OAsgZWWR0qTRu uNZmgOiyVMZ30E+4UY3IYqrSFNOOJ9N17fWtq6bxCQJJP6WPZUV2ovpoYv0SsMN5tIAy 1mBzXAI9yT0FtzQ66Hu6KnlCgpjiYkY/XIGHa26U2UL1JM3OuLg4zHolWQb8aF48EPvf 6fsQ== X-Gm-Message-State: AJcUukfYgWD0L0NWiipAWJjquXGR1GfLAnxZI0Keu8yTWGCvYZJgNB3Y XUv88PoN53v6Qy9UmMdA6XLREA== X-Google-Smtp-Source: ALg8bN79em6x5NhHPF5tMk1F4ff43D118VqGvJk2fMPHOx7NBFjfZoz7F7oQ+MSntuArcjsWBFEdJw== X-Received: by 2002:a17:902:4624:: with SMTP id o33mr28598916pld.289.1548056057171; Sun, 20 Jan 2019 23:34:17 -0800 (PST) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id r6sm19483243pgk.91.2019.01.20.23.34.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Jan 2019 23:34:16 -0800 (PST) From: Pi-Hsun Shih Cc: Pi-Hsun Shih , Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org (open list:REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] remoteproc: elf_loader: Use memset_io instead of memset. Date: Mon, 21 Jan 2019 15:34:08 +0800 Message-Id: <20190121073408.56557-2-pihsun@chromium.org> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog In-Reply-To: <20190121073408.56557-1-pihsun@chromium.org> References: <20190121073408.56557-1-pihsun@chromium.org> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use memset_io and memcpy_toio instead of memset and memcpy in rproc_elf_load_segments, since the target ptr may be device memory. Signed-off-by: Pi-Hsun Shih --- This fix issue while trying to load ELF firmware based on https://lore.kernel.org/patchwork/patch/1033804/, that the memset(..., 0) would use "dc zva" instruction on aarch64, which cause kernel crash since the target is device memory. --- drivers/remoteproc/remoteproc_elf_loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c index b17d72ec8603bc..17f1815757dc54 100644 --- a/drivers/remoteproc/remoteproc_elf_loader.c +++ b/drivers/remoteproc/remoteproc_elf_loader.c @@ -159,7 +159,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) u32 memsz = phdr->p_memsz; u32 filesz = phdr->p_filesz; u32 offset = phdr->p_offset; - void *ptr; + void __iomem *ptr; if (phdr->p_type != PT_LOAD) continue; @@ -191,7 +191,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) /* put the segment where the remote processor expects it */ if (phdr->p_filesz) - memcpy(ptr, elf_data + phdr->p_offset, filesz); + memcpy_toio(ptr, elf_data + phdr->p_offset, filesz); /* * Zero out remaining memory for this segment. @@ -201,7 +201,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) * this. */ if (memsz > filesz) - memset(ptr + filesz, 0, memsz - filesz); + memset_io(ptr + filesz, 0, memsz - filesz); } return ret;