From patchwork Tue Jul 24 06:57:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10541369 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 D263917FD for ; Tue, 24 Jul 2018 07:11:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B347B28706 for ; Tue, 24 Jul 2018 07:11:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B154C287EF; Tue, 24 Jul 2018 07:11:34 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 3D79E287D5 for ; Tue, 24 Jul 2018 07:11:34 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=+xCdLHad/arsGx5k3/f0rxWy33jDVw47Fy349WezrK8=; b=D+02sVopPLL6kikS+LuYDPnTOa 0vtOolZQlbnObrbn6BT38FbCd4BBkVJgORGM+5nhKvmYw2DApiEfGcnPMh1Ssw6QXZC9ApymZV59G +qiHvBDLyYmtDACdF2hGOouwYzuRekse61olPopVjv6JV3aqIZKHIaQUE7Q2sk3JNr6LvCc87lljM oUjjiSfICvUAryZy1MTsZvuqCwkBpEZ/F+HRTgsGlSvgNq5TnN5TmXuYaUrbythKAAC/mBx6ydAe/ +YfMdPhMViclsCYfLmtzFr+K5Vk01C3k/wzEESyetb+1v66lCLAdOJHhQyzgycNfrRchWfdhYrLm0 EU0IylPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhrTn-0001DH-4p; Tue, 24 Jul 2018 07:11:31 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fhrGO-00019x-Pw for linux-arm-kernel@lists.infradead.org; Tue, 24 Jul 2018 06:57:46 +0000 Received: by mail-pf1-x444.google.com with SMTP id b17-v6so624366pfi.0 for ; Mon, 23 Jul 2018 23:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8ScyWDBSkpDCeiO9xWIrh9E1Li1NS358S3v+0v5j+T0=; b=iiggbw/YJZIAmCl7wpn67Ovdkz+pycG2Mg51R/BAaen71ZB0eRXijPEyRgy/mq7wcd vZuBl7F5EF5rXfpH1vpV/gyllE0ooG8GMxvKSqC0uAnU8aq9M42TGFGK7DAI3m1gVdH5 IQJsH+l9kVW4XYYkiCKC0zQ/frf8WjM9ggA+s= 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; bh=8ScyWDBSkpDCeiO9xWIrh9E1Li1NS358S3v+0v5j+T0=; b=alKfyoR7P2aWIEoygUwNdiEdIVRSWyh8iu45sL9yMCJZVfCg6oAiyWLJ8xk8VESTpv g6UGYqttyPRZaFquNeg4AXaYadS8jR3LqQuQqA67q/gHvREjSKtETBIV5e+Zcj7xPNUD n0Nr0i7EUARwUTH4bYEnqRMd9vYz9MTFZqULNzrMasWNQLosaGHQeyMufikwvqy6XUvW +yzmPVPNBC5yHPDJ/AuVBJYecqwrdb3n10tXZdaKjdj7+X9sP8WY7ydMaZd9qsi8u2nu jPmzgmrprL0jUJx/RWb5+zUN9HMizwIRgZd8jcZXwfpKmKns4cauR9Zimk+AgsrgN2Pr 90/Q== X-Gm-Message-State: AOUpUlFmKOVkNn9NZ1UjusXRTeE5MyBZrw4HWrwxas+S2/v/0Y2H+F5s hew4mYy1MT63OvvVjvHuH5imWw== X-Google-Smtp-Source: AAOMgpd1sndZWCunzrA9HLAAoRE8DF3myXLtZcMYvG+4FiARYJJehM9j7fcL1BGeIM4XeNi2dZC+2A== X-Received: by 2002:a62:3601:: with SMTP id d1-v6mr16421214pfa.41.1532415450265; Mon, 23 Jul 2018 23:57:30 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id z19-v6sm2465351pgi.33.2018.07.23.23.57.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 23:57:29 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Subject: [PATCH v12 03/16] s390, kexec_file: drop arch_kexec_mem_walk() Date: Tue, 24 Jul 2018 15:57:46 +0900 Message-Id: <20180724065759.19186-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724065759.19186-1-takahiro.akashi@linaro.org> References: <20180724065759.19186-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180723_235741_194325_4D81936E X-CRM114-Status: GOOD ( 13.98 ) 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: ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , james.morse@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Since s390 already knows where to locate buffers, calling arch_kexec_mem_walk() has no sense. So we can just drop it as kbuf->mem indicates this while all other architectures sets it to 0 initially. This change is a preparatory work for the next patch, where all the variant memory walks, either on system resource or memblock, will be put in one common place so that it will satisfy all the architectures' need. Signed-off-by: AKASHI Takahiro Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Dave Young Cc: Vivek Goyal Cc: Baoquan He Reviewed-by: Philipp Rudo --- arch/s390/kernel/machine_kexec_file.c | 10 ---------- kernel/kexec_file.c | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index f413f57f8d20..32023b4f9dc0 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c @@ -134,16 +134,6 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data, return ret; } -/* - * The kernel is loaded to a fixed location. Turn off kexec_locate_mem_hole - * and provide kbuf->mem by hand. - */ -int arch_kexec_walk_mem(struct kexec_buf *kbuf, - int (*func)(struct resource *, void *)) -{ - return 1; -} - int arch_kexec_apply_relocations_add(struct purgatory_info *pi, Elf_Shdr *section, const Elf_Shdr *relsec, diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 63c7ce1c0c3e..bf39df5e5bb9 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -534,6 +534,10 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) { int ret; + /* Arch knows where to place */ + if (kbuf->mem) + return 0; + ret = arch_kexec_walk_mem(kbuf, locate_mem_hole_callback); return ret == 1 ? 0 : -EADDRNOTAVAIL;