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.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 83931C433DF for ; Fri, 17 Jul 2020 04:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6085F2071A for ; Fri, 17 Jul 2020 04:46:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726798AbgGQEqp (ORCPT ); Fri, 17 Jul 2020 00:46:45 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:17610 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725864AbgGQEqo (ORCPT ); Fri, 17 Jul 2020 00:46:44 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06H4Voo3143975; Fri, 17 Jul 2020 00:46:35 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 32auqup48t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jul 2020 00:46:35 -0400 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 06H4WMEl145082; Fri, 17 Jul 2020 00:46:35 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 32auqup486-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jul 2020 00:46:34 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 06H4Uhtg011264; Fri, 17 Jul 2020 04:46:32 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 328rbqsxx8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Jul 2020 04:46:32 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 06H4kTdd43909294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jul 2020 04:46:30 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DBD4352280; Fri, 17 Jul 2020 04:46:29 +0000 (GMT) Received: from [9.102.1.129] (unknown [9.102.1.129]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id D3ACF5227A; Fri, 17 Jul 2020 04:46:26 +0000 (GMT) Subject: Re: [PATCH v3 02/12] powerpc/kexec_file: mark PPC64 specific code To: Thiago Jung Bauermann Cc: Pingfan Liu , Nayna Jain , Kexec-ml , Mahesh J Salgaonkar , Mimi Zohar , lkml , linuxppc-dev , Sourabh Jain , Petr Tesarik , Andrew Morton , Dave Young , Vivek Goyal , Eric Biederman References: <159466074408.24747.10036072269371204890.stgit@hbathini.in.ibm.com> <159466085652.24747.2414199807974963385.stgit@hbathini.in.ibm.com> <87v9io8c13.fsf@morokweng.localdomain> From: Hari Bathini Message-ID: <63d551a9-684b-768b-8b0f-2a0da68d7f11@linux.ibm.com> Date: Fri, 17 Jul 2020 10:16:25 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <87v9io8c13.fsf@morokweng.localdomain> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-07-16_11:2020-07-16,2020-07-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_spam_definite policy=outbound score=100 malwarescore=0 bulkscore=0 adultscore=0 clxscore=1015 phishscore=0 spamscore=100 impostorscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 mlxscore=100 mlxlogscore=-1000 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007170029 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 16/07/20 7:19 am, Thiago Jung Bauermann wrote: > > I didn't forget about this patch. I just wanted to see more of the > changes before comenting on it. > > Hari Bathini writes: > >> Some of the kexec_file_load code isn't PPC64 specific. Move PPC64 >> specific code from kexec/file_load.c to kexec/file_load_64.c. Also, >> rename purgatory/trampoline.S to purgatory/trampoline_64.S in the >> same spirit. > > There's only a 64 bit implementation of kexec_file_load() so this is a > somewhat theoretical exercise, but there's no harm in getting the code > organized, so: > > Reviewed-by: Thiago Jung Bauermann > > I have just one question below. >> +/** >> + * setup_new_fdt_ppc64 - Update the flattend device-tree of the kernel >> + * being loaded. >> + * @image: kexec image being loaded. >> + * @fdt: Flattened device tree for the next kernel. >> + * @initrd_load_addr: Address where the next initrd will be loaded. >> + * @initrd_len: Size of the next initrd, or 0 if there will be none. >> + * @cmdline: Command line for the next kernel, or NULL if there will >> + * be none. >> + * >> + * Returns 0 on success, negative errno on error. >> + */ >> +int setup_new_fdt_ppc64(const struct kimage *image, void *fdt, >> + unsigned long initrd_load_addr, >> + unsigned long initrd_len, const char *cmdline) >> +{ >> + int chosen_node, ret; >> + >> + /* Remove memory reservation for the current device tree. */ >> + ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params), >> + fdt_totalsize(initial_boot_params)); >> + if (ret == 0) >> + pr_debug("Removed old device tree reservation.\n"); >> + else if (ret != -ENOENT) { >> + pr_err("Failed to remove old device-tree reservation.\n"); >> + return ret; >> + } >> + >> + ret = setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, >> + cmdline, &chosen_node); >> + if (ret) >> + return ret; >> + >> + ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0); >> + if (ret) >> + pr_err("Failed to update device-tree with linux,booted-from-kexec\n"); >> + >> + return ret; >> +} > > For setup_purgatory_ppc64() you start with an empty function and build > from there, but for setup_new_fdt_ppc64() you moved some code here. Is > the code above 64 bit specific? Actually, I was not quiet sure if fdt updates like in patch 6 & patch 9 can be done after setup_ima_buffer() call. If you can confirm, I will move them back to setup_purgatory() Thanks Hari