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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1731CC19F32 for ; Wed, 5 Mar 2025 07:34:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpjGx-0007Mz-Pz; Wed, 05 Mar 2025 02:34:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpjGv-0007I8-2i; Wed, 05 Mar 2025 02:34:29 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpjGt-0005AK-1Z; Wed, 05 Mar 2025 02:34:28 -0500 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5253kiWp017694; Wed, 5 Mar 2025 07:34:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=P7j5VW nPK7BiG0vlJ/ekCrstCUJLXDvdBQ0tSti2rC8=; b=HToBRsMXWl+xK9pabEhRic RbUzm5Gz3KBipYPJYXhcIP3rfpIH2zjOp2cQ3s7sLwcHY5iJuDLxiNL0FSgAnZEa KPh8Ct66fTcSlSApu/4X/xNJ9JulmZYRFtYMRIZCvhhMJno8vIg3z5DK5rgo55Gu 8Bw5gZ7c/zRpzrNu5JM+AN3IKnOvM7Xd7YrEFwaFpxmAoCcck2tYyjvxYCNL6xZ6 jHCoWojKB5WlelOestVxgsI8aQ7GDkdtgPHrw5nq+hedwpuqqB9SOIerDqlU4++m mtwqSi1q5vVeeMwiVQZ0l5ozsiJ1P5sLGRYtwmhZBH9z+MXpxTDmJAevQLzHc8kw == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 456f08rtd5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Mar 2025 07:34:24 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 5257UO4w021871; Wed, 5 Mar 2025 07:34:23 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 456f08rtcs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Mar 2025 07:34:23 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5256etvE009012; Wed, 5 Mar 2025 07:34:22 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 454cxyhrtc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Mar 2025 07:34:22 +0000 Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5257YLHi24183368 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Mar 2025 07:34:21 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2FADB58067; Wed, 5 Mar 2025 07:34:21 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 54CCF58043; Wed, 5 Mar 2025 07:34:18 +0000 (GMT) Received: from [9.39.18.13] (unknown [9.39.18.13]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 5 Mar 2025 07:34:17 +0000 (GMT) Message-ID: Date: Wed, 5 Mar 2025 13:04:16 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 5/6] hw/ppc: Pass device tree properties for Fadump To: Nicholas Piggin , Aditya Gupta , qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Daniel Henrique Barboza , Sourabh Jain , Mahesh J Salgaonkar , Hari Bathini References: <20250217071711.83735-1-adityag@linux.ibm.com> <20250217071711.83735-6-adityag@linux.ibm.com> Content-Language: en-US From: Harsh Prateek Bora In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Oa9bBupWNVD8mk602TVLXnKVwiVyQOU3 X-Proofpoint-GUID: uNDj4CJWIrt1YT06CAqm960mxRnxUoCT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-05_03,2025-03-05_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 adultscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503050058 Received-SPF: pass client-ip=148.163.156.1; envelope-from=harshpb@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 2/27/25 08:58, Nicholas Piggin wrote: > On Mon Feb 17, 2025 at 5:17 PM AEST, Aditya Gupta wrote: >> Platform (ie. QEMU) is expected to pass few device tree properties for >> details for fadump: >> >> * "ibm,configure-kernel-dump": RTAS call for fadump >> * "ibm,configure-kernel-dump-sizes": Space required to store dump data >> for firmware provided dump sections (ie. CPU & HPTE regions) >> * "ibm,configure-kernel-dump-version": Versions of fadump supported >> * "ibm,kernel-dump": Contains the Fadump Memory Structure on a fadump >> boot >> >> Implement passing configure-kernel-dump-sizes, and >> configure-kernel-dump-version device tree properties, irrespective of >> whether it's a fadump boot or not, so that kernel can reserve memory to >> store the firmware provided dump sections in case of a crash >> >> Also, in case of a fadump boot, pass the fadump memory structure to the >> kernel in "ibm,kernel-dump" device tree property. >> >> Signed-off-by: Aditya Gupta >> --- >> hw/ppc/spapr.c | 62 ++++++++++++++++++++++++++++++++++++++++++ >> include/hw/ppc/spapr.h | 2 ++ >> 2 files changed, 64 insertions(+) >> >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index f3a4b4235d43..3602e5b5d18d 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -897,9 +897,27 @@ static int spapr_dt_rng(void *fdt) >> static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt) >> { > > You might be able to add a spapr_dt_rtas_fadump() function > and do it there to help keep functions small? Ditto. Would look nicer coming from spapr_fadump.[ch] as suggested by Nick earlier. Thanks Harsh > > Thanks, > Nick > >> MachineState *ms = MACHINE(spapr); >> + MachineClass *mc = MACHINE_GET_CLASS(ms); >> int rtas; >> GString *hypertas = g_string_sized_new(256); >> GString *qemu_hypertas = g_string_sized_new(256); >> + uint32_t max_possible_cpus = mc->possible_cpu_arch_ids(ms)->len; >> + uint64_t fadump_cpu_state_size = 0; >> + uint16_t fadump_versions[2] = { >> + FADUMP_VERSION /* min supported version */, >> + FADUMP_VERSION /* max supported version */ >> + }; >> + uint32_t fadump_rgn_sizes[2][3] = { >> + { >> + cpu_to_be32(FADUMP_CPU_STATE_DATA), >> + 0, 0 /* Calculated later */ >> + }, >> + { >> + cpu_to_be32(FADUMP_HPTE_REGION), >> + 0, 0 /* HPTE region not implemented */ >> + } >> + }; >> + >> uint32_t lrdr_capacity[] = { >> 0, >> 0, >> @@ -1006,6 +1024,50 @@ static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt) >> _FDT(fdt_setprop(fdt, rtas, "ibm,lrdr-capacity", >> lrdr_capacity, sizeof(lrdr_capacity))); >> >> + /* >> + * CPU State Data contains multiple fields such as header, num_cpus and >> + * register entries >> + * >> + * Calculate the maximum CPU State Data size, according to maximum >> + * possible CPUs the QEMU VM can have >> + */ >> + /* Reg save header */ >> + fadump_cpu_state_size += sizeof(struct rtas_fadump_reg_save_area_header); >> + >> + /* Num_cpus */ >> + fadump_cpu_state_size += sizeof(__be32); >> + >> + /* Register Entries */ >> + fadump_cpu_state_size += max_possible_cpus * >> + FADUMP_NUM_PER_CPU_REGS * >> + sizeof(struct rtas_fadump_reg_entry); >> + >> + /* Set maximum size for CPU state data region */ >> + assert(fadump_rgn_sizes[0][0] == cpu_to_be32(FADUMP_CPU_STATE_DATA)); >> + >> + /* Upper 32 bits of size, usually 0 */ >> + fadump_rgn_sizes[0][1] = cpu_to_be32(fadump_cpu_state_size >> 32); >> + >> + /* Lower 32 bits of size */ >> + fadump_rgn_sizes[0][2] = cpu_to_be32(fadump_cpu_state_size & 0xffffffff); >> + >> + /* Add device tree properties required from platform for fadump */ >> + _FDT((fdt_setprop(fdt, rtas, "ibm,configure-kernel-dump-version", >> + fadump_versions, sizeof(fadump_versions)))); >> + _FDT((fdt_setprop(fdt, rtas, "ibm,configure-kernel-dump-sizes", >> + fadump_rgn_sizes, sizeof(fadump_rgn_sizes)))); >> + >> + if (is_next_boot_fadump) { >> + struct rtas_fadump_mem_struct *fdm = >> + &fadump_metadata.registered_fdm; >> + >> + uint64_t fdm_size = >> + sizeof(struct rtas_fadump_section_header) + >> + (be16_to_cpu(fdm->header.dump_num_sections) * >> + sizeof(struct rtas_fadump_section)); >> + >> + _FDT((fdt_setprop(fdt, rtas, "ibm,kernel-dump", fdm, fdm_size))); >> + } >> spapr_dt_rtas_tokens(fdt, rtas); >> } >> >> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h >> index 0e8002bad9e0..fa63008e57ec 100644 >> --- a/include/hw/ppc/spapr.h >> +++ b/include/hw/ppc/spapr.h >> @@ -928,6 +928,8 @@ static inline uint64_t fadump_gpr_id_to_u64(uint32_t gpr_id) >> return val; >> } >> >> +extern bool is_next_boot_fadump; >> + >> struct fadump_metadata { >> bool fadump_registered; >> bool fadump_dump_active; >